From patchwork Fri Sep 27 21:46:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 174660 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4090455ill; Fri, 27 Sep 2019 14:47:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqyq6WgeSgGuaJ6lIwK8SmsUX61CpyTwqX2RIsgSNClGOZJ3CD7LXaLhbWpXGwgvm5gO1dE7 X-Received: by 2002:a17:902:2e:: with SMTP id 43mr5350914pla.55.1569620831831; Fri, 27 Sep 2019 14:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569620831; cv=none; d=google.com; s=arc-20160816; b=wqPS2B+gL3Thgr/uuIAvdcqhUBXQVPmT6HMYrNcsicOY8VSR7o0bLklDkwhPK78BCB dW1nYMl1w7PflBx5T0iEm1CWSNA3ksZraLm2v+VFsF0f+aK8CED6Kog6mCEAhgIIAvVc A5dzT2DIO0i79Jj1x2UdBk07hqPUGdZwn88EKJMWRBaic75SOx2gOw/7A3jt3uanXee4 pOD3GDPVbztttt1NH520vXTSkQlkdy0d8Ly6LeuxYyNfWUzz0BzpWaeBLDa1wkex3q6H FviaT4RgOqgKfH5hLudMsUCAMWr8KdbnRRUO3HjE8pudCHbRWNPOuUm07PX8zjyfdFbd nY5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=ODRN2UDsrLb1/powq6AxfnT26cyfj/1V7a0E0uqCrbA=; b=eWQcA3JcBkixllXYOsU7+MsgPJ3TeICTkmwbse3ehLkmCrp3aHe1oG1W4Wt23BwT1W gcJy2Oswt+1PNBbXvvNTZhChXHQJ57e4Z7VBKmpOIX3lYsIl5ipkqGM6TtCVTWhZPJ28 fJkMYK8onZ8jwFYXTVg7m+CbMtiloxBFv0904LLx37rahPRpWjVvi+lKQJRXA4Gu2O5b rn2QaE1WP9vr/wpaPynP/beyorfl6WWdXNOIIq/kb3AlWEopffPfxeEeWksRMXGYIE7j C54qhOpDLk+bjwf/gV6g+bgs0cSX8gQ6iwQjP8XC/wNSKNAHqNhZEr636AsnYvPd7jFG zEjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OpfgdP2Q; 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 s18si7167800pgg.71.2019.09.27.14.47.11; Fri, 27 Sep 2019 14:47:11 -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=OpfgdP2Q; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1D5CB7F375; Fri, 27 Sep 2019 21:47:07 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mail.openembedded.org (Postfix) with ESMTP id 3FF227D25F for ; Fri, 27 Sep 2019 21:47:04 +0000 (UTC) Received: by mail-pg1-f176.google.com with SMTP id s1so4137681pgv.8 for ; Fri, 27 Sep 2019 14:47:05 -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:mime-version :content-transfer-encoding; bh=A1hqHT2GS4lXFP/EM/3oYPkE+KY6Wnp3FAQ73PDxdHE=; b=OpfgdP2QR+PDOlUpl3QqRzBJe1pWO0UgDA8SIgHkEz3uXdzLx65hjiVQx06x89qJIr KuIGUKwyh+k6QvCG8d3vj9s5DoF85Pz7CiTS6AvP/JXCWpYQDy01uhsDfhB4SJsHaUdM 38vewkMcfq5NfqdlixDAFLCS/h/vU1VsbX29rH9Cp9udVuMnmPnuXdp+5Qaf8eTHw/oO ww9jD/rvBQ9kT/inqkYyJy2ck2+z7fIHGExgcbWQE3onLoezjduhL4dCx5ZWVFSWbbT4 LbjESOZ1eB0nXuYNPqTbzPE2sDE8r8hci92mDcGEf+1PidwheNje01auP1rsM4+4vp88 WUqQ== 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:mime-version :content-transfer-encoding; bh=A1hqHT2GS4lXFP/EM/3oYPkE+KY6Wnp3FAQ73PDxdHE=; b=A3YdO0gNqTh1CEtz77ZsJCkuibyXf1yupitzifmESPoe++0ZbqD+PdKVSWsgLbk8vM NIVLz3Z3Aqr6u3Z7CbNSazavro5WN90YDk/2YVCnh7tjiuFDA5vGdM9i5LlyoW7km5Fc bGaD3ireASUlW1K5A6+h7NkNSp8uXbcNSNzPEhbZHrpIg5/WP/9qGPXJxC3SiVoSFTIE bM6qKwcU1E/VykUim0oIkD4sDhgpkcjbCLO+bP3p3fUjIWWCCqmnntVffjIKrXu50GBx U05f1KLe+lysA4NKCYGr+hIT2iulXxn9OhIvpdvzLOm51nVIpKEfuyOe+fWfoEHFY3cn QxGw== X-Gm-Message-State: APjAAAWiYEaWciNVHuCPUmii4pJVfvnnypat8E/CAb04UgUWeiaegZ6l 3lfF97KiXRt8uQUDdM4p3tRKq25lfRc= X-Received: by 2002:a62:cb:: with SMTP id 194mr7225189pfa.130.1569620824726; Fri, 27 Sep 2019 14:47:04 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id g20sm3352513pfo.73.2019.09.27.14.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 14:47:04 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 27 Sep 2019 14:46:53 -0700 Message-Id: <20190927214653.2627591-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH] opensaf: Fix duplicate copies of shared libs in package 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: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org some plugins are installed into libdir/opensaf but we were making a copy into libdir as well, this patch changes that so the packaged files are appearing only once create_empty_library should be using cross compiler with linker flags, existig code in this area is not cross compile friendly skip dev-elf QA test since some .so are stubs Signed-off-by: Khem Raj --- ...rary-Use-CC-variable-intead-of-hardc.patch | 23 +++++++++++++++++++ .../opensaf/opensaf_5.19.07.bb | 6 +++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch -- 2.23.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch new file mode 100644 index 0000000000..21abcf75b5 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch @@ -0,0 +1,23 @@ +From 300fd3e27e71a91fc52d3f985ed4fde548852853 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 27 Sep 2019 12:50:11 -0700 +Subject: [PATCH] create_empty_library: Use CC variable intead of hardcoding + gcc + +This ensures that cross-compiles can succeed, otherwise we get wrong +architecture on these stub libraries + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + scripts/create_empty_library | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/create_empty_library ++++ b/scripts/create_empty_library +@@ -66,4 +66,4 @@ for s in $symbols; do + echo "SaAisErrorT $s() { return SA_AIS_ERR_UNAVAILABLE; }" >> "$tmpdir/lib.c" + done + rm -f "$1" +-gcc -O2 -shared -fPIC "$tmpdir/lib.c" -Wl,-version-script="$2" -Wl,-soname="$libbase.so.$version1" -o "$1" ++$CC -O2 -shared -fPIC "$tmpdir/lib.c" -Wl,-version-script="$2" -Wl,-soname="$libbase.so.$version1" -o "$1" $LDFLAGS diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb index 3df6824ff3..7ce54c3a31 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.19.07.bb @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ file://0001-Add-configure-time-check-for-gettid-API.patch \ + file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ " SRC_URI[md5sum] = "e9ae9de803a99b7ab33757a49858542f" SRC_URI[sha256sum] = "caed672d03ab1fe3f27d333429c7ca03022714e7c6350500208b7bd7349f03ce" @@ -44,13 +45,11 @@ PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" -PKGLIBDIR="${libdir}" CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" do_install_append() { - cp -av --no-preserve=ownership ${B}/lib/.libs/*.so* ${D}${libdir} rm -fr "${D}${localstatedir}/lock" rm -fr "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" @@ -70,3 +69,6 @@ RDEPENDS_${PN} += "bash python" # http://errors.yoctoproject.org/Errors/Details/186970/ COMPATIBLE_HOST_libc-musl = 'null' + +INSANE_SKIP_${PN}-dev += "dev-elf" +