From patchwork Sun Aug 19 23:04:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 144541 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3304237ljj; Sun, 19 Aug 2018 16:05:01 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzA9xxieaG07YxewhySF/0V6+LI9efq8P06UhYD9n6w24JJbDhVUhe6K1ClqkRLnD2A6cvn X-Received: by 2002:a63:3741:: with SMTP id g1-v6mr6398321pgn.59.1534719901554; Sun, 19 Aug 2018 16:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534719901; cv=none; d=google.com; s=arc-20160816; b=kpRlaqHGrgdIU0JxIOe/qsfTvvz7+ff1RNTaYUZDcqaWG3Zk66WDRST5Y9qYqHgPV+ N2k4Sy0eiTaFvBMwrdhmCF7HZ2OixrPEO8BPcWZI4cin/yF7A9zlGGFTBk2h5I/iCIio H5WCzX68asiY/6/9kJb4FsHNnmTbk1KXkpYMtdIzuaEHgeA3YcH1D3x1kC2FS5W1HGUF q8qSduNRRqNArA/QoHm/fp2DFNsYRldO+VwNwkeKA7pjgzudVdKQVo9ZH08WZQkfaNVN NcUNAOQDnkAW0GcAKyuieGLyJ0TQ2VgfDMHSvExDOiockil5+qWIkgDkmtF31hL/uts1 F+Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=VzNvPjlr+MnZpwzFMC0kblXNv3Z/MdS4PLnM1XRtL/k=; b=xWilpZ5kkB51f6oOvrfhQwCCzyhFOwOwaOw2l/qwlqjDsOIYM6EnI2SHRPs+Sm2CXk Gr325TBB6Y8B9X8jYxJ+WFdRnLeN5MW0U+J5vsIe53SXJUe4zdiClyK6tJR/ZqfbL5L5 Nn9W6cqGgfFv9gqSYervBeDDnZg7cUiO+L0f52imfDG8ROFV5aKdSGAcTy1wzeZFoZf9 ZEoRllHslV3ndvcybvpfzOAg43OTFS+ErEo+7yZp3c65U8vXLlbjYmZEhcjMy9LSP5J8 5uCIKSdCScYA9UIPA7P+RGB3UzVK4hpxlMOBGtvkXuwOqZExwJ6nZKYgc4/o78z2doNn 2TGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N2d1CLyA; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f23-v6si7900180pgj.282.2018.08.19.16.05.00; Sun, 19 Aug 2018 16:05:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N2d1CLyA; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B928D7914C; Sun, 19 Aug 2018 23:04:54 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mail.openembedded.org (Postfix) with ESMTP id DADE97934A for ; Sun, 19 Aug 2018 23:04:52 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id z25-v6so1150315pgu.7 for ; Sun, 19 Aug 2018 16:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=csRVd28eWLvZ3Jvr3WMNf40WMVfeZXT0xmaBDsp0GPs=; b=N2d1CLyAxIEF7A/bAvipGTJebWGm2HZUvzuz+LnqtUl0IURjep48K7cgwrRskBrpDn cImfQ9JB84nYTqPFmRvU20DlPCk919+6pYpg47ddUEmAd8T4cpHS3fTRpUk+b9kki8rp bqqC0foUmlZA6LrCnkIcB+I4Q0Uv9SsiaQCxY3beVHP/PftIUzcMI99GX7M0RmzYSKYF yoflTCsxzV+DWNhM2sqrRKcx+7+cJkRf3lRcWFwzck/9g469r/UCuK/lpo1iRf6Q11Ag 3oG5THT8duCFKX+nEP9hhp5JShi0XnxO0S/P12R13svSIKW13zqzWGSqbISDbNTiIHs2 KMaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=csRVd28eWLvZ3Jvr3WMNf40WMVfeZXT0xmaBDsp0GPs=; b=mrYwPmo0GodX4mB9nG9JPAZQ7hKySLqrbopLT5qa0gvmciPAikxUufJvaEKgIZGKhI LpM5WFvX/AgOf1EqDHcVfsiKqUEDWXQvKzwZUI88RFVS2JwksT+PqwUq0mYgE3VYaxLE ocB8GLmYvZFAVJ/h7wr/kzNidAfZZnHYZabIRtDsR5a65UVHlsJQxi3Ff4yrAeL3Z0PV p41koezymdgXwy/Tu+51Yt0tX6+u3MpV6GSpDifX2TPa5s3BMb9ssCq1V/9LKgUAiYKM 4Izg0RS/4Dhkkog2WeObh0VCvCj4WO3d/sT4j0pYTtHcJIZalG1XI4CDkefJziukCnPS EZ0A== X-Gm-Message-State: AOUpUlF03YWkHJGF2bKu7ojBsOFkwhnhhsKioMImuU0n6i0PxjgZ2xF2 IFiVT5eXeY5c52jZO0XVaWyEmrz6 X-Received: by 2002:a62:d74f:: with SMTP id v15-v6mr14123873pfl.257.1534719893415; Sun, 19 Aug 2018 16:04:53 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::4add]) by smtp.gmail.com with ESMTPSA id m15-v6sm14241217pfk.149.2018.08.19.16.04.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Aug 2018 16:04:52 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 19 Aug 2018 16:04:43 -0700 Message-Id: <20180819230444.42440-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [oe] [meta-networking][PATCH 1/2] dlm: Build fence only when pacemaker recipe is available X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org pacemaker is not in meta-networking, and therefore dlm fails to build when meta-cgl is not included, this changeset makes the pacemaker dependency to be optional, and disabled by default so users who have pacemaker in the bbfiles should enable pacemaker support via a bbappend or setting it in config metadata Signed-off-by: Khem Raj --- meta-networking/recipes-extended/dlm/dlm_4.0.7.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb index f7f7e188c5..18843a61f8 100644 --- a/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb +++ b/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb @@ -20,17 +20,24 @@ UPSTREAM_CHECK_REGEX = "dlm-(?P\d+(\.\d+)+)" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" -DEPENDS = "corosync systemd pacemaker" +DEPENDS = "corosync systemd" inherit pkgconfig systemd distro_features_check +PACKAGECONFIG ??= "" + +PACKAGECONFIG[pacemaker] = ",,pacemaker" + SYSTEMD_SERVICE_${PN} = "dlm.service" SYSTEMD_AUTO_ENABLE = "enable" export EXTRA_OEMAKE = "" +DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" + do_compile_prepend() { sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile + sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile } do_compile () { From patchwork Sun Aug 19 23:04:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 144542 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3304553ljj; Sun, 19 Aug 2018 16:05:24 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyrvnvheFk5YGOBgX/xbCg/sCengIRjSTuBZ4GszAmODyy9nbn/9xmSt5riFVULmgfECeGj X-Received: by 2002:a63:ec43:: with SMTP id r3-v6mr40157019pgj.295.1534719924093; Sun, 19 Aug 2018 16:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534719924; cv=none; d=google.com; s=arc-20160816; b=zL4EwYPlYglyvDWr+jjnvqk3rx7j4E+Kn8CK6I9iMCbwzyPH8UCgPNJQPPz92To9gS wqw/VSyBO39po7E61V1R87wjkZypBrQSN0BVf5ha7cqGlmAFE/1R3nMcFf1m/G6ieFep PTWwQWzaLv7Amnvk1QsuG0bmwW8GAlbK9JMldAmdHxNbJdtra01oLXkV6CzD1Yw8R0cf wCcOiG9NBWOM3PM3t6XhB7Nz/ym3rjswJ4PW/DsJnR0otLKoYZv2mS6fVS7TrOPcb2u4 fIhGEV5s3ftjNTO2mT0S3T11YlJ6pr7v4saiUirUfKeMP7YKlQx3O1K/NxxuJExuJBu/ YDaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=gArhzivT0qEJ9bi8pfa1Hzqp9O/uSZpJXzuyJSlS7nU=; b=jvpKDmHJmAyPHAGNX1UHJNr5FN8XuP7viIAX/N5A65W83+wGUNLLu/39sjTVDowj5w ucBL8cfm5WJzFlOM5oZqFNq/7Jxu/b5gDxIA5vbAIUOObClb+GhRjajrJ9QHz2Kh/KZC hFZEw9O6ZOz+MBkXadKYJ8ciz1BTZRvyyla6tjOltLdht1HVpwWTuLEKJXQqDADP7i9C CSplPXO/rQhATyIdadAiZ17z+bVTbmZSqDsoKKU2KjsR4+q37U7tDYiEP4dl+cRMqGz4 Rk98KcwwlJG1o/3BW3YYZ7ngvQyo39G9lWyaFQie0+RY7f9em8Get7IOzuoCmWKeJrC+ OI3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MLXvtyx1; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x18-v6si8569101pll.88.2018.08.19.16.05.23; Sun, 19 Aug 2018 16:05:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MLXvtyx1; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EFF4379361; Sun, 19 Aug 2018 23:05:20 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mail.openembedded.org (Postfix) with ESMTP id 6350B7934A for ; Sun, 19 Aug 2018 23:04:53 +0000 (UTC) Received: by mail-pf1-f169.google.com with SMTP id i26-v6so5790884pfo.12 for ; Sun, 19 Aug 2018 16:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RrtDo1C60HztkhxH63ds8UFzZeN31pEsXTUKckeDq3s=; b=MLXvtyx12HG3JyotWXegNytX479yxzocb+KYSYkrDTuif07VoM7s0WXR1ruQhpCGJe g6gp/5oHkDa/1VB0vroXsjW0rFiwCteN3KLAOlrG3skJLBiQgLJADx8fBDUG5jQedZ4/ beuqMLRbpQco4T+NFlGZ+892iXULsjrq5vn0Q+9oBTOtwiUzbyceH5y5bDX3Izx8CKq0 OHZeIeIJYcem7iM+S+A+WNzfSPYkcLnHXF1Ui+Jvzk8iXtJFO+Ky2G5yR412+yGEcujj zE6LMkqxRIsGMKWr9fNbU9XRvUQzgQGvbpNbvoce86RUuS4ctMLsSUw3vz20FLjsYC85 8CMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RrtDo1C60HztkhxH63ds8UFzZeN31pEsXTUKckeDq3s=; b=j4i6dkyR1ye+IgSHs+SamKTTKL7WCqpXSK3JANBWAdgb2X9CojKkFggqrdEj8Yom0R VC+2Zww8MLj2rrkR8IjiPMF9qr4yNQdr2OL5Rur7dGNFYdfb1cUbXPU+SCbu0zGWGqnH WZQY8xIUvxkfi2GSzmhqJ7A7mAvlHFcgi3uIx+g+vYU5iQsJ6LS4KygIwp+C9MrBw8v9 Eu8F/WQYHeGfE3UQyH3X3Ho/oMXlQQbVf6jknrL9uQKaxGYprkeyx/JHhWsZ2bx308gd KP6eYVxzsYByoUK4yQiJ5QsIOEjseFUU5zebmU7C7qfOvtZeseNLJya2nhOiEbRZejx8 nRGA== X-Gm-Message-State: AOUpUlGYpNWDA9euqiq1RwJ8BbiK7Pf1hM2unP3qbU4NUgbbElFpY1wO 3MhJdnZZdHVzKsWbD0FiTx8F8Oo0 X-Received: by 2002:a63:6343:: with SMTP id x64-v6mr10634027pgb.173.1534719894150; Sun, 19 Aug 2018 16:04:54 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::4add]) by smtp.gmail.com with ESMTPSA id m15-v6sm14241217pfk.149.2018.08.19.16.04.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Aug 2018 16:04:53 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 19 Aug 2018 16:04:44 -0700 Message-Id: <20180819230444.42440-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180819230444.42440-1-raj.khem@gmail.com> References: <20180819230444.42440-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 2/2] dlm: Fix build with glibc 2.28+ X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...acros.h-for-major-minor-macros-in-gl.patch | 41 +++++++++++++++++++ .../recipes-extended/dlm/dlm_4.0.7.bb | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch b/meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch new file mode 100644 index 0000000000..6f9a0a45a3 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch @@ -0,0 +1,41 @@ +From a55ab8a07770296bf6a622df14f2f0445be16327 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 Aug 2018 15:58:49 -0700 +Subject: [PATCH] Include sys/sysmacros.h for major/minor macros in glibc 2.25+ + +sys/sysmacros.h was included though sys/types.h until 2.28 +glibc release removed it therefore it must be included +explicitly now. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + dlm_controld/action.c | 2 ++ + libdlm/libdlm.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/dlm_controld/action.c b/dlm_controld/action.c +index 84637f1..2b8ad6c 100644 +--- a/dlm_controld/action.c ++++ b/dlm_controld/action.c +@@ -8,6 +8,8 @@ + + #include "dlm_daemon.h" + ++#include ++ + #include + #include + +diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c +index a9e6195..499eb6a 100644 +--- a/libdlm/libdlm.c ++++ b/libdlm/libdlm.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb index 18843a61f8..027864a1a7 100644 --- a/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb +++ b/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb @@ -9,7 +9,8 @@ SRC_URI = "https://releases.pagure.org/dlm/${BP}.tar.gz \ file://respect-ldflags-also-from-bin_ldflags.patch \ file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \ file://0001-dlm-fix-package-qa-error.patch \ -" + file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ + " SRC_URI[md5sum] = "aa604a10d5ac2d3414eb89ec6984cd12" SRC_URI[sha256sum] = "639ddfc82369272a68d56816689736c00b8f1b6b2869a6b66b7dbf6dad86469a"