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

Fix buildd images for series earlier than bionic

Browse Source 
Don't install gpg or gpg-agent when building buildd images for series
earlier than bionic.  (In earlier series, those packages didn't exist
and gnupg was build-essential.)
This commit is contained in:
Colin Watson 2019-01-16 12:39:21 +00:00
parent 48f98803bd
commit 2b15590f3b
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.557) UNRELEASED; urgency=medium
* Don't install gpg or gpg-agent when building buildd images for series
earlier than bionic. (In earlier series, those packages didn't exist
and gnupg was build-essential.)
-- Colin Watson <cjwatson@ubuntu.com> Wed, 16 Jan 2019 12:36:48 +0000
livecd-rootfs (2.556) disco; urgency=medium
* Add wpasupplicant to the additional packages installed for the raspi2 and

11
live-build/auto/config
View File

@ -686,8 +686,15 @@ case $SUBPROJECT in
add_package install policyrcd-script-zg2
add_package install pkgbinarymangler
add_package install ca-certificates
add_package install gpg
add_package install gpg-agent
case $SUITE in
precise|trusty|xenial)
;;
*)
# only needed in >= bionic
add_package install gpg
add_package install gpg-agent
;;
esac
case $SUITE in
precise|trusty|xenial)
# no longer needed in >= artful