From cc512cd9e1aec90ca590288d7004f8bb144998e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 9 Oct 2020 15:22:08 +0200 Subject: utouch-*, ifenslave, iozone3, ttf-honkyfonts, python3-smbus: don't use trailing slash in S * see oe-core base.bbclass changes from: https://lists.openembedded.org/g/openembedded-core/message/143159 https://lists.openembedded.org/g/openembedded-core/message/143161 Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb | 2 +- meta-oe/recipes-benchmark/iozone3/iozone3_490.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb | 2 +- meta-oe/recipes-support/utouch/utouch-evemu_git.bb | 2 +- meta-oe/recipes-support/utouch/utouch-frame_git.bb | 2 +- meta-oe/recipes-support/utouch/utouch-mtview_git.bb | 2 +- meta-python/recipes-devtools/python/python3-smbus_4.1.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb b/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb index 72a7eeec58..0db9e8a0a7 100644 --- a/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb +++ b/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb @@ -11,7 +11,7 @@ MAN_PKG = "${PN}" SRCREV = "c26e9310f552e69d0d44eb48746e02c9ae4b4f6f" SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" do_install() { install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb index ecf08cb33c..1d2e53a319 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145 UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" -S = "${WORKDIR}/${BPN}_${PV}/src/current/" +S = "${WORKDIR}/${BPN}_${PV}/src/current" # # All other arches can use the default OEMAKE except those diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb index 4df0c3afb5..9c89f97f3f 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb @@ -8,7 +8,7 @@ PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" -S = "${WORKDIR}/hunkyfonts-${PV}/TTF/" +S = "${WORKDIR}/hunkyfonts-${PV}/TTF" PACKAGES = "ttf-hunky-sans ttf-hunky-serif" FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif" diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index 7c5a734394..a5a881d1fe 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -14,6 +14,6 @@ SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" PV = "1.0.6+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 1ebebfa9f5..ca74d911f8 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -18,4 +18,4 @@ SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" PV = "1.1.2+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 5f07bf28ee..04d1f3fc7f 100644 --- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -16,4 +16,4 @@ DEPENDS += "mtdev utouch-frame utouch-evemu libx11" PV = "1.1.7+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-python/recipes-devtools/python/python3-smbus_4.1.bb b/meta-python/recipes-devtools/python/python3-smbus_4.1.bb index 1be77393b2..6b33649434 100644 --- a/meta-python/recipes-devtools/python/python3-smbus_4.1.bb +++ b/meta-python/recipes-devtools/python/python3-smbus_4.1.bb @@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "ef8f77afc70e7dbfd1171bfeae87a8a7f10074829370ce8d9ccd585a01 DEPENDS += "i2c-tools" -S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" +S = "${WORKDIR}/i2c-tools-${PV}/py-smbus" inherit distutils3 -- cgit v1.2.3-54-g00ecf