From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920137738831265792 X-Received: by 2002:a1c:5686:: with SMTP id k128mr5708095wmb.189.1611350873018; Fri, 22 Jan 2021 13:27:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a54b:: with SMTP id j11ls1410938wrb.3.gmail; Fri, 22 Jan 2021 13:27:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJpBrdSVd+I8XFyVr0GK7um5r13D13msSF8UEBJF/Q0kgpb9+m2N/ctd6KcvsqY8pb9JXc X-Received: by 2002:a5d:40d2:: with SMTP id b18mr6102891wrq.369.1611350872119; Fri, 22 Jan 2021 13:27:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611350872; cv=none; d=google.com; s=arc-20160816; b=V0pYkn53m9FstAUtuJU8vVbTapVcfTvpCIWeYEGbNKoU8rGJ/rc9nnYNn1KIbzRrIc WkAQZXTPTCUtO9tWKnMR+TfPj6HQ0eX56goYWhE9Iref2B3C1eDqJNmxuQzsx+UUfVTw XY3v8RezST0QqrOrTHnVyLXCEQ1i0505HuHQHrijBFqfXAWqaAhYWT5g2ygF+6iTEOxG aqO2TyKkcsweOEzM4FpDmOMbIqV3AAiGtJVNiXIRiDvD/ME7rSQ6gkSZ9gSNcog33OkY RfQLaNLgqWOwcLJH9dQ5KFUCfpVYqt4rc9OWJMDbsFWgag74G2zVpx7kQF4OemepbNhp +F7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=GDj4SVdgYfqnT10b6dMnv5NaFoWKpZ2UncOHgfHIoLg=; b=gTjVUv6uUfNHZLicnAfhSTK136WNY+SiZmEirlTD1TPR/OwImiD2S74Pp9ukAn2Zrf 4UDIhvOINwwAmik8+AhIHB8ATkWJ8LfFc8SDsgJZLwD2h9PjDSefmsPNMikVGYl1kU9P RxjD+VptF0UVhAoF24V9E9Sb7OoVsMM6tRHc/P9mL9tB8kVh3k4k2bFiAtVQnxhILWxB Wh3TY2YQ84/JCM40KA+8/X/wHtCxulr8UQUPh+WrTWIWawwo7uXyV2GZCd5goamRpZKq cMS98ITP/T/TXS+OO6DPhMhvDZ1odNNKnehKsZnSLS2gAXwSXTiGdUu+bhYMzNClxP0y y8sw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id l21si489948wmg.2.2021.01.22.13.27.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 13:27:52 -0800 (PST) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 10MLRp5I027967 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 22:27:51 +0100 Received: from md2dvrtc.fritz.box ([167.87.247.200]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 10MLRpiD012149 for ; Fri, 22 Jan 2021 22:27:51 +0100 From: "Q. Gylstorff" To: isar-users@googlegroups.com Subject: [PATCH v3] update libubootenv to 0.3.1 Date: Fri, 22 Jan 2021 22:27:51 +0100 Message-Id: <20210122212751.11418-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122144512.5060-1-Quirin.Gylstorff@siemens.com> References: <20210122144512.5060-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: XcfvRycuIya3 From: Quirin Gylstorff This fixes bugs and remove the patch for the isar-build Signed-off-by: Quirin Gylstorff --- Changes V2: - delete patch file Changes V3: - correct description of libubootenv .../0002-Add-support-GNUInstallDirs.patch | 48 ------------------- ...ibubootenv_0.2.bb => libubootenv_0.3.1.bb} | 15 ++---- 2 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch rename meta/recipes-bsp/libubootenv/{libubootenv_0.2.bb => libubootenv_0.3.1.bb} (58%) diff --git a/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch b/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch deleted file mode 100644 index f8c3038..0000000 --- a/meta/recipes-bsp/libubootenv/files/0002-Add-support-GNUInstallDirs.patch +++ /dev/null @@ -1,48 +0,0 @@ -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.3.1.bb similarity index 58% rename from meta/recipes-bsp/libubootenv/libubootenv_0.2.bb rename to meta/recipes-bsp/libubootenv/libubootenv_0.3.1.bb index 8eea584..6027f8c 100644 --- a/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3.1.bb @@ -5,8 +5,8 @@ # # SPDX-License-Identifier: MIT -DESCRIPTION = "swupdate utility for software updates" -HOMEPAGE= "https://github.com/sbabic/swupdate" +DESCRIPTION = "Standalone library & tools for accessing the U-Boot environment" +HOMEPAGE= "https://github.com/sbabic/libubootenv" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" @@ -14,18 +14,11 @@ PROVIDES = "libubootenv-tool libubootenv-dev libubootenv-doc libubootenv0.1" inherit dpkg-gbp -SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https \ - file://0002-Add-support-GNUInstallDirs.patch;apply=no " -SRCREV = "2c7cb6d941d906dcc1d2e447cc17e418485dff12" +SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https" +SRCREV = "918da2525ce711700633ad69ea9b7e569b7abdbc" 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" -- 2.20.1