From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920137738831265792 X-Received: by 2002:ac2:47f8:: with SMTP id b24mr232675lfp.108.1611326715850; Fri, 22 Jan 2021 06:45:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9ad2:: with SMTP id p18ls1226653ljj.5.gmail; Fri, 22 Jan 2021 06:45:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTudgNf9yK0uNgLXE6k+PdKI6V2YMyU7tIuJeHZIK1k2hNBVDL1VRqlbY1gvuYmK/nJCmZ X-Received: by 2002:a05:651c:1390:: with SMTP id k16mr208785ljb.138.1611326714700; Fri, 22 Jan 2021 06:45:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611326714; cv=none; d=google.com; s=arc-20160816; b=V36gtBB9JP4rkds+TypHQu+4ghr5amOI7PoYhLaL9/xRCVdhd7og6bIiUlp/0v4wkM +6RGCMD78/4BJA5oIMYbnF16wh9CCM1IZyIkeoI5Kd8UTYRm4pph3Bmpe7Wgh8r8Pmrz yxZOc1xwQBFW0C0ZRE3sDESU6FW9mFD9eqO7+Z5eVR/7gqzs3Z4PTcwa/UQEy7fmWeGg iKJ2BTNa0G2Z+iBVYcQ9MHqjhqrL0wNEvDVrxnXckpoJUxmg8SpYTkhaOHuifED2cH6z eP7ELpjr2NSpXsWKLkSsDrEPpsLCai90Wb9phzxNE51NNBNHlCRT3JXB9XRb8rCywvGm z8HA== 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:cc:to:from; bh=iSunaLxapmUuZAcC3tukDZYlnjRnce6M5aEaYWlw+yI=; b=pmzzaiZgi+wXoiRhSXpfDO1MbQOfgmB4/O/sp6sBGJxPrPjVz4WympAF9jWTeTKkIr eB5zUHo7WDQdUoEZBxOXn96Lf4Rih19knveJBdWWCOL2hqzWLXHFRMkYDtN3cz3w0uQK jNkGSNJEj5QIbiEeBi5HnJnGLlj5lK7Mpprp4zD8DlmvKPs+EhfGW+Ltkb+ICwTCgTQ+ 4wjLrUMlixHb/+LhgMPXZoX6XwAuDc6p+EDoIvnIf/2JkI5iueKmU1DTRKNZXj/1Atzf UtJNcX78hDvrBut/1mVz+Wppp8oClL4rNKEDCgc4j4Il0ePTrdJ7URlpvnkxW/aFGheZ 3ncg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x8si457390ljh.5.2021.01.22.06.45.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 06:45:14 -0800 (PST) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 10MEjDcT004897 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Jan 2021 15:45:13 +0100 Received: from md2dvrtc.fritz.box ([167.87.53.201]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 10MEjCox013394; Fri, 22 Jan 2021 15:45:12 +0100 From: "Q. Gylstorff" To: isar-users@googlegroups.com, henning.schild@siemens.com Cc: Quirin Gylstorff , Nobuhiro Iwamatsu Subject: [PATCH v2] update libubootenv to 0.3.1 Date: Fri, 22 Jan 2021 15:45:12 +0100 Message-Id: <20210122144512.5060-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210121102850.17ed212c@md1za8fc.ad001.siemens.net> References: <20210121102850.17ed212c@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: E/9jJaRy0b3l From: Quirin Gylstorff This fixes bugs and remove the patch for the isar-build Signed-off-by: Quirin Gylstorff --- Changes V2: - delete patch file .../0002-Add-support-GNUInstallDirs.patch | 48 ------------------- ...ibubootenv_0.2.bb => libubootenv_0.3.1.bb} | 11 +---- 2 files changed, 2 insertions(+), 57 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} (70%) 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 70% rename from meta/recipes-bsp/libubootenv/libubootenv_0.2.bb rename to meta/recipes-bsp/libubootenv/libubootenv_0.3.1.bb index 8eea584..f88d944 100644 --- a/meta/recipes-bsp/libubootenv/libubootenv_0.2.bb +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3.1.bb @@ -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