mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-01-11 15:00:39 +00:00
Code Issues Projects Releases Wiki Activity

arm-systemready: WORKDIR to UNPACKDIR changes

Browse Source 
Recent upstream changes to what is acceptable use of WORKDIR have broken
where the meta-arm-systemready recipes are expecting things to be.  Fix
them to point to the correct location.

Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2024-07-01 09:11:52 -04:00
parent 1a2004428d
commit 1d65894556
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta-arm-systemready/classes/arm-systemready-acs.bbclass
View File

@@ -29,7 +29,7 @@ IMAGE_POSTPROCESS_COMMAND += "write_image_test_data; "
python do_deploy() {
deploydir = d.getVar('DEPLOYDIR')
suffix = d.getVar('IMAGE_DEPLOY_SUFFIX')
imgfile = os.path.join(d.getVar('WORKDIR'), d.getVar('IMAGE_FILENAME'))
imgfile = os.path.join(d.getVar('UNPACKDIR'), d.getVar('IMAGE_FILENAME'))
deployfile = os.path.join(deploydir, d.getVar('IMAGE_NAME') + suffix)
linkfile = os.path.join(deploydir, d.getVar('IMAGE_LINK_NAME') + suffix)
@@ -47,14 +47,14 @@ python do_deploy() {
# Copy the report.txt to DEPLOYDIR
# The machine-specific implementation can optionally put the report file in
# ${WORKDIR}/report.txt. If there is no such file present, use the template.
workdir = d.getVar('WORKDIR')
report_file = os.path.join(workdir, "report.txt")
# ${UNPACKDIR}/report.txt. If there is no such file present, use the template.
unpackdir = d.getVar('UNPACKDIR')
report_file = os.path.join(unpackdir, "report.txt")
report_file_dest = os.path.join(deploydir, "report.txt")
if os.path.exists(report_file):
report_file_to_copy = report_file
else:
report_file_to_copy = os.path.join(workdir, "systemready-ir-template",
report_file_to_copy = os.path.join(unpackdir, "systemready-ir-template",
"report.txt")
shutil.copyfile(report_file_to_copy, report_file_dest)

2
meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb
View File

@@ -58,4 +58,6 @@ SRC_URI[acs-img.sha256sum] = "ea52f84dab44bde97de3e2d2224d883acaae35724dd8e2bdfb
# Revision pointing to v2023.04 tag
SRCREV_sr-ir-template = "c714db178ddf72e5ae5017f15421095297d5bf0e"
S = "${WORKDIR}/sources-unpack"
inherit arm-systemready-acs

4
meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc
View File

@@ -22,6 +22,8 @@ ARM_SYSTEMREADY_LINUX_DISTRO_ISO_IMAGE = \
# Size of installation disk in MB
ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE ?= "4096"
S = "${WORKDIR}/sources-unpack"
do_image() {
dd if=/dev/zero of=${WORKDIR}/${IMAGE_LINK_NAME}.wic \
bs=1M count=${ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE} status=none
@@ -29,7 +31,7 @@ do_image() {
do_deploy() {
# Deploy the iso and installation target disk image to the deploy folder
install -m 644 ${WORKDIR}/${ISO_IMAGE_NAME}.iso ${DEPLOYDIR}
install -m 644 ${UNPACKDIR}/${ISO_IMAGE_NAME}.iso ${DEPLOYDIR}
install -m 644 ${WORKDIR}/${IMAGE_LINK_NAME}.wic ${DEPLOYDIR}
}