* [PATCH 0/1] Move drbd from meta-oe to meta-networking @ 2014-12-10 9:01 Bian Naimeng 2014-12-10 9:01 ` [PATCH 1/1] drbd: add recipe Bian Naimeng 0 siblings, 1 reply; 3+ messages in thread From: Bian Naimeng @ 2014-12-10 9:01 UTC (permalink / raw) To: openembedded-devel As discussed at yocto@yoctoproject.org. https://lists.yoctoproject.org/pipermail/yocto/2014-December/022542.html We should move drbd from meta-oe to meta-networking. And add the RDEPEND for this recipe. Bian Naimeng (1): Move drbd from meta-oe to meta-networking. .../recipes-support/drbd/drbd/drbd.service | 12 +++++ meta-networking/recipes-support/drbd/drbd_8.4.4.bb | 58 ++++++++++++++++++++++ meta-oe/recipes-extended/drbd/drbd_8.4.4.bb | 57 --------------------- meta-oe/recipes-extended/drbd/files/drbd.service | 12 ----- 4 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 meta-networking/recipes-support/drbd/drbd/drbd.service create mode 100644 meta-networking/recipes-support/drbd/drbd_8.4.4.bb delete mode 100644 meta-oe/recipes-extended/drbd/drbd_8.4.4.bb delete mode 100644 meta-oe/recipes-extended/drbd/files/drbd.service -- 1.9.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] drbd: add recipe 2014-12-10 9:01 [PATCH 0/1] Move drbd from meta-oe to meta-networking Bian Naimeng @ 2014-12-10 9:01 ` Bian Naimeng 2014-12-10 11:39 ` Martin Jansa 0 siblings, 1 reply; 3+ messages in thread From: Bian Naimeng @ 2014-12-10 9:01 UTC (permalink / raw) To: openembedded-devel DRBD is a block device which is designed to build high availability clusters. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> --- .../recipes-support/drbd/drbd/drbd.service | 12 +++++ meta-networking/recipes-support/drbd/drbd_8.4.4.bb | 58 ++++++++++++++++++++++ meta-oe/recipes-extended/drbd/drbd_8.4.4.bb | 57 --------------------- meta-oe/recipes-extended/drbd/files/drbd.service | 12 ----- 4 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 meta-networking/recipes-support/drbd/drbd/drbd.service create mode 100644 meta-networking/recipes-support/drbd/drbd_8.4.4.bb delete mode 100644 meta-oe/recipes-extended/drbd/drbd_8.4.4.bb delete mode 100644 meta-oe/recipes-extended/drbd/files/drbd.service diff --git a/meta-networking/recipes-support/drbd/drbd/drbd.service b/meta-networking/recipes-support/drbd/drbd/drbd.service new file mode 100644 index 0000000..6b6ab30 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd/drbd.service @@ -0,0 +1,12 @@ +[Unit] +Description=DRBD Service +After=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@LIBEXECDIR@/drbd-helper startxxx +ExecStop=@LIBEXECDIR@/drbd-helper stop + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/drbd/drbd_8.4.4.bb b/meta-networking/recipes-support/drbd/drbd_8.4.4.bb new file mode 100644 index 0000000..abf4554 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd_8.4.4.bb @@ -0,0 +1,58 @@ +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" + +RDEPENDS_${PN} += "bash perl" + +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[md5sum] = "ef4e6db51cda1898c597a3d61fcb9e1e" +#SRC_URI[sha256sum] = "7c1558459614fbdc1b3209f1b9e5767a443d9bdfe681a49c652b5f392799d58d" + +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 +} + +SYSTEMD_SERVICE_${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +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 +} + +FILES_${PN} += "run" +FILES_${PN} += "${base_libdir}/drbd" +FILES_${PN}-dbg += "${base_libdir}/drbd/.debug" diff --git a/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb b/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb deleted file mode 100644 index 5439bac..0000000 --- a/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb +++ /dev/null @@ -1,57 +0,0 @@ -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" - -SRC_URI = "http://oss.linbit.com/${BPN}/8.4/${BPN}-${PV}.tar.gz \ - file://drbd.service \ - " - -#SRC_URI[md5sum] = "ef4e6db51cda1898c597a3d61fcb9e1e" -#SRC_URI[sha256sum] = "7c1558459614fbdc1b3209f1b9e5767a443d9bdfe681a49c652b5f392799d58d" - -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 -} - -SYSTEMD_SERVICE_${PN} = "drbd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -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 deleted file mode 100644 index 22f853f..0000000 --- a/meta-oe/recipes-extended/drbd/files/drbd.service +++ /dev/null @@ -1,12 +0,0 @@ -[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 - -[Install] -WantedBy=multi-user.target -- 1.9.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] drbd: add recipe 2014-12-10 9:01 ` [PATCH 1/1] drbd: add recipe Bian Naimeng @ 2014-12-10 11:39 ` Martin Jansa 0 siblings, 0 replies; 3+ messages in thread From: Martin Jansa @ 2014-12-10 11:39 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 7104 bytes --] On Wed, Dec 10, 2014 at 05:01:28PM +0800, Bian Naimeng wrote: > DRBD is a block device which is designed to build high availability clusters. drbd wasn't merged to meta-oe yet, so this should be adding it to meta-networking, not moving it. > > Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> > --- > .../recipes-support/drbd/drbd/drbd.service | 12 +++++ > meta-networking/recipes-support/drbd/drbd_8.4.4.bb | 58 ++++++++++++++++++++++ > meta-oe/recipes-extended/drbd/drbd_8.4.4.bb | 57 --------------------- > meta-oe/recipes-extended/drbd/files/drbd.service | 12 ----- > 4 files changed, 70 insertions(+), 69 deletions(-) > create mode 100644 meta-networking/recipes-support/drbd/drbd/drbd.service > create mode 100644 meta-networking/recipes-support/drbd/drbd_8.4.4.bb > delete mode 100644 meta-oe/recipes-extended/drbd/drbd_8.4.4.bb > delete mode 100644 meta-oe/recipes-extended/drbd/files/drbd.service > > diff --git a/meta-networking/recipes-support/drbd/drbd/drbd.service b/meta-networking/recipes-support/drbd/drbd/drbd.service > new file mode 100644 > index 0000000..6b6ab30 > --- /dev/null > +++ b/meta-networking/recipes-support/drbd/drbd/drbd.service > @@ -0,0 +1,12 @@ > +[Unit] > +Description=DRBD Service > +After=network.target > + > +[Service] > +Type=oneshot > +RemainAfterExit=yes > +ExecStart=@LIBEXECDIR@/drbd-helper startxxx > +ExecStop=@LIBEXECDIR@/drbd-helper stop > + > +[Install] > +WantedBy=multi-user.target > diff --git a/meta-networking/recipes-support/drbd/drbd_8.4.4.bb b/meta-networking/recipes-support/drbd/drbd_8.4.4.bb > new file mode 100644 > index 0000000..abf4554 > --- /dev/null > +++ b/meta-networking/recipes-support/drbd/drbd_8.4.4.bb > @@ -0,0 +1,58 @@ > +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" > + > +RDEPENDS_${PN} += "bash perl" > + > +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[md5sum] = "ef4e6db51cda1898c597a3d61fcb9e1e" > +#SRC_URI[sha256sum] = "7c1558459614fbdc1b3209f1b9e5767a443d9bdfe681a49c652b5f392799d58d" Why do you keep this comment? > + > +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 > +} > + > +SYSTEMD_SERVICE_${PN} = "drbd.service" > +SYSTEMD_AUTO_ENABLE = "disable" > + > +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 > +} > + > +FILES_${PN} += "run" > +FILES_${PN} += "${base_libdir}/drbd" > +FILES_${PN}-dbg += "${base_libdir}/drbd/.debug" > diff --git a/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb b/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb > deleted file mode 100644 > index 5439bac..0000000 > --- a/meta-oe/recipes-extended/drbd/drbd_8.4.4.bb > +++ /dev/null > @@ -1,57 +0,0 @@ > -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" > - > -SRC_URI = "http://oss.linbit.com/${BPN}/8.4/${BPN}-${PV}.tar.gz \ > - file://drbd.service \ > - " > - > -#SRC_URI[md5sum] = "ef4e6db51cda1898c597a3d61fcb9e1e" > -#SRC_URI[sha256sum] = "7c1558459614fbdc1b3209f1b9e5767a443d9bdfe681a49c652b5f392799d58d" > - > -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 > -} > - > -SYSTEMD_SERVICE_${PN} = "drbd.service" > -SYSTEMD_AUTO_ENABLE = "disable" > - > -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 > deleted file mode 100644 > index 22f853f..0000000 > --- a/meta-oe/recipes-extended/drbd/files/drbd.service > +++ /dev/null > @@ -1,12 +0,0 @@ > -[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 > - > -[Install] > -WantedBy=multi-user.target > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-10 11:39 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-12-10 9:01 [PATCH 0/1] Move drbd from meta-oe to meta-networking Bian Naimeng 2014-12-10 9:01 ` [PATCH 1/1] drbd: add recipe Bian Naimeng 2014-12-10 11:39 ` Martin Jansa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.