* 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:
parent
f808c28d9a
commit
39ae9a2797
12
build.sh
12
build.sh
|
@ -70,11 +70,13 @@ make $LISTTARGET $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
|
||||||
|
|
||||||
echo " ... building the images"
|
echo " ... building the images"
|
||||||
# Setting IMAGETARGET directly is deprecated; NOSOURCE is preferred
|
# Setting IMAGETARGET directly is deprecated; NOSOURCE is preferred
|
||||||
if [ -n "$NOSOURCE" ] ; then
|
if [ -z "$INAGETARGET" ]; then
|
||||||
IMAGETARGET="bin-official_images"
|
if [ -n "$NOSOURCE" ] ; then
|
||||||
fi
|
IMAGETARGET="bin-official_images"
|
||||||
if [ -z "$IMAGETARGET" ] ; then
|
fi
|
||||||
IMAGETARGET="official_images"
|
if [ -z "$IMAGETARGET" ] ; then
|
||||||
|
IMAGETARGET="official_images"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
make $IMAGETARGET
|
make $IMAGETARGET
|
||||||
|
|
||||||
|
|
|
@ -90,8 +90,10 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
|
||||||
[ Joey Hess ]
|
[ Joey Hess ]
|
||||||
* Add a temporary hack in Debian_etch-kde to use sid d-i, to get a fixed
|
* Add a temporary hack in Debian_etch-kde to use sid d-i, to get a fixed
|
||||||
preseed that supports preseeding of tasks.
|
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
|
debian-cd (2.2.25) unstable; urgency=low
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue