[lxc-devel] [lxc/master] Debian: powerpc and architecture fixes

[evgeni on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 415 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161212/9597982c/attachment.bin>
-------------- next part --------------
From 7d4c775a81885c7592b501ca7aa5734079f7997c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Ruano=20Rinc=C3=B3n?= <santiago at debian.org>
Date: Mon, 12 Dec 2016 11:00:39 +0100
Subject: [PATCH 1/2] templates/lxc-debian.in: Fix typo in calling dpkg with
 --print-foreign-architectures option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Santiago Ruano Rincón <santiago at debian.org>
Signed-off-by: Evgeni Golov <evgeni at debian.org>
---
 templates/lxc-debian.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 892607c..e22b962 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -542,7 +542,7 @@ EOF
     # If the container isn't running a native architecture, setup multiarch
     if [ "$interpreter" = "" -a "${arch}" != "${hostarch}" ]; then
         # Test if dpkg supports multiarch
-        if ! chroot "$rootfs" dpkg --print-foreign-architecture 2>&1; then
+        if ! chroot "$rootfs" dpkg --print-foreign-architectures 2>&1; then
             chroot "$rootfs" dpkg --add-architecture "${hostarch}"
         fi
     fi

From 944d1191f33d467e762aea937b0ed1e0f3c3bc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Ruano=20Rinc=C3=B3n?= <santiago at debian.org>
Date: Mon, 12 Dec 2016 11:12:26 +0100
Subject: [PATCH 2/2] templates/lxc-debian.in: handle ppc hostarch -> powerpc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Santiago Ruano Rincón <santiago at debian.org>
Signed-off-by: Evgeni Golov <evgeni at debian.org>
---
 templates/lxc-debian.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index e22b962..6bdf02d 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -653,6 +653,8 @@ elif [ "$arch" = "x86_64" ]; then
     arch="amd64"
 elif [ "$arch" = "armv7l" ]; then
     arch="armhf"
+elif [ "$arch" = "ppc" ]; then
+    arch="powerpc"
 elif [ "$arch" = "ppc64le" ]; then
     arch="ppc64el"
 elif [ "$arch" = "mips" -a "$littleendian" = "yes" ]; then