Re: [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Jan 27, 2022 at 05:31:01PM +0100, Christian Melki wrote:
> Wow. That was bad.
> Thanks for paying attention.
> 
> I have yet to find a proper way to do testing and sending patches.
> So I test in the active environment and then move it to the ptxdist repo
> where I prepare for sending.
> Obviously a lot of potential for manual mishaps in this process.
> 
> If anyone cares to share their work process I'm all ears.
> I'm obviously doing far to many manual steps with far to many mishaps.

Use the ptxdist git. Checkout the version your BSP is using and start a
branch there. Now you can do all the changes in PTXdist and test the whole
thing. At the end, you just need to rebase it to the current master.

If there are conflicting changes in master then cherry-pick those first
before adding your own stuff. During rebase, just skip them if that doesn't
happen automatically.

Michael

> On 1/27/22 16:56, Bruno Thomsen wrote:
> > Den tor. 27. jan. 2022 kl. 15.37 skrev Christian Melki
> > <christian.melki@t2data.com>:
> >>
> >> Mostly bugfixes. Including the build fix previously included.
> >> Remove patches.
> >>
> >> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> >> ---
> >>  .../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 <oliver.jowett@flightaware.com>
> >> -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 <christian.melki@t2data.com>
> >> +#
> >> +# 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 <christian.melki@t2data.com>")
> >> +       @$(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
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de