From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...e.in-fix-permission-bits-for-drbd.service.patch | 25 ++++++++++++ .../recipes-support/drbd/drbd-utils_8.9.6.bb | 46 ++++++++++++++++++++++ ...ck_existence_of_modules_before_installing.patch | 24 +++++++++++ .../recipes-support/drbd/drbd_9.0.8-1.bb | 24 +++++++++++ 4 files changed, 119 insertions(+) create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb (limited to 'meta-openembedded/meta-networking/recipes-support/drbd') diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch new file mode 100644 index 0000000000..90dd1f8618 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch @@ -0,0 +1,25 @@ +Upstream-Status: Pending + +Subject: Makefile.in: fix permission bits for drbd.service + +Signed-off-by: Chen Qi +--- + scripts/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/Makefile.in b/scripts/Makefile.in +index 402b93b..4a45407 100644 +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -65,7 +65,7 @@ endif + # yes, debian apparently allows installing both types from the same package + ifneq ($(initscripttype),sysv) # "systemd" or "both" + install -d $(DESTDIR)$(systemdunitdir) +- install -m 755 drbd.service $(DESTDIR)$(systemdunitdir)/ ++ install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ + install -d $(DESTDIR)/lib/drbd/ + install -m 755 drbd $(DESTDIR)/lib/drbd/ + install -d $(DESTDIR)$(tmpfilesdir)/ +-- +1.9.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb new file mode 100644 index 0000000000..81f1cfec5d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb @@ -0,0 +1,46 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ +DRBD mirrors a block device over the network to another machine.\ +Think of it as networked raid 1. It is a building block for\ +setting up high availability (HA) clusters." +HOMEPAGE = "http://www.drbd.org/" +SECTION = "admin" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" + +SRC_URI = "http://www.linbit.com/downloads/drbd/utils/archive/${BP}.tar.gz \ + file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \ + " +SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b" +SRC_URI[sha256sum] = "297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913" + +SYSTEMD_SERVICE_${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +inherit autotools-brokensep systemd + +EXTRA_OECONF = " \ + --with-initdir=/etc/init.d \ + --without-pacemaker \ + --without-rgmanager \ + --without-bashcompletion \ + --with-distro debian \ + --with-initscripttype=both \ + --with-systemdunitdir=${systemd_unitdir}/system \ + --without-manual\ + " + +do_install_append() { + # don't install empty /var/lock to avoid conflict with base-files + rm -rf ${D}${localstatedir}/lock +} + +RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" + +# The drbd items are explicitly put under /lib when installed. +# +FILES_${PN} += "/run" +FILES_${PN} += "${nonarch_base_libdir}/drbd \ + ${nonarch_libdir}/drbd \ + ${nonarch_libdir}/tmpfiles.d" +FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch new file mode 100644 index 0000000000..6414f7305a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch @@ -0,0 +1,24 @@ +If CONFIG_BLK_DEV_DRBD kernel config is enabled, then DRBD +does not build drbd.ko here. Under this circumstance do_install +task is going to fail with a below error: +-- snip -- +| install: cannot stat ‘drbd.ko’: No such file or directory +| make[1]: *** [install] Error 1 +-- snip -- + +So, check for kernel module existence before installing. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Jagadeesh Krishnanjanappa +--- drbd-9.0.1-1/drbd/Makefile 2016-07-03 06:54:19.421538690 -0700 ++++ drbd-9.0.1-1/drbd/Makefile_mod 2016-07-03 06:53:18.938801628 -0700 +@@ -158,7 +158,7 @@ else + fi + install -d $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR) + set -e ; for ko in $(MODOBJS); do \ +- install -m 644 $$ko $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR); \ ++ [ -e $$ko ] && install -m 644 $$ko $(DESTDIR)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR); \ + done + ifeq ($(DESTDIR),/) + ifeq ($(shell uname -r),$(KERNELRELEASE)) diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb new file mode 100644 index 0000000000..fa4d10b4c1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD is a block device which is designed to build high \ + availability clusters. This is done by mirroring a whole \ + block device via (a dedicated) network. You could see \ + it as a network raid-1." +HOMEPAGE = "http://oss.linbit.com/drbd/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" +DEPENDS = "virtual/kernel" + +SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ + file://check_existence_of_modules_before_installing.patch" + +SRC_URI[md5sum] = "c1dd58043f46e9926b579aa65d4ea980" +SRC_URI[sha256sum] = "87f72d46db9bad926415b3ab9f5f1397de8c581d2e2ec1addbdd5ce2604e6123" +inherit module + +EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" + +do_install () { + oe_runmake install DESTDIR="${D}" +} + +PNBLACKLIST[drbd] = "implicit declaration of function 'setup_timer'; 4.15 head file issue?" -- cgit v1.2.3