From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 29 Jan 2022 20:26:31 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nDtMl-00HX02-Sd for lore@lore.pengutronix.de; Sat, 29 Jan 2022 20:26:31 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nDtMl-0005dP-5Z; Sat, 29 Jan 2022 20:26:31 +0100 Received: from mail-am6eur05on2079.outbound.protection.outlook.com ([40.107.22.79] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDtME-0005cd-Jm for ptxdist@pengutronix.de; Sat, 29 Jan 2022 20:25:59 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YfcPWyaidCdI/8p/gMAp1KBDjoXkuOHE3n//cfMc5HT/vVX05iQJqFbesRgz0EsCbE3I2LGcOpPc1PcmFqk0+RugKU0Ws4uMVs9dmCUpkkxpMVNPMnYdk/SpvkUFbfJ4AMBY131lWFVf2zmmYW4kroxNCrbdiOlhE85+nO53J7GNWjIcbzmKPeqiTAi7PNsHvLw7MuKZnL4j21i54USpEJrowx2U88ZqkBxI0Kmgbs+LxfNxq3fhQAf7yZgA3/6YEKJ+VCwTXPmb5311rU+eSnrqKy41pTxr+gUcQAwxjc+BmagDJbKXYv8TFG2XPzcZ7i/j2ycWpwMOLi/q/fNeZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iMG9Hqx2DGvRHR/UdIupCzd1YZ9VqKWEKjunjYntTq8=; b=O4+Jm+ziRD9wV6Fs+lu+36+GbkCfMEYPjAupq60iGGuVahTqkLzrZVs7a3fDCRGDd3DUfA5+6jjmUYg/3C7z556d1SImBZ3ZwNayZ1doEhTZ/Ok2TurXyf12CjS/JyroDLsslgQUX1hWfQ4T7OMDpuYcK7z1x7LYe+vmD/1+Cmgz8sVUih4M7h/GzSFpHzykwoAL1jJu3PR112lmy8HEoUbZ7lmY8cFWw7M4tJm54BmZrOhF0mpuEy/jK0adEJ5pBmMQHBg3AuvFAfpiEzyHY+QU1a2UQec1I31RwRnZ2NDiYFENUSF2ir2kgihbIFwiqXh8Ek/e/VuzQYDoOawLyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iMG9Hqx2DGvRHR/UdIupCzd1YZ9VqKWEKjunjYntTq8=; b=iWyStpHm0embWP+4LY3/pvDeYPOUiYBSCdkosGWA67HH44lqKk8GNPFccQQeMcELxqDwQBpo3JozCl54Z5cBTtM8UC2dNeBuYtsdefq1vcnbBo5Wy+Zj329uos0TRECq7750kOEzFBR/r+tNhnuDShOIfpEIJL1qg62hsPW9tMM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DU0P251MB0409.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:341::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Sat, 29 Jan 2022 19:25:56 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe%4]) with mapi id 15.20.4930.020; Sat, 29 Jan 2022 19:25:56 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Sat, 29 Jan 2022 20:25:49 +0100 Message-Id: <20220129192549.2632671-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: GV3P280CA0065.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::23) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76f56059-3934-46e8-eaed-08d9e35d2c23 X-MS-TrafficTypeDiagnostic: DU0P251MB0409:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:612; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BfGWR1w3tkS9o8fXbNNw77kp5LCpADIQbQ13+Njr/mOV2aZZr3CVUt2nsw01pBzNtSHem/sdclCSd6JGYa2nrnRrDhbLneZcoZwF+SgTYZPcJ5VFH9N+jUyHgGGp956HcOQoB4qR2Ye/O+c7sOHBrUBh8VV4tz1cXBWilC9b7IwPW5DF4dUcquTAdRfPB3tzbYV7dLe3MBPffLBIpFtMTJomdIITIrs8qrP/tTvVbj6fI0nQcEs4ZqzD5bWrtZ5pVDDn4zdUHHcAVdVnUQNnsXVtqriIG8eFqN7hyHTHqevry04qZEwdYrMvJFJkhGJzU2mebXvqv2laoo5A5ijtHBjLgr7F8pIhKn6YeJtg3mdF4yh3neMMuN3YwH39CfiSfMRbEjOhhed2z/ZDJir2tedQRPXZIxcvaEiukxXAf/gJHAuVVSjyD6lhvCONKxUPPzJdT1pZkwQD6V8xaDszoM1qAuSof3MyMt1Ib14SIfxOZoSjkTQLvg5ROo9IPW08UOojZyplsv2vXcUNYjKh6CYdtgCA1BreKEewHXoc52sJGr/Ual3tvKyvIhAeRH7XjA139MZtrJNpCRB6O18+la3TW5IUGpoh6m+CZDPxL5M7kvJcaIeSSFDfP/uhydIjk2fLoZGGbyOhC5GiRq3U/PQvZ/mBJP7zkXiyMm2q8IKVQg3+i8KrvpnTWlQ8xiWQAljJyHrBORXMbe1pmhgQdO8igcWHU4/9y8jiYTvXPi/R3FbSFEG3r4BOVWtQkgjExki5I63b4eD3+EIKsxTJJ5Hg7eoPduk3lfHb191jyawnM1w+GUvTlY83ggNLQQo1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(346002)(136003)(39830400003)(376002)(396003)(366004)(2616005)(2906002)(38100700002)(8676002)(83380400001)(44832011)(1076003)(38350700002)(186003)(26005)(66556008)(316002)(66476007)(508600001)(6506007)(6916009)(66946007)(36756003)(6486002)(5660300002)(8936002)(86362001)(966005)(6666004)(52116002)(6512007)(20210929001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tG8aVvMhFVV3qTRnt/yV3RtCbm1O2E69FhelI1WoRkmE0eg6tv6udG2hKTj1?= =?us-ascii?Q?EH0HPqpfirLKCoKczvxO2T9+9UqIP4fInCW5ZvZtVo6WGwcA//m5ZtHQI0oG?= =?us-ascii?Q?VFIO0N9y4DPfyuFTPPaAfhATQogS+yWu1MUMYUY+sMccL+TPXEzU/tK+ZBWX?= =?us-ascii?Q?iZ2I1YQruOvWzleMRPhmRvju+39UROECnyUYrEKSnjZEiiFpur5B93x/7QkC?= =?us-ascii?Q?H/PIVMCdo/BCHDehWx1NoCHLd85WOOOwYSMgJiorN71PQWu1BQJpXFGMWuko?= =?us-ascii?Q?HHsK6se3k7t0MpAHeH0l5ALw+XprBrVvd3DwjpA+2ozv9q6ETDGafkundPso?= =?us-ascii?Q?5gzR9PcF3O6lV9OUiJyovrQOn/Qi2JuMmTvjTK+O5oZNV0dVwT/f7i0WSr3N?= =?us-ascii?Q?S60LWW68WO+bgoaElOODLHscdaqOhkFP057OnUNX+QlguWaZAEKhmDw52yh4?= =?us-ascii?Q?7m5bdGU3ADtvhXpdLvNv0f9vdD3jlWji2X5NUQwr33p7+HqtNDfH49Xen4ZN?= =?us-ascii?Q?7WwwlchVPm7N/ZPmSFMOevdINPkO1zI2xE3rmcz0pNH7jr8KcAcCIcoyasII?= =?us-ascii?Q?la2tSYskUws2HvHEFurdLfGo2aZdVs1606hLUefk0PKxCejEUVDfxfKUrMLb?= =?us-ascii?Q?hjVsUcFJDTDgR4etO76fj0506vRZkYd32TnC6u+ImISDCXK59SF3bQkaCgKp?= =?us-ascii?Q?HuvHqshKE55yX1AlOQ1DfFvVcuhfa//nWxy2rqMPFsWcZ5mrXQaTBbDVFGbO?= =?us-ascii?Q?RyKIBQe8sZcMDZ1gWspRoX3YfGLTsqs5BTA+fJ02SueTauEPpJdyB+N2GunN?= =?us-ascii?Q?GkwFzmQbe5S9durIe0FWXw9hZBMS7CjUhJVb4bED8bz651YmpQ/2NQGjtAJQ?= =?us-ascii?Q?sSueAssToaH+BLEizgvQqfKnQ+Ua7R3ACXzD9yNKJcrs/qnUelIwmZX0JjRb?= =?us-ascii?Q?atHZWHYWq+ioUCfY0uPaFC+8/S/HDHtVwWxpuS82Yv3bCfk+UZLCAJ6ifPrd?= =?us-ascii?Q?+3wgiKeX+rrWm+NbBDT/lkeSfRRyxjNQnN1koB2mibqJ9/1PbSZISDLrCXGU?= =?us-ascii?Q?yPzVgDvicowVIbDl1vuOEuJS0mO2LQPAzPEOLED0G2oc8uBY7vszy1lm1bTZ?= =?us-ascii?Q?zBKf2a3tbzjbNKUokW9z7TDV2A+dr3pMFl3OBrxeJEIxsr2u9BPPmjRKBhKR?= =?us-ascii?Q?ej4oRarVfKdZVlSINbZAGIPdAXvHkRXuhjlCoo6ymt0Uny0HJxzxAvNhu2DM?= =?us-ascii?Q?2hfMiPgMaEVK76ESt7zrappuHL+G9tpAyhzBcxVICTLc94KZRED2BuXezT+2?= =?us-ascii?Q?yhLoAVr4hkZw+oC1GtHo7ZihaNuKs18pqgJ+FbJFtYV8vvAUZRue4RZGAUaX?= =?us-ascii?Q?yU90DNpSdtvmzAqCNQpJ/2YwuZW1u6HBz3710f2Ox2oY3+ijQ2OO6zxRShtN?= =?us-ascii?Q?G23eEZIL9vdl/HuDFvahnydNMNY9NfM50HZkAu6KTIaIjIIdcGBtXRbgP9ZE?= =?us-ascii?Q?JevnykxyZTimRWCGdNuayQHVSOCLYtAK8XvKEnbubf6u/c3jjxFkDSkVIitB?= =?us-ascii?Q?P4RWgYeqZlqaqSkc0j/mKXms3IAftSDp85Obcsp3CWiD9H7HREV8PlhPoza7?= =?us-ascii?Q?ur/pEhzYrIU+4aTbl+U8AsVJmuLErFiw7DrGppT6LmVx+nnxlTiDCW/fBg9L?= =?us-ascii?Q?8z+LLfnIZGRyqSJB3TqcaI6rZDA=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76f56059-3934-46e8-eaed-08d9e35d2c23 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2022 19:25:56.3213 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lkNB7Z2k9qRun7vi68yaeYYZfdLshdCn87IH2yc/Mu8zhdMXrV8IUIeuC85nQ6qjnS2h/qkuuRXqWjYbZRUQiHcu2es/bBO+sLBf3pQK1qQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P251MB0409 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] pps-tools: Version bump. 1.0.2 -> 1.0.3 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false * Update pps-tools. Very minor bugfix release. * Remove old patch as that one got fixed upstream. * Add a patch to remove inclusion of SYSROOT. Signed-off-by: Christian Melki --- ...le-fix-installation-to-empty-DESTDIR.patch | 40 ------------------- patches/pps-tools-1.0.2/series | 4 -- ...-obstructive-use-of-SYSROOT-variable.patch | 29 ++++++++++++++ patches/pps-tools-1.0.3/series | 4 ++ rules/pps-tools.make | 4 +- 5 files changed, 35 insertions(+), 46 deletions(-) delete mode 100644 patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch delete mode 100644 patches/pps-tools-1.0.2/series create mode 100644 patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch create mode 100644 patches/pps-tools-1.0.3/series diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch deleted file mode 100644 index 97498dc22..000000000 --- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Thomas Petazzoni -Date: Mon, 3 Dec 2018 13:55:02 +0100 -Subject: [PATCH] Makefile: fix installation to empty DESTDIR - -When DESTDIR is empty, or at least does not contain usr/bin or -usr/include, the installation fails, because install does not create -those intermediate directories: - -$ make DESTDIR=/tmp/koin install -install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc -install: failed to access '/tmp/koin/usr/bin': No such file or directory - -Using the -D option of install fixes this: - -$ make DESTDIR=/tmp/koin install -install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc -install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h - -Signed-off-by: Thomas Petazzoni -Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1 -Signed-off-by: Roland Hieber ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 939466885e9f..30672f79585c 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,8 +19,8 @@ include .depend - endif - - install : all -- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) -- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h -+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) -+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h - - uninstall : - for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series deleted file mode 100644 index 7b3c77623..000000000 --- a/patches/pps-tools-1.0.2/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Makefile-fix-installation-to-empty-DESTDIR.patch -# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic diff --git a/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch b/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch new file mode 100644 index 000000000..6bb31aff6 --- /dev/null +++ b/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch @@ -0,0 +1,29 @@ +From: Christian Melki +Date: Sat, 29 Jan 2022 19:22:44 +0100 +Subject: [PATCH] Makefile: Remove obstructive use of SYSROOT variable. + +Ptxdist declares a SYSROOT env variable which is picked up here. +But it is used as a cc --sysroot variable. +This offsets searches for std headers and causes breakage. +Remove it. Not needed. + +Signed-off-by: Christian Melki +--- + Makefile | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile b/Makefile +index a57a325bc133..30672f79585c 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,10 +3,6 @@ TARGETS = ppstest ppsctl ppswatch ppsldisc + CFLAGS += -Wall -O2 -D_GNU_SOURCE + CFLAGS += -ggdb + CFLAGS += -fPIC +-ifdef SYSROOT +-CFLAGS += --sysroot $(SYSROOT) +-endif +- + LDLIBS += -lm + + # -- Actions section -- diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series new file mode 100644 index 000000000..8376d9c98 --- /dev/null +++ b/patches/pps-tools-1.0.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch +# 7d2c06910f16bd177a79768e6f4195f6 - git-ptx-patches magic diff --git a/rules/pps-tools.make b/rules/pps-tools.make index 65a06c7d1..789659154 100644 --- a/rules/pps-tools.make +++ b/rules/pps-tools.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools # # Paths and names # -PPS_TOOLS_VERSION := 1.0.2 -PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7 +PPS_TOOLS_VERSION := 1.0.3 +PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION) PPS_TOOLS_SUFFIX := tar.gz PPS_TOOLS_URL := https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_SUFFIX) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de