Merge lp:~cyphermox/livecd-rootfs/lts-xenial into lp:livecd-rootfs

Proposed by Mathieu Trudel-Lapierre on 2016-04-13
Status: Rejected
Rejected by: Sebastien Bacher on 2016-08-02
Proposed branch: lp:~cyphermox/livecd-rootfs/lts-xenial
Merge into: lp:livecd-rootfs
Diff against target: 593 lines (+343/-16) (has conflicts)
5 files modified
debian/changelog (+111/-0)
debian/control (+4/-0)
get-ppa-fingerprint (+19/-0)
live-build/auto/build (+5/-0)
live-build/auto/config (+204/-16)
Text conflict in debian/changelog
Text conflict in debian/control
Text conflict in get-ppa-fingerprint
Text conflict in live-build/auto/build
Text conflict in live-build/auto/config
To merge this branch: bzr merge lp:~cyphermox/livecd-rootfs/lts-xenial
Reviewer Review Type Date Requested Status
Steve Langasek 2016-04-13 Disapprove on 2016-04-20
Review via email: mp+291819@code.launchpad.net

Description of the change

In prevision for the HWE stack from xenial to be all backported to Trusty; here are the changes for setting it as default.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

This can't land until xorg-lts-xenial has landed in trusty.

Steve Langasek (vorlon) wrote :

appears to be targeted at the wrong branch (see xenial vs. trusty conflicts in changelog)

review: Disapprove

Unmerged revisions

916. By Mathieu Trudel-Lapierre on 2016-04-13

live-build/auto/config: Switch HWE from lts-wily to lts-xenial.
(LP: #1568918)

915. By Adam Conrad on 2016-01-16

Only install thermald on amd64|i386 on lubuntu, fixing PPC build.

914. By Adam Conrad on 2016-01-16

live-build/auto/config: Switch HWE from lts-vivid to lts-wily.

913. By Adam Conrad on 2016-01-16

Switch from lts-vivid to lts-wily HWE kernels (LP: #1524366)

912. By Adam Conrad on 2015-07-30

* Add xserver-xorg-core-lts-vivid to X HWE hints for the resolver.
* Add libwayland-egl1-mesa-lts-vivid to X HWE hints (LP: #1479524)
* Add kde-window-manager to kubuntu hints to fix a resolver issue.
* Add thermald to lubuntu hints to work around lack of recommends.

911. By Adam Conrad on 2015-06-23

* live-build/auto/config: Switch HWE from lts-utopic to lts-vivid.
* Remove obsolete libegl1-mesa-drivers-lts-* from HWE_X_PACKAGES.

910. By Adam Conrad on 2015-02-18

Add audacious-plugins to LUBUNTU_HWE_HINTS to unsnag the PPC build.

909. By Adam Conrad on 2015-02-17

Release 2.208.5

908. By Adam Conrad on 2015-02-17

Remove xscreensaver-data and xscreensaver with XUBUNTU_HWE_HINTS.

907. By Adam Conrad on 2015-02-17

* Rename XUBUNTU_HWE_HINTS to XFCE_HWE_HINTS, so it's more reusable
  and have MYTHBUNTU, XUBUNTU, and UBUNTUSTUDIO all make use of it.
* Explicitly seed the correct notify option for every last flavour.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-13 11:40:22 +0000
3+++ debian/changelog 2016-04-13 20:42:56 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 livecd-rootfs (2.399) xenial; urgency=medium
7
8 [ Oliver Grawert ]
9@@ -1677,6 +1678,116 @@
10
11 -- Colin Watson <cjwatson@ubuntu.com> Sat, 10 May 2014 13:54:42 +0100
12
13+=======
14+livecd-rootfs (2.208.12) UNRELEASED; urgency=medium
15+
16+ * live-build/auto/config: Switch HWE from lts-wily to lts-xenial.
17+ (LP: #1568918)
18+
19+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Wed, 13 Apr 2016 16:37:13 -0400
20+
21+livecd-rootfs (2.208.11) trusty; urgency=medium
22+
23+ * Only install thermald on amd64|i386 on lubuntu, fixing PPC build.
24+
25+ -- Adam Conrad <adconrad@ubuntu.com> Sat, 16 Jan 2016 01:23:46 -0700
26+
27+livecd-rootfs (2.208.10) trusty; urgency=medium
28+
29+ * live-build/auto/config: Switch HWE from lts-vivid to lts-wily.
30+
31+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 15 Jan 2016 19:18:16 -0700
32+
33+livecd-rootfs (2.208.9) trusty; urgency=medium
34+
35+ * Switch from lts-vivid to lts-wily HWE kernels (LP: #1524366)
36+
37+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 09 Dec 2015 10:47:37 -0700
38+
39+livecd-rootfs (2.208.8) trusty; urgency=medium
40+
41+ * Add xserver-xorg-core-lts-vivid to X HWE hints for the resolver.
42+ * Add libwayland-egl1-mesa-lts-vivid to X HWE hints (LP: #1479524)
43+ * Add kde-window-manager to kubuntu hints to fix a resolver issue.
44+ * Add thermald to lubuntu hints to work around lack of recommends.
45+
46+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 28 Jul 2015 20:06:52 -0600
47+
48+livecd-rootfs (2.208.7) trusty; urgency=medium
49+
50+ * live-build/auto/config: Switch HWE from lts-utopic to lts-vivid.
51+ * Remove obsolete libegl1-mesa-drivers-lts-* from HWE_X_PACKAGES.
52+
53+ -- Adam Conrad <adconrad@ubuntu.com> Mon, 22 Jun 2015 14:07:52 -0600
54+
55+livecd-rootfs (2.208.6) trusty; urgency=medium
56+
57+ * Add audacious-plugins to LUBUNTU_HWE_HINTS to unsnag the PPC build.
58+
59+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 18 Feb 2015 12:00:36 -0700
60+
61+livecd-rootfs (2.208.5) trusty; urgency=medium
62+
63+ * Explicitly install the xserver-xorg-input-all-lts-utopic package.
64+ * Rename XUBUNTU_HWE_HINTS to XFCE_HWE_HINTS, so it's more reusable
65+ and have MYTHBUNTU, XUBUNTU, and UBUNTUSTUDIO all make use of it.
66+ * Explicitly seed the correct notify option for every last flavour.
67+ * Remove xscreensaver-data and xscreensaver with XUBUNTU_HWE_HINTS.
68+
69+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 17 Feb 2015 13:57:51 -0700
70+
71+livecd-rootfs (2.208.4) trusty; urgency=medium
72+
73+ * Use the correct metapackage for edubuntu-desktop, and add HWE_HINTS
74+ * Add KUBUNTU_HWE_HINTS and populate to work around task->meta change
75+ * Revert lubuntu to using tasks for minimal and standard, since their
76+ unique snowflake apt --no-install-recommends setup breaks switching
77+ * Add XUBUNTU_HWE_HINTS and populate to work around task->meta change
78+ * Add UBUNTUGNOME_HWE_HINTS and populate it skip using unity packages
79+ * Add LUBUNTU_HWE_HINTS and populate to work around task->meta change
80+ * Reuse XUBUNTU_HWE_HINTS for MYTHBUNTU_HWE_HINTS and add some tweaks
81+ * Also reuse XUBUNTU_HWE_HINTS for UBUNTUSTUDIO_HWE_HINTS with tweaks
82+
83+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 04 Feb 2015 04:42:54 -0700
84+
85+livecd-rootfs (2.208.3) trusty; urgency=medium
86+
87+ * Pull xserver-xorg-video-geode-lts-utopic out of the i386 images.
88+
89+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 03 Feb 2015 07:03:03 -0700
90+
91+livecd-rootfs (2.208.2) trusty; urgency=medium
92+
93+ [ Colin Watson ]
94+ * If EXTRA_PPAS is set in the environment (as a space-separated sequence
95+ of <ppa-owner>/<ppa-name> pairs), fetch signing keys for those from
96+ Launchpad using python3-software-properties, and add those PPAs when
97+ building the live filesystem. This makes it easier for a builder to
98+ build an image against an additional PPA (LP: #1334374).
99+
100+ [ Adam Conrad ]
101+ * Move from task-based installs to package-based installs, and switch
102+ to using the lts-utopic HWE kernel and X stack for all flavours.
103+ * Abstract the signed kernel image, so it's only defined in one spot.
104+ * Before trying to copy kernels around, cut -lts* off the end of FLAVOUR,
105+ since the actual files on disk are -generic, not -generic-lts-utopic.
106+ * Define HWE_X_PACKAGES required to install lts-utopic and use it.
107+ * Define UNITY_HWE_HINTS to hint correct alternative package selections.
108+
109+ -- Adam Conrad <adconrad@ubuntu.com> Mon, 02 Feb 2015 01:43:48 -0700
110+
111+livecd-rootfs (2.208.1) trusty; urgency=medium
112+
113+ * Install linux-signed-generic directly in live passes rather than relying
114+ on it being in the corresponding tasks. linux-signed-generic shouldn't
115+ be in a task because that expands to ABI-versioned packages, and tasks
116+ can't be updated post-release.
117+ * Filter out kernel packages that mistakenly ended up in live tasks, so
118+ that we can install updated versions separately (LP: #1325281).
119+
120+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 24 Jun 2014 14:51:03 +0100
121+
122+>>>>>>> MERGE-SOURCE
123 livecd-rootfs (2.208) trusty; urgency=medium
124
125 * Adding support for ubuntu-touch i386 based images
126
127=== modified file 'debian/control'
128--- debian/control 2015-02-04 12:32:24 +0000
129+++ debian/control 2016-04-13 20:42:56 +0000
130@@ -8,7 +8,11 @@
131
132 Package: livecd-rootfs
133 Architecture: any
134+<<<<<<< TREE
135 Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a57-1ubuntu12~), android-tools-fsutils [armhf], python3-software-properties
136+=======
137+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf], python3-software-properties
138+>>>>>>> MERGE-SOURCE
139 Suggests: partimage
140 Breaks: ubuntu-defaults-builder (<< 0.32)
141 Description: construction script for the livecd rootfs
142
143=== modified file 'get-ppa-fingerprint'
144--- get-ppa-fingerprint 2014-09-17 10:11:35 +0000
145+++ get-ppa-fingerprint 2016-04-13 20:42:56 +0000
146@@ -1,3 +1,4 @@
147+<<<<<<< TREE
148 #! /usr/bin/python3
149
150 from __future__ import print_function
151@@ -15,3 +16,21 @@
152 owner_name = "~%s" % owner_name
153 ppa_info = ppa.get_ppa_info_from_lp(owner_name, ppa_name)
154 print(ppa_info["signing_key_fingerprint"])
155+=======
156+#! /usr/bin/python3
157+
158+from __future__ import print_function
159+
160+from optparse import OptionParser
161+
162+from softwareproperties import ppa
163+
164+
165+parser = OptionParser(usage="%prog OWNER/NAME")
166+_, args = parser.parse_args()
167+if not args:
168+ parser.error("must provide a PPA owner/name")
169+owner_name, ppa_name = args[0].split("/")
170+ppa_info = ppa.get_ppa_info_from_lp(owner_name, ppa_name)
171+print(ppa_info["signing_key_fingerprint"])
172+>>>>>>> MERGE-SOURCE
173
174=== modified file 'live-build/auto/build'
175--- live-build/auto/build 2016-04-12 17:24:25 +0000
176+++ live-build/auto/build 2016-04-13 20:42:56 +0000
177@@ -598,10 +598,14 @@
178 if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
179 continue
180 fi
181+<<<<<<< TREE
182 if [ "$FLAVOUR" = "virtual" ]; then
183 # The virtual kernel is named generic in /boot
184 FLAVOUR="generic"
185 fi
186+=======
187+ FLAVOUR=${FLAVOUR%%-lts-*}
188+>>>>>>> MERGE-SOURCE
189 KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
190 if [ -z "$KVERS" ]; then
191 if [ -e "binary/$INITFS/vmlinuz" ]; then
192@@ -631,6 +635,7 @@
193 NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
194 if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
195 # only one kernel flavour
196+ FLAVOUR=${LB_LINUX_FLAVOURS%%-lts-*}
197 if [ -e "binary/$INITFS/vmlinuz" ]; then
198 ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
199 chmod 644 "$PREFIX.kernel"
200
201=== modified file 'live-build/auto/config'
202--- live-build/auto/config 2016-04-07 16:57:07 +0000
203+++ live-build/auto/config 2016-04-13 20:42:56 +0000
204@@ -39,8 +39,17 @@
205 {
206 local pass="$1"
207 shift
208+ local filter=
209 local task
210
211+ if [ "$1" = --filter ]; then
212+ # Add an extra layer of backslash-quoting to anything that's
213+ # already backslash-quoted, since it will need to pass
214+ # through eval.
215+ filter="$(printf %s "$2" | sed 's/\(\\.\)/\\\\\1/g')"
216+ shift 2
217+ fi
218+
219 # The removal of direct task installation support from live-build
220 # poses some problems. If the chroot has multiarch configured - for
221 # example, if we're building for amd64 - then dumpavail will show
222@@ -60,7 +69,7 @@
223 for task; do
224 # We need a ridiculous number of backslashes to protect
225 # parentheses from eval.
226- echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
227+ echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task${filter:+ -a $filter}" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
228 done
229 }
230
231@@ -84,6 +93,7 @@
232 BOOTLOADER=none
233 BOOTAPPEND_LIVE=
234 LIVE_TASK=
235+LIVE_TASK_FILTER=
236 PREINSTALLED=false
237 PREINSTALL_POOL=
238 PREINSTALL_POOL_SEEDS=
239@@ -186,14 +196,59 @@
240 ;;
241 esac
242
243+<<<<<<< TREE
244 SIGNED_KERNEL_PACKAGE="linux-signed-generic"
245 UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal"
246
247+=======
248+# Default to lts-xenial for the point release, this is overridden later by
249+# specific projects/flavours:
250+case $ARCH in
251+ powerpc)
252+ KERNEL_FLAVOURS="powerpc-smp-lts-xenial powerpc64-smp-lts-xenial"
253+ ;;
254+ *)
255+ KERNEL_FLAVOURS="generic-lts-xenial"
256+ ;;
257+esac
258+HWE_X_PACKAGES="xserver-xorg-core-lts-xenial xserver-xorg-lts-xenial xserver-xorg-video-all-lts-xenial xserver-xorg-input-all-lts-xenial libwayland-egl1-mesa-lts-xenial"
259+SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-xenial"
260+UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal"
261+KUBUNTU_HWE_HINTS="pinentry-qt4 kde-baseapps-bin kde-window-manager"
262+EDUBUNTU_HWE_HINTS="gnome-session gnome-terminal"
263+XFCE_HWE_HINTS="lightdm-gtk-greeter unity-settings-daemon- unity-control-center- notification-daemon- libpanel-applet-4-0-"
264+LUBUNTU_HWE_HINTS="xfce4-notifyd xterm notification-daemon- audacious-plugins"
265+UBUNTUGNOME_HWE_HINTS="unity-settings-daemon- unity-control-center- libaccount-plugin-1.0-0-"
266+XUBUNTU_HWE_HINTS="xfce4-notifyd xscreensaver-data- $XFCE_HWE_HINTS"
267+MYTHBUNTU_HWE_HINTS="notify-osd $XFCE_HWE_HINTS"
268+UBUNTUSTUDIO_HWE_HINTS="xfce4-notifyd $XFCE_HWE_HINTS"
269+
270+>>>>>>> MERGE-SOURCE
271 case $PROJECT in
272 ubuntu|ubuntu-dvd)
273+<<<<<<< TREE
274 add_package install ubuntu-minimal ubuntu-standard
275 add_package install ubuntu-desktop $UNITY_HWE_HINTS
276+=======
277+ add_package install ubuntu-minimal ubuntu-standard
278+ case "$ARCH+$SUBARCH" in
279+ armhf+omap4)
280+ # Don't use the task as this drags in the regular X
281+ # stack (the metapackage doesn't). We want the
282+ # "reverted" one.
283+ add_package install ubuntu-desktop \
284+ xserver-xorg-core-omap-revert \
285+ xserver-xorg-video-omap-revert \
286+ xserver-xorg-input-evdev-omap-revert
287+ ;;
288+ *)
289+ add_package install ubuntu-desktop $UNITY_HWE_HINTS
290+ add_package install $HWE_X_PACKAGES
291+ ;;
292+ esac
293+>>>>>>> MERGE-SOURCE
294 LIVE_TASK='ubuntu-live'
295+<<<<<<< TREE
296 case $ARCH in
297 amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
298 esac
299@@ -216,21 +271,54 @@
300 if [ "$SUBPROJECT" = "system-image" ]; then
301 OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
302 fi
303+=======
304+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
305+ case $ARCH in
306+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
307+ esac
308+>>>>>>> MERGE-SOURCE
309 ;;
310
311 kubuntu|kubuntu-dvd)
312+<<<<<<< TREE
313 add_task install minimal standard
314 add_task install kubuntu-desktop
315 LIVE_TASK='kubuntu-live'
316 case $ARCH in
317 amd64) add_package live linux-signed-generic ;;
318- esac
319+=======
320+ add_package install ubuntu-minimal ubuntu-standard
321+ case "$ARCH+$SUBARCH" in
322+ armhf+omap4)
323+ # Don't use the task as this drags in the regular X
324+ # stack (the metapackage doesn't). We want the
325+ # "reverted" one.
326+ add_package install kubuntu-desktop \
327+ xserver-xorg-core-omap-revert \
328+ xserver-xorg-video-omap-revert \
329+ xserver-xorg-input-evdev-omap-revert
330+ ;;
331+ *)
332+ add_package install kubuntu-desktop $KUBUNTU_HWE_HINTS
333+ add_package install $HWE_X_PACKAGES
334+ ;;
335+>>>>>>> MERGE-SOURCE
336+ esac
337+<<<<<<< TREE
338+=======
339+ LIVE_TASK='kubuntu-live'
340+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
341+ case $ARCH in
342+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
343+ esac
344+>>>>>>> MERGE-SOURCE
345 COMPONENTS='main restricted universe'
346 add_chroot_hook remove-gnome-icon-cache
347 ;;
348
349 kubuntu-active)
350- add_task install minimal standard kubuntu-active
351+ add_package install ubuntu-minimal ubuntu-standard kubuntu-active
352+ add_package install $HWE_X_PACKAGES
353 LIVE_TASK='kubuntu-active-live'
354 COMPONENTS='main restricted universe'
355 add_chroot_hook remove-gnome-icon-cache
356@@ -249,51 +337,83 @@
357 ;;
358
359 edubuntu|edubuntu-dvd)
360- add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome
361+ add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop $UNITY_HWE_HINTS $EDUBUNTU_HWE_HINTS
362+ add_package install $HWE_X_PACKAGES
363 LIVE_TASK='edubuntu-live'
364+<<<<<<< TREE
365 case $ARCH in
366 amd64) add_package live linux-signed-generic ;;
367 esac
368+=======
369+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
370+ case $ARCH in
371+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
372+ esac
373+>>>>>>> MERGE-SOURCE
374 COMPONENTS='main restricted universe'
375 ;;
376
377 xubuntu)
378- add_task install minimal standard xubuntu-desktop
379+ add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop $XUBUNTU_HWE_HINTS
380+ add_package install $HWE_X_PACKAGES
381 add_package install xterm
382 LIVE_TASK='xubuntu-live'
383+<<<<<<< TREE
384 case $ARCH in
385 amd64) add_package live linux-signed-generic ;;
386 esac
387 COMPONENTS='main restricted universe multiverse'
388+=======
389+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
390+>>>>>>> MERGE-SOURCE
391 case $ARCH in
392- amd64|i386) KERNEL_FLAVOURS=generic ;;
393+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
394 esac
395+ COMPONENTS='main restricted universe multiverse'
396 ;;
397
398 ubuntu-netbook)
399- add_task install minimal standard ubuntu-netbook
400+ add_package install ubuntu-minimal ubuntu-standard ubuntu-netbook
401 LIVE_TASK='netbook-live'
402 ;;
403
404 mythbuntu)
405- add_task install minimal standard mythbuntu-desktop
406+ add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop $MYTHBUNTU_HWE_HINTS
407+ add_package install $HWE_X_PACKAGES
408 LIVE_TASK='mythbuntu-live'
409+<<<<<<< TREE
410 case $ARCH in
411 amd64) add_package live linux-signed-generic ;;
412 esac
413+=======
414+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
415+ case $ARCH in
416+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
417+ esac
418+>>>>>>> MERGE-SOURCE
419 COMPONENTS='main restricted universe multiverse'
420 ;;
421
422 lubuntu)
423- add_task install minimal standard lubuntu-desktop
424+ add_task install minimal standard
425+ add_package install lubuntu-desktop $LUBUNTU_HWE_HINTS
426+ case $ARCH in
427+ amd64|i386) add_package install thermald ;;
428+ esac
429+ add_package install $HWE_X_PACKAGES
430 LIVE_TASK='lubuntu-live'
431+<<<<<<< TREE
432 case $ARCH in
433 amd64) add_package live linux-signed-generic ;;
434 esac
435 COMPONENTS='main restricted universe multiverse'
436+=======
437+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
438+>>>>>>> MERGE-SOURCE
439 case $ARCH in
440- amd64|i386) KERNEL_FLAVOURS=generic ;;
441+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
442 esac
443+ COMPONENTS='main restricted universe multiverse'
444
445 # The Lubuntu STRUCTURE file has "feature
446 # no-follow-recommends". Mirror this.
447@@ -301,11 +421,19 @@
448 ;;
449
450 ubuntu-gnome)
451- add_task install minimal standard ubuntu-gnome-desktop
452+ add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop $UBUNTUGNOME_HWE_HINTS
453+ add_package install $HWE_X_PACKAGES
454 LIVE_TASK='ubuntu-gnome-live'
455+<<<<<<< TREE
456 case $ARCH in
457 amd64) add_package live linux-signed-generic ;;
458 esac
459+=======
460+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
461+ case $ARCH in
462+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
463+ esac
464+>>>>>>> MERGE-SOURCE
465 COMPONENTS='main restricted universe'
466 ;;
467
468@@ -322,20 +450,38 @@
469 ;;
470
471 ubuntustudio-dvd)
472+<<<<<<< TREE
473 add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
474+=======
475+ add_package install ubuntu-minimal ubuntu-standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography $UBUNTUSTUDIO_HWE_HINTS
476+ add_package install $HWE_X_PACKAGES
477+>>>>>>> MERGE-SOURCE
478 COMPONENTS='main restricted universe multiverse'
479 case $ARCH in
480- amd64|i386) KERNEL_FLAVOURS=lowlatency ;;
481+ amd64|i386) KERNEL_FLAVOURS=lowlatency-lts-xenial ;;
482 esac
483 ;;
484
485 ubuntukylin)
486+<<<<<<< TREE
487 add_task install minimal standard ubuntukylin-desktop
488+=======
489+ add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop $UNITY_HWE_HINTS
490+ add_package install $HWE_X_PACKAGES
491+>>>>>>> MERGE-SOURCE
492 add_package install ubuntukylin-default-settings
493+<<<<<<< TREE
494 LIVE_TASK='ubuntukylin-live'
495 case $ARCH in
496 amd64) add_package live linux-signed-generic ;;
497 esac
498+=======
499+ LIVE_TASK='ubuntu-live'
500+ LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
501+ case $ARCH in
502+ amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
503+ esac
504+>>>>>>> MERGE-SOURCE
505 COMPONENTS='main restricted universe'
506 ;;
507
508@@ -344,7 +490,7 @@
509 ;;
510
511 ubuntu-server)
512- add_task install minimal
513+ add_package install ubuntu-minimal
514 COMPONENTS='main'
515 PREINSTALL_POOL_SEEDS='server-ship'
516 ;;
517@@ -488,17 +634,17 @@
518 esac
519
520 if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then
521- add_task live "$LIVE_TASK"
522+ add_task live ${LIVE_TASK_FILTER:+--filter "$LIVE_TASK_FILTER"} "$LIVE_TASK"
523 fi
524
525 case $PROJECT in
526 ubuntu-dvd)
527 add_task install ubuntu-usb
528- add_task live ubuntu-usb-live
529+ add_task live ${LIVE_TASK_FILTER:+--filter "$LIVE_TASK_FILTER"} ubuntu-usb-live
530 ;;
531
532 *-dvd)
533- add_task live "$PROJECT-live"
534+ add_task live ${LIVE_TASK_FILTER:+--filter "$LIVE_TASK_FILTER"} "$PROJECT-live"
535 ;;
536 esac
537
538@@ -748,6 +894,7 @@
539 ;;
540 esac
541
542+<<<<<<< TREE
543 if [ "$EXTRA_PPAS" ]; then
544 rm -f config/archives/extra-ppas.list.chroot \
545 config/archives/extra-ppas.pref.chroot \
546@@ -828,6 +975,47 @@
547 ;;
548 esac
549
550+=======
551+if [ "$EXTRA_PPAS" ]; then
552+ rm -f config/archives/extra-ppas.list.chroot \
553+ config/archives/extra-ppas.key.chroot
554+ gpg_tmpdir="$(mktemp -d)"
555+ run_gpg () {
556+ gpg --no-default-keyring --no-options --homedir "$gpg_tmpdir" \
557+ --secret-keyring "$gpg_tmpdir/secring.gpg" \
558+ --keyserver hkp://keyserver.ubuntu.com:80/ \
559+ "$@"
560+ }
561+ for extra_ppa in $EXTRA_PPAS; do
562+ extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
563+ echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot
564+ run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
565+ --recv "$extra_ppa_fingerprint"
566+ run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
567+ --output "$gpg_tmpdir/export.gpg" \
568+ --export "$extra_ppa_fingerprint"
569+ got_fingerprint="$(
570+ run_gpg --keyring "$gpg_tmpdir/export.gpg" \
571+ --fingerprint --batch --with-colons |
572+ grep '^fpr:' | cut -d: -f10)"
573+ if [ "$got_fingerprint" != "$extra_ppa_fingerprint" ]; then
574+ echo "Fingerprints do not match. Got:" >&2
575+ echo "$got_fingerprint" | sed 's/^/ /' >&2
576+ echo "Expected:" >&2
577+ echo " $extra_ppa_fingerprint" >&2
578+ exit 1
579+ fi
580+ cat "$gpg_tmpdir/export.gpg" >> config/archives/extra-ppas.key.chroot
581+ rm -f "$gpg_tmpdir/export.gpg"
582+ done
583+ rm -rf "$gpg_tmpdir"
584+ cp -a config/archives/extra-ppas.list.chroot \
585+ config/archives/extra-ppas.list.binary
586+ cp -a config/archives/extra-ppas.key.chroot \
587+ config/archives/extra-ppas.key.binary
588+fi
589+
590+>>>>>>> MERGE-SOURCE
591 # cribbed from cdimage, perhaps this should be a small helper script in germinate?
592 add_inheritance () {
593 case " $inherit " in

Subscribers

People subscribed via source and target branches