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

Make the jigdos use the same naming scheme as the isos.

This commit is contained in:
Santiago Garcia Mantinan 2005-05-17 10:10:15 +00:00
parent 8a8cc186cb
commit 4cf8c8ca37
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Makefile
View File

@ -902,40 +902,41 @@ bin-images: ok bin-md5list $(OUT) $(TDIR)/jigdofilelist
cd $$dir/..; \ cd $$dir/..; \
opts=`cat $(BDIR)/$$n.mkisofs_opts`; \ opts=`cat $(BDIR)/$$n.mkisofs_opts`; \
volid=`cat $(BDIR)/$$n.volid`; \ volid=`cat $(BDIR)/$$n.volid`; \
rm -f $(OUT)/$(CODENAME)-$(ARCH)-$$n.raw; \ relname=`echo $(DEBVERSION) | sed -e 's/[. ]//g'`; \
rm -f $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.raw; \
if [ "$(DOJIGDO)" != "0" ]; then \ if [ "$(DOJIGDO)" != "0" ]; then \
$(JIGDOSCRIPT) \ $(JIGDOSCRIPT) \
"debian-`echo $(DEBVERSION) | sed -e 's/[. ]//g'`-$(ARCH)-binary-$$n.iso" \ debian-$$relname-$(ARCH)-binary-$$n.iso \
"`echo "$(JIGDOTEMPLATEURL)" | sed -e 's|%ARCH%|$(ARCH)|g'`$(CODENAME)-$(ARCH)-$$n.template" \ "`echo "$(JIGDOTEMPLATEURL)" | sed -e 's|%ARCH%|$(ARCH)|g'`debian-$$relname-$(ARCH)-binary-$$n.template" \
$(BINDISKINFOND) \ $(BINDISKINFOND) \
> $(TDIR)/$(CODENAME)-$(ARCH).jigdo; \ > $(TDIR)/debian-$$relname-$(ARCH).jigdo; \
fi; \ fi; \
if [ "$(DOJIGDO)" != "2" -o -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \ if [ "$(DOJIGDO)" != "2" -o -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \ $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-$(ARCH)-$$n.raw $$opts CD$$n ; \ -o $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.raw $$opts CD$$n ; \
if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $$n $$dir \ $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $$n $$dir \
$(OUT)/$(CODENAME)-$(ARCH)-$$n.raw; \ $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.raw; \
fi; \ fi; \
if [ "$(DOJIGDO)" != "0" ]; then \ if [ "$(DOJIGDO)" != "0" ]; then \
$(BASEDIR)/tools/jigdo_create "$(OUT)/$(CODENAME)-$(ARCH)-$$n.raw" \ $(BASEDIR)/tools/jigdo_create $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.raw \
"$(OUT)/$(CODENAME)-$(ARCH)-$$n.jigdo" \ $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.jigdo \
"$(OUT)/$(CODENAME)-$(ARCH)-$$n.template" \ $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.template \
"$(TDIR)/$(CODENAME)-$(ARCH).jigdo"; \ $(TDIR)/debian-$$relname-$(ARCH).jigdo; \
fi; \ fi; \
else \ else \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \ $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
$$opts CD$$n \ $$opts CD$$n \
| $(BASEDIR)/tools/jigdo_create "-" \ | $(BASEDIR)/tools/jigdo_create "-" \
"$(OUT)/$(CODENAME)-$(ARCH)-$$n.jigdo" \ $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.jigdo \
"$(OUT)/$(CODENAME)-$(ARCH)-$$n.template" \ $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.template \
"$(TDIR)/$(CODENAME)-$(ARCH).jigdo"; \ $(TDIR)/debian-$$relname-$(ARCH).jigdo; \
fi; \ fi; \
if [ "$(DOJIGDO)" = "2" ]; then \ if [ "$(DOJIGDO)" = "2" ]; then \
rm -f $(OUT)/$(CODENAME)-$(ARCH)-$$n.raw; \ rm -f $(OUT)/debian-$$relname-$(ARCH)-binary-$$n.raw; \
fi; \ fi; \
done done
rm -f "$(TDIR)/$(CODENAME)-$(ARCH).jigdo" rm -f $(TDIR)/debian-$$relname-$(ARCH).jigdo
src-images: ok src-md5list $(OUT) $(TDIR)/jigdofilelist src-images: ok src-md5list $(OUT) $(TDIR)/jigdofilelist
@echo "Generating the source iso images ..." @echo "Generating the source iso images ..."
$(Q)set -e; \ $(Q)set -e; \
@ -947,33 +948,34 @@ src-images: ok src-md5list $(OUT) $(TDIR)/jigdofilelist
cd $$dir/..; \ cd $$dir/..; \
opts=`cat $(SDIR)/$$n.mkisofs_opts`; \ opts=`cat $(SDIR)/$$n.mkisofs_opts`; \
volid=`cat $(SDIR)/$$n.volid`; \ volid=`cat $(SDIR)/$$n.volid`; \
rm -f $(OUT)/$(CODENAME)-src-$$n.raw; \ relname=`echo $(DEBVERSION) | sed -e 's/[. ]//g'`; \
rm -f $(OUT)/debian-$$relname-$(ARCH)-source-$$n.raw; \
if [ "$(DOJIGDO)" != "0" ]; then \ if [ "$(DOJIGDO)" != "0" ]; then \
$(JIGDOSCRIPT) \ $(JIGDOSCRIPT) \
"debian-`echo $(DEBVERSION) | sed -e 's/[. ]//g'`-source-$$n.iso" \ debian-$$relname-source-$$n.iso \
"`echo "$(JIGDOTEMPLATEURL)" | sed -e 's|%ARCH%|$(ARCH)|g'`$(CODENAME)-src-$$n.template" \ "`echo "$(JIGDOTEMPLATEURL)" | sed -e 's|%ARCH%|source|g'`debian-$$relname-source-$$n.template" \
$(SRCDISKINFOND) \ $(SRCDISKINFOND) \
> $(TDIR)/$(CODENAME)-src.jigdo; \ > $(TDIR)/debian-$$relname-source.jigdo; \
fi; \ fi; \
if [ "$(DOJIGDO)" != "2" ]; then \ if [ "$(DOJIGDO)" != "2" ]; then \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \ $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-src-$$n.raw $$opts CD$$n ; \ -o $(OUT)/debian-$$relname-source-$$n.raw $$opts CD$$n ; \
if [ "$(DOJIGDO)" != "0" ]; then \ if [ "$(DOJIGDO)" != "0" ]; then \
$(BASEDIR)/tools/jigdo_create "$(OUT)/$(CODENAME)-src-$$n.raw" \ $(BASEDIR)/tools/jigdo_create $(OUT)/debian-$$relname-source-$$n.raw \
"$(OUT)/$(CODENAME)-src-$$n.jigdo" \ $(OUT)/debian-$$relname-source-$$n.jigdo \
"$(OUT)/$(CODENAME)-src-$$n.template" \ $(OUT)/debian-$$relname-source-$$n.template \
"$(TDIR)/$(CODENAME)-src.jigdo"; \ $(TDIR)/debian-$$relname-source.jigdo; \
fi; \ fi; \
else \ else \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \ $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
$$opts CD$$n \ $$opts CD$$n \
| $(BASEDIR)/tools/jigdo_create "-" \ | $(BASEDIR)/tools/jigdo_create "-" \
"$(OUT)/$(CODENAME)-src-$$n.jigdo" \ $(OUT)/debian-$$relname-source-$$n.jigdo \
"$(OUT)/$(CODENAME)-src-$$n.template" \ $(OUT)/debian-$$relname-source-$$n.template \
"$(TDIR)/$(CODENAME)-src.jigdo"; \ $(TDIR)/debian-$$relname-source.jigdo; \
fi; \ fi; \
done done
rm -f "$(TDIR)/$(CODENAME)-src.jigdo" rm -f $(TDIR)/debian-$$relname-source.jigdo
# Generate the *.list files for the Pseudo Image Kit # Generate the *.list files for the Pseudo Image Kit
pi-makelist: pi-makelist:
@ -989,21 +991,25 @@ bin-image: ok bin-md5list $(OUT)
@echo "Generating the binary iso image n°$(CD) ..." @echo "Generating the binary iso image n°$(CD) ..."
@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false) @test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
set -e; cd $(BDIR); opts=`cat $(CD).mkisofs_opts`; \ set -e; cd $(BDIR); opts=`cat $(CD).mkisofs_opts`; \
volid=`cat $(CD).volid`; rm -f $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \ volid=`cat $(CD).volid`; \
relname=`echo $(DEBVERSION) | sed -e 's/[. ]//g'`; \
rm -f $(OUT)/debian-$$relname-$(ARCH)-binary-$(CD).raw; \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \ $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw $$opts CD$(CD); \ -o $(OUT)/debian-$$relname-$(ARCH)-binary-$(CD).raw $$opts CD$(CD); \
if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \ $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
$(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \ $(OUT)/debian-$$relname-$(ARCH)-binary-$(CD).raw; \
fi fi
src-image: ok src-md5list $(OUT) src-image: ok src-md5list $(OUT)
@echo "Generating the source iso image n°$(CD) ..." @echo "Generating the source iso image n°$(CD) ..."
@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false) @test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
set -e; cd $(SDIR); opts=`cat $(CD).mkisofs_opts`; \ set -e; cd $(SDIR); opts=`cat $(CD).mkisofs_opts`; \
volid=`cat $(CD).volid`; rm -f $(OUT)/$(CODENAME)-src-$(CD).raw; \ volid=`cat $(CD).volid`; \
relname=`echo $(DEBVERSION) | sed -e 's/[. ]//g'`; \
rm -f $(OUT)/debian-$$relname-source-$(CD).raw; \
$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \ $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-o $(OUT)/$(CODENAME)-src-$(CD).raw $$opts CD$(CD) -o $(OUT)/debian-$relname-source-$(CD).raw $$opts CD$(CD)
#Calculate the md5sums for the images (if available), or get from templates #Calculate the md5sums for the images (if available), or get from templates

2
debian/changelog vendored
View File

@ -27,6 +27,8 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
- Add autorun capabilities to i386 cds so that instead of getting the - Add autorun capabilities to i386 cds so that instead of getting the
"what do you want Windows to do" question under XP, we get the html "what do you want Windows to do" question under XP, we get the html
README started. README started.
- Make the jigdos use the same naming scheme as the isos, as per my
proposal to the list.
-- Joey Hess <joeyh@debian.org> Thu, 14 Apr 2005 00:59:49 -0400 -- Joey Hess <joeyh@debian.org> Thu, 14 Apr 2005 00:59:49 -0400