mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 18:49:32 +02:00
rpm: update 4.18.1 -> 4.19.1
Upstream has replaced autoconf with cmake, which necessitates a rewrite of the recipe and available options, and a rebase to cmake of 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : the patch was removing the NULL marker at the end of function arguments, and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch was restoring it (in addition to the actual change the patch was making). Now both patches preserve the NULL terminator. (From OE-Core rev: 38549d462b399e3a63335f60a44c8bbced98639a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
482ed7cd80
commit
05d0b9eafb
@@ -1,4 +1,7 @@
|
||||
perl: disable auto requires
|
||||
From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 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
|
||||
@@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
Index: git/fileattrs/perl.attr
|
||||
===================================================================
|
||||
--- git.orig/fileattrs/perl.attr
|
||||
+++ git/fileattrs/perl.attr
|
||||
---
|
||||
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
|
||||
Index: git/fileattrs/perllib.attr
|
||||
===================================================================
|
||||
--- git.orig/fileattrs/perllib.attr
|
||||
+++ git/fileattrs/perllib.attr
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user