summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/build-essential.morph2
-rw-r--r--strata/build-essential/stage2-fhs-dirs.morph4
2 files changed, 3 insertions, 3 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 03bed0c5..d7aab159 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -167,7 +167,7 @@ chunks:
- name: stage2-fhs-dirs
morph: strata/build-essential/stage2-fhs-dirs.morph
repo: baserock:baserock/fhs-dirs
- ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
+ ref: jjardon/no_lib_bin_links
unpetrify-ref: master
build-mode: bootstrap
prefix: /tools
diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph
index 64080217..6f842403 100644
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ b/strata/build-essential/stage2-fhs-dirs.morph
@@ -3,8 +3,8 @@ kind: chunk
description: create the FHS 2.3 directory hierarchy and the usual files
install-commands:
- sh ./create-fhs-dirs "$DESTDIR"
-- rmdir "$DESTDIR/bin"
-- ln -s "$PREFIX/bin" "$DESTDIR/bin"
+- rmdir "$DESTDIR/usr/bin"
+- ln -s "$PREFIX/bin" "$DESTDIR/usr/bin"
- install -m 644 passwd "$DESTDIR/etc/passwd"
- install -m 600 shadow "$DESTDIR/etc/shadow"
- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"