From patchwork Sat Sep 14 09:32:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1162320 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GwlvKmkA"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46VnNM0JqBz9sNF for ; Sat, 14 Sep 2019 19:32:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3D27987FB5; Sat, 14 Sep 2019 09:32:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JOQpNg7-Ipfm; Sat, 14 Sep 2019 09:32:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AAC8087F38; Sat, 14 Sep 2019 09:32:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id CFD311BF3C1 for ; Sat, 14 Sep 2019 09:32:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CD5F687F38 for ; Sat, 14 Sep 2019 09:32:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tnJrG-sAECHg for ; Sat, 14 Sep 2019 09:32:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id CDD5A87ED0 for ; Sat, 14 Sep 2019 09:32:26 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id y135so3518750wmc.1 for ; Sat, 14 Sep 2019 02:32:26 -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 :mime-version:content-transfer-encoding; bh=+UErbVBAgOFSDsh8G0MUMrEWNiExXzU7i3hZcQoZg14=; b=GwlvKmkAbMj2G6XxawlX9Q9zyPTXwoawikHBbt7M4sQDJBqRtuzM47osTNl/aXpkU5 tc2EtaGPIJPaATJxifpVI0tcX8ZC0r1y8EewnVWONVMIeNqSknsuizzADkcaCoiod2WT bGrNdvPI0m1y0bq6GKhwsXUXGXO+ZEtkL3J6cMyXDCj1RMYnW2hLuPgZiWeSb0Ei7dZA AMLfeBkW5V7OpWOCOhr3J15Iw4mkB1YLdkpMODrguIFF9i2P6eIlPTBAwLa1Y1EM1prl K+3jInqdiONoWEwLvdYVwizU3eTgzHcjZPqyRaQMiyBb+QZyn3otqebEOcmuiTg12yBS pJaw== 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=+UErbVBAgOFSDsh8G0MUMrEWNiExXzU7i3hZcQoZg14=; b=S6ZLphBlWvoK8efnhDpzV3xp85yaHE58g22kH9BnLlgbvNtitp84HfXZB5buEa5pQn rxpZaZIpSXXx7zB/bRy1MdmQ1jzvSeqN4nQEsRXjG/26EKAYGo3hwOAMnCzP6cD+6tFV izOBbJsjt9OyVZazS5/slic7A1qfIHZYo3eCFJg83TZ1vHoscof/1jeMrtIQFtigKCY4 7Kr0Byq1bndaQ3cQe6SWmz63xoH84tm/C9pzNcktX9XJXf27OhR9e+tyt1FFNw8VybSk K7qisq9KfBiMAG6joncMr13G8zlfaXtM1n8Ywubgq8DZr2IsRzypfutnoWyxYbP7foYY lmMg== X-Gm-Message-State: APjAAAV+y/xKprgaVilYmq+GaU2Mw54VakQaqSBEEc2+1uwNtdncrRHS pFDPNZXvRv6OaXM9QizuNgVT5Z2tRaE= X-Google-Smtp-Source: APXvYqwr/i6IuA0B6h8CROgzIgQ8j3U43Iu3jWAZgZaPD23+xCMdyQXAyDAIFu8c8zQJYs3MLAcCMw== X-Received: by 2002:a1c:c589:: with SMTP id v131mr6403761wmf.163.1568453544874; Sat, 14 Sep 2019 02:32:24 -0700 (PDT) Received: from kali.home (lfbn-ren-1-605-248.w81-53.abo.wanadoo.fr. [81.53.181.248]) by smtp.gmail.com with ESMTPSA id w12sm47070933wrg.47.2019.09.14.02.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Sep 2019 02:32:24 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 14 Sep 2019 11:32:27 +0200 Message-Id: <20190914093227.4893-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190914093227.4893-1-fontaine.fabrice@gmail.com> References: <20190914093227.4893-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/chrony: drop musl patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch is not needed as musl defines SCM_TIMESTAMPING_PKTINFO since version 1.1.19 and https://git.musl-libc.org/cgit/musl/commit/?id=c35a8bf456ca6ef74e3cc7c4d8f63572bc1e1167 Signed-off-by: Fabrice Fontaine --- .../0001-ntp-fix-build-with-musl-libc.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/chrony/0001-ntp-fix-build-with-musl-libc.patch diff --git a/package/chrony/0001-ntp-fix-build-with-musl-libc.patch b/package/chrony/0001-ntp-fix-build-with-musl-libc.patch deleted file mode 100644 index c927b343f7..0000000000 --- a/package/chrony/0001-ntp-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1e64bc4c4379ae3e55be3c518e0e3e22c8c4ae77 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 14 Nov 2017 13:23:57 +0200 -Subject: [PATCH] ntp: fix build with musl libc - -The configure script enables HAVE_LINUX_TIMESTAMPING_OPT_PKTINFO based -on the existence of struct scm_ts_pktinfo and -SOF_TIMESTAMPING_OPT_PKTINFO that were introduced in Linux kernel v4.13 -in the linux/net_tstamp.h kernel header. But this feature also requires -SCM_TIMESTAMPING_PKTINFO that is defined in the socket.h header. musl -libc provides its own version of socket.h, and as of musl version 1.1.16 -this macro is missing. Define this macro in the code as a temporary -measure until musl is updated to its latest version. - -Signed-off-by: Baruch Siach ---- -Upstream status: not upstreamable ---- - ntp_io_linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ntp_io_linux.c b/ntp_io_linux.c -index 00caed06f7ba..2214a6f6f6c5 100644 ---- a/ntp_io_linux.c -+++ b/ntp_io_linux.c -@@ -574,6 +574,10 @@ extract_udp_data(unsigned char *msg, NTP_Remote_Address *remote_addr, int len) - - /* ================================================== */ - -+#ifndef SCM_TIMESTAMPING_PKTINFO -+#define SCM_TIMESTAMPING_PKTINFO 58 -+#endif -+ - int - NIO_Linux_ProcessMessage(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_addr, - NTP_Local_Timestamp *local_ts, struct msghdr *hdr, int length) --- -2.15.0 -