From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 Jan 2022 15:37:19 +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 1nD5tn-00Ewb5-89 for lore@lore.pengutronix.de; Thu, 27 Jan 2022 15:37:19 +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 1nD5th-0005FY-Bg; Thu, 27 Jan 2022 15:37:13 +0100 Received: from mail-eopbgr50088.outbound.protection.outlook.com ([40.107.5.88] helo=EUR03-VE1-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 1nD5sf-0004FW-8L for ptxdist@pengutronix.de; Thu, 27 Jan 2022 15:36:13 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DaK00F97E9jyh/PKrypVRc8ngWREk5/jUBLSRdLfppsRVN8yFoMxfySK6L/eUYdW/kJ8tbJEtG+rWYiLKjOF+TOJCi0znmEJM39OfXmtG+Kv5iMAj6ueNJdpGaH6V9zl2stipeH7qaBZvMw2oW1uZD0jX1KZQY8p4mJ5LUSsWhFPIxzD4xmKVrw/qeJdS56sRu7sPEMK3S1yHHMAHfebnoQccG6lfb29GV/WB+lEE565CxTo/H0rt2HbMD+1f+2AIUCLqDcjlDppt3uuhl2+DPz4nbVv2Q39mmKwpDv5/6H3Tlp77JlBQbKpToGpeZVzNlQE0N/9I9Ic4f4cZzm/2Q== 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=1sMWtiykf5xD6w5iMACFTIyZX1NbmcGpAuF8O7hKfl4=; b=ITo67wtzQ1ivMu5RCkrf+dTcFnGJ4bPjCnT7PqPyQ9LfANLpN/CeepF2xVKZndFbbTUaqpPabyYhKL52KAAq88P8jG5GhmSVgDPjW++hrT4cA7padZfMyRdE61PTZZc9Xy90bau0olM6K3Wqrx+mx4fljYDcwxVeTgedcANiDVYmsvzpwkBwGWc69q9pJRF4cVmKH8jNorDriyOjaje5Mp9934tSpHv3H3SkWEV86zeaEgW8ubz53nmVVS3DxdlsqyxQqa+z2MlfajJ1o0hRiEnAnMMBWElIln8NfVDktgHO8RRr2oS7rxl8NOrYyS4rmb9fYSFAnVDN/3zAFreXWg== 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=1sMWtiykf5xD6w5iMACFTIyZX1NbmcGpAuF8O7hKfl4=; b=MBL1vjcZOZpQrxKG5C17KUjIEUemS2XmPdcjV76hhCafDS7lqcdkIX0uihjpiHCnC1+7djjRdY7LKgmHzxQE8Vh+vbPA/FiGswV5kbOTyTY5Vrj5qmL0lrqOnuG3rvTF0YGVcvrbZBq6/AkO1g0WPvWzxO+CnztNJkXChKuZlbQ= 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 DU0P251MB0598.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:329::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Thu, 27 Jan 2022 14:36:01 +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.015; Thu, 27 Jan 2022 14:36:01 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 27 Jan 2022 15:35:23 +0100 Message-Id: <20220127143532.2212796-4-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220127143532.2212796-1-christian.melki@t2data.com> References: <20220127143532.2212796-1-christian.melki@t2data.com> X-ClientProxiedBy: HE1PR1001CA0014.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:3:f7::24) 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: 0b4b949a-f73e-4b90-6d0e-08d9e1a256f0 X-MS-TrafficTypeDiagnostic: DU0P251MB0598:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Iev2Xcf4gnu3WIFkko3muyDfyiBgdj69PxBWsR0pB0+vvMQQeV7LRCBC48g1+6pdzUNJiz4W1BtYsv9FFXRfk8VIxiuCvUs7ozwh4Gg5l+7M11ktUEGpZYZq/iqlgn+vYdT3qG8snozgZ3RBIDzDgjyyIwCQqJ252TGZidu1dsOdwnNLkL+JuSK1epWGY0NPf+uNGUOddUA92Vjtiu7QiCMaqtcFWz4VNOMswoclA+OXgOXrKD5gWXMGpXbJH1jfjecsx16F0z5VQGNINr60dZfhROoXslsOM2BN1hf0J/45G1bVVDsK5G8n5j6AgqEMytr4DA93KZoGFjQi75yQPM2mlOB/Ud43lChuWtNXj/E0iIIceYk851ZOkYlTvqsPuPEjbHtvYGj+7K1eDTrBJfMPIxfMyA//pH6Sl3CvkFyg/5jLbLHq3z9Obf1IL5Ab1zDiQsBGyBpwJh4V0GqymBs4126zSPOid5GJZJmuDfOzr3lV2lj07hZQsxTL0obcdGfxVdrroiB+xWJqXcgF9Atf33WDz7OX1Ka6bAsvVcKglXrZ/RHSFSJgxHj2gk6z0jhT86tF8HpUsIKOBKDZiolLdpk8fHTyjllX0pR/BJrGD57PLHquRumu4kDA9IyvvAAhvg63eobk81GNPTw4s+X7KeZ92voYFamNYSLRCTTiVWTwCGjMllc4W9HgHJqo4sb8Oh11eAdtV5gJjDgl9UPTaPWO5s90Y+1ja7k3ZpuSPNM0UijQHUgXIQdomipocoypI9Q1jZTU/nb8upPieUj+jbLxVN1wTi9Msq781D8= 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)(366004)(136003)(346002)(396003)(39830400003)(376002)(966005)(6512007)(44832011)(36756003)(6486002)(5660300002)(2906002)(508600001)(66476007)(66946007)(38100700002)(52116002)(86362001)(6916009)(83380400001)(316002)(66556008)(6666004)(8936002)(8676002)(186003)(38350700002)(2616005)(6506007)(1076003)(26005)(20210929001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+TCSXign8H7JPlrq3FI6/qbc+CjKr96X5RkGX3AXLSOtYbgmjFaAQW6oG8ZB?= =?us-ascii?Q?giugF3nlzxIou1M0/2aXB4p9vrZgzP2MYgYgklx0GBZtLoW2fkLZEkWnZ9Ok?= =?us-ascii?Q?ZWffYXVvvi1FKBwZ+vzawThcHShkJijTHDeIV8w/vNr7+3kfLnt9nfb7Csh1?= =?us-ascii?Q?6hWHeZCQCk1BJm5waijx28bRXQUobkmKP3awyDP1K8GOF+FnzHGGRANygUg5?= =?us-ascii?Q?rJxls/P9YJ1rT09dH0mJOjje205H2qb1RH4U9N/HCD+vycIRTsO2qNu21BTH?= =?us-ascii?Q?0kETk6QJNfwkx1TnIxC8G5f3BH+nJkdOoFktjLCokOPRyWu9Ug+8pYhGtjIb?= =?us-ascii?Q?geCRvTQRXvMoJx0m/zP76kRJVvdxiU3rLH7aMXc07qHrxjemjSeaZSXCrGu7?= =?us-ascii?Q?5wtC8aljz6XNKfoSeWAyczhMNp0Glk2gFfCypVd7LA8uy8kDkIrGhyw+Dtk0?= =?us-ascii?Q?+ZXQhDJndgkwZ84FI2tN7i7p5HK5wKWVaKv0vkOwnVzY5RhQPCT5IoXu8zAA?= =?us-ascii?Q?EH9aBu5xZviIu7vWFV6RlgNkhOTP1fx7nQUQM026FKqDrxKTfM8KIELk93JX?= =?us-ascii?Q?yIzNHqbRJWcS+cxorS7cj0+gQI+B5crBCq1aS8Ctk9eHbAB5Q6sR8usZNbgi?= =?us-ascii?Q?RILViME6B11muV4wSsv9bjFWzbGpMFW7lOV9UHAUxdFh4JOrtZMIXtRIGZfA?= =?us-ascii?Q?ckilbr+xEpF7Pl2fwkFUEH2d19dhewBKfLoGNYBHZ/JtdzmP8nJs/O0PDUSy?= =?us-ascii?Q?9YBKEVdCqa1dzKiy2WADiX5npjEjsRL4PsD/S4qmjGrBjWT7YCxddzKmHPln?= =?us-ascii?Q?R7KYmvW7sSmWH/U+31AC/SvFhj8VY1jstuAT6ICltkc7VlDC7DlH7PShgzBZ?= =?us-ascii?Q?xoEuUx5odoed5vvmCptmLqX+xMy1SRqoSIyFboJav8zxGmDxu/SyDGbbVTWA?= =?us-ascii?Q?SRZb6LbB6tNf9IMzk/KQ4rBD+BKkdLVmV7VnFfEX0oFCaiekj0pIzoI5TB+V?= =?us-ascii?Q?o0bWAnEuwf7H+dUWQIDho0oxQg8BCRx2//lTHoaaunDYsnZZ0oyobD3ZmWod?= =?us-ascii?Q?Nyl+AXivWRXN2ioSAEgkqJPQeasT4C+oYHGBXh2Fdo9G10pPdFbuYTGOUqVs?= =?us-ascii?Q?ltQX+tK0I4wDX03bok3WYLzZFhQ8fsWjDC/hm5Hc2+1RbSDKbmcvQ0ZTr5EO?= =?us-ascii?Q?QOM9ngOfu7qn4eLK2s/fL0oNAJUm5J97RmbYbCEbhL1JgLkTUA6jVcGzuIu5?= =?us-ascii?Q?VcQY67Cil3kTWrIYTwr4FOk21pDda6PrA5DEVu4S8+g21A8H4eChJUvCYljq?= =?us-ascii?Q?ICzyX6ocbaWt7FmdbMEJJb7p6XoQqR+cHssDcIdpqMS4oWVLDd+aMnxTVgbm?= =?us-ascii?Q?VU9batF4oHwL6vw5yKr0vJin5ZAlsE/sB6BJ5QmfSv7EOst8X31JWy25lWWq?= =?us-ascii?Q?fxxIeD3KErTUCyfKzvjfwGJjDRIbln6KchIZfFu32kBUerUhbxhQy703yKCP?= =?us-ascii?Q?jXHSWvrhBCNlTbrctIvCiiEyTsZ6FPH1O2gVbA9e4JzFSam2qZp1U3VVAYCU?= =?us-ascii?Q?7DStgSKi+N/CNB5HdgJjeh3IW6gTV8XHQJsqtZSGYIZHP1hXTIKH+hCjaPj2?= =?us-ascii?Q?LNMowHWFYQkZfpoF+w+i1kdBbVdG/ZRF2Zwllney5HWj4fwRv1ZLGVQZFgez?= =?us-ascii?Q?W9868V2IhoSwrm0OOZ85KiC17Qs=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b4b949a-f73e-4b90-6d0e-08d9e1a256f0 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 14:36:01.0590 (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: SdDIvey48aaCuQeQ7buH5k8w8zTdTkBzARMkwq+3/NSayAk0cYDPO1tJKyZLF9qxOE624VMwYLmHHDxRkhTM1m2ziMx0l8rgNrpqQXWqyy4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P251MB0598 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 autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1 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 Mostly bugfixes. Including the build fix previously included. Remove patches. Signed-off-by: Christian Melki --- .../dump1090fa-6.1/fix_cpufeatures_arch.patch | 61 -------------- patches/dump1090fa-6.1/series | 2 - patches/dump1090fa.make | 82 +++++++++++++++++++ 3 files changed, 82 insertions(+), 63 deletions(-) delete mode 100644 patches/dump1090fa-6.1/fix_cpufeatures_arch.patch delete mode 100644 patches/dump1090fa-6.1/series create mode 100644 patches/dump1090fa.make diff --git a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch b/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch deleted file mode 100644 index 270a35846..000000000 --- a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 059e48b82beb4fb920cca977b02db1ceb48facb9 Mon Sep 17 00:00:00 2001 -From: Oliver Jowett -Date: Thu, 23 Sep 2021 13:23:17 +0800 -Subject: [PATCH] Allow env vars (not only command line overrides) to set - CPUFEATURES_{ARCH,UNAME}. Change CPUFEATURES_{ARCH,UNAME} defaults to use - {ARCH,UNAME} values. - -Fixes #158 ---- - Makefile | 8 ++++++-- - Makefile.cpufeatures | 4 ++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index a85d154c5..9d81ed157 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,7 +39,11 @@ else - LIMESDR ?= no - endif - --UNAME := $(shell uname) -+HOST_UNAME := $(shell uname) -+HOST_ARCH := $(shell uname -m) -+ -+UNAME ?= $(HOST_UNAME) -+ARCH ?= $(HOST_ARCH) - - ifeq ($(UNAME), Linux) - CPPFLAGS += -D_DEFAULT_SOURCE -@@ -150,7 +154,6 @@ endif - ## starch (runtime DSP code selection) mix, architecture-specific - ## - --ARCH ?= $(shell uname -m) - ifneq ($(CPUFEATURES),yes) - # need to be able to detect CPU features at runtime to enable any non-standard compiler flags - STARCH_MIX := generic -@@ -180,6 +183,7 @@ include dsp/generated/makefile.$(STARCH_MIX) - showconfig: - @echo "Building with:" >&2 - @echo " Version string: $(DUMP1090_VERSION)" >&2 -+ @echo " Architecture: $(ARCH)" >&2 - @echo " DSP mix: $(STARCH_MIX)" >&2 - @echo " RTLSDR support: $(RTLSDR)" >&2 - @echo " BladeRF support: $(BLADERF)" >&2 -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures -index 8c3b8418d..6b4289978 100644 ---- a/Makefile.cpufeatures -+++ b/Makefile.cpufeatures -@@ -2,8 +2,8 @@ - - # cmake integration is a little tricky, so let's do this by hand for now - --CPUFEATURES_UNAME := $(shell uname) --CPUFEATURES_ARCH := $(shell uname -m) -+CPUFEATURES_UNAME ?= $(UNAME) -+CPUFEATURES_ARCH ?= $(ARCH) - - CPUFEATURES_OBJS := cpu_features/src/filesystem.o cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o - CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG diff --git a/patches/dump1090fa-6.1/series b/patches/dump1090fa-6.1/series deleted file mode 100644 index cc3b46e66..000000000 --- a/patches/dump1090fa-6.1/series +++ /dev/null @@ -1,2 +0,0 @@ -fix_cpufeatures_arch.patch - diff --git a/patches/dump1090fa.make b/patches/dump1090fa.make new file mode 100644 index 000000000..366209805 --- /dev/null +++ b/patches/dump1090fa.make @@ -0,0 +1,82 @@ +# -*-makefile-*- +# +# Copyright (C) 2021 by Christian Melki +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa + +# +# Paths and names +# +DUMP1090FA_VERSION := 7.1 +DUMP1090FA_MD5 := e50b888f2d9ec86a15cd39f997eb099b +DUMP1090FA := dump1090fa-$(DUMP1090FA_VERSION) +DUMP1090FA_SUFFIX := tar.gz +DUMP1090FA_URL := https://github.com/flightaware/dump1090/archive/refs/tags/v$(DUMP1090FA_VERSION).$(DUMP1090FA_SUFFIX) +DUMP1090FA_SOURCE := $(SRCDIR)/$(DUMP1090FA).$(DUMP1090FA_SUFFIX) +DUMP1090FA_DIR := $(BUILDDIR)/$(DUMP1090FA) +DUMP1090FA_LICENSE := GPL-2.0-only +DUMP1090FA_LICENSE_FILES := \ + file://COPYING;md5=751419260aa954499f7abaabaa882bbe + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +DUMP1090FA_ARCH := $(call remove_quotes,$(PTXCONF_ARCH_STRING)) +ifeq ($(DUMP1090FA_ARCH),arm64) +DUMP1090FA_ARCH := aarch64 +endif + +DUMP1090FA_CONF_TOOL := NO +DUMP1090FA_MAKE_ENV := \ + $(CROSS_ENV) \ + BLADERF=no \ + LIMESDR=no \ + HACKRF=no \ + RTLSDR=yes \ + ARCH=$(DUMP1090FA_ARCH) \ + CPUFEATURES_ARCH=$(DUMP1090FA_ARCH) \ + CPUFEATURES_UNAME="Linux" + +ifdef PTXCONF_ARCH_ARM +ifndef PTXCONF_ARCH_ARM_NEON +# don't try to use NEON if it's not available +DUMP1090FA_MAKE_ENV += CPUFEATURES=no +endif +endif + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/dump1090fa.install: + @$(call targetinfo) + @install -vD -m 755 $(DUMP1090FA_DIR)/dump1090 $(DUMP1090FA_PKGDIR)/usr/bin/dump1090-fa + $(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/dump1090fa.targetinstall: + @$(call targetinfo) + @$(call install_init, dump1090fa) + @$(call install_fixup, dump1090fa,PRIORITY,optional) + @$(call install_fixup, dump1090fa,SECTION,base) + @$(call install_fixup, dump1090fa,AUTHOR,"Christian Melki ") + @$(call install_fixup, dump1090fa,DESCRIPTION,missing) + + @$(call install_copy, dump1090fa, 0, 0, 0755, -, /usr/bin/dump1090-fa) + + @$(call install_finish, dump1090fa) + + @$(call touch) + +# vim: syntax=make -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de