From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6841139815099924480 X-Received: by 2002:a2e:9987:: with SMTP id w7mr8852146lji.242.1592826986030; Mon, 22 Jun 2020 04:56:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5f95:: with SMTP id r21ls1825215lfe.3.gmail; Mon, 22 Jun 2020 04:56:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwefI4j9lXmObQUNQfsL/XSaQlfgUaXTmOAnqOJN9PMcFa+MVY5RgWDnEY5bvj6aOvxbGMz X-Received: by 2002:a19:c187:: with SMTP id r129mr9516970lff.129.1592826985374; Mon, 22 Jun 2020 04:56:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592826985; cv=none; d=google.com; s=arc-20160816; b=oXQxT0JarAa6bJI3KDAz0qOrkEdcfCSIPLBwtjgGn5xm1iyH7S4+Dtg7yCNqgiHoRW fBh1SyHzaXPGOBSfDxzyPYsIls7Ce4VujCi/aoG+nxMn7NooeIZMkiDitfU3q3wjHU0r ZUcGbI+0uSVWE1o+wAw3umWlw5v/9OlWslF+Jb20uopaW6ickqoCOUGs2e7EjzyRYeFi wkdRp4eMYF3bGl1D66/dSbNck5umglODaz3CLi3KkGp53zNhvlHaSFMLGd4Zd+nRdI+8 6IAvHO8TINtNbvagzVYEq0SjwhFD/AWzdan+f9syEm9Do17fLwL/jYpVj10FGEc0Jcyc C+7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=2AQDYfS0480gDYDddaL027yPVZSs95+ccGWtwCN1trM=; b=sA/GhC3tdr0PYz9iYt+rWF5KcEZ3lauXThQZKH5+lHl9PC4FuQGwKO8Ks0IuD8lJH3 p0RiRoQLDOPm7gsSJEYoS31+fi3kEUtUOxWQAdkY/KN75H7+6qYZli2x+aPMpkv9Vz4m /DP8xvT9oMHrpcYFf9h87nrd//3a7FX4mmeGylAOtoSpowfBLCpiaQanDlvZAaoU7lc6 Nnf99Ir4xWBCZ8QAhaR9PkUc7TKdb1vQZ2sM1nt+5179WsIQdHWSIl4FUCup4XADJ23o Tt7dLZVypXrBr5D1j0FQfT2KYkVWU1v8fTJPa34MVjxL3Cwu0ZlMAA9A8Q4Y+Hz+HLL5 +xHQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@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 u23si799963ljg.7.2020.06.22.04.56.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 04:56:25 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@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 05MBuOxi016098 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 22 Jun 2020 13:56:24 +0200 Received: from md2dvrtc.ad001.siemens.net (iep-nanobox-2.ppmd.siemens.net [139.25.69.120] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 05MBuO9P008334; Mon, 22 Jun 2020 13:56:24 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH] u-boot: add libubootenv Date: Mon, 22 Jun 2020 13:56:24 +0200 Message-Id: <20200622115624.4639-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: T+hjEQQxgcQ5 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" + +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