diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch deleted file mode 100644 index e33d8eac1d..0000000000 --- a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 54698856e5602bbd9d61e855814c854a013b4840 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 22 Dec 2018 18:47:45 -0800 -Subject: [PATCH] Add OpenEmbedded cross compile case - -Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410] -Signed-off-by: Khem Raj ---- - genconfig.sh | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/genconfig.sh -+++ b/genconfig.sh -@@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then - OS_VERSION="Tomato $TOMATO_VER" - fi - -+# OpenEmbedded special case -+if [ -f ./os.openembedded ]; then -+ OS_NAME=OpenEmbedded -+ OS_VERSION=$(cat ./os.openembedded) -+fi -+ - ${RM} ${CONFIGFILE} - - echo "/* MiniUPnP Project" >> ${CONFIGFILE} -@@ -346,6 +352,11 @@ case $OS_NAME in - echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} - FW=iptables - ;; -+ OpenEmbedded) -+ OS_URL=http://www.openembedded.org/ -+ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} -+ FW=iptables -+ ;; - AstLinux) - OS_URL=http://www.astlinux.org/ - echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.3.10.bb similarity index 92% rename from meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb rename to meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.3.10.bb index b7ba37f290..f7e1518f2c 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.3.10.bb @@ -13,9 +13,8 @@ DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack openssl" SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ file://miniupnpd.service \ - file://0001-Add-OpenEmbedded-cross-compile-case.patch \ " -SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" +SRC_URI[sha256sum] = "f9c34ed3632fb60cd248dd5897bd98479a103a75688b056ca2f069e68ab32987" UPSTREAM_CHECK_URI = "https://miniupnp.tuxfamily.org/files/" UPSTREAM_CHECK_REGEX = "${BPN}-(?P\d+(\.\d+)+)\.tar"