From 79b20b6e12a274a3c510801e8e3a5f5d05cb780c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Jul 2018 21:30:13 +0200
Subject: [PATCH] modules: update OpenWrt
514a4b3e1b4e include/feeds.mk: rework generation of opkg distfeeds.conf
3e89f58a5ead base-files: fix feed list in PKG_CONFIG_DEPENDS
7fa7c854fe33 include/feeds.mk: always add available feeds to PACKAGE_SUBDIRS
a5b9553cf592 scripts/feeds: add src-dummy method
2f306873efbe ramips: TP-Link TL-WR902AC v3: add missing wps button
36a4681b2bef ramips: TP-Link TL-WR902AC v3: don't build factory image
ca903c73c705 kernel: bump 4.14 to 4.14.54 for 18.06
3a5498c5e55d kernel: bump 4.9 to 4.9.111 for 18.06
27014da237f1 mac80211: Expose support for ath9k Dynack
5a40fad22a39 kernel: bcm47xxpart: fix getting user-space data partition name
---
modules | 2 +-
...8-scripts-feeds-add-src-dummy-method.patch | 34 -------
...d-available-feeds-to-PACKAGE_SUBDIRS.patch | 34 -------
...-fix-feed-list-in-PKG_CONFIG_DEPENDS.patch | 22 -----
...rk-generation-of-opkg-distfeeds.conf.patch | 93 -------------------
5 files changed, 1 insertion(+), 184 deletions(-)
delete mode 100644 patches/openwrt/0008-scripts-feeds-add-src-dummy-method.patch
delete mode 100644 patches/openwrt/0009-include-feeds.mk-always-add-available-feeds-to-PACKAGE_SUBDIRS.patch
delete mode 100644 patches/openwrt/0010-base-files-fix-feed-list-in-PKG_CONFIG_DEPENDS.patch
delete mode 100644 patches/openwrt/0011-include-feeds.mk-rework-generation-of-opkg-distfeeds.conf.patch
diff --git a/modules b/modules
index bc1502559..396fbb2a9 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing luci gluon'
OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-18.06
-OPENWRT_COMMIT=b84a07b3803bd39d0a1eb1b040718a023b8f7971
+OPENWRT_COMMIT=514a4b3e1b4e42fa796d1c908259ee9e215a77da
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-18.06
diff --git a/patches/openwrt/0008-scripts-feeds-add-src-dummy-method.patch b/patches/openwrt/0008-scripts-feeds-add-src-dummy-method.patch
deleted file mode 100644
index a33ed514e..000000000
--- a/patches/openwrt/0008-scripts-feeds-add-src-dummy-method.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 9 Jul 2018 22:00:27 +0200
-Subject: scripts/feeds: add src-dummy method
-
-The src-dummy method does not actually obtain any feed, but it can be used
-to insert addtional entries into the opkg distfeeds.conf.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/scripts/feeds b/scripts/feeds
-index 7613d3a107e4666b30cab2d3dad2ed64b6bcabc3..b29e1d5c353d23c8f0afc81fb0f1ec37e1f2a521 100755
---- a/scripts/feeds
-+++ b/scripts/feeds
-@@ -59,7 +59,8 @@ sub parse_config() {
- my $valid = 1;
- $line[0] =~ /^src-[\w-]+$/ or $valid = 0;
- $line[1] =~ /^\w+$/ or $valid = 0;
-- @src = split /\s+/, $line[2];
-+ @src = split /\s+/, ($line[2] or '');
-+ @src = ('') if @src == 0;
- $valid or die "Syntax error in feeds.conf, line: $line\n";
-
- $name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
-@@ -127,6 +128,10 @@ my %update_method = (
- 'init' => "ln -s '%s' '%s'",
- 'update' => "",
- 'revision' => "echo -n 'local'"},
-+ 'src-dummy' => {
-+ 'init' => "true '%s' && mkdir '%s'",
-+ 'update' => "",
-+ 'revision' => "echo -n 'dummy'"},
- 'src-git' => {
- 'init' => "git clone --depth 1 '%s' '%s'",
- 'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
diff --git a/patches/openwrt/0009-include-feeds.mk-always-add-available-feeds-to-PACKAGE_SUBDIRS.patch b/patches/openwrt/0009-include-feeds.mk-always-add-available-feeds-to-PACKAGE_SUBDIRS.patch
deleted file mode 100644
index f33c2d3a8..000000000
--- a/patches/openwrt/0009-include-feeds.mk-always-add-available-feeds-to-PACKAGE_SUBDIRS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 9 Jul 2018 22:13:19 +0200
-Subject: include/feeds.mk: always add available feeds to PACKAGE_SUBDIRS
-
-Setting CONFIG_FEED_... symbols combined two different effects: Disabling
-a feed in the generated opkg distfeeds.conf, and omitting the feed from
-PACKAGE_SUBDIRS.
-
-It does not make sense to omit built feeds from PACKAGE_SUBDIRS, as it will
-only lead to packages that can be enabled in .config (and that will
-consequently be built) not to be found during rootfs creation, breaking
-the build. All feeds that packages are emitted to should simply always be
-added to PACKAGE_SUBDIRS instead; the CONFIG_FEED_... only configure the
-generated distfeeds.conf like this.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/include/feeds.mk b/include/feeds.mk
-index cecd30424f19525fc7bbb606b45c1e5baf9e8157..c9ffa95a368a72fd43a7e688b7ee1b274ade2916 100644
---- a/include/feeds.mk
-+++ b/include/feeds.mk
-@@ -16,11 +16,7 @@ FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))
- PACKAGE_SUBDIRS=$(PACKAGE_DIR)
- ifneq ($(CONFIG_PER_FEED_REPO),)
- PACKAGE_SUBDIRS += $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/base
-- ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),)
-- PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_AVAILABLE),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
-- else
-- PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_ENABLED),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
-- endif
-+ PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_AVAILABLE),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
- endif
-
- opkg_package_files = $(wildcard \
diff --git a/patches/openwrt/0010-base-files-fix-feed-list-in-PKG_CONFIG_DEPENDS.patch b/patches/openwrt/0010-base-files-fix-feed-list-in-PKG_CONFIG_DEPENDS.patch
deleted file mode 100644
index b34a0dc28..000000000
--- a/patches/openwrt/0010-base-files-fix-feed-list-in-PKG_CONFIG_DEPENDS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 9 Jul 2018 23:50:28 +0200
-Subject: base-files: fix feed list in PKG_CONFIG_DEPENDS
-
-FEEDS_ENABLED and FEEDS_DISABLED are derived from FEEDS_AVAILABLE, not
-FEEDS_INSTALLED.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 7175daec3a0a1a3ecd08ceee4d06e2c0eae4b29a..ef29798d5de855e35d178cb02f356bb3e77a9bd0 100644
---- a/package/base-files/Makefile
-+++ b/package/base-files/Makefile
-@@ -27,7 +27,7 @@ PKG_CONFIG_DEPENDS += \
- CONFIG_PER_FEED_REPO \
- CONFIG_PER_FEED_REPO_ADD_DISABLED \
- CONFIG_PER_FEED_REPO_ADD_COMMENTED \
-- $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
-+ $(foreach feed,$(FEEDS_AVAILABLE),CONFIG_FEED_$(feed))
-
- include $(INCLUDE_DIR)/package.mk
-
diff --git a/patches/openwrt/0011-include-feeds.mk-rework-generation-of-opkg-distfeeds.conf.patch b/patches/openwrt/0011-include-feeds.mk-rework-generation-of-opkg-distfeeds.conf.patch
deleted file mode 100644
index a51e8d32c..000000000
--- a/patches/openwrt/0011-include-feeds.mk-rework-generation-of-opkg-distfeeds.conf.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 10 Jul 2018 00:00:01 +0200
-Subject: include/feeds.mk: rework generation of opkg distfeeds.conf
-
-Allow enabling/commenting/disabling each feed individually by using a
-tristate config symbol.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/include/feeds.mk b/include/feeds.mk
-index c9ffa95a368a72fd43a7e688b7ee1b274ade2916..3e0801e656bfa4d14ccd22db23a059d46cdc558c 100644
---- a/include/feeds.mk
-+++ b/include/feeds.mk
-@@ -10,8 +10,6 @@
-
- FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
- FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n))
--FEEDS_ENABLED:=$(foreach feed,$(FEEDS_AVAILABLE),$(if $(CONFIG_FEED_$(feed)),$(feed)))
--FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))
-
- PACKAGE_SUBDIRS=$(PACKAGE_DIR)
- ifneq ($(CONFIG_PER_FEED_REPO),)
-@@ -35,10 +33,11 @@ endef
- # 1: destination file
- define FeedSourcesAppend
- ( \
-- echo "src/gz %d_core %U/targets/%S/packages"; \
-+ echo 'src/gz %d_core %U/targets/%S/packages'; \
-+ echo 'src/gz %d_base %U/packages/%A/base'; \
- $(strip $(if $(CONFIG_PER_FEED_REPO), \
-- $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(feed)";) \
-- $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
-- $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \
-+ $(foreach feed,$(FEEDS_AVAILABLE), \
-+ $(if $(CONFIG_FEED_$(feed)), \
-+ echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/packages/%A/$(feed)';)))) \
- ) >> $(1)
- endef
-diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index ef29798d5de855e35d178cb02f356bb3e77a9bd0..4842a45a41afac0f21b63ee2f1a71a443b234141 100644
---- a/package/base-files/Makefile
-+++ b/package/base-files/Makefile
-@@ -25,8 +25,6 @@ PKG_CONFIG_DEPENDS += \
- CONFIG_NAND_SUPPORT \
- CONFIG_CLEAN_IPKG \
- CONFIG_PER_FEED_REPO \
-- CONFIG_PER_FEED_REPO_ADD_DISABLED \
-- CONFIG_PER_FEED_REPO_ADD_COMMENTED \
- $(foreach feed,$(FEEDS_AVAILABLE),CONFIG_FEED_$(feed))
-
- include $(INCLUDE_DIR)/package.mk
-diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
-index 5ee2d3e4e320d337a0fb0f46ae4649ae847cd6c2..cee8cd54e1239a3dd424fa86df8fac3eaa1d31b8 100644
---- a/package/base-files/image-config.in
-+++ b/package/base-files/image-config.in
-@@ -268,18 +268,4 @@ menuconfig PER_FEED_REPO
- If set, a separate repository is generated within bin/*/packages/
- for the core packages and each enabled feed.
-
-- config PER_FEED_REPO_ADD_DISABLED
-- bool "Add available but not enabled feeds to opkg.conf"
-- default y
-- depends on PER_FEED_REPO
-- help
-- Add not installed or disabled feeds from feeds.conf to opkg.conf.
--
-- config PER_FEED_REPO_ADD_COMMENTED
-- bool "Comment out not enabled feeds"
-- default !BUILDBOT
-- depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED
-- help
-- Add not enabled feeds as commented out source lines to opkg.conf.
--
- source "tmp/.config-feeds.in"
-diff --git a/scripts/feeds b/scripts/feeds
-index b29e1d5c353d23c8f0afc81fb0f1ec37e1f2a521..304ef6cbafd141ff98d6a8afe5de5b371a4cb2a7 100755
---- a/scripts/feeds
-+++ b/scripts/feeds
-@@ -824,11 +824,12 @@ sub feed_config() {
- my $installed = (-f "feeds/$feed->[1].index");
-
- printf "\tconfig FEED_%s\n", $feed->[1];
-- printf "\t\tbool \"Enable feed %s\"\n", $feed->[1];
-+ printf "\t\ttristate \"Enable feed %s\"\n", $feed->[1];
- printf "\t\tdepends on PER_FEED_REPO\n";
- printf "\t\tdefault y\n" if $installed;
- printf "\t\thelp\n";
-- printf "\t\t Enable the \\\"%s\\\" feed at %s.\n", $feed->[1], $feed->[2][0];
-+ printf "\t\t Enable the \\\"%s\\\" feed in opkg distfeeds.conf.\n", $feed->[1];
-+ printf "\t\t Say M to add the feed commented out.\n";
- printf "\n";
- }
-
--
GitLab