From: Alon Bar-Lev Date: Wed, 20 Dec 2006 19:44:13 +0000 (+0000) Subject: fbsd support, closes bug#158647, thanks for Timothy Redaelli X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=746db271869c40be14a28fd3b6267aad16f65f1c;p=gentoo.git fbsd support, closes bug#158647, thanks for Timothy Redaelli Package-Manager: portage-2.1.1-r2 --- diff --git a/sys-fs/dazuko/ChangeLog b/sys-fs/dazuko/ChangeLog index f24c9517944d..6c431cfdbae3 100644 --- a/sys-fs/dazuko/ChangeLog +++ b/sys-fs/dazuko/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/dazuko # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/ChangeLog,v 1.14 2006/12/18 16:49:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/ChangeLog,v 1.15 2006/12/20 19:44:13 alonbl Exp $ + + 20 Dec 2006; Alon Bar-Lev dazuko-2.3.2-r2.ebuild: + fbsd support, closes bug#158647, thanks for Timothy Redaelli 18 Dec 2006; Jeroen Roovers dazuko-2.3.2-r2.ebuild: Marked ~hppa (bug #151630). diff --git a/sys-fs/dazuko/Manifest b/sys-fs/dazuko/Manifest index a7bad32e43a8..f775eb9db2b8 100644 --- a/sys-fs/dazuko/Manifest +++ b/sys-fs/dazuko/Manifest @@ -28,14 +28,14 @@ EBUILD dazuko-2.3.1.ebuild 1094 RMD160 d9f6d0a38c8e0dbbafff3d3414d864fe3c39217d MD5 75cee2dc54b7e1609f3f6433452aa684 dazuko-2.3.1.ebuild 1094 RMD160 d9f6d0a38c8e0dbbafff3d3414d864fe3c39217d dazuko-2.3.1.ebuild 1094 SHA256 7fa71348c942729731e59294353b849da53a9ba5037fd092bb26a26ca6ee7851 dazuko-2.3.1.ebuild 1094 -EBUILD dazuko-2.3.2-r2.ebuild 1340 RMD160 a41706da0658f7c28b863609420509458dd1ac05 SHA1 34f2981fa34e190af5e13c4b8f83e516f2bd3896 SHA256 46bdf1d89fc32cc27dcffd35f8bed40f9f635301b670737d71d0ee7d8e1f6325 -MD5 a88af9103e2d696096c300ef40433298 dazuko-2.3.2-r2.ebuild 1340 -RMD160 a41706da0658f7c28b863609420509458dd1ac05 dazuko-2.3.2-r2.ebuild 1340 -SHA256 46bdf1d89fc32cc27dcffd35f8bed40f9f635301b670737d71d0ee7d8e1f6325 dazuko-2.3.2-r2.ebuild 1340 -MISC ChangeLog 2045 RMD160 4fc44699c68c1b1a6adac846a608ba10a06ca3ea SHA1 54970fcad7b2892a8ca94ce41e7780d5fcb7f3cc SHA256 e838de4fa20b37bf603494304e8f47548ab9859c9cf214bb20662ebabdc703d5 -MD5 6be6d8b80a407fd2947cdf82a320f836 ChangeLog 2045 -RMD160 4fc44699c68c1b1a6adac846a608ba10a06ca3ea ChangeLog 2045 -SHA256 e838de4fa20b37bf603494304e8f47548ab9859c9cf214bb20662ebabdc703d5 ChangeLog 2045 +EBUILD dazuko-2.3.2-r2.ebuild 2044 RMD160 740c777b289c54764b041534af35db638c245961 SHA1 a81bb3eae14f838ea606119d550423daa02969e9 SHA256 56aed597be4bd28492749378d61a8f7b41105762325a535121c4614648695d7d +MD5 7f08c14d9f22c4cd3aa7bfd0b7fa05ea dazuko-2.3.2-r2.ebuild 2044 +RMD160 740c777b289c54764b041534af35db638c245961 dazuko-2.3.2-r2.ebuild 2044 +SHA256 56aed597be4bd28492749378d61a8f7b41105762325a535121c4614648695d7d dazuko-2.3.2-r2.ebuild 2044 +MISC ChangeLog 2184 RMD160 9f0681a3cfcec568ea456f19e870c535d05e7c88 SHA1 3e04e60dd6ded994305df70e0c4687923bdebc2a SHA256 7ef025d3eeee66265044798df74d6cc2dec025f2c9bb65781c4144f4f420bd78 +MD5 cb262b626e77598150ca78f7710a2b23 ChangeLog 2184 +RMD160 9f0681a3cfcec568ea456f19e870c535d05e7c88 ChangeLog 2184 +SHA256 7ef025d3eeee66265044798df74d6cc2dec025f2c9bb65781c4144f4f420bd78 ChangeLog 2184 MISC metadata.xml 980 RMD160 dfaf2070e4ef1023e90175d32fa626f334a56c07 SHA1 25e746478812c9b3c448ff3dd922a2bbc6129662 SHA256 c9a35d5cae928315a49ceb533066c2c41cf54e4fe4fa1529159b91e22274b022 MD5 e0a4db020fd5c28ea5a62ecefe8f1ec6 metadata.xml 980 RMD160 dfaf2070e4ef1023e90175d32fa626f334a56c07 metadata.xml 980 diff --git a/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild b/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild index dc92d6d8f7f1..a460e8d4ffc2 100644 --- a/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild +++ b/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild,v 1.2 2006/12/18 16:49:42 jer Exp $ - -inherit linux-mod +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dazuko/dazuko-2.3.2-r2.ebuild,v 1.3 2006/12/20 19:44:13 alonbl Exp $ +inherit linux-mod toolchain-funcs flag-o-matic DESCRIPTION="Linux kernel module and interface providing file access control" MY_P="${P/_/-}" # for -preN versions @@ -11,9 +10,10 @@ SRC_URI="http://www.dazuko.org/files/${MY_P}.tar.gz HOMEPAGE="http://www.dazuko.org" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="" -DEPEND=">=virtual/linux-sources-2.2" +DEPEND="kernel_linux? ( >=virtual/linux-sources-2.2 )" +RDEPEND=${DEPEND} S="${WORKDIR}/${MY_P}" # kernel settings @@ -21,32 +21,51 @@ CONFIG_CHECK="SECURITY_CAPABILITIES" MODULE_NAMES="dazuko(misc:)" BUILD_TARGETS="dummy_rule" +pkg_setup() { + [ "${KERNEL}" = "linux" ] && linux-mod_pkg_setup +} + src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${PN}-2.3.1-suspend2.patch" - if kernel_is 2 6 19; then + if [ "${KERNEL}" == "linux" ] && kernel_is 2 6 19; then epatch "${WORKDIR}/${P}-linux-2.6.19.patch" fi } src_compile() { + if [ "${KERNEL}" = "FreeBSD" ]; then + KERNEL_DIR=/usr/src/sys + KBUILD_OUTPUT=/boot/modules + MAKE=make + fi ./configure \ --without-dep \ --kernelsrcdir="${KERNEL_DIR}" \ --kernelobjdir="${KBUILD_OUTPUT}" \ || die "configure failed" - convert_to_m Makefile - linux-mod_src_compile - cd library - emake || die - cd .. + if [ "${KERNEL}" = "linux" ]; then + convert_to_m Makefile + linux-mod_src_compile + else + emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die + fi + + emake -C library CC="$(tc-getCC)" || die } src_install() { - linux-mod_src_install + if [ "${KERNEL}" = "linux" ]; then + linux-mod_src_install + else + insinto /boot/modules + doins "${S}"/dazuko.kld + exeinto /boot/modules + doexe "${S}"/dazuko.ko + fi dolib.a library/libdazuko.a insinto /usr/include @@ -58,3 +77,11 @@ src_install() { dodoc README.trusted } +pkg_postinst() { + [ "${KERNEL}" = "linux" ] && linux-mod_pkg_postinst +} + +pkg_postrm() { + [ "${KERNEL}" = "linux" ] && linux-mod_pkg_postrm +} +