Author: jhuntwork Date: 2005-04-15 19:27:19 -0600 (Fri, 15 Apr 2005) New Revision: 82
Modified: trunk/packages/linux/Makefile trunk/packages/pciutils/Makefile Log: Adjusted kernel install and adjusted pciutils to update its ids file (Thanks, Randy McMurchy) Modified: trunk/packages/linux/Makefile =================================================================== --- trunk/packages/linux/Makefile 2005-04-16 00:44:38 UTC (rev 81) +++ trunk/packages/linux/Makefile 2005-04-16 01:27:19 UTC (rev 82) @@ -5,12 +5,10 @@ VRS= 2.6.11.6 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 -FILE1= $(PATCH2).gz -PATCH1= reiser4-for-2.6.11-1 -PATCH2= squashfs2.1-patch -PATCH3= $(DIR)-reiser4_missing_export-1.patch +PATCH1= squashfs2.1-patch +PATCH2= $(DIR)-reiser4_missing_export-1.patch URL= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -URL1= http://ftp.namesys.com/pub/reiser4-for-2.6/$(VRS)/$(FILE1) +URL1= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.11/broken-out #RULES @@ -24,11 +22,12 @@ @echo "=====> Building $(NM) in chroot" @echo "" @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC) ; fi - @if [ ! -f $(PATCH1) ] ; then $(WGET) $(URL1) && gunzip $(FILE1) ; fi @if [ ! -f /boot/isolinux/linux ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ - patch -Np1 -i ../$(PATCH1) && \ - patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH2) && \ - patch -Np1 -i ../$(PATCH3) && \ + $(WGET) $(URL1).1/serie && \ + for i in `cat serie` ; do $(WGET) $(URL1).2/$i && \ + mv $i ../ && patch -Np1 -i ../$i ; done && \ + patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH1) && \ + patch -Np1 -i ../$(PATCH2) && \ make mrproper && \ cp $(ROOT)/linux/config .config && \ make -j3 && \ Modified: trunk/packages/pciutils/Makefile =================================================================== --- trunk/packages/pciutils/Makefile 2005-04-16 00:44:38 UTC (rev 81) +++ trunk/packages/pciutils/Makefile 2005-04-16 01:27:19 UTC (rev 82) @@ -20,8 +20,9 @@ @echo "" @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi @if [ ! -f /usr/lib/libaal.so ] ; then tar xzvf $(FILE) && cd $(DIR) && \ - make -j3 PREFIX=/usr && \ - make PREFIX=/usr install ; fi + make PREFIX=/usr && \ + make PREFIX=/usr install && \ + update-pciids ; fi @make clean clean: -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
