Author: justin Date: 2005-11-12 13:30:23 -0700 (Sat, 12 Nov 2005) New Revision: 1063
Added: branches/dm/packages/wireless_tools/ Removed: branches/dm/packages/unionfs/unionfs-1.0.13-amd64.patch branches/dm/packages/unionfs/unionfs-1.0.14-fix_builtin-1.patch branches/dm/packages/unionfs/unionfs-1.0.14-fixes-1.patch Modified: branches/dm/TODO branches/dm/packages/LVM2/Makefile branches/dm/packages/Xorg/Makefile branches/dm/packages/coreutils/Makefile branches/dm/packages/cvs/Makefile branches/dm/packages/dialog/Makefile branches/dm/packages/findutils/Makefile branches/dm/packages/gcc/Makefile branches/dm/packages/glibc/Makefile branches/dm/packages/gpm/Makefile branches/dm/packages/less/Makefile branches/dm/packages/libpng/Makefile branches/dm/packages/man-pages/Makefile branches/dm/packages/pciutils/Makefile branches/dm/packages/portmap/Makefile branches/dm/packages/psmisc/Makefile branches/dm/packages/strace/Makefile branches/dm/packages/tcpwrappers/Makefile branches/dm/packages/thunderbird/Makefile branches/dm/packages/udev/Makefile branches/dm/packages/unionfs/Makefile branches/dm/packages/unzip/Makefile branches/dm/packages/vim/Makefile branches/dm/vars/vars.x86 Log: Merged commits 1052-1060,1062 from trunk to dm branch, to reduce diff size when we merge to trunk. Modified: branches/dm/TODO =================================================================== --- branches/dm/TODO 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/TODO 2005-11-12 20:30:23 UTC (rev 1063) @@ -2,6 +2,6 @@ * Reduce slightly the XTerm font size -* Update README/documentation for Makefiles +* Update README/documentation for Makefiles [in progress] -* Add sudo +* Add sudo, rsync, jhalfs Modified: branches/dm/packages/LVM2/Makefile =================================================================== --- branches/dm/packages/LVM2/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/LVM2/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,12 +1,12 @@ # lvm2 Makefile NM= LVM2 -VRS= 2.01.09 +VRS= 2.01.15 DIR= $(NM).$(VRS) FILE= $(DIR).tgz URL-$(FILE)= ftp://sources.redhat.com/pub/lvm2/$(FILE) -SHA-$(FILE)= 8c0149e7f9bb8a785111b4d279be5a2bf9a44cd9 +SHA-$(FILE)= 115d2ad69d2b0c280578774442c4f669bfb6cf1e # Targets Modified: branches/dm/packages/Xorg/Makefile =================================================================== --- branches/dm/packages/Xorg/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/Xorg/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -14,7 +14,7 @@ PATCH2= X11R6.8.2-src-gcc4-1.patch URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2) -SHA-$(PATCH2)= 2b63e37461eb09a12acace54c913524c38e2655d +SHA-$(PATCH2)= 1b6fc0f487fa9e4546d364e850959c7e599f6b2b PATCH3= xorg-$(VRS)-locale_names-1.patch URL-$(PATCH3)= $(HTTPBLFS)/$(NM)/$(PATCH3) Modified: branches/dm/packages/coreutils/Makefile =================================================================== --- branches/dm/packages/coreutils/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/coreutils/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,25 +1,21 @@ # Coreutils Makefile NM= coreutils -VRS= 5.2.1 +VRS= 5.93 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) -SHA-$(FILE)= 1028755ae0fa9be840576e4837004cf5a9981c45 +SHA-$(FILE)= 56d983bfb20d04ff298677e7e795956f0d44ea6f -PATCH1= $(DIR)-uname-2.patch +PATCH1= $(DIR)-uname-1.patch URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= 15e872e94319b29c3db4e9454d8d87ff3d51999b +SHA-$(PATCH1)= 42cc795e56b96994a4dc9e8f2a8dd72b6a25665f PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2) -SHA-$(PATCH2)= 29b8d86879d6e654642b51b86766c7b8b2c53066 +SHA-$(PATCH2)= 6a0098315fa9b7cb80d17dd1b146ac91fa187606 -PATCH3= $(DIR)-echo_posix-1.patch -URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3) -SHA-$(PATCH3)= b160e29015f0f9f252c948010fbb40d48ce0009a - # Targets include $(ROOT)/scripts/functions @@ -30,7 +26,7 @@ compile-stage1: ifndef CROSS - DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=$(WD) + ./configure --prefix=$(WD) else echo "utils_cv_sys_open_max=1024" >> config.cache DEFAULT_POSIX2_VERSION=199209 CC="$${CC} $(64FLAGS)" \ @@ -48,9 +44,9 @@ chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3) +stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(std_build) - cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/ + cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/ compile-stage2: ifeq ($(LFS-ARCH),x86) @@ -60,9 +56,8 @@ patch -Np1 -i ../$(PATCH1) endif patch -Np1 -i ../$(PATCH2) - patch -Np1 -i ../$(PATCH3) ifndef CROSS - DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr + ./configure --prefix=/usr else CC="gcc $(64FLAGS)" DEFAULT_POSIX2_VERSION=199209 \ ./configure --prefix=/usr Modified: branches/dm/packages/cvs/Makefile =================================================================== --- branches/dm/packages/cvs/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/cvs/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,16 +1,16 @@ # cvs Makefile NM= cvs -VRS= 1.11.20 +VRS= 1.11.21 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 47f51a96b5a73e18c96f431f3c494735aa9c0236 +SHA-$(FILE)= d114ed2943a4027f1277b04f57867a2e09a1f432 PATCH1= $(DIR)-zlib-1.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= facc13bda7cc912db51f3994a5fe9f8374837394 +SHA-$(PATCH1)= 0d20bab8a6b6e419a8c900d082b487ad6a3aec38 # Targets @@ -29,7 +29,7 @@ make $(PM) make install install -m755 -d /usr/share/doc/$(DIR) - install -m644 doc/cvs{,client}.ps /usr/share/doc/$(DIR) + install -m644 doc/*.pdf /usr/share/doc/$(DIR) clean: -rm -rf $(DIR) Modified: branches/dm/packages/dialog/Makefile =================================================================== --- branches/dm/packages/dialog/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/dialog/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,12 +1,12 @@ # Dialog Makefile NM= dialog -VRS= 1.0-20050306 +VRS= 1.0-20051107 DIR= $(NM)-$(VRS) FILE= $(DIR).tgz URL-$(FILE)= ftp://invisible-island.net/dialog/$(FILE) -SHA-$(FILE)= c99418b18e0dae9d446b6392bc4804b11d600e3a +SHA-$(FILE)= d5d80f43c08dcdc44224da8fedd83d77e6943b3f # Targets Modified: branches/dm/packages/findutils/Makefile =================================================================== --- branches/dm/packages/findutils/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/findutils/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -36,11 +36,11 @@ compile-stage2: ifndef CROSS - ./configure --prefix=/usr --libexecdir=/usr/lib/locate \ + ./configure --prefix=/usr --libexecdir=/usr/lib/findutils \ --localstatedir=/var/lib/locate else CC="gcc $(64FLAGS)" ./configure --prefix=/usr \ - --libexecdir=/usr/lib64/locate --localstatedir=/var/lib/locate + --libexecdir=/usr/lib64/findutils --localstatedir=/var/lib/locate endif make $(PM) make install Modified: branches/dm/packages/gcc/Makefile =================================================================== --- branches/dm/packages/gcc/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/gcc/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -108,7 +108,7 @@ cp $(SRC)/$(FILE) $(LFSSRC)/ compile-pass1: - ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \ + ../$(DIR)/configure --prefix=$(WD) \ --with-local-prefix=$(WD) --disable-nls --enable-shared \ --enable-languages=c make $(PM) bootstrap @@ -126,7 +126,7 @@ sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ > gcc/Makefile.in cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) - ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \ + ../$(DIR)/configure --prefix=$(WD) \ --with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \ --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \ --disable-libstdcxx-pch Modified: branches/dm/packages/glibc/Makefile =================================================================== --- branches/dm/packages/glibc/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/glibc/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -2,7 +2,7 @@ NM= glibc ifndef CROSS -VRS= 2.3.5 +VRS= 2.3.6 else VRS= 20050926 endif @@ -11,40 +11,16 @@ FILE= $(DIR).tar.bz2 ifndef CROSS URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) -SHA-$(FILE)= 465cb1f4708dfa88606379cc1ebecb724c65f027 +SHA-$(FILE)= 82d0487419f1bdbf2dee439c344e89d6af47e558 else URL-$(FILE)= ftp://sources.redhat.com/pub/glibc/snapshots/$(FILE) SHA-$(FILE)= 47753ac9e13fd955c77c3e2b2bbb278d009dcbc5 endif -FILE1= $(NM)-linuxthreads-2.3.5.tar.bz2 +FILE1= $(NM)-linuxthreads-2.3.6.tar.bz2 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1) -SHA-$(FILE1)= bfc44a76a708f905fe9c414162d5efcd3d47355f +SHA-$(FILE1)= 10190168bf948556afdfff46f87f9208402d810f -PATCH1= $(DIR)-fix_test-1.patch -URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= 40656faedabfa072c02225ba7d21fc0e76bbacb3 - -PATCH2= $(DIR)-gcc4_fix_symbols-1.patch -URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2) -SHA-$(PATCH2)= 22d71f8368cb5de8f906b2aa50f7f27ff90a832a - -PATCH3= $(DIR)-gcc4_fix_string-1.patch -URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3) -SHA-$(PATCH3)= cd0888185c423fe50da823a8d3fa1abb55913bfa - -PATCH4= $(DIR)-gcc4_fix_elf-1.patch -URL-$(PATCH4)= $(HTTP)/$(NM)/$(PATCH4) -SHA-$(PATCH4)= 5c648e3a7f7c6a80be60e4b7b99d0be915898803 - -PATCH5= $(DIR)-gcc4_fix_iconvdata-1.patch -URL-$(PATCH5)= $(HTTP)/$(NM)/$(PATCH5) -SHA-$(PATCH5)= b03258c1869d7ddb9f41e920d1b4a19a8d860a7d - -PATCH6= $(DIR)-gcc4_fix_math_tests-1.patch -URL-$(PATCH6)= $(HTTP)/$(NM)/$(PATCH6) -SHA-$(PATCH6)= 32f42c062a3a0bfa651cedf015988537ad88dcaa - PATCH30= $(DIR)-sparc_tls-1.patch URL-$(PATCH30)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH30) SHA-$(PATCH30)= 5100d3728f58bc40f7f61de10c0b7a202b876aa5 @@ -86,16 +62,11 @@ $(WD)/include/bits ifndef CROSS -stage1: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5) +stage1: $(FILE) $(FILE1) $(sep_dir_build) - cp $(SRC)/{$(FILE),$(FILE1),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)} $(LFSSRC)/ + cp $(SRC)/{$(FILE),$(FILE1)} $(LFSSRC)/ compile-stage1: - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5) ../$(DIR)/configure --prefix=$(WD) --disable-profile \ --enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \ --without-gd --with-headers=$(WD)/include --without-selinux @@ -154,18 +125,12 @@ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' ifndef CROSS -stage2: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5) $(PATCH6) +stage2: $(FILE) $(FILE1) $(sep_dir_build) - cp $(SRC)/$(PATCH6) $(LFSSRC)/ touch $@ compile-stage2: cd ../$(DIR) ; unpack ../$(FILE1) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH6) ../$(DIR)/configure --prefix=/usr --disable-profile \ --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc PARALLELMFLAGS="$(PM)" make Modified: branches/dm/packages/gpm/Makefile =================================================================== --- branches/dm/packages/gpm/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/gpm/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -10,11 +10,11 @@ PATCH1= $(DIR)-segfault-1.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= 85434264c6b790dcc16eb6f01c7ff53184b3f70a +SHA-$(PATCH1)= da53bf78a0ebaa5020e332aa6d6861159170ed86 PATCH2= $(DIR)-silent-1.patch URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2) -SHA-$(PATCH2)= 24422000764febc4049eb091d475c9751e1771f9 +SHA-$(PATCH2)= 8899a212eadfbda201d8da3e44590bd05b97f9f6 # Targets Modified: branches/dm/packages/less/Makefile =================================================================== --- branches/dm/packages/less/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/less/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -22,11 +22,10 @@ compile-stage2: ifndef CROSS - ./configure --prefix=/usr --bindir=/bin \ - --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc else CC="gcc $(64FLAGS)" ./configure --prefix=/usr \ - --bindir=/bin --sysconfdir=/etc + --sysconfdir=/etc endif make $(PM) make install Modified: branches/dm/packages/libpng/Makefile =================================================================== --- branches/dm/packages/libpng/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/libpng/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -10,7 +10,7 @@ PATCH1= $(DIR)-link_to_proper_libs-1.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= 82d5113d4e50eaa8d54f481d191e7866ec0b6123 +SHA-$(PATCH1)= 376016153e0a6f8650aea8dc754baf2679afee2a # Targets Modified: branches/dm/packages/man-pages/Makefile =================================================================== --- branches/dm/packages/man-pages/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/man-pages/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,12 +1,12 @@ # Man-pages Makefile NM= man-pages -VRS= 2.09 +VRS= 2.13 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) -SHA-$(FILE)= 45f229a7e7f694b5e61b6c6b3a6e82d5408eb6cc +SHA-$(FILE)= 85eca68ecf1ea9a0eb04d05880874932b2190d94 # Targets Modified: branches/dm/packages/pciutils/Makefile =================================================================== --- branches/dm/packages/pciutils/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/pciutils/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,12 +1,12 @@ # PCI Utilities Makefile NM= pciutils -VRS= 2.1.11 +VRS= 2.2.0 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= fa561d97033d8992d2b20c5ca928e6a2ac9ebcfb +SHA-$(FILE)= 4157acd035dc78b2a198d242c3975f289771b484 # Targets @@ -22,6 +22,9 @@ compile-stage2: make PREFIX=/usr make PREFIX=/usr install + install -m 755 -d /usr/include/pci + install -m 644 lib/*.h /usr/include/pci + install -m 644 lib/libpci.a /usr/lib update-pciids clean: Modified: branches/dm/packages/portmap/Makefile =================================================================== --- branches/dm/packages/portmap/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/portmap/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -10,11 +10,11 @@ PATCH1= $(NM)-$(VRS)-compilation_fixes-3.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= b7a2f3828026309fccc3e688d4e0dfe328163a54 +SHA-$(PATCH1)= d5ec968a1b151ac47783ba6c2b177ec0e75f8ffd PATCH2= $(NM)-$(VRS)-glibc_errno_fix-1.patch URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2) -SHA-$(PATCH2)= 6de7af3aae51d03bd5781767e0b6b09b36eeaee5 +SHA-$(PATCH2)= 96b7881d07559dfceeb9b1df9b15646d5f92f7cb # Targets Modified: branches/dm/packages/psmisc/Makefile =================================================================== --- branches/dm/packages/psmisc/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/psmisc/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,12 +1,12 @@ # Psmisc Makefile NM= psmisc -VRS= 21.6 +VRS= 21.8 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) -SHA-$(FILE)= c23b3cd41ed8e4d599dd4f2dfc22e397fc1351cf +SHA-$(FILE)= 0f45d06a63e986addb6d7fbbbf03b7befbd12593 # Targets Modified: branches/dm/packages/strace/Makefile =================================================================== --- branches/dm/packages/strace/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/strace/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -8,6 +8,10 @@ URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/$(NM)/$(FILE) SHA-$(FILE)= 1f7754e9b992a147f5313bae9125424e5b4b48a6 +PATCH1= $(DIR)-quota_fixes-1.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1) +SHA-$(PATCH1)= 93c5f9884e16668833f2e4020d60661375107d24 + # 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) ./configure --prefix=/usr make $(PM) make install Modified: branches/dm/packages/tcpwrappers/Makefile =================================================================== --- branches/dm/packages/tcpwrappers/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/tcpwrappers/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -10,7 +10,7 @@ PATCH1= tcp_wrappers-$(VRS)-shared_lib_plus_plus-1.patch URL-$(PATCH1)= $(HTTPBLFS)/tcp_wrappers/$(PATCH1) -SHA-$(PATCH1)= 3a695742d0ca38872a2672c1f0a0c038b81c2552 +SHA-$(PATCH1)= 915652d43c57f346d6f0a14eeaf706bbfed98ffa PATCH2= tcp_wrappers-$(VRS)-gcc34-1.patch URL-$(PATCH2)= $(HTTPBLFS)/tcp_wrappers/$(PATCH2) Modified: branches/dm/packages/thunderbird/Makefile =================================================================== --- branches/dm/packages/thunderbird/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/thunderbird/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -11,11 +11,11 @@ PATCH1= $(NM)-1.0.6-gcc4-1.patch URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1) -SHA-$(PATCH1)= d26a28afe3ca418a2b005daf31a561175cb664eb +SHA-$(PATCH1)= c918d248059e4f5f2f60c2f87ed3c2ebe6a91f7f PATCH2= $(NM)-1.0.6-fixes-1.patch URL-$(PATCH2)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2) -SHA-$(PATCH2)= 85108557c83d0feafba5e080fdf6247a717237c8 +SHA-$(PATCH2)= e8798ebb7e638a7f1045ff103f75935ed61f0ef4 PATCH3= $(NM)-1.0.6-locale-1.patch URL-$(PATCH3)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH3) Modified: branches/dm/packages/udev/Makefile =================================================================== --- branches/dm/packages/udev/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/udev/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -31,10 +31,7 @@ make CC="gcc $(64FLAGS)" LD="gcc $(64FLAGS)" \ EXTRAS=extras/run_directory/ endif - # DESTDIR avoids killing an existing udevd and starting a new one - make EXTRAS=extras/run_directory/ DESTDIR=/ install - # Udev-070 Makefile has a bug here - install -m755 extras/run_directory/udev_run_hotplugd /sbin + make DESTDIR=/ EXTRAS=extras/run_directory/ install sed '/KERNEL==.dm-/d' $(SRC)/$(CONFIG1) >/etc/udev/rules.d/25-lfs.rules echo 'KERNEL=="device-mapper", NAME="mapper/control"' >>/etc/udev/rules.d/25-lfs.rules echo 'KERNEL=="dm-*", NAME=""' >>/etc/udev/rules.d/25-lfs.rules Modified: branches/dm/packages/unionfs/Makefile =================================================================== --- branches/dm/packages/unionfs/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/unionfs/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,18 +1,13 @@ # Unionfs Makefile NM= unionfs -VRS= 1.0.14 +VRS= 1.1.1 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.gz URL-$(FILE)= ftp://ftp.fsl.cs.sunysb.edu/pub/$(NM)/$(FILE) -SHA-$(FILE)= 70b87ec8ae1b5b51b2d7a7b9ef4da80565ee124e +SHA-$(FILE)= ca384dafb3a01dbce6ebbb9ebe9cf2049baff994 -PATCH1= $(DIR)-fix_builtin-1.patch -PATCH2= $(DIR)-fixes-1.patch - -PATCH40= unionfs-1.0.13-amd64.patch - # Targets include $(ROOT)/scripts/functions @@ -25,21 +20,15 @@ $(std_build) compile-stage2: - patch -Np1 -i ../$(PATCH2) -ifeq ($(LFS-ARCH),x86_64) - patch -Np1 -i ../$(PATCH40) -endif make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG install strip --strip-debug /lib/modules/$(KVERS)/kernel/fs/unionfs.ko -patch-kernel: $(FILE) $(PATCH1) +patch-kernel: $(FILE) $(std_build) -rm -f $@ compile-patch-kernel: - patch -Np1 -i ../$(PATCH1) - patch -Np1 -i ../$(PATCH2) ./patch-kernel.sh $(ROOT)/$(PKG)/linux/linux-$(KVERS)/ clean: Deleted: branches/dm/packages/unionfs/unionfs-1.0.13-amd64.patch =================================================================== --- branches/dm/packages/unionfs/unionfs-1.0.13-amd64.patch 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/unionfs/unionfs-1.0.13-amd64.patch 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,21 +0,0 @@ -diff -Naur unionfs-1.0.13_orig/unionimap.c unionfs-1.0.13/unionimap.c ---- unionfs-1.0.13_orig/unionimap.c 2005-07-22 18:16:48.000000000 +0100 -+++ unionfs-1.0.13/unionimap.c 2005-08-17 18:01:10.000000000 +0100 -@@ -244,7 +244,7 @@ - "Lower-Level"); - while (read(file, (void *)&entry, sizeof(struct fmapent))) { - fprintf(stdout, "%-11lu %-8d %-22llu\n", inode++, -- entry.fsnum, entry.inode); -+ entry.fsnum, (long long unsigned int) entry.inode); - } - } - out: -@@ -293,7 +293,7 @@ - unsigned long lowerlevel = 0; - if (inode) { - fprintf(stdout, "%-11lu %-22llu\n", -- lowerlevel++, inode); -+ lowerlevel++, (long long unsigned int) inode); - } - } - } Deleted: branches/dm/packages/unionfs/unionfs-1.0.14-fix_builtin-1.patch =================================================================== --- branches/dm/packages/unionfs/unionfs-1.0.14-fix_builtin-1.patch 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/unionfs/unionfs-1.0.14-fix_builtin-1.patch 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,21 +0,0 @@ -Submitted by: Jeremy Huntwork (jhuntwork at linuxfromscratch dot org) -Date: 2005-09-15 -Initial Package Version: 1.0.14 -Origin: LFS LiveCD -Upstream Status: Submitted -Description: Fixes the Makefile used for compiling unionfs into the kernel - instead of as a module. - -diff -Naur unionfs-1.0.14.orig/Makefile.kernel unionfs-1.0.14/Makefile.kernel ---- unionfs-1.0.14.orig/Makefile.kernel 2005-09-15 14:55:43.000000000 -0400 -+++ unionfs-1.0.14/Makefile.kernel 2005-09-15 20:15:16.683211384 -0400 -@@ -1,7 +1,7 @@ - UNIONFS_VERSION = 1.0.14 --EXTRACFLAGS+=-DUNIONFS_VERSION=\"${UNIONFS_VERSION}\" -+EXTRA_CFLAGS+=-DUNIONFS_VERSION=\"$(UNIONFS_VERSION)\" - # This will disable debugging support --# EXTRACFLAGS+=-DUNIONFS_NDEBUG -+# EXTRA_CFLAGS+=-DUNIONFS_NDEBUG - - obj-$(CONFIG_UNION_FS) += unionfs.o - Deleted: branches/dm/packages/unionfs/unionfs-1.0.14-fixes-1.patch =================================================================== --- branches/dm/packages/unionfs/unionfs-1.0.14-fixes-1.patch 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/unionfs/unionfs-1.0.14-fixes-1.patch 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,20 +0,0 @@ -Submitted by: Justin Knierim (justin at linuxfromscratch dot org) -Date: 2005-09-22 -Initial Package Version: 1.0.14 -Origin: Junjiro Okajima -Upstream Status: Submitted -Description: Fixes a off by one error in unionfs which causes - instability when a file is overwritten multiple times. - -diff -Naur unionfs-orig/inode.c unionfs-1.0.14/inode.c ---- unionfs-orig/inode.c 2005-09-15 14:55:43.000000000 -0400 -+++ unionfs-1.0.14/inode.c 2005-09-22 21:38:14.000000000 -0400 -@@ -45,7 +45,7 @@ - hidden_dentry = dtohd(dentry); - - /* check if whiteout exists in this branch, i.e. lookup .wh.foo first */ -- name = KMALLOC(dentry->d_name.len + sizeof(".wh"), GFP_UNIONFS); -+ name = KMALLOC(dentry->d_name.len + sizeof(".wh."), GFP_UNIONFS); - if (!name) { - err = -ENOMEM; - goto out; Modified: branches/dm/packages/unzip/Makefile =================================================================== --- branches/dm/packages/unzip/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/unzip/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -10,15 +10,15 @@ PATCH1= $(DIR)-fix_Makefile-1.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) -SHA-$(PATCH1)= 866108c75e4d0cdafe4b74db73a753ef6cb00e69 +SHA-$(PATCH1)= 48f4cbbc21f2562a6957dcf7532df6f84c3b1cdc PATCH2= $(DIR)-fix_libz-1.patch URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2) -SHA-$(PATCH2)= fdd84b0ae1aa71b06e0aef849ee7be417ce122a1 +SHA-$(PATCH2)= 166a01de3d461d9083846f542a625b1c5f87634b PATCH3= $(DIR)-dont_make_noise-1.patch URL-$(PATCH3)= $(HTTPBLFS)/$(NM)/$(PATCH3) -SHA-$(PATCH3)= d267d4fc0320906ea2ef37e5292644b86a4fb904 +SHA-$(PATCH3)= 9e8f063e70370968a860d3bddeb37c43391f7a3c # Targets Modified: branches/dm/packages/vim/Makefile =================================================================== --- branches/dm/packages/vim/Makefile 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/packages/vim/Makefile 2005-11-12 20:30:23 UTC (rev 1063) @@ -43,7 +43,7 @@ ./configure --prefix=/usr --enable-multibyte endif make $(PM) - make install + make HELPSUBLOC=/usr/share/doc/vim-6.4 install ln -sf vim /usr/bin/vi cp $(ROOT)/etc/vimrc /etc Copied: branches/dm/packages/wireless_tools (from rev 1059, trunk/packages/wireless_tools) Modified: branches/dm/vars/vars.x86 =================================================================== --- branches/dm/vars/vars.x86 2005-11-11 16:24:22 UTC (rev 1062) +++ branches/dm/vars/vars.x86 2005-11-12 20:30:23 UTC (rev 1063) @@ -1,4 +1,4 @@ -export VERSION := x86-6.2-pre1 +export VERSION := x86-6.2-pre2 export CFLAGS := -Os -s -march=i486 export LIB_MAYBE64 := lib export KERNEL_ARCH := i386 -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
