summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package_rpm.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 0a32b3e5dc..1ea7549621 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -293,6 +293,7 @@ python write_specfile () {
293 spec_files_bottom = [] 293 spec_files_bottom = []
294 294
295 perfiledeps = (d.getVar("MERGEPERFILEDEPS", True) or "0") == "0" 295 perfiledeps = (d.getVar("MERGEPERFILEDEPS", True) or "0") == "0"
296 extra_pkgdata = (d.getVar("RPM_EXTRA_PKGDATA", True) or "0") == "1"
296 297
297 for pkg in packages.split(): 298 for pkg in packages.split():
298 localdata = bb.data.createCopy(d) 299 localdata = bb.data.createCopy(d)
@@ -373,6 +374,8 @@ python write_specfile () {
373 else: 374 else:
374 bb.note("Creating RPM package for %s" % splitname) 375 bb.note("Creating RPM package for %s" % splitname)
375 spec_files_top.append('%files') 376 spec_files_top.append('%files')
377 if extra_pkgdata:
378 package_rpm_extra_pkgdata(splitname, spec_files_top, localdata)
376 spec_files_top.append('%defattr(-,-,-,-)') 379 spec_files_top.append('%defattr(-,-,-,-)')
377 if file_list: 380 if file_list:
378 bb.note("Creating RPM package for %s" % splitname) 381 bb.note("Creating RPM package for %s" % splitname)
@@ -479,6 +482,8 @@ python write_specfile () {
479 bb.note("Not creating empty RPM package for %s" % splitname) 482 bb.note("Not creating empty RPM package for %s" % splitname)
480 else: 483 else:
481 spec_files_bottom.append('%%files -n %s' % splitname) 484 spec_files_bottom.append('%%files -n %s' % splitname)
485 if extra_pkgdata:
486 package_rpm_extra_pkgdata(splitname, spec_files_bottom, localdata)
482 spec_files_bottom.append('%defattr(-,-,-,-)') 487 spec_files_bottom.append('%defattr(-,-,-,-)')
483 if file_list: 488 if file_list:
484 bb.note("Creating RPM package for %s" % splitname) 489 bb.note("Creating RPM package for %s" % splitname)