Merge pull request #161 from monstermunchkin/images/gentoo

images/gentoo: Fix portage make.conf
lxc · May 25, 2020 · 6d82e26 · 6d82e26
2 parents feb345b + 7ceb814
commit 6d82e26
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/images/gentoo.yaml b/images/gentoo.yaml
@@ -446,9 +446,21 @@ 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
 
-    TARGET="amd64"
-    [ "$(uname -m)" = "aarch64" ] && TARGET="arm64"
-    echo ACCEPT_KEYWORDS="~${TARGET}" >> /etc/portage/make.conf
+    machine="$(uname -m)"
+    TARGET=
+
+    case "${machine}" in
+    aarch64)
+      TARGET=arm64 ;;
+    i686)
+      TARGET=x86 ;;
+    ppc*)
+      TARGET=ppc ;;
+    x86_64)
+      TARGET=amd64 ;;
+    esac
+
+    [ -n "${TARGET}" ] && echo ACCEPT_KEYWORDS="~${TARGET}" >> /etc/portage/make.conf
   types:
   - container
   - vm