From 956a9696bbcc0447ed63205a42e6179609195fc8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 16 Sep 2016 09:12:12 +0200
Subject: [PATCH] net/intel-em: transition driver to be compatible with 16.7.x

This would require -devel bits, which API will change again,
but we can make the driver plugin fully compatible in the way
that the core package registers its loader.conf values.
---
 net/intel-em-kmod/+POST_DEINSTALL                        | 2 --
 net/intel-em-kmod/+POST_INSTALL                          | 2 --
 net/intel-em-kmod/Makefile                               | 7 -------
 net/intel-em-kmod/src/etc/rc.loader.d/if_em_updated_load | 1 -
 net/intel-em/+POST_INSTALL                               | 6 ++++++
 net/intel-em/+PRE_DEINSTALL                              | 5 +++++
 net/intel-em/Makefile                                    | 7 +++++++
 7 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 net/intel-em-kmod/+POST_DEINSTALL
 delete mode 100644 net/intel-em-kmod/+POST_INSTALL
 delete mode 100644 net/intel-em-kmod/Makefile
 delete mode 100644 net/intel-em-kmod/src/etc/rc.loader.d/if_em_updated_load
 create mode 100644 net/intel-em/+POST_INSTALL
 create mode 100644 net/intel-em/+PRE_DEINSTALL
 create mode 100644 net/intel-em/Makefile

diff --git a/net/intel-em-kmod/+POST_DEINSTALL b/net/intel-em-kmod/+POST_DEINSTALL
deleted file mode 100644
index 8c691ba7e..000000000
--- a/net/intel-em-kmod/+POST_DEINSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "uninstall loader hook"
-configctl firmware loader update
diff --git a/net/intel-em-kmod/+POST_INSTALL b/net/intel-em-kmod/+POST_INSTALL
deleted file mode 100644
index 4ca7eb048..000000000
--- a/net/intel-em-kmod/+POST_INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "install loader hook"
-configctl firmware loader update
diff --git a/net/intel-em-kmod/Makefile b/net/intel-em-kmod/Makefile
deleted file mode 100644
index d3933c830..000000000
--- a/net/intel-em-kmod/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-PLUGIN_NAME=		intel-em-kmod
-PLUGIN_VERSION=		1.0.1
-PLUGIN_COMMENT=		intel-em-kmod wrapper (please reboot after install/deinstall)
-PLUGIN_DEPENDS=		intel-em-kmod
-PLUGIN_MAINTAINER=	ad@opnsense.org
-
-.include "../../Mk/plugins.mk"
diff --git a/net/intel-em-kmod/src/etc/rc.loader.d/if_em_updated_load b/net/intel-em-kmod/src/etc/rc.loader.d/if_em_updated_load
deleted file mode 100644
index d2bb32345..000000000
--- a/net/intel-em-kmod/src/etc/rc.loader.d/if_em_updated_load
+++ /dev/null
@@ -1 +0,0 @@
-YES
\ No newline at end of file
diff --git a/net/intel-em/+POST_INSTALL b/net/intel-em/+POST_INSTALL
new file mode 100644
index 000000000..4a5bf7b67
--- /dev/null
+++ b/net/intel-em/+POST_INSTALL
@@ -0,0 +1,6 @@
+echo "Updating /boot/loader.conf"
+touch /boot/loader.conf
+cp /boot/loader.conf /boot/loader.conf.bak
+(grep -v if_em_updated_load /boot/loader.conf.bak; \
+    echo 'if_em_updated_load="YES"') > /boot/loader.conf
+rm -f /boot/loader.conf.bak
diff --git a/net/intel-em/+PRE_DEINSTALL b/net/intel-em/+PRE_DEINSTALL
new file mode 100644
index 000000000..7f4e685c8
--- /dev/null
+++ b/net/intel-em/+PRE_DEINSTALL
@@ -0,0 +1,5 @@
+echo "Updating /boot/loader.conf"
+touch /boot/loader.conf
+cp /boot/loader.conf /boot/loader.conf.bak
+(grep -v if_em_updated_load /boot/loader.conf.bak) > /boot/loader.conf
+rm -f /boot/loader.conf.bak
diff --git a/net/intel-em/Makefile b/net/intel-em/Makefile
new file mode 100644
index 000000000..4e2444a5b
--- /dev/null
+++ b/net/intel-em/Makefile
@@ -0,0 +1,7 @@
+PLUGIN_NAME=		intel-em
+PLUGIN_VERSION=		1.1
+PLUGIN_COMMENT=		Intel Gigabit Base Driver wrapper (requires reboot after install/deinstall)
+PLUGIN_DEPENDS=		intel-em-kmod
+PLUGIN_MAINTAINER=	ad@opnsense.org
+
+.include "../../Mk/plugins.mk"