Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 01:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

snappy: make ppc64el and s390x os tarball builds work

Browse Source
This commit is contained in:
Oliver Grawert 2016-04-12 19:24:25 +02:00
parent 62b25a47f2
commit 814311e826
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ livecd-rootfs (2.399) UNRELEASED; urgency=medium
* live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot: * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
kill the snappy os build if the initramfs-tools-ubuntu-core package kill the snappy os build if the initramfs-tools-ubuntu-core package
is not found is not found
* make s390x known to the snappy builds
* skip kernel snap an device tarball builds for s390x and ppc64el
* drop listing of the device tarballs, this was only for debugging
-- Oliver Grawert <ogra@ubuntu.com> Sun, 10 Apr 2016 17:23:05 +0200 -- Oliver Grawert <ogra@ubuntu.com> Sun, 10 Apr 2016 17:23:05 +0200

8
live-build/auto/build
View File

@ -379,7 +379,7 @@ case $PROJECT:$SUBPROJECT in
arm64) arm64)
subarches="generic dragonboard" subarches="generic dragonboard"
;; ;;
i386|amd64|powerpc|ppc64el) i386|amd64|powerpc|ppc64el|s390x)
subarches="generic" subarches="generic"
;; ;;
esac esac
@ -410,6 +410,10 @@ case $PROJECT:$SUBPROJECT in
linux_package="linux-image-4.4.0-1009-snapdragon dragon410c-firmware" linux_package="linux-image-4.4.0-1009-snapdragon dragon410c-firmware"
fi fi
;; ;;
ppc64el|s390x)
echo "I: skipping kernel and device tarball for $ARCH"
return
;;
esac esac
# make sure all virtual filesystems are available # make sure all virtual filesystems are available
@ -586,8 +590,6 @@ EOF
done done
fi fi
ls -l *device.tar.gz
LB_LINUX_FLAVOURS=none LB_LINUX_FLAVOURS=none
;; ;;
esac esac