Use the correct module list variables

lunar-linux · Oct 30, 2012 · 04bb0a8 · 04bb0a8
1 parent 7380d7c
commit 04bb0a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/mkfiles/stage1.mk b/mkfiles/stage1.mk
@@ -27,20 +27,22 @@ stage1-moonbase: $(ISO_TARGET)/.stage1-moonbase
 
 
 # first build sequence to get the toolchain installed properly
+TOOLCHAIN_MODULES=kernel-headers glibc binutils gcc binutils glibc
+
 $(ISO_TARGET)/.stage1-toolchain: stage1-moonbase stage1-spool
 	@echo stage1-toolchain
-	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -rc kernel-headers glibc binutils gcc binutils glibc
+	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -rc $(TOOLCHAIN_MODULES)
 	@touch $@
 
 stage1-toolchain: $(ISO_TARGET)/.stage1-toolchain
 
 
 # first time build all the require modules for a minimal system
-STAGE1_MODULES=acl attr bash bzip2 coreutils cracklib dialog diffutils e2fsprogs file findutils gawk glib-2 gmp grep gzip installwatch less libcap libffi libmpc lunar make mpfr ncurses net-tools patch pcre perl procps readline sed shadow tar util-linux wget xz zlib
+STAGE1_MODULES=acl attr bash binutils bzip2 coreutils cracklib dialog diffutils e2fsprogs file findutils gawk gcc glibc glib-2 gmp grep gzip installwatch kernel-headers less libcap libffi libmpc lunar make mpfr ncurses net-tools patch pcre perl procps readline sed shadow tar util-linux wget xz zlib
 
 $(ISO_TARGET)/.stage1: stage1-toolchain
 	@echo stage1-build
-	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -rc $(STAGE1_MODULES)
+	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -rc $(filter-out $(TOOLCHAIN_MODULES),$(STAGE1_MODULES))
 	@touch $@
 
 stage1-build: $(ISO_TARGET)/.stage1

diff --git a/mkfiles/stage2.mk b/mkfiles/stage2.mk
@@ -81,12 +81,12 @@ stage2-moonbase: $(ISO_TARGET)/.stage2-moonbase
 
 
 # build all the require modules for the iso
-STAGE2_MODULES=kernel-headers pkgconfig xz gettext attr acl gawk sed ncurses readline zlib cracklib libcap util-linux e2fsprogs libffi gmp bzip2 glib-2 wget shadow coreutils net-tools gzip mpfr procps file bash dialog diffutils findutils grep installwatch less tar patch libmpc binutils glibc lunar gcc make
+STAGE2_MODULES=kernel-headers glibc gcc binutils pkgconfig xz gettext attr acl gawk sed ncurses readline zlib cracklib libcap util-linux e2fsprogs libffi gmp bzip2 glib-2 wget shadow coreutils net-tools gzip mpfr procps file bash dialog diffutils findutils grep installwatch less tar patch libmpc lunar make
 
 $(ISO_TARGET)/.stage2: stage2-moonbase stage2-spool
 	@echo stage2-build
-	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c kernel-headers glibc gcc binutils
-	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c $(STAGE1_MODULES)
+	#@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c kernel-headers glibc gcc binutils
+	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c $(STAGE2_MODULES)
 	@touch $@
 
 stage2-build: $(ISO_TARGET)/.stage2