X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=Makefile;h=21ea5a59858adb9e711db5b3830a6ce2477a045d;hb=f5f2b8a06300ad05c882d2db9fbcfab2dad7fa06;hp=2c2a28ac3c0ced5afc272f4649fb485c957a8ad1;hpb=4ec55a784b05179a73f7666e41d91fd6662122ef;p=debian6500.git

diff --git a/Makefile b/Makefile
index 2c2a28a..21ea5a5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@ SHELL=/bin/bash
 
 MASTERFILE = trc6500-master-file
 
-VERSION = $(shell awk '/^$(MASTERFILE)/ {gsub(/[()]/, ""); print $$2; exit}' $(MASTERFILE)/debian/debian-changelog)
+VERSION = $(shell awk '/^$(MASTERFILE)/ {gsub(/[()]/, ""); print $$2; exit}' $(MASTERFILE)/changelog)
 
 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
 
@@ -20,12 +20,17 @@ $(TARGET_ISO): $(ISO)
 	mv $< $@
 
 $(ISO): $(TARGET_DEB)
-	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)
 
 clean:
 	rm -f $(TARGET_DEB) $(TARGET_ISO)
+
+version:
+	echo $(VERSION) $(ISOVER)
+.PHONY: $(TARGET_DEB)