diff mbox series

[isar-cip-core,2/2] swupdate: Convert to DEB_BUILD_PROFILES

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

Commit Message

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

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

Comments

Jan Kiszka Feb. 16, 2022, 2:34 p.m. UTC | #1
On 16.02.22 14:03, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  recipes-core/swupdate/swupdate.inc                   | 12 ++----------
>  .../swupdate/swupdate_2021.11-1+debian-gbp.bb        | 11 ++++-------
>  2 files changed, 6 insertions(+), 17 deletions(-)
> 
> 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 "
> -

Why can this be dropped now?

Jan

>  # 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
diff mbox series

Patch

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