diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-16 12:51:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-02 11:05:59 +0000 |
commit | 8b0640c4aea2f012bd2204f324f1993959303a7e (patch) | |
tree | 17239665a0e63993d6d289858a1b11ab5e36f198 /meta/recipes-core/util-linux | |
parent | 927320844fd040dcef26a250a0bab725b2fd71d9 (diff) | |
download | poky-8b0640c4aea2f012bd2204f324f1993959303a7e.tar.gz |
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.
(From OE-Core rev: e07272491e9f4d81a4c3797c585958163657bf9c)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 |
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" | |||
24 | DEPENDS_append_class-native = " lzo-native" | 24 | DEPENDS_append_class-native = " lzo-native" |
25 | DEPENDS_append_class-nativesdk = " lzo-native" | 25 | DEPENDS_append_class-nativesdk = " lzo-native" |
26 | 26 | ||
27 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ | 27 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
28 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | PACKAGES =+ "util-linux-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ | 31 | 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 @@ | |||
1 | MAJOR_VERSION = "2.32" | ||
2 | require util-linux.inc | 1 | require util-linux.inc |
3 | 2 | ||
4 | # To support older hosts, we need to patch and/or revert | 3 | # To support older hosts, we need to patch and/or revert |