linux/poky.git/scripts, branch yocto-3.1.18

wic: fix WicError message

2022-07-08T07:27:20+00:00

* add missing % to print the values instead of: | INFO: Build artifacts not found, exiting. | INFO: (Please check that the build artifacts for the machine | INFO: selected in local.conf actually exist and that they | INFO: are the correct artifacts for the image (.wks file)). | | ERROR: ("The artifact that couldn't be found was %s:\n %s", 'kernel-dir', '/OE/build/deploy/images/qemux86-64') (From OE-Core rev: c83cabad78dbc98bb72be7fd7dd51023853a3ff9) Signed-off-by: Martin Jansa Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e104c2b1273d8c5bd97893f318bf2a2699ef7f2d) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scripts/git: Ensure we don't have circular references

2022-05-14T19:26:34+00:00

This is horrible but I'm running out of better ideas. We hit circular reference issues which we were trying to avoid in the core HOSTTOOLS code. When building the eSDK, there can be two copies of the script. Therefore assume git will never be in a directory called scripts. This fixes eSDK build failures. (From OE-Core rev: 0f6ae13d76129d96f788b7ede312cfc361ee2bda) Signed-off-by: Richard Purdie (cherry picked from commit 27de610ac30d4c81352efc794df7e9b1060f7a68) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scripts: Make git intercept global

2022-05-14T19:26:34+00:00

The previous minimially invasive git intercept simply isn't enough. For example, meson used in the igt-gpu-tools recipe hardcodes the path to git in the configure step so at install time, changing PATH has no effect. There are lots of interesting things we could do to try and avoid problems but making the git intercept and dropping fakeroot privs for git global is probably the least worst solution at this point. It will add slight overhead to git calls but we don't make many so the overall impact is likely minimal. (From OE-Core rev: ce6e606ba8b975a33df2f3dc6104abed9cfa7a36) Signed-off-by: Richard Purdie (cherry picked from commit af27c81eaf68ee681dcd9456a74cca6a9ab40bf6) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

install/devshell: Introduce git intercept script due to fakeroot issues

2022-05-09T10:51:59+00:00

In a devshell, recent versions of git will complain if the repo is owned by someone other than the current UID - consider this example: ------ bitbake -c devshell linux-yocto [...] kernel-source#git branch fatal: unsafe repository ('/home/paul/poky/build-qemuarm64/tmp/work-shared/qemuarm64/kernel-source' is owned by someone else) To add an exception for this directory, call: git config --global --add safe.directory /home/paul/poky/build-qemuarm64/tmp/work-shared/qemuarm64/kernel-source kernel-source# ------ Of course the devshell has UID zero and the "real" UID is for "paul" in this case. And so recent git versions complain. As the whole purpose of the devshell is to invoke a shell where development can take place, having a non-functional git is clearly unacceptable. Richard suggested we could use PSEUDO_UNLOAD=1 to evade this issue, and I suggested we probably will see other similar instances like this and should make use of PATH to intercept via devshell wrappers - conveniently we already have examples of this. Here, we copy the existing "ar" example and tune it to the needs of git to combine Richard's suggestion and mine. As such we now also can store commit logs and use send-email with our user specific settings, instead of "root", so in additon to fixing basic commands like "git branch" it should also increase general usefulness. RP: Tweaked the patch so the PATH change only applies to the devshell task and is a generic git intercept rather than devshell specific. RP: Also apply the PATH change to do_install tasks since that also runs under fakeroot and several software projects inject "git describe" output into their binaries (systemd, iputils, llvm, ipt-gpu-tools at least) causing reproducibility issues from systems with different git versions. (From OE-Core rev: 0ff2cff2c1eac3fe6304644db0fc27ba3130c237) Signed-off-by: Paul Gortmaker Signed-off-by: Richard Purdie (cherry picked from commit 3266c327dfa186791e0f1e2ad63c6f5d39714814) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scripts/contrib/oe-build-perf-report-email.py: remove obsolete check for phantomjs and optipng

2022-05-03T16:50:06+00:00

Use of those tools was removed in b5c131006e3fad0a15e6cdf81f71dc1e96647028 perf-build-test/report: Drop phantomjs and html email reports support (From OE-Core rev: bb3fc61f0d7f7bcd77ef194b76f4fdd8a7ff6aa5) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

perf-build-test/report: Drop phantomjs and html email reports support

2022-05-03T16:50:06+00:00

phantomjs isn't reliable and we've moved to sharing the reports via a webserver. Update the scripts to more match those being used in the autobuilder helper where the html email support was removed. (From OE-Core rev: ce6d41812a70a1586aaabb8de5d748a81f6d7cae) Signed-off-by: Richard Purdie (cherry picked from commit b5c131006e3fad0a15e6cdf81f71dc1e96647028) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool: deploy-target: Remove stripped binaries in pseudo context

2022-02-23T23:43:42+00:00

deploy-target may fail the second time with "pseudo abort" because devtool-deploy-target-stripped is deleted outside of pseudo's fakeroot context. (From OE-Core rev: b293bcf4c312156cb57814dd71f13f8ab2a8ae80) Signed-off-by: Florian Amstutz Signed-off-by: Richard Purdie (cherry picked from commit 2338a33b690b0bbe279cde3f73764911b239cb50) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

recipetool: Fix circular reference in SRC_URI

2022-02-23T23:43:42+00:00

When creating a new recipe.bb file for a binary, don't use BP which includes the version information, instead use BPN which is just the name base Package Name. Since PB is not specified, it takes the default: PV = "1.0+git${SRCPV}" But SRCPV is defined in terms of the SRC_URI, which leads to infinite recursion (traceback below). Here are the pertinent variables which cause the recursion: SRC_URI = "git://github.com/lvc/abi-dumper;protocol=https;subdir=${BP}" BP = "${BPN}-${PV}" PV = "1.0+git${SRCPV}" SRCPV = "${@bb.fetch2.get_srcrev(d)}" def get_srcrev(d, method_name='sortable_revision'): # ... trimmed scms = [] fetcher = Fetch(d.getVar('SRC_URI').split(), d) # ... trimmed [YOCTO #14040] (From OE-Core rev: 64434ffd6d406e4c3d1e9ca2fb72fa97990346d8) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie (cherry picked from commit 3b8d43fc53ee13d39abc3b2a1f706a97fcf752aa) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic: use shutil.which

2022-01-22T17:56:53+00:00

Use shutil.which to find the executable instead to silence the below warning: $ cat tmp/work/intel_x86_64-poky-linux/core-image-base/1.0-r5/temp/log.do_image_wic [snip] DEBUG: Executing shell function do_image_wic /path/layers/oe-core/scripts/wic:27: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives from distutils import spawn INFO: Creating image(s)... [snip] [RP: Added conversion for missed function reference] (From OE-Core rev: 488815681466d5e4c7640df5281fa6e1f9b4c75e) Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 3966cbf5c8a2dbc3a4f0f3eefdbeeb83f522bf87) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic: misc: Do not find for executables in ASSUME_PROVIDED

2022-01-22T17:56:53+00:00

Executables like tar won't be available on the native sysroot, as they are part of the ASSUME_PROVIDED variable. Cc: Paul Barker (From OE-Core rev: eab485069809c991433b9e1b8e4223a555e4d7f9) Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Richard Purdie (cherry picked from commit 2f574d535f8665b26dab65c14668cf8fc7b751c0) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie