upgrade 5 recipes and 3 fixes
cover upgrade 5 recipes and 3 fixes
The following changes since commit ff6bead1624a1e261408516b3d064a04aab5f592:
doxygen: Use SOURCEFORGE_MIRROR for SRC_URI (2018-12-07 08:38:34 -0800)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20181217
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20181217
Hongxu Jia (8):
efivar: 36 -> 37
libreport: 2.9.6 -> 2.9.7
python3-blivet: 3.1.1 -> 3.1.2
python3-blivetgui: 2.1.9 -> 2.1.10 python-pyparted/python3-pyparted: drop incorrect and redundant PV
usermode: 1.112 -> 1.113
lvm2/libdevmapper: drop unnecessary UPSTREAM_CHECK_URI and
UPSTREAM_CHECK_REGEX
efibootmgr: fix conflicting types for 'efi_set_verbose'
...1-Include-sys-sysmacros.h-for-major-minor.patch | 25 -----------------
.../0001-Missing-n-in-translated-string.patch | 28 -------------------
.../{usermode_1.112.bb => usermode_1.113.bb} | 6 ++---
meta-oe/recipes-bsp/efibootmgr/efibootmgr_17.bb | 1 +
.../efibootmgr/files/0001-remove-extra-decl.patch | 31 ++++++++++++++++++++++
.../efivar/{efivar_36.bb => efivar_37.bb} | 2 +-
.../{libreport_2.9.6.bb => libreport_2.9.7.bb} | 2 +-
meta-oe/recipes-support/lvm2/lvm2.inc | 3 ---
...on3-blivet_3.1.1.bb => python3-blivet_3.1.2.bb} | 2 +-
...vetgui_2.1.9.bb => python3-blivetgui_2.1.10.bb} | 2 +-
.../python-pyparted/python-pyparted_3.11.1.bb | 2 --
.../python-pyparted/python3-pyparted_3.11.1.bb | 2 --
12 files changed, 38 insertions(+), 68 deletions(-)
delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch
delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch
rename meta-gnome/recipes-support/usermode/{usermode_1.112.bb => usermode_1.113.bb} (79%)
create mode 100644 meta-oe/recipes-bsp/efibootmgr/files/0001-remove-extra-decl.patch
rename meta-oe/recipes-bsp/efivar/{efivar_36.bb => efivar_37.bb} (96%)
rename meta-oe/recipes-extended/libreport/{libreport_2.9.6.bb => libreport_2.9.7.bb} (96%)
rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.1.1.bb => python3-blivet_3.1.2.bb} (96%)
rename meta-python/recipes-extended/python-blivet/{python3-blivetgui_2.1.9.bb => python3-blivetgui_2.1.10.bb} (92%)Signature · 1 line
2.7.4
PATCH 1/8 efivar: 36 -> 37
---
meta-oe/recipes-bsp/efivar/{efivar_36.bb => efivar_37.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-bsp/efivar/{efivar_36.bb => efivar_37.bb} (96%)meta-oe/recipes-bsp/efivar/efivar_37.bb renamed from meta-oe/recipes-bsp/efivar/efivar_36.bb +1 -1
@@ -12,7 +12,7 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "ef3449223ecd1e7b1098c523d66b2f960fe839ea" +SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" SRC_URI = "git://github.com/rhinstaller/efivar.git \ file://allow-multi-definitions-for-native.patch \ "
Signature · 1 line
2.7.4
PATCH 2/8 libreport: 2.9.6 -> 2.9.7
In reply to Hongxu Jia---
.../libreport/{libreport_2.9.6.bb => libreport_2.9.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/libreport/{libreport_2.9.6.bb => libreport_2.9.7.bb} (96%)meta-oe/recipes-extended/libreport/libreport_2.9.7.bb renamed from meta-oe/recipes-extended/libreport/libreport_2.9.6.bb +1 -1
@@ -17,7 +17,7 @@ SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0003-without-build-plugins.patch \ file://0004-configure.ac-remove-prog-test-of-augparse.patch \ " -SRCREV = "e43eb0b747f58ef9be7e2d8fc9f3fafc93fa63c6" +SRCREV = "1d5cc00e44af4800fcae9761625dd4230681e82a" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.7.4
PATCH 3/8 python3-blivet: 3.1.1 -> 3.1.2
In reply to Hongxu Jia---
.../python-blivet/{python3-blivet_3.1.1.bb => python3-blivet_3.1.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.1.1.bb => python3-blivet_3.1.2.bb} (96%)meta-python/recipes-extended/python-blivet/python3-blivet_3.1.2.bb renamed from meta-python/recipes-extended/python-blivet/python3-blivet_3.1.1.bb +1 -1
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "0a1f8374197f5a5fb368de90a7f1c1258b7cd2b9" +SRCREV = "878f794a38120a652cab0026b77175b099bf1f9d" SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \ file://0001-comment-out-selinux.patch \ file://0002-run_program-support-timeout.patch \
Signature · 1 line
2.7.4
PATCH 4/8 python3-blivetgui: 2.1.9 -> 2.1.10
In reply to Hongxu Jia---
.../{python3-blivetgui_2.1.9.bb => python3-blivetgui_2.1.10.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-extended/python-blivet/{python3-blivetgui_2.1.9.bb => python3-blivetgui_2.1.10.bb} (92%)meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb renamed from meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.9.bb +1 -1
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "393c139c09dc44167b64f47771650ce9aa9d469f" +SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ "
Signature · 1 line
2.7.4
PATCH 5/8 python-pyparted/python3-pyparted: drop incorrect and redundant PV
In reply to Hongxu Jia--- meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb | 2 -- meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb | 2 -- 2 files changed, 4 deletions(-)
meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb +0 -2
@@ -1,7 +1,5 @@ require python-pyparted.inc -PV = "3.10.7+git${SRCPV}" - inherit distutils RDEPENDS_${PN} += "python-stringold python-codecs python-math python-subprocess"
meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb +0 -2
@@ -1,7 +1,5 @@ require python-pyparted.inc -PV = "3.10.7+git${SRCPV}" - inherit distutils3 RDEPENDS_${PN} += "python3-stringold python3-codecs python3-math"
Signature · 1 line
2.7.4
PATCH 6/8 usermode: 1.112 -> 1.113
In reply to Hongxu JiaDrop backported patches
- 0001-Missing-n-in-translated-string.patch
- 0001-Include-sys-sysmacros.h-for-major-minor.patch
---
...1-Include-sys-sysmacros.h-for-major-minor.patch | 25 -------------------
.../0001-Missing-n-in-translated-string.patch | 28 ----------------------
.../{usermode_1.112.bb => usermode_1.113.bb} | 6 ++---
3 files changed, 2 insertions(+), 57 deletions(-)
delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch
delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch
rename meta-gnome/recipes-support/usermode/{usermode_1.112.bb => usermode_1.113.bb} (79%)meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 75539659396b18110d5a52a8a32845254b4d8eca Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 11 Aug 2018 18:25:47 -0700 -Subject: [PATCH] Include sys/sysmacros.h for major/minor - -usermount.c:238: undefined reference to `major' - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - usermount.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usermount.c b/usermount.c -index 4107027..21ef77f 100644 ---- a/usermount.c -+++ b/usermount.c -@@ -40,6 +40,7 @@ - #include <sys/stat.h> - #include <sys/time.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <errno.h> - #include <glob.h> - #include <libintl.h>
meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera <[email protected]> -Date: Wed, 11 Apr 2018 17:13:44 +0200 -Subject: [PATCH] Missing \n in translated string - -Upstream-Status: Backport - -Signed-off-by: Hongxu Jia <[email protected]> ---- - po/tr.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/tr.po b/po/tr.po -index 84e5021..a28e947 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" - #: ../../po/../userpasswd.c:37 - #, c-format - msgid "Unexpected command-line arguments\n" --msgstr "Beklenmeyen komut satırı argümanları" -+msgstr "Beklenmeyen komut satırı argümanları\n" - - #: ../../po/../userinfo.c:411 - #, c-format --- -2.7.4 -
meta-gnome/recipes-support/usermode/usermode_1.113.bb renamed from meta-gnome/recipes-support/usermode/usermode_1.112.bb +2 -4
@@ -16,11 +16,9 @@ DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-fix-compile-failure-against-musl-C-library.patch \ file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \ - file://0001-Missing-n-in-translated-string.patch \ - file://0001-Include-sys-sysmacros.h-for-major-minor.patch \ " -SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196" -SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370" +SRC_URI[md5sum] = "eadfbff18578b645096b6fa61854b41d" +SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b1ba092" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
Signature · 1 line
2.7.4
PATCH 7/8 lvm2/libdevmapper: drop unnecessary UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX
In reply to Hongxu JiaSince switch to github [a7bc7b6 lvm2/libdevmapper: 2.02.180 -> 2.03.01], UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX is not necessary
--- meta-oe/recipes-support/lvm2/lvm2.inc | 3 --- 1 file changed, 3 deletions(-)
meta-oe/recipes-support/lvm2/lvm2.inc +0 -3
@@ -18,9 +18,6 @@ SRC_URI = "git://github.com/lvmteam/lvm2.git;protocol=https;branch=master \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ " -UPSTREAM_CHECK_URI = "ftp://sources.redhat.com/pub/lvm2/" -UPSTREAM_CHECK_REGEX = "LVM2\.(?P<pver>\d+(\.\d+)+)" - S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license
Signature · 1 line
2.7.4
PATCH 8/8 efibootmgr: fix conflicting types for 'efi_set_verbose'
In reply to Hongxu JiaSince upstream efivar-37 pulibc efi_set_verbose in its headers [daf3b6c Move verbosity headers to be public], it is not necessary to delcare in efibootmgr.
--- meta-oe/recipes-bsp/efibootmgr/efibootmgr_17.bb | 1 + .../efibootmgr/files/0001-remove-extra-decl.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 meta-oe/recipes-bsp/efibootmgr/files/0001-remove-extra-decl.patch
meta-oe/recipes-bsp/efibootmgr/efibootmgr_17.bb +1 -0
@@ -12,6 +12,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRCREV = "e067160ecef8208e1944002e5d50b275733211fb" SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ + file://0001-remove-extra-decl.patch \ " S = "${WORKDIR}/git"
meta-oe/recipes-bsp/efibootmgr/files/0001-remove-extra-decl.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 +From: Peter Jones <[email protected]> +Date: Wed, 13 Jun 2018 09:41:01 -0400 +Subject: [PATCH] remove extra decl + +Signed-off-by: Peter Jones <[email protected]> + +Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git] +Signed-off-by: Hongxu Jia <[email protected]> + +--- + src/efibootmgr.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/efibootmgr.c b/src/efibootmgr.c +index de38f01..4e1a680 100644 +--- a/src/efibootmgr.c ++++ b/src/efibootmgr.c +@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) + "invalid numeric value %s\n", + optarg); + } +- /* XXX efivar-36 accidentally doesn't have a public +- * header for this */ +- extern int efi_set_verbose(int verbosity, FILE *errlog); + efi_set_verbose(opts.verbose - 2, stderr); + break; + case 'V': +-- +2.7.4 +
Signature · 1 line
2.7.4