Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* build.sh: Don't force IMAGETARGET to bin-official_images when NOSOURCE 

is set, if IMAGETARGET is also already set, as in a kde cd build.
This commit is contained in:
Joey Hess 2006-11-29 22:57:52 +00:00
parent f808c28d9a
commit 39ae9a2797
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -70,11 +70,13 @@ make $LISTTARGET $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
echo " ... building the images"
# Setting IMAGETARGET directly is deprecated; NOSOURCE is preferred
if [ -n "$NOSOURCE" ] ; then
IMAGETARGET="bin-official_images"
fi
if [ -z "$IMAGETARGET" ] ; then
IMAGETARGET="official_images"
if [ -z "$INAGETARGET" ]; then
if [ -n "$NOSOURCE" ] ; then
IMAGETARGET="bin-official_images"
fi
if [ -z "$IMAGETARGET" ] ; then
IMAGETARGET="official_images"
fi
fi
make $IMAGETARGET

4
debian/changelog vendored
View File

@ -90,8 +90,10 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
[ Joey Hess ]
* Add a temporary hack in Debian_etch-kde to use sid d-i, to get a fixed
preseed that supports preseeding of tasks.
* build.sh: Don't force IMAGETARGET to bin-official_images when NOSOURCE
is set, if IMAGETARGET is also already set, as in a kde cd build.
-- Joey Hess <joeyh@debian.org> Wed, 29 Nov 2006 16:24:30 -0500
-- Joey Hess <joeyh@debian.org> Wed, 29 Nov 2006 17:56:56 -0500
debian-cd (2.2.25) unstable; urgency=low