From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6841139815099924480 X-Received: by 2002:a2e:9917:: with SMTP id v23mr11232016lji.225.1592908439332; Tue, 23 Jun 2020 03:33:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3047:: with SMTP id b7ls3137185lfb.1.gmail; Tue, 23 Jun 2020 03:33:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr+w996GDtmZssawcXAi8XDqkcj4aZK9uVlUFTVvlGHZ/Yh3NvuHglMSuGA7Q5tOyv2/N+ X-Received: by 2002:a19:1d1:: with SMTP id 200mr12483231lfb.57.1592908438465; Tue, 23 Jun 2020 03:33:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592908438; cv=none; d=google.com; s=arc-20160816; b=cYkJQpiUMjWrfN9boWHtGWHJd4y5QtEi/yOlT9EFgMJ4KO0KGBdre6pN8idlLFta2d eZpjUltoW60T91P5QIZkHUjiLH3zbIzFGCLCh7AL9B6SexzPi/Q+DSUybZh3JhqkPQ/O nV1DDcDuFisZECrBhpjDzj7+xMj3rQrF/4X81TkqNYsxAv/sozDYvaUaOUi9paQBsheQ qvgCjCLo1xGG4k6KDc7jX2eid1hY0uxKBt0b8b+CaPrZczDabuhmZGaDTksjMEReSmft 0PEowg3eu9qRI73HPlqfJPvW3b+bCbUD5eNj+7axaNvt6DxP+fHLSFY9LEEJXxCcOphW UnKQ== 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=M+CKgmfJ7U+W/hkbmoBBJozbasUJwrPzsTELb6l6Wuc=; b=aofO7UBKUZJzXjLc0dPZ4obHiUfgUJx+8Vrf78Ub0JGUyuze+z9EYrAJUYq8aKxEn+ JRgzxq/6dojlg+p2Ruig9M7HkomeBYdidT5uHWTEXz1TnJk/wTgxgc0OhgiBYWbPJnRl m9G2XT7r/1CNW8Zs99lsf1roAK2EczNZWVVaCJPOVyyEIjatbUCilciJIgydctgALJ2V vX5AYfb7f/+RcLuomnKmCSP7jdYn/xxlYIEawsWhL3Lk7BAGj9qYcJ/ZHFRXrsE5pMVW WVEg+wXwxDEWiJk2HJGMHtelKnZu5tgFfdGAhZIE7Yt0OjlVEX5AiGkh3BnKmbs7MCzY wb2Q== 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 j14si827957lji.8.2020.06.23.03.33.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2020 03:33:58 -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 05NAXuxO004214 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2020 12:33:56 +0200 Received: from [167.87.144.134] ([167.87.144.134]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 05NAXsrW021159; Tue, 23 Jun 2020 12:33:55 +0200 Subject: Re: [PATCH] u-boot: add libubootenv To: Harald Seiler , "Q. Gylstorff" , isar-users@googlegroups.com References: <20200622115624.4639-1-Quirin.Gylstorff@siemens.com> <9fe766bf55717326b6bba427bff922bc3a9f2b4f.camel@denx.de> From: Jan Kiszka Message-ID: <231240a6-9797-cc23-2f06-f1b9c5426823@siemens.com> Date: Tue, 23 Jun 2020 12:33:54 +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: <9fe766bf55717326b6bba427bff922bc3a9f2b4f.camel@denx.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: LQPXXeiKPZ6f On 23.06.20 12:28, Harald Seiler wrote: > Hi Quirin, > > On Mon, 2020-06-22 at 13:56 +0200, 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 +++++++++++++++++++ >> .../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" > > libubootenv requires a proper config and default environment file to work. > I sent a patch a few days ago (not yet applied) which creates a package > for those [1] and I think it would make sense to have libubootenv depend > on that package to ensure config exists alongside the tools. That would > mean: > > DEPENDS="u-boot-config" > DEBIAN_DEPENDS="u-boot-config" u-boot-${MACHINE}-config Makes sense. > > [1]: https://groups.google.com/forum/#!msg/isar-users/H_CixMXvd6Q/cXbO4VzgAgAJ > >> + >> +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 >> -- >> 2.20.1 > > Regards, > Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux