From 1cffbb39352cbd3acb7f7405ccf860d46f74ceed Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Mon, 7 Aug 2017 14:00:33 +0200 Subject: [PATCH] modules: update LEDE --- modules | 2 +- .../0012-procd-switch-to-latest-master.patch | 16 +++++++--------- .../0016-procd-remove-procd-nand-package.patch | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules b/modules index ad4806284..70ef5b6c5 100644 --- a/modules +++ b/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=c407e6c2f29b96fe589370125595004e856f78d5 +LEDE_COMMIT=982612dba26f042f8b9a524996b0774d3c8e747a PACKAGES_OPENWRT_REPO=https://github.com/openwrt/packages.git PACKAGES_OPENWRT_BRANCH=lede-17.01 diff --git a/patches/lede/0012-procd-switch-to-latest-master.patch b/patches/lede/0012-procd-switch-to-latest-master.patch index 6607f7093..a00741512 100644 --- a/patches/lede/0012-procd-switch-to-latest-master.patch +++ b/patches/lede/0012-procd-switch-to-latest-master.patch @@ -3,19 +3,17 @@ Date: Thu, 13 Jul 2017 17:15:21 +0200 Subject: procd: switch to latest master diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile -index d195da32ab98163e6714f644a6c1e5117f657e2d..d78b4e0fe1b4cd12dd873ff55250ed833de50e05 100644 +index 7587170f0286fc6aba132d3c477fc14ab6be316e..b878ad06b73512fff08246978dbbf11ba47cdfc8 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile -@@ -12,9 +12,9 @@ PKG_RELEASE:=1 - +@@ -13,8 +13,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git --PKG_SOURCE_DATE:=2017-07-12 --PKG_SOURCE_VERSION:=4dbf57a63b99f7bcaaf40679140995f80d864004 --PKG_MIRROR_HASH:=314519a40af6bda6987034b2e53f28cd2443d063aa69857bad7e8b7532f05c8d -+PKG_SOURCE_DATE:=2017-07-13 -+PKG_SOURCE_VERSION:=76dcbee7fd3a90221619feb7e4c572e00b60af9b -+PKG_MIRROR_HASH:=61460e267fbc1e3269caac4b98d7d351c6ccfa0b4f3493b37dad83a6faad4b2e + PKG_SOURCE_DATE:=2017-07-31 +-PKG_SOURCE_VERSION:=3e68cdfdc5221d2a9268e9b30fbd474ea20b92f8 +-PKG_MIRROR_HASH:=9b16f8d88ebff47ce55c09a34a68d3f4b04f7db7632d4ce73ae68b7fb8d66f73 ++PKG_SOURCE_VERSION:=f062b305b5ea2c77bb8286f8982f08e4c5b133ae ++PKG_MIRROR_HASH:=419f99b484bc5698c3e096bbc40af768d01361da10ab25d22e95038bfbb2b724 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/patches/lede/0016-procd-remove-procd-nand-package.patch b/patches/lede/0016-procd-remove-procd-nand-package.patch index 017784a82..dc1883668 100644 --- a/patches/lede/0016-procd-remove-procd-nand-package.patch +++ b/patches/lede/0016-procd-remove-procd-nand-package.patch @@ -435,7 +435,7 @@ index 0000000000000000000000000000000000000000..6bd2005344c081df20e5a330a69e49e3 + nand_upgrade_stage1 +} diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile -index d78b4e0fe1b4cd12dd873ff55250ed833de50e05..98cac395f9f60f581a384a51a5b2a0f03f16df25 100644 +index b878ad06b73512fff08246978dbbf11ba47cdfc8..d35248e66d7252d4851f456876a6eb61002fdb66 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -22,11 +22,9 @@ PKG_LICENSE_FILES:= -- GitLab