summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Obergschwandtner <andreas.obergschwandtner@skidata.com>2019-08-05 16:35:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-07 16:08:15 +0100
commit6070e77e1ed5c170d86c41b6ef9c9f8e22dfea8d (patch)
tree3f0b2c1b7e46d2d5623a3732721721c76565b887
parentc1ac9c679066402375909ebb7a96962f4596c035 (diff)
downloadpoky-6070e77e1ed5c170d86c41b6ef9c9f8e22dfea8d.tar.gz
bzip2: set the autoconf package version to the recipe version
This is done to require only a single version change if bzip2 is updated and fixes also setting package version 1.0.6 for bzip2 1.0.8. (From OE-Core rev: beb4fb0b0e89ce6b80645322ee435a6b4909b652) Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bzip2/bzip2/configure.ac2
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.8.bb4
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-extended/bzip2/bzip2/configure.ac b/meta/recipes-extended/bzip2/bzip2/configure.ac
index e2bf1bf110..b8abade2d9 100644
--- a/meta/recipes-extended/bzip2/bzip2/configure.ac
+++ b/meta/recipes-extended/bzip2/bzip2/configure.ac
@@ -1,6 +1,6 @@
1AC_PREREQ([2.57]) 1AC_PREREQ([2.57])
2 2
3AC_INIT(bzip2, 1.0.6) 3AC_INIT(bzip2, %BZIP2_VERSION%)
4AM_INIT_AUTOMAKE(foreign) 4AM_INIT_AUTOMAKE(foreign)
5AM_MAINTAINER_MODE 5AM_MAINTAINER_MODE
6 6
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
index 6f86b451ae..8e9b779e67 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
@@ -29,6 +29,10 @@ ALTERNATIVE_${PN} = "bunzip2 bzcat bzip2"
29#install binaries to bzip2-native under sysroot for replacement-native 29#install binaries to bzip2-native under sysroot for replacement-native
30EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}" 30EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}"
31 31
32do_configure_prepend () {
33 sed -i -e "s|%BZIP2_VERSION%|${PV}|" ${S}/configure.ac
34}
35
32do_install_ptest () { 36do_install_ptest () {
33 sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile 37 sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
34} 38}