diff options
| author | leimaohui <leimaohui@cn.fujitsu.com> | 2018-06-25 15:50:03 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-07-20 16:14:22 -0700 |
| commit | da59f864945681521ea313de8b483f7593018948 (patch) | |
| tree | da09f5b603a50650881c485865b8af9566034427 | |
| parent | e051646f040d00b284e237df135c65f90e9278e2 (diff) | |
| download | meta-openembedded-da59f864945681521ea313de8b483f7593018948.tar.gz | |
ctdb: Has been integrated into samba. So, there is no need to maitain this recipe anymore.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 files changed, 0 insertions, 123 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 deleted file mode 100644 index c9195b4f45..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | support cross-compile for linux-os. | ||
| 2 | |||
| 3 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | ||
| 4 | |||
| 5 | diff -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 deleted file mode 100644 index 1294fe41b5..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | link rep_snprintf from lib/replace/snprintf.o for ltdbtool | ||
| 2 | |||
| 3 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | ||
| 4 | |||
| 5 | Index: ctdb-2.5.6/Makefile.in | ||
| 6 | =================================================================== | ||
| 7 | --- ctdb-2.5.6.orig/Makefile.in | ||
| 8 | +++ ctdb-2.5.6/Makefile.in | ||
| 9 | @@ -176,7 +176,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. | ||
| 10 | @echo Linking $@ | ||
| 11 | $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) | ||
| 12 | |||
| 13 | -bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) | ||
| 14 | +bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o | ||
| 15 | @echo Linking $@ | ||
| 16 | $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS) | ||
| 17 | |||
diff --git a/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch b/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch deleted file mode 100644 index a7e987b85f..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From f02ff7383f1cc0c118732352ccbae476c7b3b3ba Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 3 | Date: Tue, 17 Nov 2015 16:17:00 -0500 | ||
| 4 | Subject: [PATCH] service: ensure the PID directory is created | ||
| 5 | |||
| 6 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 7 | --- | ||
| 8 | config/ctdb.service | 1 + | ||
| 9 | 1 file changed, 1 insertion(+) | ||
| 10 | |||
| 11 | diff --git a/config/ctdb.service b/config/ctdb.service | ||
| 12 | index ea37c30..8537105 100644 | ||
| 13 | --- a/config/ctdb.service | ||
| 14 | +++ b/config/ctdb.service | ||
| 15 | @@ -5,6 +5,7 @@ After=network.target | ||
| 16 | [Service] | ||
| 17 | Type=forking | ||
| 18 | LimitCORE=infinity | ||
| 19 | +RuntimeDirectory=/run/ctdb | ||
| 20 | PIDFile=/run/ctdb/ctdbd.pid | ||
| 21 | ExecStart=/usr/sbin/ctdbd_wrapper /run/ctdb/ctdbd.pid start | ||
| 22 | ExecStop=/usr/sbin/ctdbd_wrapper /run/ctdb/ctdbd.pid stop | ||
| 23 | -- | ||
| 24 | 2.1.4 | ||
| 25 | |||
diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb deleted file mode 100644 index df1a19e7a2..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | DESCRIPTION = "CTDB is a cluster implementation of the TDB database \ | ||
| 2 | used by Samba and other projects to store temporary data. If an \ | ||
| 3 | application is already using TDB for temporary data it is very easy \ | ||
| 4 | to convert that application to be cluster aware and use CTDB instead." | ||
| 5 | HOMEPAGE = "https://ctdb.samba.org/" | ||
| 6 | LICENSE = "GPL-2.0+ & LGPL-3.0+ & GPL-3.0+" | ||
| 7 | |||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
| 9 | file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ | ||
| 10 | file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ | ||
| 11 | " | ||
| 12 | |||
| 13 | SRC_URI = "https://ftp.samba.org/pub/${BPN}/${BP}.tar.gz \ | ||
| 14 | file://01-support-cross-compile-for-linux-os.patch \ | ||
| 15 | file://02-link-rep_snprintf-for-ltdbtool.patch \ | ||
| 16 | file://service-ensure-the-PID-directory-is-created.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "efc50109f90a4c790124c35e4ba234ad" | ||
| 20 | SRC_URI[sha256sum] = "fc1cdd7efcc91afc629f21408281bba5da107b9c17e74bdee2f28a532d14f874" | ||
| 21 | |||
| 22 | inherit autotools-brokensep pkgconfig systemd | ||
| 23 | |||
| 24 | PACKAGECONFIG ??= "" | ||
| 25 | PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" | ||
| 26 | |||
| 27 | PARALLEL_MAKE = "" | ||
| 28 | |||
| 29 | DEPENDS += "popt libtevent libtalloc libldb libtirpc" | ||
| 30 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" | ||
| 31 | LDFLAGS += "-ltirpc" | ||
| 32 | |||
| 33 | # ctdbd_wrapper requires pgrep, hence procps | ||
| 34 | RDEPENDS_${PN} += "procps" | ||
| 35 | |||
| 36 | do_configure() { | ||
| 37 | gnu-configize --force ${S} | ||
| 38 | oe_runconf | ||
| 39 | } | ||
| 40 | |||
| 41 | do_install_append() { | ||
| 42 | install -d ${D}${systemd_unitdir}/system | ||
| 43 | install -m 0644 ${S}/config/ctdb.service ${D}${systemd_unitdir}/system | ||
| 44 | sed -i -e 's,/usr/sbin/,${sbindir}/,' ${D}${systemd_unitdir}/system/ctdb.service | ||
| 45 | sed -i -e 's,\([=\ ]\)/run/,\1${localstatedir}/run/,' ${D}${systemd_unitdir}/system/ctdb.service | ||
| 46 | |||
| 47 | rm -r ${D}/${localstatedir}/run | ||
| 48 | } | ||
| 49 | |||
| 50 | # The systemd service is disabled by default, as the service will fail to | ||
| 51 | # start without /etc/ctdb/nodes. If the user supplies this, they can re-enable | ||
| 52 | # the service. | ||
| 53 | SYSTEMD_AUTO_ENABLE = "disable" | ||
| 54 | SYSTEMD_SERVICE_${PN} = "ctdb.service" | ||
| 55 | |||
| 56 | # onnode is a shell script with bashisms and bash #! | ||
| 57 | RDEPENDS_${PN} += "bash" | ||
