Install udev rules to udevdir as defined by udev.pc pkg-config file instead of /etc/udev which is reserved for user defined rules.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

2 files changed, 90 insertions, 1 deletions

diff --git a/app-crypt/tpm-emulator/ChangeLog b/app-crypt/tpm-emulator/ChangeLog
index 06b513c35138..f719738aa805 100644
--- a/app-crypt/tpm-emulator/ChangeLog
+++ b/app-crypt/tpm-emulator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/tpm-emulator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.13 2012/05/31 03:31:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.14 2012/08/11 16:43:01 ssuominen Exp $
+
+*tpm-emulator-0.5.1-r1 (11 Aug 2012)
+
+  11 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +tpm-emulator-0.5.1-r1.ebuild:
+  Install udev rules to udevdir as defined by udev.pc pkg-config file instead
+  of /etc/udev which is reserved for user defined rules.
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> tpm-emulator-0.5.1.ebuild,
   tpm-emulator-0.5.ebuild:
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..546bc8e6054f
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild,v 1.1 2012/08/11 16:43:01 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs linux-mod eutils multilib user
+
+MY_P=${P/-/_}
+DESCRIPTION="Emulator driver for tpm"
+HOMEPAGE="https://developer.berlios.de/projects/tpm-emulator"
+
+SRC_URI="mirror://berlios/tpm-emulator/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="modules"
+DEPEND="dev-libs/gmp
+	virtual/pkgconfig"
+RDEPEND=""
+S=${WORKDIR}/${P/-/_}
+
+#fixups at:
+#https://developer.berlios.de/feature/index.php?func=detailfeature&feature_id=3304&group_id=2491
+
+pkg_setup() {
+	use modules && linux-mod_pkg_setup
+	MODULE_NAMES="tpmd_dev(crypt::${S}/tpmd_dev)"
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="CC=$(tc-getCC)"
+	enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_prepare() {
+	sed -i 's/LDFLAGS :=/override LDFLAGS +=/g' tpmd/Makefile
+	sed -i 's#/var/tpm#/var/run/tpm#g' tpmd/tpmd.c tddl/tddl.c tpmd_dev/tpmd_dev.c
+
+	# use kernel object directory found by linux-info getversion() (bug 241956)
+	sed -i 's#/lib/modules/\$(KERNEL_RELEASE)/build#'"${KV_OUT_DIR}#" tpmd_dev/Makefile
+
+	# reorder -lgmp so --as-needed works (bug 264073)
+	sed -i 's/LDFLAGS/LDLIBS/' tpmd/Makefile
+
+	# fix parallel make
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+}
+
+src_compile() {
+	emake user || die "Failed to build userspace"
+	if use modules; then
+		linux-mod_src_compile || die "Failed to build kernelspace"
+	fi
+}
+
+src_install() {
+	if [ -x /usr/bin/scanelf -a -f tpm_emulator.ko ]; then
+		[ -z "$(/usr/bin/scanelf -qs __guard tpm_emulator.ko)" ] || \
+			die 'cannot have gmp compiled with hardened flags'
+		[ -z "$(/usr/bin/scanelf -qs __stack_smash_handler tpm_emulator.ko)" ] || \
+			die 'cannot have gmp compiled with hardened flags'
+	fi
+
+	use modules && linux-mod_src_install
+	dodoc README
+
+	emake user_install DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" \
+		|| die "Failed to install userspace"
+
+	newinitd "${FILESDIR}"/${PN}.initd-0.5.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-0.5.1 ${PN}
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	insinto "${udevdir}"/rules.d
+	newins "${FILESDIR}"/${PN}.udev 60-${PN}.rules
+
+	keepdir /var/run/tpm
+	fowners tss /var/run/tpm
+
+	keepdir /var/log/tpm
+	fowners tss:tss /var/log/tpm
+}