| Message ID | 20261103131831.1622873-1-ross.burton@arm.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | automake: remove bb/inc split | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/automake-remove-bb-inc-split.patch FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test auh changelog truncation notice (test_mbox.TestMbox.test_auh_changelog_truncation_notice) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test CVE tag format: No new source patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new source patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new source patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc deleted file mode 100644 index 9946c73c715..00000000000 --- a/meta/recipes-devtools/automake/automake.inc +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A GNU tool for automatically generating Makefiles" -DESCRIPTION = "Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding \ -Standards. Automake requires the use of Autoconf." -LICENSE = "GPL-2.0-only" -HOMEPAGE = "http://www.gnu.org/software/automake/" -SECTION = "devel" - -SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz" - -inherit autotools texinfo - -do_configure() { - # We can end up patching macros, which would then mean autoreconf - # Cheat by saying everything is up to date. - touch ${S}/aclocal.m4 ${S}/Makefile.in ${S}/configure - oe_runconf -} - -export AUTOMAKE = "${@bb.utils.which('automake', d.getVar('PATH'))}" - -FILES:${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/meta/recipes-devtools/automake/automake_1.19.bb b/meta/recipes-devtools/automake/automake_1.19.bb index 0ee4d8facfa..aaf3ab9a6f5 100644 --- a/meta/recipes-devtools/automake/automake_1.19.bb +++ b/meta/recipes-devtools/automake/automake_1.19.bb @@ -1,10 +1,38 @@ -require automake.inc - +SUMMARY = "A GNU tool for automatically generating Makefiles" +DESCRIPTION = "Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding \ +Standards. Automake requires the use of Autoconf." LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS:class-native = "autoconf-native" +HOMEPAGE = "http://www.gnu.org/software/automake/" +SECTION = "devel" -NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}" +DEPENDS = "autoconf-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz \ + file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \ + file://0004-Add-a-new-distro-feature-ptest.patch \ + file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \ + " + +SRC_URI[sha256sum] = "79e8b1f7a967e87ce8a9ded76bee7f793d0ce1886ab2002feb1b0510f578b75a" + +inherit autotools texinfo + +PERL = "${USRBINPATH}/perl" +PERL:class-native = "${USRBINPATH}/env perl" +PERL:class-nativesdk = "${USRBINPATH}/env perl" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" + +do_configure() { + # We can end up patching macros, which would then mean autoreconf + # Cheat by saying everything is up to date. + touch ${S}/aclocal.m4 ${S}/Makefile.in ${S}/configure + oe_runconf +} + +FILES:${PN} += "${datadir}/automake* ${datadir}/aclocal*" RDEPENDS:${PN} += "\ autoconf \ @@ -19,22 +47,4 @@ RDEPENDS:${PN} += "\ RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native" -SRC_URI += "\ - file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \ - file://0004-Add-a-new-distro-feature-ptest.patch \ - file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \ - " - -SRC_URI[sha256sum] = "79e8b1f7a967e87ce8a9ded76bee7f793d0ce1886ab2002feb1b0510f578b75a" - -PERL = "${USRBINPATH}/perl" -PERL:class-native = "${USRBINPATH}/env perl" -PERL:class-nativesdk = "${USRBINPATH}/env perl" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" - -do_install:append () { - install -d ${D}${datadir} -} - BBCLASSEXTEND = "native nativesdk"
There's no poiint having this split as there's only one recipe. As part of the merge we can do some cleanup - Remove the AUTOMAKE assignment which is not used as we don't autoreconf automake - Remove NAMEVER, never used - Remove a redundant mkdir of ${datadir}, as automake always installs files into there. Confirmed that the output is bit-for-bit identical after this change. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-devtools/automake/automake.inc | 21 ------- .../automake/automake_1.19.bb | 56 +++++++++++-------- 2 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake.inc