Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
Siggi (OpenClaw Agent)
@@ -0,0 +1,47 @@
|
||||
From f4cf90b5a298d6a3199e8b4c07f520aaf593ce2b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 9 Mar 2017 18:54:02 +0200
|
||||
Subject: [PATCH] Add a color setting for mips64_n32 binaries
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
build/rpmfc.c | 4 ++++
|
||||
rpmrc.in | 2 ++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/build/rpmfc.c b/build/rpmfc.c
|
||||
index 4b67a9bae..ed7e4e623 100644
|
||||
--- a/build/rpmfc.c
|
||||
+++ b/build/rpmfc.c
|
||||
@@ -660,6 +660,7 @@ exit:
|
||||
static const struct rpmfcTokens_s rpmfcTokens[] = {
|
||||
{ "directory", RPMFC_INCLUDE },
|
||||
|
||||
+ { "N32 MIPS64", RPMFC_ELFMIPSN32|RPMFC_INCLUDE },
|
||||
{ "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
|
||||
{ "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE },
|
||||
|
||||
@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn)
|
||||
color = RPMFC_ELF32;
|
||||
break;
|
||||
}
|
||||
+ if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE)
|
||||
+ if (ehdr.e_flags & EF_MIPS_ABI2)
|
||||
+ color = RPMFC_ELFMIPSN32;
|
||||
}
|
||||
if (elf)
|
||||
elf_end(elf);
|
||||
diff --git a/rpmrc.in b/rpmrc.in
|
||||
index 8646a966b..7349fdfd3 100644
|
||||
--- a/rpmrc.in
|
||||
+++ b/rpmrc.in
|
||||
@@ -142,6 +142,8 @@ archcolor: mipsr6el 1
|
||||
archcolor: mips64r6 2
|
||||
archcolor: mips64r6el 2
|
||||
|
||||
+archcolor: mips64_n32 4
|
||||
+
|
||||
archcolor: m68k 1
|
||||
|
||||
archcolor: m68kmint 1
|
||||
@@ -0,0 +1,27 @@
|
||||
From c39a074ff3c4d21c100d387661c7d725b5eae7b0 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Wed, 29 Nov 2023 14:06:15 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than
|
||||
cmake modules
|
||||
|
||||
Otherwise cmake will try to find libm, badly, and fail.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4a383ceba..ed847c09a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -190,7 +190,7 @@ set(REQFUNCS
|
||||
)
|
||||
|
||||
find_package(PkgConfig REQUIRED)
|
||||
-find_package(Lua 5.2 REQUIRED)
|
||||
+pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(BZip2)
|
||||
find_package(Iconv)
|
||||
@@ -0,0 +1,53 @@
|
||||
From fea9cea49aa0844de14126e54d05b91ba619427f Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Fri, 26 Jul 2024 17:18:30 +0800
|
||||
Subject: [PATCH] CMakeLists.txt: set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} in
|
||||
macros
|
||||
|
||||
There is a patch in oe-core[1] to avoid hardcoded paths in macros. It
|
||||
tries to use libdir to expand %_libdir in macros.in. However, in
|
||||
upstream commit[2], libdir for macros in CMakeLists.txt is set to
|
||||
${prefix}/=LIB=, which causes %_libdir to expand to ${prefix}/=LIB=
|
||||
instead of the correct path in the final macros.
|
||||
|
||||
On target:
|
||||
$ rpm --showrc | grep _libdir
|
||||
[snip]
|
||||
-13: _libdir ${prefix}/=LIB=
|
||||
[snip]
|
||||
|
||||
This also causes %__pkgconfig_path in fileattrs/pkgconfig.attr to become
|
||||
an invalid regular expression when building rpm packages. This results a
|
||||
warning in log.do_package_write_rpm in all packages:
|
||||
|
||||
Warning: Ignoring invalid regular expression ^((${prefix}/=LIB=|usr/share)/pkgconfig/.*.pc|usr/bin/pkg-config)$
|
||||
|
||||
Set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} instead of ${prefix}/=LIB= to
|
||||
make sure it is expanded to the correct path in macros.
|
||||
|
||||
[1] https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
|
||||
[2] https://github.com/rpm-software-management/rpm/commit/d2abb7a48760418aacd7f17c8b64e39c25ca50c9
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ed847c09a1..385b5040c6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -84,7 +84,7 @@ function(makemacros)
|
||||
set(sysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
|
||||
set(sharedstatedir "${CMAKE_INSTALL_FULL_SHAREDSTATEDIR}")
|
||||
set(localstatedir "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
|
||||
- set(libdir "\${prefix}/=LIB=")
|
||||
+ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
set(oldincludedir "${CMAKE_INSTALL_FULL_OLDINCLUDEDIR}")
|
||||
set(infodir "\${prefix}/${CMAKE_INSTALL_INFODIR}")
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 86e585cc0dd06dfa20f584af8b59d52a59accb45 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 9 Jan 2017 18:52:11 +0200
|
||||
Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in
|
||||
a short-circuited way.
|
||||
|
||||
Upstream permits short-circuiting only for local testing; Yocto on the other
|
||||
hand produces rpms that way by design.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
build/pack.c | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/build/pack.c b/build/pack.c
|
||||
index f7dac6d9a..f382c7da0 100644
|
||||
--- a/build/pack.c
|
||||
+++ b/build/pack.c
|
||||
@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
|
||||
headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
|
||||
}
|
||||
|
||||
- if (cheating) {
|
||||
- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
|
||||
- }
|
||||
-
|
||||
if ((rc = getPkgFilename(pkg->header, filename)))
|
||||
return rc;
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 73d6841d9ef2a8ac7bd63f9645a3efe8038dfdd4 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 27 Feb 2017 09:43:30 +0200
|
||||
Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
|
||||
default configuration and macros.
|
||||
|
||||
Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
macros.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7808115c1..4a383ceba 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -33,7 +33,7 @@ option(WITH_IMAEVM "Build with IMA support" OFF)
|
||||
option(WITH_FAPOLICYD "Build with fapolicyd support" ON)
|
||||
option(WITH_READLINE "Build with readline support" ON)
|
||||
|
||||
-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
|
||||
+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home")
|
||||
set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
|
||||
|
||||
# Emulate libtool versioning. Before a public release:
|
||||
diff --git a/macros.in b/macros.in
|
||||
index b49ffaad4..3acbe78f6 100644
|
||||
--- a/macros.in
|
||||
+++ b/macros.in
|
||||
@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
|
||||
%_sharedstatedir %{_prefix}/com
|
||||
%_localstatedir %{_prefix}/var
|
||||
%_lib lib
|
||||
-%_libdir %{_exec_prefix}/%{_lib}
|
||||
+%_libdir @libdir@
|
||||
%_includedir %{_prefix}/include
|
||||
%_infodir %{_datadir}/info
|
||||
%_mandir %{_datadir}/man
|
||||
@@ -0,0 +1,35 @@
|
||||
From e210458d125793915abce30420d866a30305c37a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 10 Jan 2017 14:11:30 +0200
|
||||
Subject: [PATCH] Do not read config files from $HOME
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
lib/rpmrc.c | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
|
||||
index 9437a0ff1..483585ae4 100644
|
||||
--- a/lib/rpmrc.c
|
||||
+++ b/lib/rpmrc.c
|
||||
@@ -459,8 +459,7 @@ static void setDefaults(void)
|
||||
if (!defrcfiles) {
|
||||
defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
|
||||
confdir, "/" RPM_VENDOR "/rpmrc", ":",
|
||||
- SYSCONFDIR "/rpmrc", ":",
|
||||
- "~/.rpmrc", NULL);
|
||||
+ SYSCONFDIR "/rpmrc", NULL);
|
||||
}
|
||||
|
||||
#ifndef MACROFILES
|
||||
@@ -472,8 +471,7 @@ static void setDefaults(void)
|
||||
confdir, "/" RPM_VENDOR "/macros", ":",
|
||||
SYSCONFDIR "/rpm/macros.*", ":",
|
||||
SYSCONFDIR "/rpm/macros", ":",
|
||||
- SYSCONFDIR "/rpm/%{_target}/macros", ":",
|
||||
- "~/.rpmmacros", NULL);
|
||||
+ SYSCONFDIR "/rpm/%{_target}/macros", NULL);
|
||||
}
|
||||
#else
|
||||
macrofiles = MACROFILES;
|
||||
@@ -0,0 +1,27 @@
|
||||
From a8fe7a7a2e41c9f127ed26407d57076babcb89e8 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 20 Jan 2017 13:32:06 +0200
|
||||
Subject: [PATCH] Do not reset the PATH environment variable before running
|
||||
scriptlets.
|
||||
|
||||
We add lots of native stuff into it and scriptlets rely on that.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
lib/rpmscript.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
|
||||
index 57689bb68..7b7e26606 100644
|
||||
--- a/lib/rpmscript.c
|
||||
+++ b/lib/rpmscript.c
|
||||
@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
|
||||
if (ipath && ipath[5] != '%')
|
||||
path = ipath;
|
||||
|
||||
- xx = setenv("PATH", path, 1);
|
||||
+ //xx = setenv("PATH", path, 1);
|
||||
free(ipath);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
From 34c0d3263f3e0b366a2320e0823f46673f7ba928 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 17 Jan 2017 14:07:17 +0200
|
||||
Subject: [PATCH] When cross-installing, execute package scriptlets without
|
||||
chrooting into destination rootfs
|
||||
|
||||
This is triggered only when RPM_NO_CHROOT_FOR_SCRIPTS environment variable is defined.
|
||||
Otherwise they will trigger an explosion of failures, obviously.
|
||||
|
||||
Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>:
|
||||
|
||||
Remove leaking temporary scriptlet files
|
||||
|
||||
Since we tell dnf to run rpm with debug output, this will result in rpm not
|
||||
cleaning up written temporary scriptlet files (same flag controls both
|
||||
behaviors). This wouldn't have been a problem since we normally would use the
|
||||
target sysroot also for temporary files, but we need to chroot out to be able
|
||||
to actually run the rpm scriptlets (purpose of this patch), so the temporary
|
||||
files are written to the host's /var/tmp/ directory, causing a gradual
|
||||
resource leakage on the host system for every RPM based do_rootfs task
|
||||
executed.
|
||||
|
||||
Signed-off-by: Olof Johansson <olofjn@axis.com>
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
lib/rpmscript.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
|
||||
index 3f6313278..57689bb68 100644
|
||||
--- a/lib/rpmscript.c
|
||||
+++ b/lib/rpmscript.c
|
||||
@@ -448,8 +448,7 @@ exit:
|
||||
Fclose(out); /* XXX dup'd STDOUT_FILENO */
|
||||
|
||||
if (fn) {
|
||||
- if (!rpmIsDebug())
|
||||
- unlink(fn);
|
||||
+ unlink(fn);
|
||||
free(fn);
|
||||
}
|
||||
free(mline);
|
||||
@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
|
||||
|
||||
if (rc != RPMRC_FAIL) {
|
||||
if (script_type & RPMSCRIPTLET_EXEC) {
|
||||
- rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
|
||||
+ if (getenv("RPM_NO_CHROOT_FOR_SCRIPTS") != NULL) {
|
||||
+ rpmChrootOut();
|
||||
+ rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
|
||||
+ rpmChrootIn();
|
||||
+ } else {
|
||||
+ rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
|
||||
+ }
|
||||
} else {
|
||||
rc = runLuaScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
From ae4fdd8e8d052835973e6ff4b7550f93bde30a98 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Tue, 31 Aug 2021 10:37:05 +0200
|
||||
Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata
|
||||
|
||||
The flags look like '19T56' where 19 is the compression level
|
||||
(deterministic), and 56 is the amount of threads (varies from one
|
||||
host to the next and breaks reproducibility for .rpm).
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
build/pack.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/pack.c b/build/pack.c
|
||||
index f382c7da0..0889dd993 100644
|
||||
--- a/build/pack.c
|
||||
+++ b/build/pack.c
|
||||
@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg)
|
||||
headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr);
|
||||
buf = xstrdup(rpmio_flags);
|
||||
buf[s - rpmio_flags] = '\0';
|
||||
- headerPutString(pkg->header, RPMTAG_PAYLOADFLAGS, buf+1);
|
||||
+ headerPutString(pkg->header, RPMTAG_PAYLOADFLAGS, "");
|
||||
free(buf);
|
||||
}
|
||||
exit:
|
||||
@@ -0,0 +1,57 @@
|
||||
From b04ecb793a3c859985eead5e261785b27a4c4a20 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Thu, 7 May 2020 17:40:58 +0800
|
||||
Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32
|
||||
|
||||
This patch is from:
|
||||
https://github.com/rpm-software-management/rpm/issues/193
|
||||
|
||||
Error: Transaction check error:
|
||||
file /sbin/ldconfig conflicts between attempted installs of
|
||||
ldconfig-2.31+git0+71f2b249a2-r0.mips64_n32 and
|
||||
lib32-ldconfig-2.31+git0+71f2b249a2-r0.mips32r2
|
||||
...
|
||||
|
||||
This was because:
|
||||
transactions_color = 001 (ELF32) & 010 (ELF64) & 100 (ELF32 N32 MIPS64)
|
||||
FColor = Current file color (001) & transaction_color (111)
|
||||
oFcolor = Previous file color (100) & transaction_color (111)
|
||||
|
||||
In handleColorConflict, it only deal with conditons "new preferred" or
|
||||
"old preferred". But not deal with the situation where neither is the
|
||||
preferred type. so for tri-lib system, like mips64/mips64 n32/mips(32),
|
||||
"Transaction check error" occurred.
|
||||
|
||||
Fixed by performing a 'last-in-wins' resolution when "neither is preferred".
|
||||
|
||||
Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193>
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
lib/transaction.c | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/transaction.c b/lib/transaction.c
|
||||
index 70d2587ac..b89b30060 100644
|
||||
--- a/lib/transaction.c
|
||||
+++ b/lib/transaction.c
|
||||
@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts,
|
||||
rpmfsSetAction(ofs, ofx, FA_CREATE);
|
||||
rpmfsSetAction(fs, fx, FA_SKIPCOLOR);
|
||||
rConflicts = 0;
|
||||
- }
|
||||
+ }else {
|
||||
+ /*
|
||||
+ * If neither is already skipped, we skip the old one, and
|
||||
+ * install the new one (last in wins).
|
||||
+ */
|
||||
+ if (ofs && !XFA_SKIPPING(rpmfsGetAction(ofs, ofx)) &&
|
||||
+ fs && !XFA_SKIPPING(rpmfsGetAction(fs, fx))) {
|
||||
+ rpmfsSetAction(ofs, ofx, FA_SKIPCOLOR);
|
||||
+ rpmfsSetAction(fs, fx, FA_CREATE);
|
||||
+ }
|
||||
+ rConflicts = 0;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 58bf006646a063837c46b695f7e7ebb69bee7238 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Hatle <mark.hatle@windriver.com>
|
||||
Date: Tue, 15 Aug 2017 16:41:57 -0500
|
||||
Subject: [PATCH] perl: disable auto requires
|
||||
|
||||
When generating automatic requirements, it's possible for perl scripts to
|
||||
declare 'optional' dependencies. These seem to often be incorrect and will
|
||||
cause installation failures in OE. Instead of fixing the perl scripts, it
|
||||
was decided it is better to simply disable the automatic dependency
|
||||
generation. This matches the behavior from the previous RPM5 implementation.
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific configuration]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
---
|
||||
fileattrs/perl.attr | 2 +-
|
||||
fileattrs/perllib.attr | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr
|
||||
index 0daef58d5..81ddf5305 100644
|
||||
--- a/fileattrs/perl.attr
|
||||
+++ b/fileattrs/perl.attr
|
||||
@@ -1,3 +1,3 @@
|
||||
-%__perl_requires %{_rpmconfigdir}/perl.req
|
||||
+#__perl_requires %{_rpmconfigdir}/perl.req
|
||||
%__perl_magic ^.*[Pp]erl .*$
|
||||
%__perl_flags exeonly
|
||||
diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr
|
||||
index fcad48099..495a28927 100644
|
||||
--- a/fileattrs/perllib.attr
|
||||
+++ b/fileattrs/perllib.attr
|
||||
@@ -1,5 +1,5 @@
|
||||
%__perllib_provides %{_rpmconfigdir}/perl.prov
|
||||
-%__perllib_requires %{_rpmconfigdir}/perl.req
|
||||
+#__perllib_requires %{_rpmconfigdir}/perl.req
|
||||
%__perllib_magic ^Perl[[:digit:]] module source.*
|
||||
%__perllib_path \\.pm$
|
||||
%__perllib_flags magic_and_path
|
||||
@@ -0,0 +1,69 @@
|
||||
From d7143dc4e75c8bcc5cc4c852a4b972942b7e4d07 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 20 Jan 2017 13:33:05 +0200
|
||||
Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR
|
||||
environment variable
|
||||
|
||||
This is needed so that rpm can pick up target-specific configuration
|
||||
from target rootfs instead of its own native sysroot.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
lib/rpmrc.c | 19 ++++++++++++++-----
|
||||
1 file changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
|
||||
index 483585ae4..ea858c290 100644
|
||||
--- a/lib/rpmrc.c
|
||||
+++ b/lib/rpmrc.c
|
||||
@@ -456,10 +456,14 @@ const char * lookupInDefaultTable(const char * name,
|
||||
static void setDefaults(void)
|
||||
{
|
||||
const char *confdir = rpmConfigDir();
|
||||
+ const char *etcconfdir = getenv("RPM_ETCCONFIGDIR");
|
||||
+ if (etcconfdir == NULL)
|
||||
+ etcconfdir = "";
|
||||
+
|
||||
if (!defrcfiles) {
|
||||
defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
|
||||
confdir, "/" RPM_VENDOR "/rpmrc", ":",
|
||||
- SYSCONFDIR "/rpmrc", NULL);
|
||||
+ etcconfdir, SYSCONFDIR "/rpmrc", NULL);
|
||||
}
|
||||
|
||||
#ifndef MACROFILES
|
||||
@@ -469,9 +473,9 @@ static void setDefaults(void)
|
||||
confdir, "/platform/%{_target}/macros", ":",
|
||||
confdir, "/fileattrs/*.attr", ":",
|
||||
confdir, "/" RPM_VENDOR "/macros", ":",
|
||||
- SYSCONFDIR "/rpm/macros.*", ":",
|
||||
- SYSCONFDIR "/rpm/macros", ":",
|
||||
- SYSCONFDIR "/rpm/%{_target}/macros", NULL);
|
||||
+ etcconfdir, SYSCONFDIR "/rpm/macros.*", ":",
|
||||
+ etcconfdir, SYSCONFDIR "/rpm/macros", ":",
|
||||
+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL);
|
||||
}
|
||||
#else
|
||||
macrofiles = MACROFILES;
|
||||
@@ -1115,7 +1119,11 @@ static void read_auxv(void)
|
||||
*/
|
||||
static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
|
||||
{
|
||||
- const char * const platform_path = SYSCONFDIR "/rpm/platform";
|
||||
+ const char *etcconfdir = getenv("RPM_ETCCONFIGDIR");
|
||||
+ if (etcconfdir == NULL)
|
||||
+ etcconfdir = "";
|
||||
+
|
||||
+ const char * const platform_path = rstrscat(NULL, etcconfdir, SYSCONFDIR "/rpm/platform", NULL);
|
||||
static struct utsname un;
|
||||
char * chptr;
|
||||
canonEntry canon;
|
||||
@@ -1435,6 +1443,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
|
||||
|
||||
if (arch) *arch = un.machine;
|
||||
if (os) *os = un.sysname;
|
||||
+ free(platform_path);
|
||||
}
|
||||
|
||||
static
|
||||
@@ -0,0 +1,34 @@
|
||||
From 29c2a0c18b0c773128bf62c611b4c53fe4471105 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Tue, 16 Jan 2024 09:59:26 +0100
|
||||
Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C
|
||||
library
|
||||
|
||||
This addresses musl failures; if there is code out there relying on
|
||||
those braces, it needs to be fixed when used on musl.
|
||||
|
||||
This is unlikely to be trivially fixable upstream.
|
||||
|
||||
Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
rpmio/rpmglob.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c
|
||||
index 243568766..43c27074a 100644
|
||||
--- a/rpmio/rpmglob.c
|
||||
+++ b/rpmio/rpmglob.c
|
||||
@@ -33,6 +33,12 @@
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
+/* Don't fail if the standard C library
|
||||
++ * doesn't provide brace expansion */
|
||||
+#ifndef GLOB_BRACE
|
||||
+#define GLOB_BRACE 0
|
||||
+#endif
|
||||
+
|
||||
/* Return 1 if pattern contains a magic char, see glob(7) for a list */
|
||||
static int ismagic(const char *pattern)
|
||||
{
|
||||
@@ -0,0 +1,55 @@
|
||||
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) {
|
||||
Reference in New Issue
Block a user