From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6891203156929150976 X-Received: by 2002:a17:906:30c8:: with SMTP id b8mr2678945ejb.77.1604586555700; Thu, 05 Nov 2020 06:29:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:8585:: with SMTP id v5ls1019825ejx.1.gmail; Thu, 05 Nov 2020 06:29:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKVfBxQ2m46LcqefyzKlrYz2FiwggLt/7PyGRHjxLLPCmWpHz6lLB3MHfDtbLtOH71MvKf X-Received: by 2002:a17:906:a28f:: with SMTP id i15mr2744263ejz.468.1604586554604; Thu, 05 Nov 2020 06:29:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604586554; cv=none; d=google.com; s=arc-20160816; b=EN+Kv7w6x2JBYXXOi/6dsCfuHF+reQjo5OFJ1sdiVUdCB4KhuSuoHMyyPXVaC8cM9+ F3FVqGtf3UynhDuEjz3KnPpDUJGrSvKFETEkT7/kpeZ5KqEWhUN/yrGPII4QAHkztwYO IPSDgYg37u8q1BEeqKCrs4O+HjtE5WPsQrjubPxXSZ/rjuxu2zpIOxF2xBTNTrj3tlUr uuF75VXWoxyD7p0TwhLSAPfBvBx8/o2xH0PhfnRPV7q2+sJhRgOX3cHstw3ZuIrCKYpx 0jZgyPSO0QGtBAdRkc0SLD3FguzB/5OD63IRW1gsm+aFmDcsIHevXDwncGVx5A/aaeD2 IkBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date; bh=XqvER2ZnnTussPvA4G0pAhf9phVlJ3KhfEhowCFSZMc=; b=nvAuu2PQivfttAZk2Hb3xJ6zyg0PVA4RPPn7JXbmFmLd/J7TQsZ3ebTNcgiPfNgyr1 eajT5aRA0ekQAaln3r0t2o97LPXTmLKU7fn4HMTt7aaQ+rg4dquFXT+XjIvkz16/gmnc K4l6PSvfYjTH88Q1Y9vfgfdbaykfrJZXrZyE1arx+/fDttgoUK1/svQ3klfzxxjtKMoM poUNDWdPa1Z+jrkqRE6NnL4khCZ0/M3C9NU45PS8jc6QitGHG+QqEmFIuk+vhca6DL1W 9lfEa5wrMSt2/1AEr0zP58gEsDTCthgEWekdGW1rd8egmengWAeYIB/agN5qUOWwTXLB ACtw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a11si39303edq.1.2020.11.05.06.29.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Nov 2020 06:29:14 -0800 (PST) Received-SPF: neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 0A5ETBjL023914 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 5 Nov 2020 15:29:13 +0100 Date: Thu, 5 Nov 2020 15:29:11 +0100 From: Baurzhan Ismagulov To: isar-users Subject: Re: [PATCH v5] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS Message-ID: <20201105142911.GL5078@yssyq.m.ilbers.de> Mail-Followup-To: isar-users References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: YEBFSYwzNT/G 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 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 --- 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 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.20.1