[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH 2/3] cargo_common.bbclass: Handle Cargo.lock modifications for git dependencies
From: "Frederic Martinsons" <frederic.martinsons () gmail ! com>
Date: 2023-07-31 9:44:09
Message-ID: 3553fa6951145c0504e272b0c57eecbf109e7488.1690795930.git.frederic.martinsons () gmail ! com
[Download RAW message or body]
Content-Transfer-Encoding: 8bit
From: Frederic Martinsons <frederic.martinsons@gmail.com>
Now we use --frozen, Cargo.lock cannot be modified by cargo build.
These patched git dependencies requires that the git url is removed
from Cargo.lock.
Fixes #15104
Signed-off-by: Frederic Martinsons <frederic.martinsons@gmail.com>
---
meta/classes-recipe/cargo_common.bbclass | 40 ++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass
index db54826ddb..01afb74640 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -117,6 +117,8 @@ cargo_common_do_configure () {
}
python cargo_common_do_patch_paths() {
+ import shutil
+
cargo_config = os.path.join(d.getVar("CARGO_HOME"), "config")
if not os.path.exists(cargo_config):
return
@@ -146,6 +148,44 @@ python cargo_common_do_patch_paths() {
print('\n[patch."%s"]' % k, file=config)
for name in v:
print(name, file=config)
+
+ if not patches:
+ return
+
+ # Cargo.lock file is needed for to be sure that artifacts
+ # downloaded by the fetch steps are those expected by the
+ # project and that the possible patches are correctly applied.
+ # Moreover since we do not want any modification
+ # of this file (for reproducibility purpose), we prevent it by
+ # using --frozen flag (in CARGO_BUILD_FLAGS) and raise a clear error
+ # here is better than letting cargo tell (in case the file is missing)
+ # "Cargo.lock should be modified but --frozen was given"
+
+ manifest_path = d.getVar("MANIFEST_PATH", True)
+ lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock")
+ if not os.path.exists(lockfile):
+ bb.fatal(f"{lockfile} file doesn't exist")
+
+ # There are patched files and so Cargo.lock should be modified but we use
+ # --frozen so let's handle that modifications here.
+ #
+ # Note that a "better" (more elegant ?) would have been to use cargo update for
+ # patched packages:
+ # cargo update --offline -p package_1 -p package_2
+ # But this is not possible since it requires that cargo local git db
+ # to be populated and this is not the case as we fetch git repo ourself.
+
+ newlines = []
+ with open(lockfile, "r") as f:
+ for line in f.readlines():
+ if not line.startswith("source = \"git"):
+ newlines.append(line)
+
+ lockfile_mod = lockfile + ".new"
+ with open(lockfile_mod, "w") as f:
+ f.writelines(newlines)
+
+ shutil.move(lockfile_mod, lockfile)
}
do_configure[postfuncs] += "cargo_common_do_patch_paths"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#185130): https://lists.openembedded.org/g/openembedded-core/message/185130
Mute This Topic: https://lists.openembedded.org/mt/100458216/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic