diff options
author | Sergei Zhmylev <s.zhmylev@yadro.com> | 2023-11-03 17:29:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-06 16:49:21 +0000 |
commit | 251a5c88f6bcf347d637b39b8a86e8a083774986 (patch) | |
tree | f2bae154fec24813174dc39b79e3e6266623e404 /meta/classes-global/debian.bbclass | |
parent | f1b0ab7e4b1cfeabaa8f981175e503d0c435ba0b (diff) | |
download | poky-251a5c88f6bcf347d637b39b8a86e8a083774986.tar.gz |
classes: Move package RDEPENDS processing out of debian.bbclass
INHERIT_DIRSTO by default includes debian.bbclass which in turn properly
establishes dependencies between package management tasks and build
process. Debian class also unconditionally renames several packages in a
Debian way. In order to allow disabling of such renaming rules, the logic
of RDEPENDS handling is moved to a package.bbclass.
This commit also solves the SDK building issue without debian.bbclass.
(From OE-Core rev: 8313a4201cde39c444aa6fbe82e46a767fc31f6b)
Signed-off-by: Sergei Zhmylev <s.zhmylev@yadro.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-global/debian.bbclass')
-rw-r--r-- | meta/classes-global/debian.bbclass | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/meta/classes-global/debian.bbclass b/meta/classes-global/debian.bbclass index 7135d74837..c34e04112c 100644 --- a/meta/classes-global/debian.bbclass +++ b/meta/classes-global/debian.bbclass | |||
@@ -14,26 +14,14 @@ | |||
14 | # | 14 | # |
15 | # Better expressed as ensure all RDEPENDS package before we package | 15 | # Better expressed as ensure all RDEPENDS package before we package |
16 | # This means we can't have circular RDEPENDS/RRECOMMENDS | 16 | # This means we can't have circular RDEPENDS/RRECOMMENDS |
17 | # | ||
18 | # Logic of processing dependencies moved to a package.bbclass to | ||
19 | # allow removing inheritance on debian.bbclass | ||
17 | 20 | ||
18 | AUTO_LIBNAME_PKGS = "${PACKAGES}" | 21 | AUTO_LIBNAME_PKGS = "${PACKAGES}" |
19 | 22 | ||
20 | inherit package | 23 | inherit package |
21 | 24 | ||
22 | DEBIANRDEP = "do_packagedata" | ||
23 | do_package_write_ipk[deptask] = "${DEBIANRDEP}" | ||
24 | do_package_write_deb[deptask] = "${DEBIANRDEP}" | ||
25 | do_package_write_tar[deptask] = "${DEBIANRDEP}" | ||
26 | do_package_write_rpm[deptask] = "${DEBIANRDEP}" | ||
27 | do_package_write_ipk[rdeptask] = "${DEBIANRDEP}" | ||
28 | do_package_write_deb[rdeptask] = "${DEBIANRDEP}" | ||
29 | do_package_write_tar[rdeptask] = "${DEBIANRDEP}" | ||
30 | do_package_write_rpm[rdeptask] = "${DEBIANRDEP}" | ||
31 | |||
32 | python () { | ||
33 | if not d.getVar("PACKAGES"): | ||
34 | d.setVar("DEBIANRDEP", "") | ||
35 | } | ||
36 | |||
37 | python debian_package_name_hook () { | 25 | python debian_package_name_hook () { |
38 | import glob, copy, stat, errno, re, pathlib, subprocess | 26 | import glob, copy, stat, errno, re, pathlib, subprocess |
39 | 27 | ||