Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

follow WORKDIR -> UNPACKDIR transition #135

Merged
merged 4 commits into from
Jun 4, 2024
Merged

follow WORKDIR -> UNPACKDIR transition #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1103666
layer.conf: remove compatibility with 'scarthgap'
ejoerns May 27, 2024
bf2e097
follow WORKDIR -> UNPACKDIR transition
ejoerns May 27, 2024
fce8cdd
recipes: Switch away from S = WORKDIR
ejoerns May 27, 2024
8368b80
genimage.bbclass: Switch away from S = WORKDIR
ejoerns May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions classes-recipe/genimage.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ PACKAGES = ""

PACKAGE_ARCH = "${MACHINE_ARCH}"

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

B = "${WORKDIR}/genimage-${PN}"

Expand Down Expand Up @@ -133,7 +134,7 @@ GENIMAGE_OPTS ??= ""
do_genimage_preprocess[cleandirs] = "${GENIMAGE_TMPDIR} ${GENIMAGE_ROOTDIR} ${B}"

do_configure () {
if ! grep -q "@IMAGE@" ${WORKDIR}/${GENIMAGE_CONFIG}; then
if ! grep -q "@IMAGE@" ${S}/${GENIMAGE_CONFIG}; then
bbnote "${GENIMAGE_CONFIG} does not contain @IMAGE@ marker"
fi
}
Expand All @@ -149,7 +150,7 @@ python do_genimage_preprocess () {

import re

infile = d.getVar('WORKDIR') + "/" + d.getVar('GENIMAGE_CONFIG')
infile = d.getVar('S') + "/" + d.getVar('GENIMAGE_CONFIG')
outfile = d.getVar('B') + "/.config"

with open(infile, "r+") as input:
Expand All @@ -170,7 +171,7 @@ fakeroot do_genimage () {
--config ${B}/.config \
--tmppath ${GENIMAGE_TMPDIR} \
--inputpath ${DEPLOY_DIR_IMAGE} \
--includepath ${WORKDIR} \
--includepath ${S} \
--outputpath ${B} \
--rootpath ${GENIMAGE_ROOTDIR} \
${GENIMAGE_OPTS}
Expand Down
2 changes: 1 addition & 1 deletion conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ BBFILE_PRIORITY_ptx = "6"

LAYERDEPENDS_ptx = "core"

LAYERSERIES_COMPAT_ptx = "scarthgap"
LAYERSERIES_COMPAT_ptx = "styhead"
8 changes: 4 additions & 4 deletions recipes-bsp/barebox/barebox.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ EXTRA_OEMAKE = " \
"

do_configure() {
if [ -e ${WORKDIR}/defconfig ]; then
cp ${WORKDIR}/defconfig ${B}/.config
if [ -e ${UNPACKDIR}/defconfig ]; then
cp ${UNPACKDIR}/defconfig ${B}/.config
else
if [ -n "${BAREBOX_CONFIG}" ]; then
oe_runmake ${BAREBOX_CONFIG}
Expand All @@ -68,9 +68,9 @@ BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory
do_compile () {
# If there is an 'env' directory, append its content
# to the compiled environment
if [ -d ${WORKDIR}/env/ ]; then \
if [ -d ${UNPACKDIR}/env/ ]; then \
mkdir -p ${S}/.yocto-defaultenv
cp -r ${WORKDIR}/env/* ${S}/.yocto-defaultenv/; \
cp -r ${UNPACKDIR}/env/* ${S}/.yocto-defaultenv/; \
grep -q .yocto-defaultenv ${B}/.config || \
sed -i -e "s,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$,\1 .yocto-defaultenv\"," \
${B}/.config; \
Expand Down
3 changes: 2 additions & 1 deletion recipes-core/ptx-profile/ptx-profile.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

SRC_URI = "file://00-ptx.sh"

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

do_install () {
install -d ${D}${sysconfdir}/profile.d/
Expand Down
9 changes: 5 additions & 4 deletions recipes-core/systemd/systemd-rc-once.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ SRC_URI = "\
file://systemd-rc-once \
"

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

inherit allarch systemd

do_install() {
install -d ${D}${base_libdir}/init
install -m 0755 ${WORKDIR}/rc-once.sh ${D}${base_libdir}/init/
install -m 0755 ${S}/rc-once.sh ${D}${base_libdir}/init/
install -d ${D}${systemd_unitdir}/system
install -m 0755 ${WORKDIR}/systemd-rc-once ${D}${systemd_unitdir}/
install -m 0644 ${WORKDIR}/rc-once.service ${D}${systemd_unitdir}/system/
install -m 0755 ${S}/systemd-rc-once ${D}${systemd_unitdir}/
install -m 0644 ${S}/rc-once.service ${D}${systemd_unitdir}/system/
install -d ${D}${systemd_unitdir}/system/system-update.target.wants
ln -sf ../rc-once.service ${D}${systemd_unitdir}/system/system-update.target.wants/rc-once.service
install -d ${D}${sysconfdir}/rc.once.d
Expand Down
Loading