mirror of
https://git.yoctoproject.org/poky
synced 2026-04-02 17:02:21 +02:00
bcf6af00f4
* Rebased: 0001-When-cross-installing-execute-package-scriptlets-wit.patch 0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch * Removed the one which already merged: 0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch * Added a patch to fix rpm-native build error: gcc: error: unrecognized command-line option -fhardened 0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch * License-Update: Minor formatting changes as the commit messages said in 41143b27b6f7320f280aea6014e8f532eb0239d6 (From OE-Core rev: 5d25e1ba4d8850e2c281fc7f24493239bf2f9866) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 452b696ea3e1975ea30cf7a92678aa4b316e6300 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>
|
|
|
|
Rebased to 4.20.1
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
---
|
|
lib/rpmscript.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
|
|
index e9f288ae0..f0c628708 100644
|
|
--- a/lib/rpmscript.c
|
|
+++ b/lib/rpmscript.c
|
|
@@ -299,7 +299,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);
|
|
@@ -330,7 +330,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
|
|
char *mline = NULL;
|
|
rpmRC rc = RPMRC_FAIL;
|
|
|
|
- rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", script->descr);
|
|
+ rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", script->descr);
|
|
|
|
if (script->body) {
|
|
fn = writeScript(*argvp[0], script->body);
|
|
@@ -382,7 +382,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
|
|
script->descr, 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",
|
|
script->descr, *argvp[0], (unsigned)getpid());
|
|
|
|
fclose(in);
|
|
@@ -426,7 +426,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",
|
|
script->descr, (unsigned)pid, (unsigned)reaped, status);
|
|
|
|
if (reaped < 0) {
|