From 024e69ac94583a965d415b777935d6d634863901 Mon Sep 17 00:00:00 2001
From: Bogdan Oprescu <bogdan.oprescu@enea.com>
Date: Mon, 7 Nov 2022 09:27:26 +0100
Subject: Update layer for kirkstone build

Change-Id: Iee0a4b00b50e4a5e362aea386c7af0c7c7439fcb
Signed-off-by: Bogdan Oprescu <bogdan.oprescu@enea.com>
---
 classes/distrodata.bbclass          | 86 +++++++++++++++++++++++++++++++++++++
 conf/distro/enea.conf               | 16 +++----
 recipes-enea/bitcalc/bitcalc_1.0.bb |  2 +-
 3 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 classes/distrodata.bbclass

diff --git a/classes/distrodata.bbclass b/classes/distrodata.bbclass
new file mode 100644
index 0000000..dc06177
--- /dev/null
+++ b/classes/distrodata.bbclass
@@ -0,0 +1,86 @@
+addtask distrodata
+do_distrodata[nostamp] = "1"
+python do_distrodata() {
+        import csv
+        logpath = d.getVar('LOG_DIR')
+        bb.utils.mkdirhier(logpath)
+        logfile = os.path.join(logpath, "distrodata.csv")
+
+        localdata = bb.data.createCopy(d)
+        tmpdir = d.getVar('TMPDIR')
+        distro_check_dir = os.path.join(tmpdir, "distro_check")
+
+        pn = d.getVar("PN")
+        bb.note("Package Name: %s" % pn)
+
+        if pn.find("-native") != -1:
+            pnstripped = pn.split("-native")
+            bb.note("Native Split: %s" % pnstripped)
+            localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES'))
+
+        if pn.startswith("nativesdk-"):
+            pnstripped = pn.replace("nativesdk-", "")
+            bb.note("NativeSDK Split: %s" % pnstripped)
+            localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES'))
+
+        if pn.find("-cross") != -1:
+            pnstripped = pn.split("-cross")
+            bb.note("cross Split: %s" % pnstripped)
+            localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES'))
+
+        if pn.find("-crosssdk") != -1:
+            pnstripped = pn.split("-crosssdk")
+            bb.note("cross Split: %s" % pnstripped)
+            localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES'))
+
+        if pn.find("-initial") != -1:
+            pnstripped = pn.split("-initial")
+            bb.note("initial Split: %s" % pnstripped)
+            localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES'))
+
+        """generate package information from .bb file"""
+        pname = localdata.getVar('PN')
+        pcurver = localdata.getVar('PV')
+        pdesc = localdata.getVar('DESCRIPTION')
+        if pdesc is not None:
+                pdesc = pdesc.replace(',','')
+                pdesc = pdesc.replace('\n','')
+
+
+        pgrp = localdata.getVar('SECTION')
+        plicense = localdata.getVar('LICENSE').replace(',','_')
+
+        rstatus = localdata.getVar('RECIPE_COLOR')
+        if rstatus is not None:
+                rstatus = rstatus.replace(',','')
+
+        pupver = localdata.getVar('RECIPE_UPSTREAM_VERSION')
+        if pcurver == pupver:
+                vermatch="1"
+        else:
+                vermatch="0"
+
+        noupdate_reason = localdata.getVar('RECIPE_NO_UPDATE_REASON')
+        if noupdate_reason is None:
+                noupdate="0"
+        else:
+                noupdate="1"
+                noupdate_reason = noupdate_reason.replace(',','')
+
+        maintainer = localdata.getVar('RECIPE_MAINTAINER')
+        rlrd = localdata.getVar('RECIPE_UPSTREAM_DATE')
+        # do the comparison
+        result = ""
+
+        lf = bb.utils.lockfile("%s.lock" % logfile)
+        with open(logfile, "a") as f:
+            row = [pname, pdesc, maintainer, plicense, vermatch, pcurver, pupver, noupdate_reason, rstatus]
+            row.extend(result)
+
+            writer = csv.writer(f)
+            writer.writerow(row)
+            f.close()
+        bb.utils.unlockfile(lf)
+}
+do_distrodata[vardepsexclude] = "DATETIME"
+
diff --git a/conf/distro/enea.conf b/conf/distro/enea.conf
index 30d2f79..79c0cc3 100644
--- a/conf/distro/enea.conf
+++ b/conf/distro/enea.conf
@@ -5,7 +5,7 @@ DISTRO_VERSION_MAJOR = "8.2"
 DISTRO_VERSION_MINOR ??= ""
 DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}"
 
-DISTRO_FEATURES_append = " systemd"
+DISTRO_FEATURES:append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_dev_manager = "systemd"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
@@ -24,13 +24,13 @@ PRSERV_HOST ?= "localhost:0"
 
 BB_DANGLINGAPPENDS_WARNONLY ?= "1"
 
-PREFERRED_VERSION_linux-yocto = "5.4%"
-PREFERRED_VERSION_linux-yocto_qemux86 = "5.4%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 = "5.4%"
-PREFERRED_VERSION_linux-yocto_qemuarm = "5.4%"
-PREFERRED_VERSION_linux-yocto_qemumips = "5.4%"
-PREFERRED_VERSION_linux-yocto_qemumips64 = "5.4%"
-PREFERRED_VERSION_linux-yocto_qemuppc = "5.4%"
+PREFERRED_VERSION_linux-yocto = "5.10%"
+PREFERRED_VERSION_linux-yocto:qemux86 = "5.10"
+PREFERRED_VERSION_linux-yocto:qemux86-64 = "5.10%"
+PREFERRED_VERSION_linux-yocto:qemuarm = "5.10%"
+PREFERRED_VERSION_linux-yocto:qemumips = "5.10%"
+PREFERRED_VERSION_linux-yocto:qemumips64 = "5.10%"
+PREFERRED_VERSION_linux-yocto:qemuppc = "5.10%"
 
 # some fetch sources requires an increased value for timeout
 FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 600 -nv --passive-ftp --no-check-certificate"
diff --git a/recipes-enea/bitcalc/bitcalc_1.0.bb b/recipes-enea/bitcalc/bitcalc_1.0.bb
index 89096c4..2cfa879 100644
--- a/recipes-enea/bitcalc/bitcalc_1.0.bb
+++ b/recipes-enea/bitcalc/bitcalc_1.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b52bab7a403562f36be803f11489f1a4"
 PR = "r0"
 
 DEPENDS = "gcc-sanitizers"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}"
 
-- 
cgit v1.2.3-54-g00ecf