From patchwork Tue Jan 8 22:05:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 155007 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp9129jaa; Tue, 8 Jan 2019 14:05:32 -0800 (PST) X-Google-Smtp-Source: ALg8bN4/0B9U0yfBurBvC9B6aa/HKpuRoXfslcEbcbHd9AIaWt3QZRgU/1RSkVQZiUpbfYW7eXUe X-Received: by 2002:a63:2946:: with SMTP id p67mr3111214pgp.317.1546985132398; Tue, 08 Jan 2019 14:05:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546985132; cv=none; d=google.com; s=arc-20160816; b=ZzHRA142icVPmEjHQRkKa5zpwH7RUHLljXAkVngATL3686DFPoTEPrVBOait+tA607 ffZPRNRq7dGCd9Ceb5bxHm/YqlE+t9boMf36GdL9/Y7TostLQolI4VDmdzMvpEY6JGgr umiMgmO4lES9zPsCfjxKMH6KoTGippV5C8KrLTDfrleSn47ZZGzmVRNKGbJerIgih2Gj KKv+h06VH5dIIJX2KByoo4W3XbY0bGquZS9cM3mfhpLiOpJ5ItH6sGM5bR129/qU2qJ0 x56IdDqaKptb2q9W0jkaRNIcm8cN4hjMAtDCAd4AtrhdybITp+9c5GmEFEI76RyIW/Fz yy2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=aTfghtvc9MjE8QQ71R3Iqthp/XgcGprYjkYNg6r1f2o=; b=qHsBnobMC1YrL/BT7iRJocY7tmOQ8fw67G1b1vPZ6aBg6Op018KFJ5jMv9DeIinQ38 2Hfs4A13enTYQTiSJgds/Fuj1NOAPlSj67uEnAYexe6N8ipjbTE7YlVvy0Z6BYvVU/3+ 6UjyHQMleKXJ0qJE8IyTBbjokaDtA/NtbOmAirB7RJCRjxE3XA/wNUjkd8+zgoEH/qYU 4eGKBkaq0g2OqNTgOvx8G/qU7GiFdbnAxywr8CepB78VCkOu5waYw+AVYGNa3uF+rzAV +wh8OAJ0mt4+JeiBZ0Xuwx4vNX9xrN4DAxJLLjdRtoSsT6jrTEGbZhXNPng6jwb2St5T xuQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ALUG3BAg; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n20si1159143plp.294.2019.01.08.14.05.32; Tue, 08 Jan 2019 14:05:32 -0800 (PST) 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=ALUG3BAg; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 08F3B7C0AA; Tue, 8 Jan 2019 22:05:29 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mail.openembedded.org (Postfix) with ESMTP id 8E7927BFAA for ; Tue, 8 Jan 2019 22:05:19 +0000 (UTC) Received: by mail-pl1-f182.google.com with SMTP id e11so2528273plt.11 for ; Tue, 08 Jan 2019 14:05:21 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=auXXyfXcXRSsnAYMPAFxzh0Zk06acta5P0kGM36gbuw=; b=ALUG3BAgFoMhW1ckkWPM56yYqm55RXXJzV1mKKiwt9KBZalBibeVvdEAGxosoIEDz9 Tu8QcgR0dty2+eRbCGYltnScpEzl8G75RBiYHPdMY7X7q/zuDJ6fjSHVwsfukWHAbnlH vuGjiblij2kT1Mn2hr33J+VM+tEDSb9G0gvxFUNXVGpwo91Z5eifGOy0TJJEibytW9/m fmlDjocyyd2uTkwnk/MeLlnnM7Zn4GM7W6rJ7vEDwtOT88KPWGIGehJ+2YQqUd/OU456 kTER8hZdvQbX8AIWzf4XpTCtxQMSzL4XNEq/QyLk8VAIAm35en7unqyBtNhAnEKHiq/R FlAQ== 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:mime-version:content-transfer-encoding; bh=auXXyfXcXRSsnAYMPAFxzh0Zk06acta5P0kGM36gbuw=; b=FCYxd1NOflWBpTxzgkkaf71Z5Ve7iVB2ISCminl9sppvY8uprAw62mmQL64VOQ89xD BYFYvBi3mU7ZaFhhcndW/k6kXHAqfHvneTEnti+JG43st+k5X+CjPs/1gx4vk2mZXOyy BF0GD688lI9zQl20vWVSlQrDhULlUBRLWtTqqi365JCTa0KrSZzInVsLiazzehDCYOBw 6/qc1x3WaUyGok2UeWWUWkQXia3ZWiwq73XJZNZSyR6OFNZBxnKRM1G6PNjuQg61ML7i DOS0AyLSWqFq+gSQ1GRsAMkZbg9cEoXsyMBEW3RTRVPg8B6YALDGCpj8CwHsfBs3UU9r Spdw== X-Gm-Message-State: AJcUukcLoJ6FzI6M7g+UiMkXWDe+qsuN6J0C9xg2SHvpx4ZZLA15shRC 2sXaVDkzs0yA7Nn6SoNbfL89dxGvdys= X-Received: by 2002:a17:902:541:: with SMTP id 59mr3584882plf.88.1546985120179; Tue, 08 Jan 2019 14:05:20 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::6e98]) by smtp.gmail.com with ESMTPSA id b27sm104995752pfh.113.2019.01.08.14.05.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 14:05:19 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 8 Jan 2019 14:05:12 -0800 Message-Id: <20190108220512.44077-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190108220512.44077-1-raj.khem@gmail.com> References: <20190108220512.44077-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/2] linuxptp: Upgrade to 2.0 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop upstreamed patches Signed-off-by: Khem Raj --- ...03-include-missing-time.h-for-time_t.patch | 26 -------------- ...eader-sequence-to-avoid-duplicate-de.patch | 36 ------------------- .../{linuxptp_1.8.bb => linuxptp_2.0.bb} | 6 ++-- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch delete mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch rename meta-oe/recipes-connectivity/linuxptp/{linuxptp_1.8.bb => linuxptp_2.0.bb} (72%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch deleted file mode 100644 index 96163f6542..0000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b36cafdbcbe2193f5b669e703c608e19e23f80a3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Jul 2017 11:16:42 -0700 -Subject: [PATCH 3/4] include missing time.h for time_t - -Signed-off-by: Khem Raj ---- - util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.h b/util.h -index e912f19..3c634c1 100644 ---- a/util.h -+++ b/util.h -@@ -22,7 +22,7 @@ - - #include "ddt.h" - #include "ether.h" -- -+#include - /** - * Table of human readable strings, one for each port state. - */ --- -2.13.3 - diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch deleted file mode 100644 index e699275148..0000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3cd28aa771934d9165ff0d7e19932cde65de3e52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Jul 2017 11:16:57 -0700 -Subject: [PATCH 4/4] Adjust include header sequence to avoid duplicate - definitions on musl - -Signed-off-by: Khem Raj ---- - raw.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/raw.c b/raw.c -index f51c829..494ea7f 100644 ---- a/raw.c -+++ b/raw.c -@@ -18,8 +18,6 @@ - */ - #include - #include --#include --#include - #include - #include - #include -@@ -32,6 +30,8 @@ - #include - #include - -+#include -+#include - #include - #include - #include --- -2.13.3 - diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb similarity index 72% rename from meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb rename to meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb index c7b8b2933c..eb262d36b2 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb @@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ file://no-incdefs-using-host-headers.patch \ - file://0003-include-missing-time.h-for-time_t.patch \ - file://0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch \ " -SRC_URI[md5sum] = "5688cdfe57932273e1dbf35b3b97b9a0" -SRC_URI[sha256sum] = "fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165" +SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11" +SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"