From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6841139815099924480 X-Received: by 2002:a05:6402:782:: with SMTP id d2mr2609238edy.131.1602584997354; Tue, 13 Oct 2020 03:29:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:848:: with SMTP id f8ls389991ejd.4.gmail; Tue, 13 Oct 2020 03:29:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9wkZq242RrZIU9/N5M4iwn71ZvQpPYWzKwJNrmfEI/brPg23C3qJzdy1EfRoD3bMf1qQj X-Received: by 2002:a17:906:b01a:: with SMTP id v26mr34576230ejy.166.1602584996310; Tue, 13 Oct 2020 03:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602584996; cv=none; d=google.com; s=arc-20160816; b=sBvWkv84OMjkpct4eqf/a5B7OWIzWyxf0GfvlvLbh++SkZifL0cdN/4uippvx1tDAI J3zWoNTYTbEndO7DrLw9J/p9SiZ0fOvdn5SV3d38GIHWIYRi8OUXhUOH66j2DpzxepBb qXrtIJIjOWrhhfYabXWSNkq4/NVlHoYFysgISDckXNjqPM42CykpapsNFthQtGk41Xyz VRXKhFy/6Rt+o4rljgoMowi+HfqquVw6mD2k8By6VTfEBUF/Wg+RQUFuxfLmwbo4HgJ1 +VCh2sa7qK/1YNxTHW63qJMweRX+MA45ekF2SQbMpnsluTvUtXK8B4iNIo88uiWyQpfn 01vw== 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:references:to:from:subject; bh=duNiwkJqehWRpXUDIg6MTRWJv8qyMOafTn439RcXwMU=; b=bX7hXpt2Xd3yiFmnr/dG0wmf/8uwDHUptkhaEaRoDpCUMb4chD3ppQ3ATSTBH9rcBY r8XPTIFTXmebzlkxBrWglODzgK/p1GIuP6wTk4cGAxOvBc1sXKGhrO6Fr4tNALft/A6O U7Pv48MnAmgfqu5hqHPfEPTtHh8Q5pLj8nCptZtDLfTQoNZppibGZDoEyxAFtoJeDKF+ u9fKthkowfyS/sAC0LlfZPn+nQbUsbSwzpBvBHlIdItqMk/4nvgcwnMMep741yOEx5he RvLWlD+l+/g9c7OrLCDFTNCY99Q0xzPBhsPQnn2Kyctdt79BoV8FVSaDeogIWp08GMv/ 2xZA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id v18si546815edx.4.2020.10.13.03.29.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 03:29:56 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 09DATtgj014351 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Oct 2020 12:29:56 +0200 Received: from [139.25.68.37] ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 09DATtYV028367; Tue, 13 Oct 2020 12:29:55 +0200 Subject: Re: [PATCH v2] u-boot: add libubootenv From: Jan Kiszka To: "[ext] Q. Gylstorff" , isar-users@googlegroups.com References: <20200817082450.28101-1-Quirin.Gylstorff@siemens.com> Message-ID: <47378782-f299-52a5-a193-982e4ab59318@siemens.com> Date: Tue, 13 Oct 2020 12:29:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: IJGXRVocAwsI On 31.08.20 18:35, [ext] Jan Kiszka wrote: > On 17.08.20 10:24, [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. >> >> This patch uses dpkg-gdb to build the package from salsa.debian.org and adds >> a fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=967487. >> >> Signed-off-by: Quirin Gylstorff >> --- >> >> Changes V2: >> - use dpkg-gbd instead dpkg >> - use salsa.debian.org as source >> - add fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=967487 >> >> meta-isar/conf/machine/de0-nano-soc.conf | 2 +- >> .../0002-Add-support-GNUInstallDirs.patch | 48 +++++++++++++++++++ >> .../libubootenv/libubootenv_0.2.bb | 30 ++++++++++++ >> .../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 - >> 6 files changed, 79 insertions(+), 5 deletions(-) >> create mode 100644 meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch >> 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/0002-Add-support-GNUInstallDirs.patch b/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch >> new file mode 100644 >> index 0000000..f8c3038 >> --- /dev/null >> +++ b/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch >> @@ -0,0 +1,48 @@ >> +From b17d194bd8285a19382a902a0bec9e5e042df064 Mon Sep 17 00:00:00 2001 >> +From: Nobuhiro Iwamatsu >> +Date: Tue, 16 Apr 2019 08:52:01 +0900 >> +Subject: [PATCH 2/4] Add support GNUInstallDirs >> + >> +This adds the functionality of the module "GNUInstallDirs" to make the >> +installation compatible with GNU. >> + >> +https://cmake.org/cmake/help/v3.14/module/GNUInstallDirs.html >> + >> +Signed-off-by: Nobuhiro Iwamatsu >> +--- >> + CMakeLists.txt | 2 ++ >> + src/CMakeLists.txt | 8 ++++---- >> + 2 files changed, 6 insertions(+), 4 deletions(-) >> + >> +diff --git a/CMakeLists.txt b/CMakeLists.txt >> +index 104969e..57477fc 100644 >> +--- a/CMakeLists.txt >> ++++ b/CMakeLists.txt >> +@@ -10,6 +10,8 @@ add_definitions(-DVERSION="${VERSION}") >> + >> + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") >> + >> ++include("GNUInstallDirs") >> ++ >> + #set(CMAKE_C_FLAGS_DEBUG "-g") >> + include_directories ("${PROJECT_SOURCE_DIR}/src") >> + add_subdirectory (src) >> +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt >> +index ea5979c..d97f221 100644 >> +--- a/src/CMakeLists.txt >> ++++ b/src/CMakeLists.txt >> +@@ -19,7 +19,7 @@ add_executable(fw_setenv fw_setenv.c) >> + target_link_libraries(fw_printenv ubootenv z) >> + target_link_libraries(fw_setenv ubootenv z) >> + >> +-install (TARGETS ubootenv DESTINATION lib) >> +-install (FILES libuboot.h DESTINATION include) >> +-install (TARGETS fw_printenv DESTINATION bin) >> +-install (TARGETS fw_setenv DESTINATION bin) >> ++install (TARGETS ubootenv DESTINATION "${CMAKE_INSTALL_LIBDIR}") >> ++install (FILES libuboot.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") >> ++install (TARGETS fw_printenv DESTINATION "${CMAKE_INSTALL_BINDIR}") >> ++install (TARGETS fw_setenv DESTINATION "${CMAKE_INSTALL_BINDIR}") >> +-- >> +2.20.1 >> + >> 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..995e581 >> --- /dev/null >> +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb >> @@ -0,0 +1,30 @@ >> +# libubootenv >> +# >> +# This software is a part of ISAR. >> +# Copyright (c) Siemens AG, 2020 >> +# >> +# SPDX-License-Identifier: MIT >> + >> +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" >> + >> +inherit dpkg-gbp >> + >> +SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https \ >> + file://0002-Add-support-GNUInstallDirs.patch;apply=no " >> +SRCREV = "2c7cb6d941d906dcc1d2e447cc17e418485dff12" >> + >> +S = "${WORKDIR}/git" >> + >> +do_prepare_build() { >> + cd ${S} >> + export QUILT_PATCHES=debian/patches >> + quilt import -f ${WORKDIR}/*.patch >> + quilt push -a >> +} >> + >> +dpkg_runbuild_prepend() { >> + export DEB_BUILD_OPTIONS="nocheck" >> +} > > Inconsitent indention of the functions. > >> 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 >> > > Looks good to me otherwise - and we are already using it in production IIRC. > > Jan > Could you address my comment and check if this still applies over next? Thanks, Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux