From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6841139815099924480 X-Received: by 2002:a2e:2a84:: with SMTP id q126mr8881883ljq.42.1592831054279; Mon, 22 Jun 2020 06:04:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:89d8:: with SMTP id c24ls3244677ljk.2.gmail; Mon, 22 Jun 2020 06:04:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOIUPYMM2QLNawvgqsUm6FRTAaKWywVi8otf02l2MD+tEt0Y98hp8p83kNvNKHPFs4liqy X-Received: by 2002:a2e:a16d:: with SMTP id u13mr8823873ljl.362.1592831053396; Mon, 22 Jun 2020 06:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592831053; cv=none; d=google.com; s=arc-20160816; b=0ODHc5HU5ggt1YZRyQltQALaEVmzmTStDzeQRXBDZvEh2BuR9NyIfqG/IGRgO8rA26 OqglxdmPuYzGXW3IStGB4K9e5fysOYD9qKIkEfCxqGI2lWg2Ytc2gVnJBJ5+AmyroGQN QOFANOHXOWtZ7c5IDsLS2dPDvaTeSdZTDFgqGFOR6zXyR3L5Z6DDmFRAC6yj+7M7WU0a OXL9HwYdC164yNVkR5Qg4MCDMh9YAM9t6H9uwozpeSZPOsWfvEp/LSfOz1YpBb1kiEjZ VYliwE+eM8ljqUAp/wsxcdFfi3pn0ZdAK/dAQQXH3BnSBEqNEQtJtqywWlAcSMr7zeHW A2YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=ETzMjVrxhIN6jhDy2Hom/B8hx/JSx+gxwsvSs/E5gO8=; b=i2l+8uuihV6B/miOzvz00PgfJowxTqssOAelOv+olNMbNvK+281QUc8/vQLvUdBfW6 tEdrSlb9jNUqf7DRiZCdlDokQbm5qxGwD7oO/89Dy+d55McEnhVUeGlAaUHaC1V4bEF0 a2BNlE+scdxDkGtgd3ykH5/Q6FGE6+r/u0UERNQ/kAWlpj9LKuOTQgH1BbYTWQkxVVL3 kVvS0PCRzPmAB0AAZdZcu0CZbubIqMznN50wJo6FgmLezJfNyDiE8FyShaZJDWGJFmmS jMRcYCw05odMnww5lwg8l+NisAOXITJbBJRqyvY8L3zdvBu0rAThmhmVg/sly23ABM/9 WRnA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id u23si814192ljg.7.2020.06.22.06.04.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 06:04:13 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 05MD4Cqf008206 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 22 Jun 2020 15:04:12 +0200 Received: from [139.25.68.37] ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 05MD4CFu015656; Mon, 22 Jun 2020 15:04:12 +0200 Subject: Re: [PATCH] u-boot: add libubootenv To: "[ext] Q. Gylstorff" , isar-users@googlegroups.com References: <20200622115624.4639-1-Quirin.Gylstorff@siemens.com> From: Jan Kiszka Message-ID: <2f9ec0c4-2012-2a37-58e2-5b4e85d8b131@siemens.com> Date: Mon, 22 Jun 2020 15:04:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200622115624.4639-1-Quirin.Gylstorff@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: kxxBT/wSbAj6 On 22.06.20 13:56, [ext] Q. Gylstorff wrote: > From: Quirin Gylstorff > > Add the new library libubootenv and remove fw_printenv and fw_setenv > form u-boot-tools as the are now part of the new library. > > libubootenv is a library that provides a hardware independent > way to access to U-Boot environment. U-Boot has its default environment > compiled board-dependently and this means that tools to access the environment > are also board specific, too. > > libubootenv conflicts with u-boot-tools from Debian 10 > as both try to install fw_printenv and fw_sentenv. This conflict is not > part of the control file as it breaks the installation of custom u-boot-tools > from the u-boot-sources. > > Signed-off-by: Quirin Gylstorff > --- > meta-isar/conf/machine/de0-nano-soc.conf | 2 +- > .../libubootenv/files/debian/compat | 1 + > .../libubootenv/files/debian/control.tmpl | 15 ++++++++++ > .../libubootenv/files/debian/rules.tmpl | 24 ++++++++++++++++ > .../libubootenv/libubootenv_0.2.bb | 28 +++++++++++++++++++ Can we try inherit dpkg-gbp SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https" SRCREV = "2c7cb6d941d906dcc1d2e447cc17e418485dff12" instead? Jan > .../files/debian/u-boot-tools.conffiles | 1 - > .../u-boot/files/debian/u-boot-tools.install | 2 -- > .../u-boot/files/debian/u-boot-tools.links | 1 - > 8 files changed, 69 insertions(+), 5 deletions(-) > create mode 100644 meta/recipes-bsp/libubootenv/files/debian/compat > create mode 100644 meta/recipes-bsp/libubootenv/files/debian/control.tmpl > create mode 100644 meta/recipes-bsp/libubootenv/files/debian/rules.tmpl > create mode 100644 meta/recipes-bsp/libubootenv/libubootenv_0.2.bb > delete mode 100644 meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles > delete mode 100644 meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links > > diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf > index 3a2c009..6558d90 100644 > --- a/meta-isar/conf/machine/de0-nano-soc.conf > +++ b/meta-isar/conf/machine/de0-nano-soc.conf > @@ -15,4 +15,4 @@ WKS_FILE ?= "de0-nano-soc.wks.in" > IMAGER_INSTALL += "u-boot-de0-nano-soc" > IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc" > > -IMAGE_INSTALL += "u-boot-tools u-boot-script" > +IMAGE_INSTALL += "u-boot-tools libubootenv u-boot-script" > diff --git a/meta/recipes-bsp/libubootenv/files/debian/compat b/meta/recipes-bsp/libubootenv/files/debian/compat > new file mode 100644 > index 0000000..b4de394 > --- /dev/null > +++ b/meta/recipes-bsp/libubootenv/files/debian/compat > @@ -0,0 +1 @@ > +11 > diff --git a/meta/recipes-bsp/libubootenv/files/debian/control.tmpl b/meta/recipes-bsp/libubootenv/files/debian/control.tmpl > new file mode 100644 > index 0000000..fade69a > --- /dev/null > +++ b/meta/recipes-bsp/libubootenv/files/debian/control.tmpl > @@ -0,0 +1,15 @@ > +Source: libubootenv > +Section: embedded > +Priority: optional > +Maintainer: Stefano Babic > +Build-Depends: ${BUILD_DEB_DEPENDS} > +Standards-Version: 4.2.1 > +Homepage: https://sbabic.github.io/libubootenv > + > +Package: libubootenv > +Architecture: any > +Depends: ${DEBIAN_DEPENDS} > +Description: libubootenv is a library that provides a hardware independent > + way to access to U-Boot environment. U-Boot has its default environment > + compiled board-dependently and this means that tools to access the environment > + are also board specific, too. > diff --git a/meta/recipes-bsp/libubootenv/files/debian/rules.tmpl b/meta/recipes-bsp/libubootenv/files/debian/rules.tmpl > new file mode 100644 > index 0000000..56ccd19 > --- /dev/null > +++ b/meta/recipes-bsp/libubootenv/files/debian/rules.tmpl > @@ -0,0 +1,24 @@ > +#!/usr/bin/make -f > + > +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) > +export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- > +export CC=$(DEB_HOST_GNU_TYPE)-gcc > +export LD=$(DEB_HOST_GNU_TYPE)-gcc > +endif > + > +export DH_VERBOSE = 1 > + > +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow > + > +override_dh_auto_configure: > + dh_auto_configure -- > + > +%: > + echo $@ > + dh $@ > + > +override_dh_installchangelogs: > + true > + > +override_dh_installdocs: > + true > diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb > new file mode 100644 > index 0000000..7ada382 > --- /dev/null > +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb > @@ -0,0 +1,28 @@ > +# Copyright (c) 2019 Siemens AG > +# Licensed under the Siemens Inner Source License, see LICENSE > + > +DESCRIPTION = "swupdate utility for software updates" > +HOMEPAGE= "https://github.com/sbabic/swupdate" > +LICENSE = "GPL-2.0" > +LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > +SRC_URI = "gitsm://github.com/sbabic/libubootenv.git;branch=master;protocol=https" > + > +SRCREV = "bf6ff631c0e38cede67268ceb8bf1383b5f8848e" > + > +BUILD_DEB_DEPENDS = "cmake, zlib1g-dev" > + > +SRC_URI += "file://debian" > +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" > +TEMPLATE_VARS += "BUILD_DEB_DEPENDS DEFCONFIG DEBIAN_DEPENDS" > + > + > +inherit dpkg > + > +S = "${WORKDIR}/git" > + > +do_prepare_build() { > + DEBDIR=${S}/debian > + install -d ${DEBDIR} > + cp -R ${WORKDIR}/debian ${S} > + deb_add_changelog > +} > diff --git a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles > deleted file mode 100644 > index d49a8fb..0000000 > --- a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.conffiles > +++ /dev/null > @@ -1 +0,0 @@ > -/etc/fw_env.config > diff --git a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install > index d1ae3e0..2893b9a 100644 > --- a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install > +++ b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.install > @@ -1,5 +1,3 @@ > tools/dumpimage /usr/bin/ > -tools/env/fw_printenv /usr/bin/ > tools/mkenvimage /usr/bin/ > tools/mkimage /usr/bin/ > -tools/env/fw_env.config /etc > diff --git a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links b/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links > deleted file mode 100644 > index 92f5a6c..0000000 > --- a/meta/recipes-bsp/u-boot/files/debian/u-boot-tools.links > +++ /dev/null > @@ -1 +0,0 @@ > -/usr/bin/fw_printenv /usr/bin/fw_setenv > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux