All of lore.kernel.org
 help / color / mirror / Atom feed
From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: felix.moessbauer@siemens.com, jan.kiszka@siemens.com,
	cip-dev@lists.cip-project.org
Subject: [cip-dev][isar-cip-core][PATCH 1/3] swupdate delete unused patch
Date: Thu, 15 Feb 2024 13:14:05 +0100	[thread overview]
Message-ID: <20240215121659.315309-2-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20240215121659.315309-1-Quirin.Gylstorff@siemens.com>

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 ...tch-to-add-the-build-version-to-swup.patch | 94 -------------------
 1 file changed, 94 deletions(-)
 delete mode 100644 recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch

diff --git a/recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch b/recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
deleted file mode 100644
index efc584b..0000000
--- a/recipes-core/swupdate/files/0001-d-patches-Add-patch-to-add-the-build-version-to-swup.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 48963be5c3cd33ed9f36db52130cbd1dda3ed007 Mon Sep 17 00:00:00 2001
-From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-Date: Fri, 16 Jun 2023 19:43:38 +0200
-Subject: [PATCH] d/patches: Add patch to add the build version to swupdate
-
-The build version is only set if build in a git repository
-this patch allows to use the version information stored in
-the Makefile.
-
-Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
----
- ...Set-version-if-git-returns-no-informa.diff | 46 +++++++++++++++++++
- debian/patches/series                         |  1 +
- debian/rules                                  |  2 +
- 3 files changed, 49 insertions(+)
- create mode 100644 debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
-
-diff --git a/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff b/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
-new file mode 100644
-index 00000000..480b67f5
---- /dev/null
-+++ b/debian/patches/Makefile.flags-Set-version-if-git-returns-no-informa.diff
-@@ -0,0 +1,46 @@
-+From 40b3d8036ba08da2cb0013f5fefd4736b25dca8e Mon Sep 17 00:00:00 2001
-+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-+Date: Sat, 17 Jun 2023 17:56:18 +0200
-+Subject: [PATCH] Makefile.flags: Set version if git returns no information
-+
-+This set the swupdate version if build in a non git environment.
-+E.g. pristine-tar build or from a release tarball.
-+
-+Also allows to set the EXTRAVERSION from the command line.
-+
-+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-+---
-+ Makefile       | 2 +-
-+ Makefile.flags | 3 +++
-+ 2 files changed, 4 insertions(+), 1 deletion(-)
-+
-+diff --git a/Makefile b/Makefile
-+index 9f6a33a6..56189688 100644
-+--- a/Makefile
-++++ b/Makefile
-+@@ -5,7 +5,7 @@
-+ VERSION = 2022
-+ PATCHLEVEL = 12
-+ SUBLEVEL = 0
-+-EXTRAVERSION =
-++EXTRAVERSION ?=
-+ NAME =
-+ 
-+ IPCLIB_VERSION = 0.1
-+diff --git a/Makefile.flags b/Makefile.flags
-+index 2bec8468..f69ab5e8 100644
-+--- a/Makefile.flags
-++++ b/Makefile.flags
-+@@ -7,6 +7,9 @@
-+ # ==========================================================================
-+ SWU_DIR = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-+ SWU_VER = $(shell git -C $(SWU_DIR) describe --tags --always --dirty)
-++ifeq (,$(SWU_VER))
-++	SWU_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-++endif
-+ export SWU_VER
-+ SKIP_STRIP ?= n
-+ 
-+-- 
-+2.39.2
-+
-diff --git a/debian/patches/series b/debian/patches/series
-index 5638bbf5..12324569 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,3 +1,4 @@
- Link-config-to-swupdate-www-path.diff
- Replace-Font-Awesome-5-with-Fork-Awesome.diff
- use-gcc-compiler.diff
-+Makefile.flags-Set-version-if-git-returns-no-informa.diff
-diff --git a/debian/rules b/debian/rules
-index 57da4ca7..f645cc6e 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -17,6 +17,8 @@ export DH_WITH=--with lua
- export HAVE_LUA=y
- endif
- 
-+DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p' | cut -d + -f 2)
-+export EXTRAVERSION=($(DEB_CHANGELOG_VERSION))
- BU_SWU=
- ifeq (linux,$(DEB_HOST_ARCH_OS))
- 	BU_SWU += -VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libmtd-dev libubi-dev)"
--- 
-2.39.2
-
-- 
2.43.0



  reply	other threads:[~2024-02-15 12:17 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-15 12:14 [cip-dev][isar-cip-core][PATCH 0/3] Add SWUpdate 2022.12 Quirin Gylstorff
2024-02-15 12:14 ` Quirin Gylstorff [this message]
2024-02-15 12:14 ` [cip-dev][isar-cip-core][PATCH 2/3] add " Quirin Gylstorff
2024-02-15 13:41   ` Jan Kiszka
2024-02-15 13:43     ` Gylstorff Quirin
2024-02-15 14:39   ` MOESSBAUER, Felix
2024-02-15 12:14 ` [cip-dev][isar-cip-core][PATCH 3/3] build swupdate 2022.12 for qemu-amd64-secure-boot-bullseye Quirin Gylstorff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240215121659.315309-2-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=felix.moessbauer@siemens.com \
    --cc=jan.kiszka@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.