netbase: 5.6 -> 5.7

netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
Removed since it is included in 5.7

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch b/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
deleted file mode 100644 (file)
index 27ba2f6..0000000
--- a/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 52d46c4d1fbd4c88d69c2fcf7837b2f2ba7ef6f2 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <maxin.john@intel.com>
-Date: Thu, 12 Jan 2017 16:50:58 +0200
-Subject: [PATCH] netbase: add rpcbind as an alias to sunrpc
-
-the patch comes from:
-https://bugs.archlinux.org/task/20273
-
-Upstream-Status: Pending
-
-Signed-off-by: Li Wang <li.wang@windriver.com>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
-
----
- etc-rpc      | 2 +-
- etc-services | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/etc-rpc b/etc-rpc
-index 1b30625..9a9a81a 100644
---- a/etc-rpc
-+++ b/etc-rpc
-@@ -1,7 +1,7 @@
- # This file contains user readable names that can be used in place of rpc
- # program numbers.
- 
--portmapper    100000  portmap sunrpc
-+portmapper    100000  portmap sunrpc rpcbind
- rstatd                100001  rstat rstat_svc rup perfmeter
- rusersd               100002  rusers
- nfs           100003  nfsprog
-diff --git a/etc-services b/etc-services
-index fa7ae24..10ba2bc 100644
---- a/etc-services
-+++ b/etc-services
-@@ -51,8 +51,8 @@ kerberos     88/udp          kerberos5 krb5 kerberos-sec     # Kerberos v5
- iso-tsap      102/tcp         tsap            # part of ISODE
- acr-nema      104/tcp         dicom           # Digital Imag. & Comm. 300
- pop3          110/tcp         pop-3           # POP version 3
--sunrpc                111/tcp         portmapper      # RPC 4.0 portmapper
--sunrpc                111/udp         portmapper
-+sunrpc                111/tcp         portmapper rpcbind # RPC 4.0 portmapper
-+sunrpc                111/udp         portmapper rpcbind
- auth          113/tcp         authentication tap ident
- sftp          115/tcp
- nntp          119/tcp         readnews untp   # USENET News Transfer Protocol

diff --git a/meta/recipes-core/netbase/netbase_5.6.bb b/meta/recipes-core/netbase/netbase_5.7.bb
similarity index 69%
rename from meta/recipes-core/netbase/netbase_5.6.bb
rename to meta/recipes-core/netbase/netbase_5.7.bb
index 2aa49711ccafedbc22a1e8894b4f4c106e8e84fa..754c2447d9be249507b202563165c9f3208f49dd 100644 (file)
--- a/meta/recipes-core/netbase/netbase_5.6.bb
+++ b/meta/recipes-core/netbase/netbase_5.7.bb
@@ -6,11 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
 PE = "1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz \
-           file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch"
+SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"
 
-SRC_URI[md5sum] = "7ad156272c5a42f49c73386ff39c8624"
-SRC_URI[sha256sum] = "5d93a099deb28869b7306e914700fafbd293b55bdb5df05a5aa6effd0af5930c"
+SRC_URI[md5sum] = "f1e50e8d637f6be12af169fa1b67b40a"
+SRC_URI[sha256sum] = "1802ed95847a30d0b618cdfb6fc8f62989fda9fc3d1c0efd0b19e3011a34f915"
 
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
 do_install () {