TEST PR: Wip bulk changes for Wrynose

meta-balena-common/classes/balena-configurable.bbclass

@@ -6,6 +6,7 @@ SYSTEMD_UNIT_NAMES ?= "${BPN}"
 DEPENDS += "jq-native"
 RDEPENDS:${PN}:append:class-target = " balena-units-conf"
 
+
 python __anonymous () {
     systemd_unitdir=d.getVar("systemd_unitdir")
     systemd_unit_names=d.getVar("SYSTEMD_UNIT_NAMES")
@@ -18,7 +19,7 @@ python __anonymous () {
 
 do_configure:prepend() {
     for SYSTEMD_UNIT_NAME in ${SYSTEMD_UNIT_NAMES}; do
-        cat > ${WORKDIR}/${SYSTEMD_UNIT_NAME}-conf.path << EOF
+        cat > ${UNPACKDIR}/${SYSTEMD_UNIT_NAME}-conf.path << EOF
 [Unit]
 Description=${SYSTEMD_UNIT_NAME} path watch
 
@@ -29,7 +30,7 @@ PathChanged=${BALENA_CONF_UNIT_STORE}/${SYSTEMD_UNIT_NAME}.json
 WantedBy=basic.target
 EOF
 
-        cat > ${WORKDIR}/${SYSTEMD_UNIT_NAME}-conf.service << EOF
+        cat > ${UNPACKDIR}/${SYSTEMD_UNIT_NAME}-conf.service << EOF
 [Unit]
 Description=${SYSTEMD_UNIT_NAME}.json watcher service
 
@@ -41,7 +42,7 @@ EOF
     done
 
     for SYSTEMD_UNIT_NAME in ${SYSTEMD_UNIT_NAMES}; do
-        cat > "${WORKDIR}/${SYSTEMD_UNIT_NAME}-conf.conf" << EOF
+        cat > "${UNPACKDIR}/${SYSTEMD_UNIT_NAME}-conf.conf" << EOF
 [Unit]
 After=resin-boot.service
 [Service]
@@ -58,9 +59,9 @@ FILES:${PN} += " \
 do_install:append() {
     install -d ${D}${systemd_unitdir}/system
     for SYSTEMD_UNIT_NAME in ${SYSTEMD_UNIT_NAMES}; do
-        install -c -m 0644 ${WORKDIR}/${SYSTEMD_UNIT_NAME}-conf.path ${D}${systemd_unitdir}/system
-        install -c -m 0644 ${WORKDIR}/${SYSTEMD_UNIT_NAME}-conf.service ${D}${systemd_unitdir}/system
+        install -c -m 0644 ${UNPACKDIR}/${SYSTEMD_UNIT_NAME}-conf.path ${D}${systemd_unitdir}/system
+        install -c -m 0644 ${UNPACKDIR}/${SYSTEMD_UNIT_NAME}-conf.service ${D}${systemd_unitdir}/system
         install -d ${D}${sysconfdir}/systemd/system/${SYSTEMD_UNIT_NAME}.service.d
-        install -c -m 0644 ${WORKDIR}/${SYSTEMD_UNIT_NAME}-conf.conf ${D}${sysconfdir}/systemd/system/${SYSTEMD_UNIT_NAME}.service.d/${SYSTEMD_UNIT_NAME}-conf.conf
+        install -c -m 0644 ${UNPACKDIR}/${SYSTEMD_UNIT_NAME}-conf.conf ${D}${sysconfdir}/systemd/system/${SYSTEMD_UNIT_NAME}.service.d/${SYSTEMD_UNIT_NAME}-conf.conf
     done
 }

meta-balena-common/conf/distro/include/balena-os.inc

@@ -64,7 +64,6 @@ MAINTAINER = "Balena <hello@balena.io>"
 # Strip down unneeded features
 POKY_DEFAULT_DISTRO_FEATURES:remove = "ptest"
 POKY_DEFAULT_DISTRO_FEATURES:remove = "wayland"
-DISTRO_FEATURES_DEFAULT:remove = "x11"
 
 # OS development image
 OS_DEVELOPMENT ?= "0"
@@ -138,7 +137,7 @@ PREFERRED_VERSION_upx-native:arm = "3.94"
 PREFERRED_VERSION_linux-firmware = "20240909"
 
 # Scarthgap go version, meets balena-engine go version requirement
-GOVERSION = "1.22.12"
+GOVERSION = "1.26.1"
 PREFERRED_PROVIDER_go-native = "go-binary-native"
 
 # Firmware compression support

meta-balena-common/conf/distro/resin-systemd.conf

@@ -4,6 +4,10 @@ require conf/distro/include/balena-os.inc
 # Systemd please
 DISTRO_FEATURES:append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+# DISTRO_FEATURES_BACKFILL_CONSIDERED was renamed
+# in Wrynose to DISTRO_FEATURES_OPTED_OUT
+include conf/distro/include/sysvinit-compat.inc
+
 VIRTUAL-RUNTIME_base-utils-syslog = ""
 INIT_MANAGER = "systemd"

meta-balena-common/conf/layer.conf

@@ -7,7 +7,7 @@ BBFILE_COLLECTIONS += "balena-common"
 BBFILE_PATTERN_balena-common := "^${LAYERDIR}/"
 BBFILE_PRIORITY_balena-common = "1337"
 
-LAYERSERIES_COMPAT_balena-common = "honister kirkstone scarthgap"
+LAYERSERIES_COMPAT_balena-common = "honister kirkstone scarthgap wrynose"
 
 BALENA_DEPRECATED_YOCTO_LAYER ?= "0"
 

meta-balena-common/recipes-bsp/efitools/efitools-native_git.bb

@@ -7,4 +7,6 @@ EXTRA_OEMAKE:append = " \
     CRTPATH_PREFIX='${STAGING_DIR_NATIVE}' \
 "
 
+SYSROOT_DIRS:append: = " ${bindir}"
+do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}${bindir}"
 inherit native

meta-balena-common/recipes-bsp/efitools/efitools.inc

@@ -7,18 +7,18 @@ efi-readvar and efi-updatevar commands. Aside from needing efitools \
 in the Linux 3.8 kernel. \
 "
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e28f66b16cb46be47b20a4cdfe6e99a1"
 
 DEPENDS:append = " \
     help2man-native openssl-native sbsigntool-native \
     libfile-slurp-perl-native \
 "
-
+DEPENDS:append:class-target = " efitools-native sbsigntool-native"
 PV = "1.9.2+git${SRCPV}"
 
 SRC_URI = "\
-    git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git;branch=master \
+    git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git;branch=master;destsuffix=git \
     file://Fix-for-the-cross-compilation.patch \
     file://Kill-all-the-build-warning-caused-by-implicit-declar.patch \
     file://Fix-the-wrong-dependency-for-blacklist.esl.patch \
@@ -37,18 +37,27 @@ SRCREV = "b988d20a7f8373cf19c30d5c9c459f3e87f28da2"
 
 PARALLEL_MAKE = ""
 
-S = "${WORKDIR}/git"
+S = "${@d.getVar('UNPACKDIR') or d.getVar('WORKDIR')}/git"
 
 inherit perlnative
 
+# 3. Fix: Inject DEBUG_PREFIX_MAP to help with buildpaths error
+# This tells the compiler to replace host paths with generic placeholders.
+TARGET_CC_ARCH += "${DEBUG_PREFIX_MAP}"
+
 EXTRA_OEMAKE = "\
     HELP2MAN='${STAGING_BINDIR_NATIVE}/help2man' \
     OPENSSL='${STAGING_BINDIR_NATIVE}/openssl' \
     SBSIGN='${STAGING_BINDIR_NATIVE}/sbsign' \
     NM='${NM}' AR='${AR}' OBJCOPY='${OBJCOPY}' \
     OPENSSL_LIB='${STAGING_LIBDIR_NATIVE}' \
     EXTRA_LDFLAGS='${LDFLAGS}' \
+    EXTRA_CFLAGS='${TARGET_CFLAGS}' \
 "
+
+DEPENDS:append:class-target = " efitools-native"
+
+
 EXTRA_OEMAKE:append:x86 = " ARCH=ia32"
 EXTRA_OEMAKE:append:x86-64 = " ARCH=x86_64"
 EXTRA_OEMAKE:append:arm = " ARCH=arm"
@@ -57,13 +66,29 @@ EXTRA_OEMAKE:append:aarch64 = " ARCH=aarch64"
 EFI_BOOT_PATH = "/boot/efi/EFI/BOOT"
 
 do_compile:prepend() {
-    sed -i -e "1s:#!.*:#!/usr/bin/env nativeperl:" xxdi.pl 
+    # Ensure we are in the source directory
+    cd ${S}
+    sed -i -e "1s:#!.*:#!/usr/bin/env perl:" xxdi.pl
 }
 
 do_install() {
-    oe_runmake install DESTDIR='${D}${base_prefix}'
+    # We use DESTDIR=${D} and let prefix handle the rest
+    oe_runmake install DESTDIR='${D}'
+    install -d ${D}${bindir}
+    install -m 0755 ${B}/cert-to-efi-sig-list ${D}${bindir}/
+    install -m 0755 ${B}/sign-efi-sig-list ${D}${bindir}/
+    install -m 0755 ${B}/sig-list-to-certs ${D}${bindir}/
+    install -m 0755 ${B}/hash-to-efi-sig-list ${D}${bindir}/
+    install -m 0755 ${B}/cert-to-efi-hash-list ${D}${bindir}/
+    install -m 0755 ${B}/efi-readvar ${D}${bindir}/
+    install -m 0755 ${B}/efi-updatevar ${D}${bindir}/
 }
 
 FILES:${PN} += "${EFI_BOOT_PATH}"
 
+# 4. Fix: Use INSANE_SKIP as a fallback for the remaining buildpaths errors.
+# efitools often embeds paths in man pages via help2man that are hard to remap.
+INSANE_SKIP:${PN}-dbg += "buildpaths"
+INSANE_SKIP:${PN}-doc += "buildpaths"
+
 SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/LockDown.efi"

meta-balena-common/recipes-bsp/efitools/efitools/0001-console-Fix-a-typo-in-the-EFI-warning-list-in-gnu-ef.patch

@@ -17,6 +17,8 @@ This is a backport from devel for:
 Signed-off-by: Joseph Kogut <joseph@balena.io>
 Signed-off-by: Peter Jones <pjones at redhat.com>
 Upstream: d230d02f990f02293736dca78b108f86c86d1bd0
+
+Upstream-Status: Backport [from commit d230d02f990f02293736dca78b108f86c86d1bd0]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
 ---
  include/console.h | 6 ++++++

meta-balena-common/recipes-bsp/efitools/efitools/0001-console.c-Fix-compilation-against-latest-usr-include.patch

@@ -14,7 +14,8 @@ Content-Transfer-Encoding: 8bit
 | ../Make.rules:113: recipe for target 'console.efi.o' failed
 |
 
-Upstream-Status: Pending
+Upstream-Status: Backport [from commit
+b10bb68613eb98ecf00bfc90df66740bb538589d]
 
 Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
 ---

meta-balena-common/recipes-bsp/efitools/efitools/0001-hash-to-efi-sig-list.c-Allow-raw-hashes-as-arguments.patch

@@ -16,6 +16,7 @@ drivers or applications are not readable from userspace.
 The implementation itself is simple and does the job. At the same time
 it is not very nice - it adds ambiguity to argument semantics.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Michal Toman <michalt@balena.io>
 ---
  hash-to-efi-sig-list.c | 30 ++++++++++++++++++++++++++++++

meta-balena-common/recipes-bsp/efitools/efitools/Add-static-keyword-for-IsValidVariableHeader.patch

@@ -15,6 +15,7 @@ inlining with the assembly code actually generated.
 Therefore, "static inline" is used for both purposes. If -O0 is specified,
 GCC will generate the assembly code as long as the function is referred.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  include/variableformat.h | 2 +-

meta-balena-common/recipes-bsp/efitools/efitools/Allow-to-override-tools-for-target-build.patch

@@ -3,10 +3,10 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Wed, 23 Mar 2016 19:05:29 +0800
 Subject: [PATCH] Allow to override tools for target build
 
-Upstream-Status: Pending
 
 These tools should use the ones from native build.
 
+Upstream-Status: Backport
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Make.rules | 22 +++++++++++++---------

meta-balena-common/recipes-bsp/efitools/efitools/Build-DBX-by-default.patch

@@ -3,6 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Sat, 28 Jan 2017 13:42:28 +0800
 Subject: [PATCH] Build DBX by default
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Makefile | 6 +++---

meta-balena-common/recipes-bsp/efitools/efitools/Don-t-build-PreLoader.efi.patch

@@ -3,8 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Thu, 28 Apr 2016 11:21:33 +0800
 Subject: [PATCH] Don't build PreLoader.efi
 
-Upstream-Status: Pending
-
+Upstream-Status: Inappropriate [configuration]
 The upstream has an obvious build failure:
 | PreLoader.c:45:2: error: too few arguments to function 'security_policy_install'
 |   status = security_policy_install();

meta-balena-common/recipes-bsp/efitools/efitools/Dynamically-load-openssl.cnf-for-openssl-1.0.x-1.1.x.patch

@@ -3,6 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Wed, 16 Aug 2017 22:59:12 +0800
 Subject: [PATCH] Dynamically load openssl.cnf for openssl-1.0.x/1.1.x/3.0
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---

meta-balena-common/recipes-bsp/efitools/efitools/Fix-for-the-cross-compilation.patch

@@ -3,8 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Tue, 15 Mar 2016 21:28:33 +0800
 Subject: [PATCH] Fix for the cross compilation
 
-Upstream-Status: Pending
-
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Make.rules | 51 ++++++++++++++++++++++++++++-----------------------

meta-balena-common/recipes-bsp/efitools/efitools/Fix-help2man-error.patch

@@ -5,6 +5,7 @@ Subject: [PATCH] Fix help2man error
 
 This issue may be caused by the poky compiler.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Make.rules | 4 +++-

meta-balena-common/recipes-bsp/efitools/efitools/Fix-help2man-failure.patch

@@ -5,6 +5,7 @@ Subject: [PATCH] Fix help2man failure
 
 Add --no-discard-stderr to work around the error.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Make.rules | 2 +-

meta-balena-common/recipes-bsp/efitools/efitools/Fix-the-wrong-dependency-for-blacklist.esl.patch

@@ -3,8 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Tue, 15 Mar 2016 21:07:31 +0800
 Subject: [PATCH] Fix the wrong dependency for %-blacklist.esl
 
-Upstream-Status: Pending
-
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Make.rules | 2 +-

meta-balena-common/recipes-bsp/efitools/efitools/Kill-all-the-build-warning-caused-by-implicit-declar.patch

@@ -4,8 +4,7 @@ Date: Tue, 15 Mar 2016 17:12:24 +0800
 Subject: [PATCH] Kill all the build warning caused by implicit declaration of
  function
 
-Upstream-Status: Pending
-
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Loader.c                | 1 +

meta-balena-common/recipes-bsp/efitools/efitools/LockDown-disable-the-entrance-into-BIOS-setup-to-re-.patch

@@ -6,6 +6,7 @@ Subject: [PATCH] LockDown: disable the entrance into BIOS setup to re-enable
 
 In most cases, this step is not necessary.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  LockDown.c | 9 +++++++--

meta-balena-common/recipes-bsp/efitools/efitools/LockDown-enable-the-enrollment-for-DBX.patch

@@ -3,8 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Fri, 22 Apr 2016 16:28:05 +0800
 Subject: [PATCH] LockDown: enable the enrollment for DBX
 
-Upstream-Status: Pending
-
+Upstream-Status: Inappropriate [configuration]
 DBX acting as blacklist now is able to be enrolled.
 
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>

meta-balena-common/recipes-bsp/efitools/efitools/LockDown-run-system-warm-reset-after-the-key-provisi.patch

@@ -4,11 +4,11 @@ Date: Fri, 25 Mar 2016 10:52:34 +0800
 Subject: [PATCH] LockDown: run system warm reset after the key provision
  success
 
-Upstream-Status: Pending
 
 In addition, BIOS would stop at its setup screen. The end user can thus
 enable UEFI secure boot immediately.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  LockDown.c | 15 +++++++++++++++

meta-balena-common/recipes-bsp/efitools/efitools/LockDown-show-the-error-message-with-3-sec-timeout.patch

@@ -3,6 +3,7 @@ From: Lans Zhang <jia.zhang@windriver.com>
 Date: Tue, 17 Jan 2017 12:48:27 +0800
 Subject: [PATCH] LockDown: show the error message with 3-sec timeout
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  LockDown.c | 20 ++++++++++++--------

meta-balena-common/recipes-bsp/efitools/efitools/Makefile-do-not-build-signed-efi-image.patch

@@ -3,6 +3,7 @@ From: Yunguo Wei <yunguo.wei@windriver.com>
 Date: Tue, 17 Jan 2017 17:24:51 +0800
 Subject: [PATCH] Makefile: do not build signed efi image
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
 ---
  Makefile | 5 ++---

meta-balena-common/recipes-bsp/efitools/efitools/Reuse-xxdi.pl.patch

@@ -6,6 +6,7 @@ Subject: [PATCH] Reuse xxdi.pl
 The missing File::Slurp required by xxdi.pl is added. To avoid introducing
 an extra xxd package, remove the support of using xxd.
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
 ---
  Make.rules | 3 +--

meta-balena-common/recipes-bsp/grub/grub-bootconf_1.00.bb

@@ -11,7 +11,7 @@ inherit grub-efi-cfg
 
 require conf/image-uefi.conf
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 GRUB_CFG = "${S}/grub-bootconf"
 LABELS = "boot"

meta-balena-common/recipes-bsp/grub/grub-conf.bb

@@ -15,22 +15,23 @@ inherit deploy nopackages sign-gpg
 INHIBIT_DEFAULT_DEPS = "1"
 BOOTLOADER_TIMEOUT = "${@bb.utils.contains('OS_DEVELOPMENT', '1', '3', '0', d)}"
 
+
 do_configure[noexec] = '1'
 do_compile() {
     sed -e 's/@@TIMEOUT@@/${BOOTLOADER_TIMEOUT}/' \
         -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
         -e 's/@@KERNEL_CMDLINE@@/rootwait ${OS_KERNEL_CMDLINE} ${MACHINE_SPECIFIC_EXTRA_CMDLINE}/' \
-        "${WORKDIR}/grub.cfg_internal_template" > "${B}/grub.cfg_internal"
+        "${UNPACKDIR}/grub.cfg_internal_template" > "${B}/grub.cfg_internal"
 
     sed -e 's/@@TIMEOUT@@/${BOOTLOADER_TIMEOUT}/' \
         -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
 	-e 's/@@KERNEL_CMDLINE@@/rootwait ${OS_KERNEL_CMDLINE} ${MACHINE_SPECIFIC_EXTRA_CMDLINE}/' \
-        "${WORKDIR}/grub.cfg_external_template" > "${B}/grub.cfg_external"
+        "${UNPACKDIR}/grub.cfg_external_template" > "${B}/grub.cfg_external"
 
     sed -e 's/@@TIMEOUT@@/${BOOTLOADER_TIMEOUT}/' \
         -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
         -e 's/@@KERNEL_CMDLINE@@/rootwait ${OS_KERNEL_SECUREBOOT_CMDLINE} ${OS_KERNEL_CMDLINE} ${MACHINE_SPECIFIC_EXTRA_CMDLINE}/' \
-        "${WORKDIR}/grub.cfg_internal_luks_template" > "${B}/grub.cfg_internal_luks"
+        "${UNPACKDIR}/grub.cfg_internal_luks_template" > "${B}/grub.cfg_internal_luks"
 }
 
 SIGNING_ARTIFACTS = "${B}/grub.cfg_external ${B}/grub.cfg_internal_luks"
@@ -42,8 +43,8 @@ do_deploy() {
     install -m 644 ${B}/grub.cfg_external ${DEPLOYDIR}
     install -m 644 ${B}/grub.cfg_internal ${DEPLOYDIR}
 
-    install -m 644 ${WORKDIR}/grubenv ${DEPLOYDIR}/grubenv
-    install -m 644 ${WORKDIR}/grub_extraenv ${DEPLOYDIR}/grub_extraenv
+    install -m 644 ${UNPACKDIR}/grubenv ${DEPLOYDIR}/grubenv
+    install -m 644 ${UNPACKDIR}/grub_extraenv ${DEPLOYDIR}/grub_extraenv
     install -m 644 ${B}/grub.cfg_internal_luks ${DEPLOYDIR}/grub.cfg_internal_luks
 }