summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-11-15 16:18:39 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-11-16 21:50:10 +0100
commit0e525daafe2958504674a9910bbed7c1b4d3fd38 (patch)
treeab265ec69054c64bc7c16a7b7bb55610531d5039 /meta-networking/recipes-support
parentdf552bed28c6ed983a94ebad4185bc9b2d04486f (diff)
downloadmeta-openembedded-0e525daafe2958504674a9910bbed7c1b4d3fd38.tar.gz
samba, ctdb, libldb, libtdb, libtevent, talloc: move to meta-networking
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r--meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch24
-rw-r--r--meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch16
-rw-r--r--meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb43
-rwxr-xr-xmeta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch57
-rw-r--r--meta-networking/recipes-support/libldb/libldb_1.1.17.bb46
-rw-r--r--meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch15
-rw-r--r--meta-networking/recipes-support/libtdb/libtdb_1.3.0.bb30
-rw-r--r--meta-networking/recipes-support/libtevent/libtevent/do-not-check-xsltproc-manpages.patch16
-rw-r--r--meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb30
-rw-r--r--meta-networking/recipes-support/talloc/talloc_2.1.1.bb45
10 files changed, 322 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch b/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch
new file mode 100644
index 0000000000..c9195b4f45
--- /dev/null
+++ b/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch
@@ -0,0 +1,24 @@
1support cross-compile for linux-os.
2
3Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
4
5diff -Nurp ctdb-2.5.1.orig/configure ctdb-2.5.1/configure
6--- ctdb-2.5.1.orig/configure 2015-05-07 16:24:28.545000238 +0900
7+++ ctdb-2.5.1/configure 2015-05-07 16:28:20.894000244 +0900
8@@ -10692,10 +10692,16 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
9 # see bug 5910, use our replacements if we detect
10 # a broken system.
11 if test "$cross_compiling" = yes; then :
12+ case "$target_os" in
13+ *linux*)
14+ ;;
15+ *)
16 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
17 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
18 as_fn_error $? "cannot run test program while cross compiling
19 See \`config.log' for more details" "$LINENO" 5; }
20+ ;;
21+ esac
22 else
23 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24 /* end confdefs.h. */
diff --git a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch
new file mode 100644
index 0000000000..1dd9b93a5a
--- /dev/null
+++ b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch
@@ -0,0 +1,16 @@
1link rep_snprintf from lib/replace/snprintf.o for ltdbtool
2
3Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
4
5diff -Nurp ctdb-2.5.1.orig/Makefile.in ctdb-2.5.1/Makefile.in
6--- ctdb-2.5.1.orig/Makefile.in 2015-05-07 16:43:39.276000236 +0900
7+++ ctdb-2.5.1/Makefile.in 2015-05-07 16:44:09.627000237 +0900
8@@ -170,7 +170,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.
9 @echo Linking $@
10 $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
11
12-bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
13+bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o
14 @echo Linking $@
15 $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
16
diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
new file mode 100644
index 0000000000..3731efd6b4
--- /dev/null
+++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb
@@ -0,0 +1,43 @@
1DESCRIPTION = "CTDB is a cluster implementation of the TDB database \
2used by Samba and other projects to store temporary data. If an \
3application is already using TDB for temporary data it is very easy \
4to convert that application to be cluster aware and use CTDB instead."
5DESCRIPTION = "CTDB is a cluster implementation of the TDB database \
6used by Samba and other projects to store temporary data. If an \
7application is already using TDB for temporary data it is very easy \
8to convert that application to be cluster aware and use CTDB instead."
9HOMEPAGE = "https://ctdb.samba.org/"
10LICENSE = "GPL-2.0+ & LGPL-3.0+ & GPL-3.0+"
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
13 file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
14 file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
15 "
16
17SRC_URI = "https://ftp.samba.org/pub/${PN}/${BP}.tar.gz \
18 file://01-support-cross-compile-for-linux-os.patch \
19 file://02-link-rep_snprintf-for-ltdbtool.patch \
20 "
21
22SRC_URI[md5sum] = "d0cd91726ff4ca2229e1b21859c94717"
23SRC_URI[sha256sum] = "d5bf3f674cae986bb6178b1db215a703ac94adc5f75fadfdcff63dcbb5e98ab5"
24
25inherit autotools-brokensep pkgconfig systemd
26
27PARALLEL_MAKE = ""
28
29DEPENDS += "popt libtevent talloc"
30
31do_configure() {
32 oe_runconf
33}
34
35do_install_append() {
36 install -d ${D}${systemd_unitdir}/system
37 install -m 0644 ${S}/config/ctdb.service ${D}${systemd_unitdir}/system
38 sed -i -e 's,/usr/sbin/,${sbindir}/,' ${D}${systemd_unitdir}/system/ctdb.service
39}
40
41SYSTEMD_SERVICE_${PN} = "ctdb.service"
42
43FILES_${PN} += "/run"
diff --git a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
new file mode 100755
index 0000000000..2425a55e39
--- /dev/null
+++ b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
@@ -0,0 +1,57 @@
1Some modules such as dynamic library maybe cann't be imported while cross compile,
2we just check whether does the module exist.
3
4Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
5
6--- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:42:12.265127110 +0800
7+++ ldb-1.1.17/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:45:25.717119550 +0800
8@@ -1,7 +1,7 @@
9 # functions to support bundled libraries
10
11 from Configure import conf
12-import sys, Logs
13+import sys, Logs, imp
14 from samba_utils import *
15
16 def PRIVATE_NAME(bld, name, private_extension, private_library):
17@@ -218,17 +218,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li
18 # versions
19 minversion = minimum_library_version(conf, libname, minversion)
20
21- try:
22- m = __import__(modulename)
23- except ImportError:
24- found = False
25- else:
26+ # Find module in PYTHONPATH
27+ stuff = imp.find_module(modulename, [os.environ["PYTHONPATH"]])
28+ if stuff:
29 try:
30- version = m.__version__
31- except AttributeError:
32+ m = imp.load_module(modulename, stuff[0], stuff[1], stuff[2])
33+ except ImportError:
34 found = False
35+
36+ if conf.env.CROSS_COMPILE:
37+ # Some modules such as dynamic library maybe cann't be imported
38+ # while cross compile, we just check whether the module exist
39+ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (stuff[1]))
40+ found = True
41 else:
42- found = tuplize_version(version) >= tuplize_version(minversion)
43+ try:
44+ version = m.__version__
45+ except AttributeError:
46+ found = False
47+ else:
48+ found = tuplize_version(version) >= tuplize_version(minversion)
49+ finally:
50+ if stuff[0]:
51+ stuff[0].close()
52+ else:
53+ found = False
54+
55 if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
56 Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion))
57 sys.exit(1)
diff --git a/meta-networking/recipes-support/libldb/libldb_1.1.17.bb b/meta-networking/recipes-support/libldb/libldb_1.1.17.bb
new file mode 100644
index 0000000000..44f061ab6b
--- /dev/null
+++ b/meta-networking/recipes-support/libldb/libldb_1.1.17.bb
@@ -0,0 +1,46 @@
1SUMMARY = "Hierarchical, reference counted memory pool system with destructors"
2HOMEPAGE = "http://ldb.samba.org"
3SECTION = "libs"
4LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+"
5
6DEPENDS += "libtdb talloc libtevent popt"
7RDEPENDS_${PN} += "libtevent popt libtalloc openldap"
8RDEPENDS_pyldb += "python libtdb libtalloc"
9
10SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \
11 file://do-not-import-target-module-while-cross-compile.patch \
12 "
13
14LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
15 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
16 file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
17
18SRC_URI[md5sum] = "7c2ab4e3f2a4186493aa06eabbc61cc0"
19SRC_URI[sha256sum] = "b9a312aad19e9463716d257d8f2529fd7fc1a5ef24f6dcdc0c4a1930d7bdb6e6"
20
21inherit waf-samba
22
23S = "${WORKDIR}/ldb-${PV}"
24
25EXTRA_OECONF += "--disable-rpath \
26 --disable-rpath-install \
27 --bundled-libraries=NONE \
28 --builtin-libraries=replace \
29 --with-modulesdir=${libdir}/ldb/modules \
30 --with-privatelibdir=${libdir}/ldb \
31 --with-libiconv=${STAGING_DIR_HOST}${prefix}\
32 "
33
34PACKAGES += "pyldb pyldb-dbg pyldb-dev"
35
36FILES_${PN} += "${libdir}/ldb/*"
37FILES_${PN}-dbg += "${libdir}/ldb/.debug/* \
38 ${libdir}/ldb/modules/ldb/.debug/*"
39
40FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \
41 ${libdir}/libpyldb-util.so.1 \
42 ${libdir}/libpyldb-util.so.1.1.17 \
43 "
44FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \
45 ${libdir}/.debug/libpyldb-util.so.1.1.17"
46FILES_pyldb-dev = "${libdir}/libpyldb-util.so"
diff --git a/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch
new file mode 100644
index 0000000000..bcc45c9fc3
--- /dev/null
+++ b/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch
@@ -0,0 +1,15 @@
1Don't check manpages for xsltproc.
2
3Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
4
5--- tdb-1.3.0.orig/wscript 2015-04-22 09:52:32.366000222 +0900
6+++ tdb-1.3.0/wscript 2015-04-22 09:51:57.720000205 +0900
7@@ -90,7 +90,7 @@ def configure(conf):
8 not conf.env.disable_tdb_mutex_locking):
9 conf.define('USE_TDB_MUTEX_LOCKING', 1)
10
11- conf.CHECK_XSLTPROC_MANPAGES()
12+ conf.find_program('xsltproc', var='XSLTPROC')
13
14 if not conf.env.disable_python:
15 # also disable if we don't have the python libs installed
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.0.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.0.bb
new file mode 100644
index 0000000000..0b9e1f22b3
--- /dev/null
+++ b/meta-networking/recipes-support/libtdb/libtdb_1.3.0.bb
@@ -0,0 +1,30 @@
1SUMMARY = "The tdb library"
2SECTION = "libs"
3LICENSE = "LGPL-3.0+ & GPL-3.0+"
4
5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
6 file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
7
8SRC_URI = "http://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
9 file://do-not-check-xsltproc-manpages.patch"
10
11SRC_URI[md5sum] = "f18cd6afc4f5670edfe58f72d2665f94"
12SRC_URI[sha256sum] = "04bee48d405ab7815810575a6e0cb364cc0eea6187b54b18c84e9c18a768ba20"
13
14S = "${WORKDIR}/tdb-${PV}"
15
16inherit waf-samba
17
18EXTRA_OECONF += "--disable-rpath \
19 --bundled-libraries=NONE \
20 --builtin-libraries=replace \
21 --with-libiconv=${STAGING_DIR_HOST}${prefix}\
22 "
23
24PACKAGES += "tdb-tools python-tdb python-tdb-dbg"
25
26FILES_${PN} = "${libdir}/*.so.*"
27FILES_tdb-tools = "${bindir}/*"
28FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
29FILES_python-tdb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*"
30RDEPENDS_python-tdb = "python"
diff --git a/meta-networking/recipes-support/libtevent/libtevent/do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-support/libtevent/libtevent/do-not-check-xsltproc-manpages.patch
new file mode 100644
index 0000000000..1ce4dda1c3
--- /dev/null
+++ b/meta-networking/recipes-support/libtevent/libtevent/do-not-check-xsltproc-manpages.patch
@@ -0,0 +1,16 @@
1Don't check manpages for xsltproc.
2
3Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
4
5diff -Nurp tevent-0.9.21.orig/lib/talloc/wscript tevent-0.9.21/lib/talloc/wscript
6--- tevent-0.9.21.orig/lib/talloc/wscript 2013-09-08 21:24:14.000000000 +0900
7+++ tevent-0.9.21/lib/talloc/wscript 2015-04-24 16:28:04.085000230 +0900
8@@ -55,7 +55,7 @@ def configure(conf):
9 if conf.env.standalone_talloc:
10 conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
11
12- conf.CHECK_XSLTPROC_MANPAGES()
13+ conf.find_program('xsltproc', var='XSLTPROC')
14
15 if not conf.env.disable_python:
16 # also disable if we don't have the python libs installed
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb
new file mode 100644
index 0000000000..f297f30e12
--- /dev/null
+++ b/meta-networking/recipes-support/libtevent/libtevent_0.9.21.bb
@@ -0,0 +1,30 @@
1SUMMARY = "Hierarchical, reference counted memory pool system with destructors"
2HOMEPAGE = "http://tevent.samba.org"
3SECTION = "libs"
4LICENSE = "LGPLv3+"
5
6DEPENDS += "talloc libcap"
7RDEPENDS_${PN} += "libtalloc"
8RDEPENDS_python-tevent = "python"
9
10SRC_URI = "http://samba.org/ftp/tevent/tevent-${PV}.tar.gz"
11LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b"
12
13SRC_URI[md5sum] = "3d5a76c0a1b5f724842d785fd055633f"
14SRC_URI[sha256sum] = "f2be7463573dab2d8210cb57fe7e7e2aeb323274cbdc865a6e29ddcfb977f0f4"
15
16inherit waf-samba
17
18S = "${WORKDIR}/tevent-${PV}"
19
20EXTRA_OECONF += "--disable-rpath \
21 --bundled-libraries=NONE \
22 --builtin-libraries=replace \
23 --with-libiconv=${STAGING_DIR_HOST}${prefix}\
24 --without-gettext \
25 "
26
27PACKAGES += "python-tevent python-tevent-dbg"
28
29FILES_python-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
30FILES_python-tevent-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"
diff --git a/meta-networking/recipes-support/talloc/talloc_2.1.1.bb b/meta-networking/recipes-support/talloc/talloc_2.1.1.bb
new file mode 100644
index 0000000000..89c390f01d
--- /dev/null
+++ b/meta-networking/recipes-support/talloc/talloc_2.1.1.bb
@@ -0,0 +1,45 @@
1SUMMARY = "Hierarchical, reference counted memory pool system with destructors"
2HOMEPAGE = "http://talloc.samba.org"
3SECTION = "libs"
4LICENSE = "LGPL-3.0+ & GPL-3.0+"
5
6SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz"
7LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
8 file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
9
10SRC_URI[md5sum] = "5dffb86414218a91864ed4453ba9be07"
11SRC_URI[sha256sum] = "3e29ce6c3ba3c4f7c2d57ce8cf0fbc24c86618c519f2b2fb6a459025488b6174"
12
13inherit waf-samba
14
15EXTRA_OECONF += "--disable-rpath \
16 --disable-rpath-install \
17 --bundled-libraries=NONE \
18 --builtin-libraries=replace \
19 --disable-silent-rules \
20 --with-libiconv=${STAGING_DIR_HOST}${prefix}\
21 "
22
23PACKAGES += "libtalloc libtalloc-dbg libtalloc-dev pytalloc pytalloc-dbg pytalloc-dev"
24
25#ALLOW_EMPTY_${PN} = "1"
26FILES_${PN} = ""
27FILES_${PN}-dev = ""
28FILES_${PN}-dbg = ""
29
30FILES_libtalloc = "${libdir}/libtalloc.so.2 \
31 ${libdir}/libtalloc.so.2.1.1"
32FILES_libtalloc-dbg = "/usr/src/debug/ \
33 ${libdir}/.debug/libtalloc.so.2.1.1"
34FILES_libtalloc-dev = "${includedir}/ \
35 ${libdir}/libtalloc.so \
36 ${libdir}/pkgconfig/"
37
38FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \
39 ${libdir}/libpytalloc-util.so.2 \
40 ${libdir}/libpytalloc-util.so.2.1.1 \
41 "
42FILES_pytalloc-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \
43 ${libdir}/.debug/libpytalloc-util.so.2.1.1"
44FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so"
45RDEPENDS_pytalloc = "python"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-12 22:55:21 +0000