<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p style="color: #777777;">
<a href="https://gitlab.rtems.org/martinerikwerner">Martin Werner</a>
commented on a
<a href="https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/50#note_111612">discussion</a>:
</p>
<div class="md" style="color: #333238; word-wrap: break-word;">
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">I'm assuming there's a "not" missing in that question? Since at the moment it does not use a copy of that file.</p>
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">The diff between them contains quite a bit more, of which I assume quite a bit is rtems-specific and cannot be replaced wholesale:</p>
<div class="gl-relative markdown-code-block js-markdown-code">
<pre data-canonical-lang="diff" class="code highlight js-syntax-highlight language-diff" v-pre="true" style='display: block; font-size: 14px; color: #333238; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: .25rem; white-space: pre; margin-top: 0; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="diff" style="margin-top: 0;">$ 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 </span>
<span id="LC2" class="line" lang="diff"><span class="gh" style="margin-top: 0;">diff --git a/rtems/config/tools/rtems-automake-1.12.6-1.cfg b/bare/config/devel/automake-1.12.6-1.cfg</span></span>
<span id="LC3" class="line" lang="diff"><span class="gh" style="margin-top: 0;">index a9c2bbb..d294216 100644</span></span>
<span id="LC4" class="line" lang="diff"><span class="gd" style="margin-top: 0;">--- a/rtems/config/tools/rtems-automake-1.12.6-1.cfg</span></span>
<span id="LC5" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ b/bare/config/devel/automake-1.12.6-1.cfg</span></span>
<span id="LC6" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -2,28 +2,23 @@</span></span>
<span id="LC7" class="line" lang="diff"> # Automake 1.12.6</span>
<span id="LC8" class="line" lang="diff"> #</span>
<span id="LC9" class="line" lang="diff"> </span>
<span id="LC10" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%if %{rtems_arch} == none</span></span>
<span id="LC11" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- %define _target %{_host}</span></span>
<span id="LC12" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%if %{release} == %{nil}</span></span>
<span id="LC13" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%define release 1</span></span>
<span id="LC14" class="line" lang="diff"> %endif</span>
<span id="LC15" class="line" lang="diff"> </span>
<span id="LC16" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%include %{_configdir}/checks.cfg</span></span>
<span id="LC17" class="line" lang="diff"> %include %{_configdir}/base.cfg</span>
<span id="LC18" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%include %{_configdir}/versions.cfg</span></span>
<span id="LC19" class="line" lang="diff"> </span>
<span id="LC20" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%define rtems_automake_version 1.12.6</span></span>
<span id="LC21" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%define automake_version 1.12.6</span></span>
<span id="LC22" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+</span></span>
<span id="LC23" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%hash sha256 automake-%{automake_version}.tar.gz 0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef</span></span>
<span id="LC24" class="line" lang="diff"> </span>
<span id="LC25" class="line" lang="diff"> #</span>
<span id="LC26" class="line" lang="diff"> # Fix the warning on new perl versions.</span>
<span id="LC27" class="line" lang="diff"> #</span>
<span id="LC28" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%patch add automake -p1 %{rtems_automake_patches}/automake-1.12.6-bugzilla.redhat.com-1239379.diff?h=4.11</span></span>
<span id="LC29" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%hash md5 automake-1.12.6-bugzilla.redhat.com-1239379.diff 8f53b687f9eae7c00c460e80bbef9276</span></span>
<span id="LC30" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%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</span></span>
<span id="LC31" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%hash sha256 automake-1.12.6-bugzilla.redhat.com-1239379.diff a406f23667f3e7844ebc77b6f4f43811b9e39046365b686cc689cb0ae9c88b8b</span></span>
<span id="LC32" class="line" lang="diff"> </span>
<span id="LC33" class="line" lang="diff"> #</span>
<span id="LC34" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-# Check the version of automake in the path.</span></span>
<span id="LC35" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+# The automake build instructions. We use 1.xx Release 1.</span></span>
<span id="LC36" class="line" lang="diff"> #</span>
<span id="LC37" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%if %{__automake_ver} < %{rtems_automake_version}</span></span>
<span id="LC38" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- #</span></span>
<span id="LC39" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- # Tools configuration.</span></span>
<span id="LC40" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- #</span></span>
<span id="LC41" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- %include %{_configdir}/devel/automake-1.12.6-1.cfg</span></span>
<span id="LC42" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%endif</span></span>
<span id="LC43" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%include %{_configdir}/automake-1-1.cfg</span></span></code></pre>
<copy-code></copy-code>
</div>
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">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?:
<a href="https://gitlab.rtems.org/rtems/rtos/rtems/-/blob/main/assets/tracmigration/ticket_attachments/automake-1.12.6-bugzilla.redhat.com-1239379.diff" style="margin-top: 0;">https://gitlab.rtems.org/rtems/rtos/rtems/-/blob/main/assets/tracmigration/ticket_attachments/automake-1.12.6-bugzilla.redhat.com-1239379.diff</a></p>
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">Using the tracmigration url solves the build issue similarly for me as far as I can tell.</p>
<p dir="auto" style="color: #333238; margin: 0;" align="initial">Would it still make sense to update %{rtems_git_tools} to point at 4.11 instead of 5?</p>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/50#note_111612">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.rtems.org">gitlab.rtems.org</a>. <a href="https://gitlab.rtems.org/-/sent_notifications/5340bbf84038623df8702b4cfa333f08/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.rtems.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.rtems.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Merge request","url":"https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/50#note_111612"}}</script>
</p>
</div>
</body>
</html>