Do not force lzma on ubuntu-core builds, the compress format default should be set universally inside initramfs-tools-ubuntu-core package instead of getting duplicated multiple times all over the place.

sil2100/enable-universe-none
Dimitri John Ledkov 6 years ago
parent 3d36dc0794
commit d7b629cae6

3
debian/changelog vendored

@ -2,6 +2,9 @@ livecd-rootfs (2.592) UNRELEASED; urgency=medium
* Drop trying to mount removed maas squashfs.
* Stop overriding initramfs compression default to lzma. LP: #1831736
* Do not force lzma on ubuntu-core builds, the compress format default
should be set universally inside initramfs-tools-ubuntu-core package
instead of getting duplicated multiple times all over the place.
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 05 Jun 2019 00:02:32 +0100

@ -590,8 +590,6 @@ case $PROJECT:${SUBPROJECT:-} in
Chroot chroot "apt-get -y autoremove"
rm -rf chroot/boot/initrd.img* chroot/boot/vmlinu?-* chroot/lib/modules/* \
chroot/boot/abi-* chroot/boot/System.map-* chroot/boot/config-*
mkdir -p chroot/etc/initramfs-tools/conf.d
echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/snappy-device-tarball.conf
# install needed packages and the kernel itself
Chroot chroot "apt-get -y install initramfs-tools-ubuntu-core linux-firmware xz-utils"

@ -8,10 +8,6 @@ IVER="$(dpkg -s initramfs-tools-ubuntu-core | \
# fail the build if we did not find the snappy initrd package
[ -n "$IVER" ] || exit 1
# force lzma
mkdir -p /etc/initramfs-tools/conf.d
echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf
update-initramfs.REAL -c -kcore-$IVER -v
cd /boot

Loading…
Cancel
Save