From ce1bb2fa28bd8730c70dfe4352e7070c40b28e5e Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Mon, 25 Jun 2018 13:51:14 -0400
Subject: Revert "tpm2-abrmd: move tpm2-abrmd.default to tpm2-abrmd.inc"

This reverts commit 0bb383b60a8f61df2c4e078d34294e5ef996445b.
---
 meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default        | 1 +
 meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default    | 1 +
 .../recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default   | 1 -
 .../recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default     | 1 -
 meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc                  | 9 ---------
 meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb             | 9 +++++++++
 meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb               | 9 +++++++++
 7 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
 create mode 100644 meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default
 delete mode 100644 meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default
 delete mode 100644 meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default

diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
new file mode 100644
index 0000000..987978a
--- /dev/null
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
@@ -0,0 +1 @@
+DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans"
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default
new file mode 100644
index 0000000..08dd111
--- /dev/null
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default
@@ -0,0 +1 @@
+DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20"
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default
deleted file mode 100644
index 987978a..0000000
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default
+++ /dev/null
@@ -1 +0,0 @@
-DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans"
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default
deleted file mode 100644
index 08dd111..0000000
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default
+++ /dev/null
@@ -1 +0,0 @@
-DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20"
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
index 5ce5cf3..037151e 100644
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
@@ -11,7 +11,6 @@ DEPENDS += "autoconf-archive-native dbus glib-2.0 glib-2.0-native"
 
 SRC_URI = "\
     file://tpm2-abrmd-init.sh \
-    file://tpm2-abrmd.default \
 "
 
 inherit autotools pkgconfig systemd update-rc.d useradd
@@ -37,11 +36,3 @@ FILES_${PN} += "\
     ${systemd_unitdir}/system-preset \
     ${datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service \
 "
-
-do_install_append() {
-    install -d "${D}${sysconfdir}/init.d"
-    install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
-
-    install -d "${D}${sysconfdir}/default"
-    install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
-}
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb
index 4c5f727..6cdf373 100644
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.3.1.bb
@@ -4,6 +4,15 @@ DEPENDS += "libtctidevice libtctisocket libtss2"
 
 SRC_URI += " \
     https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
+    file://tpm2-abrmd.default \
 "
 SRC_URI[md5sum] = "3f5f2461fd98aca0add1187e4705c0de"
 SRC_URI[sha256sum] = "859d777a0d2c5d78309c4a2f06879a1e914b41324ea8258920a778a1ad7e38ea"
+
+do_install_append() {
+    install -d "${D}${sysconfdir}/init.d"
+    install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
+
+    install -d "${D}${sysconfdir}/default"
+    install -m 0644 "${WORKDIR}/tpm2-abrmd.default" "${D}${sysconfdir}/default/tpm2-abrmd"
+}
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb
index bcac1a1..22d1d45 100644
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb
@@ -9,6 +9,7 @@ PV = "${PVBASE}.${SRCPV}"
 
 SRC_URI += " \
     git://github.com/01org/${BPN}.git;protocol=git;branch=master;name=${BPN};destsuffix=${BPN} \
+    file://tpm2-abrmd_git.default \
     "
 
 SRCREV = "${AUTOREV}"
@@ -23,4 +24,12 @@ do_configure_prepend () {
     cd "${currentdir}"
 }
 
+do_install_append() {
+    install -d "${D}${sysconfdir}/init.d"
+    install -m 0755 "${WORKDIR}/tpm2-abrmd-init.sh" "${D}${sysconfdir}/init.d/tpm2-abrmd"
+
+    install -d "${D}${sysconfdir}/default"
+    install -m 0644 "${WORKDIR}/tpm2-abrmd_git.default" "${D}${sysconfdir}/default/tpm2-abrmd"
+}
+
 RDEPENDS_${PN} += "tpm2-tss"
-- 
cgit v1.2.3-54-g00ecf