From patchwork Wed Oct 7 05:01:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 121 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp441890ooj; Wed, 7 Oct 2020 07:01:38 -0700 (PDT) X-Received: by 2002:ac8:7309:: with SMTP id x9mr3388867qto.302.1602079297952; Wed, 07 Oct 2020 07:01:37 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079297; cv=pass; d=google.com; s=arc-20160816; b=mU8FMRw+LGbjJAcEcgpZ3ydVnEgf6+wwU6VXKTL6v3/+VRMw1OdmUFVfZgUQgQghnE W0fHmWod3Zq2829zACol3YROMHAnC3gjlR7bg9JkofORPMY0Rp0XXEmxiHl4i++Ncnp0 mymYzE0w9Pa8WQDOYHlAshNy8iZHsAnTGXwcy7gnguQmYSLecmREwCyteSWZSz9t1BTP J+iuOyPIotmblkRTDAi1arsgg2K8PocxNYXQ2myKIiiZBXCw7DGDzc9YM1hZvAtCXS3v ZUUAyQxKxwV6YeKzP9PEYPfUhEX6KyQmbsIIeGmSYud9aI2SeE1ITiWpI74MRROPpWz8 kMQQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=EIkEM8/bJH5j7mq2d5ZsDfE8VoEHsGQS0uu386L+TAr63GUU1EIEV3Crfuef2vBFlu riI6x7u/O3ESuybRC2A5TBU6TGZbLrvuwZtdP7vqaYothidryuhfgQ9s6eItAUbx/C9X +MZFi1q7UkthdM0zNJcK4v8NA0Ad4yH0OmJ992a7ZC3LYk2jlKISxP+DTi+3T8rLHaSH Cua/WPFbdRZ6Qz6fpSvZs9J6XrCRF1W7k5uGQQ+kBDbd76yBM9flZBzZZntaOZyG9YzE 1Iclo+l/02xTItt3WYgIiomfIY5/emuEfx6m83V4WQZjEBGDBxGmiVPFm41tMQYkmaDt kokg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Eeps5L4l; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id z6sor1300897qvm.61.2020.10.07.07.01.36 (Google Transport Security); Wed, 07 Oct 2020 07:01:37 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Eeps5L4l; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqeu675qkgqe6kpsvpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQEU675QKGQE6KPSVPA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079296; cv=pass; d=google.com; s=arc-20160816; b=XIHYZQmcV7G1COJVWpRrKnWwL3lecuTiha36p+IjMiUQgLkevKh4HoHqyZ4mdlcoTd q8nAjTRk7LnOIvINS2W4cMTzDcO8AwCIU0un/w2FPpM7klio4J+TyEZdBqPv4tQIKwz1 V8mX9XnbgwDpu5tpu1hqsKZpCR/7kd45cplyUCO4L+o8Y6yeqHeqyoGY1rK6VuVs85uv 9TbdWCLaAKO0TeZK1Gz84GQgw/q3GMONMRGVXgCO01npBo5eYdPDzfmCHpXnVnJ30w0a LmqpX1XCUpC/r2ml60Z8c81AQh55KyLSmJgUbcdAMQmseULWZWX0pTg/XUUnJVgkLwUN /XMw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=BqpimzJpFcwNMcuIer1TOcPTmml7h40wFeIn7D2dHL9t8LItcL4cOB9JiYr15H52vy deY/PybHXa3IzqP+Hz2UZanDK33G484fbPTRHOUjWVbLYYy1PlBFn8w/aCmk4Iclr2W1 zMB65wj0ojsfvP5Um+jf1mKMrdiwUsAiD0etIuxREr1ClSs6Li0gSG0ReMiMbIo6mhUg e0pWx67/uCTYxjdzO9P02ZdqRjN1DnLqZZ/Df+hdN6ZWueDpTw2+/THCRB5ZnAO29S4b rpRgdFV/sJa7HaWOSok1IzoYPGjCepgyz4xtJxbCCF6b0LsfAwfWoGe6iXCfrOzlukk1 GCGQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=Eeps5L4lCgBHtQCmtQQ84PScGMUdmIQSS+6yO6FyhsMz+BzkG+fir5T+0p1fvK70bC jgYuR5NP/kTlKaq+EZ9QzZWSmiAiOuOW2ba8uSgclSoHwsVMl+x9EXH4BqPVF9OQz+AO vskoPkgzW0qLG5h1ALwVfE5/Utaxmco/RJFhM7ZVSgysn+AR41YDhHXqqHKyFnzZRNVn RLh8W/kqgrhWQS13KYpcY286e0OFDlWRPAQ8LSlVMuwZM4THb/DzlKsCVBvA8x88t9t1 Bu13Ilvdt/VrAcoM4Hngr+2LBBnmx19R7hdEjZtAZcbgX8wLa5PsgXDrLo+f/9UrRzNE t0dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=FF363AqO8VASnutcs2SVGzYLdgKCcwfa7bLH2Z1Fwno=; b=VqIBcc15jgoHx27Hpg/kkaaLu6/05Ww1LOGXzwF0w2ZQhcyuwixFoVPyFeVlkQfOnN En0B14xMl6KIWtx5sylIxTrtRCYhXO1gUPjN4JjMJwCDvQQTWMKK5kVob7/QXKPEABmq z2jPhDm0Ho096WNO+Afa43k6oiHnV1uBXMHXYQAzFWZ0agecqDp8RjJG2i7NwKAB99D4 s30px0JSnUWX3B36LLyJEm3pMHhzwIDja5IzQAV54blhR+R6p9l4XpUQ+tSe/lqh7Pt9 qho7cNNdq9dFZBr+lZbTlJ51lB/6/V7e2Q/Oa6g49RueJej7Myh8vjtnDT7jxVcv4vbj 9gQA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533frbOx+ItJXYX4+synk9PZYjyrUBRvuNMCqRLODCUo0/02cLGr rJljtA0VrpQIJAFYUb6hJmw= X-Google-Smtp-Source: ABdhPJw4V1kBlwdrv78370dp3eU1jh0mQ/Y0Y3Eyqqb+vt+wTDJ6ZZXumL3j+AnI1VQ3gVXV9t1p9A== X-Received: by 2002:adf:fa41:: with SMTP id y1mr3794889wrr.213.1602079296525; Wed, 07 Oct 2020 07:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:428e:: with SMTP id k14ls3026684wrq.0.gmail; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) X-Received: by 2002:a5d:4908:: with SMTP id x8mr23428wrq.189.1602079295319; Wed, 07 Oct 2020 07:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079295; cv=none; d=google.com; s=arc-20160816; b=c4WBbNTc4iU8HBPOslSc0Mfq1y++aQpcp4sEoR3Vy0nigkOGVHex2J0bTXhWxv/b8U IBM2aeuKkvs1wwbIB3drS0/btTwH/Mo98hhNnwI/+R8pXf5k6lontyvS8jWYIS5INn6b kewdN+AJnHz0kNlUfmh2nM83iG5EGx9Yjo87MbIY7TnoymZTvuxW7R9QHm8pgv+4EY8f 9uIM8t+4qv5CbZ2GHw75oU0Q5QgUY6LH3ZD9WD/HPkdDfXK3X2qXTE1nXXCI3KJTaE9Q 4dKJWvxGuLyzfFJI1C/hkhCyaJcw1gNmpmAflUoPthWvXwnZd6yAWR2QcvM3bbaOal+7 26fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=JhadybXlyO5h1r6YpwOlkxXeCJbRhQKLlyniQILDszg=; b=NkKdSHHZzvC//fiSiXXlV04mcxjhukNaJaMyUIHmgmqL3KNAsQXPIOybvAVqRrbl/g pORVq52p7u4Jagv2lcVqmGw0Jbo5X9FHR2FBQDFfmj2OYlMYCS1+5iA6SmK2pJMDzvOR agRz7KluaafnXAw3KJYidu+Nt/9xntRTYRwBb22wbTvL4ORDHENegapNk5iWxiBSW303 lfb6Iz4Vm9yh+wLsZAmjI1ZiNaSY2KKdbs9iYCzJAqttz+ZHQrvRQS01uq3q4U3paTWe lV86CLBaT4Z1iK6Sv96BjtvGbmKtPC/MxJaaBTn7OSzyPBLSS+utgiX4W2rjDQ+OqF8o zTZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f3si233782wme.3.2020.10.07.07.01.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 097E1Yph018032 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:34 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1UkG019880 for ; Wed, 7 Oct 2020 16:01:34 +0200 From: Jan Kiszka To: isar-users 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 Message-Id: <78e84769718556b15a8a81b927df68c11db591bf.1602079290.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679901901903072560?= X-GMAIL-MSGID: =?utf-8?q?1679901901903072560?= From: Jan Kiszka 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 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 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"