* [PATCH] update libubootenv to 0.3.1
@ 2021-01-21 9:08 Q. Gylstorff
2021-01-21 9:28 ` Henning Schild
0 siblings, 1 reply; 5+ messages in thread
From: Q. Gylstorff @ 2021-01-21 9:08 UTC (permalink / raw)
To: isar-users; +Cc: Quirin Gylstorff
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This fixes bugs and remove the patch for the isar-build
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
.../{libubootenv_0.2.bb => libubootenv_0.3.1.bb} | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
rename meta/recipes-bsp/libubootenv/{libubootenv_0.2.bb => libubootenv_0.3.1.bb} (70%)
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] update libubootenv to 0.3.1
2021-01-21 9:08 [PATCH] update libubootenv to 0.3.1 Q. Gylstorff
@ 2021-01-21 9:28 ` Henning Schild
2021-01-22 14:45 ` [PATCH v2] " Q. Gylstorff
0 siblings, 1 reply; 5+ messages in thread
From: Henning Schild @ 2021-01-21 9:28 UTC (permalink / raw)
To: [ext] Q. Gylstorff; +Cc: isar-users
Not sure i read this correctly, but seems you forgot to remove the
patch from the tree.
Henning
Am Thu, 21 Jan 2021 10:08:41 +0100
schrieb "[ext] Q. Gylstorff" <Quirin.Gylstorff@siemens.com>:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> This fixes bugs and remove the patch for the isar-build
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> .../{libubootenv_0.2.bb => libubootenv_0.3.1.bb} | 11
> ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
> rename meta/recipes-bsp/libubootenv/{libubootenv_0.2.bb =>
> libubootenv_0.3.1.bb} (70%)
>
> 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"
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] update libubootenv to 0.3.1
2021-01-21 9:28 ` Henning Schild
@ 2021-01-22 14:45 ` Q. Gylstorff
2021-01-22 21:27 ` [PATCH v3] " Q. Gylstorff
0 siblings, 1 reply; 5+ messages in thread
From: Q. Gylstorff @ 2021-01-22 14:45 UTC (permalink / raw)
To: isar-users, henning.schild; +Cc: Quirin Gylstorff, Nobuhiro Iwamatsu
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This fixes bugs and remove the patch for the isar-build
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
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 <nobuhiro1.iwamatsu@toshiba.co.jp>
-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 <nobuhiro1.iwamatsu@toshiba.co.jp>
----
- 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
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v3] update libubootenv to 0.3.1
2021-01-22 14:45 ` [PATCH v2] " Q. Gylstorff
@ 2021-01-22 21:27 ` Q. Gylstorff
2021-02-10 9:16 ` Anton Mikanovich
0 siblings, 1 reply; 5+ messages in thread
From: Q. Gylstorff @ 2021-01-22 21:27 UTC (permalink / raw)
To: isar-users
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This fixes bugs and remove the patch for the isar-build
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
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 <nobuhiro1.iwamatsu@toshiba.co.jp>
-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 <nobuhiro1.iwamatsu@toshiba.co.jp>
----
- 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] update libubootenv to 0.3.1
2021-01-22 21:27 ` [PATCH v3] " Q. Gylstorff
@ 2021-02-10 9:16 ` Anton Mikanovich
0 siblings, 0 replies; 5+ messages in thread
From: Anton Mikanovich @ 2021-02-10 9:16 UTC (permalink / raw)
To: Q. Gylstorff, isar-users
23.01.2021 00:27, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> This fixes bugs and remove the patch for the isar-build
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Applied to next, thanks.
--
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-10 9:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 9:08 [PATCH] update libubootenv to 0.3.1 Q. Gylstorff
2021-01-21 9:28 ` Henning Schild
2021-01-22 14:45 ` [PATCH v2] " Q. Gylstorff
2021-01-22 21:27 ` [PATCH v3] " Q. Gylstorff
2021-02-10 9:16 ` Anton Mikanovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox