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

Quote the params to make_image to make sure they work...

This commit is contained in:
Steve McIntyre 2005-12-08 23:46:42 +00:00
parent 1f19193d3c
commit 5e16cfe7f9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -875,10 +875,10 @@ images: bin-images src-images
# 2 jigdo, cleanup_jigdo
#
bin-images: ok bin-md5list $(OUT)
$(make_image) $(BDIR) $(ARCH) $(OUT) $(DOJIGDO) $(DEBVERSION) $(MIRROR) $(MKISOFS) $(MKISOFS_OPTS) $(JIGDO_OPTS) $(JIGDO_CLEANUP)
$(make_image) "$(BDIR)" "$(ARCH)" "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"
src-images: ok src-md5list $(OUT)
$(make_image) $(SDIR) source $(OUT) $(DOJIGDO) $(DEBVERSION) $(MIRROR) $(MKISOFS) $(MKISOFS_OPTS) $(JIGDO_OPTS) $(JIGDO_CLEANUP)
$(make_image) "$(SDIR)" source "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"
check-number-given:
@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)

5
tools/make_image
View File

@ -15,7 +15,8 @@ MIRROR=$6
MKISOFS=$7
MKISOFS_OPTS=$8
JIGDO_OPTS=$9
JIGDO_CLEANUP=$10
shift
JIGDO_CLEANUP=$9
if [ "$CD"x = ""x ] ; then
echo "Generating the $ARCH iso/jigdo images ..."
@ -69,7 +70,7 @@ do
2) # jigdo only, no ISO
$MKISOFS $MKISOFS_OPTS -V "$volid" \
-o /dev/null -v \
-o /dev/null \
-jigdo-jigdo $OUT/$OUTFILE.jigdo \
-jigdo-template $OUT/$OUTFILE.template \
-jigdo-map Debian=$MIRROR/ \