From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6891203156929150976 X-Received: by 2002:a5d:404f:: with SMTP id w15mr32678090wrp.39.1604483266171; 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-Google-Smtp-Source: ABdhPJxyH+PK/KIo0dd/ptRdPUSZQ5krmq8zSrLq3cpup0nwYuc6zbQxV4uUmdJg4WL4z/oiBtwY 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 Return-Path: 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; 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 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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: rIEtuWO9uCZI 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 --- 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 -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux