summaryrefslogtreecommitdiffstats
path: root/meta/classes/debian.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/debian.bbclass
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/debian.bbclass')
-rw-r--r--meta/classes/debian.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 6f8a599ccb..39b1a1a08b 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/classes/debian.bbclass
@@ -4,7 +4,7 @@
4# depends are correct 4# depends are correct
5# 5#
6# Custom library package names can be defined setting 6# Custom library package names can be defined setting
7# DEBIANNAME_ + pkgname to the desired name. 7# DEBIANNAME: + pkgname to the desired name.
8# 8#
9# Better expressed as ensure all RDEPENDS package before we package 9# Better expressed as ensure all RDEPENDS package before we package
10# This means we can't have circular RDEPENDS/RRECOMMENDS 10# This means we can't have circular RDEPENDS/RRECOMMENDS
@@ -51,11 +51,11 @@ python debian_package_name_hook () {
51 return (s[stat.ST_MODE] & stat.S_IEXEC) 51 return (s[stat.ST_MODE] & stat.S_IEXEC)
52 52
53 def add_rprovides(pkg, d): 53 def add_rprovides(pkg, d):
54 newpkg = d.getVar('PKG_' + pkg) 54 newpkg = d.getVar('PKG:' + pkg)
55 if newpkg and newpkg != pkg: 55 if newpkg and newpkg != pkg:
56 provs = (d.getVar('RPROVIDES_' + pkg) or "").split() 56 provs = (d.getVar('RPROVIDES:' + pkg) or "").split()
57 if pkg not in provs: 57 if pkg not in provs:
58 d.appendVar('RPROVIDES_' + pkg, " " + pkg + " (=" + d.getVar("PKGV") + ")") 58 d.appendVar('RPROVIDES:' + pkg, " " + pkg + " (=" + d.getVar("PKGV") + ")")
59 59
60 def auto_libname(packages, orig_pkg): 60 def auto_libname(packages, orig_pkg):
61 p = lambda var: pathlib.PurePath(d.getVar(var)) 61 p = lambda var: pathlib.PurePath(d.getVar(var))
@@ -110,10 +110,10 @@ python debian_package_name_hook () {
110 if soname_result: 110 if soname_result:
111 (pkgname, devname) = soname_result 111 (pkgname, devname) = soname_result
112 for pkg in packages.split(): 112 for pkg in packages.split():
113 if (d.getVar('PKG_' + pkg, False) or d.getVar('DEBIAN_NOAUTONAME_' + pkg, False)): 113 if (d.getVar('PKG:' + pkg, False) or d.getVar('DEBIAN_NOAUTONAME:' + pkg, False)):
114 add_rprovides(pkg, d) 114 add_rprovides(pkg, d)
115 continue 115 continue
116 debian_pn = d.getVar('DEBIANNAME_' + pkg, False) 116 debian_pn = d.getVar('DEBIANNAME:' + pkg, False)
117 if debian_pn: 117 if debian_pn:
118 newpkg = debian_pn 118 newpkg = debian_pn
119 elif pkg == orig_pkg: 119 elif pkg == orig_pkg:
@@ -126,7 +126,7 @@ python debian_package_name_hook () {
126 newpkg = mlpre + newpkg 126 newpkg = mlpre + newpkg
127 if newpkg != pkg: 127 if newpkg != pkg:
128 bb.note("debian: renaming %s to %s" % (pkg, newpkg)) 128 bb.note("debian: renaming %s to %s" % (pkg, newpkg))
129 d.setVar('PKG_' + pkg, newpkg) 129 d.setVar('PKG:' + pkg, newpkg)
130 add_rprovides(pkg, d) 130 add_rprovides(pkg, d)
131 else: 131 else:
132 add_rprovides(orig_pkg, d) 132 add_rprovides(orig_pkg, d)