aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-01-16 12:51:10 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-31 23:11:01 +0000
commite07272491e9f4d81a4c3797c585958163657bf9c (patch)
treec2b990d395a35b0285c3f679395e9eb42cf37246 /meta/recipes-core
parent20a441d53817f80e0ce1597e77f6e794422ac49a (diff)
downloadopenembedded-core-contrib-e07272491e9f4d81a4c3797c585958163657bf9c.tar.gz
openembedded-core-contrib-e07272491e9f4d81a4c3797c585958163657bf9c.tar.bz2
openembedded-core-contrib-e07272491e9f4d81a4c3797c585958163657bf9c.zip
util-linux: simplify version upgrades (MAJOR_VERSION)
There doesn't appear to be a need to manually and explicitly specificy the major version (for the download URL), it can be deduced easily from PV. Do so. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc3
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.32.1.bb1
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e514041a19..7bfec80508 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -24,7 +24,8 @@ DEPENDS = "zlib ncurses virtual/crypt"
DEPENDS_append_class-native = " lzo-native"
DEPENDS_append_class-nativesdk = " lzo-native"
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
+MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \
"
PACKAGES =+ "util-linux-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
index c909836cbb..b0492afff3 100644
--- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
@@ -1,4 +1,3 @@
-MAJOR_VERSION = "2.32"
require util-linux.inc
# To support older hosts, we need to patch and/or revert