From patchwork Wed Jul 19 15:41:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108294 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp992718obm; Wed, 19 Jul 2017 08:41:48 -0700 (PDT) X-Received: by 10.84.132.106 with SMTP id 97mr551781ple.105.1500478908889; Wed, 19 Jul 2017 08:41:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500478908; cv=none; d=google.com; s=arc-20160816; b=IaptgAaejefrgSnyhfEHbTld1bgdaA/zhJLgMAiDY2uJPJx4Fa9BlnEPLWNvQRjpJ2 lwyZk2w1dJibzYUPPIuV2M1XvRv8HPzZR8ov7ghkGJd5SXuZpLfkrKc67Ud+DFYrsGe/ UxJqPQBFvLFBweJ47r8ZsXvr/R61uqviI2MS2VnCmCL9Ude5020efxIBvQDM8NdnWD91 sg5xBScptLMyFtiNFsc042drMxlzqKw0OFos+FhScgi3W5lTnRKprRjlzup5TBFWxVQq gQYQJ6jUtmwTb1Oz9LQuyvqDVCkzZ2KbxPyVZc2dSNkRQ+khyYlxIKdR6yHUcxhbRFKB tDbQ== 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=8birpjG9tksJXSjaikEP2zSD5uMnNyFIAIaLhoH5uXA=; b=Y0+d04dGSU8Y+uz8MlP8XPKuCQ+drY8KS4EPu3CN3tQ9mW+XablpTrxrJkh32ZotM8 I8s7XYD68Fk9B/fsdap43TsS0gWBCEWCw9Y/azbEcs/bpKN1SeU8xHfwXYgOk8RmSY9V PSjEUqhT0NseczhXflqXtuu6bDirzwm0l3GIYxD4rjdpBxokzo5WM8c9OOh1D6O1/J72 RDPIaSlqYSdfD1DfMXHbkVEXCRyDjP24tSquvVPBD4rakpB+De61vkHbY4NY2zkz3fYU 6LUuhvmbf6Ct17UQRTnNvpGodhgnAHgHY5dbjKrH2xp55UKYoqDFA6JA4QPLDbH4Be3e zaTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=WspGSxMc; 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 d10si228732pgc.317.2017.07.19.08.41.48; Wed, 19 Jul 2017 08:41:48 -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.b=WspGSxMc; 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 B6AD1782EF; Wed, 19 Jul 2017 15:41:45 +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 0AB3E782EE for ; Wed, 19 Jul 2017 15:41:44 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id c23so289994pfe.5 for ; Wed, 19 Jul 2017 08:41:46 -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=dRqogqce+C3rgSBychEIO450KXe3qlIgs90GI6ivtmM=; b=WspGSxMceXxzIhjM0M0fyGjssuM1zCpCqcpDa+cTAfquzMrPhaholnXmtov9212Xzg fGaYxblbBdD6lHDAnR4/qSS3NvvzHP4X+xe07PQR1RgHyYaiHD+GwspmZ4cekuePUpkD 06ANszk6GaFqLfIdsYVu1aAbJwW2d1TzuVJ3Rz+4ZNsBi2EgNoRyTp2+pka+3t6iQvEU iT/SzbmD9mfBsMGUBu0Orv7xAvvBW1oCg6JYvFT9GkWhH1EGGpM8lWoK9PY5WNdz+FzA w0NPEKERdjkKZg9IjeiMLq0OxUglAV8UgvGTLX+ZWdMyR0rAlPAoGsGoAaAy6h2Tirfp J9ww== 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=dRqogqce+C3rgSBychEIO450KXe3qlIgs90GI6ivtmM=; b=ZH7VisCg+zQ2GyVWLZDWI7gTkZdWn0dXX5EI+Jhw8hb8+seMvS2JQLs8VkTOA73RDV uZd5V+hCJVYJKiPsrxmlTal70iSE4hCNHp/mEMH4bVuf6Dv9w6OtOiZvuTsNTXUX2OCI lT8D46P380LYN+J5O1gjgTnVkTJ6sygZ6iz66MdcKf0vQHXEbJrOajDMWLRmDp2qbuTj f4y+kYQXzKo5b6yccPeJbjCZyhSfYoMAhxQZS+VjUa/KqBWBbc5blmvBsN0nTjiuf4o0 Snv7N7+XH0lTeN70NkY22k6YiTAQBnhLEayH1/gEoYxN009wm+6AluK5jtkFcV3a6ZNw PZqA== X-Gm-Message-State: AIVw111EzPZl7vgkX0Tg308HQ4Ba2IDIULoR6/+jwY6z8n3oPewKPEw8 WeQaMZth+mpl3nTu X-Received: by 10.99.166.17 with SMTP id t17mr558150pge.60.1500478906030; Wed, 19 Jul 2017 08:41:46 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b85sm494845pfe.94.2017.07.19.08.41.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 08:41:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 19 Jul 2017 08:41:29 -0700 Message-Id: <20170719154132.20556-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [oe] [meta-networking][PATCH 1/4] ippool: Fix build errors found with hardening flags 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 Signed-off-by: Martin Jansa --- ...timer-Check-for-return-value-of-write-API.patch | 28 ++++++++++++++++++++++ .../recipes-daemons/ippool/ippool_1.3.bb | 22 ++++++++--------- 2 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch new file mode 100644 index 000000000..6fb7cc5c4 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch @@ -0,0 +1,28 @@ +From 5d7f20c045b3c74dad2c53d65e30bd4840250082 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 27 Jun 2017 15:17:19 -0700 +Subject: [PATCH] usl_timer: Check for return value of write() API + +Signed-off-by: Khem Raj +--- + usl/usl_timer.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/usl/usl_timer.c b/usl/usl_timer.c +index fda752b..d8414a6 100644 +--- a/usl/usl_timer.c ++++ b/usl/usl_timer.c +@@ -94,7 +94,9 @@ void usl_timer_tick(void) + + if (!usl_tick_pending) { + usl_tick_pending = 1; +- write(usl_tick_pipe[1], &msg, sizeof(msg)); ++ if (write(usl_tick_pipe[1], &msg, sizeof(msg)) != sizeof(msg)) { ++ fprintf(stderr, "write to fd %i failed: %s\n", usl_tick_pipe[1], strerror(errno)); ++ } + } + } + +-- +2.13.2 + diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 969f434cc..e1c9215ca 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -11,16 +11,16 @@ HOMEPAGE = "http://www.openl2tp.org/" SECTION = "console/network" LICENSE = "GPLv2+" -SRC_URI = "\ - https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://ippool_usl_timer.patch \ - file://ippool_parallel_make_and_pic.patch \ - file://ippool_init.d.patch \ - file://always_syslog.patch \ - file://makefile-add-ldflags.patch \ - file://runtest.sh \ - file://ippool.service \ - " +SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ + file://runtest.sh \ + file://ippool.service \ + file://ippool_usl_timer.patch \ + file://ippool_parallel_make_and_pic.patch \ + file://ippool_init.d.patch \ + file://always_syslog.patch \ + file://makefile-add-ldflags.patch \ + file://0001-usl_timer-Check-for-return-value-of-write-API.patch \ + " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" SRC_URI[md5sum] = "e2401e65db26a3764585b97212888fae" @@ -50,7 +50,7 @@ do_compile_prepend() { # ignore the OPT_CFLAGS?= in Makefile, # it should be in CFLAGS from env - export OPT_CFLAGS= + export OPT_CFLAGS="${SELECTED_OPTIMIZATION}" } From patchwork Wed Jul 19 15:41:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108295 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp992807obm; Wed, 19 Jul 2017 08:41:56 -0700 (PDT) X-Received: by 10.98.38.68 with SMTP id m65mr508694pfm.47.1500478916449; Wed, 19 Jul 2017 08:41:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500478916; cv=none; d=google.com; s=arc-20160816; b=lZF4yqbS7oKvcLRe0NYJuJm4wclVfVfR7EEhAkwnY0LbSTTtEG7rR4xA8QkrjSdfZ/ GpfCFy4WKDQ1MgILFrULUyoWi1m1ZybJUjUiu7/kZApRtEtjolMfDwMZ/q/CRfzcT/JD EDGd9/PVFADfYCX3XEbF7+UOh0HkFHVTO8J3ustGph1guEXoVRKjSEqzgJvCHUHzKpp7 dElvUKvji7Y7+aMJX2ar1UMXM701mofE7/z6PcuSXLDUR6sWDPJqIyIA9X7wtaBb13HW IVIcAy+6fs0clFDDI8zAYZ0veuIhH48F8q9GNXMirReBMrB45W6rDfmrDzqhODQ0t150 TqUA== 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=CzqeGSxGwEWFAc4jtOZiGhEDPssEPXCKWJl18XhDqtI=; b=XqU5zKUiRkqyLLff5pq++cp2J0d5OphJPovjSviepRqoyKCxqzyJs3Vz8WXgvv8URV PvWP6hkKFNeQpZvKcvVaj7FbGpII652pG77pvAXMVwKSz0U2llXEFbOaIpviNt75W76o UjkML1wDVCkw0I/5fNUgvISiFaOig0qnWoanzr4ZeGZlOqf78i+xqswWc0VkKbkXtH8J 7+5dXmTSXosQhTricORKb1M3AiqUKX1vXCWZVKS4AIX9a+PNtnNw9tzAW3LEhDbljvs5 k0gPsXVu1BFVCnGUpVCZPKbC5N79hhshS7AM0wdPIiY4dJBBEyNMIJVkimdl9Pb3S2IS HzwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=J4f/aFkH; 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 j81si201044pfe.571.2017.07.19.08.41.56; Wed, 19 Jul 2017 08:41:56 -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.b=J4f/aFkH; 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 5E8EB78307; Wed, 19 Jul 2017 15:41:52 +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 BD620782F1 for ; Wed, 19 Jul 2017 15:41:46 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id e199so306733pfh.0 for ; Wed, 19 Jul 2017 08:41:48 -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=cqVcgl4tPJwIdZj4gUzsR4SmHJAPZa0SnbdC4V2l2CA=; b=J4f/aFkHD5vE6aZE0dWUdJ30KgveM1WQA0GOBUFCTTmITOZDy1by9n71DYaIadequY P0NA0B8Wz/6xiTGnWNb1DD2EhoaDmWRMdfus5KV/OwDENmEJ8tjFAIC5fF1CIooqa+Sc FS7l25FAsVrs4EId1CkQPRDa3dw8oROlIjF6MLCRAPCpLxzCD7UAaybeWKxIlCZD2y9U nstzUPJ1Tp4zyYuCU1hJ8NH+TCPzl6LBUkCzCJMyzDusTbZT3hlg9vSogGUwJPEzEtLN BTlk1Pmu5tLwR554L6jPBHH04DsHhg9pZxm2J1waxKr4/k4Umj76srp74NBNCthXvjxB jCWA== 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=cqVcgl4tPJwIdZj4gUzsR4SmHJAPZa0SnbdC4V2l2CA=; b=J/OW/iAzzBgsG4AIyLr5X6npnevy2pLWEdvLWbXaZD3yKZxgeYediYBeOy64pNTgAv jzwkWKAdPbxpJLCqSVx6/OTaaD/dIaE6rZRHLYSrJww6hIbRScoHtYxWLkQeQXjZWQah 1kCyloFtv+EwaDSuCPOoazV4mj7KToPIFvVbB06k9t0/v0zk6VVLQskh+Spo3xnQRsHX o3E8i7+S+N1QjgyOZ54bolcjxOQ9lEujargxDMG+Ehwu4XHHAp/46AXP0nui34RCCL4B WkK8JbcuButVuaQW/pi42UumKF8WU8jT60504aD2mZrrbFDKQGXK/JgX1dIHHRyp12iI rnaA== X-Gm-Message-State: AIVw113aIPUrVYcbqvic5ciEQqsoTdTuEjV3HD2FYIizYYqQ/UTaP8eK WCeG2XNDTChiiUir X-Received: by 10.99.119.130 with SMTP id s124mr478189pgc.371.1500478907512; Wed, 19 Jul 2017 08:41:47 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b85sm494845pfe.94.2017.07.19.08.41.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 08:41:46 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 19 Jul 2017 08:41:30 -0700 Message-Id: <20170719154132.20556-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719154132.20556-1-raj.khem@gmail.com> References: <20170719154132.20556-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 2/4] flashrom: Upgrade to 0.9.9 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 build with musl along way Signed-off-by: Khem Raj --- .../flashrom/0001-Fix-compilation-on-aarch64.patch | 62 ------- .../0001-ichspi.c-Fix-build-with-clang.patch | 29 --- ...fine-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch | 28 +++ ...utological-pointer-compare-when-using-cla.patch | 35 ---- .../0003-remove-duplicate-const-qualifiers.patch | 71 -------- .../recipes-extended/flashrom/flashrom/sst26.patch | 198 +++++++++++++++++++++ .../recipes-extended/flashrom/flashrom_0.9.6.1.bb | 22 --- .../recipes-extended/flashrom/flashrom_0.9.9.bb | 19 ++ 8 files changed, 245 insertions(+), 219 deletions(-) delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch create mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch create mode 100644 meta-oe/recipes-extended/flashrom/flashrom/sst26.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb create mode 100644 meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch deleted file mode 100644 index 6c2f64ed9..000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d9e4dc750dc45e42b482d744829254a3672c11b3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 19 Oct 2016 00:24:08 +0000 -Subject: [PATCH 1/3] Fix compilation on aarch64 - -Signed-off-by: Khem Raj ---- - arch.h | 2 +- - hwaccess.c | 2 +- - hwaccess.h | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -Index: flashrom-0.9.6.1/arch.h -=================================================================== ---- flashrom-0.9.6.1.orig/arch.h -+++ flashrom-0.9.6.1/arch.h -@@ -27,7 +27,7 @@ - #define __FLASHROM_ARCH__ "mips" - #elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) - #define __FLASHROM_ARCH__ "ppc" --#elif defined(__arm__) -+#elif defined(__arm__) || defined(__aarch64__) - #define __FLASHROM_ARCH__ "arm" - #endif - __FLASHROM_ARCH__ -Index: flashrom-0.9.6.1/hwaccess.c -=================================================================== ---- flashrom-0.9.6.1.orig/hwaccess.c -+++ flashrom-0.9.6.1/hwaccess.c -@@ -121,7 +121,7 @@ int rget_io_perms(void) - return 0; - } - --#elif defined (__arm__) -+#elif defined (__arm__) || defined (__aarch64__) - - static inline void sync_primitive(void) - { -Index: flashrom-0.9.6.1/hwaccess.h -=================================================================== ---- flashrom-0.9.6.1.orig/hwaccess.h -+++ flashrom-0.9.6.1/hwaccess.h -@@ -68,8 +68,8 @@ - #error Little-endian PowerPC #defines are unknown - #endif - --#elif defined (__arm__) --#if defined (__ARMEL__) -+#elif defined (__arm__) || defined (__aarch64__) -+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define __FLASHROM_LITTLE_ENDIAN__ 1 - #else - #error Big-endian ARM #defines are unknown -@@ -337,7 +337,7 @@ int libpayload_wrmsr(int addr, msr_t msr - - /* PCI port I/O is not yet implemented on MIPS. */ - --#elif defined(__arm__) -+#elif defined(__arm__) || defined (__aarch64__) - - /* Non memory mapped I/O is not supported on ARM. */ - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch deleted file mode 100644 index ff16f0b11..000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a2f603c54013cd0b04bb0103dc615644f315d5e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 15 Nov 2016 17:39:24 +0000 -Subject: [PATCH] ichspi.c: Fix build with clang - -ichspi.c:1130:24: error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier] - static const uint32_t const dec_berase[4] = { - ^ -Signed-off-by: Khem Raj ---- - ichspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ichspi.c b/ichspi.c -index 0223ae3..e47aebd 100644 ---- a/ichspi.c -+++ b/ichspi.c -@@ -1127,7 +1127,7 @@ static void ich_hwseq_set_addr(uint32_t addr) - static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr) - { - uint8_t enc_berase; -- static const uint32_t const dec_berase[4] = { -+ static const uint32_t dec_berase[4] = { - 256, - 4 * 1024, - 8 * 1024, --- -1.9.1 - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch new file mode 100644 index 000000000..4170fefd2 --- /dev/null +++ b/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch @@ -0,0 +1,28 @@ +From 7c65a465a3ddeb7afb9a7c49d010ae7e5d5b1ad1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Jul 2017 20:25:49 -0700 +Subject: [PATCH] spi: Define _XOPEN_SOURCE to enable ffs() libc API + +musl exposes this issue + +Signed-off-by: Khem Raj +--- + spi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spi.c b/spi.c +index 894f73f..aeb6518 100644 +--- a/spi.c ++++ b/spi.c +@@ -21,7 +21,7 @@ + /* + * Contains the generic SPI framework + */ +- ++#define _XOPEN_SOURCE + #include + #include + #include "flash.h" +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch b/meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch deleted file mode 100644 index aec11bffa..000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9be0d152dfe8ac0f9b665d61aeb3f99dae533e0f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 19 Oct 2016 00:25:09 +0000 -Subject: [PATCH 2/3] Disable Wtautological-pointer-compare when using clang - -Signed-off-by: Khem Raj ---- - flashrom.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/flashrom.c b/flashrom.c -index 04e9934..bf49104 100644 ---- a/flashrom.c -+++ b/flashrom.c -@@ -1569,6 +1569,9 @@ int selfcheck(void) - * For 'flashchips' we check the first element to be non-null. In the - * other cases there exist use cases where the first element can be - * null. */ -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wtautological-pointer-compare" -+ - if (flashchips == NULL || flashchips[0].vendor == NULL) { - msg_gerr("Flashchips table miscompilation!\n"); - ret = 1; -@@ -1602,6 +1605,7 @@ int selfcheck(void) - msg_gerr("Known laptops table does not exist!\n"); - ret = 1; - } -+#pragma clang diagnostic pop - #endif - return ret; - } --- -1.9.1 - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch b/meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch deleted file mode 100644 index 99283d37f..000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 42ec9bd51e60aa38fe6e78f644e742d6989b6683 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 19 Oct 2016 00:25:23 +0000 -Subject: [PATCH 3/3] remove duplicate const qualifiers - -Signed-off-by: Khem Raj ---- - bitbang_spi.c | 12 ++++++------ - dummyflasher.c | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/bitbang_spi.c b/bitbang_spi.c -index 11d2de1..508cf45 100644 ---- a/bitbang_spi.c -+++ b/bitbang_spi.c -@@ -26,33 +26,33 @@ - #include "spi.h" - - /* Note that CS# is active low, so val=0 means the chip is active. */ --static void bitbang_spi_set_cs(const const struct bitbang_spi_master *master, int val) -+static void bitbang_spi_set_cs(const struct bitbang_spi_master *master, int val) - { - master->set_cs(val); - } - --static void bitbang_spi_set_sck(const const struct bitbang_spi_master *master, int val) -+static void bitbang_spi_set_sck(const struct bitbang_spi_master *master, int val) - { - master->set_sck(val); - } - --static void bitbang_spi_set_mosi(const const struct bitbang_spi_master *master, int val) -+static void bitbang_spi_set_mosi(const struct bitbang_spi_master *master, int val) - { - master->set_mosi(val); - } - --static int bitbang_spi_get_miso(const const struct bitbang_spi_master *master) -+static int bitbang_spi_get_miso(const struct bitbang_spi_master *master) - { - return master->get_miso(); - } - --static void bitbang_spi_request_bus(const const struct bitbang_spi_master *master) -+static void bitbang_spi_request_bus(const struct bitbang_spi_master *master) - { - if (master->request_bus) - master->request_bus(); - } - --static void bitbang_spi_release_bus(const const struct bitbang_spi_master *master) -+static void bitbang_spi_release_bus(const struct bitbang_spi_master *master) - { - if (master->release_bus) - master->release_bus(); -diff --git a/dummyflasher.c b/dummyflasher.c -index 66d0df0..d0de41c 100644 ---- a/dummyflasher.c -+++ b/dummyflasher.c -@@ -66,7 +66,7 @@ int spi_ignorelist_size = 0; - static uint8_t emu_status = 0; - - /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ --static const uint8_t const sfdp_table[] = { -+static const uint8_t sfdp_table[] = { - 0x53, 0x46, 0x44, 0x50, // @0x00: SFDP signature - 0x00, 0x01, 0x01, 0xFF, // @0x04: revision 1.0, 2 headers - 0x00, 0x00, 0x01, 0x09, // @0x08: JEDEC SFDP header rev. 1.0, 9 DW long --- -1.9.1 - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch b/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch new file mode 100644 index 000000000..46a01529f --- /dev/null +++ b/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch @@ -0,0 +1,198 @@ +--- flashrom-0.9.9.orig/chipdrivers.h ++++ flashrom-0.9.9/chipdrivers.h +@@ -103,6 +103,7 @@ + int spi_prettyprint_status_register_sst25(struct flashctx *flash); + int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash); + int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash); ++int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash); + + /* sfdp.c */ + int probe_spi_sfdp(struct flashctx *flash); +--- flashrom-0.9.9.orig/flashchips.c ++++ flashrom-0.9.9/flashchips.c +@@ -12564,6 +12564,120 @@ + + { + .vendor = "SST", ++ .name = "SST26VF016B(A)", ++ .bustype = BUS_SPI, ++ .manufacture_id = SST_ID, ++ .model_id = SST_SST26VF016B, ++ .total_size = 2048, ++ .page_size = 256, ++ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, ++ .tested = TEST_OK_PREW, ++ .probe = probe_spi_rdid, ++ .probe_timing = TIMING_ZERO, ++ .block_erasers = ++ { ++ { ++ .eraseblocks = { {4 * 1024, 512} }, ++ .block_erase = spi_block_erase_20, ++ }, { ++ .eraseblocks = { ++ {8 * 1024, 4}, ++ {32 * 1024, 1}, ++ {64 * 1024, 30}, ++ {32 * 1024, 1}, ++ {8 * 1024, 4}, ++ }, ++ .block_erase = spi_block_erase_d8, ++ }, { ++ .eraseblocks = { {2 * 1024 * 1024, 1} }, ++ .block_erase = spi_block_erase_c7, ++ }, ++ }, ++ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ ++ .unlock = spi_disable_blockprotect_sst26_global_unprotect, ++ .write = spi_chip_write_256, /* Multi I/O supported */ ++ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ ++ .voltage = {2700, 3600}, ++ }, ++ { ++ .vendor = "SST", ++ .name = "SST26VF032B(A)", ++ .bustype = BUS_SPI, ++ .manufacture_id = SST_ID, ++ .model_id = SST_SST26VF032B, ++ .total_size = 4096, ++ .page_size = 256, ++ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, ++ .tested = TEST_UNTESTED, ++ .probe = probe_spi_rdid, ++ .probe_timing = TIMING_ZERO, ++ .block_erasers = ++ { ++ { ++ .eraseblocks = { {4 * 1024, 1024} }, ++ .block_erase = spi_block_erase_20, ++ }, { ++ .eraseblocks = { ++ {8 * 1024, 4}, ++ {32 * 1024, 1}, ++ {64 * 1024, 62}, ++ {32 * 1024, 1}, ++ {8 * 1024, 4}, ++ }, ++ .block_erase = spi_block_erase_d8, ++ }, { ++ .eraseblocks = { {4 * 1024 * 1024, 1} }, ++ .block_erase = spi_block_erase_c7, ++ }, ++ }, ++ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ ++ .unlock = spi_disable_blockprotect_sst26_global_unprotect, ++ .write = spi_chip_write_256, /* Multi I/O supported */ ++ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ ++ .voltage = {2700, 3600}, ++ }, ++ ++ ++ { ++ .vendor = "SST", ++ .name = "SST26VF064B(A)", ++ .bustype = BUS_SPI, ++ .manufacture_id = SST_ID, ++ .model_id = SST_SST26VF064B, ++ .total_size = 8192, ++ .page_size = 256, ++ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, ++ .tested = TEST_OK_PREW, ++ .probe = probe_spi_rdid, ++ .probe_timing = TIMING_ZERO, ++ .block_erasers = ++ { ++ { ++ .eraseblocks = { {4 * 1024, 2048} }, ++ .block_erase = spi_block_erase_20, ++ }, { ++ .eraseblocks = { ++ {8 * 1024, 4}, ++ {32 * 1024, 1}, ++ {64 * 1024, 126}, ++ {32 * 1024, 1}, ++ {8 * 1024, 4}, ++ }, ++ .block_erase = spi_block_erase_d8, ++ }, { ++ .eraseblocks = { {8 * 1024 * 1024, 1} }, ++ .block_erase = spi_block_erase_c7, ++ }, ++ }, ++ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ ++ .unlock = spi_disable_blockprotect_sst26_global_unprotect, ++ .write = spi_chip_write_256, /* Multi I/O supported */ ++ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ ++ .voltage = {2700, 3600}, ++ }, ++ ++ { ++ .vendor = "SST", + .name = "SST25WF512", + .bustype = BUS_SPI, + .manufacture_id = SST_ID, +--- flashrom-0.9.9.orig/flashchips.h ++++ flashrom-0.9.9/flashchips.h +@@ -697,6 +697,8 @@ + #define SST_SST25VF064C 0x254B + #define SST_SST26VF016 0x2601 + #define SST_SST26VF032 0x2602 ++#define SST_SST26VF016B 0x2641 ++#define SST_SST26VF032B 0x2642 + #define SST_SST26VF064B 0x2643 + #define SST_SST27SF512 0xA4 + #define SST_SST27SF010 0xA5 +--- flashrom-0.9.9.orig/linux_spi.c ++++ flashrom-0.9.9/linux_spi.c +@@ -141,6 +141,16 @@ + return 0; + } + ++static void print_hex(const char *msg, const void *buf, size_t len) ++{ ++ size_t i; ++ msg_pspew("%s:\n", msg); ++ for (i = 0; i < len; i++) { ++ msg_pspew(" %02x", ((uint8_t *)buf)[i]); ++ } ++ msg_pspew("\n"); ++} ++ + static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, + unsigned int readcnt, + const unsigned char *txbuf, +@@ -172,10 +182,12 @@ + else + iocontrol_code = SPI_IOC_MESSAGE(2); + ++ print_hex("Write", txbuf, writecnt); + if (ioctl(fd, iocontrol_code, msg) == -1) { + msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); + return -1; + } ++ if (readcnt) print_hex("Got", rxbuf, readcnt); + return 0; + } + +--- flashrom-0.9.9.orig/spi25_statusreg.c ++++ flashrom-0.9.9/spi25_statusreg.c +@@ -196,6 +196,19 @@ + return spi_disable_blockprotect_generic(flash, 0x3C, 0, 0, 0xFF); + } + ++int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash) ++{ ++ int result = spi_write_enable(flash); ++ if (result) ++ return result; ++ ++ static const unsigned char cmd[] = { 0x98 }; /* ULBPR */ ++ result = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); ++ if (result) ++ msg_cerr("ULBPR failed\n"); ++ return result; ++} ++ + /* A common block protection disable that tries to unset the status register bits masked by 0x0C (BP0-1) and + * protected/locked by bit #7. Useful when bits 4-5 may be non-0). */ + int spi_disable_blockprotect_bp1_srwd(struct flashctx *flash) diff --git a/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb b/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb deleted file mode 100644 index 0edc68820..000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils" - -SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://0001-Fix-compilation-on-aarch64.patch \ - file://0002-Disable-Wtautological-pointer-compare-when-using-cla.patch \ - file://0003-remove-duplicate-const-qualifiers.patch \ - file://0001-ichspi.c-Fix-build-with-clang.patch \ - " - -SRC_URI[md5sum] = "407e836c0a2b17ec76583cb6809f65e5" -SRC_URI[sha256sum] = "6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a" - -CFLAGS += "-Wno-error=unknown-pragmas" - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb b/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb new file mode 100644 index 000000000..1bd97929c --- /dev/null +++ b/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +LICENSE = "GPLv2" +HOMEPAGE = "http://flashrom.org" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb" + +SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ + file://0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch \ + file://sst26.patch \ + " +SRC_URI[md5sum] = "aab9c98925d9cfb5ffb28b67a6112530" +SRC_URI[sha256sum] = "cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45" + +inherit pkgconfig + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} From patchwork Wed Jul 19 15:41:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108296 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp992953obm; Wed, 19 Jul 2017 08:42:07 -0700 (PDT) X-Received: by 10.98.63.83 with SMTP id m80mr484534pfa.161.1500478927113; Wed, 19 Jul 2017 08:42:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500478927; cv=none; d=google.com; s=arc-20160816; b=aeJrHPPDUhIckq9ajhzpBwEB+/f1HPCQVyhAnrHfJSRpmXebcBmMdOtPRKZ1IVLRuf CyenEQnzTFbQBd1uxbihRA8vDhGRwQyj6te+CBujD66Eu5MMbrdg+6kvo+rXWburWOco KGmbLQw+QPZ5VLB18rr+aXUVcUB47aQE4qnk2S+uaOj1gWNV6q5AzmPuxjG2l/3fNxx0 59JkegKobxO08Rz5QIWJWruIz0fB0GJPztjFYgXlG70p2TfSjGZW/pIPkjHNxMF4vS/K SQYmrI1BOC6FCj1pbzzEW/6IX+/E2EL3nUril0a/doQZ7kOfFsoNSKl6fgoJaPrKBmI0 Ff3A== 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=Aethb3p0UahP1cYyLmavA6gbQQnYuesxBwnvcxFpNOM=; b=wH6J73BH374RnU34fsgZkuFUOxFmu6TkuX0TSzzzLjHW57A999KZkmBQUHvgDkBoTs T/yV7Vk+0lOyj3qsA3A/CiLimgK3wG2gxFZIgC72iY8XE2CKJ+mUaUIznMUOo9De9JlZ E6QIpE1MH7oTr7ZRT0aKNpYnuI7quKiZR9NU3xNnmR9zXoRuXLkkmTy3GDj6NmszQlRJ VF0zz61SI0ekVDHluQyXqrapzbhCDxfy2vjmKOcnFVKBlz2ftKfxeqy1CVFTspf/Resd 1BiYhFtGBUPyPOaDISkrqvhiAyUoD4GauNPHb5Ds57+/QLVotUPM4hDzj0vAxY8H+MlK x7sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=f8H+oOJo; 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 z91si32805plh.734.2017.07.19.08.42.06; Wed, 19 Jul 2017 08:42:07 -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.b=f8H+oOJo; 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 DB56078304; Wed, 19 Jul 2017 15:41:56 +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 981FD781F6 for ; Wed, 19 Jul 2017 15:41:48 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id q85so302093pfq.2 for ; Wed, 19 Jul 2017 08:41:50 -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=kbkbwkw0ILKQ7cQaHwgFyWV2sf1B3S+JplASlialCkc=; b=f8H+oOJosHh739swmvSKQy2vmc6/vc0QgjTZ0MfrT/eN2utHRwlM+t7phk/3UDX8cL /6YgIb40bFwICiFzE2CZ3n5TMHMBQtAgit/GLK0p260A+Kg83YhhyavQUMMoPnbh9sd8 5Nl1joTwANutONTKLi21hPPkJI8HIXpqTB7LHepQgX6nk+M2aHjX6HWeK2TX8aWCJW6j QgT98Zgl0S0B439y4E60V3bGCLJWCbywjQ5iPFKA1UKrcuC35p4RUW+3WZWTMfN551r6 5Q9Xg6iIilWMGJ4euEFRWvX8y/8ievMVPbnJOcHahU2qIsavxga6b+yAd9AqhATvNEck x1oQ== 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=kbkbwkw0ILKQ7cQaHwgFyWV2sf1B3S+JplASlialCkc=; b=WrEFAGgGH0TzWFRRCTU/StAE+t+b3Fs0jrclaG+9iIaJExKJyFkghzBve71gq4Miqk dh2SOaPWWjj8BPr/0wkl9hV3qNmiSxyE9jNnB3Z2MB+M3b2u9pr2eW+q0e5bKkjQ0XrQ Garx6VqbUFH/jz5wEXQaTTda1zYalJIYOrPJivVBgeW24zb+gvPBT7uu0zmzZh60ZdOV jOGLPA7ApzvLh8QDQgfHxvUbjtRRh25lvzZrhunDEjYnUsWr07WKHJpHN34KAi/Op4Mp AYC4I8zRhZ5z5UjR/9xo6BPMS8NRiH4LpsWV3VxDQ2WBDhVUg5pjDuycWyU3Vx8WknDG g4LA== X-Gm-Message-State: AIVw113qz05rhZwPdEIwq3VwZ9KalassY6Bqko9WpjUBXQ90mzFyGXoh CR8s7MgPgF64XImD X-Received: by 10.84.178.37 with SMTP id y34mr541394plb.223.1500478909921; Wed, 19 Jul 2017 08:41:49 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b85sm494845pfe.94.2017.07.19.08.41.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 08:41:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 19 Jul 2017 08:41:31 -0700 Message-Id: <20170719154132.20556-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719154132.20556-1-raj.khem@gmail.com> References: <20170719154132.20556-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/4] postgresql: Do not link with libnsl on musl 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 libnsl is not available on musl Signed-off-by: Khem Raj --- meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb | 4 ++++ 1 file changed, 4 insertions(+) -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb b/meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb index e4d2edad0..7043b272a 100644 --- a/meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb +++ b/meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb @@ -7,5 +7,9 @@ SRC_URI += "\ file://not-check-libperl.patch \ " +do_compile_prepend_libc-musl() { + sed -i -e 's/\-lnsl//g' ${B}/src/Makefile.global +} + SRC_URI[md5sum] = "2fee03f2034034dbfcb3321a0bb0f829" SRC_URI[sha256sum] = "e3eb51d045c180b03d2de1f0c3af9356e10be49448e966ca01dfc2c6d1cc9d23" From patchwork Wed Jul 19 15:41:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108297 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp993056obm; Wed, 19 Jul 2017 08:42:16 -0700 (PDT) X-Received: by 10.84.239.9 with SMTP id w9mr518975plk.332.1500478935752; Wed, 19 Jul 2017 08:42:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500478935; cv=none; d=google.com; s=arc-20160816; b=zgLrCYkLQSyUdy7cmptZycq4mjCo2Kl+6LZOkfBPZWZK2hK3OFHR9jSUZU2hY9XxEu n2Y656KSp7aEBxT6UhC+y2R/gO0BBLVReU4yD4KqQp1KsLTXSu+6bJNFHJDe2hxIEV2c CKkZ5sPC3KiYSpy9Ojbbv2PwpuwRfQ1qI99lKYlbwp7HZnNgJw4yp7HM17R3UIhV/nRo rnNw0mBzCP/nA24baJAa58p98c2MeNsZZgI9BzqE1u7G0HvYT8hoZLvtndGWR9e7iBYl 3EYcl9Dzw/LdRTcJqbnhQQK9WBpP2qH97ZQG5+04QtFH9xpZPC+5uG0+X94Nm6fbglYm Q7Vw== 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=xVqlP8bfzo+OByYwLpI0LssVF3w33L+hOfhOs+yZbCI=; b=Ke1pFe7iCgdOTZpOiYKbFbHfHziJEj4nZk4I0S9+REMAEIHTYa8QfruW0P4YNrkd/D BTDyg0Cxd8Sz+QaK2gT+mwwc2pJD2J9/ZC75k1ikQ5jGabhTqfthSZMPRROatrHPlOde BNKLyg6Sszsd0uNgpavT9qTQ6JuS/TkqVJdKlC5jb8r2xfx2s0McX2DMjvaZO5AX1/H1 8YZHVrllB1397DwC/RzH6WNhf+l+1vV9+blcQhDm+vsnHbVGzXIdUWJIk09XzsOzaqJM FTULEwNcqNMqla5O2qhl4ezjvxxgtPemSCfbmyD1ynetNXQvTQSEE33VUIwUGGql7oYb ZwzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Y/RkOc2D; 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 b1si23267pld.832.2017.07.19.08.42.15; Wed, 19 Jul 2017 08:42:15 -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.b=Y/RkOc2D; 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 EE3AD7831F; Wed, 19 Jul 2017 15:41:57 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id A8EE3782F3 for ; Wed, 19 Jul 2017 15:41:50 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id t8so345105pgs.4 for ; Wed, 19 Jul 2017 08:41:52 -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=KmHh2EW3cP7bixvqMtBQEWcRiNgEIA7vALbBH5SzQSc=; b=Y/RkOc2DQ9N3eqvTFEoKL4s7jfkL7Soa2OyzJszZdyb0s0N/JL7vucnm8hxwFKMaV9 210+n3vjkmKWnwYGtDxmwtX1c/8SMQQtbquLozAI5M4oa6IDX9ptg8HtjNrsy1PNfnMg 6lk+3GF5vXyVfFZFIzdMJS2wynNFo6xwOU7bX9kw+mNaivfoUdwQsevr34jQx/M/NSb5 XUFcjSFvoAAAsyzxGJAt7UfO/AaEg39UljKYB/fkJPbujQsSafM7cy1SjWL3R+qnZX0G IWhgjYHsWHqL2IYKuKpta0Wbc7C2PdoOWH3PdU5l9/TD29gwXL5a/ICk9ZwbAm8RXJxt 6G8Q== 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=KmHh2EW3cP7bixvqMtBQEWcRiNgEIA7vALbBH5SzQSc=; b=MIh6ZEc9BVzKPaE+ziTS3DPTrcQ3QSjsW/8luBGiRskEX/W+FjyQXLRZiTxJumLxHd MkWCSz9he7PS0LOor6/nZ73Zw7pQlASyHP2/rVhX88qPiDvGS/pPLKhsv56vUPDj3+5I ijmNT+Bea9/X2xBhf82gw8n0/6fV0Q8oaVrpaB63q/Z3IKgwy7iZ17rTq09LuynbDv8p txxr7qtbo6DAD1njBurby//biqPeB0UUGXh1YxfXR7ui98L8hqV/7xc9MK15Hed27Obf pXoKG1UOKtOKDFu18E9uAd182oN7OolK9xozYPr61f8y33WukWAByOxFRPJuUg+hkU+E lW1w== X-Gm-Message-State: AIVw110CU/wNX+vzsX/oYFAQsSxZh3WgvRQz/X0AILzxhHErSksXG4Vv R9TtBmlI2w3Ed5fm X-Received: by 10.84.173.4 with SMTP id o4mr610278plb.180.1500478911600; Wed, 19 Jul 2017 08:41:51 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b85sm494845pfe.94.2017.07.19.08.41.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 08:41:50 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 19 Jul 2017 08:41:32 -0700 Message-Id: <20170719154132.20556-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719154132.20556-1-raj.khem@gmail.com> References: <20170719154132.20556-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 4/4] zeroconf: Fix build with musl 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 --- ...name-arp_op-to-avoid-namespace-conflicts-.patch | 69 ++++++++++++++++++++++ .../recipes-protocols/zeroconf/zeroconf_0.9.bb | 4 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch new file mode 100644 index 000000000..b4d6d94b0 --- /dev/null +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch @@ -0,0 +1,69 @@ +From 549773fdaf1fb003b84f25df386a07d299cdeb3e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Jul 2017 21:25:33 -0700 +Subject: [PATCH] zeroconf: Rename arp_op to avoid namespace conflicts with C + library + +on musl e.g. we get +In file included from /mnt/a/oe/build/tmp/work/corei7-64-bec-linux-musl/zeroconf/0.9-r1/recipe-sysroot/usr/include/net/ethernet.h:10:0, + +This is because in musl arp_op is a define which is included +and causes the conflict + +Signed-off-by: Khem Raj +--- + zeroconf.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/zeroconf.c b/zeroconf.c +index 812d34b..f27e907 100644 +--- a/zeroconf.c ++++ b/zeroconf.c +@@ -14,8 +14,6 @@ + + #include + #include +-#include +-#include + #include + #include + #include +@@ -34,6 +32,8 @@ + #include + #include + #include ++#include ++#include + + #include "delay.h" + +@@ -108,7 +108,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt); + void arp_packet_dump(struct arp_packet *pkt); + void arp_packet_send(int as, + struct intf *intf, +- short int arp_op, ++ short int arpop, + int null_sender); + void arp_probe(int as, struct intf *intf); + void arp_claim(int as, struct intf *intf); +@@ -1591,7 +1591,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt) + + void arp_packet_send(int as, + struct intf *intf, +- short int arp_op, ++ short int arpop, + int null_sender) + { + +@@ -1605,7 +1605,7 @@ void arp_packet_send(int as, + ap.arp.ar_pro = htons(ARP_IP_PROTO); + ap.arp.ar_hln = ETH_ALEN; + ap.arp.ar_pln = 4; /* octets in IPv4 address */ +- ap.arp.ar_op = htons(arp_op); ++ ap.arp.ar_op = htons(arpop); + + /* filling with 0xff sets the destination to + * the broadcast link-layer address for free +-- +2.13.3 + diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 13f9b9b9a..753d83298 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -20,7 +20,9 @@ SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.g file://compilefix.patch \ file://makefile-add-ldflags.patch \ file://zeroconf-default \ - file://debian-zeroconf" + file://debian-zeroconf \ + file://0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch \ + " SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2" SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b"