From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v4 13/13] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
Date: Wed, 7 Oct 2020 16:01:30 +0200 [thread overview]
Message-ID: <78e84769718556b15a8a81b927df68c11db591bf.1602079290.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1602079290.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
Aligns this recipe with deb_debianize. Provide a compat path along with
a warning to ease migration.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
RECIPE-API-CHANGELOG.md | 4 ++++
meta/recipes-bsp/u-boot/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/u-boot/u-boot-custom.inc | 10 ++++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index ac9d8d63..6e40fbcd 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -252,3 +252,7 @@ with ${D} which needs to be filled explicitly in do_install as before.
ISARROOT variable is now removed from the bitbake environment. It is unset
after the initial setup. It is replaced with dedicated variables like
BITBAKEDIR, SCRIPTSDIR and TESTSUITEDIR.
+
+### Deprecate BUILD_DEPENDS in u-boot-custom.inc
+
+Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize.
diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
index 0ab3a295..9379be7d 100644
--- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl
+++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
@@ -2,7 +2,7 @@ Source: ${PN}
Section: admin
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: ${BUILD_DEPENDS}
+Build-Depends: ${DEBIAN_BUILD_DEPENDS}
Maintainer: ISAR project <isar-users@googlegroups.com>
Package: u-boot-${MACHINE}
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 41124fc3..34bf91bf 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -16,10 +16,16 @@ inherit dpkg
SRC_URI += "file://debian/"
-BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
+python() {
+ if d.getVar('BUILD_DEPENDS'):
+ bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please switch to DEBIAN_BUILD_DEPENDS")
+ d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
+}
+
+DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
TEMPLATE_FILES = "debian/control.tmpl"
-TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
+TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
U_BOOT_TOOLS_PACKAGE ?= "0"
--
2.26.2
next prev parent reply other threads:[~2020-10-07 14:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 14:01 [PATCH v4 00/13] Complete backlog: SDK, assorting fixed and cleanups Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 01/13] sdk: Add support for adding self-defined sdk packages Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 02/13] sdk: Make all links in the SDK chroot relative Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 03/13] sdk: Add script to relocate SDK Jan Kiszka
2020-10-15 18:50 ` Baurzhan Ismagulov
2020-10-16 6:47 ` Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 04/13] sdk: Make shipping the isar-apt repo opt-in Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 05/13] sdk: Inject sysroot path when calling relocated toolchain Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 06/13] sdk: Update README.sdk Jan Kiszka
2020-10-16 8:18 ` [PATCH v5 " Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 07/13] isar-bootstrap: Connect to gpg-agent before adding keys Jan Kiszka
2020-11-21 7:41 ` Jan Kiszka
2020-12-14 7:03 ` Jan Kiszka
2020-12-16 11:36 ` Baurzhan Ismagulov
2020-12-16 15:53 ` [PATCH v1] isar-bootstrap: Run gpg-agent before starting apt-key Baurzhan Ismagulov
2020-12-16 16:41 ` Jan Kiszka
2021-01-18 17:30 ` Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 08/13] buildchroot-host: Drop unneeded :native for riscv64 setup Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 09/13] deb-dl-dir: Fix quoting Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 10/13] Fix dependencies on isar-apt Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 11/13] dpkg: Account for changes in mk-build-deps in bullseye Jan Kiszka
2020-10-07 14:01 ` [PATCH v4 12/13] isar-bootstrap: Align debootstrap calls Jan Kiszka
2020-10-07 14:01 ` Jan Kiszka [this message]
2020-11-05 14:23 ` [PATCH v4 00/13] Complete backlog: SDK, assorting fixed and cleanups Baurzhan Ismagulov
2020-11-26 15:40 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78e84769718556b15a8a81b927df68c11db591bf.1602079290.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox