From 701ef7ff0e1b17150424a64acfafbb83f518f9c9 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 31 May 2021 22:34:03 +0200 Subject: 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta') 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 FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" -BPN = "util-linux" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ -- cgit 1.2.3-korg