Author: alexander
Date: 2007-08-19 04:43:28 -0600 (Sun, 19 Aug 2007)
New Revision: 2033
Added:
branches/minimal/scripts/shutdown-helper.in
Removed:
branches/minimal/scripts/shutdown-helper
Modified:
branches/minimal/Makefile
branches/minimal/packages/initramfs/Makefile
branches/minimal/packages/initramfs/init.in
branches/minimal/packages/net-firmware/Makefile
Log:
Synchronized with trunk, fixed initramfs build
Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile 2007-08-16 14:40:53 UTC (rev 2032)
+++ branches/minimal/Makefile 2007-08-19 10:43:28 UTC (rev 2033)
@@ -282,7 +282,7 @@
ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \
ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \
ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \
- ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware
ch-initramfs ch-linux32
+ ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-linux32
ifeq ($(CD_ARCH),x86)
make ch-grub
make ch-linux
@@ -398,8 +398,9 @@
@install -m644 doc/README doc/lfscd-remastering-howto.txt $(MP)/root
@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
@install -m600 root/.bashrc $(MP)/root/.bashrc
- @install -m755 scripts/{net-setup,greeting} $(MP)/usr/bin/
- @install -m755 scripts/{livecd-login,shutdown-helper} $(MP)/usr/bin/
+ @install -m755 scripts/{net-setup,greeting,livecd-login} $(MP)/usr/bin/
+ @sed s/@LINKER@/$(LINKER)/ scripts/shutdown-helper.in
>$(MP)/usr/bin/shutdown-helper
+ @chmod 755 $(MP)/usr/bin/shutdown-helper
@svn export --force root $(MP)/etc/skel
iso: prepiso
Modified: branches/minimal/packages/initramfs/Makefile
===================================================================
--- branches/minimal/packages/initramfs/Makefile 2007-08-16 14:40:53 UTC
(rev 2032)
+++ branches/minimal/packages/initramfs/Makefile 2007-08-19 10:43:28 UTC
(rev 2033)
@@ -26,7 +26,7 @@
cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf
cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d
sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/*
- sed s/@VERSION@/$(VERSION)/ init.in >$(WDIR)/init
+ sed -e s/@VERSION@/$(VERSION)/ -e s/@LINKER@/$(LINKER)/ init.in
>$(WDIR)/init
chmod 755 $(WDIR)/init
cp fakecd.iso.head $(WDIR)
mknod -m 640 $(WDIR)/dev/console c 5 1
Modified: branches/minimal/packages/initramfs/init.in
===================================================================
--- branches/minimal/packages/initramfs/init.in 2007-08-16 14:40:53 UTC (rev
2032)
+++ branches/minimal/packages/initramfs/init.in 2007-08-19 10:43:28 UTC (rev
2033)
@@ -18,12 +18,6 @@
nodhcp=0
cdtype=
-case `uname -m` in
- i[3456]86) LINKER="ld-linux.so.2" ;;
-
- x86_64) LINKER="ld-linux-x86-64.so.2" ;;
-esac
-
find_cd() {
for SYS in /sys/block/hd* /sys/block/sr* ; do
[ ! -d "$SYS" ] && continue
@@ -344,5 +338,5 @@
cd /.root
# Clean up and free some memory
rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init /fakecd.iso.head
-./lib/${LINKER} --library-path ./lib ./bin/mount -n --move . /
-exec ../lib/${LINKER} --library-path ./lib ./usr/sbin/chroot . "$init" "$@"
+./lib/@LINKER@ --library-path ./lib ./bin/mount -n --move . /
+exec ../lib/@LINKER@ --library-path ./lib ./usr/sbin/chroot . "$init" "$@"
Modified: branches/minimal/packages/net-firmware/Makefile
===================================================================
--- branches/minimal/packages/net-firmware/Makefile 2007-08-16 14:40:53 UTC
(rev 2032)
+++ branches/minimal/packages/net-firmware/Makefile 2007-08-19 10:43:28 UTC
(rev 2033)
@@ -82,21 +82,16 @@
URL-$(FILE17)= http://www.ralinktech.com.tw/data/$(FILE17)
SHA-$(FILE17)= 8f40bd8448c136e7edcc005f45e657258085ab8e
-DIR18= iwlwifi-3945-ucode-2.14.1.5
+DIR18= iwlwifi-3945-ucode-2.14.4
FILE18= $(DIR18).tgz
URL-$(FILE18)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE18)
-SHA-$(FILE18)= aeeeccb2fddeff86ee7dbdca0f0d627d0c99d45c
+SHA-$(FILE18)= c715e4f0ab4ddddb45f6b5c36644e13dc0cd0b2c
-DIR19= iwlwifi-4965-ucode-4.44.1.18
+DIR19= iwlwifi-4965-ucode-4.44.17
FILE19= $(DIR19).tgz
URL-$(FILE19)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE19)
-SHA-$(FILE19)= 01bf0264cfc4f60957a7242264050a81c56858bf
+SHA-$(FILE19)= 955d8718419dc2670d9b8167e22df118a36666a5
-DIR20= iwlwifi-4965-ucode-4.44.17
-FILE20= $(DIR20).tgz
-URL-$(FILE20)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE20)
-SHA-$(FILE20)= 955d8718419dc2670d9b8167e22df118a36666a5
-
ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE)))
# Targets
@@ -129,7 +124,6 @@
@unzip $(FILE17) ; cp $(DIR17)/*.bin /lib/firmware
@tar xf $(FILE18) ; cp $(DIR18)/* /lib/firmware
@tar xf $(FILE19) ; cp $(DIR19)/* /lib/firmware
- @tar xf $(FILE20) ; cp $(DIR20)/* /lib/firmware
@make clean
@touch $@
Deleted: branches/minimal/scripts/shutdown-helper
===================================================================
--- branches/minimal/scripts/shutdown-helper 2007-08-16 14:40:53 UTC (rev
2032)
+++ branches/minimal/scripts/shutdown-helper 2007-08-19 10:43:28 UTC (rev
2033)
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-case `uname -m` in
- i[3456]86) LINKER="ld-linux.so.2" ;;
-
- x86_64) LINKER="ld-linux-x86-64.so.2" ;;
-esac
-
-FILES="/lib/libc.so.6
-/lib/${LINKER}
-/lib/libreadline.so.5
-/lib/libhistory.so.5
-/lib/libncursesw.so.5
-/lib/libdl.so.2
-/lib/libblkid.so.1
-/lib/libuuid.so.1
-/bin/sh
-/bin/umount
-/sbin/losetup
-/sbin/halt
-/sbin/reboot
-/usr/sbin/chroot
-/usr/sbin/dmsetup
-/usr/lib/libdevmapper.so.1.02
-/usr/bin/eject
-/bin/sleep
-/lib/libm.so.6
-/lib/librt.so.1
-/lib/libpthread.so.0
-/dev/console
-/dev/null
-/dev/loop0
-/dev/loop3
-/dev/mapper/control"
-
-case "$RUNLEVEL" in
- 0)
- HALT="/sbin/halt -d -f -i -p"
- ;;
- 6)
- HALT="/sbin/reboot -d -f -i"
- ;;
-esac
-
-if [ ! -b /dev/lfs-cd ] && [ ! -d /dev/shm/.partition ] ; then
- # The CD has been loaded into RAM
- $HALT
- while true ; do sleep 1 ; done
-fi
-
-mkdir /dev/shm/old /dev/shm/proc /dev/shm/etc
-ln -s /proc/mounts /dev/shm/etc/mtab
-echo "$FILES" | cpio -pLd --quiet /dev/shm
-case `uname -m` in
- x86_64)
- ln -s lib /dev/shm/lib64
- ln -s lib /dev/shm/usr/lib64
- ;;
-esac
-if [ -b /dev/lfs-cd ] ; then cp -RH /dev/lfs-cd /dev/shm/dev/lfs-cd ; fi
-
-cat >/dev/shm/sbin/init <<EOF
-#!/bin/sh
-
-halt() {
- $HALT
- while true ; do sleep 1 ; done
-}
-
-fail() {
- echo "Could not unmount the CD, sorry. Please report this as a bug."
- sleep 5
- halt
-}
-
-exec </dev/console >/dev/console 2>/dev/console
-TIMEOUT=
-while ! umount -n /old 2>/dev/null && [ "\$TIMEOUT" != "....." ] ; do
- sleep 1
- TIMEOUT=".\$TIMEOUT"
-done
-[ "\$TIMEOUT" = "....." ] && fail
-
-dmsetup remove_all || fail
-losetup -d /dev/loop0 || fail
-umount -n /.cdrom || fail
-
-if [ -d /.partition ] ; then
- losetup -d /dev/loop3 || fail
- umount -n /.partition || fail
-fi
-
-if [ -b /dev/lfs-cd ] ; then
- eject -r /dev/lfs-cd
- echo -n "Take the CD, close the CD-ROM tray and press Enter..."
- ( sleep 30 ; halt ) &
- read ENTER
-fi
-halt
-EOF
-chmod 755 /dev/shm/sbin/init
-ln -nsf /old/dev/initctl /dev/shm/dev/initctl
-# "-t no" because otherwise /dev/pts isn't unmounted.
-umount -na -t no
-# brltty quirk - it mounts /etc/brltty/usbfs. "not mounted" goes to /dev/null
-umount -n /etc/brltty/usbfs 2>/dev/null
-cd /dev/shm
-mount -n -t proc proc /dev/shm/proc
-pivot_root . old
-exec chroot . /old/sbin/init u
Copied: branches/minimal/scripts/shutdown-helper.in (from rev 2032,
trunk/scripts/shutdown-helper.in)
===================================================================
--- branches/minimal/scripts/shutdown-helper.in (rev 0)
+++ branches/minimal/scripts/shutdown-helper.in 2007-08-19 10:43:28 UTC (rev
2033)
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+FILES="/lib/libc.so.6
+/lib/@LINKER@
+/lib/libreadline.so.5
+/lib/libhistory.so.5
+/lib/libncursesw.so.5
+/lib/libdl.so.2
+/lib/libblkid.so.1
+/lib/libuuid.so.1
+/bin/sh
+/bin/umount
+/sbin/losetup
+/sbin/halt
+/sbin/reboot
+/usr/sbin/chroot
+/usr/sbin/dmsetup
+/usr/lib/libdevmapper.so.1.02
+/usr/bin/eject
+/bin/sleep
+/lib/libm.so.6
+/lib/librt.so.1
+/lib/libpthread.so.0
+/dev/console
+/dev/null
+/dev/loop0
+/dev/loop3
+/dev/mapper/control"
+
+case "$RUNLEVEL" in
+ 0)
+ HALT="/sbin/halt -d -f -i -p"
+ ;;
+ 6)
+ HALT="/sbin/reboot -d -f -i"
+ ;;
+esac
+
+if [ ! -b /dev/lfs-cd ] && [ ! -d /dev/shm/.partition ] ; then
+ # The CD has been loaded into RAM
+ $HALT
+ while true ; do sleep 1 ; done
+fi
+
+mkdir /dev/shm/old /dev/shm/proc /dev/shm/etc
+ln -s /proc/mounts /dev/shm/etc/mtab
+echo "$FILES" | cpio -pLd --quiet /dev/shm
+# this doesn't hurt on x86
+ln -s lib /dev/shm/lib64
+ln -s lib /dev/shm/usr/lib64
+if [ -b /dev/lfs-cd ] ; then cp -RH /dev/lfs-cd /dev/shm/dev/lfs-cd ; fi
+
+cat >/dev/shm/sbin/init <<EOF
+#!/bin/sh
+
+halt() {
+ $HALT
+ while true ; do sleep 1 ; done
+}
+
+fail() {
+ echo "Could not unmount the CD, sorry. Please report this as a bug."
+ sleep 5
+ halt
+}
+
+exec </dev/console >/dev/console 2>/dev/console
+TIMEOUT=
+while ! umount -n /old 2>/dev/null && [ "\$TIMEOUT" != "....." ] ; do
+ sleep 1
+ TIMEOUT=".\$TIMEOUT"
+done
+[ "\$TIMEOUT" = "....." ] && fail
+
+dmsetup remove_all || fail
+losetup -d /dev/loop0 || fail
+umount -n /.cdrom || fail
+
+if [ -d /.partition ] ; then
+ losetup -d /dev/loop3 || fail
+ umount -n /.partition || fail
+fi
+
+if [ -b /dev/lfs-cd ] ; then
+ eject -r /dev/lfs-cd
+ echo -n "Take the CD, close the CD-ROM tray and press Enter..."
+ ( sleep 30 ; halt ) &
+ read ENTER
+fi
+halt
+EOF
+chmod 755 /dev/shm/sbin/init
+ln -nsf /old/dev/initctl /dev/shm/dev/initctl
+# "-t no" because otherwise /dev/pts isn't unmounted.
+umount -na -t no
+# brltty quirk - it mounts /etc/brltty/usbfs. "not mounted" goes to /dev/null
+umount -n /etc/brltty/usbfs 2>/dev/null
+cd /dev/shm
+mount -n -t proc proc /dev/shm/proc
+pivot_root . old
+exec chroot . /old/sbin/init u
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
