diff mbox series

[v5] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS

Message ID ff41a1cd-18af-fa49-e127-c40dbb319d6f@siemens.com
State Accepted, archived
Headers show
Series [v5] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS | expand

Commit Message

Jan Kiszka Nov. 3, 2020, 11:47 p.m. UTC 
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>
---

Changes in v5:
 - rebased over next

 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(-)

Comments

Baurzhan Ismagulov Nov. 5, 2020, 4:29 a.m. UTC | #1 
On Wed, Nov 04, 2020 at 10:47:42AM +0100, Jan Kiszka wrote:
> Aligns this recipe with deb_debianize. Provide a compat path along with
> a warning to ease migration.

Hmm, git am 13.txt failed for me:

Applying: u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
error: corrupt patch at line 35
Patch failed at 0001 u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

patch -p1 <13.txt failed as well:

patching file RECIPE-API-CHANGELOG.md
patching file meta/recipes-bsp/u-boot/files/debian/control.tmpl
patch: **** malformed patch at line 183: diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc

I've rebased v4 and applied to next as below. After a quick check, all changes
seem to be in, but you might want to check as well.

With kind regards,
Baurzhan.


From bae0b6d241622f050900cc1da97be6513d719e82 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 27 Sep 2020 14:45:41 +0200
Subject: [PATCH] u-boot: Deprecate BUILD_DEPENDS in favor of
 DEBIAN_BUILD_DEPENDS

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 da5734d8..cc45f3f6 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -278,3 +278,7 @@ part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024
 ```
 In this case we can either drop the /boot mountpoint or use some other mountpoint
 like /boot/efi to avoid such issues.
+
+### 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 3e4fc1b6..9984d8cc 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -18,10 +18,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"
 U_BOOT_CONFIG_PACKAGE ?= "0"
Jan Kiszka Nov. 5, 2020, 10:51 p.m. UTC | #2 
On 05.11.20 15:29, Baurzhan Ismagulov wrote:
> On Wed, Nov 04, 2020 at 10:47:42AM +0100, Jan Kiszka wrote:
>> Aligns this recipe with deb_debianize. Provide a compat path along with
>> a warning to ease migration.
> 
> Hmm, git am 13.txt failed for me:
> 
> Applying: u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
> error: corrupt patch at line 35
> Patch failed at 0001 u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> patch -p1 <13.txt failed as well:
> 
> patching file RECIPE-API-CHANGELOG.md
> patching file meta/recipes-bsp/u-boot/files/debian/control.tmpl
> patch: **** malformed patch at line 183: diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> 
> I've rebased v4 and applied to next as below. After a quick check, all changes
> seem to be in, but you might want to check as well.
> 

Thanks for fixing up! I rebased locally, and that went smoothly.

Apparently, I have local tooling issue with routing out my patches.

Jan
diff mbox series

Patch

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index da5734d8..cc45f3f6 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -278,3 +278,7 @@  part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024
 ```
 In this case we can either drop the /boot mountpoint or use some other mountpoint
 like /boot/efi to avoid such issues.
+
+### 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 3e4fc1b6..9984d8cc 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -18,10 +18,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"
 U_BOOT_CONFIG_PACKAGE ?= "0"
-- 
2.26.2