From ad35c4251b882beb9de012b92991229cbf561a29 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 25 May 2024 10:11:12 +0300 Subject: [PATCH 1/4] layer.conf: bump layer compatibility to styhead With the introduction of UNPACKDIR the OE-Core layer is no longer compatible with scarthgap. Switch LAYERSERIES_COMPAT to styhead. Signed-off-by: Dmitry Baryshkov --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 87e9f20..55ca3b8 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-rpb" BBFILE_PATTERN_meta-rpb := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-rpb = "8" -LAYERSERIES_COMPAT_meta-rpb = "nanbield scarthgap" +LAYERSERIES_COMPAT_meta-rpb = "styhead" LAYERDEPENDS_meta-rpb = "openembedded-layer meta-python networking-layer \ filesystems-layer virtualization-layer" From 4005dbf526ed90ad392e185dc618bdd42127d9e6 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 24 May 2024 20:17:28 +0300 Subject: [PATCH 2/4] feh: follow up UNPACKDIR introduction With the introduction of UNPACKDIR the files were moved from WORKDIR to UNPACKDIR. Adjust the recipe accordingly. Signed-off-by: Dmitry Baryshkov --- recipes-overlayed/feh/feh_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-overlayed/feh/feh_%.bbappend b/recipes-overlayed/feh/feh_%.bbappend index 0aeda3a..77bb4f4 100644 --- a/recipes-overlayed/feh/feh_%.bbappend +++ b/recipes-overlayed/feh/feh_%.bbappend @@ -4,10 +4,10 @@ SRC_URI += "file://fehbg file://fehbg.desktop" do_install:append() { install -d ${D}${sysconfdir}/xdg/autostart - install -m 0644 ${WORKDIR}/fehbg.desktop ${D}${sysconfdir}/xdg/autostart + install -m 0644 ${UNPACKDIR}/fehbg.desktop ${D}${sysconfdir}/xdg/autostart install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/fehbg ${D}${bindir} + install -m 0755 ${UNPACKDIR}/fehbg ${D}${bindir} } PACKAGE_BEFORE_PN += "${PN}-autostart" From a038cbbc86d564fd8b5c509e13b3a0dca1f6c02b Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 24 May 2024 20:17:28 +0300 Subject: [PATCH 3/4] openbox: follow up UNPACKDIR introduction With the introduction of UNPACKDIR the files were moved from WORKDIR to UNPACKDIR. Adjust the recipe accordingly. Signed-off-by: Dmitry Baryshkov --- recipes-overlayed/openbox/openbox_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-overlayed/openbox/openbox_%.bbappend b/recipes-overlayed/openbox/openbox_%.bbappend index 1f2cc75..57721fc 100644 --- a/recipes-overlayed/openbox/openbox_%.bbappend +++ b/recipes-overlayed/openbox/openbox_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://menu.xml" do_install:append:rpb() { - install -m 0644 ${WORKDIR}/menu.xml ${D}${sysconfdir}/xdg/openbox + install -m 0644 ${UNPACKDIR}/menu.xml ${D}${sysconfdir}/xdg/openbox } RDEPENDS:${PN} += "openbox-xdgmenu" From 9206fc3baa2cfd3870ea0c7e3a2996d9a898b3dc Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 24 May 2024 20:17:28 +0300 Subject: [PATCH 4/4] rpb-boot-initramfs: follow up UNPACKDIR introduction With the introduction of UNPACKDIR the files were moved from WORKDIR to UNPACKDIR. Adjust the recipe accordingly. Signed-off-by: Dmitry Baryshkov --- recipes-samples/initrdscripts/rpb-boot-initramfs_1.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-samples/initrdscripts/rpb-boot-initramfs_1.0.bb b/recipes-samples/initrdscripts/rpb-boot-initramfs_1.0.bb index c738780..712cd53 100644 --- a/recipes-samples/initrdscripts/rpb-boot-initramfs_1.0.bb +++ b/recipes-samples/initrdscripts/rpb-boot-initramfs_1.0.bb @@ -4,8 +4,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://init.sh" +S = "${UNPACKDIR}" + do_install() { - install -m 0755 ${WORKDIR}/init.sh ${D}/init + install -m 0755 ${UNPACKDIR}/init.sh ${D}/init } inherit allarch