Re: [PATCH 3/3] [meta-oe] drbd: add recipe

[Koen Kooi <koen@dominion.thruhere.net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bian Naimeng schreef op 28-11-14 09:49:
> DRBD is a block device which is designed to build high availability
> clusters.
> 
> Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> --- 
> meta-oe/recipes-extended/drbd/drbd_8.4.4.bb      | 57
> ++++++++++++++++++++++++ meta-oe/recipes-extended/drbd/files/drbd.service
> | 12 +++++ 2 files changed, 69 insertions(+) create mode 100644
> meta-oe/recipes-extended/drbd/drbd_8.4.4.bb create mode 100644
> meta-oe/recipes-extended/drbd/files/drbd.service
> 
> diff --git a/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb
> b/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb new file mode 100644 index
> 0000000..5439bac --- /dev/null +++
> b/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb @@ -0,0 +1,57 @@ +SUMMARY =
> "BD 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 = "kernel/userland" + 
> +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM =
> "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" + +PR = "r0" +#PR =
> "r1001"

PR isn't used anumore

> + +SRC_URI = "http://oss.linbit.com/${BPN}/8.4/${BPN}-${PV}.tar.gz \ +
> file://drbd.service \ +          " + +#SRC_URI[md5sum] =
> "ef4e6db51cda1898c597a3d61fcb9e1e" +#SRC_URI[sha256sum] =
> "7c1558459614fbdc1b3209f1b9e5767a443d9bdfe681a49c652b5f392799d58d" +
Drop the commented lines

> +SRC_URI[md5sum] = "b51815343c1a9151e2936b3b97520388" +SRC_URI[sha256sum]
> = "a056219c5c23b079c3354179f7a1b9f55d47e573a4cd3178f2ef4c15604288f0" + 
> +inherit autotools-brokensep systemd + +EXTRA_OECONF = "--with-utils
> \ +                --without-km                  \ +
> --with-initdir=/etc/init.d    \ +                --without-pacemaker
> \ +                --without-rgmanager           \ +
> --without-bashcompletion      \ +                --with-distro debian
> \ +               " + +do_configure (){ +    oe_runconf +}

Please add a comment why the stock do_configure doesn't work. And at least
add a 'gnu-configize' to make it work on new architectures.

> + +SYSTEMD_SERVICE_${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE =
> "disable"

Move that below do_install

> + +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}/etc/init.d/drbd
> ${D}/${libexecdir}/drbd-helper +    fi +} + +FILES_${PN} += "run" 
> +FILES_${PN} += "${base_libdir}/drbd" +FILES_${PN}-dbg +=
> "${base_libdir}/drbd/.debug" diff --git
> a/meta-oe/recipes-extended/drbd/files/drbd.service
> b/meta-oe/recipes-extended/drbd/files/drbd.service new file mode 100644 
> index 0000000..22f853f --- /dev/null +++
> b/meta-oe/recipes-extended/drbd/files/drbd.service @@ -0,0 +1,12 @@ 
> +[Unit] +Description=DRBD Service +After=network.target + +[Service] 
> +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/drbd/drbd-helper
> start +ExecStop=/usr/lib/drbd/drbd-helper stop

Hardcoded paths


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFUedfIMkyGM64RGpERAnGtAJ9Js9FqtaeaPcfOd/l6nzWMwnEkCgCdFYtk
BFdk3t9Rv7jnV78/C+wNmXw=
=wZiM
-----END PGP SIGNATURE-----