file /etc/ethertypes conflicts between netbase-1:6.2-r0.corei7_64 and ebtables-2.0.10+4-r4.corei7_64


Dingo <dingo@...>
 

file /etc/ethertypes conflicts between attempted installs of netbase-1:6.2-r0.corei7_64 and ebtables-2.0.10+4-r4.corei7_64
commit ba069a5a3dae374744f68a57ab9e7869167beb2b
Author: Alexander Kanavin <alex.kanavin@gmail.com>
Date:   Fri Dec 4 21:07:14 2020 +0100
    netbase: upgrade 6.1 -> 6.2
    Not sure why this didn't inherit allarch, but now it does - only
    static data is installed.

    (From OE-Core rev: ae1880436b293449318655f5b0207d2a741052ba)

    Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/recipes-core/netbase/netbase_6.1.bb b/meta/recipes-core/netbase/netbase_6.2.bb
similarity index 65%
rename from meta/recipes-core/netbase/netbase_6.1.bb
rename to meta/recipes-core/netbase/netbase_6.2.bb
index 33eca459d5..a54d2e7764 100644
--- a/meta/recipes-core/netbase/netbase_6.1.bb
+++ b/meta/recipes-core/netbase/netbase_6.2.bb
@@ -6,17 +6,18 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
 PE = "1"

-SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}~bpo10+1.tar.xz"
-S = "${WORKDIR}/${BPN}-${PV}~bpo10+1"
+SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz"

-SRC_URI[md5sum] = "4fa7517285b4045ac0dc8dbf6730dd7a"
-SRC_URI[sha256sum] = "4e9c3082dff8896cb6b6bea9bb2200d82fb0d7c8d8c8fc9b18704fe553316237"
+inherit allarch
+
+SRC_URI[sha256sum] = "309a24146a06347d654b261e9e07a82fab844b173674a42e223803dd8258541e"

 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/"
-do_install () {

-       install -d ${D}/${mandir}/man8 ${D}${sysconfdir}
+do_install () {
+       install -d ${D}${sysconfdir}
        install -m 0644 ${S}/etc/rpc ${D}${sysconfdir}/rpc
        install -m 0644 ${S}/etc/protocols ${D}${sysconfdir}/protocols
        install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services
+       install -m 0644 ${S}/etc/ethertypes ${D}${sysconfdir}/ethertypes
 }

Join yocto@lists.yoctoproject.org to automatically receive all group messages.