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

fix some typo and take colin's feedback into account

Browse Source
This commit is contained in:
Didier Roche 2015-04-22 14:13:37 +01:00
parent 7af419aa63
commit db631a4d2f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
live-build/auto/build
View File

@ -332,7 +332,8 @@ fi
# ubuntu-core and ubuntu-desktop-next splits kernel stuff into a "device" tarball so # ubuntu-core and ubuntu-desktop-next splits kernel stuff into a "device" tarball so
# at this point we reset it to "none" as all the work to extract it was done already # at this point we reset it to "none" as all the work to extract it was done already
# in a binary hook # in a binary hook
if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then case $PROJECT:$SUBPROJECT in
ubuntu-core:system-image|ubuntu-desktop-next:system-image)
LB_LINUX_FLAVOURS=none LB_LINUX_FLAVOURS=none
# rename to have the right prefix etc # rename to have the right prefix etc
@ -342,7 +343,9 @@ if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then
if [ -e device-azure.tar.gz ]; then if [ -e device-azure.tar.gz ]; then
mv device-azure.tar.gz "$PREFIX.azure.device.tar.gz" mv device-azure.tar.gz "$PREFIX.azure.device.tar.gz"
fi fi
fi ;;
esac
if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then
LB_LINUX_FLAVOURS=none LB_LINUX_FLAVOURS=none

5
live-build/auto/config
View File

@ -162,7 +162,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
ubuntu-server) ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf add_package live oem-config-debconf ubiquity-frontend-debconf
;; ;;
ubuntu-core|base|ubuntu-touch|ubuntu-cpc|ubuntu-deskop-next) ubuntu-core|base|ubuntu-touch|ubuntu-cpc|ubuntu-desktop-next)
;; ;;
*) *)
add_package live oem-config-gtk ubiquity-frontend-gtk add_package live oem-config-gtk ubiquity-frontend-gtk
@ -218,9 +218,6 @@ case $PROJECT in
# we use SUBPROJECT to pass on the information # we use SUBPROJECT to pass on the information
if [ "$SUBPROJECT" = "system-image" ]; then if [ "$SUBPROJECT" = "system-image" ]; then
OPTS="${OPTS:+$OPTS }--linux-packages=linux-image" OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
# universe needed for 'system-image-cli'
COMPONENTS='main restricted universe'
fi fi
;; ;;