Skip to content

Commit 3e3827f

Browse files
vscode: switch S to UNPACKDIR for whinlatter+
Whinlatter and wrynose split WORKDIR and UNPACKDIR; do_unpack extracts under UNPACKDIR while WORKDIR is reserved for build artefacts. The recipe used to set S = ${WORKDIR}/VSCode-linux-... which now produces 'S should be set relative to UNPACKDIR' as a fatal error. Switch to S = ${UNPACKDIR}/... with a kirkstone..walnascar fallback via UNPACKDIR ??= ${WORKDIR} so older releases that don't define UNPACKDIR keep working.
1 parent d73ad33 commit 3e3827f

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

recipes-devtools/vscode/vscode_1.120.0.bb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ SRC_URI[vscode-x64.sha256sum] = "510426eb23d330bf25d84fe88e49a08d965d6b21957b8
4444
SRC_URI[vscode-arm64.sha256sum] = "69c0d1d0534cd4173e2b3dbee5d001ed5c2bd0c846bb22dca917312b64eb1baf"
4545
SRC_URI[vscode-armhf.sha256sum] = "1662d3dd08a3602544bc4ca1b091e04d5393a23414607b7c34f0570ebd0d5daa"
4646

47-
S = "${WORKDIR}/VSCode-linux-${VSCODE_ARCH}"
47+
# Whinlatter+ split WORKDIR / UNPACKDIR; tarballs land under UNPACKDIR
48+
# while WORKDIR is now reserved for build artefacts. Older releases
49+
# (kirkstone..walnascar) didn't have UNPACKDIR at all -- give it a
50+
# WORKDIR fallback so the recipe works on every supported release.
51+
UNPACKDIR ??= "${WORKDIR}"
52+
S = "${UNPACKDIR}/VSCode-linux-${VSCODE_ARCH}"
4853

4954
# These are arch-specific prebuilt ELFs, not noarch content; bin_package
5055
# inherits allarch which is wrong here. Override back to per-machine

0 commit comments

Comments
 (0)