diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-core/netbase | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/netbase')
| -rw-r--r-- | poky/meta/recipes-core/netbase/netbase/hosts | 8 | ||||
| -rw-r--r-- | poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch | 14 | ||||
| -rw-r--r-- | poky/meta/recipes-core/netbase/netbase_5.6.bb (renamed from poky/meta/recipes-core/netbase/netbase_5.4.bb) | 12 |
3 files changed, 10 insertions, 24 deletions
diff --git a/poky/meta/recipes-core/netbase/netbase/hosts b/poky/meta/recipes-core/netbase/netbase/hosts deleted file mode 100644 index b94f414d5..000000000 --- a/poky/meta/recipes-core/netbase/netbase/hosts +++ /dev/null @@ -1,8 +0,0 @@ -127.0.0.1 localhost.localdomain localhost - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff00::0 ip6-mcastprefix -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters diff --git a/poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch b/poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch index 56c8d5b5c..27ba2f68a 100644 --- a/poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch +++ b/poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch @@ -1,4 +1,4 @@ -From 76989205a1411f16d7ab09ff9d279539a73dc259 Mon Sep 17 00:00:00 2001 +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 @@ -10,6 +10,7 @@ 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 ++-- @@ -29,12 +30,12 @@ index 1b30625..9a9a81a 100644 rusersd 100002 rusers nfs 100003 nfsprog diff --git a/etc-services b/etc-services -index e3202ec..a039d7e 100644 +index fa7ae24..10ba2bc 100644 --- a/etc-services +++ b/etc-services -@@ -64,8 +64,8 @@ csnet-ns 105/udp cso-ns - rtelnet 107/tcp # Remote Telnet - rtelnet 107/udp +@@ -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 @@ -43,6 +44,3 @@ index e3202ec..a039d7e 100644 auth 113/tcp authentication tap ident sftp 115/tcp nntp 119/tcp readnews untp # USENET News Transfer Protocol --- -2.4.0 - diff --git a/poky/meta/recipes-core/netbase/netbase_5.4.bb b/poky/meta/recipes-core/netbase/netbase_5.6.bb index 5ab0c58f8..2aa49711c 100644 --- a/poky/meta/recipes-core/netbase/netbase_5.4.bb +++ b/poky/meta/recipes-core/netbase/netbase_5.6.bb @@ -6,20 +6,16 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" PE = "1" -SRC_URI = "http://snapshot.debian.org/archive/debian/20170112T093812Z/pool/main/n/${BPN}/${BPN}_${PV}.tar.xz \ - file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch \ - file://hosts" +SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz \ + file://netbase-add-rpcbind-as-an-alias-to-sunrpc.patch" -SRC_URI[md5sum] = "117cb70c55ef3c1c002f127812b114c1" -SRC_URI[sha256sum] = "66ff73d2d162e2d49db43988d8b8cd328cf7fffca042db73397f14c71825e80d" +SRC_URI[md5sum] = "7ad156272c5a42f49c73386ff39c8624" +SRC_URI[sha256sum] = "5d93a099deb28869b7306e914700fafbd293b55bdb5df05a5aa6effd0af5930c" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { install -d ${D}/${mandir}/man8 ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts install -m 0644 etc-rpc ${D}${sysconfdir}/rpc install -m 0644 etc-protocols ${D}${sysconfdir}/protocols install -m 0644 etc-services ${D}${sysconfdir}/services } - -CONFFILES_${PN} = "${sysconfdir}/hosts" |
