diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-19 14:02:37 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-04 15:17:03 +0000 |
| commit | 0e750e39d2776da5f61bf343ef69572b6d75ca27 (patch) | |
| tree | 80da06ace82bf67d2bfc1c66af3b6b741dedf337 | |
| parent | e279a9906a2ecf61384cad685cb62408cfd7a2d4 (diff) | |
| download | fhs-dirs-0e750e39d2776da5f61bf343ef69572b6d75ca27.tar.gz | |
Current 3-stage bootstrap -- fails due to needing a relocatable sysroot for stage 2
| -rw-r--r-- | fhs-dirs.morph.yaml | 21 | ||||
| -rw-r--r-- | stage2-fhs-dirs.morph | 3 | ||||
| -rw-r--r-- | stage2-fhs-dirs.morph.yaml | 27 |
3 files changed, 31 insertions, 20 deletions
diff --git a/fhs-dirs.morph.yaml b/fhs-dirs.morph.yaml index c6235e8..082513d 100644 --- a/fhs-dirs.morph.yaml +++ b/fhs-dirs.morph.yaml @@ -1,14 +1,15 @@ name: fhs-dirs kind: chunk decription: create the FHS 2.3 directory hierarchy and the usual files + install-commands: -- sh ./create-fhs-dirs "$DESTDIR" -- sh ./create-dev-nodes "$DESTDIR" -- install -m 644 passwd "$DESTDIR/etc/passwd" -- install -m 600 shadow "$DESTDIR/etc/shadow" -- install -m 644 interfaces "$DESTDIR/etc/network/interfaces" -- install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" -- install -m 644 issue "$DESTDIR/etc/issue" -- install -m 644 services "$DESTDIR/etc/services" -- echo baserock > "$DESTDIR"/etc/hostname + - sh ./create-fhs-dirs "$DESTDIR" + - sh ./create-dev-nodes "$DESTDIR" + - install -m 644 passwd "$DESTDIR/etc/passwd" + - install -m 600 shadow "$DESTDIR/etc/shadow" + - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" + - install -m 644 group "$DESTDIR/etc/group" + - install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" + - install -m 644 issue "$DESTDIR/etc/issue" + - install -m 644 services "$DESTDIR/etc/services" + - echo baserock > "$DESTDIR"/etc/hostname diff --git a/stage2-fhs-dirs.morph b/stage2-fhs-dirs.morph index 3159247..0cd13b7 100644 --- a/stage2-fhs-dirs.morph +++ b/stage2-fhs-dirs.morph @@ -4,6 +4,9 @@ "decription": "create the FHS 2.3 directory hierarchy and the usual files", "install-commands": [ "sh ./create-fhs-dirs \"$DESTDIR\"", + "rmdir \"$DESTDIR/bin\" \"$DESTDIR/lib\"", + "ln -s \"/tools/bin\" \"$DESTDIR/bin\"", + "ln -s \"/tools/lib\" \"$DESTDIR/lib\"", "sh ./create-dev-nodes \"$DESTDIR\"", "install -m 644 passwd \"$DESTDIR/etc/passwd\"", "install -m 600 shadow \"$DESTDIR/etc/shadow\"", diff --git a/stage2-fhs-dirs.morph.yaml b/stage2-fhs-dirs.morph.yaml index ab16542..056b94a 100644 --- a/stage2-fhs-dirs.morph.yaml +++ b/stage2-fhs-dirs.morph.yaml @@ -1,14 +1,21 @@ name: stage2-fhs-dirs kind: chunk decription: create the FHS 2.3 directory hierarchy and the usual files + install-commands: -- sh ./create-fhs-dirs "$DESTDIR" -- sh ./create-dev-nodes "$DESTDIR" -- install -m 644 passwd "$DESTDIR/etc/passwd" -- install -m 600 shadow "$DESTDIR/etc/shadow" -- install -m 644 interfaces "$DESTDIR/etc/network/interfaces" -- install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" -- install -m 644 issue "$DESTDIR/etc/issue" -- install -m 644 services "$DESTDIR/etc/services" -- echo baserock > "$DESTDIR"/etc/hostname + # We tweak this a little for stage 2 because everything is installed into + # the one sysroot (/tools). We use symlinked versions of /bin and /lib. + - sh ./create-fhs-dirs "$DESTDIR" + - rmdir "$DESTDIR/bin" "$DESTDIR/lib" + - ln -s "/tools/bin" "$DESTDIR/bin" + - ln -s "/tools/lib" "$DESTDIR/lib" + + - sh ./create-dev-nodes "$DESTDIR" + - install -m 644 passwd "$DESTDIR/etc/passwd" + - install -m 600 shadow "$DESTDIR/etc/shadow" + - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" + - install -m 644 group "$DESTDIR/etc/group" + - install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" + - install -m 644 issue "$DESTDIR/etc/issue" + - install -m 644 services "$DESTDIR/etc/services" + - echo baserock > "$DESTDIR"/etc/hostname |