Changeset 1627

Show
Ignore:
Timestamp:
07/12/06 22:05:24 (2 years ago)
Author:
justin
Message:

Upgraded nfs-utils, gtk2, xchat, pango, cairo, glib2, xfsprogs (adding dependancy uuid required since 2.6 according to INSTALL, dont know of any users reporting if xfs worked or not) instructions and package version.

Location:
branches/cross
Files:
2 added
2 removed
10 modified

Legend:

Unmodified
Added
Removed
  • branches/cross/Makefile

    r1624 r1627  
    229229        ch-util-linux ch-vim ch-bootscripts-clfs ch-udev-cross-lfs final-environment 
    230230 
    231 blfs-common: stop-here ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \ 
    232         ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \ 
     231blfs-common: stop-here ch-openssl ch-wget ch-reiserfsprogs ch-uuid ch-xfsprogs ch-nano \ 
     232        ch-joe ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx \ 
     233        ch-libxml2 ch-expat \ 
    233234        ch-subversion ch-livecd-bootscripts ch-docbook-xml ch-libxslt \ 
    234235        ch-docbook-xsl ch-html_tidy ch-CLFS-BOOK ch-libpng ch-freetype \ 
  • branches/cross/packages/cairo/Makefile

    r1488 r1627  
    66 
    77FILE= $(DIR).tar.gz 
    8 URL-$(FILE)= http://cairographics.org/releases/$(FILE) 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    99SHA-$(FILE)= 89e72202e5b51a8914fce60f52f7c51ecdea982a 
    1010 
  • branches/cross/packages/glib2/Makefile

    r1488 r1627  
    22 
    33NM= glib 
    4 VRS= 2.10.2 
     4VRS= 2.10.3 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    8 URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/glib/2.10/$(FILE) 
    9 SHA-$(FILE)= 14d055725a4fa347bc4c11d6f52ec5268da2454f 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
     9SHA-$(FILE)= bba1dea73c4426f6a130c82e0b7a07b78dfc73ce 
    1010 
    1111# Targets 
  • branches/cross/packages/gtk2/Makefile

    r1488 r1627  
    22 
    33NM= gtk+ 
    4 VRS= 2.8.17 
     4VRS= 2.8.18 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    8 URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.8/$(FILE) 
    9 SHA-$(FILE)= a6c62ec016bc076a9938ba962f0dd4bcc1e74e16 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
     9SHA-$(FILE)= e4f0231b943418d8bb17b3bf9d79aa902ab3eb13 
    1010 
    1111# Targets 
  • branches/cross/packages/nfs-utils/Makefile

    r1475 r1627  
    22 
    33NM= nfs-utils 
    4 VRS= 1.0.7 
     4VRS= 1.0.8 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= e216515f90f6ceb681f1527e5483d0ca53f8ac62 
    10  
    11 PATCH1= $(DIR)-gcc4-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1) 
    13 SHA-$(PATCH1)= 9ccb151f6270aff4c5346ccc6ba50d5e7577ca65 
     9SHA-$(FILE)= db21bf211150f84b462113b81e4d727afcaa6543 
    1410 
    1511# Targets 
     
    2117        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    2218 
    23 stage2: Makefile $(FILE) $(PATCH1) 
     19stage2: Makefile $(FILE) 
    2420        $(std_build) 
    2521 
    2622compile-stage2: 
    27         patch -Np1 -i ../$(PATCH1) 
    2823        ./configure --prefix=/usr --sysconfdir=/etc --disable-nfsv4 \ 
    2924         --disable-gss 
  • branches/cross/packages/openssh/Makefile

    r1488 r1627  
    66 
    77FILE= $(DIR).tar.gz 
    8 URL-$(FILE)= http://openbsd.md5.com.ar/pub/OpenBSD/OpenSSH/portable/$(FILE) 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    99SHA-$(FILE)= 2b5b0751fd578283ba7b106025c0ba391fd72f1f 
    1010 
     
    2424        chown root:sys /var/lib/sshd 
    2525        sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure 
    26         ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin \ 
     26        ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh \ 
    2727         --with-md5-passwords --with-privsep-path=/var/lib/sshd 
    2828        make $(PM) 
  • branches/cross/packages/openssl/Makefile

    r1471 r1627  
    22 
    33NM= openssl 
    4 VRS= 0.9.7i 
     4VRS= 0.9.8b 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 4c23925744d43272fa19615454da44e01465eb06 
     9SHA-$(FILE)= 99565db630a044fa484d4f91006a31908f262246 
    1010 
    1111PATCH1= $(DIR)-fix_manpages-1.patch 
    1212URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) 
    13 SHA-$(PATCH1)= 7640f69ecbe701fd4b71e0d0329d9fffbcc52607 
    14  
    15 PATCH40= $(NM)-0.9.7h-allow_lib64-1.patch 
    16 URL-$(PATCH40)= http://linuxfromscratch.org/~thomasp/x86_64-livecd/$(PATCH40) 
    17 SHA-$(PATCH40)= 26ce4198986c9c46b8ae2c85918f831f550cee88 
    18  
    19 include $(CROSSVARS) 
    20  
    21 CONFIG ?= ./config 
    22 DEPS= $(FILE) $(PATCHES) 
     13SHA-$(PATCH1)= 17a3fc451ab132178e2dc696f19dfe58f218cd4a 
    2314 
    2415# Targets 
     
    3021        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    3122 
    32 stage2: Makefile $(DEPS) 
     23stage2: Makefile $(FILE) $(PATCH1) 
    3324        $(std_build) 
    3425 
    3526compile-stage2: 
    36         for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done 
    37         $(CONFIG) --openssldir=/etc/ssl --prefix=/usr $(SSL_TARGET) shared 
     27        patch -Np1 -i ../$(PATCH1) 
     28        ./config --openssldir=/etc/ssl --prefix=/usr shared 
    3829ifeq ($(LFS-ARCH),x86) 
    3930        sed -i 's/mcpu=pentium/mtune=i486/' Configure 
    4031        sed -i 's/mcpu=pentium/mtune=i486/' Makefile 
    4132endif 
    42         make $(PM) $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man 
    43         make $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man install 
    44         cp -r certs /etc/ssl 
     33        make $(PM) MANDIR=/usr/share/man 
     34        make MANDIR=/usr/share/man install 
     35        cp -v -r certs /etc/ssl 
     36        install -v -d -m755 /usr/share/doc/$(DIR) 
     37        cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} /usr/share/doc/$(DIR) 
    4538 
    4639clean: 
  • branches/cross/packages/pango/Makefile

    r1488 r1627  
    22 
    33NM= pango 
    4 VRS= 1.12.1 
     4VRS= 1.12.3 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    8 URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/pango/1.12/$(FILE) 
    9 SHA-$(FILE)= 26f3268eabeea8aa45b1286dc7af3149c8d544a1 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
     9SHA-$(FILE)= ad493c4560c0ffd9dcdb8a1724d5bff058ef112c 
    1010 
    1111# Targets 
  • branches/cross/packages/xchat/Makefile

    r1488 r1627  
    22 
    33NM= xchat 
    4 VRS= 2.6.2 
     4VRS= 2.6.4 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://xchat.org/files/source/2.6/$(FILE) 
    9 SHA-$(FILE)= 1bf135b3947f75f1b6c8a60c436a7a1f2613a5ae 
     9SHA-$(FILE)= 84bb9e2b3f8eef03c199208c81520c20a172e825 
    1010 
    1111# Targets 
     
    2929        -rm -rf $(DIR) 
    3030 
    31 .PHONY: compile-stage1 clean chroot compile-stage2 
     31.PHONY: clean chroot compile-stage2 
  • branches/cross/packages/xfsprogs/Makefile

    r1026 r1627  
    22 
    33NM= xfsprogs 
    4 VRS= 2.6.36 
    5 DIR= $(NM)-$(VRS) 
     4VRS= 2.8.4-1 
     5DIR= $(NM)_$(VRS) 
    66 
    7 FILE= $(DIR).src.tar.bz2 
     7FILE= $(DIR).tar.gz 
    88URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= e05d9390bfdb53e34be0a30ae495afc02ca08bad 
     9SHA-$(FILE)= c020254d5cc3abae32c7f39534727b1ad0bb3950 
    1010 
    1111# Targets 
     
    2121 
    2222compile-stage2: 
    23         patch -Np1 -i ../$(DIR)-fix_compile-1.patch 
    24 ifeq ($(LFS-ARCH),sparc64) 
    25         OPTIMIZER="-Os" CC="gcc -m64 $(64FLAGS)" make 
    26 else 
    2723        OPTIMIZER="-Os" make 
    28 endif 
    2924        make install 
    3025