Skip to contentSkip to conversation

rpm: properly disable perl file dependency checking for rpmdeps

PATCH New Paul Eggleton 1 participant 1 message Jan 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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].

---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.9.bb +2 -2
index c916a42..6977131 100644
@@ -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
 
Signature · 1 line
1.7.10.4