<!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: 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: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: "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,0.01) 0 0 1px; font-family: "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">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
Holger Levsen pushed to branch master at <a href="https://salsa.debian.org/qa/jenkins.debian.net">Debian QA / jenkins.debian.net</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: bold;"><a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9c9c4bc7c37fa74bac02af527568d600006dc20c">9c9c4bc7</a></strong>
<div>
<span> by Helmut Grohne </span> <i> at 2023-10-28T13:55:08+02:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: "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; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Explicitly pass --merged-usr until debootstrap is updated to know
Signed-off-by: Holger Levsen <holger@layer-acht.org>
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
1 changed file:
</h4>
<ul>
<li class="file-stats">
<a href="#74a6f141e0061cce15c1b30a6be09bbf8c3a789b">
bin/reproducible_setup_pbuilder.sh
</a>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Changes:
</h4>
<li id="74a6f141e0061cce15c1b30a6be09bbf8c3a789b">
<a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9c9c4bc7c37fa74bac02af527568d600006dc20c#74a6f141e0061cce15c1b30a6be09bbf8c3a789b"><strong style="font-weight: bold;">bin/reproducible_setup_pbuilder.sh</strong></a>
<hr style="overflow: hidden; border: 1px solid #e1e1e1;">
<table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="155" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="155" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="line_content match" style="color: rgba(31,30,36,0.24); padding: inherit;" bgcolor="#fbfafd">@@ -155,7 +155,7 @@ setup_pbuilder() {</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="155" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
155
</td>
<td class="new_line diff-line-num" data-linenumber="155" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
155
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC155" class="line" lang="shell"> <span class="k" style="font-weight: 600;">case</span> <span class="nv" style="color: #008080;">$SUITE</span> <span class="k" style="font-weight: 600;">in</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="156" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
156
</td>
<td class="new_line diff-line-num" data-linenumber="156" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
156
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC156" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span>buster|bookworm|bullseye<span class="p">)</span> <span class="nb" style="color: #0086b3;">sudo </span>pbuilder <span class="nt" style="color: #000080;">--create</span> <span class="nv" style="color: #008080;">$pbuilder_http_proxy</span> <span class="nt" style="color: #000080;">--basetgz</span> /var/cache/pbuilder/<span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: #008080;">NAME</span><span class="k" style="font-weight: 600;">}</span><span class="nt" style="color: #000080;">-new</span>.tgz <span class="nt" style="color: #000080;">--distribution</span> <span class="nv" style="color: #008080;">$SUITE</span> <span class="nt" style="color: #000080;">--debootstrapopts</span> <span class="nt" style="color: #000080;">--no-merged-usr</span> <span class="nt" style="color: #000080;">--extrapackages</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$EXTRA_PACKAGES</span><span class="s2" style="color: #d14;">"</span> <span class="nt" style="color: #000080;">--loglevel</span> D <span class="c" style="color: #998; font-style: italic;"># no-usrmerge is called no-merged-usr here, else things would be too simple</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="157" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
157
</td>
<td class="new_line diff-line-num" data-linenumber="157" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
157
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC157" class="line" lang="shell"> <span class="p">;;</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="158" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
158
</td>
<td class="new_line diff-line-num old" data-linenumber="158" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>-<span id="LC158" class="line" lang="shell"> <span class="k" style="font-weight: 600;">*</span><span class="p">)</span> <span class="nb" style="color: #0086b3;">sudo </span>pbuilder <span class="nt" style="color: #000080;">--create</span> <span class="nv" style="color: #008080;">$pbuilder_http_proxy</span> <span class="nt" style="color: #000080;">--basetgz</span> /var/cache/pbuilder/<span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: #008080;">NAME</span><span class="k" style="font-weight: 600;">}</span><span class="nt" style="color: #000080;">-new</span>.tgz <span class="nt" style="color: #000080;">--distribution</span> <span class="nv" style="color: #008080;">$SUITE</span> <span class="nt" style="color: #000080;">--extrapackages</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$EXTRA_PACKAGES</span><span class="s2" style="color: #d14;">"</span> <span class="nt" style="color: #000080;">--loglevel</span> D</span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="159" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="158" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
158
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC158" class="line" lang="shell"> <span class="k" style="font-weight: 600;">*</span><span class="p">)</span> <span class="nb" style="color: #0086b3;">sudo </span>pbuilder <span class="nt" style="color: #000080;">--create</span> <span class="nv" style="color: #008080;">$pbuilder_http_proxy</span> <span class="nt" style="color: #000080;">--basetgz</span> /var/cache/pbuilder/<span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: #008080;">NAME</span><span class="k" style="font-weight: 600;">}</span><span class="nt" style="color: #000080;">-new</span>.tgz <span class="nt" style="color: #000080;">--distribution</span> <span class="nv" style="color: #008080;">$SUITE</span> <span class="nt" style="color: #000080;"><span class="idiff left addition" style="background-color: #c7f0d2;">--debootstrapopts</span></span><span class="idiff addition" style="background-color: #c7f0d2;"> </span><span class="nt" style="color: #000080;"><span class="idiff addition" style="background-color: #c7f0d2;">--merged-usr</span></span><span class="idiff addition" style="background-color: #c7f0d2;"> </span><span class="nt" style="color: #000080;">--extrapackages</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$EXTRA_PACKAGES</span><span class="s2" style="color: #d14;">"</span> <span class="nt" style="color: #000080;">--loglevel</span> D<span class="idiff addition" style="background-color: #c7f0d2;"> </span><span class="c" style="color: #998; font-style: italic;"><span class="idiff right addition" style="background-color: #c7f0d2;"># explicitly merge until debootstrap knows that unstable chroots must be merged</span></span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="159" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
159
</td>
<td class="new_line diff-line-num" data-linenumber="159" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
159
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC159" class="line" lang="shell"> <span class="p">;;</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="160" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
160
</td>
<td class="new_line diff-line-num" data-linenumber="160" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
160
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC160" class="line" lang="shell"> <span class="k" style="font-weight: 600;">esac</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="161" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
161
</td>
<td class="new_line diff-line-num" data-linenumber="161" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
161
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 14px; color: #333238; position: relative; font-family: "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: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC161" class="line" lang="shell"></span>
</pre></td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9c9c4bc7c37fa74bac02af527568d600006dc20c">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://salsa.debian.org">salsa.debian.org</a>. <a href="https://salsa.debian.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://salsa.debian.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 Commit","url":"https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9c9c4bc7c37fa74bac02af527568d600006dc20c"}}</script>
</p>
</div>
</body>
</html>