Changeset 748 for branches


Ignore:
Timestamp:
Mar 6, 2016, 3:16:30 PM (4 years ago)
Author:
amain
Message:

Fix 15.05 build

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/15.05/openwrt/patches/all/021_install_kernel_modules_and_merge_debwrt_config

    r734 r748  
    11diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
    2 index 24d2630..db6a8fa 100644
     2index 24d2630..34258c6 100644
    33--- a/include/kernel-defaults.mk
    44+++ b/include/kernel-defaults.mk
    5 @@ -101,17 +101,23 @@ define Kernel/SetNoInitramfs
     5@@ -101,16 +101,66 @@ define Kernel/SetNoInitramfs
    66 endef
    77 
    88 define Kernel/Configure/Default
    9 -       $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
    10 +       $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target.default
     9+       @echo
     10+       @echo
     11+       @echo ">>> Linux kernel target config"
     12+       @echo ">>> to  :  LINUX_DIR/.config.target"
     13+       @echo
     14        $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
    1115 # copy CONFIG_KERNEL_* settings over to .config.target
    12 -       awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
    13 +       awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target.default
    14 +# DebWrt: merge our custom config
    15 +       $(SCRIPT_DIR)/kconfig.pl + $(LINUX_DIR)/.config.target.default $(TOPDIR)/.config.debwrt > $(LINUX_DIR)/.config.target
     16        awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
    1617        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
    1718        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
    1819        echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
     20+       @echo
     21+       @echo
     22+       @echo ">>> METADATA kconfig"
     23+       @echo ">>> from:  TMP_DIR/.packageinfo, TOPDIR/.config"
     24+       @echo ">>> to  :  LINUX_DIR/.config.override"
     25+       @echo
    1926        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
     27+       @echo
     28+       @echo
     29+       @echo ">>> KCONFIG"
     30+       @echo ">>> from:  LINUX_DIR/.config.target, LINUX_DIR/.config.override"
     31+       @echo ">>> to  :  LINUX_DIR/.config"
     32+       @echo
    2033        $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
     34+       @echo
     35+       @echo
     36+       @echo ">>> Kernel oldnoconfig 1"
     37+       @echo
     38+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
     39+       mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.openwrt
     40+       sort $(LINUX_DIR)/.config.openwrt | grep -v '#' > $(LINUX_DIR)/.config.1
     41+       @echo
     42+       @echo
     43+       @echo ">>> Merge DebWrt config with kernel config"
     44+       @echo ">>> from: TOPDIR/.config.debwrt, LINUX_DIR/.config.linux"
     45+       @echo ">>> to  : LINUX_DIR/.config"
     46+       @echo
     47+       $(SCRIPT_DIR)/kconfig.pl + $(LINUX_DIR)/.config.openwrt $(TOPDIR)/.config.debwrt > $(LINUX_DIR)/.config
     48+       @echo
     49+       @echo
     50+       @echo ">>> Kernel oldnoconfig 2"
     51+       @echo
     52+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
     53+       sort $(LINUX_DIR)/.config | grep -v '^#' > $(LINUX_DIR)/.config.2
     54+       @echo
     55+       @echo ">>>    start diff openwrt versus debwrt"
     56+       -diff $(LINUX_DIR)/.config.1 $(LINUX_DIR)/.config.2 >$(LINUX_DIR)/.config.diff
     57+       cat $(LINUX_DIR)/.config.diff
     58+       @echo ">>>    end diff openwrt versus debwrt"
     59+       @echo
     60+       @echo
     61+       @echo ">>> Set no initramfs"
     62+       @echo
    2163        $(call Kernel/SetNoInitramfs)
    22 +# DebWrt: merge new kernel config, say no to anything new
    23 +       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
    2464        rm -rf $(KERNEL_BUILD_DIR)/modules
     65+       @echo
     66+       @echo
     67+       @echo ">>> Install kernel headers"
     68+       @echo
    2569        $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
    26 +# DebWrt: merge new kernel config, say no to anything new, 2nd pass to make sure any *new* config options are automatically satisfied (no questions asked on console). Not sure why this needed
    27 +       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
    2870        $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
    2971 endef
    30  
    31 @@ -121,7 +127,12 @@ endef
     72@@ -120,6 +170,10 @@ define Kernel/Configure/Initramfs
     73 endef
    3274 
    3375 define Kernel/CompileModules/Default
     76+       @echo
     77+       @echo
     78+       @echo ">>> Build and install kernel modules"
     79+       @echo
    3480        rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
    35 -       +$(MAKE) $(KERNEL_MAKEOPTS) modules
    36 +       # DebWrt make modules install
    37 +       -mkdir -p $(TMP_DIR)/modules
    38 +       +$(MAKE) $(KERNEL_MAKEOPTS) modules modules_install INSTALL_MOD_PATH=$(TMP_DIR)/modules
    39 +       echo "OPENWRT_LINUX_VERSION=$(LINUX_VERSION)" >> $(TOPDIR)/.openwrt_env
    40 +       echo "OPENWRT_LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION)" >> $(TOPDIR)/.openwrt_env
    41 +       echo "OPENWRT_LINUX_DIR=$(LINUX_DIR)" >> $(TOPDIR)/.openwrt_env
     81        +$(MAKE) $(KERNEL_MAKEOPTS) modules
    4282 endef
    43  
    44  OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
Note: See TracChangeset for help on using the changeset viewer.