mirror of
https://git.yoctoproject.org/poky
synced 2026-03-10 17:29:40 +01:00
5d33880b9d
Summary of changes from RPM 4.19.1 Fixes Packaging: Don’t warn about missing user/group on skipped files [Regression] (#2814) Packaging: Make user/group lookup caching thread-safe [Regression] (#2843) Lua interface: Fix regression in Lua scriptlet runaway child detection [Regression] (#2818) Build: CMakeLists.txt: restore readline support as an explicit option [Regression] (#2852) Build: Fix unconditional uses of Linux-specific extensions [Regression] (#2812) Build: Add missing include for check_symbol_exists (#2831) Build: Don’t use _nl_msg_cat_cntr if it’s not available (#2856) Drop patches: files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch (upstream resolved the issue) files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch (backports) (From OE-Core rev: d05416b6d6ec197b42f20652ed53ada1eb697d67) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d233e33a5ca12f95878c3ee9e34d9d9c61e49f68) Signed-off-by: Steve Sakoman <steve@sakoman.com>
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From f01d9c24bb86bc47ad2453483518dbb25953cac7 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Thu, 10 Jan 2019 18:14:18 +0100
|
|
Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO
|
|
from DEBUG
|
|
|
|
That way we can debug scriptlet failures without writing lots of
|
|
irrelevant noise to rootfs logs.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
---
|
|
lib/rpmscript.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
|
|
index 7b7e26606..1dcd23be5 100644
|
|
--- a/lib/rpmscript.c
|
|
+++ b/lib/rpmscript.c
|
|
@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script)
|
|
if (Ferror(fd))
|
|
goto exit;
|
|
|
|
- if (rpmIsDebug() && (rstreq(cmd, "/bin/sh") || rstreq(cmd, "/bin/bash"))) {
|
|
+ if (rpmIsVerbose() && (rstreq(cmd, "/bin/sh") || rstreq(cmd, "/bin/bash"))) {
|
|
static const char set_x[] = "set -x\n";
|
|
/* Assume failures will be caught by the write below */
|
|
Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
|
|
@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
|
|
char *mline = NULL;
|
|
rpmRC rc = RPMRC_FAIL;
|
|
|
|
- rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", sname);
|
|
+ rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", sname);
|
|
|
|
if (script) {
|
|
fn = writeScript(*argvp[0], script);
|
|
@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
|
|
sname, strerror(errno));
|
|
goto exit;
|
|
} else if (pid == 0) {/* Child */
|
|
- rpmlog(RPMLOG_DEBUG, "%s: execv(%s) pid %d\n",
|
|
+ rpmlog(RPMLOG_INFO, "%s: execv(%s) pid %d\n",
|
|
sname, *argvp[0], (unsigned)getpid());
|
|
|
|
fclose(in);
|
|
@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
|
|
reaped = waitpid(pid, &status, 0);
|
|
} while (reaped == -1 && errno == EINTR);
|
|
|
|
- rpmlog(RPMLOG_DEBUG, "%s: waitpid(%d) rc %d status %x\n",
|
|
+ rpmlog(RPMLOG_INFO, "%s: waitpid(%d) rc %d status %x\n",
|
|
sname, (unsigned)pid, (unsigned)reaped, status);
|
|
|
|
if (reaped < 0) {
|