From 9039af3377e2c8b864f4ce3d3f2009daf825b259 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Mon, 11 Sep 2023 14:26:14 +0200 Subject: [PATCH] Drop the build-time configurable Chaosnet address. It was never very usable anyway. --- Makefile | 16 +++------------- build/h3text.2017 | 2 +- build/klh10/config.203 | 4 ---- build/mchn/DB/dskdmp.txt | 1 - conf/network | 4 ---- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 77a854d8..db00f6ab 100644 --- a/Makefile +++ b/Makefile @@ -280,13 +280,9 @@ out/pdp10-ks/stamp/pdp10: $(KS10) start out/klh10/system: $(MKDIR) $(OUT)/system - cp=0; ca=0; \ - $(TEST) $(CHAOS) != no && cp=1 && ca=$(CHAOS); \ x=`echo $(IP) | tr . ,`; \ $(SED) -e "s/%IP%/$$x/" \ - -e 's/%NETMASK%/$(NETMASK)/' \ - -e "s/%CHAOSP%/$$cp/" \ - -e "s/%CHAOSA%/$$ca/" < build/klh10/config.203 > $(OUT)/system/config.203 + -e 's/%NETMASK%/$(NETMASK)/' < build/klh10/config.203 > $(OUT)/system/config.203 out/simh/system: $(MKDIR) $(OUT)/system @@ -306,12 +302,8 @@ out/pdp10-ks/system: out/klh10/dskdmp.ini: build/mchn/$(MCHN)/dskdmp.txt Makefile $(MKDIR) $(OUT)/stamp - cp=';'; ca=''; \ - $(TEST) $(CHAOS) != no && cp='' && ca='myaddr=$(CHAOS) $(CHAFRIENDS)'; \ $(SED) -e 's/%IP%/$(IP)/' \ - -e 's/%GW%/$(GW)/' \ - -e "s/%CHAOSP%/$$cp/" \ - -e "s|%CHAOSA%|$$ca|" < $< > $@ + -e 's/%GW%/$(GW)/' < $< > $@ out/simh/boot: build/mchn/$(MCHN)/boot $(MKDIR) $(OUT)/stamp @@ -323,10 +315,8 @@ out/pdp10-ka/run: build/mchn/$(MCHN)/run $(OUT)/syshst/$(H3TEXT): build/$(H3TEXT) $(MKDIR) $(OUT)/syshst - $(TEST) $(CHAOS) != no && c="CHAOS $(CHAOS), "; \ $(SED) -e 's/%IP%/$(IP)/' \ - -e 's/%HOSTNAME%/$(HOSTNAME)/' \ - -e "s/%CHAOS%/$$c/" < $< > $@ + -e 's/%HOSTNAME%/$(HOSTNAME)/' < $< > $@ $(CAT) conf/hosts >> $@ $(KLH10): diff --git a/build/h3text.2017 b/build/h3text.2017 index 6eabfcf2..b8d4f372 100644 --- a/build/h3text.2017 +++ b/build/h3text.2017 @@ -25,7 +25,7 @@ NET : 172.0.0.0 : B-172 : NET : 192.0.0.0 : C-192 : ;;; Generated by build script. -HOST : %CHAOS%%IP% : %HOSTNAME%, DB : PDP-10 : ITS : : +HOST : %IP% : %HOSTNAME%, DB : PDP-10 : ITS : : ;; Hactrn public ITS. HOST : 205.166.94.7 : HACTRN.ORG, HX : PDP-10 : ITS : : diff --git a/build/klh10/config.203 b/build/klh10/config.203 index bc6922c9..278dab5a 100644 --- a/build/klh10/config.203 +++ b/build/klh10/config.203 @@ -993,10 +993,6 @@ DEFOPT IMPUS==100. ; IMP net host number (old-style) (100 octal) DEFOPT IMPUS3== ; IP address DEFOPT NM%IMP== ; Subnet mask DEFOPT PKTTRC==-1 ;Packet tracing code enabled -DEFOPT CHAOSP==%CHAOSP% ;Has CHAOS net -DEFOPT MYCHAD==%CHAOSA% ;CHAOS net address -DEFOPT NINDX==50. ;Number of indices -DEFOPT CH11P==%CHAOSP% ;CHAOS net goes through Unibus DEFINE ITSIRP BODY IRPS ITS,,[DB ES NO SJ UP] diff --git a/build/mchn/DB/dskdmp.txt b/build/mchn/DB/dskdmp.txt index db19c700..6304a2e0 100644 --- a/build/mchn/DB/dskdmp.txt +++ b/build/mchn/DB/dskdmp.txt @@ -20,7 +20,6 @@ devdef imp ub3 lhdh addr=767600 br=6 vec=250 ipaddr=%IP% gwaddr=%GW% ; Dummy definitions. Only one DZ is still (apparently) needed. devdef dz0 ub3 dz11 addr=760010 br=5 vec=340 ;devdef dz1 ub3 dz11 addr=760020 br=5 vec=350 -%CHAOSP%devdef chaos ub3 ch11 addr=764140 br=6 vec=270 %CHAOSA% ; Define new HOST device hackery devdef idler ub3 host addr=777000 diff --git a/conf/network b/conf/network index cd862fad..99c18d98 100644 --- a/conf/network +++ b/conf/network @@ -4,7 +4,3 @@ HOSTNAME=DB-ITS.EXAMPLE.COM IP=192.168.1.100 GW=192.168.0.45 NETMASK=255,255,255,248 -CHAOS=no #Or octal Chaosnet address -CHAFRIENDS=chip=3150/no.nocrew.org \ - chip=3040/router.chaosnet.net \ - chip=7100/sj.gewt.net