Revert "tpm2-abrmd: move tpm2-abrmd.default to tpm2-abrmd.inc"

This reverts commit 0bb383b60a.
This commit is contained in:
Trevor Woerner
2018-06-25 13:51:14 -04:00
committed by Jia Zhang
parent 1812c8755b
commit ce1bb2fa28
5 changed files with 18 additions and 9 deletions
@@ -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"
}
@@ -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"
}
@@ -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"