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

Fix the "shortinfo" output in jigdo files

This commit is contained in:
Steve McIntyre 2005-12-18 19:34:35 +00:00
parent 8561aff963
commit 773b972935
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -442,6 +442,7 @@ $(BDIR)/CD1/.disk/info:
num=$${i%%.packages}; num=$${num##$(BDIR)/}; \ num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
dir=$(BDIR)/CD$$num; \ dir=$(BDIR)/CD$$num; \
echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \ 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' \ echo '#define DISKNAME ' $(BINDISKINFOND) | sed 's/_NONUS//g' \
> $$dir/README.diskdefines; \ > $$dir/README.diskdefines; \
echo '#define TYPE binary' \ echo '#define TYPE binary' \
@ -473,6 +474,7 @@ $(SDIR)/CD1/.disk/info:
num=$${i%%.sources}; num=$${num##$(SDIR)/}; \ num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
dir=$(SDIR)/CD$$num; \ dir=$(SDIR)/CD$$num; \
echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \ 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' \ echo '#define DISKNAME ' $(SRCDISKINFOND) | sed 's/_NONUS//g' \
> $$dir/README.diskdefines; \ > $$dir/README.diskdefines; \
echo '#define TYPE source' \ echo '#define TYPE source' \

3
tools/make_image
View File

@ -38,6 +38,7 @@ do
opts=`cat $DIR/$n.mkisofs_opts` opts=`cat $DIR/$n.mkisofs_opts`
volid=`cat $DIR/$n.volid` volid=`cat $DIR/$n.volid`
relname=`echo $DEBVERSION | sed -e 's/[. ]//g'` relname=`echo $DEBVERSION | sed -e 's/[. ]//g'`
DISKINFO=`cat $DIR/$n.diskinfo`
if [ $ARCH = "source" ] ; then if [ $ARCH = "source" ] ; then
OUTFILE="debian-$relname-$ARCH-$n" OUTFILE="debian-$relname-$ARCH-$n"
@ -104,7 +105,7 @@ do
$JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \ $JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \
$OUTFILE.iso $DIR/CD$n \ $OUTFILE.iso $DIR/CD$n \
"`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \ "`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \
$BINDISKINFOND \ "$DISKINFO" \
$JIGDOFALLBACKURLS $JIGDOFALLBACKURLS
fi fi
done done