From patchwork Tue Nov 3 23:47:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 169 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a05:6820:1013:0:0:0:0 with SMTP id v19csp893444oor; Wed, 4 Nov 2020 01:47:46 -0800 (PST) X-Received: by 2002:a5d:54d0:: with SMTP id x16mr30612109wrv.75.1604483266681; Wed, 04 Nov 2020 01:47:46 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1604483266; cv=pass; d=google.com; s=arc-20160816; b=g7RSeiMya3zc+xCX9WAeisC/IkdB5Z1gArbvAivM31w/tjEIlYQy/7BhIXudu4xKEH KMeyBQ6m9URKHetzw818t2Pg2JJoGOky2vYGaHGdPJYEQcYNud68iitu5N+pwDS9KoC9 IUPGpjeQnFG5Kf6dICGEkrXyGfqrQqsTF3qIEX8t6dloGqdjufo2BLlQEbynV4K+CUJ6 I4a5c/mpG7OOkmcAISYl4SV8fAd4FApMkrdzMJbIRt69cAAQVaf8slBpG7uh6s29aheZ +CbBjUEwT7s0zFSptJc4aZV9p4BywOJIV5m233Pf7HS7rx3ldURxPTQ6SUnh0TVOnaUi YBnQ== 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:content-language:mime-version :user-agent:date:message-id:to:subject:from:sender:dkim-signature; bh=woVGmtV4M1uieF1XExGbJ4Ty/1Lt16ykk/9rDiRl4fs=; b=JN5XoMdMaT4Jk+3fwDXBViPcg3ElAB/4fFFLGxVZ509Vb+kXswCNyBFTcKsswKQVoU zdsGvg/dIAzpSyqnm9FZ9rK4+0EAzGzKbjVDzxYkbv2l1yG3aBbrRkr8ZNukzUkB9ju7 aJ6s8NoMoczMM3DXLUvK0JNaEZiQ9I3uWeXlL3Sh11Qd8/fjWLHp/X0hs0Utx3t4jQ+B +SSJVlqvyqyLoc+nqkMBazsuGyXktOnJArah9tb3Z9ZNIYJCJalo9DUOrI6ELMbUL2DU X03cAnGqbQdOaD0k/DOI53qGOINJDhlZnsXuDkiai/+SV1DkRw4Iuw19VwpecA0AJ3B4 hO2w== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=RP0rWglw; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqprrh6qkgqem7votva@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQPRRH6QKGQEM7VOTVA@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 g135sor688223wme.27.2020.11.04.01.47.46 (Google Transport Security); Wed, 04 Nov 2020 01:47:46 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbqprrh6qkgqem7votva@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=RP0rWglw; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbqprrh6qkgqem7votva@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBQPRRH6QKGQEM7VOTVA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1604483266; cv=pass; d=google.com; s=arc-20160816; b=crgWfUJuXMXfuKUqe4yFixKMrjZaTIIqW8cyHFiHFFjaDUds8x1YEzLUwP8lpVTQL1 b7GcChuTOUBXb4ikRlJuJeHg3ZLicGFIband3piL3Anjm0JEh4mHp7THoSXuiiwmcz4h J1hc2hAYGDGBVN58GgxLHkO+eyInhjybndSJrIaxdunPwqCTmqKmg4IiC/6/dPUdseBg dZv4hJZTin2yyoESGzDhEL7HIgMAVVsb4F9uXjOlfWfj9EALuBL2EyyiRtDLZbB7zE7H zsMEzvkwPpaSoNGlYj/nr9vY5JxFTrNlADMZp3UuDks+xITsACRlI5Z4qzmoRu0mCOwK q+bg== 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:content-language:mime-version :user-agent:date:message-id:to:subject:from:sender:dkim-signature; bh=woVGmtV4M1uieF1XExGbJ4Ty/1Lt16ykk/9rDiRl4fs=; b=QzpYf+cNgTyzQdo8fjXxXibN+avnCOKx82hL5iXKUIu7WLTH/7uUgckRu4U5Mxi8Lk fAAZdjry3IyteKYwQxKCUVywRW+WOJac3JtKs+NCTfrMROA9P5WizicVWsE3PpzlqPN8 cZ9t0w18QyGenLtKXi5AUEn9KUuvKYWSSywd6kdTtlg+YnSiQ1bJHe6/4XJlhZXuS0Qr ZZX1w2lPe0XnWJMrEsG5VA2PXklB+QC/cJVZD2/DI8GdcnIFnz9QC+xVGvKprtOyUGWb ZO0c3OrVeaEmdzeKHSU8sxnSdvGEUbZix2AFfPbYesizEEjLbPNBepS981/Q/dw5bq7I jrrQ== 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:subject:to:message-id:date:user-agent:mime-version :content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=woVGmtV4M1uieF1XExGbJ4Ty/1Lt16ykk/9rDiRl4fs=; b=RP0rWglwKLUM10TON8tmE/1C3kAJuL8A0LK0KBisCV5y1y4HjkHSkdrm/XMyv9phFj N407GajYVCKLjLlVEE1YDb+YWbLQmNSKYefclOsPt8n5DFHlwh+b3R5/dfM9grewMNdJ AO5zdXZPo2bi8EbipYEpaGNTPR9jvhxHs1UfeLdwE7+fuit8s4OAyOkpB5M7JLQh9CiM o8IjBWC7fjb7ff3dSJSnAnAtsm+rxzku1IF0ctOXDeLZW0LVEdcUGHWXm1QnRbZYw49v 4JB3Di/OUZaRVP7fwJ77VX7M7e3p5KEvzWdR+DaVfl/kZ2kahvVk1CRWwJXm/BZ7PC0N 5ghw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:subject:to:message-id:date :user-agent:mime-version:content-language: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=woVGmtV4M1uieF1XExGbJ4Ty/1Lt16ykk/9rDiRl4fs=; b=KW8uMokNjSyK6jngY7REg58aZQLDDaYoC7NwM9e61HAvoooQRi9tJ6yjVkV/+EacKr 4BZpTTniGc2ZBBCk321n2W+SS00VXsMFo10c811+alyvyuXLuges+WjnYk6wSctL/ruR wPj1oX0rxlAY21DDC9+547/3zZ/MUg6ZgGeMBLWi0kQx79TpxeOHu6KNfGYrx3SSWm4p /TWIKrcQTsc/qfCkailKjxXuaSkWYfaLp2vOX43v2UHhEkp46uq4gizXtymAkoox2h4j JlE704hqI+BJNlAFseMSQkR+vdkCj58xKIkLEwlmfFukoze9zXvWG/vvw0PyxIhJXtM7 oIgA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530atuxTppt5tj6xPeY5ZGCPs4qk9Fwr2tW8A8HPs/IHdwuqHXWj VHxZgq8RhsJqLDZ5o9SroCM= X-Google-Smtp-Source: ABdhPJzZjSNJ5EisEOQ6Fp8yYjoAndNXt4fxFDsmQ2tRZFYBkuKnoOrEojm+ergTxP5cpQr6Zi/Vhg== X-Received: by 2002:a1c:790b:: with SMTP id l11mr3752869wme.53.1604483266125; Wed, 04 Nov 2020 01:47:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f7c4:: with SMTP id a4ls1932298wrq.1.gmail; Wed, 04 Nov 2020 01:47:45 -0800 (PST) X-Received: by 2002:a5d:69d1:: with SMTP id s17mr31384509wrw.77.1604483265142; Wed, 04 Nov 2020 01:47:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604483265; cv=none; d=google.com; s=arc-20160816; b=ZYaBHX/cem533iP8HSokQg0qruRgjJ6TR7Vo6k8JI/rLXvvJDUrX/PW0bkzychgA9q y2kI9UbHoqqBHaG0vP6jSv4AEJjiRkVcWoVuwhNZv/AkaTI5D20rmklf0lk3YXprZZRI WT+eWufJFkgEFJULpjEtLkiNe+baHBYBNQyNiwX6VPUK9JTKz5mTBcRdbfEww1QECqnQ iqgjRvYzi4RgWG8hKhaXChvVxlUwHu8GHqN8KUoPLfWFLSRy6Qk99AJ0cwad3ycQutyi 0zTRZfuEb81iLniO3GOJ1mZJMGhwOWL49JeU+7eHWu9Ux2qy62SdUEjwToR9nz0C2KZj aY4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=obq0C+YPqJeN+PdLO/XCsTqu8eZFHfxzP7X1Zb7Yo30=; b=fjztpwv3sbgOEugZzbNPV8JzwUBlcjMsZAFXTkz4jCimzsHDx7//d+Kb6qGiC8cFZU FgbpGN87jm0wPju7crvG9CCvsc35XD9udt2Vbewp+PrHKotu3tYgyosT2DZA2ZmHFFlp d8FcSd6UvuW91VgNgz8PLWUlqakmNQbYcJaD8MfdyEZJP8cHMcT1cFNb8I6ppG2EAXEd f5XRlFaCYjNvqGA9PEvlNVCTOR1bDtvr4XWsbOiWanUZhdEsbtTajKnVDXAqdSxJO2Py Fr2fA4k/3xeA5Jh6Hc1DklNpqKSLyYRxXhNWX6LCAHBWQNqEH4lQ25RxXFQv3Rr83j6+ n6wg== 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 f198si39938wme.2.2020.11.04.01.47.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2020 01:47:45 -0800 (PST) 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 0A49lhE1023583 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 4 Nov 2020 10:47:44 +0100 Received: from [167.87.41.231] ([167.87.41.231]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0A49lhMH014950 for ; Wed, 4 Nov 2020 10:47:43 +0100 From: Jan Kiszka Subject: [PATCH v5] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS To: isar-users Message-ID: Date: Wed, 4 Nov 2020 10:47:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 Content-Language: en-US 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?1682422646186154720?= X-GMAIL-MSGID: =?utf-8?q?1682422646186154720?= 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 Signed-off-by: Jan Kiszka --- 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(-) 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.26.2