Author: alexander Date: 2007-04-13 09:37:49 -0600 (Fri, 13 Apr 2007) New Revision: 1829
Added: trunk/packages/LFS-BOOK/update.patch Modified: trunk/packages/LFS-BOOK/Makefile trunk/packages/bash/Makefile trunk/packages/binutils/Makefile trunk/packages/docbook-xml/Makefile trunk/packages/docbook-xml/install trunk/packages/docbook-xsl/Makefile trunk/packages/docbook-xsl/install trunk/packages/gcc/Makefile trunk/packages/glibc/Makefile trunk/packages/iproute2/Makefile trunk/packages/linux-headers/Makefile trunk/packages/linux/Makefile trunk/packages/linux64/Makefile trunk/packages/notification-daemon-xfce/Makefile trunk/packages/readline/Makefile trunk/packages/shadow/Makefile Log: Updated LFS packages Modified: trunk/packages/LFS-BOOK/Makefile =================================================================== --- trunk/packages/LFS-BOOK/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/LFS-BOOK/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -10,7 +10,7 @@ #URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 -REV= 7961 +REV= 8043 REVPARM= -r $(REV) URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK @@ -34,6 +34,7 @@ compile-stage2: svn co $(REVPARM) $(URL) $(DIR) + cd $(DIR) ; patch -Np0 -i ../../update.patch # tar xf $(FILE) cd $(DIR) ; make BASEDIR=../$(HTMLDIR) cp -av $(DIR) $(HTMLDIR) /usr/share Added: trunk/packages/LFS-BOOK/update.patch =================================================================== --- trunk/packages/LFS-BOOK/update.patch (rev 0) +++ trunk/packages/LFS-BOOK/update.patch 2007-04-13 15:37:49 UTC (rev 1829) @@ -0,0 +1,18 @@ +Index: packages.ent +=================================================================== +--- packages.ent (revision 8043) ++++ packages.ent (working copy) +@@ -299,11 +299,11 @@ + + <!ENTITY linux-major-version "2.6"> + <!ENTITY linux-minor-version "20"> +-<!ENTITY linux-patch-version "4"> ++<!ENTITY linux-patch-version "6"> + <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> + <!ENTITY linux-size "42,359 KB"> + <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2"> +-<!ENTITY linux-md5 "ad6df0431ce9eb91dd558538e71239de"> ++<!ENTITY linux-md5 "dc2f9b8c76d75802d39ad2a99de587d9"> + <!ENTITY linux-home "http://www.kernel.org/";> + <!ENTITY linux-ch8-du "310 - 390 MB"> + <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU"> Modified: trunk/packages/bash/Makefile =================================================================== --- trunk/packages/bash/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/bash/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -8,9 +8,9 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= fe6466c7ee98061e044dae0347ca5d1a8eab4a0d -PATCH1= $(DIR)-fixes-2.patch +PATCH1= $(DIR)-fixes-4.patch URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) -SHA-$(PATCH1)= 49bd15ad3579e69b841741408fd2bb3c63119376 +SHA-$(PATCH1)= 7c6207253e2201a2b9d8d925250e3ef0c23d44ef FILE1 = $(NM)-doc-$(VRS).tar.gz URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1) Modified: trunk/packages/binutils/Makefile =================================================================== --- trunk/packages/binutils/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/binutils/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -43,7 +43,7 @@ compile-pass2: # --disable-shared overrides unsuitable default from config.site - ../$(DIR)/configure --prefix=$(WD) --disable-nls \ + CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) --disable-nls \ --with-lib-path=$(WD)/lib --disable-shared make make install @@ -60,10 +60,11 @@ mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old} mv -v $(WD)/bin/{ld-new,ld} ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld - gcc -dumpspecs | \ - perl -p -e '[EMAIL PROTECTED](WD)/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' > \ - `dirname $$(gcc -print-libgcc-file-name)`/specs + gcc -dumpspecs | sed \ + -e 's@/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED]' \ + -e '/\*startfile_prefix_spec:/{n;[EMAIL PROTECTED]@/usr/lib/ @}' \ + -e '/\*cpp:/{n;[EMAIL PROTECTED]@ -isystem /usr/[EMAIL PROTECTED]' > \ + `dirname $(gcc --print-libgcc-file-name)`/specs touch $@ chroot: Modified: trunk/packages/docbook-xml/Makefile =================================================================== --- trunk/packages/docbook-xml/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/docbook-xml/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,12 +1,13 @@ # DocBook XML DTD Makefile NM= docbook-xml -VRS= 4.4 +VRS= 4.5 +OLDVERSIONS= 4.1.2 4.2 4.3 4.4 DIR= $(NM)-$(VRS) FILE= $(DIR).zip URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 7c4d91c82ad3747e1b5600c91782758e5d91c22b +SHA-$(FILE)= b9124233b50668fb508773aa2b3ebc631d7c1620 # Targets @@ -16,7 +17,7 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) +stage2: Makefile $(FILE) install mkdir $(DIR) cd $(DIR) ; unzip ../$(FILE) make -C $(DIR) -f ../Makefile compile-$@ @@ -24,7 +25,7 @@ touch $@ compile-stage2: - ../install + ../install $(VRS) $(OLDVERSIONS) clean: -rm -rf $(DIR) Modified: trunk/packages/docbook-xml/install =================================================================== --- trunk/packages/docbook-xml/install 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/docbook-xml/install 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,75 +1,83 @@ -#!/bin/bash -install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.4 && -install -v -d -m755 /etc/xml && -chown -R root:root . && -cp -v -af docbook.cat *.dtd ent/ *.mod /usr/share/xml/docbook/xml-dtd-4.4 && +#!/bin/bash -e + +VERSION=$1 +shift +OLDVERSIONS="$@" + +install -v -d -m755 /usr/share/xml/docbook/xml-dtd-$VERSION +install -v -d -m755 /etc/xml +chown -R root:root . +cp -v -af docbook.cat *.dtd ent/ *.mod /usr/share/xml/docbook/xml-dtd-$VERSION + if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create /etc/xml/docbook -fi && +fi + xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; \ - /etc/xml/docbook && + "-//OASIS//DTD DocBook XML V$VERSION//EN" \ + "http://www.oasis-open.org/docbook/xml/$VERSION/docbookx.dtd"; \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/calstblx.dtd" \ - /etc/xml/docbook && + "-//OASIS//DTD DocBook XML CALS Table Model V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/calstblx.dtd" \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/soextblx.dtd" \ - /etc/xml/docbook && + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/soextblx.dtd" \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/dbpoolx.mod" \ - /etc/xml/docbook && + "-//OASIS//ELEMENTS DocBook XML Information Pool V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/dbpoolx.mod" \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/dbhierx.mod" \ - /etc/xml/docbook && + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/dbhierx.mod" \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/htmltblx.mod" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/htmltblx.mod" \ /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/dbnotnx.mod" \ - /etc/xml/docbook && + "-//OASIS//ENTITIES DocBook XML Notations V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/dbnotnx.mod" \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/dbcentx.mod" \ - /etc/xml/docbook && + "-//OASIS//ENTITIES DocBook XML Character Entities V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/dbcentx.mod" \ + /etc/xml/docbook xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4/dbgenent.mod" \ - /etc/xml/docbook && + "-//OASIS//ENTITIES DocBook XML Additional General Entities V$VERSION//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION/dbgenent.mod" \ + /etc/xml/docbook xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.4"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.4" \ - /etc/xml/docbook && + "http://www.oasis-open.org/docbook/xml/$VERSION"; \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION" \ + /etc/xml/docbook xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.4"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.4" \ - /etc/xml/docbook && + "http://www.oasis-open.org/docbook/xml/$VERSION"; \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION" \ + /etc/xml/docbook + if [ ! -e /etc/xml/catalog ]; then xmlcatalog --noout --create /etc/xml/catalog -fi && +fi xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && + /etc/xml/catalog xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && + /etc/xml/catalog xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/"; \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && + /etc/xml/catalog xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/"; \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && -for DTDVERSION in 4.1.2 4.2 4.3 + /etc/xml/catalog +for DTDVERSION in $OLDVERSIONS do xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \ @@ -77,11 +85,11 @@ /etc/xml/docbook xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION" \ /etc/xml/docbook xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \ - "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + "file:///usr/share/xml/docbook/xml-dtd-$VERSION" \ /etc/xml/docbook xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION/"; \ Modified: trunk/packages/docbook-xsl/Makefile =================================================================== --- trunk/packages/docbook-xsl/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/docbook-xsl/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -2,6 +2,7 @@ NM= docbook-xsl VRS= 1.69.1 +OLDVERSIONS= 1.67.2 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 @@ -20,12 +21,12 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE1) +stage2: Makefile $(FILE) $(FILE1) install $(std_build) compile-stage2: cd .. ; unpack $(FILE1) - ../install + ../install $(VRS) $(OLDVERSIONS) ln -sf xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current clean: Modified: trunk/packages/docbook-xsl/install =================================================================== --- trunk/packages/docbook-xsl/install 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/docbook-xsl/install 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,37 +1,45 @@ -#!/bin/bash +#!/bin/bash -e -install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.69.1 && +VERSION=$1 +shift +OLDVERSIONS="$@" + +install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-$VERSION cp -v -R VERSION common eclipse extensions fo html \ htmlhelp images javahelp lib manpages params \ profiling slides template website xhtml \ - /usr/share/xml/docbook/xsl-stylesheets-1.69.1 && -install -v -m755 -d /usr/share/doc/docbook-xsl-1.69.1 && -cp -v -R doc/* /usr/share/doc/docbook-xsl-1.69.1 && -if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi && + /usr/share/xml/docbook/xsl-stylesheets-$VERSION +install -v -m755 -d /usr/share/doc/docbook-xsl-$VERSION +cp -v -R doc/* /usr/share/doc/docbook-xsl-$VERSION +if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi if [ ! -f /etc/xml/catalog ]; then xmlcatalog --noout --create /etc/xml/catalog -fi && +fi xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/1.69.1"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog && + "http://docbook.sourceforge.net/release/xsl/$VERSION"; \ + "/usr/share/xml/docbook/xsl-stylesheets-$VERSION" \ + /etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/1.69.1"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog && + "http://docbook.sourceforge.net/release/xsl/$VERSION"; \ + "/usr/share/xml/docbook/xsl-stylesheets-$VERSION" \ + /etc/xml/catalog xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog && + "/usr/share/xml/docbook/xsl-stylesheets-$VERSION" \ + /etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog && -xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/1.67.2"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ - /etc/xml/catalog && -xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/1.67.2"; \ - "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \ + "/usr/share/xml/docbook/xsl-stylesheets-$VERSION" \ /etc/xml/catalog + +for OLDVERSION in $OLDVERSIONS +do + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/$OLDVERSION"; \ + "/usr/share/xml/docbook/xsl-stylesheets-$VERSION" \ + /etc/xml/catalog + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/$OLDVERSION"; \ + "/usr/share/xml/docbook/xsl-stylesheets-$VERSION" \ + /etc/xml/catalog +done Modified: trunk/packages/gcc/Makefile =================================================================== --- trunk/packages/gcc/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/gcc/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -52,7 +52,7 @@ chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' -stage2: $(FILE) +stage2: $(FILE) $(PATCH1) $(sep_dir_build) compile-stage2: Modified: trunk/packages/glibc/Makefile =================================================================== --- trunk/packages/glibc/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/glibc/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -55,6 +55,7 @@ # LiveCD specific locale additions cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50) # --enable-static overrides the unsuitable default in config.site + sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in ../$(DIR)/configure --prefix=/usr --disable-profile \ --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \ --enable-static Modified: trunk/packages/iproute2/Makefile =================================================================== --- trunk/packages/iproute2/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/iproute2/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,13 +1,13 @@ # Iproute2 Makefile -NM= iproute2 -VRS= 2.6.19 -DATE= 061214 +NM= iproute +VRS= 2.6.20 +DATE= 070313 DIR= $(NM)-$(VRS)-$(DATE) -FILE= $(DIR).tar.gz +FILE= $(NM)2-$(VRS)-$(DATE).tar.gz URL-$(FILE)= http://developer.osdl.org/dev/iproute2/download/$(FILE) -SHA-$(FILE)= f48c783c37e09a212cde65ae0370468af634fd65 +SHA-$(FILE)= 6c46d381a9840c94a12faf3b2d64577c4e74323d # Targets Modified: trunk/packages/linux/Makefile =================================================================== --- trunk/packages/linux/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/linux/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,12 +1,12 @@ # Linux Kernel Makefile NM= linux -VRS= 2.6.20.1 +VRS= 2.6.20.6 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -SHA-$(FILE)= 2a53ce04db3500d55433c9a25b2949eb342589e0 +SHA-$(FILE)= 1b26729429000688b4052a1a79b27d427208634b PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch Modified: trunk/packages/linux-headers/Makefile =================================================================== --- trunk/packages/linux-headers/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/linux-headers/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,12 +1,12 @@ # Linux-headers Makefile NM= linux -VRS= 2.6.20.1 +VRS= 2.6.20.6 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -SHA-$(FILE)= 2a53ce04db3500d55433c9a25b2949eb342589e0 +SHA-$(FILE)= 1b26729429000688b4052a1a79b27d427208634b # Targets @@ -29,6 +29,7 @@ $(std_build) compile-stage2: + sed -i '/scsi/d' include/Kbuild make mrproper make headers_check make INSTALL_HDR_PATH=/usr headers_install Modified: trunk/packages/linux64/Makefile =================================================================== --- trunk/packages/linux64/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/linux64/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,12 +1,12 @@ # Linux Kernel Makefile NM= linux -VRS= 2.6.20.1 +VRS= 2.6.20.6 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -SHA-$(FILE)= 2a53ce04db3500d55433c9a25b2949eb342589e0 +SHA-$(FILE)= 1b26729429000688b4052a1a79b27d427208634b PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch Modified: trunk/packages/notification-daemon-xfce/Makefile =================================================================== --- trunk/packages/notification-daemon-xfce/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/notification-daemon-xfce/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -21,7 +21,7 @@ compile-stage2: sed -i 's/glib-server/glib-server --prefix=/' src/daemon/Makefile.in - ./configure --prefix=/usr + ./configure --prefix=/usr --libexecdir=/usr/sbin make make install Modified: trunk/packages/readline/Makefile =================================================================== --- trunk/packages/readline/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/readline/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -8,9 +8,9 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= 18f3412c73068509d5f491b7b4535aeaf9522834 -PATCH1= $(DIR)-fixes-1.patch +PATCH1= $(DIR)-fixes-2.patch URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) -SHA-$(PATCH1)= 08d64da9885d1616e715d009fba1e93103193718 +SHA-$(PATCH1)= 738883d299e0dafa403e4d6df4dd22bf3c02efad # Targets Modified: trunk/packages/shadow/Makefile =================================================================== --- trunk/packages/shadow/Makefile 2007-04-05 11:48:54 UTC (rev 1828) +++ trunk/packages/shadow/Makefile 2007-04-13 15:37:49 UTC (rev 1829) @@ -1,13 +1,17 @@ # Shadow Makefile NM= shadow -VRS= 4.0.17 +VRS= 4.0.18.1 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) -SHA-$(FILE)= 326b3de0a81c1e1f9bfc75e67d45678c14fe282d +SHA-$(FILE)= 1a30458e9db05560bfc82529048bd5d60b45cf9b +PATCH1= $(DIR)-useradd_fix-2.patch +URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) +SHA-$(PATCH1)= 08618217ae8ce554f7d7171b7a920cb7c31254c0 + # Targets include $(ROOT)/scripts/functions @@ -16,10 +20,11 @@ chroot "$(MP)" $(chenv-post-bash) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) +stage2: Makefile $(FILE) $(PATCH1) $(std_build) compile-stage2: + patch -Np1 -i ../$(PATCH1) ./configure --libdir=/lib --sysconfdir=/etc --enable-shared --without-selinux sed -i 's/groups$$(EXEEXT) //' src/Makefile find man -name Makefile -exec sed -i '/groups/d' {} \; @@ -49,6 +54,8 @@ mkdir -pv /etc/default pwconv grpconv + useradd -D -b /home + sed -i 's/yes/no/' /etc/default/useradd clean: -rm -rf $(DIR) -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
