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

First batch of obvious changes - use better shellism, only call make (without make install).

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2018-11-21 20:22:38 +01:00
parent a3a9b2ab60
commit 2947cdbe60
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live-build/auto/build
View File

@ -32,10 +32,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
mv seed.manifest "$PREFIX".manifest mv seed.manifest "$PREFIX".manifest
else else
# First we need to build the gadget tree # First we need to build the gadget tree
( make -C "config/$PREFIX-gadget"
cd config/$PREFIX-gadget
make && make install
)
ubuntu-image classic $UBUNTU_IMAGE_ARGS \ ubuntu-image classic $UBUNTU_IMAGE_ARGS \
-p $PROJECT -a $ARCH --subarch $SUBARCH \ -p $PROJECT -a $ARCH --subarch $SUBARCH \
-o "$PREFIX".img config/$PREFIX-gadget/install -o "$PREFIX".img config/$PREFIX-gadget/install

8
live-build/auto/config
View File

@ -218,12 +218,8 @@ case $IMAGEFORMAT in
# classic images # classic images
UBUNTU_IMAGE_ARGS="" UBUNTU_IMAGE_ARGS=""
if [ "$PROPOSED" ]; then UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --with-proposed" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"
fi
if [ "$EXTRA_PPAS" ]; then
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-ppas \"$EXTRA_PPAS\""
fi
git clone lp:~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget git clone lp:~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget