Author: justin
Date: 2005-09-25 17:05:56 -0600 (Sun, 25 Sep 2005)
New Revision: 775
Modified:
x86/trunk/Makefile
x86/trunk/packages/binutils/Makefile
x86/trunk/packages/coreutils/Makefile
x86/trunk/packages/glibc/Makefile
x86/trunk/packages/grub/Makefile
x86/trunk/packages/kbd/Makefile
x86/trunk/packages/links/Makefile
x86/trunk/packages/linux-libc-headers/Makefile
x86/trunk/packages/linux/Makefile
x86/trunk/packages/syslinux/Makefile
x86/trunk/packages/unionfs/Makefile
x86/trunk/packages/unzip/Makefile
Log:
Removed "unset ARCH" commands, decided to rename to LFS-ARCH . Removed unneeded
popdev calls in main Makefile.
Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -17,7 +17,7 @@
# Machine architecure, LiveCD version, and Linux kernel version.
# Edit the ARCH and VERSION variables if you are building for a non-x86 arch.
#==============================================================================
-export ARCH := x86
+export LFS-ARCH := x86
export VERSION := $(ARCH)-6.2-pre1
export KVERS := 2.6.12.5
@@ -360,10 +360,10 @@
@-rm -rf $(WD)/{doc,info,man}
@touch $@
-ch-%: popdev
+ch-%:
make -C $(PKG)/$* stage2
-re-adjust-toolchain: popdev
+re-adjust-toolchain:
make -C $(PKG)/binutils re-adjust-toolchain
final-environment:
@@ -375,11 +375,11 @@
@-cp $(ROOT)/etc/hosts /etc
@-cp $(ROOT)/etc/fstab /etc
-update-fontsdir: popdev
+update-fontsdir:
cd /usr/X11R6/lib/X11/fonts/TTF ; /usr/X11R6/bin/mkfontscale ; \
/usr/X11R6/bin/mkfontdir ; /usr/bin/fc-cache -f
-chroot-gvim: popdev
+chroot-gvim:
make -C $(PKG)/vim stage3
# Targets to create the iso
Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile 2005-09-25 18:39:15 UTC (rev
774)
+++ x86/trunk/packages/binutils/Makefile 2005-09-25 23:05:56 UTC (rev
775)
@@ -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/trunk/packages/coreutils/Makefile
===================================================================
--- x86/trunk/packages/coreutils/Makefile 2005-09-25 18:39:15 UTC (rev
774)
+++ x86/trunk/packages/coreutils/Makefile 2005-09-25 23:05:56 UTC (rev
775)
@@ -44,7 +44,7 @@
cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/
compile-stage2:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
patch -Np1 -i ../$(PATCH1)
endif
patch -Np1 -i ../$(PATCH2)
Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/glibc/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -45,7 +45,7 @@
cp
$(SRC)/{$(FILE),$(FILE1),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)}
$(LFSSRC)/
compile-stage1:
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
cd ../$(DIR) ; rm -rf nptl*
endif
cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
@@ -70,7 +70,7 @@
touch $@
compile-stage2:
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
cd ../$(DIR) ; rm -rf nptl*
endif
cd ../$(DIR) ; unpack ../$(FILE1)
Modified: x86/trunk/packages/grub/Makefile
===================================================================
--- x86/trunk/packages/grub/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/grub/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
-ifeq ($(ARCH),x86)
+ifeq ($(LFS-ARCH),x86)
./configure --prefix=/usr
make $(PM)
make install
Modified: x86/trunk/packages/kbd/Makefile
===================================================================
--- x86/trunk/packages/kbd/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/kbd/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -24,7 +24,7 @@
SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500
STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(PATCH1) $(PATCH3)
-ifeq ($(ARCH),sparc)
+ifeq ($(LFS-ARCH),sparc)
STAGE2-DEPS += $(PATCH2)
endif
@@ -46,7 +46,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/trunk/packages/links/Makefile
===================================================================
--- x86/trunk/packages/links/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/links/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -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/trunk/packages/linux/Makefile
===================================================================
--- x86/trunk/packages/linux/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/linux/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -27,18 +27,18 @@
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
patch -Np1 -i ../reiser4.patch
patch -Np1 -i ../$(PATCH2)
cd $(ROOT) ; make -C $(PKG)/unionfs patch-kernel
- unset ARCH ; make mrproper
- cp $(ROOT)/linux/config.$(ARCH) .config
- unset ARCH ; make $(PM)
- unset ARCH ; make modules_install
-ifeq ($(ARCH),x86)
+ make mrproper
+ cp $(ROOT)/linux/config.$(LFS-ARCH) .config
+ make $(PM)
+ make modules_install
+ifeq ($(LFS-ARCH),x86)
cp -v arch/i386/boot/bzImage /boot/isolinux/linux
else
cp -v vmlinux /boot/linux
Modified: x86/trunk/packages/linux-libc-headers/Makefile
===================================================================
--- x86/trunk/packages/linux-libc-headers/Makefile 2005-09-25 18:39:15 UTC
(rev 774)
+++ x86/trunk/packages/linux-libc-headers/Makefile 2005-09-25 23:05:56 UTC
(rev 775)
@@ -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/trunk/packages/syslinux/Makefile
===================================================================
--- x86/trunk/packages/syslinux/Makefile 2005-09-25 18:39:15 UTC (rev
774)
+++ x86/trunk/packages/syslinux/Makefile 2005-09-25 23:05:56 UTC (rev
775)
@@ -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/trunk/packages/unionfs/Makefile
===================================================================
--- x86/trunk/packages/unionfs/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/unionfs/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -35,7 +35,7 @@
compile-patch-kernel:
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
- unset ARCH ; ./patch-kernel.sh $(ROOT)/$(PKG)/linux/linux-$(KVERS)/
+ ./patch-kernel.sh $(ROOT)/$(PKG)/linux/linux-$(KVERS)/
clean:
-rm -rf $(DIR)
Modified: x86/trunk/packages/unzip/Makefile
===================================================================
--- x86/trunk/packages/unzip/Makefile 2005-09-25 18:39:15 UTC (rev 774)
+++ x86/trunk/packages/unzip/Makefile 2005-09-25 23:05:56 UTC (rev 775)
@@ -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
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
