From: Mark Hatle <mark.hatle@windriver.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: [PATCH 15/31] dlm: requires corosync, from meta-networking
Date: Wed, 6 Sep 2017 14:23:13 -0500 [thread overview]
Message-ID: <1504725809-12825-16-git-send-email-mark.hatle@windriver.com> (raw)
In-Reply-To: <1504725809-12825-1-git-send-email-mark.hatle@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../respect-ldflags-also-from-bin_ldflags.patch | 36 +++++++++++++++
meta-networking/recipes-extended/dlm/dlm_4.0.2.bb | 51 ++++++++++++++++++++++
.../respect-ldflags-also-from-bin_ldflags.patch | 36 ---------------
meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 51 ----------------------
4 files changed, 87 insertions(+), 87 deletions(-)
create mode 100644 meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
create mode 100644 meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
delete mode 100644 meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
delete mode 100644 meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
diff --git a/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
new file mode 100644
index 0000000..69b2f90
--- /dev/null
+++ b/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
@@ -0,0 +1,36 @@
+diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
+--- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200
++++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200
+@@ -55,7 +55,7 @@
+ BIN_CFLAGS += -fPIE -DPIE
+ BIN_CFLAGS += -I../include -I../libdlm
+
+-BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
++BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
+ BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
+
+ LIB_CFLAGS += $(BIN_CFLAGS)
+diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile
+--- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200
++++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200
+@@ -32,7 +32,7 @@
+ BIN_CFLAGS += -fPIE -DPIE
+ BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld
+
+-BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
++BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
+ BIN_LDFLAGS += -L../libdlm -L../dlm_controld
+ BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol
+
+diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
+--- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200
++++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200
+@@ -59,7 +59,7 @@
+ BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
+
+ LIB_CFLAGS += $(BIN_CFLAGS)
+-LIB_LDFLAGS += -Wl,-z,relro -pie
++LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie
+
+ ifeq ($(USE_SD_NOTIFY),yes)
+ BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \
diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
new file mode 100644
index 0000000..31e411e
--- /dev/null
+++ b/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "dlm control daemon and tool"
+
+SECTION = "utils"
+HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage"
+
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \
+ file://respect-ldflags-also-from-bin_ldflags.patch \
+"
+
+SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f"
+SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e"
+
+LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
+LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
+
+DEPENDS = "corosync systemd"
+
+inherit pkgconfig systemd distro_features_check
+
+SYSTEMD_SERVICE_${PN} = "dlm.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+export EXTRA_OEMAKE = ""
+
+do_compile_prepend() {
+ sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile
+}
+
+do_compile () {
+ oe_runmake 'CC=${CC}'
+}
+
+do_install_append (){
+ install -d ${D}${sysconfdir}/sysconfig/
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm
+ install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
+
+ # install systemd unit files
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system
+ fi
+}
+
+do_install() {
+ oe_runmake install DESTDIR=${D} LIBDIR=${libdir}
+}
+
diff --git a/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
deleted file mode 100644
index 69b2f90..0000000
--- a/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200
-+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200
-@@ -55,7 +55,7 @@
- BIN_CFLAGS += -fPIE -DPIE
- BIN_CFLAGS += -I../include -I../libdlm
-
--BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
- BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
-
- LIB_CFLAGS += $(BIN_CFLAGS)
-diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile
---- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200
-+++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200
-@@ -32,7 +32,7 @@
- BIN_CFLAGS += -fPIE -DPIE
- BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld
-
--BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
- BIN_LDFLAGS += -L../libdlm -L../dlm_controld
- BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol
-
-diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200
-+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200
-@@ -59,7 +59,7 @@
- BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
-
- LIB_CFLAGS += $(BIN_CFLAGS)
--LIB_LDFLAGS += -Wl,-z,relro -pie
-+LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie
-
- ifeq ($(USE_SD_NOTIFY),yes)
- BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \
diff --git a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb b/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
deleted file mode 100644
index 31e411e..0000000
--- a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "dlm control daemon and tool"
-
-SECTION = "utils"
-HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-
-SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \
- file://respect-ldflags-also-from-bin_ldflags.patch \
-"
-
-SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f"
-SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e"
-
-LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
-
-DEPENDS = "corosync systemd"
-
-inherit pkgconfig systemd distro_features_check
-
-SYSTEMD_SERVICE_${PN} = "dlm.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-export EXTRA_OEMAKE = ""
-
-do_compile_prepend() {
- sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile
-}
-
-do_compile () {
- oe_runmake 'CC=${CC}'
-}
-
-do_install_append (){
- install -d ${D}${sysconfdir}/sysconfig/
- install -d ${D}${sysconfdir}/init.d/
- install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm
- install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
-
- # install systemd unit files
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system
- fi
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D} LIBDIR=${libdir}
-}
-
--
1.8.3.1
next prev parent reply other threads:[~2017-09-06 19:29 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 19:22 ` [PATCH 01/31] iproute2: Move tipc enablement to oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 02/31] libml: Move " Mark Hatle
2017-09-06 19:23 ` [PATCH 03/31] openipmi: Move to meta-networking requires net-snmp Mark Hatle
2017-09-06 19:23 ` [PATCH 04/31] glmark2: Set required distro features to opengl Mark Hatle
2017-09-06 19:23 ` [PATCH 05/31] openlmi-tools: Only build if the necessary python pieces are available Mark Hatle
2017-09-06 19:23 ` [PATCH 06/31] xorg-drivers: Add opengl distro flag requirement to ati and nouveau Mark Hatle
2017-09-06 19:23 ` [PATCH 07/31] boinc-client: Add distro flag, requires opengl Mark Hatle
2017-09-06 19:23 ` [PATCH 08/31] networkmanager-openvpn: requires openvpn from meta-networking Mark Hatle
2017-09-06 19:23 ` [PATCH 09/31] telepathy-python: Move to meta-python, requires python-dbus Mark Hatle
2017-09-06 19:23 ` [PATCH 10/31] networkmanager: Move to meta-networking, requires dnsmasq Mark Hatle
2017-09-06 19:23 ` [PATCH 11/31] python-ldap: Move to meta-networking, requires cyrus-sasl Mark Hatle
2017-09-06 19:23 ` [PATCH 12/31] python-networkmanager: Move to networking, requires networkmanager Mark Hatle
2017-09-06 19:23 ` [PATCH 13/31] corosync: Requires net-snmp from meta-networking Mark Hatle
2017-09-06 20:12 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 14/31] pywbem: Requires python-m2crypto-native (and others) from meta-python Mark Hatle
2017-09-06 19:23 ` Mark Hatle [this message]
2017-09-06 19:23 ` [PATCH 16/31] open-vm-tools: only build if meta-networking and meta-filesystems is available Mark Hatle
2017-09-06 19:23 ` [PATCH 17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack Mark Hatle
2017-09-06 19:23 ` [PATCH 18/31] enable_gnome.conf: Move the AVAHI_GTK setting Mark Hatle
2017-09-06 19:23 ` [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf Mark Hatle
2017-09-07 9:29 ` Andreas Müller
2017-09-07 13:45 ` Mark Hatle
2017-09-07 14:51 ` Andreas Müller
2017-09-07 15:08 ` Philip Balister
2017-09-06 19:23 ` [PATCH 20/31] libart-lgpg: Obsolete, replaced by version in oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 21/31] pinpoint: Add dependency on opengl for cogl Mark Hatle
2017-09-06 19:23 ` [PATCH 22/31] vim: Remove xfce vim bbappend Mark Hatle
2017-09-07 8:57 ` Andreas Müller
2017-09-07 13:52 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 23/31] layer.conf: Add meta-networking for the networkmanager Mark Hatle
2017-09-06 19:23 ` [PATCH 24/31] meta-xfce: depend on meta-multimedia Mark Hatle
2017-09-06 19:23 ` [PATCH 25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set Mark Hatle
2017-09-06 19:23 ` [PATCH 26/31] recipes-multimedia: Add LICENSE_FLAGS Mark Hatle
2017-09-06 19:23 ` [PATCH 27/31] " Mark Hatle
2017-09-06 19:23 ` [PATCH 28/31] libmtp: remove 'mtp-tools' from PACKAGES Mark Hatle
2017-09-06 19:23 ` [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete Mark Hatle
2017-09-06 19:58 ` Andreas Müller
2017-09-06 20:02 ` Mark Hatle
2017-09-06 20:13 ` Andreas Müller
2017-09-06 20:21 ` Mark Hatle
2017-09-06 20:35 ` Andreas Müller
2017-09-06 20:44 ` Mark Hatle
2017-09-06 20:53 ` Andreas Müller
2017-09-06 21:00 ` Mark Hatle
2017-09-06 23:40 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 30/31] florence: update 0.6.3 Mark Hatle
2017-09-06 19:59 ` Andreas Müller
2017-09-06 20:15 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete Mark Hatle
2017-09-06 20:01 ` Andreas Müller
2017-09-06 23:41 ` [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 23:49 ` Khem Raj
2017-09-06 23:59 ` Mark Hatle
2017-09-07 0:12 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1504725809-12825-16-git-send-email-mark.hatle@windriver.com \
--to=mark.hatle@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox