r619 - in x86/branches/utf8-newmake: . etc initramfs linux packages packages/binutils packages/blfs-bootscripts packages/coreutils packages/klibc packages/linux-libc-headers packages/nALFS-profile packages/wget uname

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Sep 6 00:09:17 PDT 2005


Author: alexander
Date: 2005-09-06 01:09:13 -0600 (Tue, 06 Sep 2005)
New Revision: 619

Added:
   x86/branches/utf8-newmake/initramfs/init.orig
   x86/branches/utf8-newmake/packages/hdparm/
   x86/branches/utf8-newmake/packages/iptables/
   x86/branches/utf8-newmake/packages/strace/
   x86/branches/utf8-newmake/packages/which/
   x86/branches/utf8-newmake/packages/xlockmore/
Removed:
   x86/branches/utf8-newmake/initramfs/init
Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/etc/issue
   x86/branches/utf8-newmake/initramfs/Makefile
   x86/branches/utf8-newmake/linux/config
   x86/branches/utf8-newmake/packages/binutils/Makefile
   x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile
   x86/branches/utf8-newmake/packages/coreutils/Makefile
   x86/branches/utf8-newmake/packages/klibc/Makefile
   x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile
   x86/branches/utf8-newmake/packages/nALFS-profile/Makefile
   x86/branches/utf8-newmake/packages/wget/Makefile
   x86/branches/utf8-newmake/uname/uname
Log:
Merged all recent changes from trunk.

Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -14,40 +14,36 @@
 # Unless otherwise noted, please try to keep all line lengths below 80 chars. 
 #
 
-# LiveCD version and Linux kernel version
+# Machine architecure, LiveCD version, and Linux kernel version.
+# Edit the ARCH and VERSION variables if you are building for a non-x86 arch.
 #==============================================================================
-export VERSION := x86-6.x-utf8-r1
+export ARCH := x86
+export VERSION := $(ARCH)-6.x-utf8-r1
 export KVERS := 2.6.12.3
 
-
 # Edit this line to match the mount-point of the partition you'll be using to
 # build the cd.
 #==============================================================================
 export MP := /mnt/lfs
 
-
 # Timezone, obviously ;)
 #==============================================================================
 export timezone := GMT
 
-
 # Page size for groff
 #==============================================================================
 export pagesize := letter
 
-
 # Top-level of these Makefiles. Edit this if you've named this directory
 # differently. (The beginning '/' is necessary - this is *not* an absolute file
 # path.)
 #==============================================================================
 export ROOT := /lfs-livecd
 
-
 # Parallel Build Level
 #==============================================================================
 export PM := -j3
 
-
 # Default http server for the lfs-base packages
 #==============================================================================
 export HTTP := http://ftp.lfs-matrix.de/pub/lfs/lfs-packages/conglomeration
@@ -77,9 +73,13 @@
 
 # More Environment Variables
 #==============================================================================
+ifeq ($(ARCH),x86)
 export CFLAGS := -Os -s -march=i486
-export CXXFLAGS := -Os -s -march=i486
-export CHOST := i486-pc-linux-gnu
+export CXXFLAGS := $(CFLAGS)
+else
+export CFLAGS := -Os -s
+export CXXFLAGS := $(CFLAGS)
+endif
 export chbash-pre-bash := SHELL=$(WD)/bin/bash
 export chbash-post-bash := SHELL=/bin/bash
 export WHICH= $(WD)/bin/which
@@ -94,7 +94,7 @@
 export WHITE= ""
 
 FTPGET= $(WD)/bin/ftpget
-WGET_V= 1.9.1
+WGET_V= 1.10.1
 
 # TARGETS
 #==============================================================================
@@ -184,7 +184,7 @@
 	@-mkdir -p $(MP)/{proc,sys}
 	@-mount -t proc proc $(MP)/proc
 	@-mount -t sysfs sysfs $(MP)/sys
-	@-mount -f -t ramfs ramfs $(MP)/dev
+	@-mount -n -t tmpfs none $(MP)/dev
 	@-mount -f -t tmpfs tmpfs $(MP)/dev/shm
 	@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
 	@touch $@
@@ -213,9 +213,10 @@
 	ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
 	ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
-	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn ch-mdadm ch-eject \
-	ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools \
-	ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
+	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn ch-mdadm ch-which \
+	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
+	ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
+	ch-syslinux ch-nALFS-profile
 
 wget-list:
 	@>wget-list ; \
@@ -303,8 +304,8 @@
 popdev:
 	@if [ ! -c /dev/console ] ; then mknod -m 600 /dev/console c 5 1 && \
 	 mknod -m 666 /dev/null c 1 3 ; fi
-	@if ! tail -n 3 /proc/mounts | grep -q "dev ramfs" ; then \
-	 mount -n -t ramfs none /dev && \
+	@if ! tail -n 3 /proc/mounts | grep -q "dev tmpfs" ; then \
+	 mount -n -t tmpfs none /dev && \
 	 mknod -m 662 /dev/console c 5 1 && \
 	 mknod -m 666 /dev/null c 1 3 && \
 	 mknod -m 666 /dev/zero c 1 5 && \
@@ -390,19 +391,20 @@
 	@cp -ra root $(MP)/etc/skel
 	@-mv $(MP)/bin/uname.real $(MP)/bin/uname
 	@-mkdir $(MP)/iso
-	@cp -rav $(MP)/sources $(MP)/iso && \
-	 cp -rav $(MP)/boot $(MP)/iso && \
-	 rm -f iso/.root.sqfs && \
-	 $(WD)/bin/mksquashfs $(MP) $(MP)/iso/.root.sqfs -info -e \
-	 boot sources tools iso lfs-livecd lost+found tmp proc && \
-	 echo "LFS-LIVECD" > $(MP)/iso/LFS
-	@touch prepiso
+	@cp -rav $(MP)/lfs-sources $(MP)/iso
+	@cp -rav $(MP)/boot $(MP)/iso
+	@touch $@
 
-iso: prepiso
-	cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o \
+$(MP)/iso/.root.sqfs:
+	@$(WD)/bin/mksquashfs $(MP) .root.sqfs -info -e \
+	 boot sources lfs-sources tools iso lfs-livecd lost+found tmp proc >sqfs.log 2>&1 && \
+	 mv .root.sqfs $@
+
+iso: prepiso $(MP)/iso/.root.sqfs
+	cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l -L -D -o \
 	$(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
 	-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-	-V "LFS_CD" ./
+	-V "lfslivecd-$(VERSION)" ./
 
 # Targets to clean your tree. 
 #==============================================================================

Modified: x86/branches/utf8-newmake/etc/issue
===================================================================
--- x86/branches/utf8-newmake/etc/issue	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/etc/issue	2005-09-06 07:09:13 UTC (rev 619)
@@ -4,6 +4,7 @@
 Jeremy Huntwork, Project Leader
 Alexander Patrakov, Maintainer, i18n
 Justin Knierim, Maintainer
+Thomas Pegg, Maintainer
 
 Version:
 ____________________________________________________________
@@ -11,10 +12,10 @@
 Please read the /root/README file before using this CD.
 
 All the source packages you will need to build an LFS system
-are located in /sources and you can find the book in
+are located in /lfs-sources and you can find the book in
 /usr/share/LFS-BOOK-6.1-HTML.
 
-Support questions concerning this cd should be directed to
+Support questions concerning this CD should be directed to
 livecd at linuxfromscratch.org
 
 Type "greeting" at any time to view this message again.

Modified: x86/branches/utf8-newmake/initramfs/Makefile
===================================================================
--- x86/branches/utf8-newmake/initramfs/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/initramfs/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -30,7 +30,9 @@
 	@$(CP) $(KLIBC)/bin/{insmod,isoinfo,ln,losetup,mkdir,mount,run-init,sh,sleep} $(WDIR)/bin
 	@$(CP) $(KLIBC)/lib/klibc-*.so $(WDIR)/lib
 	@$(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WDIR)/lib
-	@$(CP) init $(WDIR)
+	@$(CP) init.orig init
+	@sed -i 's/-VERSION/-$(VERSION)/' init
+	@$(CP) init $(WDIR)/
 	@$(MK) -m 640 $(WDIR)/dev/console c 5 1
 	@$(MK) -m 660 $(WDIR)/dev/hda b 3 0
 	@$(MK) -m 660 $(WDIR)/dev/hdb b 3 64

Deleted: x86/branches/utf8-newmake/initramfs/init
===================================================================
--- x86/branches/utf8-newmake/initramfs/init	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/initramfs/init	2005-09-06 07:09:13 UTC (rev 619)
@@ -1,60 +0,0 @@
-#!/bin/sh
-LABEL="LFS_CD"
-DEVS=`echo /dev/hd* /dev/scd*`
-
-while [ -z "$CDROM" ] && [ "$TIMEOUT" != "..............." ] ; do
-	for DEV in $DEVS ; do
-		if [ "`isoinfo -V $DEV 2>/dev/null`" = "$LABEL" ] ; then
-			CDROM=$DEV
-		fi
-	done
-	if [ -z "$CDROM" ] ; then
-		echo -n "."
-		TIMEOUT=".$TIMEOUT"
-		sleep 1
-	fi
-done
-
-if [ -z "$CDROM" ] ; then
-	echo "Cannot find LFS Live CD."
-	echo "This probably means that your IDE or SCSI controller is not supported."
-	exit 1
-else
-	echo "LFS Live CD is $CDROM"
-fi
-
-mount -w -t tmpfs -o size=90% tmpfs /.tmpfs
-mkdir /.tmpfs/.overlay
-
-# Probably redundant, but might be useful in the future for ejecting the CD
-mkdir -p /.tmpfs/.overlay/dev/shm /.tmpfs/.overlay/proc
-mkdir -m1777 /.tmpfs/.overlay/tmp
-
-mkdir /.tmpfs/.cdrom
-mkdir /.tmpfs/.sqfs
-
-# Work around unionfs bug that causes tst-cancel16 glibc test to fail in Ch5
-mkdir -m1777 /.tmpfs/.tmp
-
-mount -r -t iso9660 $CDROM /.tmpfs/.cdrom
-losetup /dev/loop0 /.tmpfs/.cdrom/.root.sqfs
-mount -r -t squashfs /dev/loop0 /.tmpfs/.sqfs
-
-# File locking and mmap don't work well on unionfs 1.0.11, this breaks
-# module-init-tools.
-# Fixed in unionfs 1.0.12a, but that version is oopsy when overwriting files.
-MODDIR=`echo /.tmpfs/.sqfs/lib/modules/*`
-MODDIR=${MODDIR#/.tmpfs/.sqfs/}
-mkdir -p /.tmpfs/.overlay/$MODDIR
-ln -s /dev/shm/.sqfs/$MODDIR/kernel /.tmpfs/.overlay/$MODDIR
-
-insmod /lib/unionfs.ko
-mount -w -t unionfs -o dirs=/.tmpfs/.overlay=rw:/.tmpfs/.cdrom=ro:/.tmpfs/.sqfs=ro unionfs /.union
-mount -o move /.tmpfs /.union/dev/shm
-
-ln -s $CDROM /.union/dev/lfs-cd
-
-# Work around unionfs bug that causes tst-cancel16 glibc test to fail in Ch5
-mount -o bind /.union/dev/shm/.tmp /.union/tmp
-
-exec run-init /.union /sbin/init

Copied: x86/branches/utf8-newmake/initramfs/init.orig (from rev 618, x86/trunk/initramfs/init.orig)


Property changes on: x86/branches/utf8-newmake/initramfs/init.orig
___________________________________________________________________
Name: svn:executable
   + *

Modified: x86/branches/utf8-newmake/linux/config
===================================================================
--- x86/branches/utf8-newmake/linux/config	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/linux/config	2005-09-06 07:09:13 UTC (rev 619)
@@ -36,11 +36,11 @@
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 # CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_BASE_FULL=y
+# CONFIG_PRINTK is not set
+# CONFIG_BUG is not set
+# CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
@@ -49,7 +49,7 @@
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
 # CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
+# CONFIG_BASE_SMALL is not set
 
 #
 # Loadable module support

Modified: x86/branches/utf8-newmake/packages/binutils/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/binutils/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/binutils/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -13,6 +13,12 @@
 
 include $(ROOT)/scripts/functions
 
+ifeq ($(ARCH),ppc)
+	LINKER=ld.so.1
+else
+	LINKER=ld-linux.so.2
+endif
+
 pass1: $(FILE)
 	@$(sep_dir_build)
 	@cp $(SRC)/$(FILE) $(LFSSRC)
@@ -54,7 +60,7 @@
 	 readelf -l a.out > .specstest
 	@if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
 	 make -C ld install && SPECFILE=`gcc --print-file specs` && \
-         sed 's@ /lib/ld-linux.so.2@ $(WD)/lib/ld-linux.so.2 at g' \
+         sed 's@ /lib/$(LINKER)@ $(WD)/lib/$(LINKER)@g' \
 	 $$SPECFILE > tempspecfile && \
          mv -f tempspecfile $$SPECFILE && unset SPECFILE && \
          rm -f $(WD)/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} && \
@@ -107,7 +113,7 @@
 	 readelf -l a.out > .specstest
 	@if cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
 	 make -C ld INSTALL=$(WD)/bin/install install && \
-         perl -pi -e 's@ $(WD)/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g;' \
+         perl -pi -e 's@ $(WD)/lib/$(LINKER)@ /lib/$(LINKER)@g;' \
 	 -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/@g;' \
 	 `gcc --print-file specs` ; fi
 	@make clean

Modified: x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -7,7 +7,7 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(FILE)
-SHA-$(FILE)= f9c9f1ec3994f16bfb20a35048ba80ab2ec557a4
+SHA-$(FILE)= 9119039a57ef1911b3a635217e9a0e9105985ade
 
 PATCH1=$(NM)-add-autosshd-1.patch
 SHA-$(PATCH1)= d69c9467e6cfcbff70006ad065f2765dc46c986b
@@ -44,6 +44,8 @@
 	  >>../$(DIR)-$@.log 2>&1
 	 @install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/ \
 	  >>../$(DIR)-$@.log 2>&1
+	 @install -m754 blfs/init.d/iptables /etc/rc.d/init.d/ \
+	  >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #

Modified: x86/branches/utf8-newmake/packages/coreutils/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/coreutils/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/coreutils/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -80,7 +80,9 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+ifeq ($(ARCH),x86)
 	@patch -Np1 -i ../$(PATCH1)
+endif
 	@patch -Np1 -i ../$(PATCH2)
 	@patch -Np1 -i ../$(PATCH3)
 	@patch -Np1 -i ../$(PATCH4)

Copied: x86/branches/utf8-newmake/packages/hdparm (from rev 618, x86/trunk/packages/hdparm)

Copied: x86/branches/utf8-newmake/packages/iptables (from rev 618, x86/trunk/packages/iptables)

Modified: x86/branches/utf8-newmake/packages/klibc/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/klibc/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/klibc/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -54,7 +54,7 @@
 #
 	@$(OK)
 	@make -C ../../util-linux klibc-losetup
-	@make -C ../../isoinfo klibc-isoinfo
+	@make -C ../../isoinfo stage2
 
 clean:
 	@-rm -rf $(DIR)

Modified: x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -23,8 +23,16 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+ifeq ($(ARCH),x86)
 	@cp -Rv include/asm-i386 $(WD)/include/asm >../$(DIR)-$@.log 2>&1
-	@cp -Rv include/linux $(WD)/include >../$(DIR)-$@.log 2>&1
+endif
+ifeq ($(ARCH),ppc)
+	@cp -Rv include/asm-ppc $(WD)/include/asm >../$(DIR)-$@.log 2>&1
+endif
+ifeq ($(ARCH),sparc)
+	@cp -Rv include/asm-sparc $(WD)/include/asm >../$(DIR)-$@.log 2>&1
+endif
+	@cp -Rv include/linux $(WD)/include >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -42,8 +50,16 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+ifeq ($(ARCH),x86)
 	@cp -Rv include/asm-i386 /usr/include/asm >../$(DIR)-$@.log 2>&1
-	@cp -Rv include/linux /usr/include >../$(DIR)-$@.log 2>&1
+endif
+ifeq ($(ARCH),ppc)
+	@cp -Rv include/asm-ppc /usr/include/asm >../$(DIR)-$@.log 2>&1
+endif
+ifeq ($(ARCH),sparc)
+	@cp -Rv include/asm-sparc /usr/include/asm >../$(DIR)-$@.log 2>&1
+endif
+	@cp -Rv include/linux /usr/include >>../$(DIR)-$@.log 2>&1
 	@chown -R root:root /usr/include/{asm,linux}
 	@find /usr/include/{asm,linux} -type d -exec chmod 755 {} \;
 	@find /usr/include/{asm,linux} -type d -exec chmod 644 {} \;

Modified: x86/branches/utf8-newmake/packages/nALFS-profile/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/nALFS-profile/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/nALFS-profile/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -28,7 +28,6 @@
 #==============================================================================
 	@sed -i 's@/your/$(DIR)/packages@/sources at g' config/general.ent
 	@cp -rav . /root/nALFS-profile-$(DIR) >../$(DIR)-$@.log 2>&1
-
 #
 #==Status Messages===========================================
 #

Copied: x86/branches/utf8-newmake/packages/strace (from rev 618, x86/trunk/packages/strace)

Modified: x86/branches/utf8-newmake/packages/wget/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/wget/Makefile	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/packages/wget/Makefile	2005-09-06 07:09:13 UTC (rev 619)
@@ -2,10 +2,10 @@
 #==============================================================================
 
 NM= wget
-VRS= 1.9.1
+VRS= 1.10.1
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
-SHA= 0597a4f47b056e3e60cf7d08c9409d67358e7099
+SHA= 63249e837a02eb946b887a610ccc7be4ab41d0bc
 
 # Targets
 # =============================================================================

Copied: x86/branches/utf8-newmake/packages/which (from rev 618, x86/trunk/packages/which)

Copied: x86/branches/utf8-newmake/packages/xlockmore (from rev 618, x86/trunk/packages/xlockmore)

Modified: x86/branches/utf8-newmake/uname/uname
===================================================================
--- x86/branches/utf8-newmake/uname/uname	2005-09-06 00:22:36 UTC (rev 618)
+++ x86/branches/utf8-newmake/uname/uname	2005-09-06 07:09:13 UTC (rev 619)
@@ -7,4 +7,10 @@
 	REAL="uname.real"
 fi
 
-$REAL "$@" | sed 's/[56]86/486/'
+if echo `$REAL -m` | grep -q "i*86" ; then
+	$REAL "$@" | sed 's/[56]86/486/'
+elif echo `$REAL -m` | grep -q "sparc" ; then
+	$REAL "$@" | sed 's/sparc64/sparc/'
+else
+	$REAL "$@"
+fi




More information about the livecd mailing list