diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-22 15:40:14 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-04 15:17:03 +0000 |
| commit | 6f7719175713237ff3fa5fe524d8159ec3cbe156 (patch) | |
| tree | 479fe569056aef96699e145f100a3f6a09b7cf3a | |
| parent | 7d7068766fb1da7637f13e9cace65b12cb0ad4b6 (diff) | |
| download | fhs-dirs-6f7719175713237ff3fa5fe524d8159ec3cbe156.tar.gz | |
Fixup previous
| -rw-r--r-- | stage2-fhs-dirs.morph | 2 | ||||
| -rw-r--r-- | stage2-fhs-dirs.morph.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stage2-fhs-dirs.morph b/stage2-fhs-dirs.morph index 2522400..3e7beb4 100644 --- a/stage2-fhs-dirs.morph +++ b/stage2-fhs-dirs.morph @@ -6,7 +6,7 @@ "sh ./create-fhs-dirs \"$DESTDIR\"", "rmdir \"$DESTDIR/bin\"", "ln -s \"$PREFIX/bin\" \"$DESTDIR/bin\"", - "cpu=$(echo $TARGET | cut -d '-' -f 1)\nif [ \"$cpu\" == \"x86_64\" ]; then\n mkdir -p \"$DESTDIR/lib64\"\n ln -s \"$PREFIX/lib/ld-linux-x86-64.so.2\" \"$DESTDIR/lib64/ld-linux-x86-64.so.2\"\nelse\n loader=$(ls /lib/ld-linux-*)\n ln -s \"$PREFIX$loader\" \"$DESTDIR$loader\"\nfi\n", + "cpu=$(echo $TARGET | cut -d '-' -f 1)\nif [ \"$cpu\" == \"x86_64\" ]; then\n mkdir -p \"$DESTDIR/lib64\"\n ln -s \"$PREFIX/lib/ld-linux-x86-64.so.2\" \"$DESTDIR/lib64/ld-linux-x86-64.so.2\"\nelse\n loader=$(ls /lib/ld-linux*)\n ln -s \"$PREFIX$loader\" \"$DESTDIR$loader\"\nfi\n", "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 d7f7d15..fe2c0d0 100644 --- a/stage2-fhs-dirs.morph.yaml +++ b/stage2-fhs-dirs.morph.yaml @@ -20,7 +20,7 @@ install-commands: mkdir -p "$DESTDIR/lib64" ln -s "$PREFIX/lib/ld-linux-x86-64.so.2" "$DESTDIR/lib64/ld-linux-x86-64.so.2" else - loader=$(ls /lib/ld-linux-*) + loader=$(ls /lib/ld-linux*) ln -s "$PREFIX$loader" "$DESTDIR$loader" fi |