The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/161
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 7ceb814ab200c2bff395a6475cd5aa710991b233 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 25 May 2020 09:42:16 +0200
Subject: [PATCH] images/gentoo: Fix portage make.conf
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/gentoo.yaml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/images/gentoo.yaml b/images/gentoo.yaml
index a35c77d..a099e84 100644
--- 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
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
