Author: jhuntwork
Date: 2005-04-15 17:55:52 -0600 (Fri, 15 Apr 2005)
New Revision: 77
Added:
trunk/uname/uname
Modified:
trunk/Makefile
trunk/packages/binutils/Makefile
trunk/packages/coreutils/Makefile
trunk/packages/e2fsprogs/Makefile
trunk/packages/gcc/Makefile
trunk/packages/hotplug/Makefile
trunk/packages/iproute2/Makefile
trunk/packages/lfs-bootscripts/Makefile
trunk/packages/linux-libc-headers/Makefile
trunk/packages/linux/Makefile
trunk/packages/m4/Makefile
trunk/packages/shadow/Makefile
trunk/packages/tar/Makefile
trunk/packages/wget/Makefile
Log:
More package and command upgrades for in order to build current 6.1
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -64,7 +64,7 @@
# The make build starts and ends here, first building the dependency targets,
-# lfs-base, extend-lfs and iso, then it echos a handy notice that it's
finished. :)
+# lfs-base, extend-lfs and iso, then it echos a notice that it's finished. :)
all: lfs-base extend-lfs iso
@echo "The livecd, $(MKTREE)/lfslivecd-$(VERSION).iso, is ready!"
@@ -103,6 +103,7 @@
@if [ ! -f $(PKG)/wget/.pass2 ] ; then make lfs-rm-wget && make
lfs-wget ; fi
@touch $(PKG)/wget/.pass2
@make prep-chroot
+ @ln -sf ${WD}/bin/bash ${MP}/bin/bash
@chroot "$(MP)" $(chenv1) 'set +h && chown -R 0:0 $(WD) $(SRC) $(ROOT)
&& cd $(ROOT) && make pre-bash $(chbash1)'
@chroot "$(MP)" $(chenv2) 'set +h && cd $(ROOT) && make post-bash
$(chbash2)'
@@ -138,6 +139,9 @@
@$(MAKE) -C $(PKG)/wget prebuild
unamemod:
+ @if [ ! -d ${WD}/bin ] ; then mkdir ${WD}/bin ; fi
+ @install -m 755 uname/uname ${WD}/bin/
+ @touch unamemod
tools: pre-which pre-wget lfs-binutils-pass1-scpt lfs-gcc-pass1-scpt
lfs-linux-libc-headers-scpt lfs-glibc-scpt \
lfs-adjust-toolchain-scpt lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt
lfs-gcc-pass2-scpt lfs-binutils-pass2-scpt \
@@ -1305,7 +1309,7 @@
@-userdel lfs
@-groupdel lfs
@-rm -rf /home/lfs
- @-rm {prepiso,lfsuser,lfs-strip,lfs-strip-scpt}
+ @-rm {prepiso,lfsuser,lfs-strip,lfs-strip-scpt,unamemod}
@-rm $(PKG)/binutils/{,re-}adjust-toolchain
@-for i in `ls $(PKG)` ; do $(MAKE) -C $(PKG)/$$i clean ; done
@-var=`find packages -name ".pass2"` && for i in $$var ; do rm -rf $$i
; done
@@ -1329,7 +1333,7 @@
@-umount $(MP)/proc
@-umount $(MP)/sys
-.PHONY: lfs-base pre-which pre-wget tools prep-chroot chroot createdirs
createfiles popdev unamemod \
+.PHONY: lfs-base pre-which pre-wget tools prep-chroot chroot createdirs
createfiles popdev \
clean scrub unloadmodule unmount lfs-wget lfs-rm-wget
lfs-binutils-pass1 lfs-gcc-pass1 \
lfs-linux-libc-headers lfs-glibc lfs-adjust-toolchain lfs-tcl
lfs-expect lfs-dejagnu lfs-gcc-pass2 \
lfs-binutils-pass2 lfs-gawk lfs-coreutils lfs-bzip2 lfs-gzip
lfs-diffutils lfs-findutils lfs-make \
Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/binutils/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -19,7 +19,7 @@
mv $(FILE) $(SRC) ; fi
@if [ ! -f $(WD)/bin/ld ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR)
&& \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=$(WD) --host=$(CHOST) --target=$(CHOST)
--disable-nls && make && \
+ ../$(DIR)/configure --prefix=$(WD) --disable-nls && make && \
make install && \
make -C ld clean && \
make -j3 -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib ; fi
@@ -41,7 +41,7 @@
mv $(FILE) $(SRC) ; fi
@if [ ! -f .pass2 ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=$(WD) --host=$(CHOST) --target=$(CHOST) \
+ ../$(DIR)/configure --prefix=$(WD) \
--enable-shared --with-lib-path=$(WD)/lib && \
make -j3 && \
make install && \
@@ -69,7 +69,7 @@
mv $(FILE) $(SRC) ; fi
@if [ ! -f /usr/bin/ld ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) &&
\
mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=/usr --host=$(CHOST) --target=$(CHOST)
--enable-shared && \
+ ../$(DIR)/configure --prefix=/usr --enable-shared && \
make -j3 tooldir=/usr && \
make tooldir=/usr install && \
cp ../$(DIR)/include/libiberty.h /usr/include ; fi
Modified: trunk/packages/coreutils/Makefile
===================================================================
--- trunk/packages/coreutils/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/coreutils/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -22,7 +22,9 @@
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
@if [ ! -f $(WD)/bin/ls ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR)
&& \
- DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=$(WD) && make -j3
&& make install ; fi
+ DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=$(WD) && make -j3
&& make install && \
+ mv ${WD}/bin/uname ${WD}/bin/uname.real && \
+ install -m 755 ${MP}${ROOT}/uname/uname ${WD}/bin/ ; fi
@make clean
chroot:
@@ -47,7 +49,9 @@
$(WD)/bin/mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin && \
mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin && \
mv /usr/bin/chroot /usr/sbin && \
- ln -s ../../bin/install /usr/bin ; fi
+ ln -s ../../bin/install /usr/bin && \
+ mv /bin/uname /bin/uname.real && \
+ install -m 755 ${ROOT}/uname/uname /bin/ ; fi
@make clean
Modified: trunk/packages/e2fsprogs/Makefile
===================================================================
--- trunk/packages/e2fsprogs/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/e2fsprogs/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -22,6 +22,7 @@
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
@if [ ! -f /sbin/mke2fs ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR)
&& \
+ sed -i -e 's/-DTEST/$(ALL_CFLAGS) &/' lib/e2p/Makefile.in && \
mkdir build && cd build && \
../configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs
--disable-evms && \
make && make install && make install-libs ; fi
Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/gcc/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -30,7 +30,7 @@
if [ ! -f $(WD)/bin/$(NM) ] ; then tar xjvf $(SRC)/$(FILE1) && cd
$(DIR) && \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib
--with-local-prefix=$(WD) \
- --disable-nls --enable-shared --host=$(CHOST) --target=$(CHOST) && \
+ --disable-nls --enable-shared && \
make -j3 bootstrap && \
make install && ln -s gcc $(WD)/bin/cc ; fi
@make clean
@@ -81,7 +81,7 @@
sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in && \
mkdir ../$(NM)-build && cd ../$(NM)-build && \
../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib
--enable-shared --enable-threads=posix \
- --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++
--host=$(CHOST) --target=$(CHOST) && \
+ --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ &&
\
make -j3 && make install && ln -s ../usr/bin/cpp /lib && ln -s gcc
/usr/bin/cc ; fi
@make clean
Modified: trunk/packages/hotplug/Makefile
===================================================================
--- trunk/packages/hotplug/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/hotplug/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -25,7 +25,9 @@
make install && \
cp etc/hotplug/pnp.distmap /etc/hotplug && \
rm -rf /etc/init.d && \
- rm -f /etc/hotplug/net.agent ; fi
+ rm -f /etc/hotplug/net.agent && \
+ touch /var/log/hotplug/events && \
+ mkdir /lib/firmware ; fi
@make clean
Modified: trunk/packages/iproute2/Makefile
===================================================================
--- trunk/packages/iproute2/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/iproute2/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -3,7 +3,7 @@
# Package versions
NM= iproute2
VRS= 2.6.11
-DATE= 050314
+DATE= 050330
DIR= $(NM)-$(VRS)
FILE= $(NM)-$(VRS)-$(DATE).tar.bz2
PATCH= $(NM)-$(VRS)_$(DATE)-remove_db-1.patch
Modified: trunk/packages/lfs-bootscripts/Makefile
===================================================================
--- trunk/packages/lfs-bootscripts/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/lfs-bootscripts/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -2,7 +2,7 @@
# Package versions
NM= lfs-bootscripts
-VRS= 3.1.0
+VRS= 3.2.0
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL= $(FTP)/$(NM)/$(FILE)
@@ -21,8 +21,8 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
- @if [ ! -d bootscripts ] ; then svn co
svn://svn.linuxfromscratch.org/LFS/trunk/bootscripts && \
- cd bootscripts && make install-livecd ; fi
+ @if [ ! -f /etc/rc.d/init.d/mountsqfs ] ; then tar xjvf ${SRC}/${FILE}
&& \
+ cd ${DIR} && make install-livecd ; fi
clean:
@-rm -rf bootscripts
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/linux/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -6,13 +6,11 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
FILE1= $(PATCH2).gz
-PATCH1= $(DIR)-security_fix-1.patch
-PATCH2= reiser4-for-2.6.11-1
-PATCH3= squashfs2.1-patch
-PATCH4= $(DIR)-reiser4_missing_export-1.patch
+PATCH1= reiser4-for-2.6.11-1
+PATCH2= squashfs2.1-patch
+PATCH3= $(DIR)-reiser4_missing_export-1.patch
URL= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-URL1= http://www.linuxfromscratch.org/patches/lfs/cvs/testing/$(PATCH1)
-URL2= http://ftp.namesys.com/pub/reiser4-for-2.6/$(VRS)/$(FILE1)
+URL1= http://ftp.namesys.com/pub/reiser4-for-2.6/$(VRS)/$(FILE1)
#RULES
@@ -26,15 +24,12 @@
@echo "=====> Building $(NM) in chroot"
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC)
; fi
- @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && mv $(PATCH1)
$(SRC) ; fi
- @if [ ! -f $(PATCH2) ] ; then $(WGET) $(URL2) && gunzip $(FILE1) ; 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 $(SRC)/$(PATCH1) && \
- patch -Np1 -i ../$(PATCH2) && \
- patch -Np1 -i
$(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH3) && \
+ patch -Np1 -i ../$(PATCH1) && \
+ patch -Np1 -i
$(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH2) && \
+ patch -Np1 -i ../$(PATCH3) && \
make mrproper && \
- sed -i 's@/sbin/hotplug@/bin/true@' kernel/kmod.c && \
- patch -Np1 -i ../$(PATCH4) && \
cp $(ROOT)/linux/config .config && \
make -j3 && \
make modules_install && \
Modified: trunk/packages/linux-libc-headers/Makefile
===================================================================
--- trunk/packages/linux-libc-headers/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/linux-libc-headers/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -2,7 +2,7 @@
# Package versions
NM= linux-libc-headers
-VRS= 2.6.11.0
+VRS= 2.6.11.2
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL= $(FTP)/$(NM)/$(FILE)
Modified: trunk/packages/m4/Makefile
===================================================================
--- trunk/packages/m4/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/m4/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -2,7 +2,7 @@
# Package versions
NM= m4
-VRS= 1.4.2
+VRS= 1.4.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL= $(FTP)/$(NM)/$(FILE)
Modified: trunk/packages/shadow/Makefile
===================================================================
--- trunk/packages/shadow/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/shadow/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -5,7 +5,9 @@
VRS= 4.0.7
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-URL= ftp://ftp.pld.org.pl/software/$(NM)/$(FILE)
+PATCH=${DIR}-fix_lastlog-1.patch
+URL= $(FTP)/$(NM)/$(FILE)
+URL1=$(FTP)/$(NM)/$(PATCH)
# RULES
@@ -20,7 +22,10 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
+ mv $(PATCH) $(SRC) ; fi
@if [ ! -d /etc/default ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR)
&& \
+ patch -Np1 -i $(SRC)/$(PATCH) && \
./configure --libdir=/lib --enable-shared && \
sed -i 's/groups$$(EXEEXT) //' src/Makefile && \
sed -i '/groups/d' man/Makefile && \
Modified: trunk/packages/tar/Makefile
===================================================================
--- trunk/packages/tar/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/tar/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -5,7 +5,9 @@
VRS= 1.15.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
+PATCH=$(DIR)-sparse_fix-1.patch
URL= $(FTP)/$(NM)/$(FILE)
+URL1=$(FTP)/$(NM)/$(PATCH)
# RULES
@@ -30,7 +32,10 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL) && \
+ mv $(PATCH) $(SRC) ; fi
@if [ ! -f /bin/tar ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
+ patch -Np1 -i $(SRC)/$(PATCH) && \
./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin && \
make -j3 && make install ; fi
@make clean
Modified: trunk/packages/wget/Makefile
===================================================================
--- trunk/packages/wget/Makefile 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/packages/wget/Makefile 2005-04-15 23:55:52 UTC (rev 77)
@@ -17,7 +17,7 @@
@if [ ! -f $(FILE) ] ; then ftpget ; fi
@if [ ! -f $(WD)/bin/$(NM) ] ; then \
tar xzvf $(FILE) && cd $(DIR) && ./configure --prefix=$(WD)
--libdir=$(WD)/lib --without-ssl \
- --enable-static --disable-shared --host=$(CHOST) --target=$(CHOST) && \
+ --enable-static --disable-shared && \
make -j3 && make install ; fi
@make clean
@@ -31,7 +31,7 @@
@if [ ! -f $(FILE) ] ; then $(WD)/bin/ftpget ; fi
@if [ ! -f /usr/bin/$(NM) ] ; then \
tar xzvf $(FILE) && cd $(DIR) && \
- ./configure --prefix=/usr --with-ssl --host=$(CHOST) --target=$(CHOST)
&& \
+ ./configure --prefix=/usr --with-ssl && \
make -j3 && make install ; fi
@make clean
Added: trunk/uname/uname
===================================================================
--- trunk/uname/uname 2005-04-03 21:44:02 UTC (rev 76)
+++ trunk/uname/uname 2005-04-15 23:55:52 UTC (rev 77)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ ! -f /bin/uname.real ] && [ ! -f /tools/bin/uname.real ]
+then
+ REAL="/bin/uname"
+else
+ REAL="uname.real"
+fi
+
+$REAL "$@" | sed 's/[56]86/486/'
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
