autoconf-archive: 2012.04.07 -> 2016.09.16
PATCH v2 1/1 autoconf-archive: 2012.04.07 -> 2016.09.16
---
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc | 7 ++++---
...oconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} | 8 +++-----
2 files changed, 7 insertions(+), 8 deletions(-)
rename meta-oe/recipes-devtools/autoconf-archive/{autoconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} (55%)meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +4 -3
@@ -1,15 +1,16 @@ +SUMMARY = "A collection of macros for GNU Autoconf" +DESCRIPTION = "The autoconf-archive set of macros extend the pre-defined \ +capabilities within the complete autoconf tool set." LICENSE = "GPLv3" HOMEPAGE = "http://www.gnu.org/software/autoconf-archive/" SECTION = "devel" - DEPENDS += "m4-native" DEPENDS_class-native = "m4-native gnu-config-native" DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" inherit autotools
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb renamed from meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb +3 -5
@@ -1,13 +1,11 @@ require autoconf-archive.inc - -PARALLEL_MAKE = "" - LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[md5sum] = "e842c5b9fae021007bd70550362e5e80" -SRC_URI[sha256sum] = "040b443bf68efd52fbfcb294b556bfbbbfe432db78445ca25e0cfe2e88f96a14" +SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" +SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82" EXTRA_OECONF += "ac_cv_path_M4=m4" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.9.1
Op 07-10-16 om 17:30 schreef Matthew Barth:
Quoted 16 lines
Signed-off-by Matthew Barth <[email protected]>--- meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc | 7 ++++--- ...oconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta-oe/recipes-devtools/autoconf-archive/{autoconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} (55%)meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +3
-0@@ -1,15 +1,16 @@ +SUMMARY = "A collection of macros for GNU Autoconf" +DESCRIPTION = "The autoconf-archive set of macros extend the pre-defined \ +capabilities within the complete autoconf tool set." LICENSE = "GPLv3"
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc line 12
Quoted 10 lines
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +0
-2HOMEPAGE = "http://www.gnu.org/software/autoconf-archive/" SECTION = "devel" - DEPENDS += "m4-native" DEPENDS_class-native = "m4-native gnu-config-native" DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk"
Removing that whitespace makes the recipe less readable. And like I said before, if you're going to touch style issues, move R* below do_install
Some files from this conflict with gnome-common:
ERROR: autoconf-archive-2016.09.16-r0 do_populate_sysroot: The recipe autoconf-archive is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
sysroots/qemux86/usr/share/aclocal/ax_check_enable_debug.m4
Matched in b'manifest-qemux86-gnome-common.populate_sysroot' sysroots/qemux86/usr/share/aclocal/ax_code_coverage.m4 Matched in b'manifest-qemux86-gnome-common.populate_sysroot'
Please verify which recipe should provide the above files.
Quoted 76 lines · Matthew Barth
Signed-off-by Matthew Barth <[email protected]>--- meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc | 7 ++++--- ...oconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta-oe/recipes-devtools/autoconf-archive/{autoconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} (55%)
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +4
-3@@ -1,15 +1,16 @@ +SUMMARY = "A collection of macros for GNU Autoconf" +DESCRIPTION = "The autoconf-archive set of macros extend the pre-defined \ +capabilities within the complete autoconf tool set." LICENSE = "GPLv3" HOMEPAGE = "http://www.gnu.org/software/autoconf-archive/" SECTION = "devel" - DEPENDS += "m4-native" DEPENDS_class-native = "m4-native gnu-config-native" DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" inherit autotools(quoted diff) +0
-0archive_2012.04.07.bb b/meta-oe/recipes-devtools/autoconf-archive/ autoconf-archive_2016.09.16.bb
similarity index 55%
rename from meta-oe/recipes-devtools/autoconf-archive/autoconf- archive_2012.04.07.bb
rename to meta-oe/recipes-devtools/autoconf-archive/autoconf- archive_2016.09.16.bb
index 5baaecc..1a0470c 100644
--- a/meta-oe/recipes-devtools/autoconf-archive/autoconf- archive_2012.04.07.bb
+++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf- archive_2016.09.16.bbmeta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb renamed from meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb +0
-5@@ -1,13 +1,11 @@ require autoconf-archive.inc - -PARALLEL_MAKE = "" - LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[md5sum] = "e842c5b9fae021007bd70550362e5e80" -SRC_URI[sha256sum] = "040b443bf68efd52fbfcb294b556bf
bbbfe432db78445ca25e0cfe2e88f96a14"(quoted diff) +2
-0+SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" +SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a722
40a5e5fcd248e8444335e63beb60fabd82"
EXTRA_OECONF+= "ac_cv_path_M4=m4"
+
BBCLASSEXTEND = "native nativesdk"
--
1.9.1--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
These macros should be provided by the autoconf-archive recipe as gnome-common has been deprecated in favour of using the macros from the latest upstream autoconf-archive which this patch set is moving to.
Quoted 105 lines · Martin Jansa
Some files from this conflict with gnome-common:
ERROR: autoconf-archive-2016.09.16-r0do_populate_sysroot: The recipe autoconf-archive is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
sysroots/qemux86/usr/share/aclocal/ax_check_enable_debug.m4
Matched in b'manifest-qemux86-gnome-common.populate_sysroot'
sysroots/qemux86/usr/share/aclocal/ax_code_coverage.m4
Matched in b'manifest-qemux86-gnome-common.populate_sysroot'
Please verify which recipe should provide the above files.On Fri, Oct 7, 2016 at 5:30 PM, Matthew Barth <[email protected] <mailto:[email protected]>> wrote:
Signed-off-by: Matthew Barth <[email protected] <mailto:[email protected]>> --- meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc | 7 ++++--- ...oconf-archive_2012.04.07.bb <http://oconf-archive_2012.04.07.bb> => autoconf-archive_2016.09.16.bb <http://autoconf-archive_2016.09.16.bb>} | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta-oe/recipes-devtools/autoconf-archive/{autoconf-archive_2012.04.07.bb <http://autoconf-archive_2012.04.07.bb> => autoconf-archive_2016.09.16.bb <http://autoconf-archive_2016.09.16.bb>} (55%) diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc index 9399363..2b5df70 100644 --- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc @@ -1,15 +1,16 @@ +SUMMARY = "A collection of macros for GNU Autoconf" +DESCRIPTION = "The autoconf-archive set of macros extend the pre-defined \ +capabilities within the complete autoconf tool set." LICENSE = "GPLv3" HOMEPAGE = "http://www.gnu.org/software/autoconf-archive/ <http://www.gnu.org/software/autoconf-archive/>" SECTION = "devel" - DEPENDS += "m4-native" DEPENDS_class-native = "m4-native gnu-config-native" DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" inherit autotools diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb <http://autoconf-archive_2012.04.07.bb> b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb <http://autoconf-archive_2016.09.16.bb> similarity index 55% rename from meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb <http://autoconf-archive_2012.04.07.bb> rename to meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb <http://autoconf-archive_2016.09.16.bb> index 5baaecc..1a0470c 100644 --- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb <http://autoconf-archive_2012.04.07.bb> +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb <http://autoconf-archive_2016.09.16.bb> @@ -1,13 +1,11 @@ require autoconf-archive.inc - -PARALLEL_MAKE = "" - LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[md5sum] = "e842c5b9fae021007bd70550362e5e80" -SRC_URI[sha256sum] = "040b443bf68efd52fbfcb294b556bfbbbfe432db78445ca25e0cfe2e88f96a14" +SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" +SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82" EXTRA_OECONF += "ac_cv_path_M4=m4" + BBCLASSEXTEND = "native nativesdk" -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] <mailto:[email protected]> http://lists.openembedded.org/mailman/listinfo/openembedded-devel <http://lists.openembedded.org/mailman/listinfo/openembedded-devel>
Then you (or someone else) need to fix gnome-common, before this is merged.
Quoted 99 lines · msbarth
These macros should be provided by the autoconf-archive recipe as gnome-common has been deprecated in favour of using the macros from the latest upstream autoconf-archive which this patch set is moving to.
On 10/12/2016 03:26 PM, Martin Jansa wrote:
Some files from this conflict with gnome-common:
ERROR: autoconf-archive-2016.09.16-r0
do_populate_sysroot: The recipe autoconf-archive is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
sysroots/qemux86/usr/share/aclocal/ax_check_enable_debug.m4
Matched in b'manifest-qemux86-gnome-common.populate_sysroot'
sysroots/qemux86/usr/share/aclocal/ax_code_coverage.m4
Matched in b'manifest-qemux86-gnome-common.populate_sysroot'
Please verify which recipe should provide the above files.Quoted 77 lines · Matthew Barth
Signed-off-by Matthew Barth <[email protected]>--- meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc | 7 ++++--- ...oconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta-oe/recipes-devtools/autoconf-archive/{autoconf-archive_2012.04.07.bb => autoconf-archive_2016.09.16.bb} (55%)
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +4
-3@@ -1,15 +1,16 @@ +SUMMARY = "A collection of macros for GNU Autoconf" +DESCRIPTION = "The autoconf-archive set of macros extend the pre-defined \ +capabilities within the complete autoconf tool set." LICENSE = "GPLv3" HOMEPAGE = "http://www.gnu.org/software/autoconf-archive/" SECTION = "devel" - DEPENDS += "m4-native" DEPENDS_class-native = "m4-native gnu-config-native" DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz"inherit autotools
(quoted diff) +0
-0_2012.04.07.bb b/meta-oe/recipes-devtools/autoconf-archive/ autoconf-archive_2016.09.16.bb
similarity index 55%
rename from meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_ 2012.04.07.bb
rename to meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_ 2016.09.16.bb
index 5baaecc..1a0470c 100644
--- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive _2012.04.07.bb
+++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive _2016.09.16.bbmeta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +0
-5@@ -1,13 +1,11 @@ require autoconf-archive.inc - -PARALLEL_MAKE = "" - LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[md5sum] = "e842c5b9fae021007bd70550362e5e80" -SRC_URI[sha256sum] = "040b443bf68efd52fbfcb294b556b
fbbbfe432db78445ca25e0cfe2e88f96a14"meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +2
-0+SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" +SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a72
240a5e5fcd248e8444335e63beb60fabd82"
EXTRA_OECONF+= "ac_cv_path_M4=m4"
+
BBCLASSEXTEND = "native nativesdk"
--
1.9.1--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel