From: Stefan Herbrechtsmeier <stefan.herbrechtsme...@weidmueller.com>
Add support for early fetch, unpack and patches task which run before
normal patch task. This feature is useful to fetch additional
dependencies based on a patched source before the normal unpack and
patch tasks. The patch are marked as early via an early=1 parameter. An
example use case is a patch for a package manager lock file (Cargo.lock,
go.sum, package-lock.json).
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsme...@weidmueller.com>
---
meta/classes-global/patch.bbclass | 17 +++++----
meta/classes-recipe/early.bbclass | 61 +++++++++++++++++++++++++++++++
meta/lib/oe/patch.py | 10 +++--
3 files changed, 77 insertions(+), 11 deletions(-)
create mode 100644 meta/classes-recipe/early.bbclass
diff --git a/meta/classes-global/patch.bbclass
b/meta/classes-global/patch.bbclass
index e5786b1c9a..7fa94c7aa7 100644
--- a/meta/classes-global/patch.bbclass
+++ b/meta/classes-global/patch.bbclass
@@ -82,18 +82,18 @@ python patch_task_postfunc() {
oe.patch.GitApplyTree.commitIgnored("Add changes from %s" % func,
dir=srcsubdir, files=['.'], d=d)
}
-def src_patches(d, all=False, expand=True):
+def src_patches(d, all=False, expand=True, early=False):
import oe.patch
- return oe.patch.src_patches(d, all, expand)
+ return oe.patch.src_patches(d, all, expand, early)
-def should_apply(parm, d):
+def should_apply(parm, d, early=False):
"""Determine if we should apply the given patch"""
import oe.patch
- return oe.patch.should_apply(parm, d)
+ return oe.patch.should_apply(parm, d, early)
should_apply[vardepsexclude] = "DATE SRCDATE"
-python patch_do_patch() {
+def apply_patches(d, s, early=False):
import oe.patch
patchsetmap = {
@@ -113,8 +113,6 @@ python patch_do_patch() {
classes = {}
- s = d.getVar('S')
-
os.putenv('PATH', d.getVar('PATH'))
# We must use one TMPDIR per process so that the "patch" processes
@@ -124,7 +122,7 @@ python patch_do_patch() {
process_tmpdir = tempfile.mkdtemp()
os.environ['TMPDIR'] = process_tmpdir
- for patch in src_patches(d):
+ for patch in src_patches(d, early=early):
_, _, local, _, _, parm = bb.fetch.decodeurl(patch)
if "patchdir" in parm:
@@ -159,6 +157,9 @@ python patch_do_patch() {
bb.utils.remove(process_tmpdir, True)
del os.environ['TMPDIR']
+
+python patch_do_patch() {
+ apply_patches(d, d.getVar('S'))
}
patch_do_patch[vardepsexclude] = "PATCHRESOLVE"
diff --git a/meta/classes-recipe/early.bbclass
b/meta/classes-recipe/early.bbclass
new file mode 100644
index 0000000000..e458fd8f7b
--- /dev/null
+++ b/meta/classes-recipe/early.bbclass
@@ -0,0 +1,61 @@
+# Copyright (C) 2025 Weidmueller Interface GmbH & Co. KG
+# Stefan Herbrechtsmeier <stefan.herbrechtsme...@weidmueller.com>
+#
+# SPDX-License-Identifier: MIT
+
+EARLY_UNPACKDIR = "${WORKDIR}/sources-unpack-early"
+
+def get_early_source_dir(d, sourcedir):
+ unpackdir = d.getVar("UNPACKDIR")
+ workdir = d.getVar('WORKDIR')
+ originaldir = unpackdir if sourcedir.startswith(unpackdir) else workdir
+ early_unpackdir = d.getVar("EARLY_UNPACKDIR")
+ return sourcedir.replace(originaldir, early_unpackdir)
+
+python early_do_fetch_early() {
+ fetch_src_uris(d, True)
+}
+addtask fetch_early
+do_fetch_early[dirs] = "${DL_DIR}"
+do_fetch_early[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}"
+do_fetch[prefuncs] += "fetcher_hashes_dummyfunc"
+do_fetch_early[network] = "1"
+
+python early_do_unpack_early() {
+ unpackdir = d.getVar("EARLY_UNPACKDIR")
+ unpack_src_uris(d, unpackdir, True)
+}
+addtask unpack_early after do_fetch_early
+do_unpack_early[cleandirs] = "${EARLY_UNPACKDIR}"
+
+python early_do_patch_early() {
+ source_dir = d.getVar("S")
+ source_dir = get_early_source_dir(d, source_dir)
+ apply_patches(d, source_dir, True)
+}
+addtask patch_early after do_unpack_early
+do_patch_early[dirs] = "${WORKDIR}"
+do_patch_early[depends] = "${PATCHDEPENDENCY}"
+do_patch_early[vardepsexclude] = "PATCHRESOLVE"
+
+python () {
+ import bb.fetch
+ src_uris = get_src_uris(d, True)
+ for src_uri in src_uris:
+ uri = bb.fetch.URI(src_uri)
+ path = uri.params.get("downloadfilename", uri.path)
+
+ # HTTP/FTP use the wget fetcher
+ if uri.scheme in ("http", "https", "ftp"):
+ d.appendVarFlag('do_fetch_early', 'depends', '
wget-native:do_populate_sysroot')
+
+ # Git packages should DEPEND on git-native
+ elif uri.scheme in ("git", "gitsm"):
+ d.appendVarFlag('do_fetch_early', 'depends', '
git-native:do_populate_sysroot')
+
+ # *.xz should DEPEND on xz-native for unpacking
+ if path.endswith('.xz') or path.endswith('.txz'):
+ d.appendVarFlag('do_fetch_early', 'depends', '
xz-native:do_populate_sysroot')
+}
+
+EXPORT_FUNCTIONS do_fetch_early do_unpack_early do_patch_early
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 58c6e34fe8..7737011e5a 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -904,7 +904,7 @@ def patch_path(url, fetch, unpackdir, expand=True):
return local
-def src_patches(d, all=False, expand=True):
+def src_patches(d, all=False, expand=True, early=False):
unpackdir = d.getVar('UNPACKDIR')
fetch = bb.fetch2.Fetch([], d)
patches = []
@@ -921,7 +921,7 @@ def src_patches(d, all=False, expand=True):
parm = urldata.parm
patchname = parm.get('pname') or os.path.basename(local)
- apply, reason = should_apply(parm, d)
+ apply, reason = should_apply(parm, d, early)
if not apply:
if reason:
bb.note("Patch %s %s" % (patchname, reason))
@@ -950,8 +950,12 @@ def src_patches(d, all=False, expand=True):
return patches
-def should_apply(parm, d):
+def should_apply(parm, d, early=False):
import bb.utils
+
+ if early and not bb.utils.to_boolean(parm.get('early'), False):
+ return False, "applies to normal patch task only"
+
if "mindate" in parm or "maxdate" in parm:
pn = d.getVar('PN')
srcdate = d.getVar('SRCDATE_%s' % pn)
--
2.39.5
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#211141):
https://lists.openembedded.org/g/openembedded-core/message/211141
Mute This Topic: https://lists.openembedded.org/mt/111123537/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
