dnssec: remove target.mak option, and enable it (with OpenSSL support…

…) in config_base
RMerl · Jul 11, 2019 · 31f7395 · 31f7395
1 parent 43d4d7a
commit 31f7395
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/release/src-rt/Makefile b/release/src-rt/Makefile
@@ -2482,10 +2482,6 @@ define RouterOptions
 		sed -i "/RTCONFIG_IGD2/d" $(1); \
 		echo "RTCONFIG_IGD2=y" >>$(1); \
 	fi; \
-	if [ "$(DNSSEC)" = "y" ]; then \
-		sed -i "/RTCONFIG_DNSSEC\b/d" $(1); \
-		echo "RTCONFIG_DNSSEC=y" >>$(1); \
-	fi; \
 	if [ "$(MERLINUPDATE)" = "y" ]; then\
 		sed -i "/RTCONFIG_MERLINUPDATE/d" $(1); \
 		echo "RTCONFIG_MERLINUPDATE=y" >>$(1); \

diff --git a/release/src-rt/target.mak b/release/src-rt/target.mak
@@ -14,7 +14,7 @@ export RT-AC56U := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y USBEXT
 		BCM5301X_TRAFFIC_MONITOR=n CLOUDCHECK=y REBOOT_SCHEDULE=y DPSTA=y \
 		LETSENCRYPT=y NATNL_AIHOME=y \
 		TFAT=y HFS="tuxera" NTFS="tuxera" REPEATER=y DUALWAN=y DNSFILTER=y UPNPIGD2=n \
-		DNSSEC=y NANO=y OPENSSL11=y NTPD=y
+		NANO=y OPENSSL11=y NTPD=y
 
 export RT-AC68U_BASE := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y \
 			SAMBA3=3.6.x MEDIASRV=y MODEM=y PARENTAL2=y ACCEL_PPTPD=y PRINTER=y STAINFO=y \
@@ -29,7 +29,7 @@ export RT-AC68U_BASE := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y U
 			BCM5301X_TRAFFIC_MONITOR=y CLOUDCHECK=y REBOOT_SCHEDULE=y DPSTA=y \
 			AMAS=y DBLOG=y ETHOBD=y \
 			TFAT=y HFS="tuxera" NTFS="tuxera" REPEATER=y DUALWAN=y DNSFILTER=y UPNPIGD2=n \
-			DNSSEC=y NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y NETOOL=y TRACEROUTE=n
+			NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y NETOOL=y TRACEROUTE=n
 
 export RT-AC68U := $(RT-AC68U_BASE) FAKEHDR=y FORCE_SN=384 FORCE_EN=20000
 export RT-AC68U += BUILD_NAME="RT-AC68U" NEWSSID_REV2=y LETSENCRYPT=y UTF8_SSID=y
@@ -49,7 +49,7 @@ export RT-AC87U := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y USBEXT
 		AMAS=n DBLOG=n LETSENCRYPT=y WPS_DUALBAND=y UTF8_SSID=y \
 		NETOOL=y TRACEROUTE=n \
 		TFAT=y HFS="tuxera" NTFS="tuxera" REPEATER=y DUALWAN=y DNSFILTER=y UPNPIGD2=n \
-		DNSSEC=y NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y
+		NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y
 
 
 #
@@ -71,7 +71,7 @@ export RT-AC86U += BUILD_NAME="RT-AC86U" NVSIZE="128" DHDAP=y DPSTA=y LACP=n WTF
 				HD_SPINDOWN=y SW_HW_AUTH=y NATNL_AIHOME=y ASPMD=n BCM_MEVENT=y \
 				IPSEC=STRONGSWAN IPSEC_SRVCLI_ONLY=SRV DFS_US=y \
 				BCMEVENTD=y BCM_APPEVENTD=y JFFS_NVRAM=y IFTTT=n ALEXA=n LETSENCRYPT=y \
-				VISUALIZATION=y NFS=y DNSFILTER=y SNMPD=n TOR=y UPNPIGD2=n DNSSEC=y NANO=y OPENSSL11=y \
+				VISUALIZATION=y NFS=y DNSFILTER=y SNMPD=n TOR=y UPNPIGD2=n NANO=y OPENSSL11=y \
 				NTPD=y DNSPRIVACY=y
 
 #
@@ -89,7 +89,7 @@ export RT-AC3200 := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y USBEX
 		REBOOT_SCHEDULE=y MULTICASTIPTV=y QUAGGA=y LAN50=y ATCOVER=y GETREALIP=y UTF8_SSID=y \
 		NOTIFICATION_CENTER=y HD_SPINDOWN=y SW_HW_AUTH=y NATNL_AIHOME=y DBLOG=y LETSENCRYPT=y \
 		NETOOL=y TRACEROUTE=n \
-		NFS=y DNSFILTER=y SNMPD=y TOR=y UPNPIGD2=n DNSSEC=y NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y
+		NFS=y DNSFILTER=y SNMPD=y TOR=y UPNPIGD2=n NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y
 
 #
 # Broadcom SDK 7.14 ARM platform
@@ -106,7 +106,7 @@ export RT-AC88U_BASE := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y U
 		BCM_RECVFILE=y TFAT=y NTFS="tuxera" HFS="tuxera" CFEZ=y ERPTEST=n CLOUDCHECK=y \
 		ASPMD=n BCMEVENTD=n WLCLMLOAD=n BCM_MUMIMO=y LAN50=y ATCOVER=y GETREALIP=y \
 		NOTIFICATION_CENTER=y NATNL_AICLOUD=y SYSSTATE=y SMARTSYNCBASE=y NATNL_AIHOME=y \
-		NFS=y DNSFILTER=y SNMPD=y TOR=y UPNPIGD2=n DNSSEC=y NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y \
+		NFS=y DNSFILTER=y SNMPD=y TOR=y UPNPIGD2=n NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y \
 		TRACEROUTE=n
 
 export RT-AC88U := $(RT-AC88U_BASE)

diff --git a/release/src/router/config_base b/release/src/router/config_base
@@ -392,8 +392,8 @@ RTCONFIG_SYSSTATE=y
 # RTCONFIG_NANO is not set
 # RTCONFIG_NFS is not set
 # RTCONFIG_IGD2 is not set
-# RTCONFIG_DNSSEC is not set
-# RTCONFIG_DNSSEC_OPENSSL is not set
+RTCONFIG_DNSSEC=y
+RTCONFIG_DNSSEC_OPENSSL=y
 # RTCONFIG_DNSSEC_NETTLE is not set
 # RTCONFIG_MERLINUPDATE is not set
 # RTCONFIG_DNSFILTER is not set