From e43a72af9055b76eb2ad7e2e42e6a5f3c8854efa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 25 Jan 2013 11:28:57 +0000 Subject: rpm: properly disable perl file dependency checking for rpmdeps We don't want the perl module dependencies being added to each package by rpmdeps because it causes too many problems when the modules aren't available at install time (since they get added in do_package which is too late for the build system to ensure they are available), and it appears that the perl dependency gathering isn't working reliably in any case judging by how they are detected on some build hosts and not others. This was being disabled previously but it seems like the macros moved to a different file at some point and nobody noticed; thus make sure we disable the macros in all RPM macro files. Should fix [YOCTO #3699]. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/rpm') diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index c916a42d5e..6977131a28 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -373,8 +373,8 @@ do_configure() { do_install_append() { sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros - sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros - sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros + sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/* + sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/* sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros sed -i -e 's,^#%_openall_before_chroot.*,%_openall_before_chroot\t1,' ${D}/${libdir}/rpm/macros -- cgit 1.2.3-korg