Changeset 1762

Show
Ignore:
Timestamp:
12/05/06 05:28:07 (2 years ago)
Author:
alexander
Message:

Merged recent fixes from the 6.2 branch, and updated Chapter 5 to LFS SVN

Location:
trunk
Files:
2 added
4 removed
16 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r1757 r1762  
    218218            tar -C .. -jxpf tools.tar.bz2 ; \ 
    219219        else \ 
    220             su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" ; \ 
     220            su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" && \ 
    221221            tar -C .. -jcpf tools.tar.bz2 tools ; \ 
    222222        fi 
    … …  
    224224 
    225225tools:  pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \ 
    226         lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \ 
     226        lfs-linux-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \ 
    227227        lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \ 
    228228        lfs-binutils-pass2 lfs-ncurses-scpt lfs-bash-scpt lfs-bzip2-scpt \ 
    … …  
    235235        @touch $@ 
    236236 
    237 pre-bash: createfiles ch-linux-libc-headers ch-man-pages \ 
    238         ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-db ch-coreutils \ 
    239         ch-iana-etc ch-m4 ch-bison ch-gpm ch-ncurses ch-procps ch-sed ch-libtool \ 
    240         ch-perl ch-readline ch-zlib ch-autoconf ch-automake ch-bash 
    241  
    242 post-bash: ch-bzip2 ch-diffutils ch-e2fsprogs ch-file ch-findutils ch-flex \ 
     237pre-bash: createfiles stop-here ch-linux-headers ch-man-pages \ 
     238        ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-db ch-sed \ 
     239        ch-e2fsprogs ch-coreutils ch-iana-etc ch-m4 ch-bison ch-gpm \ 
     240        ch-ncurses ch-procps ch-libtool ch-perl ch-readline ch-zlib \ 
     241        ch-autoconf ch-automake ch-bash 
     242 
     243post-bash: ch-bzip2 ch-diffutils ch-file ch-findutils ch-flex \ 
    243244        ch-gawk ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \ 
    244245        ch-iproute2 ch-kbd ch-less ch-make ch-man-db ch-mktemp \ 

  • trunk/packages/bash/Makefile

    r1528 r1762  
    22 
    33NM= bash 
    4 VRS= 3.1 
     4VRS= 3.2 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 766e3fd9384616d8a103f812f662fd8ec791c129 
     9SHA-$(FILE)= fe6466c7ee98061e044dae0347ca5d1a8eab4a0d 
    1010 
    11 PATCH1= $(DIR)-fixes-8.patch 
     11PATCH1= $(DIR)-fixes-1.patch 
    1212URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) 
    13 SHA-$(PATCH1)= 03d6781dd9ad6336eda906d5645c166e1641dd49 
     13SHA-$(PATCH1)= f2e145c311c52e264b3341cd6757c0ea67996fa8 
    1414 
    1515FILE1 = $(NM)-doc-$(VRS).tar.gz 
    1616URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1) 
    17 SHA-$(FILE1)= 9cacbbdf3b1be03819b1ea82cdaec0f5e61570c1 
     17SHA-$(FILE1)= 30e4a66c0974275384b90ffdbc4f54d53ba3d2b4 
    1818 
    1919# Targets 
    … …  
    2626 
    2727compile-stage1: 
     28        patch -Np1 -i ../$(PATCH1) 
    2829        ./configure --prefix=$(WD) --without-bash-malloc 
    2930        make 

  • trunk/packages/binutils/Makefile

    r1743 r1762  
    22 
    33NM= binutils 
    4 VRS= 2.16.1 
     4VRS= 2.17 
    55DIR= $(NM)-$(VRS) 
    66FILE= $(DIR).tar.bz2 
    77URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    8 SHA-$(FILE)= 5c80fd5657da47efc16a63fdd93ef7395319fbbf 
     8SHA-$(FILE)= a557686eef68362ea31a3aa41ce274e3eeae1ef0 
    99 
    1010# Targets 
    … …  
    3333        mv -v $(WD)/bin/{ld-new,ld} 
    3434        ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld 
    35         SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \ 
    36         gcc -dumpspecs > $$SPECFILE && \ 
    37         sed 's@/lib/$(LINKER)@$(WD)&@g' $$SPECFILE > tempspecfile && \ 
    38         mv -vf tempspecfile $$SPECFILE && \ 
    39         unset SPECFILE 
     35        gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&@g' \ 
     36          > `dirname $$(gcc -print-libgcc-file-name)`/specs 
    4037        GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \ 
    4138        find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \ 

  • trunk/packages/coreutils/Makefile

    r1636 r1762  
    22 
    33NM= coreutils 
    4 VRS= 5.96 
     4VRS= 6.6 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 782379daf200427058ca94a408566d600f779823 
     9SHA-$(FILE)= 9019a32b122db851eff22ace8669d7cdedf39e7b 
    1010 
    1111PATCH1= $(DIR)-uname-1.patch 
    … …  
    1515PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch 
    1616URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2) 
    17 SHA-$(PATCH2)= a7dedf947b7651f882c8ede00eb6e56689bbb154 
     17SHA-$(PATCH2)= e1e783efd515639b78627c37025b96168594f408 
    1818 
    19 PATCH50= $(DIR)-i18n-1.patch 
    20 URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50) 
    21 SHA-$(PATCH50)= 3ff73ceeae8ef66345cfed38f770e51db4d02199 
     19PATCH3= $(DIR)-i18n-1.patch 
     20URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3) 
     21SHA-$(PATCH3)= e5a7ab810f4032db0b8f829297c70e10f825f41e 
    2222 
    2323# Targets 
    … …  
    3838        'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' 
    3939 
    40 stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH50) 
     40stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3) 
    4141        $(std_build) 
    42         cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH50)} $(LFSSRC)/ 
     42        cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/ 
    4343 
    4444compile-stage2: 
    … …  
    4747endif 
    4848        patch -Np1 -i ../$(PATCH2) 
    49         patch -Np1 -i ../$(PATCH50) 
     49        patch -Np1 -i ../$(PATCH3) 
    5050        chmod +x tests/sort/sort-mb-tests 
    5151        sed -i 's/_LEN 6/_LEN 20/' src/who.c 

  • trunk/packages/expect/Makefile

    r1528 r1762  
    2323compile-stage1: 
    2424        patch -Np1 -i ../$(PATCH1) 
     25        cp configure{,.bak} 
     26        sed 's:/usr/local/bin:/bin:' configure.bak > configure 
    2527        ./configure --prefix=$(WD) --with-tcl=$(WD)/lib \ 
    2628        --with-tclinclude=$(WD)/include --with-x=no 

  • trunk/packages/findutils/Makefile

    r1659 r1762  
    22 
    33NM= findutils 
    4 VRS= 4.2.27 
     4VRS= 4.2.28 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 0655e10b20dc66b1ccddfa45e5d6c57a3cd312a2 
     9SHA-$(FILE)= 96f78e570f371c553699215857d7f992accce4d5 
    1010 
    1111# Targets 

  • trunk/packages/gcc/Makefile

    r1585 r1762  
    22 
    33NM= gcc 
    4 VRS= 4.0.3 
     4VRS= 4.1.1 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 5a94943d9ab823cf8d080cc7f9e8a4a91797afea 
     9SHA-$(FILE)= a398b95d38b6e35f4c4e02c34c0a3bff79811f8f 
    1010 
    1111PATCH1= $(DIR)-specs-1.patch 
    1212URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) 
    13 SHA-$(PATCH1)= 04d4b7d68bfd6b362e9b75678584641a2dde7c2f 
     13SHA-$(PATCH1)= 1bdfbb49437642d3e450f0e3ba25a3e30e25e857 
    1414 
    1515# Targets 
    … …  
    3737 
    3838compile-pass2: 
    39         cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \ 
     39        cd ../$(DIR) ; cp -v gcc/Makefile.in{,.orig} && \ 
    4040         sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in 
    41         cd ../$(DIR) ; cp gcc/Makefile.in{,.tmp} && \ 
     41        cd ../$(DIR) ; cp -v gcc/Makefile.in{,.tmp} && \ 
    4242         sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ 
    4343         > gcc/Makefile.in 

  • trunk/packages/gettext/Makefile

    r1528 r1762  
    22 
    33NM= gettext 
    4 VRS= 0.14.5 
     4VRS= 0.16 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 68737eee1a6427044eef901dc88e4144d371fb6b 
     9SHA-$(FILE)= ab42a62fcfbfc5adde199375a20c0ae252b40961 
    1010 
    1111# Targets 
    … …  
    1919compile-stage1: 
    2020        cd $(NM)-tools ; ./configure --prefix=$(WD) --disable-shared 
    21         cd $(NM)-tools ; make -C lib 
     21        cd $(NM)-tools ; make -C gnulib-lib 
    2222        cd $(NM)-tools ; make -C src msgfmt 
    2323        cd $(NM)-tools ; cp -v src/msgfmt $(WD)/bin 

  • trunk/packages/glibc/Makefile

    r1685 r1762  
    22 
    33NM= glibc 
    4 VRS= 2.3.6 
     4VRS= 2.5 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 82d0487419f1bdbf2dee439c344e89d6af47e558 
     9SHA-$(FILE)= ec9a007c4875062099a4701ac9137fcdb5a71447 
    1010 
    1111FILE2= $(NM)-libidn-$(VRS).tar.bz2 
    12 #URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2) 
    13 URL-$(FILE2)= http://ftp.gnu.org/gnu/glibc/$(FILE2) 
    14 SHA-$(FILE2)= 95d3a98495d4bd7138149fd312db88da56e735db 
     12URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2) 
     13SHA-$(FILE2)= ee7e019e01aa338e28db1eeb34abb2cb09d2f30a 
    1514 
    16 PATCH1= $(NM)-$(VRS)-linux_types-1.patch 
    17 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) 
    18 SHA-$(PATCH1)= 0bdf2b15e20c176caf3c85e5b6a7bc957f636d6a 
    19  
    20 PATCH2= $(NM)-$(VRS)-inotify-1.patch 
    21 URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH2) 
    22 SHA-$(PATCH2)= d282d10108a4f6b9c6eddc4351a83abe22a5b5b6 
    23  
    24 PATCH50= $(DIR)-supported_locales-2.patch 
     15PATCH50= $(DIR)-supported_locales-1.patch 
    2516 
    2617# Targets 

  • trunk/packages/m4/Makefile

    r1528 r1762  
    22 
    33NM= m4 
    4 VRS= 1.4.4 
     4VRS= 1.4.8 
    55DIR= $(NM)-$(VRS) 
    66 
    7 FILE= $(DIR).tar.gz 
     7FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 4861140cb54b6c9e135d04b5fbf460ff57f969a5 
     9SHA-$(FILE)= 31589415022c2842f62f3b91186bc9e0a9a8e1a1 
    1010 
    1111# Targets 

  • trunk/packages/make/Makefile

    r1528 r1762  
    22 
    33NM= make 
    4 VRS= 3.80 
     4VRS= 3.81 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= d2085842f08e57d58d3e1cd75a5f0342a60e5f45 
     9SHA-$(FILE)= 41ed86d941b9c8025aee45db56c0283169dcab3d 
    1010 
    1111# Targets 

  • trunk/packages/tar/Makefile

    r1528 r1762  
    22 
    33NM= tar 
    4 VRS= 1.15.1 
     4VRS= 1.16 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= f861b7524a0867833056dc382e68085234cae6ff 
    10  
    11 PATCH1= $(DIR)-gcc4_fix_tests-1.patch 
    12 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) 
    13 SHA-$(PATCH1)= ba780e0e88c7993a69d5a498912e135bf16e7df8 
    14  
    15 PATCH2= $(DIR)-sparse_fix-1.patch 
    16 URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2) 
    17 SHA-$(PATCH2)= 269dfcc556b6217d27d043ea623df75e19e3d8c9 
    18  
    19 PATCH3= $(DIR)-security_fixes-1.patch 
    20 URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3) 
    21 SHA-$(PATCH3)= 93fd5a55bccf25d03bb7e18dffc0bce27c29d207 
     9SHA-$(FILE)= b98abe392cedb7fcef475a41d61c17a8f800b90c 
    2210 
    2311# Targets 
    … …  
    2513include $(ROOT)/scripts/functions 
    2614 
    27 stage1: $(FILE) $(PATCH1) 
     15stage1: $(FILE) 
    2816        $(std_build) 
    29         cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/ 
     17        cp $(SRC)/$(FILE) $(LFSSRC)/ 
    3018 
    3119compile-stage1: 
    32         patch -Np1 -i ../$(PATCH1) 
    3320        ./configure --prefix=$(WD) 
    3421        make $(PM) 

  • trunk/packages/tcl/Makefile

    r1584 r1762  
    22 
    33NM= tcl 
    4 VRS= 8.4.13 
     4VRS= 8.4.14 
    55DIR= $(NM)$(VRS) 
    66 
    77FILE= $(DIR)-src.tar.gz 
    88URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 4af6bec9a941d7d798df4287eebece7ded67489c 
     9SHA-$(FILE)= d7af7e0c7ed563e2344dda04bbe49961589244dd 
    1010 
    1111# Targets 

  • trunk/vars/vars.ppc

    r1735 r1762  
    1 export VERSION := ppc-6.2-4 
     1export VERSION := ppc-6.3-pre1 
    22export CFLAGS := -Os -s -fno-strict-aliasing 
    33export LINKER := ld.so.1 

  • trunk/vars/vars.sparc

    r1735 r1762  
    1 export VERSION := sparc-6.2-4 
     1export VERSION := sparc-6.3-pre1 
    22export CFLAGS := -Os -s -fno-strict-aliasing 
    33export LFS_TARGET := sparc-unknown-linux-gnu 

  • trunk/vars/vars.x86

    r1735 r1762  
    1 export VERSION := x86-6.2-4 
     1export VERSION := x86-6.3-pre1 
    22export CFLAGS := -Os -s -fno-strict-aliasing -mtune=i686 
    33export LINKER := ld-linux.so.2