The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/110
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) ===
This fixes the keyserver when running `distrobuilder pack-lx{c,d}`.
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From c4567c9ce7925a4c426dab9a32bde8e4c81be4ff Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Fri, 21 Feb 2020 12:58:49 +0100
Subject: [PATCH] images/gentoo: Fix keyserver
This fixes the keyserver when running `distrobuilder pack-lx{c,d}`.
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/gentoo.yaml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/images/gentoo.yaml b/images/gentoo.yaml
index 483b878..30df501 100644
--- a/images/gentoo.yaml
+++ b/images/gentoo.yaml
@@ -398,6 +398,23 @@ actions:
echo pf:12345:powerwait:/sbin/halt >> /etc/inittab
fi
+ - trigger: post-unpack
+ action: |-
+ #!/bin/sh
+ set -eux
+
+ # Workaround GPG issues
+ mv /usr/bin/gpg2 /usr/bin/gpg2.real
+ echo "#!/bin/sh" > /usr/bin/gpg2
+ echo "exec /usr/bin/gpg2.real --keyserver keyserver.ubuntu.com \"\$@\""
>> /usr/bin/gpg2
+ chmod +x /usr/bin/gpg2
+
+ cp /usr/share/portage/config/repos.conf
/usr/share/portage/config/repos.conf.orig
+ sed -i "s#hkps://keys.gentoo.org#keyserver.ubuntu.com#g"
/usr/share/portage/config/repos.conf
+ types:
+ - containers
+ - vm
+
- trigger: post-packages
action: |-
#!/bin/sh
@@ -411,6 +428,19 @@ actions:
rm /usr/share/portage/config/repos.conf
mv /usr/share/portage/config/repos.conf.orig
/usr/share/portage/config/repos.conf
+ - trigger: post-packages
+ action: |-
+ #!/bin/sh
+ set -eux
+
+ rm /usr/bin/gpg2
+ mv /usr/bin/gpg2.real /usr/bin/gpg2
+ rm /usr/share/portage/config/repos.conf
+ mv /usr/share/portage/config/repos.conf.orig
/usr/share/portage/config/repos.conf
+ types:
+ - containers
+ - vm
+
- trigger: post-packages
action: |-
#!/bin/sh
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
