Changeset 2113

Show
Ignore:
Timestamp:
10/14/07 05:32:56 (1 year ago)
Author:
alexander
Message:

Merged all relevant changes from trunk since r2052.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r2095 r2113  
    273273        ch-docbook-xsl ch-html_tidy ch-LFS-BOOK \ 
    274274        ch-inputattach ch-openssh ch-glib2 ch-gc ch-w3m ch-lftp \ 
     275        ch-alsa-lib ch-alsa-utils ch-alsa-firmware \ 
    275276        ch-cvs ch-popt ch-samba ch-pciutils ch-libusb ch-usbutils ch-parted \ 
    276277        ch-irssi ch-XML-Parser ch-pidgin ch-net-tools ch-wireless_tools ch-wpa_supplicant \ 
    …… 
    279280        ch-device-mapper ch-LVM2 ch-dmraid ch-multipath-tools \ 
    280281        ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \ 
    281         ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-brltty  \ 
     282        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \ 
     283        ch-espeak ch-dotconf ch-speech-dispatcher ch-speechd-up ch-brltty  \ 
    282284        ch-strace ch-iptables ch-eject ch-hdparm \ 
    283285        ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \ 
    284         ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \ 
     286        ch-blfs-bootscripts ch-oui-data ch-Markdown ch-SmartyPants \ 
     287        ch-hibernate-script ch-slang ch-mc \ 
    285288        ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \ 
    286289        ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-linux32 
    …… 
    390393        @>$(MP)/var/log/wtmp 
    391394        @>$(MP)/var/log/lastlog 
    392         @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux 
    393 ifeq ($(CD_ARCH),x86_64) 
    394         @sed -i -e '/linux64/d' -e 's/ 32-bit//' $(MP)/boot/isolinux/options?.msg 
    395         @sed -i '/linux64/,$$d' $(MP)/boot/isolinux/isolinux.cfg 
    396 endif 
    397         @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg 
    398         @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue* 
     395        @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/boot/isolinux/boot.msg 
     396        @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/etc/issue* 
    399397        @install -m644 doc/lfscd-remastering-howto.txt $(MP)/root 
    400         @sed "s/\[version\]/$(VERSION)/" doc.README.txt >$(MP)/root/README.txt 
     398        @sed -e 's/\[version\]/$(VERSION)/' -e 's/\\_/_/g' \ 
     399            doc/README.txt >$(MP)/root/README.txt 
    401400        @install -m600 root/.bashrc $(MP)/root/.bashrc 
    402401        @install -m755 scripts/{net-setup,greeting,livecd-login} $(MP)/usr/bin/  
    …… 
    407406iso: prepiso 
    408407        @make unmount 
    409         # FIXME: sometimes e2fsck bombs out even after a clean build. 
    410         # Kernel bug? 
     408        # Bug in old kernels requires a sync after unmounting the loop device 
     409        # for data integrity. 
    411410        @sync ; sleep 1 ; sync 
     411        # e2fsck optimizes directories and returns 1 after a clean build. 
     412        # This is not a bug. 
    412413        @-e2fsck -f -p root.ext2 
     414        @( LC_ALL=C ; export LC_ALL ; \ 
     415            cat $(ROOT)/doc/README.html.head ; \ 
     416            sed 's/\[version\]/$(VERSION)/' $(ROOT)/doc/README.txt | \ 
     417                $(WD)/bin/Markdown --html4tags | $(WD)/bin/SmartyPants ; \ 
     418            cat $(ROOT)/doc/README.html.tail ) >$(MPBASE)/iso/README.html 
    413419        @$(WD)/bin/mkzftree -F root.ext2 $(MPBASE)/iso/root.ext2 
    414420        @cd $(MPBASE)/iso ; $(WD)/bin/mkisofs -z -R -l --allow-leading-dots -D -o \ 

  • branches/minimal/etc/bashrc

    r1995 r2113  
    33eval $(dircolors -b /etc/dircolors) 
    44 
    5 # Colors for PS1 
    6 RED="\[\033[0;31m\]" 
    7 GREEN="\[\033[0;32m\]" 
    8 ORANGE="\[\033[0;33m\]" 
    9 WHITE="\[\033[00m\]" 
    10  
    11 case $TERM in 
    12         xterm*) 
    13                 BOLD=$WHITE ;; 
    14         *) 
    15                 BOLD="\[\033[0;1m\]" ;; 
    16 esac 
    17  
    18 # Prompt 
    19 if [ $EUID -eq 0 ] ; then 
    20         PS1="$BOLD\h:$RED\u | $BOLD\D{%c} $RED| \w$WHITE\n$BOLD\\$ $WHITE" 
     5# Setup a red prompt for root and a green one for users.  
     6NORMAL="\[\e[0m\]" 
     7RED="\[\e[1;31m\]" 
     8GREEN="\[\e[1;32m\]" 
     9if [[ $EUID == 0 ]] ; then 
     10        PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL" 
    2111else 
    22         PS1="$BOLD\h:$GREEN\u | $BOLD\D{%c} $GREEN| \w$WHITE\n$BOLD\\$ $WHITE" 
     12        PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL" 
    2313fi 
    24  
    25 export PS1 
    2614 
    2715if [ "`locale charmap 2>/dev/null`" = "UTF-8" ] 

  • branches/minimal/etc/ld.so.conf

    r33 r2113  
    33/usr/local/lib 
    44/opt/lib 
    5 /usr/X11R6/lib 
    65 
    76# End /etc/ld.so.conf 

  • branches/minimal/isolinux/boot.msg

    r2020 r2113  
    22splash.lss 
    3307This is the Official LFS LiveCD, Version: 
    4 07Press [Enter] to boot, F1 - F4 for available options 
     407Press [Enter] to boot, F1 - F10 for available options 
    55 

  • branches/minimal/isolinux/isolinux.cfg

    r2078 r2113  
    33timeout 600 
    44display boot.msg 
    5 F1 options1.msg 
    6 F2 options2.msg 
    7 F3 options3.msg 
    8 F4 options4.msg 
     5F1 F1.txt 
     6F2 F2.txt 
     7F3 F3.txt 
     8F4 F4.txt 
     9F5 F5.txt 
     10F6 F6.txt 
     11F7 F7.txt 
     12F8 F8.txt 
     13F9 F9.txt 
     14F10 F10.txt 
    915 
    1016label linux 

  • branches/minimal/packages/brltty/Makefile

    r1908 r2113  
    2323        # Do we want this? 
    2424        # sed -i 's/usb_object="linux"/usb_object="libusb"/' configure 
    25         ./configure --prefix=/usr --sysconfdir=/etc --disable-speech-support \ 
    26             --disable-api 
     25        ./configure --prefix=/usr --sysconfdir=/etc --disable-api 
    2726        make 
    2827        make install 

  • branches/minimal/packages/initramfs/init.in

    r2080 r2113  
    335335                NEW_FIREWIRE=1 
    336336                ;; 
    337         all_generic_ide) 
     337        all_generic_ide|all-generic-ide) 
    338338                all_generic_ide=1 
    339339                ;; 

  • branches/minimal/packages/lfs-bootscripts/lfs-bootscripts-livecd-1.patch

    r2080 r2113  
    104104+       ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock 
    105105+       ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcsysinit.d/S70console 
    106 +       ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcsysinit.d/S80localnet 
     106+       ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcsysinit.d/S11localnet 
    107107+       if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi 
    108108+       install                   -m ${MODE} lfs/sysconfig/network-devices/ifup   ${EXTDIR}/sysconfig/network-devices/ 

  • branches/minimal/packages/linux/Makefile

    r2078 r2113  
    3535SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b 
    3636 
    37 DIR8= madwifi-0.9.3.2 
    38 FILE8= $(DIR8).tar.bz2 
    39 URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8) 
    40 SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 
     37# The latest version from 
     38# http://ftp.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ath5k/ 
     39# does not compile against linux-2.6.22. So here is an old SVN snapshot 
     40# from http://madwifi.org/ 
     41 
     42DIR8= ath5k-r2701 
     43FILE8= $(DIR8).tar.gz 
     44URL-$(FILE8)= http://www.linuxfromscratch.org/~alexander/$(FILE8) 
     45SHA-$(FILE8)= d14a002ba192788881ca9a715348f8b7b898fe3c 
    4146 
    4247DIR9=rtl-mac80211-20070729 
    …… 
    4550SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953 
    4651 
     52# Git snapshot - stable versions are incompatible with linux-2.6.22 
     53DIR10= speakup-20070928 
     54FILE10= $(DIR10).tar.gz 
     55URL-$(FILE10)= http://www.linuxfromscratch.org/~alexander/$(FILE10) 
     56SHA-$(FILE10)= 101a7fcae2cbf2dbad81d91ff7cb262d6857d104 
    4757 
    4858# Targets 
    …… 
    5464        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    5565 
    56 stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1) 
     66stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(PATCH1) 
    5767        $(std_build) 
    5868 
    …… 
    6070        tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel 
    6171        tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel 
     72        tar xf ../$(FILE10) ; cd $(DIR10) ; ./install-spkglue `pwd`/.. ; ./install-speakup `pwd`/.. 
    6273        zcat ../$(PATCH1) | patch -Np1 
    6374        patch -Np1 -i ../$(PATCH3) 
    …… 
    7990            make KERNDIR=`pwd`/.. install 
    8091        tar xf ../$(FILE8) ; cd $(DIR8) ; \ 
    81             make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. ; \ 
    82             make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \ 
    83             make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-tools install-tools ; \ 
    84             cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ 
    85             cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . 
    86         rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) 
     92            make KDIR=`pwd`/.. ; make KDIR=`pwd`/.. install 
     93        rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) $(DIR10) 
    8794        ../debian-style-headers.sh 
    88         mv *.tgz /drivers 
    8995 
    9096clean: 

  • branches/minimal/packages/linux/config.x86

    r2078 r2113  
    22# Automatically generated make config: don't edit 
    33# Linux kernel version: 2.6.22.5 
    4 # Sat Sep 22 17:26:17 2007 
     4# Fri Sep 28 20:25:12 2007 
    55# 
    66CONFIG_X86_32=y 
    …… 
    16911691 
    16921692# 
     1693# Speakup console speech 
     1694# 
     1695CONFIG_SPEAKUP=y 
     1696CONFIG_SPEAKUP_CORE=m 
     1697CONFIG_SPEAKUP_SYNTH_ACNTSA=m 
     1698CONFIG_SPEAKUP_SYNTH_ACNTPC=m 
     1699CONFIG_SPEAKUP_SYNTH_APOLLO=m 
     1700CONFIG_SPEAKUP_SYNTH_AUDPTR=m 
     1701CONFIG_SPEAKUP_SYNTH_BNS=m 
     1702CONFIG_SPEAKUP_SYNTH_DECTLK=m 
     1703CONFIG_SPEAKUP_SYNTH_DECEXT=m 
     1704CONFIG_SPEAKUP_SYNTH_DECPC=m 
     1705CONFIG_SPEAKUP_SYNTH_DTLK=m 
     1706CONFIG_SPEAKUP_SYNTH_KEYPC=m 
     1707CONFIG_SPEAKUP_SYNTH_LTLK=m 
     1708CONFIG_SPEAKUP_SYNTH_SOFT=m 
     1709CONFIG_SPEAKUP_SYNTH_SPKOUT=m 
     1710CONFIG_SPEAKUP_SYNTH_TXPRT=m 
     1711CONFIG_SPEAKUP_SYNTH_DUMMY=m 
     1712 
     1713# 
    16931714# Sound 
    16941715# 

  • branches/minimal/packages/linux/debian-style-headers.sh

    r2078 r2113  
    66rm -rf "$DSTDIR" 
    77mkdir "$DSTDIR" 
    8 cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease scripts "$DSTDIR" 
     8cp -r .config Makefile Module.symvers .version scripts "$DSTDIR" 
    99mkdir -p "$DSTDIR/include" 
    1010find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}' "$DSTDIR/include" 

  • branches/minimal/packages/linux64/Makefile

    r2078 r2113  
    11# Linux Kernel Makefile 
     2 
     3ifeq ($(CD_ARCH),x86) 
     4CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
     5endif 
     6ifeq ($(CD_ARCH),x86_64) 
     7CROSS_MAKE= make 
     8endif 
    29 
    310NM= linux 
    …… 
    3542SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b 
    3643 
    37 DIR8= madwifi-0.9.3.2 
    38 FILE8= $(DIR8).tar.bz2 
    39 URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8) 
    40 SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 
     44# The latest version from 
     45# http://ftp.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ath5k/ 
     46# does not compile against linux-2.6.22. So here is an old SVN snapshot 
     47# from http://madwifi.org/ 
    4148 
    42 ifeq ($(CD_ARCH),x86) 
    43 CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    44 endif 
    45 ifeq ($(CD_ARCH),x86_64) 
    46 CROSS_MAKE= make 
    47 endif 
     49DIR8= ath5k-r2701 
     50FILE8= $(DIR8).tar.gz 
     51URL-$(FILE8)= http://www.linuxfromscratch.org/~alexander/$(FILE8) 
     52SHA-$(FILE8)= d14a002ba192788881ca9a715348f8b7b898fe3c 
    4853 
    4954DIR9=rtl-mac80211-20070729 
    …… 
    5257SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953 
    5358 
     59# Git snapshot - stable versions are incompatible with linux-2.6.22 
     60DIR10= speakup-20070928 
     61FILE10= $(DIR10).tar.gz 
     62URL-$(FILE10)= http://www.linuxfromscratch.org/~alexander/$(FILE10) 
     63SHA-$(FILE10)= 101a7fcae2cbf2dbad81d91ff7cb262d6857d104 
    5464 
    5565# Targets 
    …… 
    6171        'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)' 
    6272 
    63 stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1) 
     73stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(PATCH1) 
    6474        $(std_build) 
    6575 
    …… 
    6777        tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel 
    6878        tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel 
     79        tar xf ../$(FILE10) ; cd $(DIR10) ; ./install-spkglue `pwd`/.. ; ./install-speakup `pwd`/.. 
    6980        zcat ../$(PATCH1) | patch -Np1 
    7081        patch -Np1 -i ../$(PATCH3) 
    …… 
    8596            $(CROSS_MAKE) KERNDIR=`pwd`/.. ; \ 
    8697            $(CROSS_MAKE) KERNDIR=`pwd`/.. install 
     98        tar xf ../$(FILE8) ; cd $(DIR8) ; \ 
     99            make KDIR=`pwd`/.. ; make KDIR=`pwd`/.. install 
    87100ifeq ($(CD_ARCH),x86) 
    88         tar xf ../$(FILE8) ; cd $(DIR8) ; \ 
    89             $(CROSS_MAKE) KERNELPATH=`pwd`/.. modules ; \ 
    90             $(CROSS_MAKE) KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \ 
    91             cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS)-64bit.tgz . 
    92101        rm /lib/modules/*-64bit/{source,build} 
    93102        cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64 
    94103endif 
    95104ifeq ($(CD_ARCH),x86_64) 
    96         tar xf ../$(FILE8) ; cd $(DIR8) ; \ 
    97             $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. ; \ 
    98             $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \ 
    99             $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-tools install-tools ; \ 
    100             cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ 
    101             cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . 
    102105        cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux 
    103         rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) 
     106        rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) $(DIR10) 
    104107        ../debian-style-headers.sh 
    105108endif 
    106         mv *.tgz /drivers 
    107  
    108109 
    109110clean: 
    110111        -rm -rf $(DIR) 
    111         -rm -f fakes-for-fglrx/{uname,cat} 
    112112 
    113113.PHONY: clean chroot compile-stage2 

  • branches/minimal/packages/linux64/config.x86_64

    r2078 r2113  
    22# Automatically generated make config: don't edit 
    33# Linux kernel version: 2.6.22.5 
    4 # Mon Sep 17 18:40:16 2007 
     4# Fri Sep 28 20:25:12 2007 
    55# 
    66CONFIG_X86_64=y 
    …… 
    15381538 
    15391539# 
     1540# Speakup console speech 
     1541# 
     1542CONFIG_SPEAKUP=y 
     1543CONFIG_SPEAKUP_CORE=m 
     1544CONFIG_SPEAKUP_SYNTH_ACNTSA=m 
     1545CONFIG_SPEAKUP_SYNTH_ACNTPC=m 
     1546CONFIG_SPEAKUP_SYNTH_APOLLO=m 
     1547CONFIG_SPEAKUP_SYNTH_AUDPTR=m 
     1548CONFIG_SPEAKUP_SYNTH_BNS=m 
     1549CONFIG_SPEAKUP_SYNTH_DECTLK=m 
     1550CONFIG_SPEAKUP_SYNTH_DECEXT=m 
     1551CONFIG_SPEAKUP_SYNTH_DECPC=m 
     1552CONFIG_SPEAKUP_SYNTH_DTLK=m 
     1553CONFIG_SPEAKUP_SYNTH_KEYPC=m 
     1554CONFIG_SPEAKUP_SYNTH_LTLK=m 
     1555CONFIG_SPEAKUP_SYNTH_SOFT=m 
     1556CONFIG_SPEAKUP_SYNTH_SPKOUT=m 
     1557CONFIG_SPEAKUP_SYNTH_TXPRT=m 
     1558CONFIG_SPEAKUP_SYNTH_DUMMY=m 
     1559 
     1560# 
    15401561# Sound 
    15411562# 

  • branches/minimal/packages/linux64/debian-style-headers.sh

    r2078 r2113  
    66rm -rf "$DSTDIR" 
    77mkdir "$DSTDIR" 
    8 cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease scripts "$DSTDIR" 
     8cp -r .config Makefile Module.symvers .version scripts "$DSTDIR" 
    99mkdir -p "$DSTDIR/include" 
    1010find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}' "$DSTDIR/include" 

  • branches/minimal/packages/livecd-bootscripts/Makefile

    r1718 r2113  
    44# Targets 
    55 
    6 SCRIPTS= clkconf langconf brltty brltty-restart 
     6SCRIPTS= clkconf langconf brltty brltty-restart speakup speakup-restart 
    77DATA= font.dat font-errors.dat lang.dat 
    88 
    …… 
    2222        install -m754 $(SCRIPTS) /etc/rc.d/init.d 
    2323        install -m644 $(DATA) /etc/langconf 
    24         ln -sf ../init.d/brltty /etc/rc.d/rcsysinit.d/S11brltty 
     24        ln -sf ../init.d/brltty /etc/rc.d/rcsysinit.d/S12brltty 
     25        ln -sf ../init.d/speakup /etc/rc.d/rcsysinit.d/S12speakup 
    2526        ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf 
    2627        ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf 
    2728        # brltty has to be restarted in order to see the font change 
     29        # and speakup has to react to the language change 
    2830        ln -sf ../init.d/brltty-restart /etc/rc.d/rcsysinit.d/S71brltty-restart 
     31        ln -sf ../init.d/speakup-restart /etc/rc.d/rcsysinit.d/S71speakup-restart 
    2932 
    3033clean: 

  • branches/minimal/packages/livecd-bootscripts/brltty

    r1581 r2113  
    2222                  echo 'visit_items=ON' >>/etc/dialogrc 
    2323                  echo 'set braille_friendly=yes' >>/root/.muttrc 
    24                   sed -i 's/^#SHOW_CURSOR:FALSE/SHOW_CURSOR:TRUE/' /etc/lynx.cfg 
     24                  sed -i -e 's/^#SHOW_CURSOR:FALSE/SHOW_CURSOR:TRUE/' \ 
     25                         -e 's/#\(DEFAULT_KEYPAD_MODE\):NUMBERS_AS_ARROWS/\1:LINKS_AND_FIELDS_ARE_NUMBERED/' \ 
     26                         /etc/lynx.cfg 
    2527                  sed -i 's/^draw_arrow=OFF/draw_arrow=ON/' /etc/tin/tinrc 
    2628                  # FIXME: others 

  • branches/minimal/packages/perl/Makefile

    r1822 r2113  
    2323        patch -Np1 -i ../$(PATCH1) 
    2424        ./configure.gnu --prefix=$(WD) \ 
    25          -Dstatic_ext='Data/Dumper Fcntl IO POSIX' \ 
     25         -Dstatic_ext='Data/Dumper Digest/MD5 Fcntl IO POSIX' \ 
    2626         -Darchname=$${LFS_TARGET%%-*}-linux 
    2727        make perl utilities 

  • branches/minimal/packages/syslinux/Makefile

    r2020 r2113  
    1717        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    1818 
    19 stage2: Makefile $(FILE) 
     19stage2: Makefile $(FILE) split-boot-help $(ROOT)/doc/README.txt 
    2020        $(std_build) 
    2121 
    …… 
    2323        mkdir -p /boot/isolinux 
    2424        cp -v isolinux.bin /boot/isolinux 
    25         cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux 
     25        ../split-boot-help <$(ROOT)/doc/README.txt 
     26        cp -v F*.txt /boot/isolinux 
     27        cp -v $(ROOT)/isolinux/{isolinux.cfg,boot.msg,splash.lss} /boot/isolinux 
     28ifeq ($(CD_ARCH),x86_64) 
     29        sed -i 's/kernel linux64/kernel linux/' /boot/isolinux/isolinux.cfg 
     30endif 
    2631 
    2732clean: 

  • branches/minimal/packages/unzip/Makefile

    r1994 r2113  
    99SHA-$(FILE)= d3d0b410f51b98dae3b056b5e9768fccb1402beb 
    1010 
     11PATCH1= $(DIR)-security_fix-1.patch 
     12URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) 
     13SHA-$(PATCH1)= 7f6a287c0b480bc4748abdf69429dfc76383e1d6 
     14 
    1115# Targets 
    1216 
    …… 
    1721        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    1822 
    19 stage2: Makefile $(FILE) 
     23stage2: Makefile $(FILE) $(PATCH1) 
    2024        $(std_build) 
    2125 
    2226compile-stage2: 
     27        patch -Np1 -i ../$(PATCH1) 
    2328ifeq ($(CD_ARCH),x86) 
    2429        make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux