mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-01-11 15:00:39 +00:00
arm: WORKDIR fixes
Upstream has removed the need for setting S to WORKDIR, and is throwing
an error if still doing so. Make the necessary changes.
From the upstream commit, much of the changes where made via:
sed -i "/^S = \"\${WORKDIR}\/git\"/d" `find . -name *.bb -o -name *.inc -o -name *.bbclass`
sed -i "s/^S = \"\${WORKDIR}\//S = \"\${UNPACKDIR}\//g" `find . -name *.bb -o -name *.inc -o -name *.bbclass`
Suggested-by: Marcin Juszkiewicz <marcin-oe@juszkiewicz.com.pl>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -58,6 +58,6 @@ SRC_URI[acs-img.sha256sum] = "ea52f84dab44bde97de3e2d2224d883acaae35724dd8e2bdfb
|
||||
# Revision pointing to v2023.04 tag
|
||||
SRCREV_sr-ir-template = "c714db178ddf72e5ae5017f15421095297d5bf0e"
|
||||
|
||||
S = "${WORKDIR}/sources-unpack"
|
||||
S = "${UNPACKDIR}"
|
||||
|
||||
inherit arm-systemready-acs
|
||||
|
||||
@@ -12,7 +12,6 @@ python3-chardet-native python3-requests-native python3-construct-native \
|
||||
dtc-native python3-dtschema-wrapper-native"
|
||||
|
||||
PV = "v2023.04"
|
||||
S = "${WORKDIR}/git"
|
||||
SRC_URI = "\
|
||||
git://git.gitlab.arm.com/systemready/systemready-scripts.git;protocol=https;nobranch=1 \
|
||||
file://0001-check-sr-results-Return-non-zero-exit-code-on-failur.patch \
|
||||
|
||||
@@ -11,7 +11,6 @@ RDEPENDS:${PN} = "python3-packaging-native python3-pyyaml-native \
|
||||
python3-jsonschema-native"
|
||||
|
||||
PV = "v2023.04"
|
||||
S = "${WORKDIR}/git"
|
||||
SRC_URI = "git://git.gitlab.arm.com/systemready/edk2-test-parser.git;protocol=https;nobranch=1"
|
||||
|
||||
# The SRCREV is at the v2023.04 tag
|
||||
|
||||
@@ -27,7 +27,7 @@ ARM_SYSTEMREADY_LINUX_DISTRO_ISO_IMAGE = \
|
||||
# Size of installation disk in MB
|
||||
ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE ?= "4096"
|
||||
|
||||
S = "${WORKDIR}/sources-unpack"
|
||||
S = "${UNPACKDIR}"
|
||||
|
||||
do_image() {
|
||||
dd if=/dev/zero of=${WORKDIR}/${IMAGE_LINK_NAME}.wic \
|
||||
|
||||
Reference in New Issue
Block a user