patches: openwrt: rebase

patches/openwrt/hack/0001-base-files-do-not-automatically-activate-services-an.patch

-From 34f6bac83a383131c3e303c8248a4b58b30ad0a6 Mon Sep 17 00:00:00 2001
+From 6d58509233d21545427431455e5f6bb16ba87f54 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
 Date: Tue, 29 May 2018 16:13:18 +0200
 Subject: [PATCH] base-files: do not automatically activate services and
@@ -21,7 +21,7 @@ Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
  create mode 100644 package/base-files/files/etc/services_wanted
 
 diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 2923a1c6ac..aef62219a7 100644
+index 2923a1c6ac..9eb020fa9f 100644
 --- a/package/base-files/Makefile
 +++ b/package/base-files/Makefile
 @@ -195,6 +195,16 @@ define Package/base-files/install
@@ -31,8 +31,8 @@ index 2923a1c6ac..aef62219a7 100644
 +define Package/base-files/postinst
 +[ -n "$$IPKG_INSTROOT" ] || {
 +	while read L; do
-+		if [ -f "/etc/init.d/$L" ]; then
-+			"/etc/init.d/$L" enable
++		if [ -f "/etc/init.d/$$L" ]; then
++			"/etc/init.d/$$L" enable
 +		fi
 +	done < /etc/services_wanted
 +}

patches/openwrt/to-upstream/0002-build-Optionally-provide-file-checksums-in-package-m.patch

-From c3868937dfff17c9e715563da23a394736ec1f14 Mon Sep 17 00:00:00 2001
+From 5327aad22eabd0ae283553a82f3ed1af92e783bc Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <Michal@Hrusecky.net>
 Date: Wed, 17 Jan 2018 13:25:43 +0100
 Subject: [PATCH] build: Optionally provide file checksums in package metadata
@@ -9,14 +9,14 @@ to check for corruptions.
 Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
 ---
  config/Config-build.in                  |   8 ++
- include/package-ipkg.mk                 |   8 ++
+ include/package-ipkg.mk                 |   9 ++
  package/base-files/Makefile             |   2 +
- package/base-files/files/sbin/pkg_check | 130 ++++++++++++++++++++++++++++++++
- 4 files changed, 148 insertions(+)
+ package/base-files/files/sbin/pkg_check | 130 ++++++++++++++++++++++++
+ 4 files changed, 149 insertions(+)
  create mode 100755 package/base-files/files/sbin/pkg_check
 
 diff --git a/config/Config-build.in b/config/Config-build.in
-index f9987fc..38f725f 100644
+index a082a5e0e2..4076c293d4 100644
 --- a/config/Config-build.in
 +++ b/config/Config-build.in
 @@ -68,6 +68,14 @@ menu "Global build settings"
@@ -35,10 +35,10 @@ index f9987fc..38f725f 100644
  		bool "Include build configuration in firmware" if DEVEL
  		default n
 diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index 9e2717e..358aede 100644
+index 6ab798c613..1785643863 100644
 --- a/include/package-ipkg.mk
 +++ b/include/package-ipkg.mk
-@@ -194,6 +194,15 @@ $(_endef)
+@@ -193,6 +193,15 @@ $(_endef)
  	$(CheckDependencies)
  
  	$(RSTRIP) $$(IDIR_$(1))
@@ -55,10 +55,10 @@ index 9e2717e..358aede 100644
  		( \
  			echo "$$$$CONTROL"; \
 diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 0055474..411ed8e 100644
+index aef62219a7..7fd90a6bd2 100644
 --- a/package/base-files/Makefile
 +++ b/package/base-files/Makefile
-@@ -195,6 +195,8 @@ define Package/base-files/install
+@@ -193,6 +193,8 @@ define Package/base-files/install
  		mkdir -p $(1)/etc/opkg; \
  		$(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \
  		$(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf)
@@ -66,10 +66,10 @@ index 0055474..411ed8e 100644
 +		rm -f $(1)/sbin/pkg_check,)
  endef
  
- ifneq ($(DUMP),1)
+ define Package/base-files/postinst
 diff --git a/package/base-files/files/sbin/pkg_check b/package/base-files/files/sbin/pkg_check
 new file mode 100755
-index 0000000..9968c9b
+index 0000000000..9968c9b78e
 --- /dev/null
 +++ b/package/base-files/files/sbin/pkg_check
 @@ -0,0 +1,130 @@
@@ -204,5 +204,5 @@ index 0000000..9968c9b
 +	exit 1
 +fi
 -- 
-2.15.1
+2.21.0