WIP: be compatible with both kirkstone and dunfell

backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb

@@ -2,7 +2,7 @@ SUMMARY = "Display or change ethernet card settings"
 DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces."
 HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/"
 SECTION = "console/network"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"
 

bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend

@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-Remove-log-info-from-init.patch"

conf/distro/netmodule-linux-minimal.conf

@@ -2,9 +2,7 @@ require netmodule-linux.conf
 DISTRO = "netmodule-linux-minimal"
 DISTRO_VARIANT = " for minimal fitImage"
 
-
+include ${LAYERSERIES_CORENAMES}/distro-minimal.inc
-#export SOURCE_DATE_EPOCH ?= "0"
-#REPRODUCIBLE_TIMESTAMP_ROOTFS = ""
 
 PREFERRED_PROVIDER_virtual/netmodule-image = "netmodule-fitimage"
 INITRAMFS_IMAGE:pn-netmodule-fitimage = "netmodule-linux-image-minimal"

conf/distro/netmodule-linux.conf

@@ -38,8 +38,6 @@ EXTRA_IMAGECMD:append_ota-ext4 = " -O ^64bit"
 
 # Packages
 PACKAGECONFIG:append:pn-curl = " tftp openssl"
-# dunfell: ssl the former equivalent of openssl
-PACKAGECONFIG:append:pn-curl = " ssl"
 PACKAGECONFIG:remove:pn-curl = "gnutls"
 
 PACKAGECONFIG:append:pn-wget = " openssl"
@@ -63,3 +61,6 @@ SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 SDK_VENDOR = "-netmodule"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
+
+# Changes specific to current yocto version
+include ${LAYERSERIES_CORENAMES}/distro.inc

dunfell/distro-minimal.inc

@@ -0,0 +1,3 @@
+INHERIT += "reproducible_build_simple"
+export SOURCE_DATE_EPOCH ?= "0"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = ""

dunfell/distro.inc

@@ -0,0 +1,15 @@
+
+# in newer versions, networkmanager is splitted
+PACKAGES:append:pn-networkmanager += "networkmanager-wwan \
+                               networkmanager-wifi \
+                               networkmanager-bluetooth \
+                               networkmanager-nmcli \
+                               "
+ALLOW_EMPTY_networkmanager-wwan = "1"
+ALLOW_EMPTY_networkmanager-wifi = "1"
+ALLOW_EMPTY_networkmanager-bluetooth = "1"
+ALLOW_EMPTY_networkmanager-nmcli = "1"
+
+# ssl the former equivalent of openssl
+PACKAGECONFIG:append:pn-curl = " ssl"
+PACKAGECONFIG:remove:pn-curl = " openssl"

dunfell/licenses.inc

@@ -0,0 +1,5 @@
+
+LIC_FILES_CHKSUM = "${@bb.utils.contains('LICENSE', 'GPL-2.0-only', \
+        'file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6', \
+        '', \
+        d)}"

recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb

@@ -1,7 +1,9 @@
 DESCRIPTION = "CPU Benchmarking bin"
 HOMEPAGE = "http://www.netmodule.com/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 PROVIDES = "benchmarking-cpu"
 

recipes-tools/battery-test/battery-test_git.bb

@@ -2,7 +2,7 @@ SUMMARY = "Battery Test tool"
 DESCRIPTION = "Read battery state, remaining time and other informations from battery"
 AUTHOR = "Ramon Mösching (ramon.moesching@netmodule.com)"
 SECTION = "core"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 PR = "r0"
 

recipes-tools/libnmapp/libnmapp_git.bb

@@ -1,6 +1,6 @@
 SUMMARY = "NetModule shared library"
 SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1f002990697cc3f88357d1c0790d47b2"
 
 SRC_URI = "git://gitlab.com/netmodule/tools/libnmapp.git;protocol=ssh;user=git;branch=develop"

recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb

@@ -1,7 +1,7 @@
 SUMMARY = "Adds a script and a systemd service to partition the drives of the system on the first boot."
 DESCRIPTION = "Adds a script and a systemd service to partition the drives of the system on the first boot."
 PR = "r1"
-LICENSE = "GPL-3.0-or-later"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c"
 
 

recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb

@@ -3,8 +3,8 @@ DESCRIPTION = "Generic NetModule update tool for firmware, bootloaders, etc"
 AUTHOR = "Alexandre Bard"
 
 SECTION = "core"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e45effb5e2fdf3ead60ab663bccdc4b8"
 
 RDEPENDS:${PN} = " \
               wget \

recipes-tools/ssf-mgr/ssf-mgr_git.bb

@@ -1,6 +1,6 @@
 SUMMARY = "NetModule system-state-framework manager"
 SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6f1c528c9a0010ef398e26c661ff286e"
 
 SRC_URI = "git://gitlab.com/netmodule/tools/ssf-mgr.git;protocol=ssh;user=git;branch=develop"