Merge ~juergh/ubuntu-cdimage:deb822-sources-now-subarch into ~mwhudson/ubuntu-cdimage:deb822-sources-now

[Juerg Haefliger]

Unmerged commits

52ab07a... by Juerg Haefliger on 2024-03-27

take subarch into account when copying locally downloaded livefs artifacts

	run-tests:0 (build)
	lint:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

2b3ab2b... by Michael Hudson-Doyle on 2023-12-06

add a README for new stuff

	run-tests:0 (build)
	lint:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

231af91... by Michael Hudson-Doyle on 2023-12-04

fix unbound local in build_image_set_locked

f17b047... by Michael Hudson-Doyle on 2023-11-17

add a way to use a local download of a livefs

131345a... by Michael Hudson-Doyle on 2023-12-06

use AptStateManager for germinate too

b5788af... by Michael Hudson-Doyle on 2023-12-09

set up a apt config for each cpuarch, not each arch

3c84d72... by Michael Hudson-Doyle on 2023-12-06

allow use of an apt proxy during image building

fbab74a... by Michael Hudson-Doyle on 2023-12-06

allow overriding the default apt sources for the pool

2fe2885... by Michael Hudson-Doyle on 2023-12-06

Pass apt config information to debian-cd.

Via environment variables which is a bit icky.

fbe078a... by Michael Hudson-Doyle on 2023-12-06

add a way to use AptStateManager in germination

diff --git a/lib/cdimage/livefs.py b/lib/cdimage/livefs.py
index 98fd0d4..2ed5e1b 100644
--- a/lib/cdimage/livefs.py
+++ b/lib/cdimage/livefs.py
@@ -733,10 +733,13 @@ def download_live_filesystems(config, builds):
     if config["CDIMAGE_LOCAL_LIVEFS_ARTIFACTS"]:
         assert len(config.arches) == 1
         arch = config.arches[0]
+        if "+" in arch:
+            pname = f'{config["PROJECT"]}-{arch.split("+")[1]}'
+        else:
+            pname = config["PROJECT"]
         artifacts_dir = config["CDIMAGE_LOCAL_LIVEFS_ARTIFACTS"]
         for srcname in os.listdir(artifacts_dir):
-            destname = srcname.replace(
-                f'livecd.{config["PROJECT"]}.', f'{arch}.')
+            destname = srcname.replace(f"livecd.{pname}.", f"{arch}.")
             srcpath = os.path.join(artifacts_dir, srcname)
             destpath = os.path.join(output_dir, destname)
             logger.info("copying %r to %r", srcpath, destpath)