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

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: a8b139028ef285bd7b8d7ad7a0f67d233287d282

New changelog entries:
  [ Colin Watson ]
  * Add a basic build-time syntax check for live-build/auto/*.
  [ Oliver Grawert ]
  * add multiverse to sources.list for snappy kernel builds
This commit is contained in:
Oliver Grawert 2016-04-21 10:53:12 +02:00 committed by usd-importer
parent a8b139028e
commit c0750e3a3f
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.407) xenial; urgency=medium
[ Colin Watson ]
* Add a basic build-time syntax check for live-build/auto/*.
[ Oliver Grawert ]
* add multiverse to sources.list for snappy kernel builds
-- Oliver Grawert <ogra@ubuntu.com> Thu, 21 Apr 2016 10:53:12 +0200
livecd-rootfs (2.406) xenial; urgency=medium livecd-rootfs (2.406) xenial; urgency=medium
* Fix syntax error. * Fix syntax error.

6
debian/rules vendored
View File

@ -4,6 +4,12 @@
DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_auto_test:
dh_auto_test
set -e; for x in live-build/auto/*; do \
sh -n "$$x"; \
done
override_dh_install: override_dh_install:
dh_install dh_install
find debian/livecd-rootfs -type f -print0 | \ find debian/livecd-rootfs -type f -print0 | \

4
live-build/auto/config
View File

@ -407,8 +407,8 @@ case $PROJECT in
# contains the framework definition # contains the framework definition
add_package install ubuntu-core-libs add_package install ubuntu-core-libs
# universe needed for 'system-image-cli' # universe needed for 'system-image-cli' and multiverse for firmware
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe multiverse'
fi fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;; ;;