Changeset 556


Ignore:
Timestamp:
Nov 17, 2013, 10:29:44 PM (6 years ago)
Author:
amain
Message:

openwrt: fix trunk build issues

Location:
trunk/openwrt/patches/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/patches/trunk/021_install_kernel_modules_and_merge_debwrt_config

    r517 r556  
    11--- openwrt/include/kernel-defaults.mk  2012-09-30 00:14:28.601162927 +0200
    22+++ openwrt/include/kernel-defaults.mk.new      2012-09-30 00:14:17.834676182 +0200
    3 @@ -96,9 +96,11 @@
    4  endif
     3@@ -93,9 +93,11 @@
     4 endef
    55 
    66 define Kernel/Configure/Default
     
    1414        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
    1515        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
    16         echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
    17 @@ -106,13 +108,20 @@
     16        echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
     17@@ -103,6 +105,8 @@
     18        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
    1819        $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
    19         $(call Kernel/SetInitramfs)
    20         rm -rf $(KERNEL_BUILD_DIR)/modules
     20        $(call Kernel/SetNoInitramfs)
    2121+# DebWrt: merge new kernel config, say no to anything new
    2222+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
     23        rm -rf $(KERNEL_BUILD_DIR)/modules
    2324        [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
    2425        $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
    25  endef
     26@@ -114,7 +118,12 @@
    2627 
    2728 define Kernel/CompileModules/Default
  • trunk/openwrt/patches/trunk/025_make_empty_rootfs

    r517 r556  
    1 --- openwrt/include/image.mk.org        2012-02-15 20:30:10.713220246 +0100
    2 +++ openwrt/include/image.mk    2012-02-15 20:41:49.980687722 +0100
    3 @@ -87,12 +87,26 @@
    4    endif
     1--- openwrt/include/image.mk.org
     2+++ openwrt/include/image.mk
     3@@ -122,12 +122,26 @@
     4 endif
    55 
    6    ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
    7 +  ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
     6 ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     7+ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
    88     define Image/mkfs/squashfs
    99+               # boot direclty from device
     
    2323                $(call Image/Build,squashfs)
    2424     endef
    25    endif
    26 +  endif
     25 endif
     26+endif
    2727 
    28    ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
     28 ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
    2929     define Image/mkfs/ubifs
Note: See TracChangeset for help on using the changeset viewer.