From ab69bcc39b3992ffdac72e9ee54aceb612c65354 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 15 Dec 2021 15:55:06 +0000 Subject: [PATCH] debian-{buster,stretch}-*: Explicitly specify DISTRO variables It seems a manual 'make' in the respective directories no longer works, as always the default distro is used as upstream reference. Let's work around this by adding DISTRO variable assignments to the respective makefiles. Change-Id: I8769d504ca7afde07d4a0ad1f03aaaec892bf576 --- debian-buster-build/Makefile | 2 ++ debian-buster-erlang/Makefile | 2 ++ debian-buster-jenkins/Makefile | 2 ++ debian-stretch-build-dist/Makefile | 2 ++ debian-stretch-build/Makefile | 2 ++ debian-stretch-jenkins/Makefile | 2 ++ debian-stretch-obs-latest/Makefile | 2 ++ 7 files changed, 14 insertions(+) diff --git a/debian-buster-build/Makefile b/debian-buster-build/Makefile index 8d0e10b4..67066b35 100644 --- a/debian-buster-build/Makefile +++ b/debian-buster-build/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:buster +DISTRO=debian-buster include ../make/Makefile diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile index 8d0e10b4..67066b35 100644 --- a/debian-buster-erlang/Makefile +++ b/debian-buster-erlang/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:buster +DISTRO=debian-buster include ../make/Makefile diff --git a/debian-buster-jenkins/Makefile b/debian-buster-jenkins/Makefile index 8d0e10b4..67066b35 100644 --- a/debian-buster-jenkins/Makefile +++ b/debian-buster-jenkins/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:buster +DISTRO=debian-buster include ../make/Makefile diff --git a/debian-stretch-build-dist/Makefile b/debian-stretch-build-dist/Makefile index 8d0e10b4..10f0e207 100644 --- a/debian-stretch-build-dist/Makefile +++ b/debian-stretch-build-dist/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:stretch +DISTRO=debian-stretch include ../make/Makefile diff --git a/debian-stretch-build/Makefile b/debian-stretch-build/Makefile index 8d0e10b4..10f0e207 100644 --- a/debian-stretch-build/Makefile +++ b/debian-stretch-build/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:stretch +DISTRO=debian-stretch include ../make/Makefile diff --git a/debian-stretch-jenkins/Makefile b/debian-stretch-jenkins/Makefile index 8d0e10b4..10f0e207 100644 --- a/debian-stretch-jenkins/Makefile +++ b/debian-stretch-jenkins/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:stretch +DISTRO=debian-stretch include ../make/Makefile diff --git a/debian-stretch-obs-latest/Makefile b/debian-stretch-obs-latest/Makefile index 8d0e10b4..3c504cd9 100644 --- a/debian-stretch-obs-latest/Makefile +++ b/debian-stretch-obs-latest/Makefile @@ -1 +1,3 @@ +UPSTREAM_DISTRO=debian:strech +DISTRO=debian-stretch include ../make/Makefile