Changeset 924


Ignore:
Timestamp:
Jan 26, 2017, 7:32:19 PM (10 months ago)
Author:
amain
Message:

lede: update patches, split patch 021_install_kernel_modules_and_merge_debwrt_config

Location:
trunk/openwrt/patches/lede/all
Files:
10 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/patches/lede/all/025_make_empty_rootfs

    r884 r924  
    1 --- trunk-HEAD/include/image.mk 2016-12-26 17:40:43.647766058 +0100
    2 +++ trunk-HEAD/include/image.mk.new     2016-12-26 17:57:14.866269381 +0100
    3 @@ -193,13 +193,32 @@
     1diff --git a/include/image.mk b/include/image.mk
     2index 81519cd..c4021ed 100644
     3--- a/include/image.mk
     4+++ b/include/image.mk
     5@@ -200,13 +200,32 @@ endef
    46 $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
    57 $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
     
    79-define Image/mkfs/squashfs
    810+ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
    9 +    define Image/mkfs/squashfs
     11+       define Image/mkfs/squashfs
    1012+       # kexec and LABEL= boot
    1113+       @mkdir -p $(call mkfs_target_dir,$(1))/overlay
     
    1618                -nopad -noappend -root-owned \
    1719                -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
    18                 -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) \
     20                -processors 1 \
    1921                $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
    2022-endef
    21 +    endef
     23+       endef
    2224+else
    23 +    define Image/mkfs/squashfs
     25+       define Image/mkfs/squashfs
    2426+       # boot direclty from device
    2527+       mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
     
    2729+       # create image file $@[used to be $(KDIR)/root.squashfs] from $(TMP_DIR)/debwrt-empty-rootfs/
    2830+       $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TMP_DIR)/debwrt-empty-rootfs/ $@ \
    29 +               -nopad -noappend -root-owned \
    30 +               -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
    31 +               -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) \
    32 +               $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
    33 +    endef
     31+               -nopad -noappend -root-owned \
     32+               -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
     33+               -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) \
     34+               $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
     35+       endef
    3436+endif
    3537 
  • trunk/openwrt/patches/lede/all/041_save_environment_variables

    r884 r924  
    1 Index: trunk-HEAD/Makefile
    2 ===================================================================
    3 --- trunk-HEAD.orig/Makefile
    4 +++ trunk-HEAD/Makefile
    5 @@ -87,8 +87,16 @@ prereq: $(target/stamp-prereq) tmp/.prer
    6  checksum: FORCE
    7         $(call sha256sums,$(BIN_DIR))
     1diff --git a/Makefile b/Makefile
     2index a26eeee..aca3ad8 100644
     3--- a/Makefile
     4+++ b/Makefile
     5@@ -91,8 +91,16 @@ diffconfig: FORCE
     6        mkdir -p $(BIN_DIR)
     7        $(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.seed
    88 
    99+con:
     
    1515+       #
    1616+
    17  prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
     17 prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile)
    1818-world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
    19 +world: con prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) con FORCE
     19+world: con prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE con
    2020        $(_SINGLE)$(SUBMAKE) -r package/index
     21        $(_SINGLE)$(SUBMAKE) -r diffconfig
    2122        $(_SINGLE)$(SUBMAKE) -r checksum
    22  
Note: See TracChangeset for help on using the changeset viewer.