<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26580">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved; Verified
  pespin: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-{buster,stretch}-*: Explicitly specify DISTRO variables<br><br>It seems a manual 'make' in the respective directories no longer<br>works, as always the default distro is used as upstream reference.<br><br>Let's work around this by adding DISTRO variable assignments to the<br>respective makefiles.<br><br>Change-Id: I8769d504ca7afde07d4a0ad1f03aaaec892bf576<br>---<br>M debian-buster-build/Makefile<br>M debian-buster-erlang/Makefile<br>M debian-buster-jenkins/Makefile<br>M debian-stretch-build-dist/Makefile<br>M debian-stretch-build/Makefile<br>M debian-stretch-jenkins/Makefile<br>M debian-stretch-obs-latest/Makefile<br>7 files changed, 14 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-buster-build/Makefile b/debian-buster-build/Makefile</span><br><span>index 8d0e10b..67066b3 100644</span><br><span>--- a/debian-buster-build/Makefile</span><br><span>+++ b/debian-buster-build/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:buster</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-buster</span><br><span> include ../make/Makefile</span><br><span>diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile</span><br><span>index 8d0e10b..67066b3 100644</span><br><span>--- a/debian-buster-erlang/Makefile</span><br><span>+++ b/debian-buster-erlang/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:buster</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-buster</span><br><span> include ../make/Makefile</span><br><span>diff --git a/debian-buster-jenkins/Makefile b/debian-buster-jenkins/Makefile</span><br><span>index 8d0e10b..67066b3 100644</span><br><span>--- a/debian-buster-jenkins/Makefile</span><br><span>+++ b/debian-buster-jenkins/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:buster</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-buster</span><br><span> include ../make/Makefile</span><br><span>diff --git a/debian-stretch-build-dist/Makefile b/debian-stretch-build-dist/Makefile</span><br><span>index 8d0e10b..10f0e20 100644</span><br><span>--- a/debian-stretch-build-dist/Makefile</span><br><span>+++ b/debian-stretch-build-dist/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-stretch</span><br><span> include ../make/Makefile</span><br><span>diff --git a/debian-stretch-build/Makefile b/debian-stretch-build/Makefile</span><br><span>index 8d0e10b..10f0e20 100644</span><br><span>--- a/debian-stretch-build/Makefile</span><br><span>+++ b/debian-stretch-build/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-stretch</span><br><span> include ../make/Makefile</span><br><span>diff --git a/debian-stretch-jenkins/Makefile b/debian-stretch-jenkins/Makefile</span><br><span>index 8d0e10b..10f0e20 100644</span><br><span>--- a/debian-stretch-jenkins/Makefile</span><br><span>+++ b/debian-stretch-jenkins/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:stretch</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-stretch</span><br><span> include ../make/Makefile</span><br><span>diff --git a/debian-stretch-obs-latest/Makefile b/debian-stretch-obs-latest/Makefile</span><br><span>index 8d0e10b..3c504cd 100644</span><br><span>--- a/debian-stretch-obs-latest/Makefile</span><br><span>+++ b/debian-stretch-obs-latest/Makefile</span><br><span>@@ -1 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:strech</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-stretch</span><br><span> include ../make/Makefile</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26580">change 26580</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/26580"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8769d504ca7afde07d4a0ad1f03aaaec892bf576 </div>
<div style="display:none"> Gerrit-Change-Number: 26580 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>