* [cip-dev][isar-cip-core][PATCH] Use u-boot-config instead of tools
@ 2021-02-01 12:33 Quirin Gylstorff
2021-02-01 16:14 ` Jan Kiszka
0 siblings, 1 reply; 2+ messages in thread
From: Quirin Gylstorff @ 2021-02-01 12:33 UTC (permalink / raw)
To: cip-dev, Jan.Kiszka, florian.bezdeka; +Cc: Quirin Gylstorff
[-- Attachment #1: Type: text/plain, Size: 2204 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Swupdate requires libubootenv0.1 and u-boot-config to access the u-boot
environment. u-boot-config adds the configuration files.
Add the flag `USE_U_BOOT_CONFIG` to deactivate the addition of
'u-boot-${MACHINE}-config.' If the image uses an upstream u-boot binary
(e.g. [1]) remove the package by setting `USE_U_BOOT_CONFIG` to `false`.
[1]: https://packages.debian.org/buster/u-boot-omap
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
classes/swupdate-config.bbclass | 8 +++++---
recipes-core/swupdate/swupdate.bb | 2 --
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index dd0317f..9909113 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -45,10 +45,13 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
KFEATURE_DEPS[ubi] = "mtd"
+USE_U_BOOT_CONFIG ?= "true"
KFEATURE_u-boot = ""
KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
-KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
-KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
+KFEATURE_u-boot[DEBIAN_DEPENDS] = "${@ 'libubootenv0.1, u-boot-${MACHINE}-config' \
+ if d.getVar("USE_U_BOOT_CONFIG", True) == "true" \
+ else 'libubootenv0.1'}"
+KFEATURE_u-boot[DEPENDS] = "${U_BOOT} libubootenv"
KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"
SWUPDATE_LUASCRIPT ?= "swupdate_handlers.lua"
@@ -73,4 +76,3 @@ python do_check_bootloader () {
bb.warn("swupdate: BOOTLOADER set to incompatible value: " + bootloader)
}
addtask check_bootloader before do_fetch
-
diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb
index b4d64fe..526c72f 100644
--- a/recipes-core/swupdate/swupdate.bb
+++ b/recipes-core/swupdate/swupdate.bb
@@ -24,8 +24,6 @@ SRC_URI += "file://debian \
file://${DEFCONFIG} \
file://${PN}.cfg"
-DEPENDS += "libubootenv"
-
DEBIAN_DEPENDS = "${shlibs:Depends}, ${misc:Depends}"
inherit dpkg
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6154): https://lists.cip-project.org/g/cip-dev/message/6154
Mute This Topic: https://lists.cip-project.org/mt/80283340/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [cip-dev][isar-cip-core][PATCH] Use u-boot-config instead of tools
2021-02-01 12:33 [cip-dev][isar-cip-core][PATCH] Use u-boot-config instead of tools Quirin Gylstorff
@ 2021-02-01 16:14 ` Jan Kiszka
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kiszka @ 2021-02-01 16:14 UTC (permalink / raw)
To: cip-dev, Quirin Gylstorff, florian.bezdeka
[-- Attachment #1: Type: text/plain, Size: 2447 bytes --]
On 01.02.21 13:33, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> Swupdate requires libubootenv0.1 and u-boot-config to access the u-boot
> environment. u-boot-config adds the configuration files.
>
> Add the flag `USE_U_BOOT_CONFIG` to deactivate the addition of
> 'u-boot-${MACHINE}-config.' If the image uses an upstream u-boot binary
> (e.g. [1]) remove the package by setting `USE_U_BOOT_CONFIG` to `false`.
>
> [1]: https://packages.debian.org/buster/u-boot-omap
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> classes/swupdate-config.bbclass | 8 +++++---
> recipes-core/swupdate/swupdate.bb | 2 --
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
> index dd0317f..9909113 100644
> --- a/classes/swupdate-config.bbclass
> +++ b/classes/swupdate-config.bbclass
> @@ -45,10 +45,13 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
>
> KFEATURE_DEPS[ubi] = "mtd"
>
> +USE_U_BOOT_CONFIG ?= "true"
> KFEATURE_u-boot = ""
> KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
> -KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
> -KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
> +KFEATURE_u-boot[DEBIAN_DEPENDS] = "${@ 'libubootenv0.1, u-boot-${MACHINE}-config' \
> + if d.getVar("USE_U_BOOT_CONFIG", True) == "true" \
> + else 'libubootenv0.1'}"
> +KFEATURE_u-boot[DEPENDS] = "${U_BOOT} libubootenv"
> KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"
>
> SWUPDATE_LUASCRIPT ?= "swupdate_handlers.lua"
> @@ -73,4 +76,3 @@ python do_check_bootloader () {
> bb.warn("swupdate: BOOTLOADER set to incompatible value: " + bootloader)
> }
> addtask check_bootloader before do_fetch
> -
> diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb
> index b4d64fe..526c72f 100644
> --- a/recipes-core/swupdate/swupdate.bb
> +++ b/recipes-core/swupdate/swupdate.bb
> @@ -24,8 +24,6 @@ SRC_URI += "file://debian \
> file://${DEFCONFIG} \
> file://${PN}.cfg"
>
> -DEPENDS += "libubootenv"
> -
> DEBIAN_DEPENDS = "${shlibs:Depends}, ${misc:Depends}"
>
> inherit dpkg
>
>
>
Applied, thanks.
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
[-- Attachment #2: Type: text/plain, Size: 420 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6155): https://lists.cip-project.org/g/cip-dev/message/6155
Mute This Topic: https://lists.cip-project.org/mt/80283340/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-01 16:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 12:33 [cip-dev][isar-cip-core][PATCH] Use u-boot-config instead of tools Quirin Gylstorff
2021-02-01 16:14 ` 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.