patches: combine all changes to use openwrt/luci#2637

* for LuCI, packages_berlin feed

squashed:
* "patches/luci: replace patches for LuCI PR 2637 with recent version"
* "patches/berlin: adapt to rewritten LuCI-PR2637"
* "patches/berlin: update "rework-package-defines-to-changes-of-luci.mk" to reapply"
* "adapt to renamed package "freifunk-berlin-uplink-notunnel""

configs/common.config

@@ -80,7 +80,7 @@ CONFIG_PACKAGE_freifunk-berlin-system-defaults=m
 CONFIG_PACKAGE_freifunk-berlin-statistics-defaults=m
 CONFIG_PACKAGE_freifunk-berlin-tunneldigger=m
 CONFIG_PACKAGE_freifunk-berlin-uhttpd-defaults=m
-CONFIG_PACKAGE_freifunk-berlin-uplink-notunnel-files=m
+CONFIG_PACKAGE_freifunk-berlin-uplink-notunnel=m
 CONFIG_PACKAGE_freifunk-berlin-uplink-tunnelberlin-tunneldigger=m
 CONFIG_PACKAGE_freifunk-common=m
 CONFIG_PACKAGE_freifunk-firewall=m

packagelists/notunnel.txt

@@ -72,7 +72,7 @@ alfred
 batctl-default
 
 # Uplink
-freifunk-berlin-uplink-notunnel-files
+freifunk-berlin-uplink-notunnel
 
 # Statistics
 luci-app-statistics

patches/packages/luci/0002-luci.mk-add-URL-and-MAINTAINER-fields-to-package-definitions.patch

@@ -0,0 +1,32 @@
+From: Sven Roederer <devel-sven@geroedel.de>
+Date: Sat, 17 Apr 2021 17:37:08 +0200
+Subject: luci.mk: add URL and MAINTAINER fields to package-definitions
+
+Add the LUCI_URL and LUCI_MAINTAINER variables to pass them to the buildpackage
+defines. Give them some sane defaults and allow overwritting by the individual
+package.
+
+Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
+
+diff --git a/luci.mk b/luci.mk
+index 65bcf15a57339ab35f8a70732fbe0aad353872c5..cb53aa2bbd7715ceb38dd7180f7979b76c10cc55 100644
+--- a/luci.mk
++++ b/luci.mk
+@@ -12,6 +12,8 @@ LUCI_DEFAULTS:=$(notdir $(wildcard ${CURDIR}/root/etc/uci-defaults/*))
+ LUCI_PKGARCH?=$(if $(realpath src/Makefile),,all)
+ LUCI_SECTION?=luci
+ LUCI_CATEGORY?=LuCI
++LUCI_URL?=https://github.com/openwrt/luci
++LUCI_MAINTAINER?=OpenWrt LuCI community
+
+ # Language code titles
+ LUCI_LANG.ar=العربية (Arabic)
+@@ -130,6 +132,8 @@ define Package/$(PKG_NAME)
+   VERSION:=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))
+   $(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
+   $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
++  URL:=$(LUCI_URL)
++  MAINTAINER:=$(LUCI_MAINTAINER)
+ endef
+
+ ifneq ($(LUCI_DESCRIPTION),)

patches/packages/luci/0003-luci.mk-add-PKG_PROVIDES-make-macro-to-set-package-provides-option.patch

@@ -0,0 +1,20 @@
+From: Sven Roederer <devel-sven@geroedel.de>
+Date: Sat, 17 Apr 2021 22:38:24 +0200
+Subject: luci.mk: add PKG_PROVIDES make-macro to set package/provides option
+
+Add PKG_PROVIDES macro to be passed down to buildpackage defines as  PROVIDES variable.
+
+Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
+
+diff --git a/luci.mk b/luci.mk
+index cb53aa2bbd7715ceb38dd7180f7979b76c10cc55..319551789f221630c574c190babab05cfe8a040c 100644
+--- a/luci.mk
++++ b/luci.mk
+@@ -132,6 +132,7 @@ define Package/$(PKG_NAME)
+   VERSION:=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))
+   $(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
+   $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
++  $(if $(PKG_PROVIDES),PROVIDES:=$(PKG_PROVIDES))
+   URL:=$(LUCI_URL)
+   MAINTAINER:=$(LUCI_MAINTAINER)
+ endef

patches/packages/luci/0004-luci.mk-make-SUBMENU-package-define-customizable-and-optional.patch

@@ -0,0 +1,45 @@
+From: Sven Roederer <devel-sven@geroedel.de>
+Date: Thu, 22 Apr 2021 22:35:58 +0200
+Subject: luci.mk: make SUBMENU package define customizable and optional
+
+When including luci.mk in external repos it's sometimes usefull to not use
+the default LuCI-submenu hierarchy.
+This change defines the LUCI_SUBMENU_FORCED variable which completely overrides
+the default submenu of the LuCI config-section. When LUCI_SUBMENU_FORCED is not
+defined, the default submenu derrived from LUCI_TYPE or "Application" fallback
+is used.
+Defining LUCI_SUBMENU_FORCED in the package Makefile will just use this value.
+Setting it to "none" will not define a submenu at all.
+Together with LUCI_SECTION and LUCI_CATEGORY menu items can now created at any
+place in the menu structure.
+
+Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
+
+diff --git a/luci.mk b/luci.mk
+index 319551789f221630c574c190babab05cfe8a040c..636cf316ec3fdaf154685750760210a447e46969 100644
+--- a/luci.mk
++++ b/luci.mk
+@@ -123,10 +123,22 @@ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \
+
+ include $(INCLUDE_DIR)/package.mk
+
++# LUCI_SUBMENU: the submenu-item below the LuCI top-level menu inside OpoenWrt menuconfig
++#               usually one of the LUCI_MENU.* definitions
++# LUCI_SUBMENU_DEFAULT: the regular SUBMENU defined by LUCI_TYPE or derrived from the packagename
++# LUCI_SUBMENU_FORCED: manually forced value SUBMENU to set to by explicit definiton
++#                      can be any string, "none" disables the creation of a submenu 
++#                      most usefull in combination with LUCI_CATEGORY, to make the package appear
++#                      anywhere in the menu structure
++LUCI_SUBMENU_DEFAULT=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
++LUCI_SUBMENU=$(if $(LUCI_SUBMENU_FORCED),$(LUCI_SUBMENU_FORCED),$(LUCI_SUBMENU_DEFAULT))
++
+ define Package/$(PKG_NAME)
+   SECTION:=$(LUCI_SECTION)
+   CATEGORY:=$(LUCI_CATEGORY)
+-  SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
++ifneq ($(LUCI_SUBMENU),none)
++  SUBMENU:=$(LUCI_SUBMENU)
++endif
+   TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
+   DEPENDS:=$(LUCI_DEPENDS)
+   VERSION:=$(if $(PKG_VERSION),$(PKG_VERSION),$(PKG_SRC_VERSION))