From a8067e0a2f8cee3bcbf40cbb302f624e62d2f02d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Sep 2017 16:03:09 +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, 11 insertions(+), 9 deletions(-) diff --git a/modules b/modules index 6026b63a..f8aa8761 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=982612dba26f042f8b9a524996b0774d3c8e747a +LEDE_COMMIT=bb6a8b2cbf55759ef383e52216aa96dfef377f76 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 a0074151..29133509 100644 --- a/patches/lede/0012-procd-switch-to-latest-master.patch +++ b/patches/lede/0012-procd-switch-to-latest-master.patch @@ -3,17 +3,19 @@ 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 7587170f0286fc6aba132d3c477fc14ab6be316e..b878ad06b73512fff08246978dbbf11ba47cdfc8 100644 +index cbbd95f1ee71a8b3d118dfa6efc8db15ba8fd4f4..4598711c2252e2c0ffc322fa2d00508de3e5a775 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile -@@ -13,8 +13,8 @@ PKG_RELEASE:=1 +@@ -12,9 +12,9 @@ PKG_RELEASE:=1 + PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git - PKG_SOURCE_DATE:=2017-07-31 --PKG_SOURCE_VERSION:=3e68cdfdc5221d2a9268e9b30fbd474ea20b92f8 --PKG_MIRROR_HASH:=9b16f8d88ebff47ce55c09a34a68d3f4b04f7db7632d4ce73ae68b7fb8d66f73 -+PKG_SOURCE_VERSION:=f062b305b5ea2c77bb8286f8982f08e4c5b133ae -+PKG_MIRROR_HASH:=419f99b484bc5698c3e096bbc40af768d01361da10ab25d22e95038bfbb2b724 +-PKG_SOURCE_DATE:=2017-08-08 +-PKG_SOURCE_VERSION:=66be6a23d71fcc068d6b813f0e0be2f8f0b6aa88 +-PKG_MIRROR_HASH:=286dcc8855f1dc403895bc9252f617c14be6f7f6ec36f13d4f4de7c4a715f08c ++PKG_SOURCE_DATE:=2017-08-22 ++PKG_SOURCE_VERSION:=54b46a351fab736a92221a6f9c750b5f9da499a1 ++PKG_MIRROR_HASH:=dcbeea89910bbdf7d6cf20c38892d6c51de375c8b35c372a7106ae17090694f3 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 dc188366..4c86f6de 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 b878ad06b73512fff08246978dbbf11ba47cdfc8..d35248e66d7252d4851f456876a6eb61002fdb66 100644 +index 4598711c2252e2c0ffc322fa2d00508de3e5a775..5f2d21c102c7781ce047b166d61354f0f7430eb7 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -22,11 +22,9 @@ PKG_LICENSE_FILES:=