Author: alexander
Date: 2007-09-26 06:52:49 -0600 (Wed, 26 Sep 2007)
New Revision: 2078
Added:
branches/minimal/etc/modprobe.conf
branches/minimal/packages/gpm/gpm-1.20.1-default_client-1.patch
branches/minimal/packages/linux64/debian-style-headers.sh
branches/minimal/packages/multipath-tools/
Modified:
branches/minimal/Makefile
branches/minimal/doc/README
branches/minimal/etc/issue.fullcd
branches/minimal/etc/issue.nosrc
branches/minimal/etc/issue.toram
branches/minimal/isolinux/isolinux.cfg
branches/minimal/isolinux/options2.msg
branches/minimal/isolinux/options4.msg
branches/minimal/packages/LFS-BOOK/Makefile
branches/minimal/packages/gpm/Makefile
branches/minimal/packages/initramfs/Makefile
branches/minimal/packages/initramfs/init.in
branches/minimal/packages/jhalfs/configuration
branches/minimal/packages/linux/Makefile
branches/minimal/packages/linux/config.x86
branches/minimal/packages/linux/debian-style-headers.sh
branches/minimal/packages/linux64/Makefile
branches/minimal/packages/linux64/config.x86_64
branches/minimal/packages/livecd-bootscripts/langconf
branches/minimal/packages/lynx/Makefile
branches/minimal/packages/module-init-tools/Makefile
branches/minimal/packages/udev/Makefile
Log:
Merged all applicable changes since r1950 from trunk.
Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile 2007-09-26 12:38:20 UTC (rev 2077)
+++ branches/minimal/Makefile 2007-09-26 12:52:49 UTC (rev 2078)
@@ -276,7 +276,8 @@
ch-irssi ch-XML-Parser ch-pidgin ch-net-tools ch-wireless_tools
ch-wpa_supplicant \
ch-tcpwrappers ch-portmap ch-nfs-utils \
ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc ch-dialog ch-ncftp \
- ch-device-mapper ch-LVM2 ch-dmraid ch-dhcpcd ch-distcc ch-ppp
ch-rp-pppoe ch-pptp \
+ ch-device-mapper ch-LVM2 ch-dmraid ch-multipath-tools \
+ ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \
ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-brltty \
ch-strace ch-iptables ch-eject ch-hdparm \
ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \
Modified: branches/minimal/doc/README
===================================================================
--- branches/minimal/doc/README 2007-09-26 12:38:20 UTC (rev 2077)
+++ branches/minimal/doc/README 2007-09-26 12:52:49 UTC (rev 2078)
@@ -28,6 +28,7 @@
* cvs
* pppd
* rp-pppoe
+* pptp client
* dhcpcd
* ncftp
* traceroute
@@ -55,6 +56,7 @@
* mdadm
* LVM2
* dmraid
+* kpartx
* hdparm
* parted
Modified: branches/minimal/etc/issue.fullcd
===================================================================
--- branches/minimal/etc/issue.fullcd 2007-09-26 12:38:20 UTC (rev 2077)
+++ branches/minimal/etc/issue.fullcd 2007-09-26 12:52:49 UTC (rev 2078)
@@ -10,7 +10,7 @@
Please read the [1;32m/root/README[00m file before using this CD.
All source packages needed to build an LFS system are located in
[1;32m/lfs-sources[00m.
-You can find the LFS book in [1;32m/usr/share/LFS-BOOK-SVN-HTML[00m.
+You can find the LFS book in [1;32m/usr/share/LFS-BOOK-6.3-HTML[00m.
Support questions concerning this CD should be directed to
[1;[EMAIL PROTECTED]
Modified: branches/minimal/etc/issue.nosrc
===================================================================
--- branches/minimal/etc/issue.nosrc 2007-09-26 12:38:20 UTC (rev 2077)
+++ branches/minimal/etc/issue.nosrc 2007-09-26 12:52:49 UTC (rev 2078)
@@ -10,7 +10,7 @@
Please read the [1;32m/root/README[00m file before using this CD.
This CD does not include LFS sources.
-You can find the LFS book in [1;32m/usr/share/LFS-BOOK-SVN-HTML[00m.
+You can find the LFS book in [1;32m/usr/share/LFS-BOOK-6.3-HTML[00m.
Support questions concerning this CD should be directed to
[1;[EMAIL PROTECTED]
Modified: branches/minimal/etc/issue.toram
===================================================================
--- branches/minimal/etc/issue.toram 2007-09-26 12:38:20 UTC (rev 2077)
+++ branches/minimal/etc/issue.toram 2007-09-26 12:52:49 UTC (rev 2078)
@@ -13,7 +13,7 @@
but were not loaded into RAM. After mounting the CD, you can find them in
the [1;32mlfs-sources[00m subdirectory of the mount point.
-You can find the LFS book in [1;32m/usr/share/LFS-BOOK-SVN-HTML[00m.
+You can find the LFS book in [1;32m/usr/share/LFS-BOOK-6.3-HTML[00m.
Support questions concerning this CD should be directed to
[1;[EMAIL PROTECTED]
Copied: branches/minimal/etc/modprobe.conf (from rev 2077,
trunk/etc/modprobe.conf)
===================================================================
--- branches/minimal/etc/modprobe.conf (rev 0)
+++ branches/minimal/etc/modprobe.conf 2007-09-26 12:52:49 UTC (rev 2078)
@@ -0,0 +1,12 @@
+blacklist 8139cp
+blacklist eth1394
+blacklist sk98lin
+blacklist eepro100
+options iwl3945 disable_hw_scan=1
+options iwl4965 disable_hw_scan=1
+
+alias pnp:dPNP0510 irtty-sir
+alias pnp:dPNP0511 irtty-sir
+alias pnp:dPNP0700 floppy
+alias pnp:dPNP0800 pcspkr
+alias pnp:dPNP0f13 psmouse
Modified: branches/minimal/isolinux/isolinux.cfg
===================================================================
--- branches/minimal/isolinux/isolinux.cfg 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/isolinux/isolinux.cfg 2007-09-26 12:52:49 UTC (rev
2078)
@@ -9,4 +9,8 @@
label linux
kernel linux
- append initrd=initramfs_data_cpio.gz
+ append initrd=initramfs_data_cpio.gz quiet
+
+label linux64
+ kernel linux64
+ append initrd=initramfs_data_cpio.gz quiet
Modified: branches/minimal/isolinux/options2.msg
===================================================================
--- branches/minimal/isolinux/options2.msg 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/isolinux/options2.msg 2007-09-26 12:52:49 UTC (rev
2078)
@@ -8,7 +8,6 @@
toram
Loads the whole CD contents (except sources and proprietary video
drivers) to RAM.
-
Note: this needs at least 512 MB of RAM, and you also need
to enable swap if you have less than 768 MB of RAM.
@@ -25,4 +24,5 @@
Uses /dev/XXX for software suspending (AKA hibernation) and resuming.
See /root/README for details.
-
+debug
+ Causes kernel messages to appear on the screen.
Modified: branches/minimal/isolinux/options4.msg
===================================================================
--- branches/minimal/isolinux/options4.msg 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/isolinux/options4.msg 2007-09-26 12:52:49 UTC (rev
2078)
@@ -7,7 +7,7 @@
new_firewire
Uses the new FireWire stack.
-nomsi noapic nolapic pci=noacpi acpi=off blacklist=yenta-socket ide=nodma
+nomsi noapic pci=noacpi acpi=off clock=pit blacklist=yenta-socket ide=nodma
These options work around various chipset bugs. Try them one-by-one in the
order given above and in various combinations if the CD does not boot, or if
a device does not work correctly or fails after hibernating and resuming.
@@ -18,11 +18,11 @@
device dev, with a translation table tbl. The example specifies a BAUM
SuperVario 40 Braille display connected by USB with default Braille table.
-vga=[res]
+vga=[resolution]
Examples:
vga=795 (1280x1024x24) vga=792 (1024x768x24) vga=789 (800x600x24)
vga=794 (1280x1024x16) vga=791 (1024x768x16) vga=788 (800x600x16)
- NOTE: This is for the framebuffer console and has nothing to do with X
- server resolution. Also, it causes some X video drivers (e.g., "s3virge") to
- malfunction. X server bug reports will be ignored if you use this option.
+ Enables the framebuffer console.
+
+
Modified: branches/minimal/packages/LFS-BOOK/Makefile
===================================================================
--- branches/minimal/packages/LFS-BOOK/Makefile 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/LFS-BOOK/Makefile 2007-09-26 12:52:49 UTC (rev
2078)
@@ -38,7 +38,8 @@
compile-stage2:
svn co $(REVPARM) $(URL) $(DIR)
# tar xf $(FILE)
- cd $(DIR) ; make BASEDIR=../$(HTMLDIR)
+ cd $(DIR) ; make BASEDIR=../$(HTMLDIR) RENDERTMP=.
+ rm $(DIR)/lfs-full.xml $(DIR)/lfs-html.xml
cp -av $(DIR) $(HTMLDIR) /usr/share
sed -i '[EMAIL
PROTECTED]".*\"@WWW_HOME=\"/usr/share/$(HTMLDIR)/index.html\"@' \
$(ROOT)/etc/profile
Modified: branches/minimal/packages/gpm/Makefile
===================================================================
--- branches/minimal/packages/gpm/Makefile 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/gpm/Makefile 2007-09-26 12:52:49 UTC (rev
2078)
@@ -16,6 +16,8 @@
URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2)
SHA-$(PATCH2)= 8899a212eadfbda201d8da3e44590bd05b97f9f6
+PATCH3= $(DIR)-default_client-1.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -30,6 +32,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
+ patch -Np1 -i ../$(PATCH3)
./configure --prefix=/usr --sysconfdir=/etc --without-curses
LDFLAGS="-lm" make
make install
Copied: branches/minimal/packages/gpm/gpm-1.20.1-default_client-1.patch (from
rev 2077, trunk/packages/gpm/gpm-1.20.1-default_client-1.patch)
===================================================================
--- branches/minimal/packages/gpm/gpm-1.20.1-default_client-1.patch
(rev 0)
+++ branches/minimal/packages/gpm/gpm-1.20.1-default_client-1.patch
2007-09-26 12:52:49 UTC (rev 2078)
@@ -0,0 +1,29 @@
+Submitted By: Alexander E. Patrakov
+Date: 2007-09-07
+Initial Package Version: 1.20.1
+Origin: Upstream
+Upstream status: will be part of 1.20.2
+Description: Restores support for "default client" in the API.
+Should fix the "Inappropriate ioctl for device" error when running brltty.
+
+--- gpm-1.20.1/src/lib/liblow.c 2002-12-25 03:57:16.000000000 +0500
++++ gpm-1.20.1/src/lib/liblow.c 2007-09-07 15:31:43.000000000 +0600
+@@ -249,7 +249,7 @@
+ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+ memcpy(tty,option.consolename,strlen(option.consolename)-1);
+ sprintf(&tty[strlen(option.consolename)-1],"%i",flag);
+- } else { /* use your current vc */
++ } else if (flag==0) { /* use your current vc */
+ if (isatty(0)) tty = ttyname(0); /* stdin */
+ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */
+ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */
+@@ -265,7 +265,8 @@
+ }
+
+ conn->vc=atoi(&tty[strlen(option.consolename)-1]);
+- }
++ } else /* a default handler -- use console */
++ tty = strdup(option.consolename);
+
+ if (gpm_consolefd == -1)
+ if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) {
Modified: branches/minimal/packages/initramfs/Makefile
===================================================================
--- branches/minimal/packages/initramfs/Makefile 2007-09-26 12:38:20 UTC
(rev 2077)
+++ branches/minimal/packages/initramfs/Makefile 2007-09-26 12:52:49 UTC
(rev 2078)
@@ -26,12 +26,15 @@
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/*
+ echo "blacklist generic" >$(WDIR)/etc/modprobe.conf
+ echo "blacklist ata_generic" >>$(WDIR)/etc/modprobe.conf
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
mknod -m 664 $(WDIR)/dev/null c 1 3
- cp /bin/{sh,dd,cat,cp,killall,mkdir,mount,umount,sed,sleep,ln,rm,uname}
$(WDIR)/bin
+ cp
/bin/{sh,dd,cat,cp,killall,ls,mkdir,mount,umount,sed,sleep,ln,rm,uname}
$(WDIR)/bin
+ cp /lib/{librt.so.1,libpthread.so.0} $(WDIR)/lib
cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,$(LINKER)} $(WDIR)/lib
cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib
cp /lib/{libpthread.so.0,librt.so.1,libuuid.so.1} $(WDIR)/lib
Modified: branches/minimal/packages/initramfs/init.in
===================================================================
--- branches/minimal/packages/initramfs/init.in 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/initramfs/init.in 2007-09-26 12:52:49 UTC (rev
2078)
@@ -1,5 +1,8 @@
#!/bin/sh
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+export PATH
+
EXPECTED_LABEL="[EMAIL PROTECTED]@"
EXPECTED_LABEL="$EXPECTED_LABEL "
EXPECTED_LABEL=${EXPECTED_LABEL:0:32}
@@ -11,6 +14,7 @@
rootdelay=
rootfstype=auto
ro="ro"
+rootflags=
noresume=0
resume=
all_generic_ide=0
@@ -28,6 +32,29 @@
done
}
+problem() {
+ cat <<"EOF"
+The problem may be caused by the fact that ISA IDE and SCSI adapters are
+no longer attempted to be autodetected. If you use such hardware, load the
+proper driver manually with the "modprobe" command and exit from this shell.
+For old IDE controllers, the correct module name is "ide-generic", or, if
+you want to use the new libata-based driver, "pata-legacy". To avoid this
+message next time you boot this CD, use a kernel command line like this:
+linux load=ide-generic
+
+This problem can be also caused by a slow SCSI controller or USB/FireWire
+CD-ROM that needs more time to be detected. If you see any kernel messages
+below, this is the case. In this case, it is sufficient to type "exit",
+and the CD will continue the boot process. To avoid this message next
+ime you boot this CD, use a kernel command line like this:
+linux rootdelay=20
+
+Dropping you to a shell.
+
+EOF
+ sh
+}
+
do_resume() {
case "$resume" in
*:*)
@@ -36,8 +63,25 @@
/dev/*)
if [ -b ${resume} ] ; then
eval echo $( stat -L -c '$(( 0x%t )):$(( 0x%T ))'
${resume} ) >/sys/power/resume
+ # MC syntax highlighting is buggy '
else
- echo "Cannot resume from device $resume, which doesn't
exist"
+ cat <<EOF
+The specified resume device ${resume} doesn't exist.
+Please fix this problem and exit this shell. If you don't want to resume,
+type "exit".
+
+EOF
+ problem
+ # Retry
+ if [ -b ${resume} ] ; then
+ eval echo $( stat -L -c '$(( 0x%t )):$(( 0x%T
))' ${resume} ) >/sys/power/resume
+ # MC syntax highlighting is buggy '
+ else
+ cat <<EOF
+The specified resume device ${resume} still doesn't exist.
+Assuming that you don't want to resume.
+EOF
+ fi
fi
;;
esac
@@ -80,9 +124,9 @@
dd if=/.tmpfs/.cdrom/root.ext2 of=of=/.tmpfs/.fakecd.iso \
bs=1 count=1 skip=8 seek=47482 conv=notrunc 2>/dev/null
umount -n /.tmpfs/.cdrom
- /sbin/losetup /dev/loop2 /.tmpfs/.fakecd.iso
+ losetup /dev/loop2 /.tmpfs/.fakecd.iso
if [ -d /.tmpfs/.partition ] ; then
- /sbin/losetup -d /dev/loop3
+ losetup -d /dev/loop3
umount -n /.tmpfs/.partition && rm -rf /.tmpfs/.partition
fi
ln -sf /dev/loop2 /dev/lfs-cd
@@ -102,53 +146,32 @@
umount -n /.tmpfs/.cdrom
}
+
do_mount_cd() {
- i=1
- while [ ! -L /dev/lfs-cd ] ; do
+ while [ ! -b /dev/lfs-cd ] ; do
find_cd
- if [ ! -L /dev/lfs-cd ] ; then
- echo "LFS LiveCD not found."
- TRIES=5
- DELAY=6 # 30 seconds total
+ if [ ! -b /dev/lfs-cd ] ; then
+ cat <<"EOF"
- for (( ; i<=$TRIES ; i++ )) ; do
- [ -L /dev/lfs-cd ] && break
+LFS LiveCD could not find its device, perhaps due to unsupported or
+undetected hardware. Please fix this problem and exit this shell.
- echo -n "Retry attempt $i of $TRIES... "
- sleep $DELAY
- find_cd
-
- [ -L /dev/lfs-cd ] && echo "success!" || echo
"failed!"
- done
+EOF
+ problem
fi
-
- if [ ! -L /dev/lfs-cd ] ; then
- echo ""
- echo "LFS LiveCD could not find its device, perhaps due
to"
- echo "unsupported or undetected hardware. Or maybe this
is"
- echo "just a slow SCSI or USB controller that needs
more time"
- echo "to settle (workaround: add rootdelay=30 to the
kernel"
- echo "command line in the boot loader)."
- echo ""
- echo "Dropping you to a shell."
- echo "Please load the needed modules and, optionally,
make"
- echo "/dev/lfs-cd a symlink pointing to the correct
device."
- echo ""
- sh
- fi
done
mkdir /.tmpfs/.cdrom
detect_cd_type
if [ "$toram" = 1 ] ; then copy_cd_to_ram ; fi
mount -n -t iso9660 -o ro /dev/lfs-cd /.tmpfs/.cdrom
- /sbin/losetup /dev/loop0 /.tmpfs/.cdrom/root.ext2
- SIZE=`/sbin/blockdev --getsize /dev/loop0`
+ losetup /dev/loop0 /.tmpfs/.cdrom/root.ext2
+ SIZE=`blockdev --getsize /dev/loop0`
OVERHEAD=$(( 0x1000 + $SIZE * 2 ))
OVLSIZE=$(( $SIZE + ( $OVERHEAD + 511 ) / 512 ))
dd if=/dev/null of=/.tmpfs/.overlay bs=512 seek=$OVLSIZE 2>/dev/null
- /sbin/losetup /dev/loop1 /.tmpfs/.overlay
- echo "0 $SIZE snapshot /dev/loop0 /dev/loop1 p 8" | /sbin/dmsetup
create lfs-cd
+ losetup /dev/loop1 /.tmpfs/.overlay
+ echo "0 $SIZE snapshot /dev/loop0 /dev/loop1 p 8" | dmsetup create
lfs-cd
mount -n -t ext2 /dev/mapper/lfs-cd /.root
mount -n --move /.tmpfs /.root/dev/shm
if [ "$toram" != 1 ] && [ ! -d /.root/dev/shm/.partition ] ; then
@@ -165,6 +188,10 @@
if [ "$nodhcp" = "1" ] ; then
rm -f /.root/etc/udev/rules.d/76-network.rules
fi
+ ( IFS="," ; for module in $load ; do
+ echo "$module" >>/.root/etc/sysconfig/modules
+ done )
+
}
do_mount_iso() {
@@ -172,8 +199,48 @@
FILE=${DEVICE#*:}
DEVICE=${DEVICE%%:*}
mkdir /.tmpfs/.partition
- mount -n -t "$rootfstype" -o "$rootflags" "$DEVICE" /.tmpfs/.partition
- /sbin/losetup /dev/loop3 "/.tmpfs/.partition/$FILE"
+ while [ ! -b "$DEVICE" ] ; do
+ cat <<EOF
+
+The device ${DEVICE}, which is supposed to contain a file
+with the ISO9660 image of the LFS LiveCD, does not exist.
+Please fix this problem and exit this shell.
+
+EOF
+ problem
+ done
+ if ! mount -n -t "$rootfstype" -o "$rootflags" "$DEVICE"
/.tmpfs/.partition ; then
+ cat <<EOF
+
+Could not mount device ${DEVICE}
+(but it does exist, please mention this when asking for support).
+Sleeping forever. Please reboot and fix the kernel command line.
+
+Maybe you have put the ISO9660 image of the LiveCD onto a partition
+formatted with an unsupported file system?
+
+Or maybe filesystem type autodetection went wrong, in which case
+you should add rootfstype=... to the kernel command line.
+
+Available partitions:
+EOF
+ cat /proc/partitions
+ while true ; do sleep 10000 ; done
+ fi
+ if [ ! -f "/.tmpfs/.partition/$FILE" ] ; then
+ cat <<EOF
+
+The file ${FILE} does not exist on the device ${DEVICE}.
+Sleeping forever. Please reboot and fix the kernel command line.
+
+Maybe you have specified a wrong device or file name? Does the following
+list of files on the partition look right?
+EOF
+ ( cd /.tmpfs/.partition ; ls )
+ umount -n /.tmpfs/.partition
+ while true ; do sleep 10000 ; done
+ fi
+ losetup /dev/loop3 "/.tmpfs/.partition/$FILE"
ln -sf /dev/loop3 /dev/lfs-cd
do_mount_cd
}
@@ -188,13 +255,52 @@
mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
do_mount_iso
;;
+ /dev/*)
+ while [ ! -b "$root" ] ; do
+ cat <<EOF
+The device ${root}, which is supposed to contain the
+root file system, does not exist.
+Please fix this problem and exit this shell.
+
+EOF
+ problem
+ done
+ if ! mount -n -t "$rootfstype" -o "$rootflags" "$root" /.root ;
then
+ cat <<EOF
+
+Could not mount device ${root}
+Sleeping forever. Please reboot and fix the kernel command line.
+
+Maybe the device is formatted with an unsupported file system?
+
+Or maybe filesystem type autodetection went wrong, in which case
+you should add the rootfstype=... parameter to the kernel command line.
+
+Available partitions:
+EOF
+ cat /proc/partitions
+ while true ; do sleep 10000 ; done
+ fi
+ ;;
*:*)
( IFS=":" ; mknod /dev/root b $root )
- mount -n -t "$rootfstype" -o "$rootflags" /dev/root /.root
+ if ! mount -n -t "$rootfstype" -o "$rootflags" /dev/root /.root
; then
+ cat <<EOF
+
+Could not mount device $root
+Sleeping forever. Please reboot and fix the kernel command line.
+
+Maybe the device is formatted with an unsupported file system?
+
+Or maybe filesystem type autodetection went wrong, in which case
+you should add the rootfstype=... parameter to the kernel command line.
+
+Available partitions:
+EOF
+ cat /proc/partitions
+ while true ; do sleep 10000 ; done
+ fi
;;
- /dev/*)
- mount -n -t "$rootfstype" -o "$rootflags" "$root" /.root
- ;;
"")
mkdir /.tmpfs
mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
@@ -243,6 +349,9 @@
rootfstype=*)
rootfstype=${param#rootfstype=}
;;
+ rootflags=*)
+ rootflags=${param#rootflags=}
+ ;;
ro)
ro="ro"
;;
@@ -278,7 +387,6 @@
echo "blacklist $drv" >>/etc/modprobe.conf
done
echo "install ata_piix /sbin/modprobe piix ; /sbin/modprobe -i
ata_piix" >>/etc/modprobe.conf
- echo "blacklist ata_generic" >>/etc/modprobe.conf
;;
1)
for driver in /lib/modules/`uname
-r`/kernel/drivers/ide/pci/*.ko ; do
@@ -310,22 +418,25 @@
if [ "$all_generic_ide" = 1 ] ; then
echo "options generic all_generic_ide=1" >>/etc/modprobe.conf
echo "options ata-generic all_generic_ide=1" >>/etc/modprobe.conf
-else
- if [ "$PATA" = 0 ] ; then
- echo "blacklist generic" >>/etc/modprobe.conf
- else
- echo "blacklist ata-generic" >>/etc/modprobe.conf
- fi
fi
-/sbin/udevd --daemon
+udevd --daemon
( IFS="," ; for module in $load ; do
- /sbin/modprobe "$module"
+ modprobe "$module"
done )
-/sbin/udevtrigger
-/sbin/udevsettle
+udevtrigger
+udevsettle
+if [ "$all_generic_ide" = 1 ] ; then
+ if [ "$PATA" = 0 ] ; then
+ modprobe generic
+ else
+ modprobe ata_generic
+ fi
+ udevsettle
+fi
+
if [ -n "$rootdelay" ] ; then sleep "$rootdelay" ; fi
[ "$noresume" = 0 ] && do_resume
Modified: branches/minimal/packages/jhalfs/configuration
===================================================================
--- branches/minimal/packages/jhalfs/configuration 2007-09-26 12:38:20 UTC
(rev 2077)
+++ branches/minimal/packages/jhalfs/configuration 2007-09-26 12:52:49 UTC
(rev 2078)
@@ -18,7 +18,7 @@
WORKING_COPY=y
# BRANCH is not set
BRANCH_ID=""
-BOOK="/usr/share/LFS-BOOK-SVN-XML"
+BOOK="/usr/share/LFS-BOOK-6.3-XML"
# ARCH_X86 is not set
# ARCH_MIPS is not set
# ARCH_PPC is not set
Modified: branches/minimal/packages/linux/Makefile
===================================================================
--- branches/minimal/packages/linux/Makefile 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/linux/Makefile 2007-09-26 12:52:49 UTC (rev
2078)
@@ -39,6 +39,12 @@
URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8)
SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
+DIR9=rtl-mac80211-20070729
+FILE9= $(DIR9).tar.bz2
+URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9)
+SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953
+
+
# Targets
include $(ROOT)/scripts/functions
@@ -47,7 +53,7 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1)
$(std_build)
compile-stage2:
@@ -61,8 +67,14 @@
make
make modules_install
cp -v arch/i386/boot/bzImage /boot/isolinux/linux
- tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
+ # both rtl8187 and rt2x00 build eeprom_93cx6.ko and thus conflict
+ # so we have to hack the build
+ tar xf ../$(FILE7) ; tar xf ../$(FILE9) ; cd $(DIR7) ; \
+ cp ../../config.rt2x00 config ; cp ../$(DIR9)/rtl* . ; \
+ sed -i 's@"eeprom_93cx6.h"@<linux/eeprom_93cx6.h>@' rtl8187_dev.c ;
\
sed -i '/depmod/d' Makefile ; \
+ echo "obj-m += rtl8187.o" >>Makefile ; \
+ echo "rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o" >>Makefile ;
\
patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \
make KERNDIR=`pwd`/.. install
tar xf ../$(FILE8) ; cd $(DIR8) ; \
@@ -71,8 +83,9 @@
make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/..
DESTDIR=`pwd`/DESTDIR-tools install-tools ; \
cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ;
cd .. ; \
cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz .
+ rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9)
+ ../debian-style-headers.sh
mv *.tgz /drivers
- cd .. ; ./debian-style-headers.sh $(DIR)
clean:
-rm -rf $(DIR)
Modified: branches/minimal/packages/linux/config.x86
===================================================================
--- branches/minimal/packages/linux/config.x86 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/linux/config.x86 2007-09-26 12:52:49 UTC (rev
2078)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.2
-# Wed Aug 15 17:47:27 2007
+# Linux kernel version: 2.6.22.5
+# Sat Sep 22 17:26:17 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -362,8 +362,6 @@
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_ASK_IP_FIB_HASH is not set
-# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
@@ -383,12 +381,6 @@
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
@@ -405,19 +397,40 @@
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
-# CONFIG_NF_CONNTRACK_ENABLED is not set
-# CONFIG_NF_CONNTRACK is not set
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
CONFIG_NETFILTER_XT_MATCH_DCCP=m
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -427,6 +440,7 @@
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -435,6 +449,8 @@
#
# IP: Netfilter Configuration
#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -449,12 +465,30 @@
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_TIPC is not set
@@ -627,6 +661,7 @@
CONFIG_NL80211=y
CONFIG_WIRELESS_EXT=y
CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUG is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
@@ -659,7 +694,16 @@
#
# Parallel port support
#
-# CONFIG_PARPORT is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
#
# Plug and Play support
@@ -680,6 +724,36 @@
#
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_XD is not set
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_BPCK6=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
CONFIG_CISS_SCSI_TAPE=y
@@ -732,7 +806,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=y
+# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_IDEPCI_PCIBUS_ORDER is not set
@@ -870,6 +944,10 @@
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
CONFIG_SCSI_NCR53C406A=m
CONFIG_SCSI_STEX=m
CONFIG_SCSI_SYM53C8XX_2=m
@@ -1007,7 +1085,8 @@
CONFIG_FUSION_FC=m
CONFIG_FUSION_SAS=m
CONFIG_FUSION_MAX_SGE=128
-# CONFIG_FUSION_CTL is not set
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
#
# IEEE 1394 (FireWire) support
@@ -1171,6 +1250,10 @@
CONFIG_VIA_RHINE_MMIO=y
CONFIG_VIA_RHINE_NAPI=y
CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
CONFIG_NETDEV_1000=y
CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -1302,6 +1385,7 @@
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
+CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
@@ -1311,9 +1395,12 @@
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
CONFIG_SLHC=m
-# CONFIG_NET_FC is not set
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_NET_FC=y
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
@@ -1393,6 +1480,7 @@
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=m
# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
@@ -1425,6 +1513,10 @@
CONFIG_SERIAL_JSM=m
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+# CONFIG_TIPAR is not set
#
# IPMI
@@ -1468,7 +1560,7 @@
#
# PCMCIA character devices
#
-# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYNCLINK_CS=m
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_MWAVE is not set
@@ -1632,8 +1724,10 @@
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
#
# ISA devices
@@ -1858,6 +1952,7 @@
#
# USB port drivers
#
+# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
@@ -1951,7 +2046,8 @@
#
# LED devices
#
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
#
# LED drivers
@@ -1960,6 +2056,10 @@
#
# LED Triggers
#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
#
# InfiniBand support
@@ -2007,6 +2107,11 @@
#
#
+# Auxiliary Display support
+#
+# CONFIG_KS0108 is not set
+
+#
# Virtualization
#
# CONFIG_KVM is not set
Modified: branches/minimal/packages/linux/debian-style-headers.sh
===================================================================
--- branches/minimal/packages/linux/debian-style-headers.sh 2007-09-26
12:38:20 UTC (rev 2077)
+++ branches/minimal/packages/linux/debian-style-headers.sh 2007-09-26
12:52:49 UTC (rev 2078)
@@ -1,25 +1,29 @@
#!/bin/sh
-SRCDIR="$1"
-KVERSION=`grep UTS_RELEASE "$SRCDIR/include/linux/utsrelease.h" | cut -d '"'
-f 2`
+KVERSION=`grep UTS_RELEASE include/linux/utsrelease.h | cut -d '"' -f 2`
DSTDIR=/usr/src/linux-$KVERSION
-echo $SRCDIR $DSTDIR
-
rm -rf "$DSTDIR"
mkdir "$DSTDIR"
-cp -rv "$SRCDIR/.config" "$SRCDIR/Makefile" "$SRCDIR/Module.symvers" "$DSTDIR"
-cp -rv "$SRCDIR/.kconfig.d" "$SRCDIR/.version" "$SRCDIR/.kernelrelease"
"$DSTDIR"
-cp -rv "$SRCDIR/include" "$SRCDIR/scripts" "$DSTDIR"
-( cd "$SRCDIR" ; find -type d ) | (
- while read dir ; do
- mkdir -p "$DSTDIR/$dir"
- done )
-( cd "$SRCDIR" ; find -type f -a '(' -name Kconfig\* \
- -o -name Makefile\* -o -name \*.s ')' ) | (
- cd "$SRCDIR"
+cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease
scripts "$DSTDIR"
+mkdir -p "$DSTDIR/include"
+find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}'
"$DSTDIR/include"
+cp -r include/asm-{i386,x86_64,generic} "$DSTDIR/include"
+find . -type f -a '(' -name Kconfig\* \
+ -o -name Makefile\* -o -name \*.s ')' | (
while read file ; do
- cp -v "$file" "$DSTDIR/$file"
+ case "$file" in
+
./arch/i386*|./include/asm-generic*|./include/asm-i386*|./include/asm-x86_64*)
+ mkdir -p "$DSTDIR/`dirname $file`"
+ cp "$file" "$DSTDIR/$file"
+ ;;
+ ./arch/*|./include/asm-*)
+ ;;
+ *)
+ mkdir -p "$DSTDIR/`dirname $file`"
+ cp "$file" "$DSTDIR/$file"
+ ;;
+ esac
done )
ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/source"
ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/build"
Modified: branches/minimal/packages/linux64/Makefile
===================================================================
--- branches/minimal/packages/linux64/Makefile 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/linux64/Makefile 2007-09-26 12:52:49 UTC (rev
2078)
@@ -46,6 +46,12 @@
CROSS_MAKE= make
endif
+DIR9=rtl-mac80211-20070729
+FILE9= $(DIR9).tar.bz2
+URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9)
+SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953
+
+
# Targets
include $(ROOT)/scripts/functions
@@ -54,7 +60,7 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1)
$(std_build)
compile-stage2:
@@ -67,8 +73,14 @@
cp ../config.x86_64 .config
$(CROSS_MAKE)
$(CROSS_MAKE) modules_install
- tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
+ # both rtl8187 and rt2x00 build eeprom_93cx6.ko and thus conflict
+ # so we have to hack the build
+ tar xf ../$(FILE7) ; tar xf ../$(FILE9) ; cd $(DIR7) ; \
+ cp ../../config.rt2x00 config ; cp ../$(DIR9)/rtl* . ; \
+ sed -i 's@"eeprom_93cx6.h"@<linux/eeprom_93cx6.h>@' rtl8187_dev.c ;
\
sed -i '/depmod/d' Makefile ; \
+ echo "obj-m += rtl8187.o" >>Makefile ; \
+ echo "rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o" >>Makefile ;
\
patch -Np0 -i ../../$(PATCH2) ; \
$(CROSS_MAKE) KERNDIR=`pwd`/.. ; \
$(CROSS_MAKE) KERNDIR=`pwd`/.. install
@@ -88,9 +100,12 @@
cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ;
cd .. ; \
cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz .
cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux
+ rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9)
+ ../debian-style-headers.sh
endif
mv *.tgz /drivers
+
clean:
-rm -rf $(DIR)
-rm -f fakes-for-fglrx/{uname,cat}
Modified: branches/minimal/packages/linux64/config.x86_64
===================================================================
--- branches/minimal/packages/linux64/config.x86_64 2007-09-26 12:38:20 UTC
(rev 2077)
+++ branches/minimal/packages/linux64/config.x86_64 2007-09-26 12:52:49 UTC
(rev 2078)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.2
-# Wed Aug 15 17:47:27 2007
+# Linux kernel version: 2.6.22.5
+# Mon Sep 17 18:40:16 2007
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -303,8 +303,6 @@
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_ASK_IP_FIB_HASH is not set
-# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
@@ -324,12 +322,6 @@
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
@@ -350,7 +342,7 @@
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
CONFIG_NF_CONNTRACK_AMANDA=m
@@ -609,6 +601,7 @@
CONFIG_NL80211=y
CONFIG_WIRELESS_EXT=y
CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUG is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
@@ -641,7 +634,16 @@
#
# Parallel port support
#
-# CONFIG_PARPORT is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
#
# Plug and Play support
@@ -658,6 +660,35 @@
# Block devices
#
CONFIG_BLK_DEV_FD=m
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
CONFIG_CISS_SCSI_TAPE=y
@@ -710,7 +741,7 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=y
+# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_IDEPCI_PCIBUS_ORDER is not set
@@ -836,6 +867,10 @@
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
CONFIG_SCSI_STEX=m
CONFIG_SCSI_SYM53C8XX_2=m
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
@@ -948,8 +983,8 @@
CONFIG_FUSION_FC=m
CONFIG_FUSION_SAS=m
CONFIG_FUSION_MAX_SGE=128
-# CONFIG_FUSION_CTL is not set
-# CONFIG_FUSION_LAN is not set
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
#
# IEEE 1394 (FireWire) support
@@ -1082,6 +1117,10 @@
CONFIG_VIA_RHINE_MMIO=y
CONFIG_VIA_RHINE_NAPI=y
CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
CONFIG_NETDEV_1000=y
CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -1211,6 +1250,7 @@
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
+CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
@@ -1220,8 +1260,11 @@
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
CONFIG_NET_FC=y
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
@@ -1298,6 +1341,7 @@
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=m
# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
@@ -1331,6 +1375,10 @@
CONFIG_SERIAL_JSM=m
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+# CONFIG_TIPAR is not set
#
# IPMI
@@ -1365,7 +1413,7 @@
#
# PCMCIA character devices
#
-# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYNCLINK_CS=m
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_MWAVE is not set
@@ -1522,8 +1570,10 @@
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
#
# PCI devices
@@ -1708,6 +1758,7 @@
#
# USB port drivers
#
+# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
@@ -1801,7 +1852,8 @@
#
# LED devices
#
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
#
# LED drivers
@@ -1810,6 +1862,10 @@
#
# LED Triggers
#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
#
# InfiniBand support
@@ -1858,6 +1914,11 @@
#
#
+# Auxiliary Display support
+#
+# CONFIG_KS0108 is not set
+
+#
# Virtualization
#
# CONFIG_KVM is not set
@@ -1883,7 +1944,7 @@
# CONFIG_JBD_DEBUG is not set
CONFIG_JBD2=m
# CONFIG_JBD2_DEBUG is not set
-CONFIG_REISER4_FS=m
+CONFIG_REISER4_FS=m
# CONFIG_REISER4_DEBUG is not set
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
Copied: branches/minimal/packages/linux64/debian-style-headers.sh (from rev
2077, trunk/packages/linux64/debian-style-headers.sh)
===================================================================
--- branches/minimal/packages/linux64/debian-style-headers.sh
(rev 0)
+++ branches/minimal/packages/linux64/debian-style-headers.sh 2007-09-26
12:52:49 UTC (rev 2078)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+KVERSION=`grep UTS_RELEASE include/linux/utsrelease.h | cut -d '"' -f 2`
+DSTDIR=/usr/src/linux-$KVERSION
+
+rm -rf "$DSTDIR"
+mkdir "$DSTDIR"
+cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease
scripts "$DSTDIR"
+mkdir -p "$DSTDIR/include"
+find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}'
"$DSTDIR/include"
+cp -r include/asm-{i386,x86_64,generic} "$DSTDIR/include"
+find . -type f -a '(' -name Kconfig\* \
+ -o -name Makefile\* -o -name \*.s ')' | (
+ while read file ; do
+ case "$file" in
+
./arch/x86_64*|./include/asm-generic*|./include/asm-i386*|./include/asm-x86_64*)
+ mkdir -p "$DSTDIR/`dirname $file`"
+ cp "$file" "$DSTDIR/$file"
+ ;;
+ ./arch/*|./include/asm-*)
+ ;;
+ *)
+ mkdir -p "$DSTDIR/`dirname $file`"
+ cp "$file" "$DSTDIR/$file"
+ ;;
+ esac
+ done )
+ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/source"
+ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/build"
Modified: branches/minimal/packages/livecd-bootscripts/langconf
===================================================================
--- branches/minimal/packages/livecd-bootscripts/langconf 2007-09-26
12:38:20 UTC (rev 2077)
+++ branches/minimal/packages/livecd-bootscripts/langconf 2007-09-26
12:52:49 UTC (rev 2078)
@@ -87,9 +87,13 @@
done <$FONTDB
# If UTF-8 locale is used, drop any "-m" flag
+ # and select a font with Euro, if appropriate
case "$F_LANG" in
*.UTF-8)
F_FONT=${F_FONT% -m*}
+ if [ "$F_FONT" = "lat1-16" ] ; then
+ F_FONT=lat0-16
+ fi
;;
esac
}
@@ -105,8 +109,7 @@
If you don't need to convert your keymap to UTF-8 (e.g. because it
is already in UTF-8, or because you don't want UTF-8), don't fill in
that field.
-\n\nIn order to enhance Unicode coverage of the Linux console at the
-cost of unavailable bright colors, use the LatArCyrHeb-16 font.\" 0 0 6 \
+\" 0 0 6 \
\"Locale:\" 1 1 \"$F_LANG\" 1 30 40 0 \
\"Console keymap:\" 2 1 \"$F_KEYMAP\" 2 30 40 0 \
\" autoconverted from charset:\" 3 1 \"$F_LEGACYCHARSET\" 3 30 40 0 \
Modified: branches/minimal/packages/lynx/Makefile
===================================================================
--- branches/minimal/packages/lynx/Makefile 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/lynx/Makefile 2007-09-26 12:52:49 UTC (rev
2078)
@@ -27,7 +27,8 @@
make docdir=/usr/share/doc/$(NM)-$(VRS)/doc \
helpdir=/usr/share/doc/$(NM)-$(VRS)/help install-full
chgrp -R root /usr/share/doc/$(NM)-$(VRS)/doc
- sed -i 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' /etc/lynx.cfg
+ sed -i -e 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' \
+ -e 's/#DEFAULT_EDITOR:/DEFAULT_EDITOR:vi/' /etc/lynx.cfg
clean:
-rm -rf $(DIR)
Modified: branches/minimal/packages/module-init-tools/Makefile
===================================================================
--- branches/minimal/packages/module-init-tools/Makefile 2007-09-26
12:38:20 UTC (rev 2077)
+++ branches/minimal/packages/module-init-tools/Makefile 2007-09-26
12:52:49 UTC (rev 2078)
@@ -28,9 +28,7 @@
./configure --prefix=/ --enable-zlib
make
make install
- echo 'blacklist 8139cp' >/etc/modprobe.conf
- echo 'blacklist eth1394' >>/etc/modprobe.conf
- echo 'blacklist sk98lin' >>/etc/modprobe.conf
+ install -m644 $(ROOT)/etc/modprobe.conf /etc/modprobe.conf
clean:
-rm -rf $(DIR)
Copied: branches/minimal/packages/multipath-tools (from rev 2077,
trunk/packages/multipath-tools)
Modified: branches/minimal/packages/udev/Makefile
===================================================================
--- branches/minimal/packages/udev/Makefile 2007-09-26 12:38:20 UTC (rev
2077)
+++ branches/minimal/packages/udev/Makefile 2007-09-26 12:52:49 UTC (rev
2078)
@@ -34,13 +34,14 @@
ln -nsfv /proc/self/fd/1 /lib/udev/devices/stdout
ln -nsfv /proc/self/fd/2 /lib/udev/devices/stderr
ln -nsfv /proc/kcore /lib/udev/devices/core
- rm -rf extras/dasd_id
make EXTRAS="`echo extras/*/`"
make DESTDIR=/ EXTRAS="`echo extras/*/`" install
cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/
+ sed -i "s/ -M 0640//" $(CONFDIR)/25-lfs.rules
cd $(CONFDIR) ; make install install-doc install-extra-doc
install -m755 ../dhcp-helper /lib/udev
install -m644 ../76-network.rules /etc/udev/rules.d/
+ echo 'SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '\''while
read id; do /sbin/modprobe pnp:d$$$$id; done < /sys$$devpath/id'\''"'
>>/etc/udev/rules.d/26-modprobe.rules
install -m644 -D docs/writing_udev_rules/index.html \
/usr/share/doc/$(DIR)/index.html
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
