Re: Multiconfig dependency
Manuel Wagesreither
Hi Oleh,
Am Do, 17. Mär 2022, um 21:29, schrieb Oleh Kravchenko: do_install[mcdepends] = "mc:initramfs::core-image-minimal:do_image_complete"I have zero practical experience with multiconfig, but isn't this missing one argument? See here: https://github.com/JPEWdev/meta-multiconfig-demos/blob/main/recipes-misc/arthur-embed/arthur-embed.bb#L21https://youtu.be/YvtlGjWrL-M?list=PLD4M5FoHz-TwWYbaJwduH8ZYNYvva76QQ&t=5030 Regards, Manuel
|
|
|
|
Booting my raspberry pi image hangs at some point. Where exactly?
Manuel Wagesreither
Hi all,
I can netboot my Raspberry Pi 4 still fine, but when I flash the image onto a usb drive using wic, booting fails. I just stops to boot at one point. I'd be glad if someone could tell me where it's hanging so I could try to start tracking it down at the right place. All metalayers are on dunfell but not at the newest commit. USB booting was working fine months ago and I don't really know at which point it stopped working. This is the last I get from the serial console: Read config.txt bytes 36302 hnd 0x00000035 Read start4.elf bytes 2229120 hnd 0x000025f8 Read fixup4.dat bytes 5448 hnd 0x0000004b Firmware: 7d9a298cda813f747b51fe17e1e417e7bf5ca94d May 27 2021 14:02:15 0x00d03114 0x00000000 0x000000ff MEM GPU: 76 ARM: 947 TOTAL: 1023 Starting start4.elf @ 0xfeb00200 partition 0 Stopping network Stop display Display stopped + The rest sadly appears on the screen only, so here is an actual screenshot: https://user.fm/files/v2-1d64d080db788dec685957ae4863e1f4/raspi.png It seems to detect the usb drive just fine. The last related log line I get is sd 0:0:0:0: [sda] Attached SCSI removable disk Whatever is running (the kernel?) is not dead, though. Around 30 seconds later it prints a "vcc-sd: disabling" and some minutes later a "random: crng init done" (= random number generator is initialized). Does anyone have an idea? I'll try to get my hands on an sd card in the meantime. Regards, Manuel
|
|
|
|
Re: qemu: Enable guest access to the internet
Manuel Wagesreither
Hi Richard,
Am Sa, 19. Mär 2022, um 13:00, schrieb Richard Purdie: SLIRP only allows specific ports and will not work for general internetI hoped I could SLIRP for general internet connectivity to work by enabling NAT on the host. If I recall correctly, I could see the pings I sent from inside the qemu guest to 10.0.2.2 show up on my host, hence I assumed there is a chance. (I checked with wireguard.) With systemd-networkd NAT seems to be quite easy to set up: [1]. [1] https://www.freedesktop.org/software/systemd/man/systemd.network.html#IPMasquerade= Regards, Manuel
|
|
|
|
Re: Multiconfig dependency
Hello Joshua,
Could you please help me with multiconfig? Currently I've found this workaround: do_install[nostamp] = "1"For all tasks that have "do_install[mcdepends]". 17.03.22 22:29, Oleh Kravchenko пише: Hello guys!
|
|
|
|
[yocto-autobuilder-helper] [PATCH] scripts/run-docs-build: Support auto generation of switchers.js and poky.yaml
Richard Purdie
This uses the set_versions.py script from the docs master branch to handle
creation of the swictchers.js version information as well as the data in poky.yaml. This allows patches to those sections of the docs to be dropped. It is assumed the patch to use set_versions is applied to the docs transitions branch so that it's switchers.js files no longer need to be tweaked. This does lead to user visible changes on the website: - Older versioned released docs gain their current version and the latest version listed in the switcher rather than being unlisted - The list of releases is normally filtered down to our active ones (hardknott, honister and dev right now) - 3.3's doc references to gatesgath are corrected to hardknott - Docs for unversioned release branches (not linked on the website) now use 3.1.999 versioning instead of confusing them with the last relased version - 3.1.13 refers to 3.1.13 instead of 3.1.12 all of which seem to be reasonable improvements. The big advantage of these changes is that with a single change to the script in the master branch, the right thing should happen for all the current docs and at release time, only a docs rebuild should need to be triggered after tags are pushed. Signed-off-by: Richard Purdie <richard.purdie@...> --- ...01-releases-update-to-include-3.1.14.patch | 41 ------------ ...umentation-update-for-3.1.14-release.patch | 23 ------- ...umentation-prepare-for-3.3.5-release.patch | 53 --------------- .../0001-conf-update-for-release.patch | 17 ----- ...honister-updates-for-recent-releases.patch | 67 ------------------- ...001-releases-update-to-include-3.4.2.patch | 63 ----------------- .../0001-conf-update-for-release.patch | 17 ----- scripts/run-docs-build | 24 +++++-- 8 files changed, 20 insertions(+), 285 deletions(-) delete mode 100644 scripts/docs-build-patches/yocto-3.1.14/0001-releases-update-to-include-3.1.14.patch delete mode 100644 scripts/docs-build-patches/yocto-3.4.2/0001-releases-update-to-include-3.4.2.patch diff --git a/scripts/docs-build-patches/yocto-3.1.14/0001-releases-update-to-include-3.1.14.patch b/scripts/docs-build-patches/yocto-3.1.14/0001-releases-update-to-include-3.1.14.patch deleted file mode 100644 index ee2983a..0000000 --- a/scripts/docs-build-patches/yocto-3.1.14/0001-releases-update-to-include-3.1.14.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2e3ec94e906a255cd7b22dfca29a6148fc433732 Mon Sep 17 00:00:00 2001 -From: Michael Halstead <mhalstead@...> -Date: Wed, 16 Feb 2022 23:04:15 -0800 -Subject: [PATCH 1/2] releases: update to include 3.1.14 - -Adding 3.1.14 to documentation switcher and release list. - -Signed-off-by: Michael Halstead <mhalstead@...> ---- - documentation/releases.rst | 1 + - documentation/sphinx-static/switchers.js | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/documentation/releases.rst b/documentation/releases.rst -index 57e4566e1..affe63403 100644 ---- a/documentation/releases.rst -+++ b/documentation/releases.rst -@@ -39,6 +39,7 @@ Release Series 3.1 (dunfell) - - :yocto_docs:`3.1.11 Documentation </3.1.11>` - - :yocto_docs:`3.1.12 Documentation </3.1.12>` - - :yocto_docs:`3.1.13 Documentation </3.1.13>` -+- :yocto_docs:`3.1.14 Documentation </3.1.14>` - - ========================== - Outdated Release Manuals -diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js -index bda15485c..1d65fa7fa 100644 ---- a/documentation/sphinx-static/switchers.js -+++ b/documentation/sphinx-static/switchers.js -@@ -6,7 +6,7 @@ - '3.4.1': '3.4.1', - '3.3.4': '3.3.4', - '3.2.4': '3.2.4', -- '3.1.13': '3.1.13', -+ '3.1.14': '3.1.14', - '3.0.4': '3.0.4', - '2.7.4': '2.7.4', - }; --- -2.35.1 - diff --git a/scripts/docs-build-patches/yocto-3.1.14/0002-documentation-update-for-3.1.14-release.patch b/scripts/docs-build-patches/yocto-3.1.14/0002-documentation-update-for-3.1.14-release.patch index aef59a3..c1d303c 100644 --- a/scripts/docs-build-patches/yocto-3.1.14/0002-documentation-update-for-3.1.14-release.patch +++ b/scripts/docs-build-patches/yocto-3.1.14/0002-documentation-update-for-3.1.14-release.patch @@ -23,26 +23,3 @@ index 0d61afc9d..01d5e00c1 100644 bitbake_version = "1.46" # String used in sidebar -diff --git a/documentation/poky.yaml b/documentation/poky.yaml -index 8da5f5915..e37ea420a 100644 ---- a/documentation/poky.yaml -+++ b/documentation/poky.yaml -@@ -1,11 +1,11 @@ --DISTRO : "3.1.13" -+DISTRO : "3.1.14" - DISTRO_NAME_NO_CAP : "dunfell" - DISTRO_NAME : "Dunfell" - DISTRO_NAME_NO_CAP_MINUS_ONE : "zeus" --YOCTO_DOC_VERSION : "3.1.13" -+YOCTO_DOC_VERSION : "3.1.14" - YOCTO_DOC_VERSION_MINUS_ONE : "3.0.4" --DISTRO_REL_TAG : "yocto-3.1.13" --POKYVERSION : "23.0.13" -+DISTRO_REL_TAG : "yocto-3.1.14" -+POKYVERSION : "23.0.14" - YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" - YOCTO_DL_URL : "https://downloads.yoctoproject.org" - YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" --- -2.35.1 - diff --git a/scripts/docs-build-patches/yocto-3.3.5/0001-documentation-prepare-for-3.3.5-release.patch b/scripts/docs-build-patches/yocto-3.3.5/0001-documentation-prepare-for-3.3.5-release.patch index ec26d67..1bd2d89 100644 --- a/scripts/docs-build-patches/yocto-3.3.5/0001-documentation-prepare-for-3.3.5-release.patch +++ b/scripts/docs-build-patches/yocto-3.3.5/0001-documentation-prepare-for-3.3.5-release.patch @@ -25,56 +25,3 @@ index e42e7b18a..fc064bf32 100644 bitbake_version = "1.50" # String used in sidebar -diff --git a/documentation/poky.yaml b/documentation/poky.yaml -index 30eb45379..32849bc70 100644 ---- a/documentation/poky.yaml -+++ b/documentation/poky.yaml -@@ -1,12 +1,12 @@ --DISTRO : "3.3.4" -+DISTRO : "3.3.5" - DISTRO_NAME_NO_CAP : "hardknott" - DISTRO_NAME : "Hardknott" - DISTRO_NAME_NO_CAP_MINUS_ONE : "gatesgarth" - DISTRO_NAME_NO_CAP_LTS : "gatesgarth" --YOCTO_DOC_VERSION : "3.3.4" -+YOCTO_DOC_VERSION : "3.3.5" - YOCTO_DOC_VERSION_MINUS_ONE : "3.2.4" --DISTRO_REL_TAG : "yocto-3.3.4" --POKYVERSION : "25.0.4" -+DISTRO_REL_TAG : "yocto-3.3.5" -+POKYVERSION : "25.0.5" - YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" - YOCTO_DL_URL : "https://downloads.yoctoproject.org" - YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" -diff --git a/documentation/releases.rst b/documentation/releases.rst -index acee21d6b..1fb6054bc 100644 ---- a/documentation/releases.rst -+++ b/documentation/releases.rst -@@ -10,6 +10,7 @@ - - - :yocto_docs:`3.4 Documentation </3.4>` - - :yocto_docs:`3.4.1 Documentation </3.4.1>` -+- :yocto_docs:`3.4.1 Documentation </3.4.2>` - - ******************************* - 3.3 'hardknott' Release Series -@@ -20,6 +21,7 @@ - - :yocto_docs:`3.3.2 Documentation </3.3.2>` - - :yocto_docs:`3.3.3 Documentation </3.3.3>` - - :yocto_docs:`3.3.4 Documentation </3.3.4>` -+- :yocto_docs:`3.3.5 Documentation </3.3.5>` - - **************************** - 3.1 'dunfell' Release Series -@@ -38,6 +40,8 @@ - - :yocto_docs:`3.1.10 Documentation </3.1.10>` - - :yocto_docs:`3.1.11 Documentation </3.1.11>` - - :yocto_docs:`3.1.12 Documentation </3.1.12>` -+- :yocto_docs:`3.1.13 Documentation </3.1.13>` -+- :yocto_docs:`3.1.14 Documentation </3.1.14>` - - ========================== - Previous Release Manuals --- -2.35.1 - diff --git a/scripts/docs-build-patches/yocto-3.3/0001-conf-update-for-release.patch b/scripts/docs-build-patches/yocto-3.3/0001-conf-update-for-release.patch index 79b4cde..0b632f9 100644 --- a/scripts/docs-build-patches/yocto-3.3/0001-conf-update-for-release.patch +++ b/scripts/docs-build-patches/yocto-3.3/0001-conf-update-for-release.patch @@ -29,20 +29,3 @@ index 5a2e25f7b..ab1b2b14c 100644 # String used in sidebar version = 'Version: ' + current_version -diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js -index 7a4edc9e7..96efab2e8 100644 ---- a/documentation/sphinx-static/switchers.js -+++ b/documentation/sphinx-static/switchers.js -@@ -2,7 +2,8 @@ - 'use strict'; - - var all_versions = { -- 'dev': 'dev (3.3)', -+ 'dev': 'dev (3.4)', -+ '3.3': '3.3', - '3.2.3': '3.2.3', - '3.1.6': '3.1.6', - '3.0.4': '3.0.4', --- -2.31.1 - diff --git a/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch b/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch index 4e72db1..dc22558 100644 --- a/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch +++ b/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch @@ -24,70 +24,3 @@ index eff758a7b..ef369b7f1 100644 bitbake_version = "1.52" # String used in sidebar -diff --git a/documentation/poky.yaml b/documentation/poky.yaml -index 392e3bd63..11e209e30 100644 ---- a/documentation/poky.yaml -+++ b/documentation/poky.yaml -@@ -1,12 +1,12 @@ --DISTRO : "3.4" -+DISTRO : "3.4.1" - DISTRO_NAME_NO_CAP : "honister" - DISTRO_NAME : "Honister" - DISTRO_NAME_NO_CAP_MINUS_ONE : "hardknott" - DISTRO_NAME_NO_CAP_LTS : "dunfell" --YOCTO_DOC_VERSION : "3.4" -+YOCTO_DOC_VERSION : "3.4.1" - YOCTO_DOC_VERSION_MINUS_ONE : "3.3.4" --DISTRO_REL_TAG : "yocto-3.4" --POKYVERSION : "26.0.0" -+DISTRO_REL_TAG : "yocto-3.4.1" -+POKYVERSION : "26.0.1" - YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" - YOCTO_DL_URL : "https://downloads.yoctoproject.org" - YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" -diff --git a/documentation/releases.rst b/documentation/releases.rst -index a6c9a47b8..16ecbf712 100644 ---- a/documentation/releases.rst -+++ b/documentation/releases.rst -@@ -4,6 +4,13 @@ - Supported Release Manuals - =========================== - -+***************************** -+Release Series 3.4 (honister) -+***************************** -+ -+- :yocto_docs:`3.4 Documentation </3.4>` -+- :yocto_docs:`3.4.1 Documentation </3.4.1>` -+ - ****************************** - Release Series 3.3 (hardknott) - ****************************** -@@ -30,6 +37,7 @@ Release Series 3.1 (dunfell) - - :yocto_docs:`3.1.9 Documentation </3.1.9>` - - :yocto_docs:`3.1.10 Documentation </3.1.10>` - - :yocto_docs:`3.1.11 Documentation </3.1.11>` -+- :yocto_docs:`3.1.12 Documentation </3.1.12>` - - ========================== - Outdated Release Manuals -diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js -index b15f5b3c1..056a8926b 100644 ---- a/documentation/sphinx-static/switchers.js -+++ b/documentation/sphinx-static/switchers.js -@@ -3,10 +3,10 @@ - - var all_versions = { - 'dev': 'dev (3.5)', -- '3.4': '3.4', -+ '3.4.1': '3.4.1', - '3.3.4': '3.3.4', - '3.2.4': '3.2.4', -- '3.1.11': '3.1.11', -+ '3.1.12': '3.1.12', - '3.0.4': '3.0.4', - '2.7.4': '2.7.4', - }; --- -2.35.1 - diff --git a/scripts/docs-build-patches/yocto-3.4.2/0001-releases-update-to-include-3.4.2.patch b/scripts/docs-build-patches/yocto-3.4.2/0001-releases-update-to-include-3.4.2.patch deleted file mode 100644 index 115e1e7..0000000 --- a/scripts/docs-build-patches/yocto-3.4.2/0001-releases-update-to-include-3.4.2.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3a72177f8ce5a52bece7d6d2f11514c47256a6f9 Mon Sep 17 00:00:00 2001 -From: Michael Halstead <mhalstead@...> -Date: Sun, 20 Feb 2022 19:33:01 -0800 -Subject: [PATCH 1/2] releases: update to include 3.4.2 - -Adding 3.4.2 to documentation switcher and release list. - -Signed-off-by: Michael Halstead <mhalstead@...> ---- - documentation/poky.yaml | 8 ++++---- - documentation/releases.rst | 1 + - documentation/sphinx-static/switchers.js | 2 +- - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/documentation/poky.yaml b/documentation/poky.yaml -index 11e209e30..058f76e50 100644 ---- a/documentation/poky.yaml -+++ b/documentation/poky.yaml -@@ -1,12 +1,12 @@ --DISTRO : "3.4.1" -+DISTRO : "3.4.2" - DISTRO_NAME_NO_CAP : "honister" - DISTRO_NAME : "Honister" - DISTRO_NAME_NO_CAP_MINUS_ONE : "hardknott" - DISTRO_NAME_NO_CAP_LTS : "dunfell" --YOCTO_DOC_VERSION : "3.4.1" -+YOCTO_DOC_VERSION : "3.4.2" - YOCTO_DOC_VERSION_MINUS_ONE : "3.3.4" --DISTRO_REL_TAG : "yocto-3.4.1" --POKYVERSION : "26.0.1" -+DISTRO_REL_TAG : "yocto-3.4.2" -+POKYVERSION : "26.0.2" - YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" - YOCTO_DL_URL : "https://downloads.yoctoproject.org" - YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" -diff --git a/documentation/releases.rst b/documentation/releases.rst -index 16ecbf712..c4bfa857a 100644 ---- a/documentation/releases.rst -+++ b/documentation/releases.rst -@@ -10,6 +10,7 @@ Release Series 3.4 (honister) - - - :yocto_docs:`3.4 Documentation </3.4>` - - :yocto_docs:`3.4.1 Documentation </3.4.1>` -+- :yocto_docs:`3.4.2 Documentation </3.4.2>` - - ****************************** - Release Series 3.3 (hardknott) -diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js -index 056a8926b..c40823d8d 100644 ---- a/documentation/sphinx-static/switchers.js -+++ b/documentation/sphinx-static/switchers.js -@@ -3,7 +3,7 @@ - - var all_versions = { - 'dev': 'dev (3.5)', -- '3.4.1': '3.4.1', -+ '3.4.2': '3.4.2', - '3.3.4': '3.3.4', - '3.2.4': '3.2.4', - '3.1.12': '3.1.12', --- -2.35.1 - diff --git a/scripts/docs-build-patches/yocto-3.4/0001-conf-update-for-release.patch b/scripts/docs-build-patches/yocto-3.4/0001-conf-update-for-release.patch index a940eb0..2daf4f4 100644 --- a/scripts/docs-build-patches/yocto-3.4/0001-conf-update-for-release.patch +++ b/scripts/docs-build-patches/yocto-3.4/0001-conf-update-for-release.patch @@ -35,20 +35,3 @@ index 8e0847938..104b49ea0 100644 # String used in sidebar version = 'Version: ' + current_version -diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js -index 1e37b625a..6038dbb5a 100644 ---- a/documentation/sphinx-static/switchers.js -+++ b/documentation/sphinx-static/switchers.js -@@ -2,7 +2,8 @@ - 'use strict'; - - var all_versions = { -- 'dev': 'dev (3.4)', -+ 'dev': 'dev (3.5)', -+ '3.4': '3.4', - '3.3.3': '3.3.3', - '3.2.4': '3.2.4', - '3.1.11': '3.1.11', --- -2.31.1 - diff --git a/scripts/run-docs-build b/scripts/run-docs-build index ceda213..685fe10 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -69,10 +69,11 @@ rsync -irlp --checksum --ignore-times --delete bitbake docs@... cd $ypdocs +# transition must build after master for the switchers.js file # Again, keeping even the no longer supported releases (see above comment) first_sphinx_commit=01dd5af7954e24552aca022917669b27bb0541ed first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 -for branch in dunfell transition $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)') $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*'); do +for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)') $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*') transition; do if [ "$branch" = "HEAD" ]; then continue fi @@ -92,6 +93,20 @@ for branch in dunfell transition $(git branch --remote --contains "$first_sphinx fi git checkout master releases.rst + if [ -e poky.yaml ]; then + git checkout master sphinx-static/switchers.js.in + cp poky.yaml poky.yaml.in + git checkout master set_versions.py + case $branch in + yocto-*) + ./set_versions.py $(echo "$branch" | sed 's/yocto-//') + ;; + *) + ./set_versions.py + ;; + esac + fi + make clean make publish @@ -109,6 +124,7 @@ for branch in dunfell transition $(git branch --remote --contains "$first_sphinx cp -r ./_build/final/* $outputdir/$branch git reset --hard + git clean -f done # get current release (e.g. most recent tag), and add a 'current' link @@ -116,9 +132,9 @@ tag=$(git tag --list 'yocto-*' | sort --version-sort | tail -1 | cut -c7-) echo Linking to $tag as current ln -s $tag $outputdir/current -# Update switchers.js with the copy from master ypdocs -cd $outputdir -find . -name switchers.js -not -path ./_static/switchers.js -exec cp ./_static/switchers.js {} \; +# Update bitbake switchers.js with the copy from master ypdocs +cd $outputdir/bitbake +find . -name switchers.js -exec cp ./../_static/switchers.js {} \; cd $outputdir rsync -irlp --checksum --ignore-times --delete . docs@...:docs/ -- 2.32.0
|
|
|
|
Re: qemu: Enable guest access to the internet
Richard Purdie
On Sat, 2022-03-19 at 09:30 +0100, Manuel Wagesreither wrote:
Hi Matthias,SLIRP only allows specific ports and will not work for general internet connectivity. It can be done without root but the downside is it isn't as powerful. TAP would allow the guest internet access but needs to be setup in advance (using the gen-tapdevs script) or for there to be sudo access to setup what is needed. Cheers, Richard
|
|
|
|
Re: qemu: Enable guest access to the internet
Manuel Wagesreither
Hi Matthias,
Am Sa, 19. Mär 2022, um 08:43, schrieb Matthias Klein: Then everything worked through the tap device.Please note I'd like to use SLIRP instead of TAP as TAP needs root on the host. But I guess I could just try it for once, just to see if it works... Regards, Manuel
|
|
|
|
Re: qemu: Enable guest access to the internet
Matthias Klein
Hello Manuel,
the last time I tried, I had to set the IP 192.168.7.2 and the gateway 192.168.7.1 in the guest. Then everything worked through the tap device. Best regards, Matthias -----Ursprüngliche Nachricht----- Von: yocto@... <yocto@...> Im Auftrag von Manuel Wagesreither via lists.yoctoproject.org Gesendet: Samstag, 19. März 2022 01:13 An: yocto@... Betreff: [yocto] qemu: Enable guest access to the internet Hi all, I would like to configure my host to allow the yocto-built qemu guest access the internet. I'm running qemu with kvm virtualization and slirp, and according to [1] it should just work. I'd like to find out why it doesn't. [1] https://www.linux-kvm.org/page/Networking#User_Networking Here's the current situation: * The guest has ip 10.0.2.15 and can ping my host with `ping 10.0.2.2`. * The host has no ip 10.0.0.0/16. * The guest cannot ping my hosts only ipv4 interface (besides lo) `ping 192.168.178.24`. * The guest cannot ping devices in the same LAN as my host: `ping 192.168.178.101`. * The host has sysctl configured like so: net.ipv4.conf.all.accept_source_route = 1 net.ipv4.conf.all.send_redirects = 1 net.ipv4.ip_forward = 1 net.ipv6.conf.all.accept_source_route = 1 net.ipv6.conf.all.forwarding = 1 * The hosts routing table: Destination Gateway Genmask Flags Metric Ref Use Iface 0.0.0.0 192.168.178.1 0.0.0.0 UG 600 0 0 wlp3s0 169.254.0.0 0.0.0.0 255.255.0.0 U 1000 0 0 wlp3s0 192.168.178.0 0.0.0.0 255.255.255.0 U 600 0 0 wlp3s0 * runqemu starts qemu with hostfwd=tcp::2222-:22. That is, qemu is instructed to on the host listen on port 2222 and forward packets to port 22 of the guest. * From the host I can ssh into the guest with `ssh root@localhost -p2222`. When the ssh connection is up, `netstat -tupen` on the host prints Proto Recv-Q Send-Q Local Address Foreign Address State User Inode PID/Program name tcp 0 0 127.0.0.1:2222 127.0.0.1:37548 ESTABLISHED 1000 34788 2301/qemu-system-x8 tcp 0 0 127.0.0.1:37548 127.0.0.1:2222 ESTABLISHED 1000 40091 2331/ssh `netstat -tuen` inside the guest prints Proto Recv-Q Send-Q Local Address Foreign Address State tcp 0 0 ::ffff:10.0.2.15:22 ::ffff:10.0.2.2:37548 ESTABLISHED Has anyone any ideas? Thanks, regards, Manuel
|
|
|
|
Pls Help-me with this issue;
Neuber Sousa <neuberfran@...>
|
|
|
|
qemu: Enable guest access to the internet
Manuel Wagesreither
Hi all,
I would like to configure my host to allow the yocto-built qemu guest access the internet. I'm running qemu with kvm virtualization and slirp, and according to [1] it should just work. I'd like to find out why it doesn't. [1] https://www.linux-kvm.org/page/Networking#User_Networking Here's the current situation: * The guest has ip 10.0.2.15 and can ping my host with `ping 10.0.2.2`. * The host has no ip 10.0.0.0/16. * The guest cannot ping my hosts only ipv4 interface (besides lo) `ping 192.168.178.24`. * The guest cannot ping devices in the same LAN as my host: `ping 192.168.178.101`. * The host has sysctl configured like so: net.ipv4.conf.all.accept_source_route = 1 net.ipv4.conf.all.send_redirects = 1 net.ipv4.ip_forward = 1 net.ipv6.conf.all.accept_source_route = 1 net.ipv6.conf.all.forwarding = 1 * The hosts routing table: Destination Gateway Genmask Flags Metric Ref Use Iface 0.0.0.0 192.168.178.1 0.0.0.0 UG 600 0 0 wlp3s0 169.254.0.0 0.0.0.0 255.255.0.0 U 1000 0 0 wlp3s0 192.168.178.0 0.0.0.0 255.255.255.0 U 600 0 0 wlp3s0 * runqemu starts qemu with hostfwd=tcp::2222-:22. That is, qemu is instructed to on the host listen on port 2222 and forward packets to port 22 of the guest. * From the host I can ssh into the guest with `ssh root@localhost -p2222`. When the ssh connection is up, `netstat -tupen` on the host prints Proto Recv-Q Send-Q Local Address Foreign Address State User Inode PID/Program name tcp 0 0 127.0.0.1:2222 127.0.0.1:37548 ESTABLISHED 1000 34788 2301/qemu-system-x8 tcp 0 0 127.0.0.1:37548 127.0.0.1:2222 ESTABLISHED 1000 40091 2331/ssh `netstat -tuen` inside the guest prints Proto Recv-Q Send-Q Local Address Foreign Address State tcp 0 0 ::ffff:10.0.2.15:22 ::ffff:10.0.2.2:37548 ESTABLISHED Has anyone any ideas? Thanks, regards, Manuel
|
|
|
|
Ali
So I'm trying to build my recipe and it continuously fails at the The Source
The ErrorThe errors that are show are regarding the Licences and i've pasted a quick snippet below.
Things I've tried
Any help is appreciated.
|
|
|
|
Re: runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available.
Edgar Mobile
It's a mobile Nvidia Quadro M1000M with an official driver. Driver version...uuuh 495 something.
From: Alexander Kanavin <alex.kanavin@...>
Sent: Friday, March 18, 2022 7:28 PM To: Edgar Mobile <heideggm@...> Cc: yocto@... <yocto@...> Subject: Re: [yocto] runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available. Cheers :) Just wondering what GPU and driver are you using on the host?
Alex
On Fri, 18 Mar 2022 at 20:26, Edgar Mobile <heideggm@...> wrote:
|
|
|
|
Re: runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available.
Alexander Kanavin
Cheers :) Just wondering what GPU and driver are you using on the host? Alex
On Fri, 18 Mar 2022 at 20:26, Edgar Mobile <heideggm@...> wrote:
|
|
|
|
meta-java: classpath recipe needs inherit from pkgconfig in kirkstone
Darcy Watkins
Hi,
I am trying out a build that uses kirkstone branch for meta-java and master branch (as proxy for kirkstone) for everything else.
| configure: error: Library requirements (gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
dwatkins@carmd-ed-n11377-docker-dwatkins_voyager1:64bit build $ ls tmp/work/cortexa7hf-neon-poky-linux-gnueabi/gtk+3/ 3.24.31-r0 dwatkins@carmd-ed-n11377-docker-dwatkins_voyager1:64bit build $ ls tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/ 1_2.70.4-r0 dwatkins@carmd-ed-n11377-docker-dwatkins_voyager1:64bit build $ ls tmp/work/cortexa7hf-neon-poky-linux-gnueabi/gdk-pixbuf/ 2.42.6-r0 dwatkins@carmd-ed-n11377-docker-dwatkins_voyager1:64bit build $ ls tmp/work/cortexa7hf-neon-poky-linux-gnueabi/gtk+ 2.24.33-r0 dwatkins@carmd-ed-n11377-docker-dwatkins_voyager1:64bit build $ find tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/ | grep gthread tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/include/glib-2.0/gio/gthreadedsocketservice.h tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/include/glib-2.0/glib/gthreadpool.h tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/include/glib-2.0/glib/deprecated/gthread.h tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/include/glib-2.0/glib/gthread.h tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/lib/pkgconfig/gthread-2.0.pc tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/lib/libgthread-2.0.so tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/lib/libgthread-2.0.so.0 tmp/work/cortexa7hf-neon-poky-linux-gnueabi/glib-2.0/1_2.70.4-r0/image/usr/lib/libgthread-2.0.so.0.7000.4
All the prerequisites appear met. Have some of the variables used to setup sysroots, etc. changed in kirkstone but not been updated in meta-java yet?
ERROR: classpath-0.99-r3 do_configure: configure failed ERROR: classpath-0.99-r3 do_configure: ExecutionError('/home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702', 1, None, None) ERROR: Logfile of failure stored in: /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/log.do_configure.29702 Log data follows: | DEBUG: Executing python function extend_recipe_sysroot | NOTE: Direct dependencies are ['/home/dwatkins/workspace/mgos/voyager1/upstream/yocto/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb:do_populate_sysroot', 'virtual:native:/home/dwatkins/workspace/mgos/voyager1/upstream/yocto/poky/meta/recipes-extended/zip/zip_3.0.bb:do_populate_sysroot', '/home/dwatkins/workspace/mgos/voyager1/upstream/yocto/poky/meta/recipes-devtools/file/file_5.41.bb:do_populate_sysroot', '/home/dwatkins/workspace/mgos/voyager1/upstream/yocto/poky/meta/recipes-devtools/quilt/quilt-native_0.67.bb:do_populate_sysroot', 'virtual:native:/home/dwatkins/workspace/mgos/voyager1/upstream/yocto/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb:do_populate_sysroot',
---snip!---
| checking for remove... yes | checking for shmat... yes | checking for IceConnectionNumber in -lICE... yes | checking for XTestQueryExtension in -lXtst... yes | checking for pkg-config... no | *** The pkg-config script could not be found. Make sure it is | *** in your path, or set the PKG_CONFIG environment variable | *** to the full path to pkg-config. | *** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config. | configure: error: Library requirements (gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them. | NOTE: The following config.log files may provide further information. | NOTE: /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/build/config.log | ERROR: configure failed | WARNING: /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702:291 exit 1 from 'exit 1' | WARNING: Backtrace (BB generated script): | #1: bbfatal_log, /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702, line 291 | #2: oe_runconf, /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702, line 267 | #3: autotools_do_configure, /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702, line 237 | #4: do_configure, /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702, line 157 | #5: main, /home/dwatkins/workspace/mgos/voyager1/build/tmp/work/cortexa7hf-neon-poky-linux-gnueabi/classpath/0.99-r3/temp/run.do_configure.29702, line 295 ERROR: Task (/home/dwatkins/workspace/mgos/voyager1/upstream/yocto/meta-java/recipes-core/classpath/classpath_0.99.bb:do_configure) failed with exit code '1' NOTE: Tasks Summary: Attempted 2426 tasks of which 2418 didn't need to be rerun and 1 failed.
Summary: 1 task failed: /home/dwatkins/workspace/mgos/voyager1/upstream/yocto/meta-java/recipes-core/classpath/classpath_0.99.bb:do_configure Summary: There were 8 WARNING messages. Summary: There were 2 ERROR messages, returning a non-zero exit code.
The following appears to fix it….
dwatkins@carmd-ed-n11377-docker-dwatkins_voyager1:64bit meta-java $ git diff diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index 42c5daf..5bf1cf6 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc @@ -7,7 +7,7 @@ LICENSE = "GPL-2.0 & SAX-PD"
PBN = "classpath"
-inherit autotools java gettext +inherit autotools java gettext pkgconfig
DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file"
All I am doing is adding ‘pkgconfig’ to its inheritance list because the error message suggested “consider adjusting the PKG_CONFIG_PATH environment variable”.
Regards,
Darcy
Darcy Watkins :: Senior Staff Engineer, Firmware
SIERRA WIRELESS Direct +1 604 233 7989 :: Fax +1 604 231 1109 :: Main +1 604 231 1100 13811 Wireless Way :: Richmond, BC Canada V6V 3A4 [M4]
|
|
|
|
Re: runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available.
Edgar Mobile
Okay, I finally got it running. What I did:
Now I have a comfy Gles 3.2 context!
Tx
From: yocto@... <yocto@...> on behalf of Edgar Mobile <heideggm@...>
Sent: Thursday, March 17, 2022 2:00 PM To: Alexander Kanavin <alex.kanavin@...> Cc: yocto@... <yocto@...> Subject: Re: [yocto] runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available.
Ah, that's an interesting information.
The dmesg log gives the impression that virgl starts correctly and in the normal shell the examples work flawlessly. The problems start once I tell weston to use the ivi-shell instead of the desktop shell.
From: Alexander Kanavin <alex.kanavin@...>
Sent: Thursday, March 17, 2022 1:51 PM To: Edgar Mobile <heideggm@...> Cc: yocto@... <yocto@...> Subject: Re: [yocto] runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available. There is no hardware acceleration with bochs at all, if you want it,
you need to make virtio/virgl driver work. Alex On Thu, 17 Mar 2022 at 14:02, Edgar Mobile <heideggm@...> wrote: > > Do you know if bochs driver is available and active for yocto 3.4 or 3.5? > > ________________________________ > From: Alexander Kanavin <alex.kanavin@...> > Sent: Thursday, March 17, 2022 11:26 AM > To: Edgar Mobile <heideggm@...> > Cc: yocto@... <yocto@...> > Subject: Re: [yocto] runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available. > > As I told you, we do not support or test this combination. Which means > that figuring out what the error messages mean and how to fix them is > on you - patches welcome. > > Alex > > On Thu, 17 Mar 2022 at 11:41, Edgar Mobile <heideggm@...> wrote: > > > > I tried that first and it was horribly slow. That's why I try hardware acceleration now. > > > > Do you _know_ it doesn't work? If yes, why? > > > > ________________________________ > > From: Alexander Kanavin <alex.kanavin@...> > > Sent: Thursday, March 17, 2022 10:33 AM > > To: Edgar Mobile <heideggm@...> > > Cc: yocto@... <yocto@...> > > Subject: Re: [yocto] runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available. > > > > If you want an aarch guest on x86, then drop the gl option from > > runqemu. This will fall back to software rendering. > > > > Alex > > > > On Thu, 17 Mar 2022 at 10:33, Edgar Mobile <heideggm@...> wrote: > > > > > > Sorry, but I need an Aarch64 guest. > > > > > > Ok, using a newer qemu I now encounter the following problem: > > > > > > root@qemuarm64:/usr/bin# XDG_RUNTIME_DIR=/run/user/0 ./eglinfo > > > EGL client extensions string: > > > EGL_EXT_client_extensions EGL_EXT_device_base > > > EGL_EXT_device_enumeration EGL_EXT_device_query EGL_EXT_platform_base > > > EGL_KHR_client_get_all_proc_addresses EGL_KHR_debug > > > EGL_EXT_platform_device EGL_EXT_platform_wayland > > > EGL_KHR_platform_wayland EGL_EXT_platform_x11 EGL_KHR_platform_x11 > > > EGL_MESA_platform_xcb EGL_MESA_platform_gbm EGL_KHR_platform_gbm > > > EGL_MESA_platform_surfaceless > > > > > > GBM platform: > > > pci id for fd 3: 1234:1111, driver (null) > > > MESA-LOADER: failed to open bochs-drm: /usr/lib/dri/bochs-drm_dri.so: cannot open shared object file: No such file or directory (search paths /usr/lib/dri) > > > failed to load driver: bochs-drm > > > ... > > > > > > > > > What is this bochs-drm_dri.so and does Yocto / the Mesa in Yocto provide it? > > > > > > ________________________________ > > > From: Alexander Kanavin <alex.kanavin@...> > > > Sent: Wednesday, March 16, 2022 2:51 PM > > > To: Edgar Mobile <heideggm@...> > > > Cc: yocto@... <yocto@...> > > > Subject: Re: [yocto] runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available. > > > > > > This configuration is not tested. If you want accelerated gl, build > > > for the qemux86-64 target. > > > > > > Alex > > > > > > On Wed, 16 Mar 2022 at 12:46, Edgar Mobile <heideggm@...> wrote: > > > > > > > > Greetings, > > > > > > > > I tried to run an Aarch64 Yocto with qemu on amd 64 Host. For that purpose, I built core-image-weston from Hardknott following the manual > > > > > > > > https://www.mail-archive.com/yocto@.../msg07306.html > > > > > > > > I then try to run > > > > > > > > runqemu sdl gl > > > > > > > > But it always aborts with > > > > > > > > runqemu - ERROR - Failed to run qemu: qemu-system-aarch64: Virtio VGA not available. > > > > > > > > What can I do? > > > > > > > > Regards > > > > > > > > > > > >
|
|
|
|
[PATCH yocto-autobuilder-helper 6/6] scripts: run-docs-build: factor out yocto-docs tags and branches building
Quentin Schulz
From: Quentin Schulz <quentin.schulz@...>
Except patching which is specific to tags and yocto- tag prefix stripping, the logic is identical, so let's merge both loops together. Cc: Quentin Schuls <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index ab5b6db..ceda213 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -71,7 +71,8 @@ cd $ypdocs # Again, keeping even the no longer supported releases (see above comment) first_sphinx_commit=01dd5af7954e24552aca022917669b27bb0541ed -for branch in dunfell transition $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)'); do +first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 +for branch in dunfell transition $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)') $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*'); do if [ "$branch" = "HEAD" ]; then continue fi @@ -82,12 +83,21 @@ for branch in dunfell transition $(git branch --remote --contains "$first_sphinx continue fi - echo Building $branch branch + echo Building $branch git checkout $branch + + if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then + echo Adding patch for $branch + git am "${scriptdir}/docs-build-patches/${branch}/"000* + fi + git checkout master releases.rst make clean make publish + # Strip yocto- from tag names + branch=$(echo "$branch" | sed 's/yocto-//') + if [ "$branch" = "master-next" ]; then branch="next" mkdir $outputdir/$branch @@ -101,28 +111,6 @@ for branch in dunfell transition $(git branch --remote --contains "$first_sphinx git reset --hard done -# Yocto Project releases/tags -first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 - -cd $ypdocs -for tag in $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*'); do - echo Processing $tag - cd $ypdocs - git checkout $tag - if [ -e "${scriptdir}/docs-build-patches/${tag}/" ]; then - echo Adding patch for $tag - git am "${scriptdir}/docs-build-patches/${tag}/"000* - fi - git checkout master releases.rst - make clean - make publish - version=$(echo $tag | cut -c7-) - mkdir $outputdir/$version - cp -r ./_build/final/* $outputdir/$version - git reset --hard - echo Finished processing $tag -done - # get current release (e.g. most recent tag), and add a 'current' link tag=$(git tag --list 'yocto-*' | sort --version-sort | tail -1 | cut -c7-) echo Linking to $tag as current -- 2.35.1
|
|
|
|
[PATCH yocto-autobuilder-helper 5/6] scripts: run-docs-build: simplify sphinx-buildable yocto-docs tag list fetching
Quentin Schulz
From: Quentin Schulz <quentin.schulz@...>
The commit that introduced Sphinx support in yocto-docs is 01dd5af7954e24552aca022917669b27bb0541ed. Any tag containing this commit is buildable by sphinx. Dunfell tags don't all have Sphinx support. However, all tags containing the introducing commit c25fe058b88b893b0d146f3ed27320b47cdec236 are buildable by sphinx. Therefore, let's just list all tags which contains either of those two commits instead of the complex series of pipes and shell commands. Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index 1656975..ab5b6db 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -102,27 +102,25 @@ for branch in dunfell transition $(git branch --remote --contains "$first_sphinx done # Yocto Project releases/tags -v_sphinx='yocto-3.1.5' #This and newer versions have Sphinx docs. +first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 + cd $ypdocs -for tag in $(git tag --list 'yocto-*'); do - first=$(printf '%s\n%s' $tag $v_sphinx | sort --version-sort | head -n1) - if [ "$first" = "$v_sphinx" ]; then - echo Processing $tag - cd $ypdocs - git checkout $tag - if [ -e "${scriptdir}/docs-build-patches/${tag}/" ]; then - echo Adding patch for $tag - git am "${scriptdir}/docs-build-patches/${tag}/"000* - fi - git checkout master releases.rst - make clean - make publish - version=$(echo $tag | cut -c7-) - mkdir $outputdir/$version - cp -r ./_build/final/* $outputdir/$version - git reset --hard - echo Finished processing $tag +for tag in $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*'); do + echo Processing $tag + cd $ypdocs + git checkout $tag + if [ -e "${scriptdir}/docs-build-patches/${tag}/" ]; then + echo Adding patch for $tag + git am "${scriptdir}/docs-build-patches/${tag}/"000* fi + git checkout master releases.rst + make clean + make publish + version=$(echo $tag | cut -c7-) + mkdir $outputdir/$version + cp -r ./_build/final/* $outputdir/$version + git reset --hard + echo Finished processing $tag done # get current release (e.g. most recent tag), and add a 'current' link -- 2.35.1
|
|
|
|
[PATCH yocto-autobuilder-helper 4/6] scripts: run-docs-build: automatically build new yocto-docs branches
Quentin Schulz
From: Quentin Schulz <quentin.schulz@...>
Since commit 01dd5af7954e24552aca022917669b27bb0541ed, all later releases of yocto-docs can be built with Sphinx. Instead of manually updating this list, let's have git return the list of remote branches which contains the commit. dunfell branch was initially released without Sphinx support but was later patched, hence why it's explicitly listed. Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index 0055b19..1656975 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -70,7 +70,18 @@ rsync -irlp --checksum --ignore-times --delete bitbake docs@... cd $ypdocs # Again, keeping even the no longer supported releases (see above comment) -for branch in dunfell gatesgarth hardknott honister master master-next transition; do +first_sphinx_commit=01dd5af7954e24552aca022917669b27bb0541ed +for branch in dunfell transition $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)'); do + if [ "$branch" = "HEAD" ]; then + continue + fi + + # Do not build <release>-next branches as they are development branches only + # Do build master-next branch though! + if echo "$branch" | grep -v "master-next" | grep -q -E "-next$"; then + continue + fi + echo Building $branch branch git checkout $branch git checkout master releases.rst -- 2.35.1
|
|
|
|
[PATCH yocto-autobuilder-helper 3/6] scripts: run-docs-build: factor out all yocto-docs branches building
Quentin Schulz
From: Quentin Schulz <quentin.schulz@...>
master, master-next and transition only differ from other branches by their output directory name. Let's put everything in common and only have a check on whether the branch is master, master-next or transition and modify the output dir in those cases. Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index d8d77c7..0055b19 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -68,37 +68,24 @@ cd $outputdir rsync -irlp --checksum --ignore-times --delete bitbake docs@...:docs/ cd $ypdocs -echo Building master branch -git checkout master -make clean -make publish -cp -r ./_build/final/* $outputdir -cd $ypdocs -echo Building transition branch -git checkout transition -make clean -make publish -cp -r ./_build/final/* $outputdir/ - -cd $ypdocs -echo Building master-next branch -git checkout master-next -make clean -make publish -mkdir $outputdir/next -cp -r ./_build/final/* $outputdir/next - -# stable branches # Again, keeping even the no longer supported releases (see above comment) -for branch in dunfell gatesgarth hardknott honister; do - cd $ypdocs +for branch in dunfell gatesgarth hardknott honister master master-next transition; do echo Building $branch branch git checkout $branch git checkout master releases.rst make clean make publish - mkdir $outputdir/$branch + + if [ "$branch" = "master-next" ]; then + branch="next" + mkdir $outputdir/$branch + elif [ "$branch" = "master" ] || [ "$branch" = "transition" ]; then + branch="" + else + mkdir $outputdir/$branch + fi + cp -r ./_build/final/* $outputdir/$branch git reset --hard done -- 2.35.1
|
|
|
|
[PATCH yocto-autobuilder-helper 2/6] scripts: run-docs-build: automatically build new Bitbake branches
Quentin Schulz
From: Quentin Schulz <quentin.schulz@...>
Since commit 84ccba0f4aff91528f764523fe1205a354c889ed, docs of all later releases can be built with Sphinx. Instead of manually updating this list, let's have git return the list of remote branches which contains this commit. 1.46 branch was initially released without Sphinx support but was later patched, hence why it's explicitly listed. Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index f7b5f97..d8d77c7 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -37,7 +37,12 @@ mkdir $outputdir/bitbake # https://lists.yoctoproject.org/g/docs/message/2193 # We copy the releases.rst file from master so that all versions of the docs # see the latest releases. -for branch in 1.46 1.48 1.50 1.52 master master-next; do +first_sphinx_commit=84ccba0f4aff91528f764523fe1205a354c889ed +for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)'); do + if [ "$branch" = "HEAD" ]; then + continue + fi + echo Building bitbake $branch branch git checkout $branch git checkout master releases.rst -- 2.35.1
|
|
|