Martin Werner commented on a discussion: https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/50#note_111612 I'm assuming there's a "not" missing in that question? Since at the moment it does not use a copy of that file. The diff between them contains quite a bit more, of which I assume quite a bit is rtems-specific and cannot be replaced wholesale: ```diff $ git diff origin/4.11:rtems/config/tools/rtems-automake-1.12.6-1.cfg origin/5:bare/config/devel/automake-1.12.6-1.cfg diff --git a/rtems/config/tools/rtems-automake-1.12.6-1.cfg b/bare/config/devel/automake-1.12.6-1.cfg index a9c2bbb..d294216 100644 --- a/rtems/config/tools/rtems-automake-1.12.6-1.cfg +++ b/bare/config/devel/automake-1.12.6-1.cfg @@ -2,28 +2,23 @@ # Automake 1.12.6 # -%if %{rtems_arch} == none - %define _target %{_host} +%if %{release} == %{nil} +%define release 1 %endif -%include %{_configdir}/checks.cfg %include %{_configdir}/base.cfg -%include %{_configdir}/versions.cfg -%define rtems_automake_version 1.12.6 +%define automake_version 1.12.6 + +%hash sha256 automake-%{automake_version}.tar.gz 0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef # # Fix the warning on new perl versions. # -%patch add automake -p1 %{rtems_automake_patches}/automake-1.12.6-bugzilla.redhat.com-1239379.diff?h=4.11 -%hash md5 automake-1.12.6-bugzilla.redhat.com-1239379.diff 8f53b687f9eae7c00c460e80bbef9276 +%patch add automake -p1 https://gitlab.rtems.org/rtems/rtos/rtems/-/blob/main/assets/tracmigration/ticket_attachments/automake-1.12.6-bugzilla.redhat.com-1239379.diff +%hash sha256 automake-1.12.6-bugzilla.redhat.com-1239379.diff a406f23667f3e7844ebc77b6f4f43811b9e39046365b686cc689cb0ae9c88b8b # -# Check the version of automake in the path. +# The automake build instructions. We use 1.xx Release 1. # -%if %{__automake_ver} < %{rtems_automake_version} - # - # Tools configuration. - # - %include %{_configdir}/devel/automake-1.12.6-1.cfg -%endif +%include %{_configdir}/automake-1-1.cfg ``` But I guess it might make sense to use the same tracmigration url (and the nicer sh256 checksum) from that file into the 4.11 branch, if that's what you mean?: https://gitlab.rtems.org/rtems/rtos/rtems/-/blob/main/assets/tracmigration/ticket_attachments/automake-1.12.6-bugzilla.redhat.com-1239379.diff Using the tracmigration url solves the build issue similarly for me as far as I can tell. Would it still make sense to update %{rtems_git_tools} to point at 4.11 instead of 5? -- View it on GitLab: https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/50#note_111612 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list bugs@rtems.org http://lists.rtems.org/mailman/listinfo/bugs
