Yet another fix of rebuilding patch

patches/openwrt/wip/0001-build-Automatically-bump-release-when-needed.patch

-From 9fe18947fd91b7ed5b0bca1eae893ad50f7a00a7 Mon Sep 17 00:00:00 2001
+From 8539c666af4be98a664592cf91ae2df4b9719c5a Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <michal.hrusecky@nic.cz>
 Date: Wed, 31 Oct 2018 13:14:23 +0100
 Subject: [PATCH] build: Automatically bump release when needed
@@ -9,9 +9,9 @@ and bump release number if it did.
 Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
 ---
  include/package-defaults.mk |  2 +-
- include/package-ipkg.mk     | 14 +++++++++++++-
+ include/package-ipkg.mk     | 15 ++++++++++++++-
  rules.mk                    |  1 +
- 3 files changed, 15 insertions(+), 2 deletions(-)
+ 3 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/include/package-defaults.mk b/include/package-defaults.mk
 index 31e331b..ee8cb5e 100644
@@ -27,7 +27,7 @@ index 31e331b..ee8cb5e 100644
    else
      VERSION:=$(PKG_RELEASE)
 diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index 457f2e7..535d419 100644
+index 457f2e7..0172e38 100644
 --- a/include/package-ipkg.mk
 +++ b/include/package-ipkg.mk
 @@ -190,6 +190,8 @@ $(_endef)
@@ -51,7 +51,7 @@ index 457f2e7..535d419 100644
 +		done; \
 +		[ -z "$$$$BUMP" ] || BUILD_VER="`expr $$$$BUILD_VER + 1`"; \
 +		echo "$(VERSION)" > "$(PKG_INFO_DIR)"/$(1).base_ver; \
-+		diff -q "$(PKG_INFO_DIR)"/$(1).base_ver "$(PKG_OLD_INFO_DIR)"/$(1).base_ver || BUILD_VER=0; \
++		diff -q "$(PKG_INFO_DIR)"/$(1).base_ver "$(PKG_OLD_INFO_DIR)"/$(1).base_ver 2> /dev/null || BUILD_VER=0; \
 +		echo "$$$$BUILD_VER" > "$(PKG_INFO_DIR)"/$(1).build_num; \
  		( \
 -			echo "$$$$CONTROL"; \
@@ -59,6 +59,14 @@ index 457f2e7..535d419 100644
  			printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \
  		) > control; \
  		chmod 644 control; \
+@@ -241,6 +253,7 @@ $(_endef)
+ 
+ 	$(INSTALL_DIR) $$(PDIR_$(1))
+ 	$(IPKG_BUILD) $$(IDIR_$(1)) $$(PDIR_$(1))
++	mv $$(PDIR_$(1))/$(1)_$(VERSION).*_$(PKGARCH).ipk $$(PDIR_$(1))/$(1)_$(VERSION)_$(PKGARCH).ipk
+ 	@[ -f $$(IPKG_$(1)) ]
+ 
+     $(1)-clean:
 diff --git a/rules.mk b/rules.mk
 index 0f385bd..9974111 100644
 --- a/rules.mk