From 3ff6c602ab6897ea03091dedf5fed2417a495028 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 14 Jul 2019 18:15:48 +0200
Subject: [PATCH] firmware: track for 20.1 development now

---
 Makefile                      |  2 +-
 plist                         |  2 --
 src/opnsense/firmware-message | 14 --------------
 src/opnsense/firmware-upgrade |  1 -
 4 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 src/opnsense/firmware-message
 delete mode 100644 src/opnsense/firmware-upgrade

diff --git a/Makefile b/Makefile
index 50e8f4e70..3c31628aa 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ CORE_PKGVERSION=	${CORE_VERSION}_${CORE_REVISION}
 CORE_PKGVERSION=	${CORE_VERSION}
 .endif
 
-CORE_ABI?=	19.1
+CORE_ABI?=	19.7
 CORE_ARCH?=	${ARCH}
 CORE_FLAVOUR=	${FLAVOUR}
 CORE_OPENVPN?=	# empty
diff --git a/plist b/plist
index 11b10db95..c8f0f6e31 100644
--- a/plist
+++ b/plist
@@ -308,8 +308,6 @@
 /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist
 /usr/local/opnsense/contrib/tzdata/iso3166.tab
 /usr/local/opnsense/contrib/tzdata/zone.tab
-/usr/local/opnsense/firmware-message
-/usr/local/opnsense/firmware-upgrade
 /usr/local/opnsense/mvc/app/cache/README
 /usr/local/opnsense/mvc/app/config/config.php
 /usr/local/opnsense/mvc/app/config/loader.php
diff --git a/src/opnsense/firmware-message b/src/opnsense/firmware-message
deleted file mode 100644
index b83369e0d..000000000
--- a/src/opnsense/firmware-message
+++ /dev/null
@@ -1,14 +0,0 @@
-<p>OPNsense 19.1 "<em>Inspiring Iguana</em>" has reached its end of life. As such
-it will not receive any more updates, but the upgrade to the new 19.7 series is
-seamless and can be performed right here from the GUI by unlocking it below.</p>
-<p> Another method is to import and reinstall using a new installation image,
-which will retain your settings (selecting "Import Configuration"), then
-reformat the disk and apply a clean system (selecting "Guided Installation").</p>
-<p>You can also upgrade via console / SSH by using option 12 from the menu by
-typing "19.7" when prompted.</p>
-<p>Make sure to read the migration notes and adjust for possible minor breaking
-changes.</p>
-<p>Please backup your configuration, preview the new version via live image or
-in a virtual machine. Create snapshots. If all else fails, report back
-<a href="https://forum.opnsense.org/" target="_blank">in the forums</a> for
-assistance.</p>
diff --git a/src/opnsense/firmware-upgrade b/src/opnsense/firmware-upgrade
deleted file mode 100644
index 4f8ffe3c7..000000000
--- a/src/opnsense/firmware-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-19.7