summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2021-05-31 22:34:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-26 15:24:08 +0100
commit21263b6114ccf4e26a18e4aa7cfdc24eaac2f76c (patch)
treec7ccc929187dcbe03c6a7521311ab5f9996cc9ec /meta
parenta44f82dd8b20c288e858de7ec1d32618639f5df4 (diff)
downloadpoky-21263b6114ccf4e26a18e4aa7cfdc24eaac2f76c.tar.gz
util-linux.inc: Do not modify BPN
Changing BPN to be "util-linux" regardless if it is the util-linux recipe or the util-linux-libuuid recipe that is being built was an easy way to allow ${BPN} and ${BP} to be used in the SRC_URI for both recipes. However, it causes problems for native.bbclass where there are expectations that ${BPN} and ${PN} match each other. Use "util-linux" directly in the SRC_URI instead to avoid the problem. (From OE-Core rev: 28a0e2cd75619ecc76293da145a81ae44f3f496f) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 701ef7ff0e1b17150424a64acfafbb83f518f9c9) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index cbf6102ee0..6b47f417aa 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -27,8 +27,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da
27 27
28FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" 28FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:"
29MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" 29MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
30BPN = "util-linux" 30SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
31SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \
32 file://configure-sbindir.patch \ 31 file://configure-sbindir.patch \
33 file://runuser.pamd \ 32 file://runuser.pamd \
34 file://runuser-l.pamd \ 33 file://runuser-l.pamd \