Merge ~xnox/ubuntu/+source/linux-snap/+git/bionic:master into ~ubuntu-kernel/ubuntu/+source/linux-snap/+git/bionic:master

Proposed by Dimitri John Ledkov
Status: Needs review
Proposed branch: ~xnox/ubuntu/+source/linux-snap/+git/bionic:master
Merge into: ~ubuntu-kernel/ubuntu/+source/linux-snap/+git/bionic:master
Diff against target: 24 lines (+6/-0)
1 file modified
Makefile (+6/-0)
Reviewer Review Type Date Requested Status
Ubuntu Kernel Repositories Pending
Review via email: mp+367635@code.launchpad.net

Commit message

lzma is deprecated, lz4 is the new world order.

This fixes FTBFS of the snap kernels in devel/eoan.

I've checked the configs and lz4 decompress should be enabled on all snap kernels already via the sample-kernels, as dep of squashfs_lz4 or some such. Thus compressing with lz4 should be safe in that regard (it should still boot). Also lz4 is the default across all of ubuntu since 18.10.

To post a comment you must log in.
06de5e9... by Dimitri John Ledkov

copy all keys

c701aea... by Dimitri John Ledkov

sigh

d26734a... by Dimitri John Ledkov

Pin any PPAs to the same priority as -updates.

PPAs only have "release" pocket, and do not have -updates, thus at the
moment they get pinned down lower than -updates. Normally, the
snappy-dev/image ppa should be treated on the same priority as
-updates.

Signed-off-by: Dimitri John Ledkov <email address hidden>

Unmerged commits

d26734a... by Dimitri John Ledkov

Pin any PPAs to the same priority as -updates.

PPAs only have "release" pocket, and do not have -updates, thus at the
moment they get pinned down lower than -updates. Normally, the
snappy-dev/image ppa should be treated on the same priority as
-updates.

Signed-off-by: Dimitri John Ledkov <email address hidden>

c701aea... by Dimitri John Ledkov

sigh

06de5e9... by Dimitri John Ledkov

copy all keys

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index b2c5ea5..bb719c8 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -44,6 +44,10 @@ Pin: release a=$(RELEASE)-proposed
6 Pin-Priority: 750
7
8 Package: *
9+Pin: origin "ppa.launchpad.net"
10+Pin-Priority: 720
11+
12+Package: *
13 Pin: release a=$(RELEASE)-updates
14 Pin-Priority: 720
15
16@@ -101,6 +105,8 @@ all:
17 $(ENV) chroot chroot apt-get -y install gnupg
18 mkdir --mode=0600 chroot/tmp/gnupg-home
19 cat snappy-dev-image.asc | $(ENV) chroot chroot gpg-agent --homedir /tmp/gnupg-home --daemon apt-key add -
20+ cp /etc/apt/trusted.gpg chroot/etc/apt/trusted.gpg
21+ cp /etc/apt/trusted.gpg.d/* chroot/etc/apt/trusted.gpg.d/
22 # Copy in the sources.list just before modifying it (on build envs this already
23 # seems to be present, otherwise those would not fail).
24 cp /etc/apt/sources.list chroot/etc/apt/sources.list

Subscribers

People subscribed via source and target branches