[isar-cip-core,1/3] swupdate delete unused patch

Commit Message

Gylstorff Quirin Feb. 15, 2024, 12:14 p.m. UTC

From: Quirin Gylstorff <[e-mail]>

Signed-off-by: Quirin Gylstorff <[e-mail]>
---
 ...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

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 <[e-mail]>
-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 <[e-mail]>
----
- ...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 <[e-mail]>
-+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 <[e-mail]>
-+---
-+ 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
-