[Lunar-commits] <lunar-iso> Added module exclude list for stage2

[Peter de Ridder]

commit 22a65df569c033af62fae6309fae6552e160e14d
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Mon, 05 Nov 2012 15:29:37 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/22a65df569c033af62fae6309fae6552e160e14d

Added module exclude list for stage2
---
  conf/modules.exclude            | +1/-0     
  conf/modules.exclude.x86_64     | +1/-0     
  mkfiles/kernel.mk               | +2/-2     
  mkfiles/stage2.mk               | +3/-1     
  template/etc/lunar/local/config | +1/-1     
  5 files changed, 8 insertions(+), 4 deletions(-)

--- /dev/null
+++ b/conf/modules.exclude
@@ -0,0 +1 @@
+EXCLUDE_MODULES=udev
--- /dev/null
+++ b/conf/modules.exclude.x86_64
@@ -0,0 +1 @@
+EXCLUDE_MODULES+=grub
--- a/mkfiles/kernel.mk
+++ b/mkfiles/kernel.mk
@@ -3,9 +3,9 @@
 kernel: linux
 
 
-$(ISO_TARGET)/var/cache/lunar/linux-$(ISO_BUILD).tar.bz2: stage2
+$(ISO_TARGET)/var/cache/lunar/linux-$(ISO_ARCH).tar.bz2: stage2
 	cp $(ISO_SOURCE)/kernels/conf/generic $(ISO_TARGET)/etc/lunar/local/.config.current
 	yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c linux
 	mv $(ISO_TARGET)/var/cache/lunar/linux-$$($(ISO_SOURCE)/scripts/chroot-build lvu installed linux)-$(ISO_BUILD).tar.bz2 $@
 
-linux: $(ISO_TARGET)/var/cache/lunar/linux-$(ISO_BUILD).tar.bz2
+linux: $(ISO_TARGET)/var/cache/lunar/linux-$(ISO_ARCH).tar.bz2
--- a/mkfiles/stage2.mk
+++ b/mkfiles/stage2.mk
@@ -89,10 +89,12 @@ ifneq ($(MAKECMDGOALS),clean)
 endif
 include $(ISO_SOURCE)/conf/modules.stage2
 include $(ISO_SOURCE)/conf/modules.kernel
+include $(ISO_SOURCE)/conf/modules.exclude
+-include $(ISO_SOURCE)/conf/modules.exclude.$(ISO_ARCH)
 
 $(ISO_TARGET)/.stage2: stage2-moonbase stage2-spool $(ISO_SOURCE)/conf/modules.all
 	@echo stage2-build
-	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c $(STAGE2_MODULES) `$(ISO_SOURCE)/scripts/chroot-build lsh sort_by_dependency $(filter-out $(KERNEL_MODULES) $(STAGE2_MODULES),$(ALL_MODULES))`
+	@yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c $(STAGE2_MODULES) `$(ISO_SOURCE)/scripts/chroot-build lsh sort_by_dependency $(filter-out $(KERNEL_MODULES) $(STAGE2_MODULES) $(EXCLUDE_MODULES),$(ALL_MODULES))`
 	@touch $@
 
 stage2-build: $(ISO_TARGET)/.stage2
--- a/template/etc/lunar/local/config
+++ b/template/etc/lunar/local/config
@@ -27,4 +27,4 @@ SAFE_OPTIMIZATIONS=on
  LUNAR_ALIAS_SSL="openssl"
 LUNAR_ALIAS_KERNEL_HEADERS="kernel-headers"
 LUNAR_ALIAS_KMOD="kmod"
-LUNAR_ALIAS_UDEV="udev"
+LUNAR_ALIAS_UDEV="systemd"