X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/db29900afb7ff1fc170edd8922208a76d1ec874b..7c82cc0f83047d49d248d216490f29d379bf32c5:/target/linux/kernel.mk

diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index fc337543e..cd74fccfb 100644
--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -1,4 +1,4 @@
-LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+LINUX_SOURCE:=$(LINUX_NAME).tar.bz2
 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
@@ -8,9 +8,12 @@ KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
 $(TARGETS): $(PACKAGE_DIR)
 
+$(LINUX_DIR):
+	mkdir -p $@
+
 $(PACKAGE_DIR):
-	mkdir -p $(PACKAGE_DIR)
-	
+	mkdir -p $@
+
 $(DL_DIR)/$(LINUX_SOURCE):
 	-mkdir -p $(DL_DIR)
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
@@ -40,7 +43,21 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
 	touch $@
 endif
 
-$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install
+ramdisk-config: $(LINUX_DIR)/.configured FORCE
+	mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+	echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+	mkdir -p $(BUILD_DIR)/root/etc/init.d
+	$(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/
+else
+	rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
+	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+endif
+
+$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config
 	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
@@ -67,12 +84,13 @@ $(KERNEL_IPKG):
 	fi
 	$(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
 
-$(BUILD_DIR)/kernel.mk: FORCE
+$(BUILD_DIR)/kernel.mk: $(LINUX_DIR) FORCE
 	echo "BOARD:=$(BOARD)" > $@
+	echo "LINUX_NAME:=$(LINUX_NAME)" >> $@
 	echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
 	echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
 
-pkg-install:
+pkg-install: FORCE
 	@{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
 
 source: $(DL_DIR)/$(LINUX_SOURCE)
@@ -84,24 +102,21 @@ compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile $(LINUX_KERNEL)
 
-mostlyclean:
+mostlyclean: FORCE
 	rm -f $(STAMP_DIR)/.linux-compile
 	rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
 	rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
 	$(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
 	rm -f $(LINUX_KERNEL)
 
-rebuild:
+rebuild: FORCE
 	-$(MAKE) mostlyclean
 	if [ -f $(LINUX_KERNEL) ]; then \
 		$(MAKE) clean; \
 	fi
 	$(MAKE) compile $(MAKE_TRACE)
 
-clean:
+clean: FORCE
 	rm -f $(STAMP_DIR)/.linux-compile
 	rm -rf $(LINUX_BUILD_DIR)
 	rm -f $(TARGETS)
-	
-.PHONY: source prepare compile install mostlyclean rebuild clean pkg-install
-