Changeset 734 for branches


Ignore:
Timestamp:
Mar 4, 2016, 9:32:07 PM (4 years ago)
Author:
amain
Message:

Fix several fixes for 15.05

Location:
branches/15.05/openwrt/patches/all
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/15.05/openwrt/patches/all/012_disable_all_openwrt_packages

    r724 r734  
    1 Index: trunk-HEAD/include/toplevel.mk
    2 ===================================================================
    3 --- trunk-HEAD/include/toplevel.mk      (revision 36922)
    4 +++ trunk-HEAD/include/toplevel.mk      (working copy)
    5 @@ -86,6 +86,11 @@
    6                 [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $(_ignore) $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
     1diff --git a/include/toplevel.mk b/include/toplevel.mk
     2index 11b2dd9..e7229ae 100644
     3--- a/include/toplevel.mk
     4+++ b/include/toplevel.mk
     5@@ -75,6 +75,11 @@ prepare-tmpinfo: FORCE
     6                [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
    77        done
    8         [ tmp/.config-feeds.in -nt tmp/.packagesubdirs ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
     8        [ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
    99+       # DebWrt: we don't need to build any packages by default, so we disable them
    1010+       #         all. This allows us to have fine control over which packages we
     
    1313+       mv tmp/.config-package.in.new tmp/.config-package.in
    1414        ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
    15         ./scripts/metadata.pl package_subdirs tmp/.packageinfo > tmp/.packagesubdirs || { rm -f tmp/.packagesubdirs; false; }
     15        ./scripts/metadata.pl package_feeds tmp/.packageinfo > tmp/.packagefeeds || { rm -f tmp/.packagefeeds; false; }
    1616        touch $(TOPDIR)/tmp/.build
  • branches/15.05/openwrt/patches/all/021_install_kernel_modules_and_merge_debwrt_config

    r731 r734  
    1 Index: trunk-HEAD/include/kernel-defaults.mk
    2 ===================================================================
    3 --- trunk-HEAD/include/kernel-defaults.mk       (revision 36948)
    4 +++ trunk-HEAD/include/kernel-defaults.mk       (working copy)
    5 @@ -105,9 +105,11 @@
     1diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
     2index 24d2630..db6a8fa 100644
     3--- a/include/kernel-defaults.mk
     4+++ b/include/kernel-defaults.mk
     5@@ -101,17 +101,23 @@ define Kernel/SetNoInitramfs
    66 endef
    77 
     
    1616        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
    1717        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
    18         echo "CONFIG_KALLSYMS_UNCOMPRESSED=y" >> $(LINUX_DIR)/.config.target
    19 @@ -114,6 +116,8 @@
     18        echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
    2019        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
    21         $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set
     20        $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
    2221        $(call Kernel/SetNoInitramfs)
    2322+# DebWrt: merge new kernel config, say no to anything new
    2423+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
    2524        rm -rf $(KERNEL_BUILD_DIR)/modules
    26         cmp -s $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev || { \
    27                 cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \
    28 @@ -120,6 +124,8 @@
    29                 cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev; \
    30         }
    3125        $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
    3226+# 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
    3327+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
    34         $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
     28        $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
    3529 endef
    3630 
    37 @@ -129,7 +135,12 @@
     31@@ -121,7 +127,12 @@ endef
    3832 
    3933 define Kernel/CompileModules/Default
  • branches/15.05/openwrt/patches/all/025_make_empty_rootfs

    r724 r734  
    1 Index: trunk-HEAD/include/image.mk
    2 ===================================================================
    3 --- trunk-HEAD/include/image.mk (revision 36922)
    4 +++ trunk-HEAD/include/image.mk (working copy)
    5 @@ -172,9 +172,24 @@
    6  $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
    7  $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
     1diff --git a/include/image.mk b/include/image.mk
     2index a92b13e..e99141f 100644
     3--- a/include/image.mk
     4+++ b/include/image.mk
     5@@ -156,6 +156,26 @@ define Image/mkfs/squashfs
     6        $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
     7 endef
    88 
    9 -define Image/mkfs/squashfs
    109+ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
    1110+    define Image/mkfs/squashfs
     
    1514+       # remove /lib/modules to prevent the image from getting to big
    1615+       rm -rf $(TARGET_DIR)/lib/modules
    17         $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
    18 -endef
     16+       $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
    1917+    endef
    2018+else
    21 +   define Image/mkfs/squashfs
     19+    define Image/mkfs/squashfs
    2220+       # boot direclty from device
    2321+       @mkdir -p $(TARGET_DIR)/overlay
    2422+       mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
    2523+       touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
    26 +       $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TMP_DIR)/debwrt-empty-rootfs/ $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
     24+       $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TMP_DIR)/debwrt-empty-rootfs/ $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
    2725+    endef
    2826+endif
    29  
     27+
     28+
    3029 # $(1): board name
    3130 # $(2): rootfs type
     31 # $(3): kernel image
Note: See TracChangeset for help on using the changeset viewer.