mirror of
https://git.yoctoproject.org/poky
synced 2026-04-28 15:32:27 +02: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>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
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
|