[PATCH v7 1/7] package_rpm.bbclass: Drop external dependency generator to support rpm 6

liezhi.yang
2026-03-01T12:26:56Z

From: Robert Yang <liezhi.yang@windriver.com>

The rpm 6 doesn't support external dependency generator. Oe-core used it for
per file dependency which was saved into pn.requires and pn.provides, but that
hasn't been used any more since 2012 (rev:
be40f6d0bb80274366af00461112af65687a4de8), and there were no complains or
updates in the past 13 years, so just drop it to support rpm 6.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes-global/package_rpm.bbclass | 84 +------------------------
1 file changed, 3 insertions(+), 81 deletions(-)

diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass
index f383ed140e..bb3b8f830a 100644
--- a/meta/classes-global/package_rpm.bbclass
+++ b/meta/classes-global/package_rpm.bbclass
@@ -14,10 +14,6 @@ RPMBUILD_COMPMODE ?= "${@'w%dT%d.zstdio' % (int(d.getVar('ZSTD_COMPRESSION_LEVEL

PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"

-# Maintaining the perfile dependencies has significant overhead when writing the
-# packages. When set, this value merges them for efficiency.
-MERGEPERFILEDEPS = "1"
-
# Filter dependencies based on a provided function.
def filter_deps(var, f):
import collections
@@ -36,67 +32,6 @@ def filter_nativesdk_deps(srcname, var):
var = filter_deps(var, lambda dep: not dep.startswith('/') and dep != 'perl' and not dep.startswith('perl('))
return var

-# Construct per file dependencies file
-def write_rpm_perfiledata(srcname, d):
- import oe.package
- workdir = d.getVar('WORKDIR')
- packages = d.getVar('PACKAGES')
- pkgd = d.getVar('PKGD')
-
- def dump_filerdeps(varname, outfile, d):
- outfile.write("#!/usr/bin/env python3\n\n")
- outfile.write("# Dependency table\n")
- outfile.write('deps = {\n')
- for pkg in packages.split():
- dependsflist_key = 'FILE' + varname + 'FLIST' + ":" + pkg
- dependsflist = (d.getVar(dependsflist_key) or "")
- for dfile in dependsflist.split():
- key = "FILE" + varname + ":" + dfile + ":" + pkg
- deps = filter_nativesdk_deps(srcname, d.getVar(key) or "")
- depends_dict = bb.utils.explode_dep_versions(deps)
- file = oe.package.file_reverse_translate(dfile)
- outfile.write('"' + pkgd + file + '" : "')
- for dep in depends_dict:
- ver = depends_dict[dep]
- if dep and ver:
- ver = ver.replace("(", "")
- ver = ver.replace(")", "")
- outfile.write(dep + " " + ver + " ")
- else:
- outfile.write(dep + " ")
- outfile.write('",\n')
- outfile.write('}\n\n')
- outfile.write("import sys\n")
- outfile.write("while 1:\n")
- outfile.write("\tline = sys.stdin.readline().strip()\n")
- outfile.write("\tif not line:\n")
- outfile.write("\t\tsys.exit(0)\n")
- outfile.write("\tif line in deps:\n")
- outfile.write("\t\tprint(deps[line] + '\\n')\n")
-
- # OE-core dependencies a.k.a. RPM requires
- outdepends = workdir + "/" + srcname + ".requires"
-
- dependsfile = open(outdepends, 'w')
-
- dump_filerdeps('RDEPENDS', dependsfile, d)
-
- dependsfile.close()
- os.chmod(outdepends, 0o755)
-
- # OE-core / RPM Provides
- outprovides = workdir + "/" + srcname + ".provides"
-
- providesfile = open(outprovides, 'w')
-
- dump_filerdeps('RPROVIDES', providesfile, d)
-
- providesfile.close()
- os.chmod(outprovides, 0o755)
-
- return (outdepends, outprovides)
-
-
python write_specfile () {
import oe.packagedata
import os,pwd,grp,stat
@@ -339,7 +274,6 @@ python write_specfile () {
spec_files_top = []
spec_files_bottom = []

- perfiledeps = (d.getVar("MERGEPERFILEDEPS") or "0") == "0"
extra_pkgdata = (d.getVar("RPM_EXTRA_PKGDATA") or "0") == "1"

for pkg in packages.split():
@@ -393,10 +327,9 @@ python write_specfile () {
splitrpostrm = localdata.getVar('pkg_postrm')

- if not perfiledeps:
- # Add in summary of per file dependencies
- splitrdepends = splitrdepends + " " + get_perfile('RDEPENDS', pkg, d)
- splitrprovides = splitrprovides + " " + get_perfile('RPROVIDES', pkg, d)
+ # Add in summary of per file dependencies
+ splitrdepends = splitrdepends + " " + get_perfile('RDEPENDS', pkg, d)
+ splitrprovides = splitrprovides + " " + get_perfile('RPROVIDES', pkg, d)

splitrdepends = filter_nativesdk_deps(srcname, splitrdepends)

@@ -665,10 +598,6 @@ python do_package_rpm () {
d.setVar('OUTSPECFILE', outspecfile)
bb.build.exec_func('write_specfile', d)

- perfiledeps = (d.getVar("MERGEPERFILEDEPS") or "0") == "0"
- if perfiledeps:
- outdepends, outprovides = write_rpm_perfiledata(srcname, d)
-
# Setup the rpmbuild arguments...
rpmbuild = d.getVar('RPMBUILD')
rpmbuild_compmode = d.getVar('RPMBUILD_COMPMODE')
@@ -693,7 +622,6 @@ python do_package_rpm () {
cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
cmd = cmd + " --define '_builddir " + d.getVar('B') + "'"
cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
- cmd = cmd + " --define '_use_internal_dependency_generator 0'"
cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"
cmd = cmd + " --define '_build_id_links none'"
cmd = cmd + " --define '_smp_ncpus_max 4'"
@@ -703,12 +631,6 @@ python do_package_rpm () {
cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
cmd = cmd + " --define '_buildhost reproducible'"
cmd = cmd + " --define '__font_provides %{nil}'"
- if perfiledeps:
- cmd = cmd + " --define '__find_requires " + outdepends + "'"
- cmd = cmd + " --define '__find_provides " + outprovides + "'"
- else:
- cmd = cmd + " --define '__find_requires %{nil}'"
- cmd = cmd + " --define '__find_provides %{nil}'"
cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
cmd = cmd + " --define 'debug_package %{nil}'"
cmd = cmd + " --define '_tmppath " + workdir + "'"
--
2.49.1