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

Only add the ubuntu-core hooks for the system-image subproject.

Browse Source
This commit is contained in:
Colin Watson 2014-08-05 08:34:24 +02:00
parent b78c13a8d7
commit 49c93a618b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.235) UNRELEASED; urgency=medium
* Only add the ubuntu-core hooks for the system-image subproject.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 05 Aug 2014 08:34:10 +0200
livecd-rootfs (2.234) utopic; urgency=medium livecd-rootfs (2.234) utopic; urgency=medium
[ James Hunt ] [ James Hunt ]

6
live-build/auto/config
View File

@ -545,8 +545,8 @@ EOF
config/archives/proposed.list.binary config/archives/proposed.list.binary
fi fi
case $PROJECT in case $PROJECT:$SUBPROJECT in
*-dvd) *-dvd:*)
. config/bootstrap . config/bootstrap
cat > config/archives/dvd.list.binary << EOF cat > config/archives/dvd.list.binary << EOF
@ -561,7 +561,7 @@ EOF
fi fi
;; ;;
ubuntu-touch|ubuntu-core) ubuntu-touch:*|ubuntu-core:system-image)
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
config/ config/
;; ;;