X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=Makefile;h=c9dbc382c0b43849f82b535d9f386e95ed9772a1;hb=HEAD;hp=a8bf4dbde8c2498fbddb4722cb5f9453f9250fd7;hpb=dfedbf47d0c0752709c19bdf690bcba59e63e3d5;p=debian6500.git

diff --git a/Makefile b/Makefile
index a8bf4db..c9dbc38 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,13 @@ VERSION = $(shell awk '/^$(MASTERFILE)/ {gsub(/[()]/, ""); print $$2; exit}' $(M
 
 ISOVER = $(shell echo $(VERSION) | sed 's/-.*$$//')
 
-ISO = simple-cdd/images/debian-7.8-amd64-CD-1.iso
+ISO = simple-cdd/images/debian-12-amd64-CD-1.iso
 
 TARGET_ISO = debian-trc6500-$(ISOVER).iso
 
 TARGET_DEB = $(MASTERFILE)_$(VERSION)_all.deb
 
-all: iso masterfile
+all: fix_bookworm iso masterfile
 
 iso: $(TARGET_ISO) 
 
@@ -20,14 +20,22 @@ $(TARGET_ISO): $(ISO)
 	mv $< $@
 
 $(ISO): $(TARGET_DEB)
-	echo $(ISOVER) > master/etc/trc6500_os_version
-	cd simple-cdd && build-simple-cdd --dist wheezy --conf ./simple-cdd.conf
+	cd simple-cdd && build-simple-cdd --keyring ~/.gnupg/pubring.gpg --dist bookworm --conf ./simple-cdd.conf
 
 masterfile: $(TARGET_DEB)
 
 $(TARGET_DEB):
+	echo $(ISOVER) > master/etc/trc6500_os_version
 	make -C $(MASTERFILE)
 
+fix_bookworm: simple-cdd/tmp/mirror/dists/bookworm/main/dep11/Components-amd64.yml.gz
+	for key in A7236886F3CCCAAD148A27F80E98404D386FA1D9 4D64FEC119C2029067D6E791F8D2585B8783D481 4CB50190207B4758A3F73A796ED0E7B82643E131 ED541312A33F1128F10B1C6C54404762BBB6E853 B0CAB9266E8C3929798B3EEEBDE6D2B9216EC7A8; do gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys $$key; done
+
+simple-cdd/tmp/mirror/dists/bookworm/main/dep11/Components-amd64.yml.gz:
+	wget ftp://ftp.fr.debian.org/debian/dists/bookworm/main/dep11/`basename $@`
+	mkdir -p `dirname $@`
+	mv `basename $@` $@
+
 clean:
 	rm -f $(TARGET_DEB) $(TARGET_ISO)