Author: alexander
Date: 2007-10-14 05:32:56 -0600 (Sun, 14 Oct 2007)
New Revision: 2113
Added:
branches/minimal/packages/Markdown/
branches/minimal/packages/SmartyPants/
branches/minimal/packages/alsa-firmware/
branches/minimal/packages/alsa-lib/
branches/minimal/packages/alsa-utils/
branches/minimal/packages/dotconf/
branches/minimal/packages/espeak/
branches/minimal/packages/livecd-bootscripts/speakup
branches/minimal/packages/livecd-bootscripts/speakup-restart
branches/minimal/packages/speech-dispatcher/
branches/minimal/packages/speechd-up/
branches/minimal/packages/syslinux/split-boot-help
Removed:
branches/minimal/etc/ld.so.conf-x86_64
branches/minimal/isolinux/options1.msg
branches/minimal/isolinux/options2.msg
branches/minimal/isolinux/options3.msg
branches/minimal/isolinux/options4.msg
Modified:
branches/minimal/Makefile
branches/minimal/etc/bashrc
branches/minimal/etc/ld.so.conf
branches/minimal/isolinux/boot.msg
branches/minimal/isolinux/isolinux.cfg
branches/minimal/packages/brltty/Makefile
branches/minimal/packages/initramfs/init.in
branches/minimal/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
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/linux64/debian-style-headers.sh
branches/minimal/packages/livecd-bootscripts/Makefile
branches/minimal/packages/livecd-bootscripts/brltty
branches/minimal/packages/perl/Makefile
branches/minimal/packages/syslinux/Makefile
branches/minimal/packages/unzip/Makefile
Log:
Merged all relevant changes from trunk since r2052.
Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile 2007-10-14 11:00:23 UTC (rev 2112)
+++ branches/minimal/Makefile 2007-10-14 11:32:56 UTC (rev 2113)
@@ -272,16 +272,19 @@
ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml
ch-libxslt \
ch-docbook-xsl ch-html_tidy ch-LFS-BOOK \
ch-inputattach ch-openssh ch-glib2 ch-gc ch-w3m ch-lftp \
+ ch-alsa-lib ch-alsa-utils ch-alsa-firmware \
ch-cvs ch-popt ch-samba ch-pciutils ch-libusb ch-usbutils ch-parted \
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-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-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
+ ch-espeak ch-dotconf ch-speech-dispatcher ch-speechd-up ch-brltty \
ch-strace ch-iptables ch-eject ch-hdparm \
ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \
- ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \
+ ch-blfs-bootscripts ch-oui-data ch-Markdown ch-SmartyPants \
+ 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-linux32
ifeq ($(CD_ARCH),x86)
@@ -389,15 +392,11 @@
@>$(MP)/var/log/btmp
@>$(MP)/var/log/wtmp
@>$(MP)/var/log/lastlog
- @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss}
$(MP)/boot/isolinux
-ifeq ($(CD_ARCH),x86_64)
- @sed -i -e '/linux64/d' -e 's/ 32-bit//'
$(MP)/boot/isolinux/options?.msg
- @sed -i '/linux64/,$$d' $(MP)/boot/isolinux/isolinux.cfg
-endif
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue*
+ @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/boot/isolinux/boot.msg
+ @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/etc/issue*
@install -m644 doc/lfscd-remastering-howto.txt $(MP)/root
- @sed "s/\[version\]/$(VERSION)/" doc.README.txt >$(MP)/root/README.txt
+ @sed -e 's/\[version\]/$(VERSION)/' -e 's/\\_/_/g' \
+ doc/README.txt >$(MP)/root/README.txt
@install -m600 root/.bashrc $(MP)/root/.bashrc
@install -m755 scripts/{net-setup,greeting,livecd-login} $(MP)/usr/bin/
@sed s/@LINKER@/$(LINKER)/ scripts/shutdown-helper.in
>$(MP)/usr/bin/shutdown-helper
@@ -406,10 +405,17 @@
iso: prepiso
@make unmount
- # FIXME: sometimes e2fsck bombs out even after a clean build.
- # Kernel bug?
+ # Bug in old kernels requires a sync after unmounting the loop device
+ # for data integrity.
@sync ; sleep 1 ; sync
+ # e2fsck optimizes directories and returns 1 after a clean build.
+ # This is not a bug.
@-e2fsck -f -p root.ext2
+ @( LC_ALL=C ; export LC_ALL ; \
+ cat $(ROOT)/doc/README.html.head ; \
+ sed 's/\[version\]/$(VERSION)/' $(ROOT)/doc/README.txt | \
+ $(WD)/bin/Markdown --html4tags | $(WD)/bin/SmartyPants ; \
+ cat $(ROOT)/doc/README.html.tail ) >$(MPBASE)/iso/README.html
@$(WD)/bin/mkzftree -F root.ext2 $(MPBASE)/iso/root.ext2
@cd $(MPBASE)/iso ; $(WD)/bin/mkisofs -z -R -l --allow-leading-dots -D
-o \
$(MPBASE)$(ROOT)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin
\
Modified: branches/minimal/etc/bashrc
===================================================================
--- branches/minimal/etc/bashrc 2007-10-14 11:00:23 UTC (rev 2112)
+++ branches/minimal/etc/bashrc 2007-10-14 11:32:56 UTC (rev 2113)
@@ -2,28 +2,16 @@
alias ll='ls -l'
eval $(dircolors -b /etc/dircolors)
-# Colors for PS1
-RED="\[\033[0;31m\]"
-GREEN="\[\033[0;32m\]"
-ORANGE="\[\033[0;33m\]"
-WHITE="\[\033[00m\]"
-
-case $TERM in
- xterm*)
- BOLD=$WHITE ;;
- *)
- BOLD="\[\033[0;1m\]" ;;
-esac
-
-# Prompt
-if [ $EUID -eq 0 ] ; then
- PS1="$BOLD\h:$RED\u | $BOLD\D{%c} $RED| \w$WHITE\n$BOLD\\$ $WHITE"
+# Setup a red prompt for root and a green one for users.
+NORMAL="\[\e[0m\]"
+RED="\[\e[1;31m\]"
+GREEN="\[\e[1;32m\]"
+if [[ $EUID == 0 ]] ; then
+ PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
else
- PS1="$BOLD\h:$GREEN\u | $BOLD\D{%c} $GREEN| \w$WHITE\n$BOLD\\$ $WHITE"
+ PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
fi
-export PS1
-
if [ "`locale charmap 2>/dev/null`" = "UTF-8" ]
then
stty iutf8
Modified: branches/minimal/etc/ld.so.conf
===================================================================
--- branches/minimal/etc/ld.so.conf 2007-10-14 11:00:23 UTC (rev 2112)
+++ branches/minimal/etc/ld.so.conf 2007-10-14 11:32:56 UTC (rev 2113)
@@ -2,6 +2,5 @@
/usr/local/lib
/opt/lib
-/usr/X11R6/lib
# End /etc/ld.so.conf
Deleted: branches/minimal/etc/ld.so.conf-x86_64
===================================================================
--- branches/minimal/etc/ld.so.conf-x86_64 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/etc/ld.so.conf-x86_64 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,9 +0,0 @@
-# Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib64
-/opt/lib
-/opt/lib64
-/usr/X11R6/lib64
-
-# End /etc/ld.so.conf
Modified: branches/minimal/isolinux/boot.msg
===================================================================
--- branches/minimal/isolinux/boot.msg 2007-10-14 11:00:23 UTC (rev 2112)
+++ branches/minimal/isolinux/boot.msg 2007-10-14 11:32:56 UTC (rev 2113)
@@ -1,5 +1,5 @@
splash.lss
07This is the Official LFS LiveCD, Version:
-07Press [Enter] to boot, F1 - F4 for available options
+07Press [Enter] to boot, F1 - F10 for available options
Modified: branches/minimal/isolinux/isolinux.cfg
===================================================================
--- branches/minimal/isolinux/isolinux.cfg 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/isolinux/isolinux.cfg 2007-10-14 11:32:56 UTC (rev
2113)
@@ -2,10 +2,16 @@
prompt 1
timeout 600
display boot.msg
-F1 options1.msg
-F2 options2.msg
-F3 options3.msg
-F4 options4.msg
+F1 F1.txt
+F2 F2.txt
+F3 F3.txt
+F4 F4.txt
+F5 F5.txt
+F6 F6.txt
+F7 F7.txt
+F8 F8.txt
+F9 F9.txt
+F10 F10.txt
label linux
kernel linux
Deleted: branches/minimal/isolinux/options1.msg
===================================================================
--- branches/minimal/isolinux/options1.msg 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/isolinux/options1.msg 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 1 of 4]:
-
-TZ=[timezone]
- Examples: TZ=EDT-4 TZ=America/New_York
-
- The first example means that the timezone is named "EDT"
- and is 4 hours behind (west) of UTC.
-
-UTC=[0,1]
- Use UTC=1 if the hardware clock is set to UTC or
- use UTC=0 (default) if the hardware clock is set to local time.
-
-LANG=[locale]
- Example: LANG=fr_FR.UTF-8
-
- If you don't specify your timezone or locale at the boot prompt,
- a configuration dialog will appear later during boot.
-
-nodhcp
- Prevents the CD from attempting to obtain an IP address automatically.
- May be required for wireless networking, because the WEP or WPA key
- needs to be set up first.
-
Deleted: branches/minimal/isolinux/options2.msg
===================================================================
--- branches/minimal/isolinux/options2.msg 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/isolinux/options2.msg 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 2 of 4]:
-
-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.
-
-rootdelay=X
- Waits X seconds before attempting to find the CD. Required (with X=20)
- for booting from USB or FireWire CD-ROMs.
-
-all_generic_ide
- Attempts to support unknown PCI IDE and SATA controllers (slow).
- For SATA support to work with this option, the SATA controller
- must be put into "Legacy" (as opposed to "Native") mode in the BIOS.
-
-resume=/dev/XXX
- Uses /dev/XXX for software suspending (AKA hibernation) and resuming.
- See /root/README for details.
-
-debug
- Causes kernel messages to appear on the screen.
Deleted: branches/minimal/isolinux/options3.msg
===================================================================
--- branches/minimal/isolinux/options3.msg 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/isolinux/options3.msg 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 3 of 4]:
-pata
- Uses new libata-based drivers for IDE controllers. This option may be
- required for controller detection or recommended for optimal performance
- on computers manufactured in year 2006 and later.
-
- Caution: new drivers are safe to use only with IDE chipsets from AMD, Intel,
- ITE, JMicron, Marvell, Netcell, NVIDIA, Serverworks, Promise, Silicon Image,
- VIA, or Winbond. Drivers for other chipsets are likely to contain bugs that
- lead to data loss.
-
-load=module1,module2,...
- Loads the specified modules unconditionally from initramfs. Use if your SCSI
- or IDE controller is not autodetected. If you don't specify this parameter
- and the CD doesn't detect your SCSI or IDE controller, you will be dropped
- into a debugging shell where you can load the needed module manually.
-
-blacklist=module1,module2,...
- Prevents the specified modules from being autoloaded.
-
-module.option=value
- Sets arbitrary module options.
-
Deleted: branches/minimal/isolinux/options4.msg
===================================================================
--- branches/minimal/isolinux/options4.msg 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/isolinux/options4.msg 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 4 of 4]:
-new_firewire
- Uses the new FireWire stack.
-
-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.
-
-brltty=drv[,dev[,tbl]]
- Example: brltty=bm,usb:
- Enables a refreshable Braille display supported by driver drv, connected to
- device dev, with a translation table tbl. The example specifies a BAUM
- SuperVario 40 Braille display connected by USB with default Braille table.
-
-vga=[resolution]
- Examples:
- vga=795 (1280x1024x24) vga=792 (1024x768x24) vga=789 (800x600x24)
- vga=794 (1280x1024x16) vga=791 (1024x768x16) vga=788 (800x600x16)
-
- Enables the framebuffer console.
-
-
Copied: branches/minimal/packages/Markdown (from rev 2112,
trunk/packages/Markdown)
Copied: branches/minimal/packages/SmartyPants (from rev 2112,
trunk/packages/SmartyPants)
Copied: branches/minimal/packages/alsa-firmware (from rev 2112,
trunk/packages/alsa-firmware)
Copied: branches/minimal/packages/alsa-lib (from rev 2112,
trunk/packages/alsa-lib)
Copied: branches/minimal/packages/alsa-utils (from rev 2112,
trunk/packages/alsa-utils)
Modified: branches/minimal/packages/brltty/Makefile
===================================================================
--- branches/minimal/packages/brltty/Makefile 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/brltty/Makefile 2007-10-14 11:32:56 UTC (rev
2113)
@@ -22,8 +22,7 @@
compile-stage2:
# Do we want this?
# sed -i 's/usb_object="linux"/usb_object="libusb"/' configure
- ./configure --prefix=/usr --sysconfdir=/etc --disable-speech-support \
- --disable-api
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-api
make
make install
Copied: branches/minimal/packages/dotconf (from rev 2112,
trunk/packages/dotconf)
Copied: branches/minimal/packages/espeak (from rev 2112, trunk/packages/espeak)
Modified: branches/minimal/packages/initramfs/init.in
===================================================================
--- branches/minimal/packages/initramfs/init.in 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/initramfs/init.in 2007-10-14 11:32:56 UTC (rev
2113)
@@ -334,7 +334,7 @@
new_firewire)
NEW_FIREWIRE=1
;;
- all_generic_ide)
+ all_generic_ide|all-generic-ide)
all_generic_ide=1
;;
init=*)
Modified:
branches/minimal/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
===================================================================
--- branches/minimal/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
2007-10-14 11:00:23 UTC (rev 2112)
+++ branches/minimal/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch
2007-10-14 11:32:56 UTC (rev 2113)
@@ -103,7 +103,7 @@
+ ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
+ ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
+ ln -sf ../init.d/console ${EXTDIR}/rc.d/rcsysinit.d/S70console
-+ ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rcsysinit.d/S80localnet
++ ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rcsysinit.d/S11localnet
+ if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m
${CONFMODE} lfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
+ install -m ${MODE} lfs/sysconfig/network-devices/ifup
${EXTDIR}/sysconfig/network-devices/
+ install -m ${MODE}
lfs/sysconfig/network-devices/ifdown ${EXTDIR}/sysconfig/network-devices/
Modified: branches/minimal/packages/linux/Makefile
===================================================================
--- branches/minimal/packages/linux/Makefile 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/linux/Makefile 2007-10-14 11:32:56 UTC (rev
2113)
@@ -34,16 +34,26 @@
URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7)
SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b
-DIR8= madwifi-0.9.3.2
-FILE8= $(DIR8).tar.bz2
-URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8)
-SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
+# The latest version from
+# http://ftp.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ath5k/
+# does not compile against linux-2.6.22. So here is an old SVN snapshot
+# from http://madwifi.org/
+DIR8= ath5k-r2701
+FILE8= $(DIR8).tar.gz
+URL-$(FILE8)= http://www.linuxfromscratch.org/~alexander/$(FILE8)
+SHA-$(FILE8)= d14a002ba192788881ca9a715348f8b7b898fe3c
+
DIR9=rtl-mac80211-20070729
FILE9= $(DIR9).tar.bz2
URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9)
SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953
+# Git snapshot - stable versions are incompatible with linux-2.6.22
+DIR10= speakup-20070928
+FILE10= $(DIR10).tar.gz
+URL-$(FILE10)= http://www.linuxfromscratch.org/~alexander/$(FILE10)
+SHA-$(FILE10)= 101a7fcae2cbf2dbad81d91ff7cb262d6857d104
# Targets
@@ -53,12 +63,13 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
$(FILE10) $(PATCH1)
$(std_build)
compile-stage2:
tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel
tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel
+ tar xf ../$(FILE10) ; cd $(DIR10) ; ./install-spkglue `pwd`/.. ;
./install-speakup `pwd`/..
zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
install -d /boot/isolinux
@@ -78,14 +89,9 @@
patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \
make KERNDIR=`pwd`/.. install
tar xf ../$(FILE8) ; cd $(DIR8) ; \
- make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. ; \
- make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/..
DESTDIR=`pwd`/DESTDIR-modules install-modules ; \
- 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)
+ make KDIR=`pwd`/.. ; make KDIR=`pwd`/.. install
+ rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9)
$(DIR10)
../debian-style-headers.sh
- mv *.tgz /drivers
clean:
-rm -rf $(DIR)
Modified: branches/minimal/packages/linux/config.x86
===================================================================
--- branches/minimal/packages/linux/config.x86 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/linux/config.x86 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.5
-# Sat Sep 22 17:26:17 2007
+# Fri Sep 28 20:25:12 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -1690,6 +1690,27 @@
CONFIG_LOGO_LINUX_CLUT224=y
#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=y
+CONFIG_SPEAKUP_CORE=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+
+#
# Sound
#
CONFIG_SOUND=m
Modified: branches/minimal/packages/linux/debian-style-headers.sh
===================================================================
--- branches/minimal/packages/linux/debian-style-headers.sh 2007-10-14
11:00:23 UTC (rev 2112)
+++ branches/minimal/packages/linux/debian-style-headers.sh 2007-10-14
11:32:56 UTC (rev 2113)
@@ -5,7 +5,7 @@
rm -rf "$DSTDIR"
mkdir "$DSTDIR"
-cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease
scripts "$DSTDIR"
+cp -r .config Makefile Module.symvers .version 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"
Modified: branches/minimal/packages/linux64/Makefile
===================================================================
--- branches/minimal/packages/linux64/Makefile 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/linux64/Makefile 2007-10-14 11:32:56 UTC (rev
2113)
@@ -1,5 +1,12 @@
# Linux Kernel Makefile
+ifeq ($(CD_ARCH),x86)
+CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
+endif
+ifeq ($(CD_ARCH),x86_64)
+CROSS_MAKE= make
+endif
+
NM= linux
VRS= 2.6.22.5
DIR= $(NM)-$(VRS)
@@ -34,23 +41,26 @@
URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7)
SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b
-DIR8= madwifi-0.9.3.2
-FILE8= $(DIR8).tar.bz2
-URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8)
-SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
+# The latest version from
+# http://ftp.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ath5k/
+# does not compile against linux-2.6.22. So here is an old SVN snapshot
+# from http://madwifi.org/
-ifeq ($(CD_ARCH),x86)
-CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
-endif
-ifeq ($(CD_ARCH),x86_64)
-CROSS_MAKE= make
-endif
+DIR8= ath5k-r2701
+FILE8= $(DIR8).tar.gz
+URL-$(FILE8)= http://www.linuxfromscratch.org/~alexander/$(FILE8)
+SHA-$(FILE8)= d14a002ba192788881ca9a715348f8b7b898fe3c
DIR9=rtl-mac80211-20070729
FILE9= $(DIR9).tar.bz2
URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9)
SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953
+# Git snapshot - stable versions are incompatible with linux-2.6.22
+DIR10= speakup-20070928
+FILE10= $(DIR10).tar.gz
+URL-$(FILE10)= http://www.linuxfromscratch.org/~alexander/$(FILE10)
+SHA-$(FILE10)= 101a7fcae2cbf2dbad81d91ff7cb262d6857d104
# Targets
@@ -60,12 +70,13 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
$(FILE10) $(PATCH1)
$(std_build)
compile-stage2:
tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel
tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel
+ tar xf ../$(FILE10) ; cd $(DIR10) ; ./install-spkglue `pwd`/.. ;
./install-speakup `pwd`/..
zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
install -d /boot/isolinux
@@ -84,30 +95,19 @@
patch -Np0 -i ../../$(PATCH2) ; \
$(CROSS_MAKE) KERNDIR=`pwd`/.. ; \
$(CROSS_MAKE) KERNDIR=`pwd`/.. install
+ tar xf ../$(FILE8) ; cd $(DIR8) ; \
+ make KDIR=`pwd`/.. ; make KDIR=`pwd`/.. install
ifeq ($(CD_ARCH),x86)
- tar xf ../$(FILE8) ; cd $(DIR8) ; \
- $(CROSS_MAKE) KERNELPATH=`pwd`/.. modules ; \
- $(CROSS_MAKE) KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules
install-modules ; \
- cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS)-64bit.tgz
.
rm /lib/modules/*-64bit/{source,build}
cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64
endif
ifeq ($(CD_ARCH),x86_64)
- tar xf ../$(FILE8) ; cd $(DIR8) ; \
- $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man
KERNELPATH=`pwd`/.. ; \
- $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man
KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \
- $(CROSS_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 .
cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux
- rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9)
+ rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9)
$(DIR10)
../debian-style-headers.sh
endif
- mv *.tgz /drivers
-
clean:
-rm -rf $(DIR)
- -rm -f fakes-for-fglrx/{uname,cat}
.PHONY: clean chroot compile-stage2
Modified: branches/minimal/packages/linux64/config.x86_64
===================================================================
--- branches/minimal/packages/linux64/config.x86_64 2007-10-14 11:00:23 UTC
(rev 2112)
+++ branches/minimal/packages/linux64/config.x86_64 2007-10-14 11:32:56 UTC
(rev 2113)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.5
-# Mon Sep 17 18:40:16 2007
+# Fri Sep 28 20:25:12 2007
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -1537,6 +1537,27 @@
CONFIG_LOGO_LINUX_CLUT224=y
#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=y
+CONFIG_SPEAKUP_CORE=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+
+#
# Sound
#
CONFIG_SOUND=m
Modified: branches/minimal/packages/linux64/debian-style-headers.sh
===================================================================
--- branches/minimal/packages/linux64/debian-style-headers.sh 2007-10-14
11:00:23 UTC (rev 2112)
+++ branches/minimal/packages/linux64/debian-style-headers.sh 2007-10-14
11:32:56 UTC (rev 2113)
@@ -5,7 +5,7 @@
rm -rf "$DSTDIR"
mkdir "$DSTDIR"
-cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease
scripts "$DSTDIR"
+cp -r .config Makefile Module.symvers .version 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"
Modified: branches/minimal/packages/livecd-bootscripts/Makefile
===================================================================
--- branches/minimal/packages/livecd-bootscripts/Makefile 2007-10-14
11:00:23 UTC (rev 2112)
+++ branches/minimal/packages/livecd-bootscripts/Makefile 2007-10-14
11:32:56 UTC (rev 2113)
@@ -3,7 +3,7 @@
# Targets
-SCRIPTS= clkconf langconf brltty brltty-restart
+SCRIPTS= clkconf langconf brltty brltty-restart speakup speakup-restart
DATA= font.dat font-errors.dat lang.dat
include $(ROOT)/scripts/functions
@@ -21,11 +21,14 @@
install -d -m755 /etc/langconf
install -m754 $(SCRIPTS) /etc/rc.d/init.d
install -m644 $(DATA) /etc/langconf
- ln -sf ../init.d/brltty /etc/rc.d/rcsysinit.d/S11brltty
+ ln -sf ../init.d/brltty /etc/rc.d/rcsysinit.d/S12brltty
+ ln -sf ../init.d/speakup /etc/rc.d/rcsysinit.d/S12speakup
ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf
ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf
# brltty has to be restarted in order to see the font change
+ # and speakup has to react to the language change
ln -sf ../init.d/brltty-restart /etc/rc.d/rcsysinit.d/S71brltty-restart
+ ln -sf ../init.d/speakup-restart
/etc/rc.d/rcsysinit.d/S71speakup-restart
clean:
Modified: branches/minimal/packages/livecd-bootscripts/brltty
===================================================================
--- branches/minimal/packages/livecd-bootscripts/brltty 2007-10-14 11:00:23 UTC
(rev 2112)
+++ branches/minimal/packages/livecd-bootscripts/brltty 2007-10-14 11:32:56 UTC
(rev 2113)
@@ -21,7 +21,9 @@
# in order to show cursor on selected items in menus
echo 'visit_items=ON' >>/etc/dialogrc
echo 'set braille_friendly=yes' >>/root/.muttrc
- sed -i 's/^#SHOW_CURSOR:FALSE/SHOW_CURSOR:TRUE/' /etc/lynx.cfg
+ sed -i -e 's/^#SHOW_CURSOR:FALSE/SHOW_CURSOR:TRUE/' \
+ -e
's/#\(DEFAULT_KEYPAD_MODE\):NUMBERS_AS_ARROWS/\1:LINKS_AND_FIELDS_ARE_NUMBERED/'
\
+ /etc/lynx.cfg
sed -i 's/^draw_arrow=OFF/draw_arrow=ON/' /etc/tin/tinrc
# FIXME: others
fi
Copied: branches/minimal/packages/livecd-bootscripts/speakup (from rev 2112,
trunk/packages/livecd-bootscripts/speakup)
===================================================================
--- branches/minimal/packages/livecd-bootscripts/speakup
(rev 0)
+++ branches/minimal/packages/livecd-bootscripts/speakup 2007-10-14
11:32:56 UTC (rev 2113)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+read SYNTH </sys/module/speakup/parameters/synth
+
+case "${1}" in
+ start)
+ if [ "$SYNTH" != "<NULL>" ] ; then
+ boot_mesg "Activating speakup..."
+ modprobe "speakup_$SYNTH" && udevsettle
+ evaluate_retval
+ if [ "$SYNTH" = "soft" ] ; then
+ boot_mesg "Starting software speech synthesizer..."
+ speech-dispatcher 2>/dev/null &&
+ speechd-up
+ evaluate_retval
+ fi
+ # Some applications need to be configured specially
+ # in order to show cursor on selected items in menus
+ echo 'visit_items=ON' >>/etc/dialogrc
+ echo 'set braille_friendly=yes' >>/root/.muttrc
+ sed -i -e 's/^#SHOW_CURSOR:FALSE/SHOW_CURSOR:TRUE/' \
+ -e
's/#\(DEFAULT_KEYPAD_MODE\):NUMBERS_AS_ARROWS/\1:LINKS_AND_FIELDS_ARE_NUMBERED/'
\
+ /etc/lynx.cfg
+ # FIXME: does not help
+ # sed -i 's/^draw_arrow=OFF/draw_arrow=ON/' /etc/tin/tinrc
+ # FIXME: others
+ fi
+ ;;
+ *)
+ echo "Usage: ${0} {start}"
+ exit 1
+ ;;
+esac
Copied: branches/minimal/packages/livecd-bootscripts/speakup-restart (from rev
2112, trunk/packages/livecd-bootscripts/speakup-restart)
===================================================================
--- branches/minimal/packages/livecd-bootscripts/speakup-restart
(rev 0)
+++ branches/minimal/packages/livecd-bootscripts/speakup-restart
2007-10-14 11:32:56 UTC (rev 2113)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+read SYNTH </sys/module/speakup/parameters/synth
+
+export LANG=`( . /etc/profile ; echo $LANG )`
+LL=${LANG%%_*}
+CHARMAP=`locale charmap`
+
+if [ "$CHARMAP" = "ANSI_X3.4-1968" ] ; then
+ CHARMAP="ISO-8859-1"
+fi
+
+case "${1}" in
+ start)
+ if [ "$SYNTH" = "soft" ] ; then
+ boot_mesg "Restarting software speech synthesizer..."
+ killproc /usr/bin/speechd-up >/dev/null 2>&1
+ killproc /usr/bin/speech-dispatcher >/dev/null 2>&1
+ sed -i "/DefaultLanguage/s/en/$LL/"
/etc/speech-dispatcher/speechd.conf
+ speech-dispatcher 2>/dev/null &&
+ /usr/bin/speechd-up -c "$CHARMAP"
+ evaluate_retval
+ fi
+ ;;
+ *)
+ echo "Usage: ${0} {start}"
+ exit 1
+ ;;
+esac
Modified: branches/minimal/packages/perl/Makefile
===================================================================
--- branches/minimal/packages/perl/Makefile 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/perl/Makefile 2007-10-14 11:32:56 UTC (rev
2113)
@@ -22,7 +22,7 @@
compile-stage1:
patch -Np1 -i ../$(PATCH1)
./configure.gnu --prefix=$(WD) \
- -Dstatic_ext='Data/Dumper Fcntl IO POSIX' \
+ -Dstatic_ext='Data/Dumper Digest/MD5 Fcntl IO POSIX' \
-Darchname=$${LFS_TARGET%%-*}-linux
make perl utilities
cp -v perl pod/pod2man $(WD)/bin
Copied: branches/minimal/packages/speech-dispatcher (from rev 2112,
trunk/packages/speech-dispatcher)
Copied: branches/minimal/packages/speechd-up (from rev 2112,
trunk/packages/speechd-up)
Modified: branches/minimal/packages/syslinux/Makefile
===================================================================
--- branches/minimal/packages/syslinux/Makefile 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/syslinux/Makefile 2007-10-14 11:32:56 UTC (rev
2113)
@@ -16,13 +16,18 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) split-boot-help $(ROOT)/doc/README.txt
$(std_build)
compile-stage2:
mkdir -p /boot/isolinux
cp -v isolinux.bin /boot/isolinux
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
+ ../split-boot-help <$(ROOT)/doc/README.txt
+ cp -v F*.txt /boot/isolinux
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,boot.msg,splash.lss} /boot/isolinux
+ifeq ($(CD_ARCH),x86_64)
+ sed -i 's/kernel linux64/kernel linux/' /boot/isolinux/isolinux.cfg
+endif
clean:
-rm -rf $(DIR)
Copied: branches/minimal/packages/syslinux/split-boot-help (from rev 2112,
trunk/packages/syslinux/split-boot-help)
===================================================================
--- branches/minimal/packages/syslinux/split-boot-help
(rev 0)
+++ branches/minimal/packages/syslinux/split-boot-help 2007-10-14 11:32:56 UTC
(rev 2113)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+IFS=""
+IGNORE=1
+F=0
+
+while read -r LINE ; do
+ case "$LINE" in
+ "BOOT OPTIONS")
+ IGNORE=0
+ ;;
+ "THANKS")
+ IGNORE=1
+ ;;
+ \#\#\#\ *\ \#\#\#)
+ if [ "$IGNORE" = "0" ] ; then
+ F=$(( F+1 ))
+ TITLE=${LINE#????}
+ TITLE=${TITLE%????}
+ TITLE="F$F = $TITLE"
+ echo "$TITLE" >>boot-option-index
+ printf '\01770\014\01707' >"F$F.txt"
+ fi
+ ;;
+ "Example:")
+ # Save a bit of space on the screen
+ if [ "$IGNORE" = "0" ] ; then
+ echo -n "Example:" >>"F$F.txt"
+ # Skip the following empty line and grab the example
+ read -r LINE
+ read -r LINE
+ fi
+ ;;
+ esac
+ if [ "$IGNORE" = "0" ] && [ "$F" != "0" ] ; then
+ echo "$LINE" >>"F$F.txt"
+ fi
+done
+
+pr -t -2 -o 4 boot-option-index | col -x >>F1.txt
+
+for FILE in F*.txt ; do
+ LENGTH=`wc -l $FILE`
+ LENGTH=${LENGTH% *}
+ for (( i=$LENGTH ; i<28 ; i++ )) ; do
+ echo >>$FILE
+ done
+done
Modified: branches/minimal/packages/unzip/Makefile
===================================================================
--- branches/minimal/packages/unzip/Makefile 2007-10-14 11:00:23 UTC (rev
2112)
+++ branches/minimal/packages/unzip/Makefile 2007-10-14 11:32:56 UTC (rev
2113)
@@ -8,6 +8,10 @@
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
SHA-$(FILE)= d3d0b410f51b98dae3b056b5e9768fccb1402beb
+PATCH1= $(DIR)-security_fix-1.patch
+URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 7f6a287c0b480bc4748abdf69429dfc76383e1d6
+
# Targets
include $(ROOT)/scripts/functions
@@ -16,10 +20,11 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
compile-stage2:
+ patch -Np1 -i ../$(PATCH1)
ifeq ($(CD_ARCH),x86)
make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
else
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
