From patchwork Thu Sep 7 03:57:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111847 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp253992qge; Wed, 6 Sep 2017 20:58:20 -0700 (PDT) X-Received: by 10.84.210.107 with SMTP id z98mr1480406plh.79.1504756700558; Wed, 06 Sep 2017 20:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504756700; cv=none; d=google.com; s=arc-20160816; b=uyBcJE0ml02zZ5cII8xOnhjqt3RRIdrWTGbCr/EYtGBq0vutddJKHV/ZWH8tPxbpag yoHfY3Opu8K17qpQ9nj/BVcB/11XeFlNHAHc4Afdf/qx5Mym76k7DP2KJl6OMKpyyd/F tu6dOaFOZRMD6wOFiWx1rq+Y4OOqhiTjKXs0fduvk2ojVFx53GkG4zG/szp0oVpBVHe6 AoRGiBMp/cvNKcU41B5ub5CAtEnDpbaF7V4Lo59ZOHkCN/2XisKFfdO9QFNPMbQDD5ds FhawPoIHPk6fc/WwIDn63wlzQmhS+WlYx0yrZhkI09TiHgZ2C7ZExR2mRc5RCXL8jbXw Sc4A== 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=411qrXSUjAFFehVdtby2aow4qxHziEyKyveVtZ8LWMM=; b=xEsl8V15p6y0IHD2omH4ndf6WsWW18HDuUjcbKhFlz9fki5d27GPsm/V4bDPgUgBX5 OoO35xQKNdCRYCboMsVvdLNUnqaRVzQAhsO5NXBh79wzoPXqbX/Kag0+sKld7Ao6Idpl g2KPMxwMIerk79LkoTPD0cF74CMKEyKMuSRb94RD8wNG1u18fTjVgIJEatdMK/7NfeIb OukUsnDey6P7VD8bRl4nDfKExBbvOJqXKxcBe5j+F39tVPpQcUzEFkI0Ux0Mk0+Nvcpj L9gdlXKFOOdh3vt32P60WJKap8LkZkTgDc21YZ72BC52sPaJGgC2zoDCKkJtjzRnjAvI 156A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WFsjiOHc; 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=NONE 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 o33si1183566pld.350.2017.09.06.20.58.19; Wed, 06 Sep 2017 20:58:20 -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=WFsjiOHc; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9303F77D6B; Thu, 7 Sep 2017 03:58:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id B3AD771AB3 for ; Thu, 7 Sep 2017 03:58:11 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id g13so3628975pfm.2 for ; Wed, 06 Sep 2017 20:58:13 -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=K9yYnrG3dPgZ42HICI/qrxKSnyRQbPw2mzL5hF+rLOI=; b=WFsjiOHc1TeZJmbRzekhmvVhI7AkF0pQ+IH3QErfgkwQ/5NAqSN1GNb8BSlndUw1Hy el8M50rwf2jMF0Klc+sH+bixk+ltEmqjXLZ4ojoWxdQ4Bkx4kcK9N+gxxTEO5HCw7HM6 bCcWQEqeUliMGo2p3R4v5guzqmQfGrywpbmEDAtmeOZX1yIR25Sxvy58tM3wvPPpNmQ0 C7gw1/czEMi43FFZNfFh6oFYxNRFu7wh44rDUc74x4LOpwaU07M909zaMXlr0wg/rkTF zObPJkYC5uXgRVwJUFVW34nhWaHgAVuKO6hfJMuYpdFAnh3BNq7ejSfIcHGFRaKXLa7Z iDgw== 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=K9yYnrG3dPgZ42HICI/qrxKSnyRQbPw2mzL5hF+rLOI=; b=r2WumdRJWlMHr90cXwK8UOoAsZu45IBeBDTFKlqJj0NaB+q9nXPNwcIYTLTWG8R7Az Hm7egOk/khniTddVO5ezVggxQp0HJf6F+czh4OHXvlQV1/4dGebTOoH07M33q7m+elwY Q8QkcoraYZsm4Pe8bUiCCPV2XmppCqQwlbk2U6qV5/YEfVJRZI8N2bm9fRENF+CHNO+R m2fioQ2adbc5YfUDApidfBLnXteQyBISXukdPetnA/7HGaSxJez54HW6pjC67gOzlVS1 Qm+y3z7yd8/5LYexLKHfWqfinYaMP/AdFhfqtk+bzdIqwnScyIHSg9MUO+hBMdSh4dqP QiQA== X-Gm-Message-State: AHPjjUjKH+pvbS6SF3sCkWxvEfxe35Ae09kBPqq+7WbwZ/0jDX497nhZ IGRdgMJ2S4c51OnD X-Google-Smtp-Source: ADKCNb6GJ9QPyJXAynraxyBnzO9IdcpO/P/2oIUi0zq4M63Gpjf9jkpyA4Zb+hzX51ToDOkRk8w09A== X-Received: by 10.98.133.194 with SMTP id m63mr1438565pfk.44.1504756692718; Wed, 06 Sep 2017 20:58:12 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id 13sm1637379pfi.55.2017.09.06.20.58.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Sep 2017 20:58:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 6 Sep 2017 20:57:54 -0700 Message-Id: <20170907035758.41689-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [oe] [meta-filesystems][PATCH 1/5] aufs-util: Use cross strip tool 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 Honor the STRIP variable when passed from environment Fixes build with musl/raspberrypi Signed-off-by: Khem Raj --- .../aufs-util/0001-libau-Define-STRIP-weakly.patch | 39 ++++++++++++++++++++++ .../recipes-utils/aufs-util/aufs-util_git.bb | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch new file mode 100644 index 000000000..9efea804b --- /dev/null +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch @@ -0,0 +1,39 @@ +From bb8801fb21ac8d73e3b1a11a8555aaf822182a51 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Sep 2017 10:36:52 -0700 +Subject: [PATCH] libau: Define STRIP weakly + +STRIP can be set on environment to use cross version of strip utility +hardcoding to strip is not working in cross environment + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + libau/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libau/Makefile b/libau/Makefile +index 81520ac..c25eef2 100644 +--- a/libau/Makefile ++++ b/libau/Makefile +@@ -25,6 +25,7 @@ LibSoHdr = libau.h rdu.h + LibSoExport = $(addsuffix .exp, $(basename ${LibSoObj})) + LibSoExportErr = $(addsuffix .err, ${LibSoExport}) + LibSoVerScript = verscript ++STRIP ?= strip + + all: ${LibSo} + +@@ -77,7 +78,7 @@ ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} + ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} \ + -Wl,--version-script,${LibSoVerScript} \ + ${LDFLAGS} -o $@ $^ ${LDLIBS} +- strip -R EXP $@ ++ ${STRIP} -R EXP $@ + # readelf --syms --use-dynamic libau.so + + install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor} +-- +2.14.1 + diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 66f560c37..2e855e313 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -12,6 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \ https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \ file://aufs-util-don-t-strip-executables.patch \ file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \ + file://0001-libau-Define-STRIP-weakly.patch \ " SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19" SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18" @@ -26,7 +27,6 @@ do_configure_prepend() { sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ -e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \ ${S}/Makefile - sed -i -e 's;strip -R;${STRIP} -R;' ${S}/libau/Makefile } do_configure_append () { From patchwork Thu Sep 7 03:57:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111848 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp254326qge; Wed, 6 Sep 2017 20:58:45 -0700 (PDT) X-Received: by 10.84.128.4 with SMTP id 4mr1476925pla.171.1504756725776; Wed, 06 Sep 2017 20:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504756725; cv=none; d=google.com; s=arc-20160816; b=RwvDyIPq/wPPMcrkxYf4cf8ksVvilh0MY/eeQAG76037wnVTuTPs4C5BzE07fETbAS 3chhRb0WVh+u/Wyqlt+9+iD3hQuZMKbv4u8Ks47GXxSE2OpzZ+6r8RaCqAGuvAC/aZyu uvdYcq1HrHnHgp4pLZ+p4RR2MYzOPU9rZBSvvVWx3tPxtA16kAMuL6vLeIjvtvdYl4uf 7voB6aUf180WgIvf3Ks5wnxBKRpybsPre3AOHHD3ROL9o1wBqKl4O+F/YfYJzoR2zacZ CPFz2yOMCS9PNluceR4jNKgW0+G7cVqQTSjkIsRcceuwkqL9WaGvUASMKNzEbmzZXxPk bukQ== 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=9aYqd5dcLQ93TFJlOY5amuUuEb+dADdxbB0Ldoqr1Hk=; b=HleYfkFJR6Hmn9Jf9AoM1VMZY7RF0X1Fk6hM4bdzFtJCzNSBtp7JxclBOP7kETyAGw bbH2wAIUHX1E4IP72YA35Ajg6FXaUgK2Iom4UjaqxAvF1nz0nPahyMUFF9y+CYIqzxkV QhVUtMMAzeW3fOaS4hpm8G8o/E86ukmliN+I9vX3RN7lX29Yu7ykkg5PpIoKNsbi5MIT iAfa1cYTrZW5QDMx1eIGsyCfZmZRkRJV7EE85LInyLvJjOJBUpAEugNU5g7HQuEZH/fq NoLkTV8BVOZA6oztTx9E13uckeAQjoBX3Y/lo1tKUiZbR1PdIBut6+tMC49aMykQPeBR UEKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FIJL4h5l; 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=NONE 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 f10si1161742pln.584.2017.09.06.20.58.45; Wed, 06 Sep 2017 20:58:45 -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=FIJL4h5l; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4441E77E24; Thu, 7 Sep 2017 03:58:42 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id AE84177D6F for ; Thu, 7 Sep 2017 03:58:12 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id h4so577979pfk.0 for ; Wed, 06 Sep 2017 20:58:14 -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=BRqt2Zsqd6IgGpzaqaaMYahuaIhMWIZgbLk8iLtC2wU=; b=FIJL4h5lG7oD7IzJrHNwQUrF5wKK7YmkOBmnDmMzUYNAjphApFO7wLN4rkua9zAf3O aMdKHC9Qc455GNya8qMjAUXRGqAqZjxU/gxo5m1o1vcVBTRBxiaDPE1oXGOMg3Drs6lP KPxuXgVP2nG7NtG5MIVYygWD2Jo+2iriaVb5D4tNq+rpSccMwLhqZoxDiwo663wt2V23 kAkuYKlf61J23wBuxbN9xBgOEliRMDP/cimWi736bNQ152cFyjixbLNieK0ww1VjSaxn uRr65JCt5KjFVQKjHXs4UJQg+dcofKR3UFqvS1h+xul3cDvXz5tlEquCzc4Vo/F+HzG7 MspA== 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=BRqt2Zsqd6IgGpzaqaaMYahuaIhMWIZgbLk8iLtC2wU=; b=sBhVbvlKWnJJy7DoXS91PWXbnqD4VwY+9rR6N02hWL7D6gvAOYKn8MKdHF35W/yKsD RxwTS3lsIuUl923OctXwO+rRy4AWVt+R44RnAZQ73v5vTQUNwvhktDJvup7VWKvbhCAj vyQFS/iPPklkNzKyMsnW52wEQVEXvuyFKEZioseKwjo3cBZseHlzp0e+fsb8dgJ6PaHo fgEXymwzVmhnfuSlDGsU7q3lVq28dkg/9X/YDNb5Bw8C6PuXmYo6PcY745LUqJWFH+Tc fuj8N6PcRTjiRINXkrPfnuOj7V7WDTMwfswg1IHqvjAHKqb8lCTeJzbvSCQt4vyxbxre Fgzg== X-Gm-Message-State: AHPjjUhgnj2fUlKiULdC7HDc4eZya3dVu2labogEiYc3UooZplEZQSTm iE2JoStWNQmdnnKC X-Google-Smtp-Source: ADKCNb5TcgKGARjS3Ns7ZVsHnnVgChFSlium0V0n4d5rz2P/Nf52SA+qFEsXA4hiVk9Or2CQDAfTuQ== X-Received: by 10.98.12.19 with SMTP id u19mr1329904pfi.143.1504756693715; Wed, 06 Sep 2017 20:58:13 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id 13sm1637379pfi.55.2017.09.06.20.58.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Sep 2017 20:58:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 6 Sep 2017 20:57:55 -0700 Message-Id: <20170907035758.41689-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170907035758.41689-1-raj.khem@gmail.com> References: <20170907035758.41689-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH V2 2/5] leveldb: Fix build with clang 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 Add build parallelism, since we do not use oe_runmake Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...uild_detect_platform-Check-for-__SSE4_2__.patch | 36 ++++++++++++++++++ .../0002-makefile-build-SHARED_MEMENVLIB.patch | 43 ++++++++++++++++++++++ meta-oe/recipes-extended/leveldb/leveldb_git.bb | 6 ++- 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch create mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch new file mode 100644 index 000000000..bbabf688d --- /dev/null +++ b/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch @@ -0,0 +1,36 @@ +From 5fd0918df2bb30e8f3edb2ee895d178edbf26f40 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 4 Sep 2017 22:38:03 -0700 +Subject: [PATCH 1/2] build_detect_platform: Check for __SSE4_2__ + +just using -msse4.2 is not enough, especially with clang +where it may accept -msse4.2 even during cross compiling +for say arm, however the difference is that builtin defines +wont be defined. + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + build_detect_platform | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: git/build_detect_platform +=================================================================== +--- git.orig/build_detect_platform ++++ git/build_detect_platform +@@ -230,13 +230,12 @@ EOF + rm -f $CXXOUTPUT 2>/dev/null + + # Test if gcc SSE 4.2 is supported +- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null </dev/null | fgrep __SSE4_2__ $CXXOUTPUT 2>/dev/null </dev/null + fi + diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch b/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch new file mode 100644 index 000000000..fc708b23a --- /dev/null +++ b/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch @@ -0,0 +1,43 @@ +From 1ed8cec1fcf666904bb3ebd29fc85e235b72d122 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 4 Sep 2017 22:40:49 -0700 +Subject: [PATCH 2/2] makefile: build SHARED_MEMENVLIB + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index f7cc7d7..cb42278 100644 +--- a/Makefile ++++ b/Makefile +@@ -126,12 +126,12 @@ SHARED_VERSION_MINOR = 20 + SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) + SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) + SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) +-SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) ++SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB) + $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3) + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1) + $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3) + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2) +-SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a ++SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) + endif + + $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) +@@ -294,7 +294,7 @@ endif + + $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS) + rm -f $@ +- $(AR) -rs $@ $(SHARED_MEMENVOBJECTS) ++ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS) + + $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) + $(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS) +-- +2.14.1 + diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb index d44aa14d2..93ae2fdea 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb @@ -8,7 +8,9 @@ SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6" PV = "1.20+git${SRCPV}" SRC_URI = "git://github.com/google/${BPN}.git \ -" + file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \ + file://0002-makefile-build-SHARED_MEMENVLIB.patch \ + " S = "${WORKDIR}/git" @@ -17,7 +19,7 @@ inherit utils do_compile() { # do not use oe_runmake. oe_runmake pass to make compilation arguments and override # leveldb makefile variable CFLAGS and broke leveldb build. - CFLAGS="${CFLAGS}" make || die + CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die } do_install() { From patchwork Thu Sep 7 03:57:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111849 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp254400qge; Wed, 6 Sep 2017 20:58:53 -0700 (PDT) X-Received: by 10.98.61.17 with SMTP id k17mr1445527pfa.48.1504756733021; Wed, 06 Sep 2017 20:58:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504756733; cv=none; d=google.com; s=arc-20160816; b=HYS+GOdaPFZvrqvzlXkXn40NJran1P0i/5uVjIZiiKB1SQ6rNq38Scyruoi8SHoHBI 18WM6DL4y4IMUi8c+FYAv3b2tQ1eWuWooeGQ5jMMqXbfowAuA0O3trRicnGff0HLzZvY 9F5fgentY5HrbageD7SJhJ09Ws3Y+MfBvTE696bDCaH3moXcdJ2nqgtuYtoFaaO2g5qp PpVrtY/8jE+GkVI6kv3I6/qs7+JgCJRQbPaWpwQ2sY6inLWQgxPVRpcxIQvTS8fLqu21 yf9ZCw918w1bgPcYsbfrVM0ZNWH7+nNhnn2TDQ9CqmPp1i8j7c7ra9URmTJMbEKnkeKb U+Wg== 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=yxlc/eyjaL55GM55ZuFqG19d3w6QMDjC498QFwqzuAs=; b=YQw/2AJ4EiYRpvFLXzC94OQsubDcd9S8ErcykAh+LtZvaUFB9RM/msMW1eqG9jzDwU wst9cbh85R5s/DcWcjZgha5o2+b9jfAuUcQWhVKVvz929I0QDTq4VueDipM9VIJ/X5pV b2HUoTxVBmBHtVgEPm6X+c1UjeuOaOSFUYld9lgFHSWZH95LgN1z/N03IRIXu4XNOcfc XRLrPaqAmKDCRDucl7SbIdx2Tfo5SvI51iQhAlPSwT92KoGltFshHXcO1WBssaPjrNT+ 2knuvHtbJul4e+ED7flOjmqFn1pEsQJqV7iB4LI1OBU5mSv5Y4UjblgjCMME3vDvyL4a GWUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OFCiUr5C; 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=NONE 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 k27si1127269pfj.347.2017.09.06.20.58.52; Wed, 06 Sep 2017 20:58:53 -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=OFCiUr5C; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5CE0B77E3F; Thu, 7 Sep 2017 03:58:43 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id BFCEA77D6C for ; Thu, 7 Sep 2017 03:58:13 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id q76so3957573pfq.5 for ; Wed, 06 Sep 2017 20:58:15 -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=g9EQUm1i4Ey38yGuivRPtUvs897i+Drw2kjL0p3zqwc=; b=OFCiUr5C1SzVbgks1MYMfIEw5s1m/N4fZ3o+3u6l5H8c1pcCH3Cl5Meg4g1oAwDP7L n/9ywM10WVMXGUyHDZBP9gFFAB46WHvIGQ1qgY2mdTGuFXJ8JtZCJjO6isWKK5FYgIDW obpUBQx+qmAv9+b0n4N5qv5TldIOYMIjIogA3QW5JMTfOuJCe4EgqGP+E93E5C4fr5bd l6a9KcN2v1FNa3SThnsq4DitpT/OpkdOin69OOkdqTlSgDXukjmc2o89jbilDXK4Vl/u vcFB2bmDLOl+bnugXLdnrDVukopN8BuAeqK9JH2r2zEFizyJZzNMJIgn+bxCkAzh0ql9 k6eg== 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=g9EQUm1i4Ey38yGuivRPtUvs897i+Drw2kjL0p3zqwc=; b=TyBzlk0/aEALNanSkrJ5ee5ioAU7HNvNVgenr9rzjE1Y+xHmmjw1Z/8BYKpqZhGAO2 nkSUUJv/IbVUXkRAxju+V8niQPgbEQgYHcer0XLLMMXiXYSgXjaMphgUxE/sTDj3/Hy1 MIrYq4PQzo9qRJ70gADn9zmRPTJB6uQcuHc8FmaWjXV+Kk9/DlZ5TwCYCvfy+QOLYYQq hWDc0a42SO61A8T3mme2zAqnaz7gCi7LzxdaXvgW8Russb3UhoZ8Au0h1en2XgyUtE/5 Gu0v7FMqpgGN7V7NGnR/hVVVj1V7C3f44l5VaeoEk5kdigGdI4Y1I9uJhGy9qeXX1MkX 2/uA== X-Gm-Message-State: AHPjjUiSL0aw0fW7wr7e+XHrc+AlGO6tqzRMxc7QzeJ5skDG6FKBhWu6 o1xFkyFofAOujpPB X-Google-Smtp-Source: ADKCNb4AThmqUycuv7w6ppMHHYgefh+p2mw+VAgorp6n2YEvcYGGAz+oyIcZV29crGoWhHgbO0uatg== X-Received: by 10.98.217.220 with SMTP id b89mr1365036pfl.144.1504756695276; Wed, 06 Sep 2017 20:58:15 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id 13sm1637379pfi.55.2017.09.06.20.58.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Sep 2017 20:58:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 6 Sep 2017 20:57:56 -0700 Message-Id: <20170907035758.41689-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170907035758.41689-1-raj.khem@gmail.com> References: <20170907035758.41689-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/5] pm-qa: Upgrade to 0.5.2 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 --- meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb index 7322df8e7..315ab2115 100644 --- a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb +++ b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb @@ -4,12 +4,12 @@ HOMEPAGE = "https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/Test LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "0.4.14" +PV = "0.5.2" BRANCH ?= "master" # Corresponds to tag pm-qa-v0.4.14 -SRCREV = "9111d1930f02337394cf16e84ad2a27f33607cbb" +SRCREV = "05710ec5032be4c8edafb4109d4d908d31243906" SRC_URI = "git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH}" From patchwork Thu Sep 7 03:57:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111850 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp254498qge; Wed, 6 Sep 2017 20:59:02 -0700 (PDT) X-Received: by 10.84.231.133 with SMTP id g5mr1490987plk.188.1504756742542; Wed, 06 Sep 2017 20:59:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504756742; cv=none; d=google.com; s=arc-20160816; b=qvsQnNvh07ZHt7sCI2tUYlMHoKEkwHf3/ebWQ46TTB1bWkqufgU2ZU4xGkcDzgR3bS nqZC64HIWA553QqDz1+yyHGxeyNfY0/GO5c7Yg7TsWk67ut+Auh7AGE1LL9tzyGf6GKE 3+E1v0pG2M/Qg8G5sxWTbdzEnDD2AGUeTaFonxpyym2CO9+ov/v4PDnVKv7odYEADP+2 x9zSqW2Tmlz8/S49bu15QhHDxxod4GxuVwM3aD/I6EPK5oQYPm4iM8MFjld57i4dTAfU Noc0GQfsxZSE/iSonqARi/h318yG72KR6J20dkWNcpe0lhxleooEbU2+7ysL7gz4c016 CYKw== 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=CDbU+VPBqfHMzJ+IjQsjClMm+76aTIEeWKA+fXB7sPk=; b=f9HgX20R4HuITDwejh/q7TFtPYHtavXX6ppnzdvnaDtWVg2/wMspFg2un718wSPCJ1 q0u1Lf8y+CDvproveRYrfpTuHrlhFdXN/Gq01+CxmbufKcN5dFJojHMS4DJNnaRjtyRM hsrnoUUkYHquKPFWQx1HlU3LFJeXyeRzWnKshCEfxMRy61JUk+/UjokbTBso22Tr1AxY HMdTb2xV/9DBXiAObEGmPaX3j/nFLS1YtCdebv3xHnL5cKMYYOeqiRbqMzkGj28/XpPv nPp0WlCiGjZ8vVfktT6gUHpt4CLN/T4azjccavjd16M5FthPh8XPW5DCU0rbdQaTZ7AN gznQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WmjHzexc; 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=NONE 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 p61si1192901plb.287.2017.09.06.20.59.02; Wed, 06 Sep 2017 20:59:02 -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=WmjHzexc; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AA9EB77E55; Thu, 7 Sep 2017 03:58:47 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f54.google.com (mail-pg0-f54.google.com [74.125.83.54]) by mail.openembedded.org (Postfix) with ESMTP id 6151177D6F for ; Thu, 7 Sep 2017 03:58:15 +0000 (UTC) Received: by mail-pg0-f54.google.com with SMTP id m9so18863124pgd.3 for ; Wed, 06 Sep 2017 20:58:16 -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=bHqbEPKogR/K11rcSrxVXZAbEbH+JJvQQ0iWszlupGQ=; b=WmjHzexcGGr4TBZgzWLXBVeYzWFsJT8LZJ3TjO08JqPMG2P1oTjRU/Py5MbJpJKtQa uI5iqpMLJTzvqDmtyQkIn3UyRhDQnnDJRjctmlyUTaU7BcZ6qokHazRHjzb9hA1LagC5 L9bJGkMy6aS+zMS0nk5K5X1jDX/AvlVG65gbuXBC8OQUsKlM5/O2V0rIdleTPSChFXkq PITih36s2fTfhMx+83c2QEA8sjE/qLFlgzrk3yqU+lOeIF2qeZsgtwJbkq2Gu+0N8ULi XVtLmN5xVG6PVZIBwvOWF4ZrC3jLYpTX3eKtrbXnOlCJwZ0Qwa7T2HSSq0q7KGbubWBv vRQg== 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=bHqbEPKogR/K11rcSrxVXZAbEbH+JJvQQ0iWszlupGQ=; b=KIe1QT/3bHD2/YzTKNfT0fAtl+VZbV3dYhf2t2gheAP0JlUtRfJvHXs7FOqneNQIeJ cOO1PqIlkjCn6cBNH7kgWC3jajXP4n6SASQsY026Kjl1jIxlsPyf8TecL3clle5ysOAX iMeqrkNN30O4AeHti1GNymtrz3fFoDmQoAgdHJ6arAXHiZUtZPuLyqPYJSrITLu6WvMi yEr33JHi7uLErQEy+zn9/cpBdFwstihsaTGToJp3Yb2wqiKVQaetitiah5Azv48+mnU+ M3wc5JeamYCNjdwxkKDvUf+ENE2+J7xJTkiOwaNZfZySixp7wYQjDSl6Y9FRNxQNrwyU vd5w== X-Gm-Message-State: AHPjjUitH7+j8F0mXz7k6+d0+CeB9hh36OXKLdF743zYmBNGJr0BMgOu JxsE3IhuWWgrlBQp X-Google-Smtp-Source: ADKCNb5ttQye8h6cePonrBQZIOYyYBtzLrAuzpJfbfdG6mXcF5rrz1HJQOnL7BH8EgsCPzCwMivm9w== X-Received: by 10.159.207.139 with SMTP id z11mr1447322plo.335.1504756696210; Wed, 06 Sep 2017 20:58:16 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id 13sm1637379pfi.55.2017.09.06.20.58.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Sep 2017 20:58:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 6 Sep 2017 20:57:57 -0700 Message-Id: <20170907035758.41689-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170907035758.41689-1-raj.khem@gmail.com> References: <20170907035758.41689-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH V2 4/5] xfsprogs: Upgrade to 4.12.0 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 Fix cross builds with hardening flags Fix build with gold Specify libtool tag Signed-off-by: Khem Raj --- ...Rename-progname-as-it-is-provided-by-libc.patch | 204 +++++++++++++++++++++ ...0001-spaceman-Add-missing-link-to-libuuid.patch | 34 ++++ .../files/remove_flags_from_build_flags.patch | 13 ++ .../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 117 ++++++++++++ .../{xfsprogs_4.11.0.bb => xfsprogs_4.12.0.bb} | 9 +- 5 files changed, 375 insertions(+), 2 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-Rename-progname-as-it-is-provided-by-libc.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch rename meta-filesystems/recipes-utils/xfsprogs/{xfsprogs_4.11.0.bb => xfsprogs_4.12.0.bb} (82%) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-Rename-progname-as-it-is-provided-by-libc.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-Rename-progname-as-it-is-provided-by-libc.patch new file mode 100644 index 000000000..aa13b67be --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-Rename-progname-as-it-is-provided-by-libc.patch @@ -0,0 +1,204 @@ +From 95aaaa800e0dc387875b4e2adad480b72c1632ff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 2 Sep 2017 14:46:49 -0700 +Subject: [PATCH] Rename progname as it is provided by libc + +Rename local variable progname to avoid a clash with libc +global symbols + +Signed-off-by: Khem Raj +--- + io/init.c | 10 +++++----- + mdrestore/xfs_mdrestore.c | 10 +++++----- + quota/init.c | 10 +++++----- + spaceman/init.c | 8 ++++---- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/io/init.c b/io/init.c +index 20d5f80..e82e101 100644 +--- a/io/init.c ++++ b/io/init.c +@@ -23,7 +23,7 @@ + #include "init.h" + #include "io.h" + +-char *progname; ++char *io_progname; + int exitcode; + int expert; + int idlethread; +@@ -35,7 +35,7 @@ usage(void) + { + fprintf(stderr, + _("Usage: %s [-adfinrRstVx] [-m mode] [-p prog] [[-c|-C] cmd]... file\n"), +- progname); ++ io_progname); + exit(1); + } + +@@ -142,7 +142,7 @@ init( + xfs_fsop_geom_t geometry = { 0 }; + struct fs_path fsp; + +- progname = basename(argv[0]); ++ io_progname = basename(argv[0]); + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +@@ -186,7 +186,7 @@ init( + flags |= IO_NONBLOCK; + break; + case 'p': +- progname = optarg; ++ io_progname = optarg; + break; + case 'r': + flags |= IO_READONLY; +@@ -207,7 +207,7 @@ init( + expert = 1; + break; + case 'V': +- printf(_("%s version %s\n"), progname, VERSION); ++ printf(_("%s version %s\n"), io_progname, VERSION); + exit(0); + default: + usage(); +diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c +index 9d1b4e8..b840a54 100644 +--- a/mdrestore/xfs_mdrestore.c ++++ b/mdrestore/xfs_mdrestore.c +@@ -19,7 +19,7 @@ + #include "libxfs.h" + #include "xfs_metadump.h" + +-char *progname; ++char *mdrestore_progname; + int show_progress = 0; + int show_info = 0; + int progress_since_warning = 0; +@@ -30,7 +30,7 @@ fatal(const char *msg, ...) + va_list args; + + va_start(args, msg); +- fprintf(stderr, "%s: ", progname); ++ fprintf(stderr, "%s: ", mdrestore_progname); + vfprintf(stderr, msg, args); + exit(1); + } +@@ -194,7 +194,7 @@ perform_restore( + static void + usage(void) + { +- fprintf(stderr, "Usage: %s [-V] [-g] source target\n", progname); ++ fprintf(stderr, "Usage: %s [-V] [-g] source target\n", mdrestore_progname); + exit(1); + } + +@@ -212,7 +212,7 @@ main( + struct stat statbuf; + int is_target_file; + +- progname = basename(argv[0]); ++ mdrestore_progname = basename(argv[0]); + + while ((c = getopt(argc, argv, "giV")) != EOF) { + switch (c) { +@@ -223,7 +223,7 @@ main( + show_info = 1; + break; + case 'V': +- printf("%s version %s\n", progname, VERSION); ++ printf("%s version %s\n", mdrestore_progname, VERSION); + exit(0); + default: + usage(); +diff --git a/quota/init.c b/quota/init.c +index d45dc4c..46403de 100644 +--- a/quota/init.c ++++ b/quota/init.c +@@ -21,7 +21,7 @@ + #include "input.h" + #include "init.h" + +-char *progname; ++char *quota_progname; + int exitcode; + int expert; + bool foreign_allowed = false; +@@ -47,7 +47,7 @@ usage(void) + { + fprintf(stderr, + _("Usage: %s [-V] [-x] [-f] [-p prog] [-c cmd]... [-d project]... [path]\n"), +- progname); ++ quota_progname); + exit(1); + } + +@@ -147,7 +147,7 @@ init( + { + int c; + +- progname = basename(argv[0]); ++ quota_progname = basename(argv[0]); + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +@@ -173,13 +173,13 @@ init( + projid_file = optarg; + break; + case 'p': +- progname = optarg; ++ quota_progname = optarg; + break; + case 'x': + expert++; + break; + case 'V': +- printf(_("%s version %s\n"), progname, VERSION); ++ printf(_("%s version %s\n"), quota_progname, VERSION); + exit(0); + default: + usage(); +diff --git a/spaceman/init.c b/spaceman/init.c +index b3eface..bedf112 100644 +--- a/spaceman/init.c ++++ b/spaceman/init.c +@@ -23,7 +23,7 @@ + #include "path.h" + #include "space.h" + +-char *progname; ++char *spaceman_progname; + int exitcode; + + void +@@ -31,7 +31,7 @@ usage(void) + { + fprintf(stderr, + _("Usage: %s [-c cmd] file\n"), +- progname); ++ spaceman_progname); + exit(1); + } + +@@ -74,7 +74,7 @@ init( + xfs_fsop_geom_t geometry = { 0 }; + struct fs_path fsp; + +- progname = basename(argv[0]); ++ spaceman_progname = basename(argv[0]); + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +@@ -86,7 +86,7 @@ init( + add_user_command(optarg); + break; + case 'V': +- printf(_("%s version %s\n"), progname, VERSION); ++ printf(_("%s version %s\n"), spaceman_progname, VERSION); + exit(0); + default: + usage(); +-- +2.14.1 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch new file mode 100644 index 000000000..450c6454d --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch @@ -0,0 +1,34 @@ +From 39836217bdc41428b23a57bd70f2bfc8dddd8c60 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 6 Sep 2017 19:16:04 -0700 +Subject: [PATCH] spaceman: Add missing link to libuuid + +When uuid is enabled then we see linking failures with gold linker e.g. + +libxfs/.libs/libxfs.so: error: undefined reference to 'uuid_compare' +libxfs/.libs/libxfs.so: error: undefined reference to 'uuid_copy' +clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + spaceman/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spaceman/Makefile b/spaceman/Makefile +index 95ec3c0..060e0af 100644 +--- a/spaceman/Makefile ++++ b/spaceman/Makefile +@@ -9,7 +9,7 @@ LTCOMMAND = xfs_spaceman + HFILES = init.h space.h + CFILES = init.c file.c prealloc.c trim.c + +-LLDLIBS = $(LIBXCMD) ++LLDLIBS = $(LIBXCMD) $(LIBUUID) + LTDEPENDENCIES = $(LIBXCMD) + LLDFLAGS = -static + +-- +2.14.1 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch new file mode 100644 index 000000000..bba9a25c2 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch @@ -0,0 +1,13 @@ +Index: xfsprogs-4.12.0/include/builddefs.in +=================================================================== +--- xfsprogs-4.12.0.orig/include/builddefs.in ++++ xfsprogs-4.12.0/include/builddefs.in +@@ -164,7 +164,7 @@ ifeq ($(ENABLE_GETTEXT),yes) + GCFLAGS += -DENABLE_GETTEXT + endif + +-BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) ++BUILD_CFLAGS += $(GCFLAGS) + # First, Global, Platform, Local CFLAGS + CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch new file mode 100644 index 000000000..efc57e4f6 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch @@ -0,0 +1,117 @@ +From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Tue, 25 Jul 2017 13:45:01 -0500 +Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when + metadumping to stdout"), we solved the problem of xfs_db printfs ending up in + the metadump stream by reassigning stdout for the duration of a stdout + metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in + their view "extern FILE *stdout" means "extern FILE * const stdout"), so we + abandon the old approach in favor of playing games with dup() to switch the + raw file descriptors. + +While we're at it, fix a regression where an unconverted outf test +allows progress info to end up in the metadump stream. + +Signed-off-by: Darrick J. Wong +--- + db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 36 insertions(+), 11 deletions(-) + +diff --git a/db/metadump.c b/db/metadump.c +index 96641e0..4e2f648 100644 +--- a/db/metadump.c ++++ b/db/metadump.c +@@ -78,6 +78,7 @@ static int obfuscate = 1; + static int zero_stale_data = 1; + static int show_warnings = 0; + static int progress_since_warning = 0; ++static bool stdout_metadump; + + void + metadump_init(void) +@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...) + va_end(ap); + buf[sizeof(buf)-1] = '\0'; + +- f = (outf == stdout) ? stderr : stdout; ++ f = stdout_metadump ? stderr : stdout; + fprintf(f, "\r%-59s", buf); + fflush(f); + progress_since_warning = 1; +@@ -2750,7 +2751,8 @@ metadump_f( + xfs_agnumber_t agno; + int c; + int start_iocur_sp; +- bool stdout_metadump = false; ++ int outfd = -1; ++ int ret; + char *p; + + exitcode = 1; +@@ -2870,16 +2872,35 @@ metadump_f( + * metadump operation so that dbprintf and other messages + * are sent to the console instead of polluting the + * metadump stream. ++ * ++ * We get to do this the hard way because musl doesn't ++ * allow reassignment of stdout. + */ +- outf = stdout; +- stdout = stderr; ++ fflush(stdout); ++ outfd = dup(STDOUT_FILENO); ++ if (outfd < 0) { ++ perror("opening dump stream"); ++ goto out; ++ } ++ ret = dup2(STDERR_FILENO, STDOUT_FILENO); ++ if (ret < 0) { ++ perror("redirecting stdout"); ++ close(outfd); ++ goto out; ++ } ++ outf = fdopen(outfd, "a"); ++ if (outf == NULL) { ++ fprintf(stderr, "cannot create dump stream\n"); ++ dup2(outfd, 1); ++ close(outfd); ++ goto out; ++ } + stdout_metadump = true; + } else { + outf = fopen(argv[optind], "wb"); + if (outf == NULL) { + print_warning("cannot create dump file"); +- free(metablock); +- return 0; ++ goto out; + } + } + +@@ -2907,15 +2928,19 @@ metadump_f( + if (progress_since_warning) + fputc('\n', stdout_metadump ? stderr : stdout); + +- if (stdout_metadump) +- stdout = outf; +- else +- fclose(outf); ++ if (stdout_metadump) { ++ fflush(outf); ++ fflush(stdout); ++ ret = dup2(outfd, STDOUT_FILENO); ++ if (ret < 0) ++ perror("un-redirecting stdout"); ++ } ++ fclose(outf); + + /* cleanup iocur stack */ + while (iocur_sp > start_iocur_sp) + pop_cur(); +- ++out: + free(metablock); + + return 0; +-- +2.13.3 diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.11.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb similarity index 82% rename from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.11.0.bb rename to meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb index 046dea425..d9980839d 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.11.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb @@ -8,9 +8,13 @@ DEPENDS = "util-linux util-linux-native" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://link_needed_libs.patch \ file://0001-define-__-prefixed-version-of-intXY_t-types.patch \ + file://remove_flags_from_build_flags.patch \ + file://0001-Rename-progname-as-it-is-provided-by-libc.patch \ + file://xfsprogs-4.12.0-fix_musl.patch \ + file://0001-spaceman-Add-missing-link-to-libuuid.patch \ " -SRC_URI[md5sum] = "f1f9b8c752347eefdb56483dafa0cefb" -SRC_URI[sha256sum] = "c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2" +SRC_URI[md5sum] = "e348b0e1d7bd1cd82d64b91ff37e727e" +SRC_URI[sha256sum] = "b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df" inherit autotools-brokensep @@ -42,6 +46,7 @@ PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" export DEBUG="-DNDEBUG" export BUILD_VERBOSE="1" +export tagname="CC" EXTRA_OEMAKE = "DIST_ROOT='${D}'" From patchwork Thu Sep 7 03:57:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111851 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp254640qge; Wed, 6 Sep 2017 20:59:12 -0700 (PDT) X-Received: by 10.98.82.75 with SMTP id g72mr1437270pfb.202.1504756752252; Wed, 06 Sep 2017 20:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504756752; cv=none; d=google.com; s=arc-20160816; b=QKDwJ5MIwMRqzMjrGgUrCLIQqQ/jbefCzbLubXy1dNIGdD2N6BXeqhjYBVuzbQWPWa ZscNMjMmgd4e2l+bYtX57IMrhtKCIqsbUNXnMpEc3AzzWfepojXpuP0S8wDoFkJTpvsz h+ygQv1CsDfoAMyfgZ0aeE+0YkjOfZJk2WyOiL9J3CYGGNJ/8sfRDixzSytk9ExenTp0 npmoG3lMY43E0zquVPYP/kgm9cbGHcAWwY3iiyA1J3ajuAvFHyYdcsg9P3+kT7/mCA3I JFa5t3HaokloPDuvC1wGM2RpHtnsoujcqMAedtc6zA7BRU+FqdLkWZI45sXSH44UrWZR Ewag== 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=lP37ahHK0kRyG68UeAbtxDCu4h8KIMbZI0hiY0LrsFk=; b=bkdCBfG9Ov5V0UTXIb2GKnXaYHqvK+ypToi2+e54hfvUTzrbW4air6LdaX7edB8OV7 qlQtNE05uAT50WUMHKM4OGWCvn75cjANALa2T3Jgtb1gdjT4g8IzQaRD4z3Sjre/I+sL uT+n14Rh0qGo5TN3TmUQh9qNwAWwIYBFpDuU+8U3/iaW3BR3Yf4Uj+IEv/l9nE1W4ph3 Lb/Vu9kQhN8K+FHG+qjlnDdUI2SXYomAph5N6aIxz6Ye8t43jmaYMbA/X85O8PO0ojmv QluNl53HMfc+IN3ChJEl01pL2LHd+8Td4YH7NzlUfE9k2iZdUSuKZ/mVzehKQZsln25q l7yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hXd+ecG2; 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=NONE 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 61si1195355plz.493.2017.09.06.20.59.11; Wed, 06 Sep 2017 20:59:12 -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=hXd+ecG2; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C1E0577E68; Thu, 7 Sep 2017 03:58:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id BF0FF77D6C for ; Thu, 7 Sep 2017 03:58:16 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id d8so4421506pgt.3 for ; Wed, 06 Sep 2017 20:58:18 -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=8MeahnWLmMZG/MIomfIRSfYpsC/Y15HFt+L/PCuOaEQ=; b=hXd+ecG2Mb2/Guhe56mSd/vuowTolWK6VDlJdtavZIC/cGelJp4TzzGtETSaK7zqXO Wv1l/mlrmzhHjgbPuRVdgz7ArUA0/cy7v2TNFSFjVQ+kSPuXsZIZbJjhJg51ZRV0KN8W UL2U+VVPkmtFqQyNhdVq35cR8vXcfqLAdWj/kqSK/tJe6TKzI/SGg3XhXoY++B13iKNz r4Y53z0MTIGXXpXnchlK0tI+hYkKS2iYz9+0XhrpynZP3a2KSu6OWPIOwurPL06p8DOz /AOBOF+neK4g9RTyV3Tj57Kmbk6chOXjHPqPcR5U0F00dLAoK15MNF8/3NywyqM5V6kK oJQQ== 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=8MeahnWLmMZG/MIomfIRSfYpsC/Y15HFt+L/PCuOaEQ=; b=LA5uARQqZv/nt3hiNkcA4CsHv6KTTKt/P6pCtfkHuhFgq3cwa/UhlCbxdjL/X1lhsr FSSp3q00IIy9MM7ovquWZKepR3FWc3YCISTYhGUEecYCFKBn+QaS/Jdttp6UakumPWDB +EDRpfzcToemQy16MUvpnWUCy1SGyiWq1FN09ObpdGXLuP+lhAoKlwZHk/9gEt0keroU OgTYfF0Pl8VINiDKZVTi73iVnhAhC44GiUPOND4lzqhQH6it9B0eISubFv0SQvW3WwkI nqhRgrdFohakQx+tLtiuJu6XRKorK7dwCyjVZJKzF4JVRiQVmZMuGAcO1eXUT2F1PSOl ALeg== X-Gm-Message-State: AHPjjUgJcq5uy5FGEmteWARk9aMHyZMXTDt75PLwf0RPz6aU6mC3aWUj 1uNktjZzU0Mhsp6y X-Google-Smtp-Source: ADKCNb6JShzvOrY/FucH1chYSm4BCP1C/YdAM62PXbFbnm6F8gTydBVZgco/6ZVjHWkbecInlR6jSQ== X-Received: by 10.98.211.76 with SMTP id q73mr1374606pfg.348.1504756697631; Wed, 06 Sep 2017 20:58:17 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id 13sm1637379pfi.55.2017.09.06.20.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Sep 2017 20:58:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 6 Sep 2017 20:57:58 -0700 Message-Id: <20170907035758.41689-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170907035758.41689-1-raj.khem@gmail.com> References: <20170907035758.41689-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 5/5] ndisc6: Fix build with clang and update to latest on git 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 Change recipe to git and http protocol Pass PERL variable to configure Add patches to fix VLAIS Re-organize structure of recipe Copy gettext.h from native sysroot instead of depending on build host Signed-off-by: Khem Raj --- ...-Do-not-symlink-gettext.h-from-build-host.patch | 34 ++++++ .../0001-replace-VLAIS-with-malloc-free-pair.patch | 124 +++++++++++++++++++++ .../ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch | 30 +++++ .../ndisc6/{ndisc6_1.0.3.bb => ndisc6_git.bb} | 53 +++++---- 4 files changed, 219 insertions(+), 22 deletions(-) create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch rename meta-networking/recipes-support/ndisc6/{ndisc6_1.0.3.bb => ndisc6_git.bb} (80%) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch new file mode 100644 index 000000000..eeae5326d --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch @@ -0,0 +1,34 @@ +From 1ee2c998933c4a3d7e7b386352cbdb12f270774c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 6 Sep 2017 20:50:48 -0700 +Subject: [PATCH] autogen: Do not symlink gettext.h from build host + +This will create a dependency on build host having gettext +installed which may not always be the case. + +Signed-off-by: Khem Raj +--- +Upstream-Status: Inappropriate [Cross-compile specific] + autogen.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 3371011..bbc7add 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -25,12 +25,6 @@ echo "Running autoreconf ..." + autoreconf -sfi + unlink po/Makevars.template + +-for d in /usr /usr/local /opt/gettext /usr/pkg $HOME ; do +- if test -f $d/share/gettext/gettext.h ; then +- ln -sf $d/share/gettext/gettext.h include/gettext.h +- fi +-done +- + test -f "include/gettext.h" || { + echo "Error: can't find convenience C header." + echo "Please put a link to it by hand as include/gettext.h" +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch new file mode 100644 index 000000000..dc58b5b79 --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch @@ -0,0 +1,124 @@ +From 3a7d5396e633e6c02a4583be7faf3d79d0d33748 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 11:14:41 -0700 +Subject: [PATCH 1/2] replace VLAIS with malloc/free pair + +Makes it compatible with non-gnu compilers + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/trace-icmp.c | 7 +++++-- + src/trace-tcp.c | 14 ++++++++++---- + src/trace-udp.c | 7 +++++-- + 3 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/trace-icmp.c b/src/trace-icmp.c +index 842938e..c76cb54 100644 +--- a/src/trace-icmp.c ++++ b/src/trace-icmp.c +@@ -43,16 +43,19 @@ send_echo_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct icmp6_hdr ih; +- uint8_t payload[plen - sizeof (struct icmp6_hdr)]; ++ uint8_t *payload; + } packet; + memset (&packet, 0, plen); ++ packet.payload = malloc(plen - sizeof (struct icmp6_hdr)); + + packet.ih.icmp6_type = ICMP6_ECHO_REQUEST; + packet.ih.icmp6_id = htons (getpid ()); + packet.ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff)); + (void)port; + +- return send_payload (fd, &packet.ih, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet.ih, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 940f918..62d22ff 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -54,10 +54,11 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct tcphdr th; +- uint8_t payload[plen - sizeof (struct tcphdr)]; ++ uint8_t *payload; + } packet; + + memset (&packet, 0, sizeof (packet)); ++ packet.payload = malloc(plen - sizeof (struct tcphdr)); + packet.th.th_sport = sport; + packet.th.th_dport = port; + packet.th.th_seq = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); +@@ -65,7 +66,9 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + packet.th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0); + packet.th.th_win = htons (TCP_WINDOW); + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +@@ -131,10 +134,11 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct tcphdr th; +- uint8_t payload[plen - sizeof (struct tcphdr)]; ++ uint8_t *payload; + } packet; + + memset (&packet, 0, sizeof (packet)); ++ packet.payload = malloc(plen - sizeof (struct tcphdr)); + packet.th.th_sport = sport; + packet.th.th_dport = port; + packet.th.th_ack = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); +@@ -142,7 +146,9 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + packet.th.th_flags = TH_ACK; + packet.th.th_win = htons (TCP_WINDOW); + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +diff --git a/src/trace-udp.c b/src/trace-udp.c +index 4adde6b..a6cbb07 100644 +--- a/src/trace-udp.c ++++ b/src/trace-udp.c +@@ -46,9 +46,10 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct udphdr uh; +- uint8_t payload[plen - sizeof (struct udphdr)]; ++ uint8_t *payload; + } packet; + memset (&packet, 0, plen); ++ packet.payload = malloc(plen - sizeof (struct udphdr)); + + (void)n; + packet.uh.uh_sport = sport; +@@ -61,7 +62,9 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + /*if (plen > sizeof (struct udphdr)) + packet.payload[0] = (uint8_t)ttl;*/ + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch new file mode 100644 index 000000000..3cc2ba80c --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch @@ -0,0 +1,30 @@ +From 2a50154fbce38fd36be7e14f5cd4a8b03c65c72f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 11:15:37 -0700 +Subject: [PATCH 2/2] Do not undef _GNU_SOURCE + +There are functions from tcp.h which are under _GNU_SOURCE +in musl + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/trace-tcp.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 62d22ff..380008e 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -21,7 +21,6 @@ + # include + #endif + +-#undef _GNU_SOURCE + #define _DEFAULT_SOURCE 1 + + #include +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb similarity index 80% rename from meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb rename to meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 6bc0531b9..48a83b830 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -3,22 +3,37 @@ IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." SECTION = "net" HOMEPAGE = "http://www.remlab.net/ndisc6/" LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to -# perform the actual trace operation. -RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" -RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" -RDEPENDS_${PN}-misc += "perl" - -SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "21afdaa3a5a5c1ce50eb7f2b7d795989" -SRC_URI[sha256sum] = "0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821" +PV = "1.0.4+git${SRCPV}" +SRCREV = "4c794b5512d23c649def1f94a684225dcbb6ac3e" +SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http \ + file://0001-replace-VLAIS-with-malloc-free-pair.patch \ + file://0002-Do-not-undef-_GNU_SOURCE.patch \ + file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + " -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +S = "${WORKDIR}/git" inherit autotools gettext +EXTRA_OECONF += "PERL=${USRBINPATH}/perl" + +LDFLAGS += "-fuse-ld=gold" +TOOLCHAIN = "gcc" + +do_configure_prepend() { + cp ${STAGING_DATADIR_NATIVE}/gettext/gettext.h ${S}/include + ${S}/autogen.sh +} + +do_install_append () { + rm -rf ${D}${localstatedir} + # Enable SUID bit for applications that need it + chmod 4555 ${D}${bindir}/rltraceroute6 + chmod 4555 ${D}${bindir}/ndisc6 + chmod 4555 ${D}${bindir}/rdisc6 +} ALLOW_EMPTY_${PN} = "1" # Split into seperate packages since we normal don't want them all @@ -49,15 +64,9 @@ or IPv4." DESCRITPION_${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ servers through slateless IPv6 autoconfiguration." -# We do not run perl during the build, but only use it on the target. -do_configure_prepend() { - export PERL="/usr/bin/perl" -} +# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to +# perform the actual trace operation. +RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" +RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" +RDEPENDS_${PN}-misc += "perl" -do_install_append () { - rm -rf ${D}${localstatedir} - # Enable SUID bit for applications that need it - chmod 4555 ${D}${bindir}/rltraceroute6 - chmod 4555 ${D}${bindir}/ndisc6 - chmod 4555 ${D}${bindir}/rdisc6 -}