diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-05 20:17:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-05 20:17:23 +0000 |
| commit | b0ef5e66fa83840befb49fb20e4ec5a8f3e2c162 (patch) | |
| tree | 05f622eab3bede58595ac5659889e3a4ca1cb0ba | |
| parent | f35da063bc797d44143542d08285cb0bf9b247de (diff) | |
| download | upstream-b0ef5e66fa83840befb49fb20e4ec5a8f3e2c162.tar.gz upstream-b0ef5e66fa83840befb49fb20e4ec5a8f3e2c162.tar.bz2 upstream-b0ef5e66fa83840befb49fb20e4ec5a8f3e2c162.zip | |
build: remove useless quote stripping for KERNELNAME, add fallback for it in the kernel build command line
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42781
| -rw-r--r-- | include/kernel-defaults.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 523cd5c483..8abd32d714 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -141,17 +141,14 @@ define Kernel/CopyImage $(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)$(1) $(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf $(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.debug -ifneq ($(subst ",,$(KERNELNAME)),) - #") - $(foreach k,$(filter-out dtbs,$(subst ",,$(KERNELNAME))),$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1);) - #") +ifneq ($(KERNELNAME),) + $(foreach k,$(filter-out dtbs,$(KERNELNAME)),$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1);) endif endef define Kernel/CompileImage/Default rm -f $(TARGET_DIR)/init - +$(MAKE) $(KERNEL_MAKEOPTS) $(subst ",,$(KERNELNAME)) modules - #") + +$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules $(call Kernel/CopyImage) endef @@ -160,9 +157,7 @@ define Kernel/CompileImage/Initramfs $(call Kernel/Configure/Initramfs) $(CP) $(GENERIC_PLATFORM_DIR)/base-files/init $(TARGET_DIR)/init rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio* - +$(MAKE) $(KERNEL_MAKEOPTS) $(subst ",,$(KERNELNAME)) modules - #") - #") + +$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules $(call Kernel/CopyImage,-initramfs) endef else |