Author: alexander Date: 2006-08-02 03:26:49 -0600 (Wed, 02 Aug 2006) New Revision: 1685
Modified: trunk/packages/db/Makefile trunk/packages/glibc/Makefile trunk/packages/grub/Makefile trunk/packages/linux-libc-headers/Makefile trunk/packages/linux/Makefile trunk/packages/module-init-tools/Makefile trunk/packages/vim/Makefile Log: Added more LFS patches Modified: trunk/packages/db/Makefile =================================================================== --- trunk/packages/db/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/db/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -8,6 +8,10 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b +PATCH1= $(DIR)-trap-1.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1) +SHA-$(PATCH1)= ff4a3c37890d581cb589829b5dbb5a40d1b797ac + # Targets include $(ROOT)/scripts/functions @@ -16,11 +20,12 @@ chroot "$(MP)" $(chenv-post-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) +stage2: Makefile $(FILE) $(PATCH1) $(std_build) - cp $(SRC)/$(FILE) $(LFSSRC) + cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC) compile-stage2: + patch -Np0 -i ../$(PATCH1) cd build_unix ; ../dist/configure --prefix=/usr \ --enable-compat185 --enable-cxx cd build_unix ; make Modified: trunk/packages/glibc/Makefile =================================================================== --- trunk/packages/glibc/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/glibc/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -17,6 +17,10 @@ URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) SHA-$(PATCH1)= 0bdf2b15e20c176caf3c85e5b6a7bc957f636d6a +PATCH2= $(NM)-$(VRS)-inotify-1.patch +URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH2) +SHA-$(PATCH2)= d282d10108a4f6b9c6eddc4351a83abe22a5b5b6 + PATCH50= $(DIR)-supported_locales-2.patch # Targets @@ -43,14 +47,15 @@ chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: $(FILE) $(FILE2) $(PATCH1) +stage2: $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(sep_dir_build) - cp $(SRC)/$(PATCH1) $(LFSSRC)/ + cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/ touch $@ compile-stage2: cd ../$(DIR) ; unpack ../$(FILE2) cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) + cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2) # The vi_VN.TCVN locale doesn't work, testcase: "LC_ALL=vi_VN.TCVN bash" # Result: the prompt never comes back, CPU utilization is 100% # (This may be a bash bug. Not reproducible on Debian Etch, though) @@ -67,6 +72,7 @@ -make -k check touch /etc/ld.so.conf PARALLELMFLAGS="$(PM)" make install + cp -v ../$(DIR)/sysdeps/unix/sysv/linux/inotify.h /usr/include/sys PARALLELMFLAGS="$(PM)" make localedata/install-locales cp $(ROOT)/etc/nsswitch.conf /etc cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime Modified: trunk/packages/grub/Makefile =================================================================== --- trunk/packages/grub/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/grub/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -8,6 +8,10 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= 2580626c4579bd99336d3af4482c346c95dac4fb +PATCH1= $(DIR)-disk_geometry-1.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1) +SHA-$(PATCH1)= 651801fe6d851c9f59ccd16b6bd49f1358c9594c + # Targets include $(ROOT)/scripts/functions @@ -16,12 +20,13 @@ chroot "$(MP)" $(chenv-post-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) +stage2: Makefile $(FILE) $(PATCH1) $(std_build) - cp $(SRC)/$(FILE) $(LFSSRC) + cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC) compile-stage2: ifeq ($(LFS-ARCH),x86) + patch -Np1 -i ../$(PATCH1) ./configure --prefix=/usr make $(PM) make install Modified: trunk/packages/linux/Makefile =================================================================== --- trunk/packages/linux/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/linux/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -21,7 +21,7 @@ SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819 PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch -URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH50) +URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 # Targets Modified: trunk/packages/linux-libc-headers/Makefile =================================================================== --- trunk/packages/linux-libc-headers/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/linux-libc-headers/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -8,6 +8,10 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= e72c9b260995b269c9fb9248ed468c18fb01f3fd +PATCH1= $(DIR)-inotify-3.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1) +SHA-$(PATCH1)= 724f0340907df408d17650fd2e58448d0a9e1799 + include $(ROOT)/packages/$(NM)/$(ARCHVARS) # Targets @@ -27,10 +31,12 @@ chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: $(FILE) +stage2: $(FILE) $(PATCH1) $(std_build) + cp $(SRC)/$(PATCH1) $(LFSSRC) compile-stage2: + patch -Np1 -i ../$(PATCH1) install -dv /usr/include/asm cp -Rv include/$(LLH_ASM)/* /usr/include/asm cp -Rv include/linux /usr/include Modified: trunk/packages/module-init-tools/Makefile =================================================================== --- trunk/packages/module-init-tools/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/module-init-tools/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -9,7 +9,7 @@ SHA-$(FILE)= b51e8ac170be23a1f2e301a1dddd47a47ec2186a PATCH1= $(DIR)-modprobe-1.patch -URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1) SHA-$(PATCH1)= 0caecb2078cc47c97e496e2e4717b8b82a52eb01 # Targets Modified: trunk/packages/vim/Makefile =================================================================== --- trunk/packages/vim/Makefile 2006-07-30 08:30:44 UTC (rev 1684) +++ trunk/packages/vim/Makefile 2006-08-02 09:26:49 UTC (rev 1685) @@ -12,14 +12,18 @@ URL-$(FILE2)= http://ftp.vim.org/pub/vim/extra/$(FILE2) SHA-$(FILE2)= 3db6b0004d213490cc00d361835e7a7c685adb52 -PATCH1= $(NM)-$(VRS)-fixes-3.patch -URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) -SHA-$(PATCH1)= 32eb47a09feeb33deeeca7d397aa4580353b1073 +PATCH1= $(NM)-$(VRS)-fixes-7.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1) +SHA-$(PATCH1)= caf8b4b5635cf72edd033b048a993f80c5a5aa7b PATCH2= $(NM)-$(VRS)-mandir-1.patch -URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH2) +URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH2) SHA-$(PATCH2)= 182f46dfacefdd3bf6f821dea71f90547d414230 +PATCH3= $(NM)-$(VRS)-spellfile-1.patch +URL-$(PATCH3)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH3) +SHA-$(PATCH3)= 4e0cb489a9b8f989f154d14cadb50deba619dd2b + # Targets include $(ROOT)/scripts/functions @@ -32,14 +36,15 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) +stage2: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(std_build) - cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC) + cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC) compile-stage2: unpack ../$(FILE2) --strip-components=1 patch -Np1 -i ../$(PATCH1) patch -Np1 -i ../$(PATCH2) + patch -Np1 -i ../$(PATCH3) echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h ./configure --prefix=/usr --enable-multibyte make $(PM) @@ -52,13 +57,14 @@ ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS) cp $(ROOT)/etc/vimrc /etc -stage3: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) +stage3: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(std_build) compile-stage3: unpack ../$(FILE2) --strip-components=1 patch -Np1 -i ../$(PATCH1) patch -Np1 -i ../$(PATCH2) + patch -Np1 -i ../$(PATCH3) echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h ./configure --prefix=/usr --with-features=huge -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
