Merge pull request #315 from lumag/fix-unpackdir

Follow UNPACKDIR introduction
96boards · May 28, 2024 · e577079 · e577079
2 parents 249ead8 + 9206fc3
commit e577079
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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"
diff --git 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"

diff --git 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"
diff --git 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