[lxc-devel] [lxc-ci/master] images/gentoo: Fix portage make.conf

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 303 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200525/737b0b92/attachment.bin>
-------------- next part --------------
From 0e4fd14d3045056e452a08ed3236eeda4d930b01 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Mon, 25 May 2020 19:15:54 +0200
Subject: [PATCH] images/gentoo: Fix portage make.conf

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

diff --git a/images/gentoo.yaml b/images/gentoo.yaml
index a099e84..1eceadc 100644
--- a/images/gentoo.yaml
+++ b/images/gentoo.yaml
@@ -446,10 +446,9 @@ actions:
     sed -i "s#hkps://keys.gentoo.org#keyserver.ubuntu.com#g" /usr/share/portage/config/repos.conf
     sed -ri "s#(sync-uri =) .+#\1 ${RSYNC_MIRROR}#" /usr/share/portage/config/repos.conf
 
-    machine="$(uname -m)"
-    TARGET=
+    TARGET="$(uname -m)"
 
-    case "${machine}" in
+    case "${TARGET}" in
     aarch64)
       TARGET=arm64 ;;
     i686)
@@ -458,9 +457,11 @@ actions:
       TARGET=ppc ;;
     x86_64)
       TARGET=amd64 ;;
+    arm*)
+      TARGET=arm ;;
     esac
 
-    [ -n "${TARGET}" ] && echo ACCEPT_KEYWORDS="~${TARGET}" >> /etc/portage/make.conf
+    echo ACCEPT_KEYWORDS="~${TARGET}" >> /etc/portage/make.conf
   types:
   - container
   - vm