diff mbox series

mmdebstrap: Fix overly strict overrides for MMHOOKS

Message ID 4a12af7a-11ab-40dd-b5aa-b7b7efa87507@siemens.com
State Accepted, archived
Headers show
Series mmdebstrap: Fix overly strict overrides for MMHOOKS | expand

Commit Message

Jan Kiszka Nov. 20, 2024, 10:22 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Using DISTROOVERRIDE breaks downstream when it sets own DISTRO values.
Use BASE_DISTRO_CODENAME, just like elsewhere.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Uladzimir Bely Nov. 27, 2024, 7:10 a.m. UTC | #1 
On Wed, 2024-11-20 at 23:22 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Using DISTROOVERRIDE breaks downstream when it sets own DISTRO
> values.
> Use BASE_DISTRO_CODENAME, just like elsewhere.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
> b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
> index 1043f2d1..9a27851d 100644
> --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
> +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
> @@ -19,8 +19,8 @@ MM_HOOK_JESSIE =
> "/usr/share/mmdebstrap/hooks/jessie-or-older"
>  DPKG_HOOKS ?= "${@'--hook-dir='+d.getVar('MM_HOOK_JESSIE') \
>                if os.path.isdir(d.getVar('MM_HOOK_JESSIE')) \
>                else '--customize-hook=\'touch
> /var/lib/dpkg/available\''}"
> -MMHOOKS:ubuntu-focal ?= "${DPKG_HOOKS}"
> -MMHOOKS:debian-buster ?= "${DPKG_HOOKS}"
> +MMHOOKS:focal ?= "${DPKG_HOOKS}"
> +MMHOOKS:buster ?= "${DPKG_HOOKS}"
>  
>  DISTRO_BOOTSTRAP_KEYRING = "${WORKDIR}/distro-keyring.gpg"
>  
> -- 
> 2.43.0
> 

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index 1043f2d1..9a27851d 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -19,8 +19,8 @@  MM_HOOK_JESSIE = "/usr/share/mmdebstrap/hooks/jessie-or-older"
 DPKG_HOOKS ?= "${@'--hook-dir='+d.getVar('MM_HOOK_JESSIE') \
               if os.path.isdir(d.getVar('MM_HOOK_JESSIE')) \
               else '--customize-hook=\'touch /var/lib/dpkg/available\''}"
-MMHOOKS:ubuntu-focal ?= "${DPKG_HOOKS}"
-MMHOOKS:debian-buster ?= "${DPKG_HOOKS}"
+MMHOOKS:focal ?= "${DPKG_HOOKS}"
+MMHOOKS:buster ?= "${DPKG_HOOKS}"
 
 DISTRO_BOOTSTRAP_KEYRING = "${WORKDIR}/distro-keyring.gpg"