mirror of
https://git.yoctoproject.org/poky
synced 2026-02-14 20:53:03 +01:00
ea9c2cfb69
With this release, as expected, deprecated openpgp support has been fully removed and replaced with sequoia: https://github.com/rpm-software-management/rpm-sequoia/ Alas, it's written in rust, and has no recipe, so for now signing rpm packages has to be disabled. Remove package name parameter to %prep in source archiving, as it's been dropped in the new rpm, and wasn't needed to begin with. Drop 0001-perl-disable-auto-reqs.patch (files removed upstream). (From OE-Core rev: 8c15b4577d5e554cc2dd5adfb88b816894b05a9a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
2.1 KiB
Diff
56 lines
2.1 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>
|
|
---
|
|
lib/rpmscript.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
|
|
index 4dc6466a8..6d3c19d01 100644
|
|
--- a/lib/rpmscript.c
|
|
+++ b/lib/rpmscript.c
|
|
@@ -290,7 +290,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);
|
|
@@ -322,7 +322,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);
|
|
@@ -374,7 +374,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);
|
|
@@ -417,7 +417,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) {
|