Author: jhuntwork
Date: 2005-11-29 17:02:40 -0700 (Tue, 29 Nov 2005)
New Revision: 1185
Modified:
trunk/Makefile
trunk/scripts/shutdown-helper
trunk/vars/vars.ppc
trunk/vars/vars.x86
trunk/vars/vars.x86_64
Log:
Fixed an issue with the shutdown-helper on other archs
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-11-29 14:08:02 UTC (rev 1184)
+++ trunk/Makefile 2005-11-30 00:02:40 UTC (rev 1185)
@@ -502,7 +502,9 @@
@sed -i "s/Version:.*/Version: $(VERSION)/" $(MP)/boot/boot.msg
endif
endif
- @install -m755
scripts/{net-setup,greeting,livecd-login,ll,shutdown-helper} $(MP)/usr/bin/
+ @install -m755 scripts/{net-setup,greeting,livecd-login,ll}
$(MP)/usr/bin/
+ @sed 's|_LINKER_|$(LINKER)|' scripts/shutdown-helper >
$(MP)/usr/bin/shutdown-helper
+ @chmod 755 $(MP)/usr/bin/shutdown-helper
@cp -ra root $(MP)/etc/skel
ifndef CROSS
@-mv $(MP)/bin/uname.real $(MP)/bin/uname
Modified: trunk/scripts/shutdown-helper
===================================================================
--- trunk/scripts/shutdown-helper 2005-11-29 14:08:02 UTC (rev 1184)
+++ trunk/scripts/shutdown-helper 2005-11-30 00:02:40 UTC (rev 1185)
@@ -1,7 +1,7 @@
#!/bin/sh
FILES="/lib/libc.so.6
-/lib/ld-linux.so.2
+/lib/_LINKER_
/lib/libreadline.so.5.0
/lib/libhistory.so.5.0
/lib/libncurses.so.5
Modified: trunk/vars/vars.ppc
===================================================================
--- trunk/vars/vars.ppc 2005-11-29 14:08:02 UTC (rev 1184)
+++ trunk/vars/vars.ppc 2005-11-30 00:02:40 UTC (rev 1185)
@@ -2,3 +2,4 @@
export CFLAGS := -Os -s
export LIB_MAYBE64 := lib
export KERNEL_ARCH := ppc
+LINKER := ld.so.1
Modified: trunk/vars/vars.x86
===================================================================
--- trunk/vars/vars.x86 2005-11-29 14:08:02 UTC (rev 1184)
+++ trunk/vars/vars.x86 2005-11-30 00:02:40 UTC (rev 1185)
@@ -2,3 +2,4 @@
export CFLAGS := -Os -s -march=i486
export LIB_MAYBE64 := lib
export KERNEL_ARCH := i386
+export LINKER := ld-linux.so.2
Modified: trunk/vars/vars.x86_64
===================================================================
--- trunk/vars/vars.x86_64 2005-11-29 14:08:02 UTC (rev 1184)
+++ trunk/vars/vars.x86_64 2005-11-30 00:02:40 UTC (rev 1185)
@@ -9,3 +9,4 @@
export LFS_TARGET := x86_64-pc-linux-gnu
export LFS_TARGET32 := i686-pc-linux-gnu
export KERNEL_ARCH := x86_64
+export LINKER := ld-linux.so.2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
