38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From 7b18adadde58798a895366105c6c1517231029d9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luca Boccassi <bluca@debian.org>
|
||
|
|
Date: Tue, 18 Jun 2024 13:35:32 +0100
|
||
|
|
Subject: [PATCH] mkosi: restrict noble-backports to noble builds
|
||
|
|
|
||
|
|
Follow-up for c01cb8cbff8512b65b7903b55f78c8d12661b8d7
|
||
|
|
|
||
|
|
(cherry picked from commit f97b243edfcae211aade6ceb2fd89ae9d9209fac)
|
||
|
|
---
|
||
|
|
.../system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf | 1 +
|
||
|
|
mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf | 1 +
|
||
|
|
2 files changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
|
||
|
|
index 0ec4807822..582f038b5f 100644
|
||
|
|
--- a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
|
||
|
|
+++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
|
||
|
|
@@ -4,6 +4,7 @@
|
||
|
|
[Match]
|
||
|
|
Architecture=!x86-64
|
||
|
|
Architecture=!x86
|
||
|
|
+Release=noble
|
||
|
|
|
||
|
|
[Distribution]
|
||
|
|
PackageManagerTrees=noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
|
||
|
|
diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
|
||
|
|
index c08eeac337..7347be9069 100644
|
||
|
|
--- a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
|
||
|
|
+++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
|
||
|
|
@@ -4,6 +4,7 @@
|
||
|
|
[Match]
|
||
|
|
Architecture=|x86-64
|
||
|
|
Architecture=|x86
|
||
|
|
+Release=noble
|
||
|
|
|
||
|
|
[Distribution]
|
||
|
|
PackageManagerTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
|