Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-19 06:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.399 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 01521cefe4108a2a62c47eb2bdbc978a70f0ed20

New changelog entries:
  [ Oliver Grawert ]
  * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
    kill the snappy os build if the initramfs-tools-ubuntu-core package
    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
  [ Adam Conrad ]
  * live-build/ubuntu-cpc/hooks/032-disk-image.binary: Install s390-tools
    and sysconfig-hardware before we attempt to configure zipl.
This commit is contained in:
Oliver Grawert 2016-04-10 17:23:05 +02:00 committed by usd-importer
parent 01521cefe4
commit 9fadf2c648
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/changelog vendored
View File

@ -1,3 +1,19 @@
livecd-rootfs (2.399) xenial; urgency=medium
[ Oliver Grawert ]
* live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
kill the snappy os build if the initramfs-tools-ubuntu-core package
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
[ Adam Conrad ]
* live-build/ubuntu-cpc/hooks/032-disk-image.binary: Install s390-tools
and sysconfig-hardware before we attempt to configure zipl.
-- Oliver Grawert <ogra@ubuntu.com> Sun, 10 Apr 2016 17:23:05 +0200
livecd-rootfs (2.398) xenial; urgency=medium livecd-rootfs (2.398) xenial; urgency=medium
* switch snappy package builds from "snappy build" to "snapcraft snap" * switch snappy package builds from "snappy build" to "snapcraft snap"

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

3
live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot
View File

@ -5,6 +5,9 @@ set -ex
IVER="$(dpkg -s initramfs-tools-ubuntu-core | \ IVER="$(dpkg -s initramfs-tools-ubuntu-core | \
sed -n '/^Version:/{s/^[^: ]*: \([^: ]*\).*/\1/;p;}')" sed -n '/^Version:/{s/^[^: ]*: \([^: ]*\).*/\1/;p;}')"
# fail the build if we did not find the snappy initrd package
[ -n "$IVER" ] || exit 1
# force lzma # force lzma
mkdir -p /etc/initramfs-tools/conf.d mkdir -p /etc/initramfs-tools/conf.d
echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf

1
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -115,6 +115,7 @@ fi
if [ "$ARCH" = "s390x" ]; then if [ "$ARCH" = "s390x" ]; then
# Do ZIPL install bits # Do ZIPL install bits
chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware
# Write out cloudy zipl.conf for future kernel updates # Write out cloudy zipl.conf for future kernel updates
cat << EOF > mountpoint/etc/zipl.conf cat << EOF > mountpoint/etc/zipl.conf