From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 Jan 2022 16:56:41 +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 1nD78b-00F10J-7I for lore@lore.pengutronix.de; Thu, 27 Jan 2022 16:56:41 +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 1nD78a-0000NZ-Fi; Thu, 27 Jan 2022 16:56:40 +0100 Received: from mail-ua1-x931.google.com ([2607:f8b0:4864:20::931]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1nD78T-0000NQ-3G for ptxdist@pengutronix.de; Thu, 27 Jan 2022 16:56:33 +0100 Received: by mail-ua1-x931.google.com with SMTP id w21so5513116uan.7 for ; Thu, 27 Jan 2022 07:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=NkVN2nfoP/hshi056ahbNj++Ujha0vecETe8g5ji9dc=; b=YO8U/EgSevlAvBsuR7CwlmcFwY683BzINJEIrjBjQBH+V/ruXkfl9BWfYThY1E3+HY JPQTemm3akxMCsfxQifwhHzydYWB3AYwMbHUDov8DkgxD5y8Txjj7JBpaI93ca//REPi HnaERLyz6ovuffqIFJ8k0xLeVIRdeqEqQCoKjczufX2uitjP5fqgCXNwaWnMI2SWKa1g B3nxwaGtH2JHYQyDF05GzUECruag97/iZK7/sv+bVWEey1rXNgu0Ngj1mXqcxpUyuy7Q M90nBgy7A9rZe+Sfza2mz4/66uqHiVJalAtrnWxulz4L4g3majd4LzypFrOulstpDocq Ndmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=NkVN2nfoP/hshi056ahbNj++Ujha0vecETe8g5ji9dc=; b=WXfDuGfy3mCOAGt6+4MT3TVTa9+HbASh1VxMglND0Rdq0cwSjKzFsoSQuLuJuO5ZpZ 78FpHU1CWmRCiR4frvxB831cI0Yd/+NSvH+w+mzkecKJv9Gvv2MV4rLsd/hcgKlYjoKF RSI+cXOP3K4zT4+PCFhJC81A1rj+sl6sOV263ixQzKZ0LO61vY/4rBmTLB4V8ItZZUuY fE46xLRpe4gh1EKmC1ETyxnrPjNOqDo7TvWK6IDahwvO+ciiQABQ7qnptStli0Gkm2d9 KzauTizsaaWExizGxHU5m76LMXV9vUdTOOxrR/yRXI91dapktUIGikiNY6m9u2dEwSh9 kqFg== X-Gm-Message-State: AOAM530RXy6fJZqrqG8Xn05ontEjKz13+t0jD7EgPRlTHG+4GpelGXV/ OTdg4ZNSxoAQeWDnz0wQ78lK3f4I63x38S3yloCUOyxM X-Google-Smtp-Source: ABdhPJxj1Q+eOHmOvvJOibWg6t/9sxPTT4NZVBHkB85jPx7Qa7h4cQ6PlYZAZZiVk/zhfxaTXrqZWZimcJJDxVYna8k= X-Received: by 2002:a05:6102:312f:: with SMTP id f15mr1867836vsh.40.1643298990846; Thu, 27 Jan 2022 07:56:30 -0800 (PST) MIME-Version: 1.0 References: <20220127143532.2212796-1-christian.melki@t2data.com> <20220127143532.2212796-4-christian.melki@t2data.com> In-Reply-To: <20220127143532.2212796-4-christian.melki@t2data.com> From: Bruno Thomsen Date: Thu, 27 Jan 2022 16:56:15 +0100 Message-ID: To: ptxdist@pengutronix.de 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.1 required=4.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [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 Den tor. 27. jan. 2022 kl. 15.37 skrev Christian Melki : > > 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 Something went wrong with the location of dump1090fa.make as it's in patches and not rules. /Bruno > > 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 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de