From: Bartosz Golaszewski <[email protected]>
Some PACKAGECONFIG switches enable building of additional artifacts that
end up in sub-packages for a recipe. For example in foo.bb we have:
PACKAGES =+ "foo-bar"
PACKAGECONFIG[bar] = "--enable-bar,--disable-bar,libdep"
FILES:foo-bar = "${bindir}/bar"
Where ${bindir}/bar is only installed if PACKAGECONFIG contains "bar".
In order to add foo-bar to the image we need to do:
IMAGE_INSTALL:append = " foo-bar"
PACKAGECONFIG:append:pn-foo = " bar"
This is redundant so with this change we need to add:
PACKAGECONFIGEXTENDS:foo-bar = "bar"
to foo.bb and now adding "foo-bar" to IMAGE_INSTALL will automatically
append "bar" to foo.bb's PACKAGECONFIG.
Signed-off-by: Bartosz Golaszewski <[email protected]>
---
documentation/ref-manual/variables.rst | 15 +++++++++++
.../packageconfigextends.bb | 27 +++++++++++++++++++
.../packageconfigextends/pkgext-bar.sh | 3 +++
.../packageconfigextends/pkgext.sh | 3 +++
meta/classes-global/base.bbclass | 13 +++++++++
.../oeqa/selftest/cases/packageconfigdeps.py | 11 ++++++++
6 files changed, 72 insertions(+)
create mode 100644
meta-selftest/recipes-test/packageconfigextends/packageconfigextends.bb
create mode 100644
meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext-bar.sh
create mode 100644
meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext.sh
create mode 100644 meta/lib/oeqa/selftest/cases/packageconfigdeps.py
diff --git a/documentation/ref-manual/variables.rst
b/documentation/ref-manual/variables.rst
index c787a17937..dcb5cdccd9 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -6016,6 +6016,21 @@ system and gives an overview of their function and
contents.
PACKAGECONFIG:append:pn-recipename = " f4"
+ :term:`PACKAGECONFIGEXTENDS`
+ List of :term:`PACKAGECONFIG` flags automatically enabled for a package
+ present in :term:`IMAGE_INSTALL`. The :term:`PACKAGES` variable lists
+ the packages generated by a recipe.
+
+ Some :term:`PACKAGECONFIG` switches enable building additional artifacts
+ that are part of sub-packages for a recipe. In order to avoid having to
+ explictly add :term:`PACKAGECONFIG` flags AND include the additional
+ packages in :term:`IMAGE_INSTALL`, the user can just do::
+
+ PACKAGECONFIGEXTENDS:packagename = " foo"
+
+ in which case pulling in `packagename` from the recipe will automatically
+ add `foo` to this recipe's :term:`PACKAGECONFIG`.
+
:term:`PACKAGECONFIG_CONFARGS`
A space-separated list of configuration options generated from the
:term:`PACKAGECONFIG` setting.
diff --git
a/meta-selftest/recipes-test/packageconfigextends/packageconfigextends.bb
b/meta-selftest/recipes-test/packageconfigextends/packageconfigextends.bb
new file mode 100644
index 0000000000..189b9779b3
--- /dev/null
+++ b/meta-selftest/recipes-test/packageconfigextends/packageconfigextends.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Test case making sure that sub-packages pull in correct
PACKAGECONFIG switches."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = " \
+ file://pkgext.sh \
+ file://pkgext-bar.sh \
+"
+
+PACKAGES =+ "${PN}-bar"
+FILES:${PN}-bar += "${bindir}/pkgext-bar"
+
+PACKAGECONFIG = ""
+PACKAGECONFIG[bar] = ""
+
+PACKAGECONFIGEXTENDS:${PN}-bar = "bar"
+
+do_compile[noexec] = "1"
+
+S = "${WORKDIR}"
+
+do_install() {
+ install -D -m 0755 ${S}/pkgext.sh ${D}${bindir}/pkgext
+ if [ "${@bb.utils.contains("PACKAGECONFIG", "bar", "1", "", d)}" = "1" ];
then
+ install -D -m 0755 ${S}/pkgext-bar.sh ${D}${bindir}/pkgext-bar
+ fi
+}
diff --git
a/meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext-bar.sh
b/meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext-bar.sh
new file mode 100644
index 0000000000..1b208b154f
--- /dev/null
+++
b/meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext-bar.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "BAR"
diff --git
a/meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext.sh
b/meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext.sh
new file mode 100644
index 0000000000..c5beb15283
--- /dev/null
+++
b/meta-selftest/recipes-test/packageconfigextends/packageconfigextends/pkgext.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "FOO"
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass
index b6e339ed9c..7ee43d85e0 100644
--- a/meta/classes-global/base.bbclass
+++ b/meta/classes-global/base.bbclass
@@ -429,6 +429,19 @@ python () {
# PACKAGECONFIG[foo] =
"--enable-foo,--disable-foo,foo_depends,foo_runtime_depends,foo_runtime_recommends,foo_conflict_packageconfig"
pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {}
if pkgconfigflags:
+ # Preprocess PACKAGECONFIG for recipe sub-packages that are in
+ # IMAGE_INSTALL but for which the required PACKAGECONFIG options
+ # were not selected.
+ img_inst = (d.getVar("IMAGE_INSTALL") or "").split()
+ recipe_pkgs = d.getVar("PACKAGES").split()
+ pkgconfig = (d.getVar("PACKAGECONFIG") or "").split()
+ for pkg in recipe_pkgs:
+ if pkg in img_inst:
+ deps = (d.getVar("PACKAGECONFIGEXTENDS:{}".format(pkg)) or
"").split()
+ for dep in deps:
+ if dep not in pkgconfig:
+ d.appendVar("PACKAGECONFIG", " " + dep)
+
pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
pn = d.getVar("PN")
diff --git a/meta/lib/oeqa/selftest/cases/packageconfigdeps.py
b/meta/lib/oeqa/selftest/cases/packageconfigdeps.py
new file mode 100644
index 0000000000..69e23c1083
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/packageconfigdeps.py
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (C) 2023: Bartosz Golaszewski <[email protected]>
+
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import bitbake
+
+class PackageconfigDepsTest(OESelftestTestCase):
+ def test_pkgcfgdeps(self):
+ self.write_config('IMAGE_INSTALL:append = " packageconfigextends-bar"')
+ bitbake('core-image-minimal')
--
2.37.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#179749):
https://lists.openembedded.org/g/openembedded-core/message/179749
Mute This Topic: https://lists.openembedded.org/mt/98090033/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
