From 7596d6a497e3ab4ac88fbb0c64526d3a1b5aac61 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 6 Jun 2024 17:06:26 +0800 Subject: mcelog: upgrade 198 -> 199 0001-server-Correct-prameter-type-for-connect-API.patch removed since it's included in 199 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...ver-Correct-prameter-type-for-connect-API.patch | 43 --------------------- meta-oe/recipes-support/mcelog/mcelog_198.bb | 45 ---------------------- meta-oe/recipes-support/mcelog/mcelog_199.bb | 43 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 88 deletions(-) delete mode 100644 meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch delete mode 100644 meta-oe/recipes-support/mcelog/mcelog_198.bb create mode 100644 meta-oe/recipes-support/mcelog/mcelog_199.bb diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch deleted file mode 100644 index 2f26f9ced5..0000000000 --- a/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0370e7a9fb0ca1b27d7b0897739e2a7cce8977ab Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 11 May 2024 22:42:07 -0700 -Subject: [PATCH] server: Correct prameter type for connect() API - -connect() function expects the second argument to be point to sockaddr -as per man sockaddr - -int connect (int, const struct sockaddr *, socklen_t); - -Fixes build failures with -Wincompatible-pointer-types when using GCC-14 -and musl - -Fixes -| server.c: In function 'server_ping': -| server.c:308:33: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] -| 308 | if (connect(fd, un, sizeof(struct sockaddr_un)) < 0) -| | ^~ -| | | -| | struct sockaddr_un * - -Upstream-Status: Submitted [ sent to contact@mcelog.org ] -Signed-off-by: Khem Raj ---- - server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server.c b/server.c -index 54c7d57..51b7d3a 100644 ---- a/server.c -+++ b/server.c -@@ -305,7 +305,7 @@ static int server_ping(struct sockaddr_un *un) - if (sigsetjmp(ping_timeout_ctx, 1) == 0) { - ret = -1; - alarm(initial_ping_timeout); -- if (connect(fd, un, sizeof(struct sockaddr_un)) < 0) -+ if (connect(fd, (const struct sockaddr *)un, sizeof(struct sockaddr_un)) < 0) - goto cleanup; - if (write(fd, PAIR("ping\n")) < 0) - goto cleanup; --- -2.45.0 - diff --git a/meta-oe/recipes-support/mcelog/mcelog_198.bb b/meta-oe/recipes-support/mcelog/mcelog_198.bb deleted file mode 100644 index 10b2293195..0000000000 --- a/meta-oe/recipes-support/mcelog/mcelog_198.bb +++ /dev/null @@ -1,45 +0,0 @@ -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 = "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-client-Include-string.h-form-mem-function-prototypes.patch \ - file://0001-server-Correct-prameter-type-for-connect-API.patch \ - file://run-ptest \ -" - -SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" - -inherit ptest - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} - install -d ${D}${sysconfdir}/cron.hourly - install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ - sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} - sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test -} - -RDEPENDS:${PN}-ptest += "make bash mce-inject" diff --git a/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-oe/recipes-support/mcelog/mcelog_199.bb new file mode 100644 index 0000000000..0a48fc48ce --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog_199.bb @@ -0,0 +1,43 @@ +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 = "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-client-Include-string.h-form-mem-function-prototypes.patch \ + file://run-ptest \ + " + +SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" + +inherit ptest + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} + install -d ${D}${sysconfdir}/cron.hourly + install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ + sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} + sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test +} + +RDEPENDS:${PN}-ptest += "make bash mce-inject" -- cgit v1.2.3-54-g00ecf