Thread (7 messages) 7 messages, 3 authors, 2021-12-16

Re: [cip-dev] [isar-cip-core][PATCH 2/2] swupdate: Drop conditional includes for buster

From: Gylstorff Quirin <hidden>
Date: 2021-12-16 13:10:28

Hi,

On 12/16/21 14:04, Kanagarajan, Vijaikumar via lists.cip-project.org wrote:
quoted hunk ↗ jump to hunk
Stretch in now dropped. The conditional includes for buster is now not
needed. Those includes are applicable to buster as well as bullseye.

Signed-off-by: Vijai Kumar K <redacted>
---
  .../swupdate/swupdate_2021.04-1+debian-gbp.bb  | 18 ++++++++----------
  1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
index a4d67fe..826982a 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -23,7 +23,8 @@ SRC_URI += "file://0001-debian-Add-option-to-build-with-efibootguard.patch \
              file://0005-debian-rules-Add-option-to-disable-fs-creation.patch \
              file://0006-debian-rules-Add-option-to-disable-webserver.patch \
              file://0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch \
-            file://0008-debian-rules-Add-Embedded-Lua-handler-option.patch"
+            file://0008-debian-rules-Add-Embedded-Lua-handler-option.patch \
+            file://0009-debian-prepare-build-for-isar-debian-buster.patch"
The patch 0009-debian-prepare-build-for-isar-debian-buster.patch should 
not be applied to bullseye as it can have an impact on the functionality 
of SWUpdate.

Quirin
quoted hunk ↗ jump to hunk
  
  # Patch for dm-verity based images - can be removed with next SWUpdate release
  SRC_URI += "file://0001-debian-patches-add-patches-for-dm-verity.patch"
@@ -41,15 +42,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck"
  # GBP_DEPENDS += "swupdate-handlers"
  # SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
  
-# modify for debian buster build
-SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
-
-# disable documentation due to missing packages in debian buster
-# disable create filesystem due to missing symbols in debian buster
-# disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \
-                                          pkg.swupdate.nocreatefs \
-                                          pkg.swupdate.nowebserver "
+# disable documentation due to missing packages
+# disable create filesystem due to missing symbols
+# disable webserver due to missing symbols
+SWUPDATE_BUILD_PROFILES_append = " nodoc \
+                                   pkg.swupdate.nocreatefs \
+                                   pkg.swupdate.nowebserver "
  # In debian buster the git-compression defaults to gz and does not detect other
  # compression formats.
  GBP_EXTRA_OPTIONS += "--git-compression=xz"



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7150): https://lists.cip-project.org/g/cip-dev/message/7150
Mute This Topic: https://lists.cip-project.org/mt/87766371/1753640
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129121/1753640/1405269326/xyzzy [quirin.gylstorff@siemens.com]
-=-=-=-=-=-=-=-=-=-=-=-
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help