Browse Source

modules: update LEDE

Matthias Schiffer 6 years ago
parent
commit
d7ace5b8b1
20 changed files with 28 additions and 95 deletions
  1. 1 1
      modules
  2. 19 0
      patches/lede/0012-procd-switch-to-master-branch.patch
  3. 0 26
      patches/lede/0012-procd-update-to-git-HEAD-version.patch
  4. 8 8
      patches/lede/0016-procd-remove-procd-nand-package.patch
  5. 0 35
      patches/lede/0016-procd-update-to-latest-git-HEAD.patch
  6. 0 0
      patches/lede/0017-base-files-always-use-staged-sysupgrade.patch
  7. 0 0
      patches/lede/0018-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch
  8. 0 0
      patches/lede/0019-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch
  9. 0 0
      patches/lede/0020-base-files-sysupgrade-cleanup.patch
  10. 0 0
      patches/lede/0021-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch
  11. 0 0
      patches/lede/0022-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch
  12. 0 0
      patches/lede/0023-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch
  13. 0 0
      patches/lede/0024-x86-sysupgrade-refactor-platform_do_upgrade.patch
  14. 0 0
      patches/lede/0025-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch
  15. 0 0
      patches/lede/0026-sunxi-sysupgrade-don-t-write-partitions-twice.patch
  16. 0 0
      patches/lede/0027-sunxi-sysupgrade-sync-with-x86.patch
  17. 0 0
      patches/lede/0028-mvebu-fix-sysupgrade.patch
  18. 0 0
      patches/lede/0029-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch
  19. 0 25
      patches/lede/0029-procd-update-to-latest-git-HEAD.patch
  20. 0 0
      patches/lede/0030-busybox-compile-with-debug-information.patch

+ 1 - 1
modules

@@ -2,7 +2,7 @@ GLUON_FEEDS='openwrt gluon routing luci'
 
 LEDE_REPO=https://git.lede-project.org/source.git
 LEDE_BRANCH=lede-17.01
-LEDE_COMMIT=65eec8bd5f6337956b972d07fde49eb5db9cb4a0
+LEDE_COMMIT=3214e174a07f5b333ae6f3fe5a857c8324e9ae27
 
 PACKAGES_OPENWRT_REPO=https://github.com/openwrt/packages.git
 PACKAGES_OPENWRT_BRANCH=lede-17.01

+ 19 - 0
patches/lede/0012-procd-switch-to-master-branch.patch

@@ -0,0 +1,19 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 8 Jul 2017 14:44:00 +0200
+Subject: procd: switch to master branch
+
+diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
+index 70515958cd5002841fd9698b7a7f4aec01ddfb3b..cead3b9b7a5f83879a1aee08ab0463049dd228f4 100644
+--- a/package/system/procd/Makefile
++++ b/package/system/procd/Makefile
+@@ -13,8 +13,8 @@ PKG_RELEASE:=1
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
+ PKG_SOURCE_DATE:=2017-06-19
+-PKG_SOURCE_VERSION:=89918c8cb78e651ee0922f13a96b7f25fc2f285a
+-PKG_MIRROR_HASH:=fad1a37227f85070f6a49a37ea1e98c22c066c91f16ad26898152972eb0c6a91
++PKG_SOURCE_VERSION:=453116e08e6a9349374bbff427b75f57ce5387c9
++PKG_MIRROR_HASH:=a0d5c1ddbd2ba63d52125fa5a815d48a3bfb1b1e0a6b85f3335af8a873ed58fc
+ CMAKE_INSTALL:=1
+ 
+ PKG_LICENSE:=GPL-2.0

+ 0 - 26
patches/lede/0012-procd-update-to-git-HEAD-version.patch

@@ -1,26 +0,0 @@
-From: Hans Dedecker <dedeckeh@gmail.com>
-Date: Mon, 6 Mar 2017 17:25:44 +0100
-Subject: procd: update to git HEAD version
-
-8f218f5 procd: service gets deleted when its last instance is freed
-35209a0 procd: update modprobe path
-
-Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index fd1bca3f4b9665581f9e9ddd9b9294fa500a9d3d..43ea23aab00918a2b664e9a5da7767f90cd568db 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2017-02-15
--PKG_SOURCE_VERSION:=5f9124103410c178d816bb5229fba7dd2286a49b
--PKG_MIRROR_HASH:=ec887b349fc60ad3882fc9eaefb5cd299d64e7d43c062df9f7b7500591ba3e85
-+PKG_SOURCE_DATE:=2017-03-05
-+PKG_SOURCE_VERSION:=8f218f5626a3cb3900dbe9801ee8ace236b0e4a5
-+PKG_MIRROR_HASH:=8ac8691888b64726453bd726fe0c98fc906540bbd2ae666dae6bea592b0b4e4d
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0

+ 8 - 8
patches/lede/0017-procd-remove-procd-nand-package.patch → patches/lede/0016-procd-remove-procd-nand-package.patch

@@ -12,21 +12,21 @@ as a separate package.
 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 
 diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index ac3fe2f52b4863260a2e8efa58dac5da6bbb9ec1..4cc3e5079b9cf25909acef92526753945ba5f9de 100644
+index 305d0bfd333fd17f0f7c57ee2298dbfd4b97fe29..fe4430d59092dae9ba2ffbea61f58ac7b4b41dc6 100644
 --- a/package/base-files/Makefile
 +++ b/package/base-files/Makefile
-@@ -18,7 +18,9 @@ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
- PKG_BUILD_DEPENDS:=usign/host
+@@ -19,7 +19,9 @@ PKG_BUILD_DEPENDS:=usign/host
  PKG_LICENSE:=GPL-2.0
  
--PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE
-+PKG_CONFIG_DEPENDS := \
+ # Extend depends from version.mk
+-PKG_CONFIG_DEPENDS += CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE
++PKG_CONFIG_DEPENDS += \
 +	CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE \
 +	CONFIG_NAND_SUPPORT
  
  include $(INCLUDE_DIR)/package.mk
  
-@@ -30,7 +32,7 @@ endif
+@@ -31,7 +33,7 @@ endif
  define Package/base-files
    SECTION:=base
    CATEGORY:=Base system
@@ -35,7 +35,7 @@ index ac3fe2f52b4863260a2e8efa58dac5da6bbb9ec1..4cc3e5079b9cf25909acef9252675394
    TITLE:=Base filesystem for Lede
    URL:=http://openwrt.org/
    VERSION:=$(PKG_RELEASE)-$(REVISION)
-@@ -105,9 +107,16 @@ ifdef CONFIG_SIGNED_PACKAGES
+@@ -106,9 +108,16 @@ ifdef CONFIG_SIGNED_PACKAGES
    endef
  endif
  
@@ -435,7 +435,7 @@ index 0000000000000000000000000000000000000000..6bd2005344c081df20e5a330a69e49e3
 +	nand_upgrade_stage1
 +}
 diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index 805583143fa865d9ffb38355f10ad300e222400e..775b9a64e172b250b3ba27e71fbf07aff46ede14 100644
+index cead3b9b7a5f83879a1aee08ab0463049dd228f4..2a42db1fc034b554860393cfd9b17ed8423d7bc4 100644
 --- a/package/system/procd/Makefile
 +++ b/package/system/procd/Makefile
 @@ -22,11 +22,9 @@ PKG_LICENSE_FILES:=

+ 0 - 35
patches/lede/0016-procd-update-to-latest-git-HEAD.patch

@@ -1,35 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 29 May 2017 23:15:22 +0200
-Subject: procd: update to latest git HEAD
-
-992b796 rcS: add missing fcntl.h include
-63789e5 init: add support for sysupgrades triggered from preinit
-5b1fb35 Remove code that has become unnecessary after sysupgrade changes
-5918b6d upgraded: add support for passing a "command" argument to stage2
-056d8dd upgraded: link dynamically, chroot during exec
-7c6cf55 system: always support staged sysupgrade
-d42b21e procd/rcS: Use /dev/null as stdin
-e0098d4 service/instance: add an auto start option
-1247db1 procd: Log initscript output prefixed with script name
-8d720b2 procd: Don't use syslog before its initialization
-2555474 procd: Add missing \n in debug message
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index 43ea23aab00918a2b664e9a5da7767f90cd568db..805583143fa865d9ffb38355f10ad300e222400e 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2017-03-05
--PKG_SOURCE_VERSION:=8f218f5626a3cb3900dbe9801ee8ace236b0e4a5
--PKG_MIRROR_HASH:=8ac8691888b64726453bd726fe0c98fc906540bbd2ae666dae6bea592b0b4e4d
-+PKG_SOURCE_DATE:=2017-05-29
-+PKG_SOURCE_VERSION:=992b796204caf5b0290ea4a1246b43b353b6c1d7
-+PKG_MIRROR_HASH:=effecf66ef6a7396dd26d54a5d232b4a895d9fe7aaca83063aaffc7b39a051d5
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0

+ 0 - 0
patches/lede/0018-base-files-always-use-staged-sysupgrade.patch → patches/lede/0017-base-files-always-use-staged-sysupgrade.patch


+ 0 - 0
patches/lede/0019-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch → patches/lede/0018-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch


+ 0 - 0
patches/lede/0020-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch → patches/lede/0019-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch


+ 0 - 0
patches/lede/0021-base-files-sysupgrade-cleanup.patch → patches/lede/0020-base-files-sysupgrade-cleanup.patch


+ 0 - 0
patches/lede/0022-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch → patches/lede/0021-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch


+ 0 - 0
patches/lede/0023-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch → patches/lede/0022-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch


+ 0 - 0
patches/lede/0024-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch → patches/lede/0023-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch


+ 0 - 0
patches/lede/0025-x86-sysupgrade-refactor-platform_do_upgrade.patch → patches/lede/0024-x86-sysupgrade-refactor-platform_do_upgrade.patch


+ 0 - 0
patches/lede/0026-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch → patches/lede/0025-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch


+ 0 - 0
patches/lede/0027-sunxi-sysupgrade-don-t-write-partitions-twice.patch → patches/lede/0026-sunxi-sysupgrade-don-t-write-partitions-twice.patch


+ 0 - 0
patches/lede/0028-sunxi-sysupgrade-sync-with-x86.patch → patches/lede/0027-sunxi-sysupgrade-sync-with-x86.patch


+ 0 - 0
patches/lede/0030-mvebu-fix-sysupgrade.patch → patches/lede/0028-mvebu-fix-sysupgrade.patch


+ 0 - 0
patches/lede/0031-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch → patches/lede/0029-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch


+ 0 - 25
patches/lede/0029-procd-update-to-latest-git-HEAD.patch

@@ -1,25 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 30 May 2017 07:29:25 +0200
-Subject: procd: update to latest git HEAD
-
-e7bb2c8 upgraded: define __GNU_SOURCE
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index 775b9a64e172b250b3ba27e71fbf07aff46ede14..f9d2f4d34f866a169eb1665ac2699c54422c3c4b 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2017-05-29
--PKG_SOURCE_VERSION:=992b796204caf5b0290ea4a1246b43b353b6c1d7
--PKG_MIRROR_HASH:=effecf66ef6a7396dd26d54a5d232b4a895d9fe7aaca83063aaffc7b39a051d5
-+PKG_SOURCE_DATE:=2017-05-30
-+PKG_SOURCE_VERSION:=e7bb2c8d631862e1535cf6eead18387f02a69ad2
-+PKG_MIRROR_HASH:=97bb96aba2db4730fd8b2edeb15f94e18caa6017d9e50a73777c14532154cade
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0

+ 0 - 0
patches/lede/0032-busybox-compile-with-debug-information.patch → patches/lede/0030-busybox-compile-with-debug-information.patch