* [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
@ 2021-10-28 11:15 Srinuvasan A
2021-10-28 13:46 ` Jan Kiszka
0 siblings, 1 reply; 7+ messages in thread
From: Srinuvasan A @ 2021-10-28 11:15 UTC (permalink / raw)
To: cip-dev; +Cc: Srinuvasan A
From: Srinuvasan A <srinuvasan_a@mentor.com>
When we build the swupdate debian package for buster some build
dependency packages are not available in stable buster, hence we created a
patch in cip-core upstream for buster build, here we hardcoded the distro
for buster build hence it is building fine in cip-core not the
downstream layer, added the "DISTRO" variable to pick the proper distro name.
Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 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 a451b55..f8298f0 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
# modify for debian buster build
-SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
+SRC_URI_append_${DISTRO} = " 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_cip-core-buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_${DISTRO} = " 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"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
2021-10-28 11:15 [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster Srinuvasan A
@ 2021-10-28 13:46 ` Jan Kiszka
2021-10-29 5:39 ` Srinuvasan A
0 siblings, 1 reply; 7+ messages in thread
From: Jan Kiszka @ 2021-10-28 13:46 UTC (permalink / raw)
To: Srinuvasan A, cip-dev
On 28.10.21 13:15, Srinuvasan A wrote:
> From: Srinuvasan A <srinuvasan_a@mentor.com>
>
> When we build the swupdate debian package for buster some build
> dependency packages are not available in stable buster, hence we created a
> patch in cip-core upstream for buster build, here we hardcoded the distro
> for buster build hence it is building fine in cip-core not the
> downstream layer, added the "DISTRO" variable to pick the proper distro name.
>
> Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
> ---
> recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
> 1 file changed, 4 insertions(+), 4 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 a451b55..f8298f0 100644
> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
> @@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
> # SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
>
> # modify for debian buster build
> -SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
> +SRC_URI_append_${DISTRO} = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
This makes no sense. DISTRO is in OVERRIDES, so this will always match.
And that would also not make sense for a patch that is for buster only.
You likely want to match on BASE_DISTRO_CODENAME. That means expanding
OVERRIDES accordingly.
Jan
>
> # 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_cip-core-buster = " nodoc \
> - pkg.swupdate.nocreatefs \
> - pkg.swupdate.nowebserver "
> +SWUPDATE_BUILD_PROFILES_append_${DISTRO} = " 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"
>
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 7+ messages in thread
* [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
2021-10-28 13:46 ` Jan Kiszka
@ 2021-10-29 5:39 ` Srinuvasan A
2021-10-29 15:08 ` Jan Kiszka
0 siblings, 1 reply; 7+ messages in thread
From: Srinuvasan A @ 2021-10-29 5:39 UTC (permalink / raw)
To: cip-dev; +Cc: Srinuvasan A
From: Srinuvasan A <srinuvasan_a@mentor.com>
When we build the swupdate debian package for buster some build
dependency packages are not available in stable buster repo, hence we created a
patch in cip-core upstream for buster build, here we hardcoded the distro
for buster build hence it is building fine in cip-core not the
downstream layer, added the "BASE_DISTRO_CODENAME" variable to pick the proper base distro.
Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 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 a451b55..e6526ba 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
# modify for debian buster build
-SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
+SRC_URI_append_${BASE_DISTRO_CODENAME} = " 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_cip-core-buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_${BASE_DISTRO_CODENAME} = " 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"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
2021-10-29 5:39 ` Srinuvasan A
@ 2021-10-29 15:08 ` Jan Kiszka
2021-11-02 10:39 ` Srinuvasan A
2021-11-02 10:41 ` [isar-cip-dev] " Srinuvasan A
0 siblings, 2 replies; 7+ messages in thread
From: Jan Kiszka @ 2021-10-29 15:08 UTC (permalink / raw)
To: Srinuvasan A, cip-dev
On 29.10.21 07:39, Srinuvasan A wrote:
> From: Srinuvasan A <srinuvasan_a@mentor.com>
>
> When we build the swupdate debian package for buster some build
> dependency packages are not available in stable buster repo, hence we created a
> patch in cip-core upstream for buster build, here we hardcoded the distro
> for buster build hence it is building fine in cip-core not the
> downstream layer, added the "BASE_DISTRO_CODENAME" variable to pick the proper base distro.
>
> Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
> ---
> recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
> 1 file changed, 4 insertions(+), 4 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 a451b55..e6526ba 100644
> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
> @@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
> # SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
>
> # modify for debian buster build
> -SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
> +SRC_URI_append_${BASE_DISTRO_CODENAME} = " 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_cip-core-buster = " nodoc \
> - pkg.swupdate.nocreatefs \
> - pkg.swupdate.nowebserver "
> +SWUPDATE_BUILD_PROFILES_append_${BASE_DISTRO_CODENAME} = " 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"
>
Please have a look at the bitbake manual, how overrides work
(https://www.yoctoproject.org/docs/latest/bitbake-user-manual/bitbake-user-manual.html#conditional-syntax-overrides).
And test whether your code is behaving as expected, also for non-buster
images.
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
2021-10-29 15:08 ` Jan Kiszka
@ 2021-11-02 10:39 ` Srinuvasan A
2021-11-02 10:41 ` [isar-cip-dev] " Srinuvasan A
1 sibling, 0 replies; 7+ messages in thread
From: Srinuvasan A @ 2021-11-02 10:39 UTC (permalink / raw)
To: cip-dev; +Cc: Srinuvasan A
From: Srinuvasan A <srinuvasan_a@mentor.com>
When we build the swupdate debian package for buster some build
dependency packages are not available in stable buster repo, hence we created a
patch in cip-core upstream for buster build, here we hardcoded the distro
for buster build hence it is building fine in cip-core not the downstream layer,
added the OVERRIDES for BASE_DISTRO_CODENAME to select the particular base distro.
Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
recipes-core/swupdate/swupdate.inc | 2 ++
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
index a469587..191aa2b 100644
--- a/recipes-core/swupdate/swupdate.inc
+++ b/recipes-core/swupdate/swupdate.inc
@@ -13,6 +13,8 @@ HOMEPAGE= "https://github.com/sbabic/swupdate"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
+OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
+
def get_bootloader_build_profile(d):
bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
if bootloader == "efibootguard":
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 a451b55..e62230f 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
# modify for debian buster build
-SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
+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_cip-core-buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_buster = " 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"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
2021-10-29 15:08 ` Jan Kiszka
2021-11-02 10:39 ` Srinuvasan A
@ 2021-11-02 10:41 ` Srinuvasan A
2021-11-02 20:12 ` Jan Kiszka
1 sibling, 1 reply; 7+ messages in thread
From: Srinuvasan A @ 2021-11-02 10:41 UTC (permalink / raw)
To: cip-dev; +Cc: Srinuvasan A
From: Srinuvasan A <srinuvasan_a@mentor.com>
When we build the swupdate debian package for buster some build
dependency packages are not available in stable buster repo, hence we created a
patch in cip-core upstream for buster build, here we hardcoded the distro
for buster build hence it is building fine in cip-core not the downstream layer,
added the OVERRIDES for BASE_DISTRO_CODENAME to select the particular base distro.
Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
recipes-core/swupdate/swupdate.inc | 2 ++
recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
index a469587..191aa2b 100644
--- a/recipes-core/swupdate/swupdate.inc
+++ b/recipes-core/swupdate/swupdate.inc
@@ -13,6 +13,8 @@ HOMEPAGE= "https://github.com/sbabic/swupdate"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
+OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
+
def get_bootloader_build_profile(d):
bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
if bootloader == "efibootguard":
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 a451b55..e62230f 100644
--- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
@@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
# modify for debian buster build
-SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
+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_cip-core-buster = " nodoc \
- pkg.swupdate.nocreatefs \
- pkg.swupdate.nowebserver "
+SWUPDATE_BUILD_PROFILES_append_buster = " 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"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster
2021-11-02 10:41 ` [isar-cip-dev] " Srinuvasan A
@ 2021-11-02 20:12 ` Jan Kiszka
0 siblings, 0 replies; 7+ messages in thread
From: Jan Kiszka @ 2021-11-02 20:12 UTC (permalink / raw)
To: Srinuvasan A, cip-dev
On 02.11.21 11:41, Srinuvasan A wrote:
> From: Srinuvasan A <srinuvasan_a@mentor.com>
>
> When we build the swupdate debian package for buster some build
> dependency packages are not available in stable buster repo, hence we created a
> patch in cip-core upstream for buster build, here we hardcoded the distro
> for buster build hence it is building fine in cip-core not the downstream layer,
> added the OVERRIDES for BASE_DISTRO_CODENAME to select the particular base distro.
>
> Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
> ---
> recipes-core/swupdate/swupdate.inc | 2 ++
> recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb | 8 ++++----
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
> index a469587..191aa2b 100644
> --- a/recipes-core/swupdate/swupdate.inc
> +++ b/recipes-core/swupdate/swupdate.inc
> @@ -13,6 +13,8 @@ HOMEPAGE= "https://github.com/sbabic/swupdate"
> LICENSE = "GPL-2.0"
> LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
>
> +OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
> +
> def get_bootloader_build_profile(d):
> bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
> if bootloader == "efibootguard":
> 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 a451b55..e62230f 100644
> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb
> @@ -35,14 +35,14 @@ SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption"
> # SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
>
> # modify for debian buster build
> -SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch"
> +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_cip-core-buster = " nodoc \
> - pkg.swupdate.nocreatefs \
> - pkg.swupdate.nowebserver "
> +SWUPDATE_BUILD_PROFILES_append_buster = " 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"
>
Thanks, applied.
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-02 20:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 11:15 [isar-cip-dev] [PATCH] recipes-core/swupdate: Update the SRC_URI and SWUPDATE_BUILD_PROFILES append for buster Srinuvasan A
2021-10-28 13:46 ` Jan Kiszka
2021-10-29 5:39 ` Srinuvasan A
2021-10-29 15:08 ` Jan Kiszka
2021-11-02 10:39 ` Srinuvasan A
2021-11-02 10:41 ` [isar-cip-dev] " Srinuvasan A
2021-11-02 20:12 ` Jan Kiszka
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.