aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-05-10 08:35:48 +0000
committerMike Baker <mbm@openwrt.org>2007-05-10 08:35:48 +0000
commit854f0ad080f5607cd4041ed91437145d2a06579c (patch)
tree4628ed721b9fc7bfb24abf466abfc3c2e9c076b7 /include
parent2bb4aa3e90c0c4e96e06b7615ee761ab0ddc85e9 (diff)
downloadupstream-854f0ad080f5607cd4041ed91437145d2a06579c.tar.gz
upstream-854f0ad080f5607cd4041ed91437145d2a06579c.tar.bz2
upstream-854f0ad080f5607cd4041ed91437145d2a06579c.zip
change handling of target/linux/generic-2.x/files to match other targets (#1648)
SVN-Revision: 7158
Diffstat (limited to 'include')
-rw-r--r--include/kernel-defaults.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index c2becb9011..b9231a9beb 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -29,6 +29,7 @@ KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
define Kernel/Prepare/Default
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
+ if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi
if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi
if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi
@@ -67,14 +68,12 @@ ifeq ($(KERNEL),2.6)
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_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/
endef
else
define Kernel/SetInitramfs
mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
- rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
+ rm -f $(BUILD_DIR)/root/init
echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
endef
endif