Fix the "shortinfo" output in jigdo files
This commit is contained in:
parent
8561aff963
commit
773b972935
2
Makefile
2
Makefile
|
@ -442,6 +442,7 @@ $(BDIR)/CD1/.disk/info:
|
|||
num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
|
||||
dir=$(BDIR)/CD$$num; \
|
||||
echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
|
||||
echo -n $(BINDISKINFOND) | sed 's/_NONUS//g' > $(BDIR)/$$num.diskinfo; \
|
||||
echo '#define DISKNAME ' $(BINDISKINFOND) | sed 's/_NONUS//g' \
|
||||
> $$dir/README.diskdefines; \
|
||||
echo '#define TYPE binary' \
|
||||
|
@ -473,6 +474,7 @@ $(SDIR)/CD1/.disk/info:
|
|||
num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
|
||||
dir=$(SDIR)/CD$$num; \
|
||||
echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
|
||||
echo -n $(SRCDISKINFOND) | sed 's/_NONUS//g' > $(SDIR)/$$num.diskinfo; \
|
||||
echo '#define DISKNAME ' $(SRCDISKINFOND) | sed 's/_NONUS//g' \
|
||||
> $$dir/README.diskdefines; \
|
||||
echo '#define TYPE source' \
|
||||
|
|
|
@ -38,6 +38,7 @@ do
|
|||
opts=`cat $DIR/$n.mkisofs_opts`
|
||||
volid=`cat $DIR/$n.volid`
|
||||
relname=`echo $DEBVERSION | sed -e 's/[. ]//g'`
|
||||
DISKINFO=`cat $DIR/$n.diskinfo`
|
||||
|
||||
if [ $ARCH = "source" ] ; then
|
||||
OUTFILE="debian-$relname-$ARCH-$n"
|
||||
|
@ -104,7 +105,7 @@ do
|
|||
$JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \
|
||||
$OUTFILE.iso $DIR/CD$n \
|
||||
"`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \
|
||||
$BINDISKINFOND \
|
||||
"$DISKINFO" \
|
||||
$JIGDOFALLBACKURLS
|
||||
fi
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue