[PATCH 0/3] Limit prebuilt container package selection

[PATCH 0/3] Limit prebuilt container package selection

[Anton Mikanovich]

As prebuilt-podman-img and prebuilt-docker-img packages are not
buildable on some architectures and distros, there should be additional
filtering to prevent enable them on unsupported target.
It requires adding hidden architecture variables selected by target
machine options in kas menu.

Anton Mikanovich (3):
  kas: Introduce internal arch options
  kas: Set prebuilt-podman-img distro support
  kas: Set prebuilt-docker-img distro support

 kas/machine/Kconfig | 45 +++++++++++++++++++++++++++++++++++++++++++++
 kas/package/Kconfig |  3 +++
 2 files changed, 48 insertions(+)

-- 
2.34.1

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241114133700.1464717-1-amikan%40ilbers.de.

[PATCH 1/3] kas: Introduce internal arch options

[Anton Mikanovich]

To allow additional options filtering based on machine architecture add
internal options with target arch.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 kas/machine/Kconfig | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig
index e09c2235..43e87f07 100644
--- a/kas/machine/Kconfig
+++ b/kas/machine/Kconfig
@@ -6,6 +6,24 @@
 
 menu "Machine selection"
 
+config ARCH_AMD64
+	bool
+
+config ARCH_ARM64
+	bool
+
+config ARCH_ARMHF
+	bool
+
+config ARCH_I386
+	bool
+
+config ARCH_MIPSEL
+	bool
+
+config ARCH_RISCV64
+	bool
+
 choice
 	prompt "Machine selection"
 	default MACHINE_QEMU_AMD64
@@ -13,110 +31,137 @@ choice
 config MACHINE_BANANAPI
 	bool "bananapi"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_ARM64
 
 config MACHINE_BEAGLEPLAY
 	bool "beagleplay"
 	depends on DEBIAN_BOOKWORM
+	select ARCH_ARM64
 
 config MACHINE_CONTAINER_AMD64
 	bool "container-amd64"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_AMD64
 
 config MACHINE_DE0_NANO_SOC
 	bool "de0-nano-soc"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_HIKEY
 	bool "hikey"
 	depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_ARM64
 
 config MACHINE_IMX6_SABRELITE
 	bool "imx6-sabrelite"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE
+	select ARCH_ARMHF
 
 config MACHINE_NANOPI_NEO
 	bool "nanopi-neo"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_NANOPI_NEO_EFI
 	bool "nanopi-neo-efi"
 	depends on DEBIAN_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_PHYBOARD_MIRA
 	bool "phyboard-mira"
 	depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_QEMU_AMD64_CIP
 	bool "qemuamd64-cip"
 	depends on DEBIAN_BOOKWORM
+	select ARCH_AMD64
 
 config MACHINE_QEMU_AMD64_SB
 	bool "qemuamd64-sb"
 	depends on DEBIAN_BULLSEYE
+	select ARCH_AMD64
 
 config MACHINE_QEMU_AMD64
 	bool "qemuamd64"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE
+	select ARCH_AMD64
 
 config MACHINE_QEMU_ARM
 	bool "qemuarm"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE
+	select ARCH_ARMHF
 
 config MACHINE_QEMU_ARM64
 	bool "qemuarm64"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE
+	select ARCH_ARM64
 
 config MACHINE_QEMU_I386
 	bool "qemui386"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_I386
 
 config MACHINE_QEMU_MIPSEL
 	bool "qemumipsel"
 	depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_MIPSEL
 
 config MACHINE_QEMU_RISCV64
 	bool "qemuriscv64"
 	depends on DEBIAN_TRIXIE || DEBIAN_SID
+	select ARCH_RISCV64
 
 config MACHINE_RPI_ARM_V7
 	bool "rpi-arm-v7"
 	depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_RPI_ARM_V7L
 	bool "rpi-arm-v7l"
 	depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_RPI_ARM
 	bool "rpi-arm"
 	depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
+	select ARCH_ARMHF
 
 config MACHINE_RPI_ARM64_V8
 	bool "rpi-arm64-v8"
 	depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
+	select ARCH_ARM64
 
 config MACHINE_SIFIVE_FU540
 	bool "sifive-fu540"
 	depends on DEBIAN_TRIXIE || DEBIAN_SID
+	select ARCH_RISCV64
 
 config MACHINE_STARFIVE_VISIONFIVE2
 	bool "starfive-visionfive2"
 	depends on DEBIAN_TRIXIE || DEBIAN_SID
+	select ARCH_RISCV64
 
 config MACHINE_STM32MP15X
 	bool "stm32mp15x"
 	depends on DEBIAN_BULLSEYE
+	select ARCH_ARMHF
 
 config MACHINE_VIRTUALBOX
 	bool "virtualbox"
 	depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+	select ARCH_AMD64
 
 config MACHINE_VMWARE
 	bool "vmware"
 	depends on DEBIAN_BULLSEYE
+	select ARCH_AMD64
 
 config MACHINE_X86_PC
 	bool "x86 PC"
 	depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE
+	select ARCH_AMD64
 
 endchoice
 
-- 
2.34.1

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241114133700.1464717-2-amikan%40ilbers.de.

[PATCH 2/3] kas: Set prebuilt-podman-img distro support

[Anton Mikanovich]

Prebuilt podman image package depends on podman, while it presents in
repos starting from Ubuntu Jammy or Debian Bullseye.
Also quay.io storage have only amd64, arm64 and armhf images, so
disable selecting this package for other architectures.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 kas/package/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kas/package/Kconfig b/kas/package/Kconfig
index 395c3a08..ac072006 100644
--- a/kas/package/Kconfig
+++ b/kas/package/Kconfig
@@ -159,6 +159,8 @@ config KAS_INCLUDE_PACKAGE_PREBUILT_DOCKER_IMG
 config PACKAGE_PREBUILT_PODMAN_IMG
         bool "prebuilt-podman-img"
         default y
+        depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || UBUNTU_JAMMY || UBUNTU_NOBLE
+        depends on ARCH_AMD64 || ARCH_ARM64 || ARCH_ARM
 
 config KAS_INCLUDE_PACKAGE_PREBUILT_PODMAN_IMG
         string
-- 
2.34.1

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241114133700.1464717-3-amikan%40ilbers.de.

[PATCH 3/3] kas: Set prebuilt-docker-img distro support

[Anton Mikanovich]

Docker storage quay.io do not have images for architectures other then
amd64, arm64 and armhf. Disable selecting this package for other
architectures.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 kas/package/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kas/package/Kconfig b/kas/package/Kconfig
index ac072006..bea2b121 100644
--- a/kas/package/Kconfig
+++ b/kas/package/Kconfig
@@ -150,6 +150,7 @@ config KAS_INCLUDE_PACKAGE_ISAR_CI_SSH_SETUP
 config PACKAGE_PREBUILT_DOCKER_IMG
         bool "prebuilt-docker-img"
         default y
+        depends on ARCH_AMD64 || ARCH_ARM64 || ARCH_ARM
 
 config KAS_INCLUDE_PACKAGE_PREBUILT_DOCKER_IMG
         string
-- 
2.34.1

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241114133700.1464717-4-amikan%40ilbers.de.

Re: [PATCH 0/3] Limit prebuilt container package selection

[Uladzimir Bely]

On Thu, 2024-11-14 at 15:36 +0200, Anton Mikanovich wrote:
> As prebuilt-podman-img and prebuilt-docker-img packages are not
> buildable on some architectures and distros, there should be
> additional
> filtering to prevent enable them on unsupported target.
> It requires adding hidden architecture variables selected by target
> machine options in kas menu.
> 
> Anton Mikanovich (3):
>   kas: Introduce internal arch options
>   kas: Set prebuilt-podman-img distro support
>   kas: Set prebuilt-docker-img distro support
> 
>  kas/machine/Kconfig | 45
> +++++++++++++++++++++++++++++++++++++++++++++
>  kas/package/Kconfig |  3 +++
>  2 files changed, 48 insertions(+)
> 
> -- 
> 2.34.1
> 

Applied to next.

-- 
Best regards,
Uladzimir.

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/bf33014f34aeb9c45deacf6ca1e34d50bcad392f.camel%40ilbers.de.