r792 - in x86/trunk: . initramfs

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Sep 26 07:44:02 PDT 2005


Author: justin
Date: 2005-09-26 08:44:01 -0600 (Mon, 26 Sep 2005)
New Revision: 792

Modified:
   x86/trunk/Makefile
   x86/trunk/initramfs/Makefile
Log:
Renamed some earlier missed ARCH variables.

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-09-26 14:43:24 UTC (rev 791)
+++ x86/trunk/Makefile	2005-09-26 14:44:01 UTC (rev 792)
@@ -18,7 +18,7 @@
 # Edit the ARCH and VERSION variables if you are building for a non-x86 arch.
 #==============================================================================
 export LFS-ARCH := x86
-export VERSION := $(ARCH)-6.2-pre1
+export VERSION := $(LFS-ARCH)-6.2-pre1
 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
@@ -138,7 +138,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
@@ -216,7 +216,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
 
@@ -392,7 +392,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
@@ -416,13 +416,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/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile	2005-09-26 14:43:24 UTC (rev 791)
+++ x86/trunk/initramfs/Makefile	2005-09-26 14:44:01 UTC (rev 792)
@@ -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/




More information about the livecd mailing list