Samba4 uses ans1_compile and compile_et to build itself, so we need a -native version of it. Heimdal is the external upstream variant of the tools samba bundles.
Signed-off-by: Koen Kooi <[email protected]> --- ...dm5-fix-race-in-Makefile-with-kadm5_err.h.patch | 34 +++++++++++++++ .../recipes-connectivity/samba/heimdal_1.6rc2.bb | 49 ++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 meta-oe/recipes-connectivity/samba/heimdal/0002-kadm5-fix-race-in-Makefile-with-kadm5_err.h.patch create mode 100644 meta-oe/recipes-connectivity/samba/heimdal_1.6rc2.bb diff --git a/meta-oe/recipes-connectivity/samba/heimdal/0002-kadm5-fix-race-in-Makefile-with-kadm5_err.h.patch b/meta-oe/recipes-connectivity/samba/heimdal/0002-kadm5-fix-race-in-Makefile-with-kadm5_err.h.patch new file mode 100644 index 0000000..bab933c --- /dev/null +++ b/meta-oe/recipes-connectivity/samba/heimdal/0002-kadm5-fix-race-in-Makefile-with-kadm5_err.h.patch @@ -0,0 +1,34 @@ +From 18fe7d300f133c2b9eb93bb4bd81e4644979a74b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <[email protected]> +Date: Tue, 1 Jul 2014 13:13:43 -0600 +Subject: [PATCH] kadm5: fix race in Makefile with kadm5_err.h + +When running make with -j4, occasionally kadm5 fails due to a missing +header file kadm5_err.h. Fix the race condition. + +Reported at https://bugzilla.redhat.com/1115164 + +Reviewed-by: Ken Dreyer <[email protected]> + +Upstream-status: Backport [upstream commit 6affa4cceceaa1369dd895f8acdd7a883ee65674] + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + lib/kadm5/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am +index f8be3b1..1b399b1 100644 +--- a/lib/kadm5/Makefile.am ++++ b/lib/kadm5/Makefile.am +@@ -155,6 +155,7 @@ iprop-commands.c iprop-commands.h: iprop-commands.in + $(SLC) $(srcdir)/iprop-commands.in + + $(libkadm5srv_la_OBJECTS): kadm5_err.h ++$(libkadm5clnt_la_OBJECTS): kadm5_err.h + $(iprop_log_OBJECTS): iprop-commands.h + + client_glue.lo server_glue.lo: $(srcdir)/common_glue.c +-- +2.4.5 + diff --git a/meta-oe/recipes-connectivity/samba/heimdal_1.6rc2.bb b/meta-oe/recipes-connectivity/samba/heimdal_1.6rc2.bb new file mode 100644 index 0000000..d6a057b --- /dev/null +++ b/meta-oe/recipes-connectivity/samba/heimdal_1.6rc2.bb @@ -0,0 +1,49 @@ +SUMMARY = "The Heimdal Kerberos 5, PKIX, CMS, GSS-API, SPNEGO, NTLM, Digest-MD5 and, SASL implementation." + +DEPENDS = "e2fsprogs ncurses" + +LICENSE = "BSD-3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2c6f8cfe82d4fdd74355866f0c14d3f" + +PV = "1.5+1.6rc2" + +SRC_URI = "http://www.h5l.org/dist/src/heimdal-1.6rc2.tar.gz \ + file://0002-kadm5-fix-race-in-Makefile-with-kadm5_err.h.patch \ + " +S = "${WORKDIR}/heimdal-1.6rc2" +SRC_URI[md5sum] = "152ca82660864acf7f712ae1a57e6795" +SRC_URI[sha256sum] = "8fe19e0f12ff0d0c2f20a6cf56727deaabd89db9c197288022fb489e103b730d" + +inherit autotools pkgconfig + +EXTRA_OECONF = " \ + --disable-shared \ + --enable-static \ + --without-openldap \ + --without-capng \ + --without-sqlite3 \ + --without-libintl \ + --without-openssl \ + --without-berkeley-db \ + --without-readline \ + --without-libedit \ + --without-hesiod \ + --without-x \ + --disable-heimdal-documentation \ + " + +do_configure_append() { + cp ${B}/*libtool ${B}/lib/libedit/libtool +} + +# Even with the makefile patch parallel make fails 8 out of 10 times with -j8 +PARALLEL_MAKE = "" + +# Put both compile tools together in $PATH and libexecdir in order to build samba4 +do_install_append() { + ln -sf ${libexecdir}/heimdal/asn1_compile ${D}${bindir}/ + ln -sf ${bindir}/compile_et ${D}${libexecdir}/heimdal/ +} + +BBCLASSEXTEND = "native" + -- 2.0.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
