[PATCH 01/10] squid: upgrade 4.9 -> 4.12

[PATCH 01/10] squid: upgrade 4.9 -> 4.12

[Andreas Müller]

License checksum was changed by change of copyright year

Changes are found at [1-3]

[1] http://www.squid-cache.org/Versions/v4/changesets/SQUID_4_12.html
[2] http://www.squid-cache.org/Versions/v4/changesets/SQUID_4_11.html
[3] http://www.squid-cache.org/Versions/v4/changesets/SQUID_4_10.html

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-daemons/squid/{squid_4.9.bb => squid_4.12.bb}   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-networking/recipes-daemons/squid/{squid_4.9.bb => squid_4.12.bb} (95%)

diff --git a/meta-networking/recipes-daemons/squid/squid_4.9.bb b/meta-networking/recipes-daemons/squid/squid_4.12.bb
similarity index 95%
rename from meta-networking/recipes-daemons/squid/squid_4.9.bb
rename to meta-networking/recipes-daemons/squid/squid_4.12.bb
index 19949acd8..6e49790fe 100644
--- a/meta-networking/recipes-daemons/squid/squid_4.9.bb
+++ b/meta-networking/recipes-daemons/squid/squid_4.12.bb
@@ -28,11 +28,11 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2
 
 SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch"
 
-SRC_URI[md5sum] = "b315d0dce37627dfe61eec7f5304baaf"
-SRC_URI[sha256sum] = "0f5829d878002147e7c4d9b8901c2c3c051693465e82e45cef9ab0e226e3e729"
+SRC_URI[md5sum] = "5d058f7f8f1db9fa4ce3db910a008b0e"
+SRC_URI[sha256sum] = "eae0ad993921e472ce36cce34674c47a224fc2868b65ef0c4b41b2f5f18378a0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://errors/COPYRIGHT;md5=19cc4dd146f397e72f3ff6f9f58fbfbe \
+                    file://errors/COPYRIGHT;md5=4c3268f394af77fbbf541875cef96a6c \
                     "
 DEPENDS = "libtool krb5 openldap db cyrus-sasl"
 
-- 
2.26.2

[PATCH 02/10] libdvdcss: upgrade 1.3.0 -> 1.4.2

[Andreas Müller]

License checksum was changed by FSF address change

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../vlc/{libdvdcss_1.3.0.bb => libdvdcss_1.4.2.bb}         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-multimedia/recipes-multimedia/vlc/{libdvdcss_1.3.0.bb => libdvdcss_1.4.2.bb} (50%)

diff --git a/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb b/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb
similarity index 50%
rename from meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb
rename to meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb
index 79e64aebd..fe06699ab 100644
--- a/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb
@@ -1,6 +1,7 @@
+SUMMARY = "libdvdcss is a simple library for accessing DVDs like block devices"
 DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption."
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2"
 
@@ -8,5 +9,5 @@ inherit autotools
 
 EXTRA_OECONF = " --disable-doc "
 
-SRC_URI[md5sum] = "7f0fdb3ff91d638f5e45ed7536f7eb67"
-SRC_URI[sha256sum] = "7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395"
+SRC_URI[md5sum] = "7b74f2e142b13c9de6dc8d807ab912d4"
+SRC_URI[sha256sum] = "78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575"
-- 
2.26.2

[PATCH 03/10] vlc: upgrade 3.0.10 -> 3.0.11

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-multimedia/vlc/{vlc_3.0.10.bb => vlc_3.0.11.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.10.bb => vlc_3.0.11.bb} (98%)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb
similarity index 98%
rename from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb
rename to meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb
index 6020c2035..dd9486e8a 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb
@@ -25,7 +25,7 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
            file://0004-Use-packageconfig-to-detect-mmal-support.patch \
            file://0005-Fix-build-with-Qt-5.15.patch \
 "
-SRC_URI[sha256sum] = "a966abfc7f3b2ff3adaa130306ecaf5d6ad3b6dc73385fc9ab0c1204029d4c31"
+SRC_URI[sha256sum] = "3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919"
 
 inherit autotools features_check gettext pkgconfig mime-xdg
 
-- 
2.26.2

[PATCH 04/10] netdata: upgrade 1.17.0 -> 1.22.1

[Andreas Müller]

* 0001-Correct-timeout-issue.patch: timeout is build by coreutils
* 0002-Makefiles-does-not-build-contrib-dir.patch: Upstream added identical

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../netdata/0001-Correct-timeout-issue.patch  | 42 -------------------
 ...Makefiles-does-not-build-contrib-dir.patch | 24 -----------
 .../recipes-webadmin/netdata/netdata_git.bb   | 15 ++-----
 3 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch
 delete mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch

diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch
deleted file mode 100644
index c4be8270c..000000000
--- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ccaf4225239c3092a51cf44f2ab0a2141b8a5fa6 Mon Sep 17 00:00:00 2001
-From: Luca Palano <github@lpzone.it>
-Date: Wed, 5 Dec 2018 10:36:52 +0100
-Subject: [PATCH 1/2] Correct of timeout issue
-
-The timeout issue has been disabled
-
-Signed-off-by: Luca Palano <github@lpzone.it>
----
- collectors/charts.d.plugin/charts.d.plugin.in | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
-index 0df6c30c..63ea4506 100755
---- a/collectors/charts.d.plugin/charts.d.plugin.in
-+++ b/collectors/charts.d.plugin/charts.d.plugin.in
-@@ -156,7 +156,7 @@ restart_timeout=$((3600 * 4))
- dryrunner=0
- 
- # check for timeout command
--check_for_timeout=1
-+check_for_timeout=0
- 
- # the default enable/disable value for all charts
- enable_all_charts="yes"
-@@ -251,9 +251,10 @@ time_divisor=$((time_divisor))
- # timeout command we use, providing a function that
- # can emulate the timeout command we need:
- # > timeout SECONDS command ...
--if [ $check_for_timeout -eq 1 ]; then
--	require_cmd timeout || exit 1
--fi
-+#if [ $check_for_timeout -eq 1 ]
-+#    then
-+#    require_cmd timeout || exit 1
-+#fi
- 
- # -----------------------------------------------------------------------------
- # internal checks
--- 
-2.20.1 (Apple Git-117)
-
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch
deleted file mode 100644
index f0887fed0..000000000
--- a/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 95e1da77de80e38068bb2739faeaad49105700cf Mon Sep 17 00:00:00 2001
-From: Luca Palano <github@lpzone.it>
-Date: Mon, 15 Jul 2019 10:16:32 +0200
-Subject: [PATCH 2/2] Makefiles does not build contrib
-
-Signed-off-by: Luca Palano <github@lpzone.it>
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index bc928bba..ba9edc6b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -54,7 +54,6 @@ dist_noinst_DATA= \
- 	CHANGELOG.md \
- 	cppcheck.sh \
- 	configs.signatures \
--	contrib \
- 	netdata.cppcheck \
- 	netdata.spec \
- 	package.json \
---
-2.20.1 (Apple Git-117)
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
index d6a5ce066..ee4a7c1e3 100644
--- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
+++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
@@ -3,15 +3,9 @@ SUMMARY = "Real-time performance monitoring"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
 
-SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \
-           file://0002-Makefiles-does-not-build-contrib-dir.patch \
-"
-SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf"
-PV = "1.17.0"
-
-# patch to disable timeout because timeout are not available with actual version
-# of core-utils
-SRC_URI += "file://0001-Correct-timeout-issue.patch"
+SRC_URI = "git://github.com/firehol/netdata.git;protocol=https"
+SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766"
+PV = "1.22.1"
 
 # default netdata.conf for netdata configuration
 SRC_URI += "file://netdata.conf"
@@ -21,7 +15,7 @@ SRC_URI += "file://netdata.service"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += "zlib util-linux"
+DEPENDS += "zlib util-linux libuv"
 
 inherit pkgconfig autotools-brokensep useradd systemd
 
@@ -58,5 +52,4 @@ do_install_append() {
     sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf
 }
 
-FILES_${PN}-dbg += "${libexecdir}/netdata/plugins.d/.debug"
 RDEPENDS_${PN} = "bash zlib"
-- 
2.26.2

[PATCH 05/10] libsass: upgrade 3.6.3 -> 3.6.4 / rename recipe

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-support/sass/{libsass_3.6.3.bb => libsass_git.bb}  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/sass/{libsass_3.6.3.bb => libsass_git.bb} (82%)

diff --git a/meta-oe/recipes-support/sass/libsass_3.6.3.bb b/meta-oe/recipes-support/sass/libsass_git.bb
similarity index 82%
rename from meta-oe/recipes-support/sass/libsass_3.6.3.bb
rename to meta-oe/recipes-support/sass/libsass_git.bb
index d893be223..9cba3a890 100644
--- a/meta-oe/recipes-support/sass/libsass_3.6.3.bb
+++ b/meta-oe/recipes-support/sass/libsass_git.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d"
 inherit autotools
 
 SRC_URI = "git://github.com/sass/libsass.git;branch=master"
-SRCREV = "e1c16e09b4a953757a15149deaaf28a3fd81dc97"
+SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396"
+PV = "3.6.4"
 
 S = "${WORKDIR}/git"
 
-- 
2.26.2

[PATCH 06/10] gnome-desktop3: upgrade 3.36.2 -> 3.36.3.1

[Andreas Müller]

===============
Version 3.36.3
===============

- thumbnails: keep the orignal file name
- Fix encoding issue when translating locale modifiers
- Update wallclock reftest expectations
- Update Hebrew wallclock expectation
- Translation updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...e-desktop3_3.36.2.bb => gnome-desktop3_3.36.3.1.bb} | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.36.2.bb => gnome-desktop3_3.36.3.1.bb} (77%)

diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb
similarity index 77%
rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb
rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb
index 1f5acd8d0..b7ef7545a 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb
@@ -1,8 +1,10 @@
 SUMMARY = "GNOME library for reading .desktop files"
 SECTION = "x11/gnome"
 LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+"
 
 BPN = "gnome-desktop"
 
@@ -14,8 +16,8 @@ inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspecti
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
 
-SRC_URI[archive.md5sum] = "9fa17a6e2eacde3f9dd0df6be10091b2"
-SRC_URI[archive.sha256sum] = "38f994dcb1e1ae093d1c929c7acc4f88e39111e43b5fdc13125b0f6e2311c789"
+SRC_URI[archive.md5sum] = "75e828342e51c88c866dcdd46c021d26"
+SRC_URI[archive.sha256sum] = "4bed119fa25ea0ff7880928142365c3c8726585fc072bc147157e66b63e96b7e"
 
 SRC_URI += " \
     file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
-- 
2.26.2

[PATCH 07/10] evince: upgrade 3.36.3 -> 3.36.5

[Andreas Müller]

================
Evince    3.36.5
================

Translations:

  * Matej Urbančič (Slovenian)

================
Evince    3.36.4
================

* pdf: Rever "support 'de facto' tooltip feature" (#1414)
  Reopens issues #1409 and #1410.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../evince/{evince_3.36.3.bb => evince_3.36.5.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/evince/{evince_3.36.3.bb => evince_3.36.5.bb} (90%)

diff --git a/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb b/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb
similarity index 90%
rename from meta-gnome/recipes-gnome/evince/evince_3.36.3.bb
rename to meta-gnome/recipes-gnome/evince/evince_3.36.5.bb
index 29e01cc23..a82e44b02 100644
--- a/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb
@@ -20,8 +20,8 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc
 
-SRC_URI[archive.md5sum] = "9762dabdde37a804072bccbfd311d357"
-SRC_URI[archive.sha256sum] = "af2ebdf7f74e6580c4f1a12bdfe26b9ff90374d7acae061de0666d64012a9db2"
+SRC_URI[archive.md5sum] = "5d68c81a3d4c5d27754b97405451f04e"
+SRC_URI[archive.sha256sum] = "6f0dd6e30639eb620f201a6ae40f21c4b78c030f0d6437f9e309f7240195e97c"
 SRC_URI += " \
     file://0001-Add-format-attribute-to-_synctex_malloc.patch \
     file://0002-add-a-formatting-attribute-check.patch \
-- 
2.26.2

[PATCH 08/10] gnome-control-center: upgrade 3.36.2 -> 3.36.3

[Andreas Müller]

================
Version 3.36.3
================

- Updated translations

Users:
- Show add user button also if no users found
- Show permissions toolbar also if no users found

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ontrol-center_3.36.2.bb => gnome-control-center_3.36.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_3.36.2.bb => gnome-control-center_3.36.3.bb} (89%)

diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb
similarity index 89%
rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb
rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb
index d3673a1fd..81f42438e 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb
@@ -30,8 +30,8 @@ DEPENDS = " \
 
 REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11"
 
-SRC_URI[archive.md5sum] = "45832b7217c8d5fa5e2dbc214972c12d"
-SRC_URI[archive.sha256sum] = "e0a5eff0c6d6c22db0c54fd070460de874d367ef3f9072e1559b70f28b847817"
+SRC_URI[archive.md5sum] = "fd99a8df0cc656e971415f2a1b310019"
+SRC_URI[archive.sha256sum] = "bc174d970dbeca3ee19c26019de31e9edf78dc9c4abde16e763566ee38c3691c"
 SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
 
 PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
-- 
2.26.2

[PATCH 09/10] redis: upgrade 5.0.9 -> 6.0.4

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../hiredis-use-default-CC-if-it-is-set.patch | 21 ++++++++++++-------
 .../redis/{redis_5.0.9.bb => redis_6.0.4.bb}  |  4 ++--
 2 files changed, 15 insertions(+), 10 deletions(-)
 rename meta-oe/recipes-extended/redis/{redis_5.0.9.bb => redis_6.0.4.bb} (93%)

diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
index 421f306de..878cd3697 100644
--- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
@@ -11,20 +11,25 @@ Signed-off-by: Venture Research <tech@ventureresearch.com>
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 
+Reworked for 6.0.4
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- deps/hiredis/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ deps/hiredis/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index 9a4de836..271c06ba 100644
+index 25ac154..569f82b 100644
 --- a/deps/hiredis/Makefile
 +++ b/deps/hiredis/Makefile
-@@ -36,7 +36,7 @@ endef
+@@ -42,8 +42,6 @@ endef
  export REDIS_TEST_CONFIG
  
  # Fallback to gcc when $CC is not in $PATH.
--CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
  OPTIMIZATION?=-O3
- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ DEBUG_FLAGS?= -g -ggdb
+-- 
+2.21.3
+
diff --git a/meta-oe/recipes-extended/redis/redis_5.0.9.bb b/meta-oe/recipes-extended/redis/redis_6.0.4.bb
similarity index 93%
rename from meta-oe/recipes-extended/redis/redis_5.0.9.bb
rename to meta-oe/recipes-extended/redis/redis_6.0.4.bb
index d04293369..ffa28ccfe 100644
--- a/meta-oe/recipes-extended/redis/redis_5.0.9.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.0.4.bb
@@ -17,8 +17,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://GNU_SOURCE.patch \
            "
 
-SRC_URI[md5sum] = "c94523c9f4ee662027ddf90575d0e058"
-SRC_URI[sha256sum] = "53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85"
+SRC_URI[md5sum] = "37200b25c282f94da4521bc510d79ced"
+SRC_URI[sha256sum] = "3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
-- 
2.26.2

[PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename recipe

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../libgit2/{libgit2_1.0.0.bb => libgit2_git.bb}               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libgit2/{libgit2_1.0.0.bb => libgit2_git.bb} (89%)

diff --git a/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb b/meta-oe/recipes-support/libgit2/libgit2_git.bb
similarity index 89%
rename from meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
rename to meta-oe/recipes-support/libgit2/libgit2_git.bb
index 74343683f..5f6a38a89 100644
--- a/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
+++ b/meta-oe/recipes-support/libgit2/libgit2_git.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
 DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
 
 SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0"
-SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0"
+SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96"
+PV = "1.0.1"
 
 S = "${WORKDIR}/git"
 
-- 
2.26.2

Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename recipe

[Khem Raj]

On 6/19/20 4:32 AM, Andreas Müller wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../libgit2/{libgit2_1.0.0.bb => libgit2_git.bb}               | 3 ++-

I think we have been preferring to use PV via recipe names if possible.
which this recipe is already doing, is there any benefit of renaming it
to _git ?

>  1 file changed, 2 insertions(+), 1 deletion(-)
>  rename meta-oe/recipes-support/libgit2/{libgit2_1.0.0.bb => libgit2_git.bb} (89%)
> 
> diff --git a/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb b/meta-oe/recipes-support/libgit2/libgit2_git.bb
> similarity index 89%
> rename from meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
> rename to meta-oe/recipes-support/libgit2/libgit2_git.bb
> index 74343683f..5f6a38a89 100644
> --- a/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
> +++ b/meta-oe/recipes-support/libgit2/libgit2_git.bb
> @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
>  DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
>  
>  SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0"
> -SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0"
> +SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96"
> +PV = "1.0.1"
>  
>  S = "${WORKDIR}/git"
>  
> 
> 
> 
> 

Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename recipe

[Andreas Müller]

On Fri, Jun 19, 2020 at 5:48 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On 6/19/20 4:32 AM, Andreas Müller wrote:
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> >  .../libgit2/{libgit2_1.0.0.bb => libgit2_git.bb}               | 3 ++-
>
> I think we have been preferring to use PV via recipe names if possible.
> which this recipe is already doing, is there any benefit of renaming it
> to _git ?
Renaming:
* needs extra efforts to create diff while working on a recipe
* might cause issues on huge diffs

Shall I switch back to old scheme and send V2?

Andreas

Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename recipe

[Khem Raj]

On 6/19/20 8:55 AM, Andreas Müller wrote:
> On Fri, Jun 19, 2020 at 5:48 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>>
>>
>> On 6/19/20 4:32 AM, Andreas Müller wrote:
>>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>>> ---
>>>  .../libgit2/{libgit2_1.0.0.bb => libgit2_git.bb}               | 3 ++-
>>
>> I think we have been preferring to use PV via recipe names if possible.
>> which this recipe is already doing, is there any benefit of renaming it
>> to _git ?
> Renaming:
> * needs extra efforts to create diff while working on a recipe
> * might cause issues on huge diffs
> 
> Shall I switch back to old scheme and send V2?
> 

So one easy problem you run into with _git recipes is that SRCREV gets
updated but PV does not, the issues with renaming recipes is as you
described and also git history tracking is a bit painful too, I am not
hard opined either way.

Lets keep the _PV version if its a proper release SRCREV that we are
jumping to.

> Andreas
> 

Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename recipe

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-devel@lists.openembedded.org <openembedded-
> devel@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 19 juni 2020 18:05
> To: Andreas Müller <schnitzeltony@gmail.com>
> Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
> Subject: Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename
> recipe
> 
> On 6/19/20 8:55 AM, Andreas Müller wrote:
> > On Fri, Jun 19, 2020 at 5:48 PM Khem Raj <raj.khem@gmail.com> wrote:
> >>
> >>
> >>
> >> On 6/19/20 4:32 AM, Andreas Müller wrote:
> >>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> >>> ---
> >>>  .../libgit2/{libgit2_1.0.0.bb => libgit2_git.bb}               | 3
> ++-
> >>
> >> I think we have been preferring to use PV via recipe names if
> possible.
> >> which this recipe is already doing, is there any benefit of renaming
> it
> >> to _git ?
> > Renaming:
> > * needs extra efforts to create diff while working on a recipe
> > * might cause issues on huge diffs
> >
> > Shall I switch back to old scheme and send V2?
> >
> 
> So one easy problem you run into with _git recipes is that SRCREV gets
> updated but PV does not, the issues with renaming recipes is as you
> described and also git history tracking is a bit painful too, I am not
> hard opined either way.
> 
> Lets keep the _PV version if its a proper release SRCREV that we are
> jumping to.
> 
> > Andreas

One reason to keep the version in the filename is because you cannot do 
versioned bbappends otherwise. I.e., it is not possible to do a 
"libgit2_1.0.%.bbappend" if the recipe is called "libgit2_git.bb".

//Peter

Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename recipe

[Andreas Müller]

On Sat, Jun 20, 2020 at 1:08 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: openembedded-devel@lists.openembedded.org <openembedded-
> > devel@lists.openembedded.org> On Behalf Of Khem Raj
> > Sent: den 19 juni 2020 18:05
> > To: Andreas Müller <schnitzeltony@gmail.com>
> > Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
> > Subject: Re: [oe] [PATCH 10/10] libgit2: upgrade 1.0.0 -> 1.0.1 / rename
> > recipe
> >
> > On 6/19/20 8:55 AM, Andreas Müller wrote:
> > > On Fri, Jun 19, 2020 at 5:48 PM Khem Raj <raj.khem@gmail.com> wrote:
> > >>
> > >>
> > >>
> > >> On 6/19/20 4:32 AM, Andreas Müller wrote:
> > >>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > >>> ---
> > >>>  .../libgit2/{libgit2_1.0.0.bb => libgit2_git.bb}               | 3
> > ++-
> > >>
> > >> I think we have been preferring to use PV via recipe names if
> > possible.
> > >> which this recipe is already doing, is there any benefit of renaming
> > it
> > >> to _git ?
> > > Renaming:
> > > * needs extra efforts to create diff while working on a recipe
> > > * might cause issues on huge diffs
> > >
> > > Shall I switch back to old scheme and send V2?
> > >
> >
> > So one easy problem you run into with _git recipes is that SRCREV gets
> > updated but PV does not, the issues with renaming recipes is as you
> > described and also git history tracking is a bit painful too, I am not
> > hard opined either way.
> >
> > Lets keep the _PV version if its a proper release SRCREV that we are
> > jumping to.
> >
> > > Andreas
>
> One reason to keep the version in the filename is because you cannot do
> versioned bbappends otherwise. I.e., it is not possible to do a
> "libgit2_1.0.%.bbappend" if the recipe is called "libgit2_git.bb".
>
> //Peter
OK - will send V2 for the two recipe-rename recipes tonight

Andreas