From 0bb383b60a8f61df2c4e078d34294e5ef996445b Mon Sep 17 00:00:00 2001
From: Jia Zhang <zhang.jia@linux.alibaba.com>
Date: Sat, 16 Jun 2018 04:57:42 -0400
Subject: [PATCH] tpm2-abrmd: move tpm2-abrmd.default to tpm2-abrmd.inc

Use separate directories to store tpm2-abrmd.default for stable
and git version.

Signed-off-by: Jia Zhang <zhang.jia@linux.alibaba.com>
---
 .../{files => tpm2-abrmd-1.3.1}/tpm2-abrmd.default       | 0
 .../tpm2-abrmd.default}                                  | 0
 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 ---------
 5 files changed, 9 insertions(+), 18 deletions(-)
 rename meta-tpm2/recipes-tpm/tpm2-abrmd/{files => tpm2-abrmd-1.3.1}/tpm2-abrmd.default (100%)
 rename meta-tpm2/recipes-tpm/tpm2-abrmd/{files/tpm2-abrmd_git.default => tpm2-abrmd-git/tpm2-abrmd.default} (100%)

diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default
similarity index 100%
rename from meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
rename to meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-1.3.1/tpm2-abrmd.default
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default
similarity index 100%
rename from meta-tpm2/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd_git.default
rename to meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd-git/tpm2-abrmd.default
diff --git a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
index 037151e..5ce5cf3 100644
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd.inc
@@ -11,6 +11,7 @@ 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
@@ -36,3 +37,11 @@ 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 6cdf373..4c5f727 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,15 +4,6 @@ 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 22d1d45..bcac1a1 100644
--- a/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb
+++ b/meta-tpm2/recipes-tpm/tpm2-abrmd/tpm2-abrmd_git.bb
@@ -9,7 +9,6 @@ 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}"
@@ -24,12 +23,4 @@ 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"