Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-04 16:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.470 to ubuntu/artful-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 2ec24bdfce2d5c81f242f0d480f7766d18a730f9

New changelog entries:
  * Add initial support for preinstallation of snaps in images, and
    preinstall pulsemixer in the Ubuntu MATE image.
This commit is contained in:
Steve Langasek 2017-10-08 21:49:09 -04:00 committed by usd-importer
parent 2ec24bdfce
commit fb1b5e73e3
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.470) artful; urgency=medium
* Add initial support for preinstallation of snaps in images, and
preinstall pulsemixer in the Ubuntu MATE image.
-- Steve Langasek <steve.langasek@ubuntu.com> Sun, 08 Oct 2017 21:49:09 -0400
livecd-rootfs (2.469) artful; urgency=medium
* Unminimization information should only go to motd when we are actually

50
live-build/auto/build
View File

@ -27,6 +27,45 @@ fi
# Setup cleanup function
Setup_cleanup
preinstall_snaps() {
lb chroot_resolv install
chroot chroot sh -c '
set -x;
cd /var/lib/snapd/seed;
SNAPPY_STORE_NO_CDN=1 snap download core'
for snap in "$@"; do
chroot chroot sh -c "
set -x;
cd /var/lib/snapd/seed;
SNAPPY_STORE_NO_CDN=1 snap download \"$snap\""
done
lb chroot_resolv remove
CORE_SNAP=$(cd chroot/var/lib/snapd/seed; ls -1 core_*.snap)
cat <<EOF > chroot/var/lib/snapd/seed/seed.yaml
snaps:
- name: core
channel: stable
file: ${CORE_SNAP}
EOF
for snap in "$@"; do
cat <<EOF >> chroot/var/lib/snapd/seed/seed.yaml
- name: $snap
channel: stable
EOF
echo -n " file: " >> chroot/var/lib/snapd/seed/seed.yaml
(cd chroot/var/lib/snapd/seed; ls -1 ${snap}_*.snap) \
>> chroot/var/lib/snapd/seed/seed.yaml
done
mkdir -p chroot/var/lib/snapd/seed/snaps \
chroot/var/lib/snapd/seed/assertions
mv chroot/var/lib/snapd/seed/*.assert \
chroot/var/lib/snapd/seed/assertions/
mv chroot/var/lib/snapd/seed/*.snap chroot/var/lib/snapd/seed/snaps/
}
rm -f binary.success
(
if [ -d config/gnupg ]; then
@ -322,6 +361,17 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
;;
esac
# FIXME: this should not be a hard-coded list in this script; this
# is an interim solution for 17.10.
case $PROJECT:$SUBPROJECT in
ubuntu-mate:*)
SNAP_LIST=pulsemixer
;;
esac
if [ -n "$SNAP_LIST" ]; then
preinstall_snaps $SNAP_LIST
fi
if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
if [ "$ARCH" = "armhf" ]; then
INFO_DESC="$(lsb_release -d -s)"