r790 - in x86/branches/utf8-newmake: . initramfs packages/binutils packages/coreutils packages/grub packages/kbd packages/links packages/linux packages/linux-libc-headers packages/syslinux packages/unzip

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Sep 26 07:38:54 PDT 2005


Author: justin
Date: 2005-09-26 08:38:53 -0600 (Mon, 26 Sep 2005)
New Revision: 790

Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/initramfs/Makefile
   x86/branches/utf8-newmake/packages/binutils/Makefile
   x86/branches/utf8-newmake/packages/coreutils/Makefile
   x86/branches/utf8-newmake/packages/grub/Makefile
   x86/branches/utf8-newmake/packages/kbd/Makefile
   x86/branches/utf8-newmake/packages/links/Makefile
   x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile
   x86/branches/utf8-newmake/packages/linux/Makefile
   x86/branches/utf8-newmake/packages/syslinux/Makefile
   x86/branches/utf8-newmake/packages/unzip/Makefile
Log:
Changed all ARCH variables to LFS-ARCH.

Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -15,10 +15,10 @@
 #
 
 # Machine architecure, LiveCD version, and Linux kernel version.
-# Edit the ARCH and VERSION variables if you are building for a non-x86 arch.
+# Edit the LFS-ARCH and VERSION variables if you are building for a non-x86 arch.
 #==============================================================================
-export ARCH := x86
-export VERSION := $(ARCH)-6.x-utf8-r1
+export LFS-ARCH := x86
+export VERSION := $(LFS-ARCH)-6.x-utf8-r1
 export KVERS := 2.6.12.5
 
 # Edit this line to match the mount-point of the partition you'll be using to
@@ -73,7 +73,7 @@
 
 # More Environment Variables
 #==============================================================================
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 export CFLAGS := -Os -s -march=i486
 export CXXFLAGS := $(CFLAGS)
 else
@@ -143,7 +143,7 @@
 extend-lfs: prep-chroot
 	@cp $(WD)/bin/which $(MP)/usr/bin
 	@cp $(ROOT)/scripts/unpack $(MP)/bin
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
 	@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
 	 make sparc-blfs $(chbash-post-bash)'
 else
@@ -222,7 +222,7 @@
 	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
 	ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
 	ch-syslinux ch-nALFS-profile
-ifeq ($(ARCH),ppc)
+ifeq ($(LFS-ARCH),ppc)
 	@make ch-yaboot
 endif
 
@@ -391,7 +391,7 @@
 	@>$(MP)/var/log/wtmp
 	@>$(MP)/var/log/lastlog
 	@install -m644 etc/issue $(MP)/etc/issue
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	@install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
 endif
@@ -415,13 +415,13 @@
 	 mv .root.sqfs $@
 
 iso: prepiso $(MP)/iso/.root.sqfs
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	@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 "lfslivecd-$(VERSION)" ./
 endif
-ifeq ($(ARCH),ppc)
+ifeq ($(LFS-ARCH),ppc)
 	@cd $(MP) ; ./usr/bin/mkisofs -hfs -part \
 	-map $(MKTREE)/$(PKG)/yaboot/map.hfs -no-desktop \
 	-hfs-volid "lfslivecd-$(VERSION)" -V "lfslivecd-$(VERSION) \

Modified: x86/branches/utf8-newmake/initramfs/Makefile
===================================================================
--- x86/branches/utf8-newmake/initramfs/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/initramfs/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -41,7 +41,7 @@
 	$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
 	$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
 	cd $(WDIR); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	$(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data_cpio.gz
 else
 	$(CP) initramfs_data.cpio.gz /boot/

Modified: x86/branches/utf8-newmake/packages/binutils/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/binutils/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/binutils/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -11,7 +11,7 @@
 
 include $(ROOT)/scripts/functions
 
-ifeq ($(ARCH),ppc)
+ifeq ($(LFS-ARCH),ppc)
 	LINKER=ld.so.1
 else
 	LINKER=ld-linux.so.2

Modified: x86/branches/utf8-newmake/packages/coreutils/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/coreutils/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/coreutils/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -52,7 +52,7 @@
 
 compile-stage2:
 	cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)} $(LFSSRC)/
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	patch -Np1 -i ../$(PATCH1)
 endif
 	patch -Np1 -i ../$(PATCH2)

Modified: x86/branches/utf8-newmake/packages/grub/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/grub/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/grub/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -20,7 +20,7 @@
 	$(std_build)
 
 compile-stage2:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	./configure --prefix=/usr
 	make $(PM)
 	make install

Modified: x86/branches/utf8-newmake/packages/kbd/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/kbd/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/kbd/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -25,7 +25,7 @@
 SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500
 
 STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(PATCH1) $(PATCH3)
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
 STAGE2-DEPS += $(PATCH2)
 endif
 
@@ -48,7 +48,7 @@
 	sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH3)
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
 	patch -Np1 -i ../$(PATCH2)
 endif
 	./configure

Modified: x86/branches/utf8-newmake/packages/links/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/links/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/links/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -20,7 +20,7 @@
 	$(std_build)
 
 compile-stage2:
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
 	./configure --prefix=/usr
 else
 	./configure --prefix=/usr --enable-graphics

Modified: x86/branches/utf8-newmake/packages/linux/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/linux/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/linux/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -31,7 +31,7 @@
 	cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-stage2:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi
 endif
 	zcat ../$(PATCH1) > ../reiser4.patch
@@ -40,10 +40,10 @@
 	cd $(ROOT) ; make -C $(PKG)/unionfs patch-kernel
 	patch -Np1 -i ../$(PATCH3)
 	make mrproper
-	cp $(ROOT)/linux/config.$(ARCH) .config
+	cp $(ROOT)/linux/config.$(LFS-ARCH) .config
 	make $(PM)
 	make modules_install
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	cp -v arch/i386/boot/bzImage /boot/isolinux/linux
 else
 	cp -v vmlinux /boot/linux

Modified: x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/linux-libc-headers/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -17,13 +17,13 @@
 	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage1:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	cp -Rv include/asm-i386 $(WD)/include/asm
 endif
-ifeq ($(ARCH),ppc)
+ifeq ($(LFS-ARCH),ppc)
 	cp -Rv include/asm-ppc $(WD)/include/asm
 endif
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
 	cp -Rv include/asm-sparc $(WD)/include/asm
 endif
 	cp -Rv include/linux $(WD)/include
@@ -36,13 +36,13 @@
 	$(std_build)
 
 compile-stage2:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	cp -Rv include/asm-i386 /usr/include/asm
 endif
-ifeq ($(ARCH),ppc)
+ifeq ($(LFS-ARCH),ppc)
 	cp -Rv include/asm-ppc /usr/include/asm
 endif
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
 	cp -Rv include/asm-sparc /usr/include/asm
 endif
 	cp -Rv include/linux /usr/include

Modified: x86/branches/utf8-newmake/packages/syslinux/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/syslinux/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/syslinux/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -20,7 +20,7 @@
 	$(std_build)
 
 compile-stage2:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	cp -v isolinux.bin /boot/isolinux
 	cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
 endif

Modified: x86/branches/utf8-newmake/packages/unzip/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/unzip/Makefile	2005-09-26 13:42:59 UTC (rev 789)
+++ x86/branches/utf8-newmake/packages/unzip/Makefile	2005-09-26 14:38:53 UTC (rev 790)
@@ -36,14 +36,14 @@
 	patch -Np1 -i ../$(PATCH2)
 	patch -Np1 -i ../$(PATCH3)
 	cp unix/Makefile .
-ifneq ($(ARCH),x86)
+ifneq ($(LFS-ARCH),x86)
 	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_noasm
 else
 	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux
 	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_shlibz
 endif
 	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
 	cp -d libunzip.so* /usr/lib
 endif
 




More information about the livecd mailing list