[lxc-devel] [lxc-ci/master] images/archlinux: Only remove linux-firmware for containers

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 574 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200303/f5b9a0fb/attachment.bin>
-------------- next part --------------
From a4784ca69346467d2095da8ecc7408558ff52f46 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 3 Mar 2020 20:58:23 +0100
Subject: [PATCH] images/archlinux: Only remove linux-firmware for containers

Since linux-firmware is a dependency of linux-aarch64, removing it would
remove the kernel and mkinitcpio which in turn would leave us without a
initramfs.
Therefore, only remove linux-firmware for containers.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 images/archlinux.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/images/archlinux.yaml b/images/archlinux.yaml
index 059ee8b..8eb5d26 100644
--- a/images/archlinux.yaml
+++ b/images/archlinux.yaml
@@ -586,7 +586,6 @@ packages:
         - haveged
         - ldns
         - libedit
-        - linux-firmware
         - net-tools
         - openssh
       action: remove
@@ -594,6 +593,15 @@ packages:
         - aarch64
         - armv7
 
+    - packages:
+        - linux-firmware
+      action: remove
+      architectures:
+        - aarch64
+        - armv7
+      types:
+        - container
+
 actions:
   - trigger: post-packages
     action: |-