linux/poky.git/scripts, branch mickledore-4.2.2

devtool: Fix the wrong variable in srcuri_entry

2023-07-04T15:32:29+00:00

devtool crashes when running "update-recipe" and append changes on the recipe. "$ devtool update-recipe -a " Traceback (most recent call last): ... File "/ovss/ovss_quanta/poky/scripts/lib/devtool/standard.py", line 1636, in srcuri_entry return 'file://%s%s' % (basepath, paramstr) ^^^^^^^^ NameError: cannot access free variable 'basepath' where it is not associated with a value in enclosing scope The input variable 'fname' should have the same meaning as the variable 'basepath'. Modify the 'fname' to 'basepath' and solve the issue. (From OE-Core rev: 6e9d2bfed4bb1a02b9ad023cb70cef90366f8233) Signed-off-by: Charlie Wu Signed-off-by: Alexandre Belloni (cherry picked from commit c3231756bbc2cb5641204414ad3670d7f8607ed3) Signed-off-by: Steve Sakoman

scripts/runqemu: allocate unfsd ports in a way that doesn't race or clash with unrelated processes

2023-07-04T15:32:29+00:00

There is already a neat check_free_port() function for finding an available port atomically, so use that and make two additional tweaks: - no need to allocate two separate ports; per unfsd documentation they can be the same - move lockfile release until after unfsd has been shut down and the port(s) used has been freed [YOCTO #15077] (From OE-Core rev: 3dccfba830bfbe89554a5e3ed5c3517d13545d35) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit dee96e82fb04ea99ecd6c25513c7bd368df3bd37) Signed-off-by: Steve Sakoman

scripts/runqemu: split lock dir creation into a reusable function

2023-07-04T15:32:29+00:00

(From OE-Core rev: 811e24cf68c542d38386f83eda05d7efe3e5e4dc) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 004d6bcb067ecf1d796801fa43a98820c4efd3c7) Signed-off-by: Steve Sakoman

runqemu-ifupdown/get-tapdevs: Add support for ip tuntap

2023-06-30T14:07:59+00:00

The *ip* command supports the creation and destruction of TAP devices since 2009 and might be more likely installed on systems then *tunctl*. Therefore it should be tried to setup or teardown the TAP interface with *ip* before falling back to *tunctl*. https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=580fbd88f75cc9eea0d28a48c025b090eb9419a7 (From OE-Core rev: e448f9b292aba2bf344a69f32d62b107c18993e9) Signed-off-by: Jörg Sommer Signed-off-by: Alexandre Belloni (cherry picked from commit 424ede206baae1c228583aab1df6c18513ac104f) Signed-off-by: Steve Sakoman

runqemu-gen-tapdevs: Refactoring

2023-06-30T14:07:59+00:00

The changes are mostly about early exit which causes indentation changes; check with `git diff -w`. Another change is the check for ip by simply calling it and deciding upon the exit code, if it's fine or not. (From OE-Core rev: 3f6dacac5f8fb3c4b6b61b3fa125372c8f044795) Signed-off-by: Jörg Sommer Signed-off-by: Alexandre Belloni (cherry picked from commit 351577761d0712a005eda9dde9215558ca9a1fe9) Signed-off-by: Steve Sakoman

image_types: Fix reproducible builds for initramfs and UKI img

2023-06-30T14:07:59+00:00

I've encountered issues reproducing initramfs and UKI image builds, which will be fixed with this patch. 1. initramfs There's a symbolic link to /sbin/init, which is appended to the cpio archive after creation. The links timestamp needs to be static and the cpio append command needs the '--reproducible' flag to produce deterministic outcomes. 2. Unified Kernel Image '--preserve-dates' is required for a static 'Time/Date' entry. I've added '--enable-deterministic-archives' although in my case this didn't change anything. (From OE-Core rev: 7bf9463665c46e331f40f9ca4f04733d14f9ab44) Signed-off-by: Frieder Paape Signed-off-by: Richard Purdie (cherry picked from commit fd027729bafb4e085ba0949e38e724f3a8cad102) Signed-off-by: Steve Sakoman

scripts: fix buildstats diff/summary hard bound to host python3

2023-05-31T14:08:11+00:00

Somehow these two got left behind and hence on older hosts that are using buildtools for a newer python - they will still fail. (From OE-Core rev: db3f62378c54ebdfbf5cccdba4c83f503372138f) Signed-off-by: Paul Gortmaker Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f1b11b83a6dd991f393940741c930691463e6d53) Signed-off-by: Steve Sakoman

runqemu: respect IMAGE_LINK_NAME

2023-04-04T12:11:49+00:00

* when searching for qemuboot.conf * don't assume that IMAGE_LINK_NAME is always - (with -.qemuboot.conf) * runqemu: use IMAGE_LINK_NAME set by testimage.bbclass or query with bitbake -e * testimage.bbclass was setting DEPLOY_DIR which I don't see used anywhere else, so I assume it was supposed to be DEPLOY_DIR_IMAGE as mentioned in corresponding runqemu code, do the same with IMAGE_LINK_NAME variable * add virtual/kernel as bitbake -e target in run_bitbake_env to make sure IMAGE_LINK_NAME is defined (kernel-artifact-names.bbclass inherits image-artifact-names.bbclass as well) * improve .qemuboot.conf search 1st search for file matching the rootfs and only when not found try again with .rootfs suffix removed [YOCTO #12937] (From OE-Core rev: 716eb55bb963db7b02d985849cb025898aabc855) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie

Revert "runqemu: Add workaround for APIC hang on pre 4.15 kernels on qemux86"

2023-03-30T22:26:04+00:00

This reverts commit 82e67b82ea8e12aa0b7b9db1d84fec0436dec71b. It was commited as part of https://bugzilla.yoctoproject.org/show_bug.cgi?id=12301 for kernels < 4.15, as of now oldest builder kernel we have is 4.15 on ubuntu 18.04 so we should not require this workaround. Moreover, this fixes an smp problem with qemux86 where no matter what -smp option is used, qemu always starts with single core. (From OE-Core rev: fa8a7c0608fc800c48d0ff1cd832ad63c51eeab1) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie

buildstats-summary: add an option to disable bold

2023-03-28T21:28:45+00:00

(From OE-Core rev: b9a0ceebe9aa1e79d97508e7ab2fc39ca7c6637f) Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie