From 43a6e67e70da4343f7646a106a371cf8b4e651a9 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Tue, 10 Dec 2019 20:06:31 +0000 Subject: [PATCH] snap: overwrite Makefile variables Overwrite Makefile variable `DISTRO` in order to build rootfs and initrd images with the right distro. fixes #868 Signed-off-by: Julio Montes --- snap/snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7bb83987f..d5fb2903e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -228,11 +228,11 @@ parts: export DEBUG=1 case "$(uname -m)" in aarch64|ppc64le|s390x) - sudo -E PATH=$PATH DISTRO=alpine make initrd + sudo -E PATH=$PATH make initrd DISTRO=alpine ;; x86_64) # In some build systems it's impossible to build a rootfs image, try with the initrd image - sudo -E PATH=$PATH DISTRO=clearlinux make image || sudo -E PATH=$PATH DISTRO=alpine make initrd + sudo -E PATH=$PATH make image DISTRO=clearlinux || sudo -E PATH=$PATH make initrd DISTRO=alpine ;; *) echo "unsupported architecture: $(uname -m)"; exit 1;; esac