Merge pull request #468 from nitkon/fixsnap

snap: Container fails to start on ppc64le
This commit is contained in:
Julio Montes
2019-04-30 11:27:25 -05:00
committed by GitHub

View File

@@ -47,15 +47,20 @@ parts:
cd ${pkg_gopath} cd ${pkg_gopath}
# build and install # build and install
arch=$(uname -m)
if [ ${arch} == "ppc64le" ]; then
arch="ppc64"
fi
make \ make \
PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \ PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \
SKIP_GO_VERSION_CHECK=1 \ SKIP_GO_VERSION_CHECK=1 \
QEMUCMD=qemu-system-$(uname -m) QEMUCMD=qemu-system-$arch
make install \ make install \
PREFIX=/usr \ PREFIX=/usr \
DESTDIR=${SNAPCRAFT_PART_INSTALL} \ DESTDIR=${SNAPCRAFT_PART_INSTALL} \
SKIP_GO_VERSION_CHECK=1 \ SKIP_GO_VERSION_CHECK=1 \
QEMUCMD=qemu-system-$(uname -m) QEMUCMD=qemu-system-$arch
# A snap is read-only squashfs, unfourtunately it's not possible to use the rootfs image with DAX # A snap is read-only squashfs, unfourtunately it's not possible to use the rootfs image with DAX
# since rw access is required therefore initrd image must be used instead. # since rw access is required therefore initrd image must be used instead.