diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-08-20 16:41:49 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-09-11 10:53:17 -0400 |
commit | 3cac00a1c33eb81e4b34c8e31abd4241b9b80aa9 (patch) | |
tree | 54db1521bafa5cf5798f6e1022189b69423ecd68 /meta-networking/recipes-support/drbd | |
parent | 51992b647bf71b70bbbdd58dd1f2752b0d051f3f (diff) | |
download | meta-openembedded-3cac00a1c33eb81e4b34c8e31abd4241b9b80aa9.tar.gz |
drbd: upgrade 8.4.4 -> 8.9.3
* Change recipe name from drbd to drbd-utils,since
after 8.4.5, the drbd userland tools had been moved to
their own repository at http://git.linbit.com/drbd-utils.git
(tarball at http://oss.linbit.com/drbd)
* Add 0001-Makefile.in-don-t-compile-documentation.patch to
avoid build Errors.
* Dropped drbd.service,since it is provided by Upstream.
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/drbd')
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch | 38 | ||||
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils_8.9.3.bb (renamed from meta-networking/recipes-support/drbd/drbd_8.4.4.bb) | 35 | ||||
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd/drbd.service | 12 |
3 files changed, 49 insertions, 36 deletions
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch new file mode 100644 index 0000000000..1de4a86d9d --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch @@ -0,0 +1,38 @@ +From feccf89f08a455460668cf286151662e4c1557b3 Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Thu, 20 Aug 2015 15:32:30 +0900 +Subject: [PATCH] Makefile.in: don't compile documentation + +The documentation file is not suitable for cross-compile, +Errors will occur: +| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory +| ../../user/v9/drbdsetup xml-help disk-options > drbdsetup_xml-help_disk-options.xml +| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory +| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory +| make[1]: *** [drbdsetup_xml-help_new-resource.xml] Error 126 + +so we do not compile it. + +Upstream-Status: pending + +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 5365a2c..d5967d8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -45,7 +45,7 @@ WITH_84_SUPPORT = @WITH_84_SUPPORT@ + # and not in e.g. dash. I'm too lazy to fix it to be compatible. + SHELL=/bin/bash + +-SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts documentation/v83 documentation/v84 documentation/v9 ++SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts + + REL_VERSION := $(shell $(SED) -ne '/^AC_INIT/{s/^[^,]*, *\([^,]*\) *,.*/\1/;p;q}' configure.ac) + ifdef FORCE +-- +1.8.4.2 + diff --git a/meta-networking/recipes-support/drbd/drbd_8.4.4.bb b/meta-networking/recipes-support/drbd/drbd-utils_8.9.3.bb index 7458707ada..66b94dd94b 100644 --- a/meta-networking/recipes-support/drbd/drbd_8.4.4.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_8.9.3.bb @@ -8,46 +8,33 @@ SECTION = "admin" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -SRC_URI = "http://oss.linbit.com/${BPN}/8.4/${BPN}-${PV}.tar.gz \ - file://drbd.service \ +SRC_URI = "http://oss.linbit.com/drbd/${BP}.tar.gz \ + file://0001-Makefile.in-don-t-compile-documentation.patch \ " -SRC_URI[md5sum] = "b51815343c1a9151e2936b3b97520388" -SRC_URI[sha256sum] = "a056219c5c23b079c3354179f7a1b9f55d47e573a4cd3178f2ef4c15604288f0" +SRC_URI[md5sum] = "09c9c33c041e1f4f85dd359f9e0b0f24" +SRC_URI[sha256sum] = "011050578c153bf4fef86e03749304ff9f333b7af3512c5c395e0e870a0445bd" SYSTEMD_SERVICE_${PN} = "drbd.service" SYSTEMD_AUTO_ENABLE = "disable" inherit autotools-brokensep systemd -EXTRA_OECONF = "--with-utils \ - --without-km \ +EXTRA_OECONF = " \ --with-initdir=/etc/init.d \ --without-pacemaker \ --without-rgmanager \ --without-bashcompletion \ --with-distro debian \ + --with-initscripttype=both \ + --with-systemdunitdir=${systemd_unitdir}/system \ " -do_configure (){ - oe_runconf -} - -do_install_append() { - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/drbd.service ${D}/${systemd_unitdir}/system - install -d ${D}/${libexecdir} - install -m 755 ${D}/${sysconfdir}/init.d/drbd ${D}/${libexecdir}/drbd-helper - - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - ${D}${systemd_unitdir}/system/drbd.service - fi -} - RDEPENDS_${PN} += "bash perl" # The drbd items are explicitly put under /lib when installed. # FILES_${PN} += "/run" -FILES_${PN} += "/lib/drbd" -FILES_${PN}-dbg += "/lib/drbd/.debug" +FILES_${PN} += "${base_libdir}/drbd \ + ${libdir}/drbd \ + ${libdir}/tmpfiles.d" +FILES_${PN}-dbg += "${base_libdir}/drbd/.debug" diff --git a/meta-networking/recipes-support/drbd/drbd/drbd.service b/meta-networking/recipes-support/drbd/drbd/drbd.service deleted file mode 100644 index 3543999976..0000000000 --- a/meta-networking/recipes-support/drbd/drbd/drbd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=DRBD Service -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@LIBEXECDIR@/drbd-helper start -ExecStop=@LIBEXECDIR@/drbd-helper stop - -[Install] -WantedBy=multi-user.target |