From 2d5a3a7737a8b83d2b865497ad1cc26e8ed90956 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 18 Nov 2020 05:11:10 +0000
Subject: [PATCH] Merge 2020.11.18

---
 Hummy/Makefile             | 12 +++++++++---
 Hummy/opkg/CONTROL/control |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Hummy/Makefile b/Hummy/Makefile
index 2b435d9cf..6fae7adc6 100644
--- a/Hummy/Makefile
+++ b/Hummy/Makefile
@@ -3,7 +3,9 @@
 #
 DISTPKG := python2.7/dist-packages
 
-.PHONY: all clean opkg clean-opk clean-opkg release opkg-bin opkg-lib
+.PHONY: all clean opkg clean-opk clean-opkg release opkg-bin opkg-lib opkg-sav
+
+MV ?= mv -f
 
 clean-opk: $(wildcard *.opk)
 	-$(RM) $?
@@ -23,11 +25,15 @@ opkg-bin: $(wildcard ../bin/*) $(wildcard bin/*)
 	install -d opkg/bin
 	install -p $? opkg/bin
 
-opkg: $(wildcard opkg/CONTROL/*) opkg-bin opkg-lib
+opkg-sav: $(wildcard *.opk)
+	$(foreach opk,$^,-$(MV) "$(opk)" "$(opk).sav")
+
+opkg: $(wildcard opkg/CONTROL/*) opkg-bin opkg-lib opkg-sav
 	opkg-pack opkg
+	-for opk in youtube-dl*.opk; do $(RM) "$${opk}.sav"; done
 
 release: opkg
-	tagname=$$(echo youtube-dl*.opk | sed -n 'p;q') && \
+	tagname="$$(for opk in youtube-dl*.opk; do echo "$$opk"; break; done)" && \
 	 tagname="$${tagname%_*.*}" && \
 	 test -n "$${tagname}" && \
 	 git tag -f -a -m "Release $${tagname}" "$${tagname}"
diff --git a/Hummy/opkg/CONTROL/control b/Hummy/opkg/CONTROL/control
index 84bc60bdc..1605b5709 100644
--- a/Hummy/opkg/CONTROL/control
+++ b/Hummy/opkg/CONTROL/control
@@ -1,7 +1,7 @@
 Package: youtube-dl
 Priority: optional
 Section: misc
-Version: 2020.11.12
+Version: 2020.11.18
 Architecture: mipsel
 Maintainer: prpr
 Depends: ffmpeg(>=4.1),wget(>=1.20),python,libiconv