r1983 - in branches/x86_64: . isolinux packages/LFS-BOOK packages/bin86 packages/binutils packages/gcc packages/glibc packages/initramfs packages/linux packages/traceroute packages/unzip packages/zlib

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Wed Jul 25 15:46:21 PDT 2007


Author: jhuntwork
Date: 2007-07-25 16:46:21 -0600 (Wed, 25 Jul 2007)
New Revision: 1983

Modified:
   branches/x86_64/Makefile
   branches/x86_64/isolinux/isolinux.cfg
   branches/x86_64/isolinux/options.msg
   branches/x86_64/packages/LFS-BOOK/Makefile
   branches/x86_64/packages/bin86/Makefile
   branches/x86_64/packages/binutils/Makefile
   branches/x86_64/packages/gcc/Makefile
   branches/x86_64/packages/glibc/Makefile
   branches/x86_64/packages/initramfs/Makefile
   branches/x86_64/packages/initramfs/init.in
   branches/x86_64/packages/linux/Makefile
   branches/x86_64/packages/traceroute/Makefile
   branches/x86_64/packages/unzip/Makefile
   branches/x86_64/packages/zlib/Makefile
Log:
All changes necessary to natively build a working x86_64 minimal CD.

Modified: branches/x86_64/Makefile
===================================================================
--- branches/x86_64/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -32,10 +32,10 @@
 # Free disk space needed for the build.
 ROOTFS_MEGS := 1536
 
-export VERSION ?= x86-6.3-pre2
-export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing -mtune=i686
+export VERSION ?= x86_64-6.3-min-pre1
+export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing
 export CXXFLAGS ?= $(CFLAGS)
-export LFS_TARGET ?= i486-pc-linux-gnu
+export LFS_TARGET ?= x86_64-unknown-linux-gnu
 
 
 # Default timezone
@@ -146,6 +146,8 @@
 	-install -d $(MP)/var/{opt,cache,lib/{misc,locate},local}
 	-install -d $(MP)/opt/{bin,doc,include,info}
 	-install -d $(MP)/opt/{lib,man/man{1,2,3,4,5,6,7,8}}
+	-if [ ! -L $(MP)/lib64 ] ; then ln -s lib $(MP)/lib64 ; fi
+	-if [ ! -L $(MP)/usr/lib64 ] ; then ln -s lib $(MP)/usr/lib64 ; fi
 	-mknod -m 600 $(MP)/dev/console c 5 1
 	-mknod -m 666 $(MP)/dev/null c 1 3
 	-mknod -m 666 $(MP)/dev/zero c 1 5
@@ -262,9 +264,8 @@
 	ch-strace ch-iptables ch-eject ch-hdparm ch-linux \
 	ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \
 	ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \
-	ch-fuse ch-dosfstools ch-ntfsprogs ch-bin86 ch-grub ch-lilo ch-syslinux \
-	ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \
-	ch-initramfs
+	ch-fuse ch-dosfstools ch-ntfsprogs ch-bin86 ch-lilo ch-syslinux \
+	ch-scsi-firmware ch-net-firmware ch-initramfs
 	make update-caches
 
 wget-list:
@@ -348,7 +349,6 @@
 	@-cp $(ROOT)/etc/fstab /etc
 
 update-caches:
-	cd /usr/share/fonts ; mkfontscale ; mkfontdir ; fc-cache -f
 	mandb -c 2>/dev/null
 	echo 'dummy / ext2 defaults 0 0' >/etc/mtab
 	updatedb --prunepaths='/sources /tools /lfs-livecd /proc /sys /dev /tmp /var/tmp'

Modified: branches/x86_64/isolinux/isolinux.cfg
===================================================================
--- branches/x86_64/isolinux/isolinux.cfg	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/isolinux/isolinux.cfg	2007-07-25 22:46:21 UTC (rev 1983)
@@ -7,7 +7,3 @@
 label linux
   kernel linux
   append initrd=initramfs_data_cpio.gz
-
-label linux64
-  kernel linux64
-  append initrd=initramfs_data_cpio.gz

Modified: branches/x86_64/isolinux/options.msg
===================================================================
--- branches/x86_64/isolinux/options.msg	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/isolinux/options.msg	2007-07-25 22:46:21 UTC (rev 1983)
@@ -9,8 +9,6 @@
 792 = 1024x768x24    791 = 1024x768x16
 789 = 800x600x24     788 = 800x600x16
 
-A 64-bit kernel for use with CLFS is available as "linux64"
-
 To set your timezone, add TZ=your_timezone anywhere
 after "linux" or "linux.ata". For example, TZ=EDT+4 means that the
 timezone is named "EDT" and is 4 hours behind (west) of UTC.

Modified: branches/x86_64/packages/LFS-BOOK/Makefile
===================================================================
--- branches/x86_64/packages/LFS-BOOK/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/LFS-BOOK/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -10,10 +10,10 @@
 #URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE)
 #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052
 
-REV= 8225
+REV= 8250
 REVPARM= -r $(REV)
 
-URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK
+URL= svn://svn.linuxfromscratch.org/LFS/branches/x86_64/BOOK
 
 # Targets
 

Modified: branches/x86_64/packages/bin86/Makefile
===================================================================
--- branches/x86_64/packages/bin86/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/bin86/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -8,6 +8,10 @@
 URL-$(FILE)= http://ftp.nux.at/pub/dev86/$(FILE)
 SHA-$(FILE)= 656f06b4b26d08412132e338baa25e42d713eeec
 
+PATCH= $(DIR)-x86_64-1.patch
+URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/$(PATCH)
+SHA-$(PATCH)= 2c967c062fbee4e40ca1bf55feec2033e132e0a9
+
 # 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) $(PATCH)
 	$(std_build)
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH)
 	make PREFIX=/usr MANDIR=/usr/share/man/man1
 	make PREFIX=/usr MANDIR=/usr/share/man/man1 install
 

Modified: branches/x86_64/packages/binutils/Makefile
===================================================================
--- branches/x86_64/packages/binutils/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/binutils/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -24,13 +24,14 @@
 	unset CFLAGS ; make -C ld clean
 	unset CFLAGS ; make -C ld LIB_PATH=$(WD)/lib
 	cp -v ld/ld-new $(WD)/bin
+	ln -sv lib $(WD)/lib64
 
 adjust-toolchain:
 	mv -v $(WD)/bin/{ld,ld-old}
 	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 | sed 's@^/lib/ld-linux.so.2@/tools&@g' \
+	gcc -dumpspecs | sed 's@/lib64/ld-linux-x86-64.so.2@/tools&@g' \
 	  > `dirname $$(gcc -print-libgcc-file-name)`/specs
 	GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \
 	find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \
@@ -61,7 +62,7 @@
 	mv -v $(WD)/bin/{ld-new,ld}
 	ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld
 	gcc -dumpspecs | sed \
-	    -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2 at g' \
+	    -e 's@/tools/lib64/ld-linux-x86-64.so.2@/lib64/ld-linux-x86-64.so.2 at g' \
 	    -e '/\*startfile_prefix_spec:/{n;s at .*@/usr/lib/ @}' \
 	    -e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
 	     `dirname $$(gcc --print-libgcc-file-name)`/specs

Modified: branches/x86_64/packages/gcc/Makefile
===================================================================
--- branches/x86_64/packages/gcc/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/gcc/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -25,7 +25,7 @@
 # --enable-static overrides the unsuitable default in config.site
 	unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) \
 	 --with-local-prefix=$(WD) --disable-nls --enable-shared \
-	 --enable-languages=c --enable-static
+	 --enable-languages=c --enable-static --disable-multilib
 	unset CFLAGS ; make bootstrap
 	unset CFLAGS ; make install
 	ln -vs gcc $(WD)/bin/cc
@@ -40,11 +40,14 @@
 	 sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
 	 > gcc/Makefile.in
 	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+	cd ../$(DIR) ; cp -v gcc/config/i386/t-linux64{,.tmp} && \
+	 sed '/MULTILIB_OSDIRNAMES/d' gcc/config/i386/t-linux64.tmp \
+	 > gcc/config/i386/t-linux64
 # --enable-static overrides the unsuitable default in config.site
 	../$(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 --enable-static
+	 --disable-libstdcxx-pch --enable-static --disable-multilib
 	make
 	make install
 
@@ -65,7 +68,8 @@
 # --enable-static overrides the unsuitable default in config.site
 	../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
 	 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-	 --enable-clocale=gnu --enable-languages=c,c++ --enable-static
+	 --enable-clocale=gnu --enable-languages=c,c++ --enable-static \
+	 --disable-multilib
 	make
 	-make -k check
 	make install

Modified: branches/x86_64/packages/glibc/Makefile
===================================================================
--- branches/x86_64/packages/glibc/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/glibc/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -50,7 +50,7 @@
 	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
 	cd ../$(DIR) ; unpack ../$(FILE2) ; mv glibc-libidn-$(VRS) libidn
 	sed -i \
-	's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
+	's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux-x86-64.so.2 -o|' \
 	        ../$(DIR)/scripts/test-installation.pl
 # LiveCD specific locale additions
 	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50)

Modified: branches/x86_64/packages/initramfs/Makefile
===================================================================
--- branches/x86_64/packages/initramfs/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/initramfs/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -20,6 +20,7 @@
 
 compile-stage2:
 	mkdir -p $(WDIR)/{bin,dev,etc/udev/rules.d,lib/firmware,sbin,sys,proc}
+	ln -s lib $(WDIR)/lib64
 	cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf
 	cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d
 	sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/*
@@ -29,7 +30,7 @@
 	mknod -m 640 $(WDIR)/dev/console c 5 1
 	mknod -m 664 $(WDIR)/dev/null c 1 3
 	cp /bin/{sh,dd,cat,cp,killall,mkdir,mount,umount,sed,sleep,ln,rm,uname} $(WDIR)/bin
-	cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,ld-linux.so.2} $(WDIR)/lib
+	cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,ld-linux-x86-64.so.2} $(WDIR)/lib
 	cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib
 	cp /lib/{libpthread.so.0,librt.so.1,libuuid.so.1} $(WDIR)/lib
 	cp /lib/{libvolume_id.so.0,libsysfs.so.2} $(WDIR)/lib

Modified: branches/x86_64/packages/initramfs/init.in
===================================================================
--- branches/x86_64/packages/initramfs/init.in	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/initramfs/init.in	2007-07-25 22:46:21 UTC (rev 1983)
@@ -317,5 +317,5 @@
 cd /.root
 # Clean up and free some memory
 rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init /fakecd.iso.head
-./lib/ld-linux.so.2 --library-path ./lib ./bin/mount -n --move . /
-exec ../lib/ld-linux.so.2 --library-path ./lib ./usr/sbin/chroot . "$init" "$@"
+./lib/ld-linux-x86-64.so.2 --library-path ./lib ./bin/mount -n --move . /
+exec ../lib/ld-linux-x86-64.so.2 --library-path ./lib ./usr/sbin/chroot . "$init" "$@"

Modified: branches/x86_64/packages/linux/Makefile
===================================================================
--- branches/x86_64/packages/linux/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/linux/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -25,10 +25,10 @@
 	patch -Np1 -i ../$(PATCH3)
 	mkdir -p /boot/isolinux
 	make mrproper
-	cp ../config.x86 .config
+	cp $(ROOT)/packages/linux64/config.x86_64 .config
 	make
 	make modules_install
-	cp -v arch/i386/boot/bzImage /boot/isolinux/linux
+	cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux
 	cd .. ; ./debian-style-headers.sh $(DIR)
 
 clean:

Modified: branches/x86_64/packages/traceroute/Makefile
===================================================================
--- branches/x86_64/packages/traceroute/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/traceroute/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -8,6 +8,10 @@
 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
 SHA-$(FILE)= c68ec1b09539a8e9655c138031c3090bda92d5f1
 
+PATCH= $(DIR)-update_config-1.patch
+URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/patches/$(NM)/$(PATCH)
+SHA-$(PATCH)= f52c3772bcd63f9f06137128d8e3b64c7c533743
+
 # 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) $(PATCH)
 	$(std_build)
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH)
 	sed -i -e 's/-o bin/-o root/' Makefile.in
 	./configure --prefix=/usr
 	make

Modified: branches/x86_64/packages/unzip/Makefile
===================================================================
--- branches/x86_64/packages/unzip/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/unzip/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -20,7 +20,7 @@
 	$(std_build)
 
 compile-stage2:
-	make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
+	make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
 	make prefix=/usr MANDIR=/usr/share/man/man1 install
 
 clean:

Modified: branches/x86_64/packages/zlib/Makefile
===================================================================
--- branches/x86_64/packages/zlib/Makefile	2007-07-25 22:44:55 UTC (rev 1982)
+++ branches/x86_64/packages/zlib/Makefile	2007-07-25 22:46:21 UTC (rev 1983)
@@ -28,15 +28,15 @@
 	make install
 
 compile-stage2:
-	./configure --prefix=/usr --shared --libdir=/lib
-	make
-	make install
+	unset CFLAGS ; ./configure --prefix=/usr --shared --libdir=/lib
+	unset CFLAGS ; make
+	unset CFLAGS ; make install
 	rm /lib/libz.so
 	ln -sf ../../lib/libz.so.$(VRS) /usr/lib/libz.so
-	make clean
-	./configure --prefix=/usr
-	make
-	make install
+	unset CFLAGS ; make clean
+	unset CFLAGS ; ./configure --prefix=/usr
+	unset CFLAGS ; make
+	unset CFLAGS ; make install
 	chmod 644 /usr/lib/libz.a
 
 clean:




More information about the livecd mailing list