github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #869 from devimc/topic/snap/fixSnap

Browse Source 
snap: fix snap in launchpad
This commit is contained in:
Julio Montes 2019-12-11 11:58:03 -06:00 committed by GitHub
commit e76cf80b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/build-kernel.sh
View File

@ -269,15 +269,14 @@ get_default_kernel_config() {
get_config_and_patches() { get_config_and_patches() {
if [ -z "${patches_path}" ]; then if [ -z "${patches_path}" ]; then
info "Clone config and patches"
patches_path="${default_patches_dir}" patches_path="${default_patches_dir}"
if [ ! -d "${patches_path}" ]; then if [ ! -d "${patches_path}" ]; then
tag="${kata_version}" tag="${kata_version}"
git clone "https://${patches_repo}.git" "${patches_repo_dir}" git clone -q "https://${patches_repo}.git" "${patches_repo_dir}"
pushd "${patches_repo_dir}" >> /dev/null pushd "${patches_repo_dir}" >> /dev/null
if [ -n $tag ] ; then if [ -n $tag ] ; then
info "checking out $tag" info "checking out $tag"
git checkout $tag git checkout -q $tag
fi fi
popd >> /dev/null popd >> /dev/null
fi fi

2
kernel/kata_config_version
View File

@ -1 +1 @@
59 60

4
snap/snapcraft.yaml
View File

@ -228,11 +228,11 @@ parts:
export DEBUG=1 export DEBUG=1
case "$(uname -m)" in case "$(uname -m)" in
aarch64|ppc64le|s390x) aarch64|ppc64le|s390x)
sudo -E PATH=$PATH DISTRO=alpine make initrd sudo -E PATH=$PATH make initrd DISTRO=alpine
;; ;;
x86_64) x86_64)
# In some build systems it's impossible to build a rootfs image, try with the initrd image # 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;; *) echo "unsupported architecture: $(uname -m)"; exit 1;;
esac esac