mcelog: update from 175 to 180
PATCH 1/2 mcelog: update from 175 to 180
The patch has been merged upstream so drop it:
f922739 test: avoid the pfa test hang
A LICENSE file was added, with the same terms, so update the file and checksum. Change the HOMEPAGE link to https.
Signed-off-by Randy MacLeod <[email protected]>
---
.../0001-test-avoid-the-pfa-test-hang.patch | 36 -------------------
.../mcelog/{mcelog_175.bb => mcelog_180.bb} | 7 ++--
2 files changed, 3 insertions(+), 40 deletions(-)
delete mode 100644 meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
rename meta-oe/recipes-support/mcelog/{mcelog_175.bb => mcelog_180.bb} (82%)meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 3765b3a4cabf76f55c1c126ac64780a8c117d1d9 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <[email protected]> -Date: Tue, 12 Jan 2021 10:30:13 +0800 -Subject: [PATCH] test: avoid the pfa test hang - -Per [1], the pfa test needs to install page-types and the pfa test -will hang forever if there is no page-types installed. - -Improve the test script to avoid the pfa test hang. - -[1] https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/tree/tests/pfa/PFA_test_howto?id=7b776a8c005b60572f49797e81287540f99fff1f - -Upstream-Status: Submitted [https://github.com/andikleen/mcelog/pull/87] - -Signed-off-by: Mingli Yu <[email protected]> ---- - tests/test | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/test b/tests/test -index 020ae2b..320f57f 100755 ---- a/tests/test -+++ b/tests/test -@@ -47,6 +47,9 @@ do - # Inject mce records and run mcelog in parallel. - # So that the mce records can be consumed by mcelog in time (avoid mce record overflow). - ./inject $conf & -+ if [ "$1" = "pfa" ] ; then -+ which page-types > /dev/null 2>&1 || continue -+ fi - $D ../../mcelog --foreground --daemon --debug-numerrors --config $conf --logfile $log >> result - - # let triggers finish --- -2.29.2 -
meta-oe/recipes-support/mcelog/mcelog_180.bb renamed from meta-oe/recipes-support/mcelog/mcelog_175.bb +3 -4
@@ -2,18 +2,17 @@ SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" +HOMEPAGE = "https://mcelog.org/" SECTION = "System Environment/Base" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ - file://0001-test-avoid-the-pfa-test-hang.patch \ file://run-ptest \ " -SRCREV = "7b776a8c005b60572f49797e81287540f99fff1f" +SRCREV = "4146c9296a0cbd26f1c5e411cb44877f350053bd" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 2/2 syslog-ng: update from 3.31.2 to 3.26.1
Drop two patches that are upstream now:
90459087f scl: fix wrong ownership during installation c1054d3f6 python: s/python/python3/ shebang (exclude tests)
Signed-off-by Randy MacLeod <[email protected]>
---
...-wrong-ownership-during-installation.patch | 30 -----------
...5-.py-s-python-python3-exclude-tests.patch | 53 -------------------
...yslog-ng_3.31.2.bb => syslog-ng_3.36.1.bb} | 5 +-
3 files changed, 1 insertion(+), 87 deletions(-)
delete mode 100644 meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch
delete mode 100644 meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
rename meta-oe/recipes-support/syslog-ng/{syslog-ng_3.31.2.bb => syslog-ng_3.36.1.bb} (95%)meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 7a8c458b7acf4732af74317f8a535077eb451b1e Mon Sep 17 00:00:00 2001 -From: Ming Liu <[email protected]> -Date: Thu, 17 Jul 2014 05:37:08 -0400 -Subject: [PATCH] scl: fix wrong ownership during installation - -The ownership of build user is preserved for some target files, fixed it by -adding --no-same-owner option to tar when extracting files. - -Signed-off-by: Ming Liu <[email protected]> - -Upstream-Status: Backport [9045908] - -Signed-off-by: Yi Fan Yu <[email protected]> ---- - scl/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scl/Makefile.am b/scl/Makefile.am -index 940a467..3c19e50 100644 ---- a/scl/Makefile.am -+++ b/scl/Makefile.am -@@ -51,7 +51,7 @@ scl-install-data-local: - fi; \ - done - $(mkinstalldirs) $(DESTDIR)/$(scldir) -- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) -+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) - chmod -R u+rwX $(DESTDIR)/$(scldir) - - scl-uninstall-local:
meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch deleted +0 -53
53 lines not on this page · raw message
meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb renamed from meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb +1 -4
@@ -22,12 +22,9 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta file://volatiles.03_syslog-ng \ file://syslog-ng-tmp.conf \ file://syslog-ng.service-the-syslog-ng-service.patch \ - file://0002-scl-fix-wrong-ownership-during-installation.patch \ - file://0005-.py-s-python-python3-exclude-tests.patch \ " -SRC_URI[md5sum] = "69ef4dc5628d5e603e9e4a1b937592f8" -SRC_URI[sha256sum] = "2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a" +SRC_URI[sha256sum] = "90a25c9767fe749db50f118ddfc92ec71399763d2ecd5ad4f11ff5eea049e60b" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
Signature · 1 line
2.31.1