Skip to content

Commit 5d2f890

Browse files
committed
Set S from UNPACKDIR in recipes that use only local files
There is no need to have two assignments; also setting S from UNPACKDIR (and not vice versa) is more logical as unpack task comes first, and tasks that come after unpack use S to access unpack results. Ref: https://git.openembedded.org/openembedded-core/commit/?id=f64b7e5fb3181734c8dde87b27e872a026261a74 Signed-off-by: Jose Quaresma <[email protected]>
1 parent 404a57f commit 5d2f890

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

dynamic-layers/openembedded-layer/recipes-devtools/android-tools/android-tools-adbd-cmdline.bb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ SECTION = "console/utils"
33
LICENSE = "MIT"
44
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
55

6-
S = "${WORKDIR}/sources"
7-
UNPACKDIR = "${S}"
6+
S = "${UNPACKDIR}"
87

98
SRC_URI = " \
109
file://50-adbd-cmdline.conf \
1110
"
1211

1312
do_install() {
1413
install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
15-
install -m 0644 ${UNPACKDIR}/50-adbd-cmdline.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
14+
install -m 0644 ${S}/50-adbd-cmdline.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
1615
}
1716

1817
FILES:${PN} += " \

recipes-bsp/partition/qcom-partition-conf.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ DEPENDS += "qcom-ptool-native"
77

88
SRC_URI = "file://${PARTCONF}"
99

10-
S = "${WORKDIR}/sources"
11-
UNPACKDIR = "${S}"
10+
S = "${UNPACKDIR}"
1211
B = "${WORKDIR}/build"
1312

1413
inherit python3native deploy

recipes-support/initrdscripts/initramfs-module-copy-modules_1.0.bb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ RDEPENDS:${PN} = "initramfs-framework-base ${VIRTUAL-RUNTIME_base-utils}"
55

66
SRC_URI = "file://copy-modules.sh"
77

8-
S = "${WORKDIR}/sources"
9-
UNPACKDIR = "${S}"
8+
S = "${UNPACKDIR}"
109

1110
do_install() {
1211
install -d ${D}/init.d
13-
install -m 0755 ${UNPACKDIR}/copy-modules.sh ${D}/init.d/95-copy_modules
12+
install -m 0755 ${S}/copy-modules.sh ${D}/init.d/95-copy_modules
1413
}
1514

1615
FILES:${PN} = "/init.d/"

0 commit comments

Comments
 (0)