* [PATCH 0/8] Upgrade 8 recipes
@ 2019-07-02 8:16 Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 1/8] python3-pykickstart: 3.18 -> 3.20 Hongxu Jia
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
The following changes since commit 64974b8779291419486338f75f229a732e450d78:
xfce4-screensaver: 0.1.4 -> 0.1.5 (2019-06-21 06:22:19 -0700)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib hongxu/upgrade-20190702
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=hongxu/upgrade-20190702
Hongxu Jia (8):
python3-pykickstart: 3.18 -> 3.20
python3-blivet: 3.1.2 -> 3.1.4
python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2
libbytesize: 1.4 -> 2.0
libblockdev: 2.20 -> 2.22
network-manager-applet: 1.8.20 -> 1.8.22
thin-provisioning-tools: 0.7.6 -> 0.8.5
libreport: 2.9.7 -> 2.10.0
..._1.8.20.bb => network-manager-applet_1.8.22.bb} | 6 ++--
.../{libblockdev_2.20.bb => libblockdev_2.22.bb} | 2 +-
.../{libreport_2.9.7.bb => libreport_2.10.0.bb} | 2 +-
.../files/0001-fix-out-of-tree-build-failure.patch | 37 +++++++++++++++++++
.../{libbytesize_1.4.bb => libbytesize_2.0.bb} | 8 ++---
.../0001-fix-compile-failed-with-libc-musl.patch | 42 ----------------------
.../files/use-sh-on-path.patch | 21 ++++++++---
...s_0.7.6.bb => thin-provisioning-tools_0.8.5.bb} | 3 +-
...on3-blivet_3.1.2.bb => python3-blivet_3.1.4.bb} | 2 +-
...ckstart_3.18.bb => python3-pykickstart_3.20.bb} | 2 +-
.../python-pyparted/python-pyparted.inc | 2 +-
...yparted_3.11.1.bb => python-pyparted_3.11.2.bb} | 0
...parted_3.11.1.bb => python3-pyparted_3.11.2.bb} | 0
13 files changed, 67 insertions(+), 60 deletions(-)
rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_1.8.20.bb => network-manager-applet_1.8.22.bb} (87%)
rename meta-oe/recipes-extended/libblockdev/{libblockdev_2.20.bb => libblockdev_2.22.bb} (97%)
rename meta-oe/recipes-extended/libreport/{libreport_2.9.7.bb => libreport_2.10.0.bb} (96%)
create mode 100644 meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch
rename meta-oe/recipes-support/libbytesize/{libbytesize_1.4.bb => libbytesize_2.0.bb} (84%)
delete mode 100644 meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch
rename meta-oe/recipes-support/thin-provisioning-tools/{thin-provisioning-tools_0.7.6.bb => thin-provisioning-tools_0.8.5.bb} (84%)
rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.1.2.bb => python3-blivet_3.1.4.bb} (96%)
rename meta-python/recipes-extended/python-pykickstart/{python3-pykickstart_3.18.bb => python3-pykickstart_3.20.bb} (94%)
rename meta-python/recipes-extended/python-pyparted/{python-pyparted_3.11.1.bb => python-pyparted_3.11.2.bb} (100%)
rename meta-python/recipes-extended/python-pyparted/{python3-pyparted_3.11.1.bb => python3-pyparted_3.11.2.bb} (100%)
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-python][PATCH 1/8] python3-pykickstart: 3.18 -> 3.20
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 2/8] python3-blivet: 3.1.2 -> 3.1.4 Hongxu Jia
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../{python3-pykickstart_3.18.bb => python3-pykickstart_3.20.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-extended/python-pykickstart/{python3-pykickstart_3.18.bb => python3-pykickstart_3.20.bb} (94%)
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.18.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb
similarity index 94%
rename from meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.18.bb
rename to meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb
index 1a03884..ed10ce9 100644
--- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.18.bb
+++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma
file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \
file://0004-load.py-retry-to-invoke-request-with-timeout.patch \
"
-SRCREV = "ad942f2644337c4672c7a22bd24a5b7268c1f5e9"
+SRCREV = "487edfded19d5969db0673b200ee4272b7dc6697"
UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)"
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-python][PATCH 2/8] python3-blivet: 3.1.2 -> 3.1.4
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 1/8] python3-pykickstart: 3.18 -> 3.20 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 3/8] python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2 Hongxu Jia
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../python-blivet/{python3-blivet_3.1.2.bb => python3-blivet_3.1.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.1.2.bb => python3-blivet_3.1.4.bb} (96%)
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.2.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb
similarity index 96%
rename from meta-python/recipes-extended/python-blivet/python3-blivet_3.1.2.bb
rename to meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb
index 45565ba..817ef9b 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.2.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
S = "${WORKDIR}/git"
B = "${S}"
-SRCREV = "878f794a38120a652cab0026b77175b099bf1f9d"
+SRCREV = "9b5ad2d5b5df159963e1c6c24523e1dfe1f71435"
SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \
file://0001-comment-out-selinux.patch \
file://0002-run_program-support-timeout.patch \
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-python][PATCH 3/8] python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 1/8] python3-pykickstart: 3.18 -> 3.20 Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 2/8] python3-blivet: 3.1.2 -> 3.1.4 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 4/8] libbytesize: 1.4 -> 2.0 Hongxu Jia
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta-python/recipes-extended/python-pyparted/python-pyparted.inc | 2 +-
.../{python-pyparted_3.11.1.bb => python-pyparted_3.11.2.bb} | 0
.../{python3-pyparted_3.11.1.bb => python3-pyparted_3.11.2.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-extended/python-pyparted/{python-pyparted_3.11.1.bb => python-pyparted_3.11.2.bb} (100%)
rename meta-python/recipes-extended/python-pyparted/{python3-pyparted_3.11.1.bb => python3-pyparted_3.11.2.bb} (100%)
diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
index a0ec028..f769f95 100644
--- a/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
+++ b/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "\
DEPENDS += "parted"
# upstream only publishes releases in github archives which are discouraged
-SRCREV = "1fdb15120f35f5da1dc7ec116522f0c796a8376a"
+SRCREV = "2396ba7df56de277b4999bdd5f7d1a1706a6388a"
SRC_URI = "git://github.com/rhinstaller/pyparted.git;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb b/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.2.bb
similarity index 100%
rename from meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb
rename to meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.2.bb
diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.2.bb
similarity index 100%
rename from meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb
rename to meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.2.bb
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 4/8] libbytesize: 1.4 -> 2.0
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
` (2 preceding siblings ...)
2019-07-02 8:16 ` [meta-python][PATCH 3/8] python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 5/8] libblockdev: 2.20 -> 2.22 Hongxu Jia
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
- Depends on libpcre2 since upstream commit [1c7e40a Port to pcre2]
- Remove PACKAGECONFIG python2 since upstream commit
[895baa3 Remove Python 2 support]
- Fix out of tree build failure
- RDEPENDS on python3-core rather than python3
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../files/0001-fix-out-of-tree-build-failure.patch | 37 ++++++++++++++++++++++
.../{libbytesize_1.4.bb => libbytesize_2.0.bb} | 8 ++---
2 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch
rename meta-oe/recipes-support/libbytesize/{libbytesize_1.4.bb => libbytesize_2.0.bb} (84%)
diff --git a/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch b/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch
new file mode 100644
index 0000000..3f42c25
--- /dev/null
+++ b/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch
@@ -0,0 +1,37 @@
+From 55802fd187b844f0c114c1657b18482bfc80ec51 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 2 Jul 2019 02:52:31 +0000
+Subject: [PATCH] fix out of tree build failure
+
+Since commit [116da95 Add the '--version' option to bs_calc.py] applied,
+while build out of tree, there is a install failure
+...
+|install -m0755 ../../git/tools/bs_calc.py /usr/bin/bscalc
+|install: cannot stat '../../git/tools/bs_calc.py': No such file or directory
+...
+
+The generated bs_calc.py locates in builddir rather than srcdir
+
+Upstream-Status: Submitted [https://github.com/storaged-project/libbytesize/pull/59]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ tools/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 08223a8..ae22fed 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -5,7 +5,7 @@ dist_man1_MANS = bscalc.man
+
+ install-exec-local:
+ install -d ${DESTDIR}${bindir}
+- install -m0755 ${srcdir}/bs_calc.py ${DESTDIR}${bindir}/bscalc
++ install -m0755 ${builddir}/bs_calc.py ${DESTDIR}${bindir}/bscalc
+
+ uninstall-local:
+ rm ${DESTDIR}${bindir}/bscalc
+--
+2.17.1
+
diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_1.4.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb
similarity index 84%
rename from meta-oe/recipes-support/libbytesize/libbytesize_1.4.bb
rename to meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb
index 863ce42..1beb677 100644
--- a/meta-oe/recipes-support/libbytesize/libbytesize_1.4.bb
+++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb
@@ -9,14 +9,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
S = "${WORKDIR}/git"
B = "${S}"
-SRCREV = "ebbda2217d177d2a17f917d7a3e3d132a26db791"
+SRCREV = "92c00638a6f846df5c40dbb690f9fcf998ad6df2"
SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \
+ file://0001-fix-out-of-tree-build-failure.patch \
"
inherit gettext autotools python3native
DEPENDS += " \
- libpcre \
+ libpcre2 \
gmp \
mpfr \
"
@@ -24,8 +25,7 @@ DEPENDS += " \
FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize"
PACKAGECONFIG ??= "python3"
-PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
-PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2"
+PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core"
PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}"
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 5/8] libblockdev: 2.20 -> 2.22
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
` (3 preceding siblings ...)
2019-07-02 8:16 ` [meta-oe][PATCH 4/8] libbytesize: 1.4 -> 2.0 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-gnome][PATCH 6/8] network-manager-applet: 1.8.20 -> 1.8.22 Hongxu Jia
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../libblockdev/{libblockdev_2.20.bb => libblockdev_2.22.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/libblockdev/{libblockdev_2.20.bb => libblockdev_2.22.bb} (97%)
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb
similarity index 97%
rename from meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb
rename to meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb
index 54a188d..c5fc928 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
inherit autotools python3native gobject-introspection
-SRCREV = "cb308566c3c5222b8422f78997a1742713b265a9"
+SRCREV = "f6e4538485d0442b3674e182c01ffe5a0f258ad4"
SRC_URI = " \
git://github.com/rhinstaller/libblockdev;branch=master \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-gnome][PATCH 6/8] network-manager-applet: 1.8.20 -> 1.8.22
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
` (4 preceding siblings ...)
2019-07-02 8:16 ` [meta-oe][PATCH 5/8] libblockdev: 2.20 -> 2.22 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 7/8] thin-provisioning-tools: 0.7.6 -> 0.8.5 Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 8/8] libreport: 2.9.7 -> 2.10.0 Hongxu Jia
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
Fix QA Issue: AM_GNU_GETTEXT used but no inherit gettext
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...rk-manager-applet_1.8.20.bb => network-manager-applet_1.8.22.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_1.8.20.bb => network-manager-applet_1.8.22.bb} (87%)
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb
similarity index 87%
rename from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
rename to meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb
index 80aafc8..1f3f611 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb
@@ -8,12 +8,12 @@ DEPENDS = "gtk+3 libnotify libsecret networkmanager \
"
GNOMEBASEBUILDCLASS = "autotools-brokensep"
-inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection
+inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[archive.md5sum] = "06aafa851762146034351aa72ebb23d4"
-SRC_URI[archive.sha256sum] = "050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec"
+SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f"
+SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed"
PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager"
PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info"
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 7/8] thin-provisioning-tools: 0.7.6 -> 0.8.5
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
` (5 preceding siblings ...)
2019-07-02 8:16 ` [meta-gnome][PATCH 6/8] network-manager-applet: 1.8.20 -> 1.8.22 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 8/8] libreport: 2.9.7 -> 2.10.0 Hongxu Jia
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
- Rebase use-sh-on-path.patch
- Drop 0001-fix-compile-failed-with-libc-musl.patch which
upstream has merged it
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../0001-fix-compile-failed-with-libc-musl.patch | 42 ----------------------
.../files/use-sh-on-path.patch | 21 ++++++++---
...s_0.7.6.bb => thin-provisioning-tools_0.8.5.bb} | 3 +-
3 files changed, 18 insertions(+), 48 deletions(-)
delete mode 100644 meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch
rename meta-oe/recipes-support/thin-provisioning-tools/{thin-provisioning-tools_0.7.6.bb => thin-provisioning-tools_0.8.5.bb} (84%)
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch
deleted file mode 100644
index 28b44da..0000000
--- a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fcbcf9c494cca166106ae4cb03c1dd135ee4f25c Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 1 Aug 2018 09:34:00 +0800
-Subject: [PATCH] fix compile failed with libc musl
-
-There is a failure while compiling with libc musl:
-[snip]
-|./block-cache/io_engine.h:18:17: error: expected
-unqualified-id before numeric constant
-| unsigned const PAGE_SIZE = 4096;
-[snip]
-
-The musl defeines macro PAGE_SIZE, undef it conditionally
-could fix the issue.
-
-http://musl.openwall.narkive.com/tO8vrHdP/why-musl-define-page-size
-
-Upstream-Status: Submitted [git://github.com/jthornber/thin-provisioning-tools]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- block-cache/io_engine.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/block-cache/io_engine.h b/block-cache/io_engine.h
-index 1704251..e36b932 100644
---- a/block-cache/io_engine.h
-+++ b/block-cache/io_engine.h
-@@ -12,6 +12,10 @@
-
- //----------------------------------------------------------------
-
-+// Musl defines
-+#ifdef PAGE_SIZE
-+#undef PAGE_SIZE
-+#endif
- namespace bcache {
- using sector_t = uint64_t;
-
---
-2.7.4
-
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch
index 8cb16de..de934c1 100644
--- a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch
+++ b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch
@@ -1,5 +1,7 @@
-
-thin-provisioning-tools: use sh on path when invoking txt2man
+From 38397b42e2c3450c2aee20e6fb92f362db4e35ef Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 2 Jul 2019 13:20:39 +0800
+Subject: [PATCH] thin-provisioning-tools: use sh on path when invoking txt2man
txt2man contains a test which might try to use ksh to run the script, so we
avoid running /bin/sh.
@@ -8,14 +10,25 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: joe.slater <joe.slater@windriver.com>
+Rebase to 0.8.5
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7c867b2..5303994 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -210,7 +210,7 @@ endif
-
+@@ -223,7 +223,7 @@ endif
%.8: %.txt bin/txt2man
@echo " [txt2man] $<"
+ @mkdir -p $(dir $@)
- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@
+ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@
#----------------------------------------------------------------
+--
+2.7.4
+
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb
similarity index 84%
rename from meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb
rename to meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb
index 5f6ba9e..9f89bac 100644
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.7.6.bb
+++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb
@@ -9,11 +9,10 @@ S = "${WORKDIR}/git"
SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \
file://0001-do-not-strip-pdata_tools-at-do_install.patch \
- file://0001-fix-compile-failed-with-libc-musl.patch \
file://use-sh-on-path.patch \
"
-SRCREV = "6f936992b8e6208a7838fcf1ec87c5bd3a694a77"
+SRCREV = "5e5409f48b5403d2c6dffd9919b35ad77d6fb7b4"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 8/8] libreport: 2.9.7 -> 2.10.0
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
` (6 preceding siblings ...)
2019-07-02 8:16 ` [meta-oe][PATCH 7/8] thin-provisioning-tools: 0.7.6 -> 0.8.5 Hongxu Jia
@ 2019-07-02 8:16 ` Hongxu Jia
7 siblings, 0 replies; 9+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../libreport/{libreport_2.9.7.bb => libreport_2.10.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/libreport/{libreport_2.9.7.bb => libreport_2.10.0.bb} (96%)
diff --git a/meta-oe/recipes-extended/libreport/libreport_2.9.7.bb b/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb
similarity index 96%
rename from meta-oe/recipes-extended/libreport/libreport_2.9.7.bb
rename to meta-oe/recipes-extended/libreport/libreport_2.10.0.bb
index da22836..e50226e 100644
--- a/meta-oe/recipes-extended/libreport/libreport_2.9.7.bb
+++ b/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb
@@ -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 = "1d5cc00e44af4800fcae9761625dd4230681e82a"
+SRCREV = "eaff08f38d771d9362923765bb404b1514c5ca0a"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-07-02 8:19 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-02 8:16 [PATCH 0/8] Upgrade 8 recipes Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 1/8] python3-pykickstart: 3.18 -> 3.20 Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 2/8] python3-blivet: 3.1.2 -> 3.1.4 Hongxu Jia
2019-07-02 8:16 ` [meta-python][PATCH 3/8] python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2 Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 4/8] libbytesize: 1.4 -> 2.0 Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 5/8] libblockdev: 2.20 -> 2.22 Hongxu Jia
2019-07-02 8:16 ` [meta-gnome][PATCH 6/8] network-manager-applet: 1.8.20 -> 1.8.22 Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 7/8] thin-provisioning-tools: 0.7.6 -> 0.8.5 Hongxu Jia
2019-07-02 8:16 ` [meta-oe][PATCH 8/8] libreport: 2.9.7 -> 2.10.0 Hongxu Jia
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.