diff mbox series

[isar-cip-dev,v2,1/1] Update ISAR to next

Message ID 20220216160359.3517492-2-Quirin.Gylstorff@siemens.com (mailing list archive)
State New
Headers show
Series Update ISAR layer | expand

Commit Message

Gylstorff Quirin Feb. 16, 2022, 4:03 p.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

refspec is now cf3f18a649ff42726677a58b224b9bb58ea4ba46

This adds Debian build profile support

The option 'nodoc' is no longer necessary
as the build dependencies of SWUpdate were fixed with [1].

[1]: https://salsa.debian.org/debian/swupdate/-/commit/d666b84435e1b1abebc6070252872ed390ac4df8

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas-cip.yml                                          |  2 +-
 recipes-core/swupdate/swupdate.inc                   | 12 ++----------
 .../swupdate/swupdate_2021.11-1+debian-gbp.bb        | 11 ++++-------
 3 files changed, 7 insertions(+), 18 deletions(-)

Comments

Jan Kiszka Feb. 16, 2022, 4:16 p.m. UTC | #1 
On 16.02.22 17:03, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> refspec is now cf3f18a649ff42726677a58b224b9bb58ea4ba46
> 
> This adds Debian build profile support
> 
> The option 'nodoc' is no longer necessary
> as the build dependencies of SWUpdate were fixed with [1].

"
This adds Debian build profile support and requires to update the
SWUpdate recipe to use this.

Along this update, we can drop the build profile 'nodoc' which is no
longer necessary as the build dependencies of SWUpdate were fixed with
https://salsa.debian.org/debian/swupdate/-/commit/d666b84435e1b1abebc6070252872ed390ac4df8
"

> 
> [1]: https://salsa.debian.org/debian/swupdate/-/commit/d666b84435e1b1abebc6070252872ed390ac4df8
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas-cip.yml                                          |  2 +-
>  recipes-core/swupdate/swupdate.inc                   | 12 ++----------
>  .../swupdate/swupdate_2021.11-1+debian-gbp.bb        | 11 ++++-------
>  3 files changed, 7 insertions(+), 18 deletions(-)
> 
> diff --git a/kas-cip.yml b/kas-cip.yml
> index 9c8ac9f..fce176b 100644
> --- a/kas-cip.yml
> +++ b/kas-cip.yml
> @@ -22,7 +22,7 @@ repos:
>  
>    isar:
>      url: https://github.com/ilbers/isar.git
> -    refspec: 33b5aa65fa3f28987525799d0731fb4e7050207d
> +    refspec: cf3f18a649ff42726677a58b224b9bb58ea4ba46
>      layers:
>        meta:
>      patches:
> diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
> index 7812ae7..f2d478d 100644
> --- a/recipes-core/swupdate/swupdate.inc
> +++ b/recipes-core/swupdate/swupdate.inc
> @@ -23,7 +23,7 @@ def get_bootloader_build_profile(d):
>          return "pkg.swupdate.uboot"
>      return ""
>  
> -SWUPDATE_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
> +DEB_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
>  
>  def get_bootloader_dependencies(d):
>      bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
> @@ -37,15 +37,7 @@ def get_bootloader_dependencies(d):
>      return ""
>  
>  DEPENDS += "${@get_bootloader_dependencies(d)}"
> -DEPENDS += "${@bb.utils.contains('SWUPDATE_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}"
> -
> -do_install_builddeps_prepend() {
> -    export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}"
> -}
> -
> -dpkg_runbuild_prepend() {
> -    export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}"
> -}
> +DEPENDS += "${@bb.utils.contains('DEB_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}"
>  
>  python do_check_bootloader () {
>      bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "None"
> diff --git a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
> index 699dad3..bf060b4 100644
> --- a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
> +++ b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
> @@ -28,25 +28,22 @@ SRC_URI += "file://0001-debian-config-Make-image-encryption-optional.patch \
>  # end patching for dm-verity based images
>  
>  # deactivate signing and encryption for simple a/b rootfs update
> -SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
> +DEB_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
>  
>  # add cross build and deactivate testing for arm based builds
> -SWUPDATE_BUILD_PROFILES += "cross nocheck"
> +DEB_BUILD_PROFILES += "cross nocheck"
>  # If the luahandler shall be embedded into the swupdate binary
>  # include the following lines.
>  # DEPENDS += "swupdate-handlers"
>  # GBP_DEPENDS += "swupdate-handlers"
> -# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
> +# DEB_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
> -SWUPDATE_BUILD_PROFILES_append = " nodoc "
> -
>  # disable create filesystem due to missing symbols in debian buster
>  # disable webserver due to missing symbols in debian buster
> -SWUPDATE_BUILD_PROFILES_append_buster = " \
> +DEB_BUILD_PROFILES_append_buster = " \
>                                     pkg.swupdate.nocreatefs \
>                                     pkg.swupdate.nowebserver "
>  # In debian buster the git-compression defaults to gz and does not detect other

Thanks, applied with the above commit message adjustment

Jan
diff mbox series

Patch

diff --git a/kas-cip.yml b/kas-cip.yml
index 9c8ac9f..fce176b 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@  repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 33b5aa65fa3f28987525799d0731fb4e7050207d
+    refspec: cf3f18a649ff42726677a58b224b9bb58ea4ba46
     layers:
       meta:
     patches:
diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
index 7812ae7..f2d478d 100644
--- a/recipes-core/swupdate/swupdate.inc
+++ b/recipes-core/swupdate/swupdate.inc
@@ -23,7 +23,7 @@  def get_bootloader_build_profile(d):
         return "pkg.swupdate.uboot"
     return ""
 
-SWUPDATE_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
+DEB_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
 
 def get_bootloader_dependencies(d):
     bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
@@ -37,15 +37,7 @@  def get_bootloader_dependencies(d):
     return ""
 
 DEPENDS += "${@get_bootloader_dependencies(d)}"
-DEPENDS += "${@bb.utils.contains('SWUPDATE_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}"
-
-do_install_builddeps_prepend() {
-    export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}"
-}
-
-dpkg_runbuild_prepend() {
-    export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}"
-}
+DEPENDS += "${@bb.utils.contains('DEB_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}"
 
 python do_check_bootloader () {
     bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "None"
diff --git a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
index 699dad3..bf060b4 100644
--- a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
@@ -28,25 +28,22 @@  SRC_URI += "file://0001-debian-config-Make-image-encryption-optional.patch \
 # end patching for dm-verity based images
 
 # deactivate signing and encryption for simple a/b rootfs update
-SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
+DEB_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
 
 # add cross build and deactivate testing for arm based builds
-SWUPDATE_BUILD_PROFILES += "cross nocheck"
+DEB_BUILD_PROFILES += "cross nocheck"
 # If the luahandler shall be embedded into the swupdate binary
 # include the following lines.
 # DEPENDS += "swupdate-handlers"
 # GBP_DEPENDS += "swupdate-handlers"
-# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
+# DEB_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
-SWUPDATE_BUILD_PROFILES_append = " nodoc "
-
 # disable create filesystem due to missing symbols in debian buster
 # disable webserver due to missing symbols in debian buster
-SWUPDATE_BUILD_PROFILES_append_buster = " \
+DEB_BUILD_PROFILES_append_buster = " \
                                    pkg.swupdate.nocreatefs \
                                    pkg.swupdate.nowebserver "
 # In debian buster the git-compression defaults to gz and does not detect other