Re: [docs] Setting up layers in Yocto, the introduction
Hi Alex On 26.09.22 18:16, Alexander Kanavin wrote: TL;DR version =============
If you want to get everything needed to run a yocto build:
- clone the bootstrap repository (ask your distribution maintainer where it is): $ git clone bootstrap_repo_uri
- run 'setup-layers' from that repo: $ /path/to/bootstrap_repo/setup-layers
If you want to save the layers setup for replication elsewhere:
- save the config file and the replication script into a 'bootstrap repository') (this can be an organization-specific yocto layer, or a standalone repository): $ bitbake-layers create-layers-setup /path/to/bootstrap_repo
- document where the bootstrap repository can be found for your users
What is this layer setup tooling? (the long version) ====================================================
Once you have a working build with the correct set of layers, it is beneficial to capture the layer setup --- what they are, which repositories they come from and which SCM revisions they're at --- into a configuration file, so that this setup can be easily replicated later, perhaps on a different machine. Here's how to do this::
$ bitbake-layers create-layers-setup /srv/work/alex/meta-alex/ NOTE: Starting bitbake server... NOTE: Created /srv/work/alex/meta-alex/setup-layers.json NOTE: Created /srv/work/alex/meta-alex/setup-layers
The tool needs a single argument which tells where to place the output, consisting of a json formatted layer configuration, and a ``setup-layers`` script that can use that configuration to restore the layers in a different location, or on a different host machine. The argument can point to a custom layer (which is then deemed a "bootstrap" layer that needs to be checked out first), or into a completely independent location.
The replication of the layers is performed by running the ``setup-layers`` script provided above:
1. Clone the bootstrap layer or some other repository to obtain the json config and the setup script that can use it.
2. Run the script directly with no options::
alex@Zen2:/srv/work/alex/my-build$ meta-alex/setup-layers Note: not checking out source meta-alex, use --force-bootstraplayer-checkout to override.
Setting up source meta-intel, revision 15.0-hardknott-3.3-310-g0a96edae, branch master Running 'git init -q /srv/work/alex/my-build/meta-intel' Running 'git remote remove origin > /dev/null 2>&1; git remote add origin git://git.yoctoproject.org/meta-intel' in /srv/work/alex/my-build/meta-intel Running 'git fetch -q origin || true' in /srv/work/alex/my-build/meta-intel Running 'git checkout -q 0a96edae609a3f48befac36af82cf1eed6786b4a' in /srv/work/alex/my-build/meta-intel
Setting up source poky, revision 4.1_M1-372-g55483d28f2, branch akanavin/setup-layers Running 'git init -q /srv/work/alex/my-build/poky' Running 'git remote remove origin > /dev/null 2>&1; git remote add origin git://git.yoctoproject.org/poky' in /srv/work/alex/my-build/poky Running 'git fetch -q origin || true' in /srv/work/alex/my-build/poky Running 'git remote remove poky-contrib > /dev/null 2>&1; git remote add poky-contrib ssh://git@.../poky-contrib' in /srv/work/alex/my-build/poky Running 'git fetch -q poky-contrib || true' in /srv/work/alex/my-build/poky Running 'git checkout -q 11db0390b02acac1324e0f827beb0e2e3d0d1d63' in /srv/work/alex/my-build/poky
.. note::
This will work to update an existing checkout as well.
.. note:: The script is self-sufficient and requires only python3 and git on the build machine.
.. note:: Both the ``create-layers-setup`` and the ``setup-layers`` provided several additional options that customize their behavior - you are welcome to study them via ``--help`` command line parameter.
Questions and answers =====================
1. Why JSON, and not YAML?
JSON is a part of the python standard library, while YAML is not. This means you can bootstrap a build on just about any machine that has python and its core library, without first having to install any dependencies. JSON not quite as easy on the eye, but with decent indentation it's totally ok.
Before anyone asks, XML is appallingly difficult to read by modern standards of readability. No thanks.
2. I don't want the script in the bootstrap repo, just the config. I will provide my own tools. How?
Use --json-only to generate only the config, and not the script:
$ bitbake-layers create-layers-setup -json-only /srv/work/alex/meta-alex/
3. I want to generate the compatible json with my own tools. Is there a schema to validate it?
There is: https://git.yoctoproject.org/poky/tree/meta/files/layers.schema.json
You can use python3-jsonschema package to check the validity.
4. I don't want the json or the script, and would want to use an entirely different format and tools. Is 'create-layers-setup' hardcoded to the OE json format?
Actually not! Other formats can be added through a plugin mechanism. OE json writer is just the default plugin but others can be implemented and selected:
--writer {oe-setup-layers}, -w {oe-setup-layers} Choose the output format (defaults to oe-setup-layers).
5. I want to use something else than hardcoded revisions in the json (e.g. refer to branch names or tags).
No problem! Edit the json to say 'main' or 'release-x.y'. Anything that 'git checkout' can take will work. Just be careful that these modification are not overwritten later by 'create-layers-setup' by e.g. renaming the json file first.
6. I already have an existing checkout and want to update it to the latest greatest. How?
First, update the bootstrap repository to the latest (or otherwise desired) revision to obtain the latest versions of the script, and the json config. Ask the distro maintainers for the recommended practice to do so.
Then, run the script again - it should be able to handle a layers checkout that already exists, and update everything accoriding to the latest json, obtained in the first step.
7. Ok, I have checked out all the layers. Now what?
The next step is to actually set up a yocto build from an existing configuration template, and start a bitbake session. This is made separate from handling the layer repositories and will be described separately. Thank you for the proposed documentation. Do you want me to look for an appropriate place in the documentation sources where it could be included, and then propose a patch? Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
Hi Luka, On 10/4/22 22:54, Luca Ceresoli wrote: Hi Quentin, On Tue, 4 Oct 2022 10:15:20 +0200 Quentin Schulz <quentin.schulz@...> wrote:
Hi Luca,
On 10/3/22 23:15, Luca Ceresoli wrote:
Hi Quentin,
On Mon, 3 Oct 2022 19:04:01 +0200 "Quentin Schulz" <foss@...> wrote:
From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx Sure this is correct? 'git clean -ffdx' does not revert changes to tracked files, be them staged or not. Nope, not sure this is correct. I misread git clean manpage, we should have a git reset --hard and git clean -ffdx. Now the question is when those are necessary because with this patch we do it twice, before and after the git checkout. I did this because I remember doing checkouts between branches of U-Boot/kernel and while the pre-checkout branch was not dirty, the after-checkout branch was dirty. I assume this might have something to do with build artifacts of the pre-checkout build that weren't .gitignored in the afer-checkout branch? Something that git clean -ffdx should tackle I think.
Sooo, I guess only having git reset --hard and git clean -ffdx before a checkout should be enough and we don't need them both before and after the checkout like I did in this patch? I think 'reset --hard' + 'clean -ffdx' only before the checkout should be enough. However I'm not sure whether there are corner cases such as a file that is .gitignored in commit A and versioned in commit B or similar. Perhaps worth trying with reset+clean only before, and see I guess it does not hurt to be on the safe side by having them before and after the git checkout then? Since the current issue went unnoticed for months... what happens. However I don't know exactly the initial problem you're trying to fix.
https://lore.kernel.org/yocto-docs/e50abe3c777e4a23a752a3ec25ad0b2a@axis.com/T/#tCheers, Quentin
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
Hi Quentin, On Tue, 4 Oct 2022 10:15:20 +0200 Quentin Schulz <quentin.schulz@...> wrote: Hi Luca,
On 10/3/22 23:15, Luca Ceresoli wrote:
Hi Quentin,
On Mon, 3 Oct 2022 19:04:01 +0200 "Quentin Schulz" <foss@...> wrote:
From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx Sure this is correct? 'git clean -ffdx' does not revert changes to tracked files, be them staged or not. Nope, not sure this is correct. I misread git clean manpage, we should have a git reset --hard and git clean -ffdx. Now the question is when those are necessary because with this patch we do it twice, before and after the git checkout. I did this because I remember doing checkouts between branches of U-Boot/kernel and while the pre-checkout branch was not dirty, the after-checkout branch was dirty. I assume this might have something to do with build artifacts of the pre-checkout build that weren't .gitignored in the afer-checkout branch? Something that git clean -ffdx should tackle I think.
Sooo, I guess only having git reset --hard and git clean -ffdx before a checkout should be enough and we don't need them both before and after the checkout like I did in this patch? I think 'reset --hard' + 'clean -ffdx' only before the checkout should be enough. However I'm not sure whether there are corner cases such as a file that is .gitignored in commit A and versioned in commit B or similar. Perhaps worth trying with reset+clean only before, and see what happens. However I don't know exactly the initial problem you're trying to fix. -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
|
|
You can simply open the recipe file for core-image-rt (in poky/meta) to see what it does. The realtime-ness (of any image) is set by setting PREFERRED_PROVIDER_virtual/kernel to the realtime flavour, which you already did, and so core-image-full-cmdline will be just as realtime as this one.
We do not have a lot of automated testing for the realtime behaviour, as it is difficult to control in a qemu based virtual environment. There's basically just poky/meta/lib/oeqa/runtime/cases/rt.py
If you want to check timings, etc. you will have to most likely put the image on real hardware, and experiment with running tests and utilities from command line. Then you can think of how to automate them.
It would help if you describe your overall goal.
Alex
toggle quoted message
Show quoted text
On Tue, 4 Oct 2022 at 21:21, Nikita Gupta <nikitagupta2509@...> wrote: Hello Alexander
But core-image-full-cmdline is not going to give real time exposure, isn't it? The requirement is to make real time image so core-image-full-cmdline will satisfy the requirement?
And would i need to run test of rt-suit one-by one or there is something so i can run in one go? Can you refer me some documents in which I get all these information as I didn't find all these info in one document.
As I am new in this thing please guide me . Your guidance is highly appreciated.
On Tue, Oct 4, 2022, 18:31 Alexander Kanavin <alex.kanavin@...> wrote:
The log file seems truncated?
To enable the standard rt test, use
TEST_SUITES:append = ' rt'
as seen in https://git.yoctoproject.org/yocto-autobuilder-helper/tree/config.json#n1138
and build core-image-full-cmdline. core-image-rt is not well tested unfortunately.
Alex
On Sun, 2 Oct 2022 at 16:15, Nikita Gupta <nikitagupta2509@...> wrote:
Hello Alexander,
Please find log.do_rootfs file for the image.
|
|
Nikita Gupta <nikitagupta2509@...>
Hello Alexander
But core-image-full-cmdline is not going to give real time exposure, isn't it? The requirement is to make real time image so core-image-full-cmdline will satisfy the requirement?
And would i need to run test of rt-suit one-by one or there is something so i can run in one go? Can you refer me some documents in which I get all these information as I didn't find all these info in one document.
As I am new in this thing please guide me . Your guidance is highly appreciated.
toggle quoted message
Show quoted text
|
|
Yocto Project Status 04 October 2022 (WW40)
Current Dev Position: YP 4.1 M4 (In QA) Next Deadline: 28th October 2022 YP 4.1 Release Next Team Meetings: Key Status/Updates: - YP 4.1 rc2 is now in QA
- Richard will not be around for the next two weeks. With 4.1 rc2 in QA for the next week, things should be quiet and the TSC can then decide on whether to release or if an rc3 is needed for any reason. Alexandre/Luca will test/queue patches during this time, patches are not expected to merge. Ross is around and should be able to cover most other things if/as needed.
- At release we released the core layer was still advertising kirkstone so this was removed. This did mean some simple changes were needed to layers to mark compatibility with the new release, we’ll aim to do this earlier in the next release.
- YP 4.2 Proposed Timeline document is at: https://docs.google.com/document/d/1X5KM_3BiEsIrHBO93ULvYHQJ72NqS5U5jjwWo5bxTiY/edit?usp=sharing
- Help is very much welcome in trying to resolve our autobuilder intermittent issues. You can see the list of failures we’re continuing to see by searching for the “AB-INT” tag in bugzilla: https://bugzilla.yoctoproject.org/buglist.cgi?quicksearch=AB-INT
Ways to contribute: YP 4.1 Milestone Dates: - YP 4.1 M4 is built and in QA
- YP 4.1 M4 Release date 2022/10/28
Upcoming dot releases: - YP 3.1.20 build date 2022/10/10
- YP 3.1.20 Release date 2022/10/21
- YP 4.0.5 build date 2022/10/31
- YP 4.0.5 Release date 2022/11/11
Tracking Metrics: The Yocto Project’s technical governance is through its Technical Steering Committee, more information is available at: https://wiki.yoctoproject.org/wiki/TSC The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you’d like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
|
toggle quoted message
Show quoted text
On Sun, 2 Oct 2022 at 16:15, Nikita Gupta <nikitagupta2509@...> wrote: Hello Alexander,
Please find log.do_rootfs file for the image.
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
Hi Luca, On 10/3/22 23:15, Luca Ceresoli wrote: Hi Quentin, On Mon, 3 Oct 2022 19:04:01 +0200 "Quentin Schulz" <foss@...> wrote:
From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx Sure this is correct? 'git clean -ffdx' does not revert changes to tracked files, be them staged or not.
Nope, not sure this is correct. I misread git clean manpage, we should have a git reset --hard and git clean -ffdx. Now the question is when those are necessary because with this patch we do it twice, before and after the git checkout. I did this because I remember doing checkouts between branches of U-Boot/kernel and while the pre-checkout branch was not dirty, the after-checkout branch was dirty. I assume this might have something to do with build artifacts of the pre-checkout build that weren't .gitignored in the afer-checkout branch? Something that git clean -ffdx should tackle I think. Sooo, I guess only having git reset --hard and git clean -ffdx before a checkout should be enough and we don't need them both before and after the checkout like I did in this patch? Cheers, Quentin
|
|
M+ & H bugs with Milestone Movements WW40
All,
YP M+ or high bugs which moved to a new milestone in WW40 are listed below: Priority | Bug ID | Short Description | Changer | Owner | Was | Became | Medium+ | 14920 | oe-selftest-armhost qemu x86-64 kernel NULL pointer dereference in handle_level_irq/setup_IO_APIC | richard.purdie@... | bruce.ashfield@... | 4.2 M1 | 0.0.0 |
Thanks, Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
|
Enhancements/Bugs closed WW40!
All,
The below were the owners of enhancements or bugs closed during the last week! Who | Count | ross.burton@... | 2 | richard.purdie@... | 1 | chee.yang.lee@... | 1 | Grand Total | 4 |
Thanks, Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
|
Current high bug count owners for Yocto Project 4.1
All,
Below is the list as of top 33 bug owners as of the end of WW40 of who have open medium or higher bugs and enhancements against YP 4.1. There are 18 possible work days left until the final release candidates for YP 4.1 needs to be released. Who | Count | michael.opdenacker@... | 33 | david.reyna@... | 23 | ross.burton@... | 17 | randy.macleod@... | 16 | richard.purdie@... | 13 | sakib.sajal@... | 11 | JPEWhacker@... | 9 | bruce.ashfield@... | 6 | Aryaman.Gupta@... | 6 | pavel@... | 5 | tim.orling@... | 4 | sundeep.kokkonda@... | 3 | jon.mason@... | 3 | pgowda.cve@... | 3 | akuster808@... | 3 | hongxu.jia@... | 2 | raj.khem@... | 2 | tvgamblin@... | 2 | sgw@... | 2 | Qi.Chen@... | 2 | open.source@... | 1 | Martin.Jansa@... | 1 | behanw@... | 1 | shachar@... | 1 | saul.wold@... | 1 | alexandre.belloni@... | 1 | martin.beeger@... | 1 | ola.x.nilsson@... | 1 | aehs29@... | 1 | thomas.perrot@... | 1 | mostthingsweb@... | 1 | ptsneves@... | 1 | nicolas.dechesne@... | 1 | Grand Total | 178 |
Thanks, Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
|
Yocto Project Newcomer & Unassigned Bugs - Help Needed
All, The triage team is starting to try and collect up and classify bugs which a newcomer to the project would be able to work on in a way which means people can find them. They're being listed on the triage page under the appropriate heading: https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs Also please review: https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded and how to create a bugzilla account at: https://bugzilla.yoctoproject.org/createaccount.cgi The idea is these bugs should be straight forward for a person to help work on who doesn't have deep experience with the project. If anyone can help, please take ownership of the bug and send patches! If anyone needs help/advice there are people on irc who can likely do so, or some of the more experienced contributors will likely be happy to help too. Also, the triage team meets weekly and does its best to handle the bugs reported into the Bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 408 unassigned or newcomer bugs. We're hoping people may be able to spare some time now and again to help out with these. Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system. There are also roughly four different "priority" classes right now, “4.1”, “4.2”, “4.3”, "4.99" and "Future", the more pressing/urgent issues being in "4.1" and then “4.2”. Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (sjolley.yp.pm@...) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a Bugzilla account). The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer_Bugs Thanks, Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
|
Re: [qa-build-notification] QA notification for completed autobuilder build (yocto-4.1.rc2)
Hi all, Intel and WR YP QA is planning for QA execution for YP build yocto-4.1.rc2. We are planning to execute following tests for this cycle: OEQA-manual tests for following module: 1. OE-Core 2. BSP-hw Runtime auto test for following platforms: 1. MinnowTurbot 32-bit 2. NUC 7 3. NUC 6 4. Edgerouter 5. Beaglebone ETA for completion next Tuesday, October 11. Best regards, Jing Hui
toggle quoted message
Show quoted text
-----Original Message----- From: qa-build-notification@... <qa-build- notification@...> On Behalf Of Pokybuild User Sent: Saturday, 1 October, 2022 6:50 AM To: yocto@... Cc: qa-build-notification@... Subject: [qa-build-notification] QA notification for completed autobuilder build (yocto-4.1.rc2)
A build flagged for QA (yocto-4.1.rc2) was completed on the autobuilder and is available at:
https://autobuilder.yocto.io/pub/releases/yocto-4.1.rc2
Build hash information:
bitbake: 074da4c469d1f4177a1c5be72b9f3ccdfd379d67 meta-agl: e7e9216ccead73fdf6054301e68396ab04710c6f meta-arm: aa89fe3f08cb8406f9f1082c683bd71cd04628fb meta-aws: 729928fb7ce4a74546b68dd31390a3f6057ab92c meta-intel: 940218bd438776026398617033e09f288dae0137 meta-mingw: b0067202db8573df3d23d199f82987cebe1bee2c meta-openembedded: 0782ea454af5b88cd686ac572c397d92e5912de4 meta-virtualization: 3fe3e0971d7d14cbd06f54cad942fa2ed86c5048 oecore: 744a2277844ec9a384a9ca7dae2a634d5a0d3590 poky: 5200799866b92259e855051112520006e1aaaac0
This is an automated message from the Yocto Project Autobuilder Git: git://git.yoctoproject.org/yocto-autobuilder2 Email: richard.purdie@...
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
On Mon, 3 Oct 2022 19:11:34 +0200 "Michael Opdenacker via lists.yoctoproject.org" <michael.opdenacker=bootlin.com@...> wrote: Hi Quentin,
On 03.10.22 19:04, Quentin Schulz wrote:
From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx In both cases, why "-ffdx"? Isn't it the same as "-fdx" (just checking the manual page). The manpage for git 2.34.1 has this extra detail: Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given. -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
Hi Quentin, On Mon, 3 Oct 2022 19:04:01 +0200 "Quentin Schulz" <foss@...> wrote: From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx Sure this is correct? 'git clean -ffdx' does not revert changes to tracked files, be them staged or not. done if [ "$PUBLISH" -ne 0 ]; then @@ -100,8 +101,7 @@ first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 git checkout origin/master set_versions.py #latest_tag=$(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" --sort="version:refname" 'yocto-*' | tail -1 | sed 's/yocto-//') latest_tag=$(./set_versions.py getlatest) -git reset --hard -git clean -f +git clean -ffdx 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 @@ -116,6 +116,7 @@ for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" -- echo Building $branch git checkout $branch + git clean -ffdx if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then echo Adding patch for $branch @@ -160,8 +161,7 @@ for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" -- fi cp -r ./_build/final/* $outputdir/$branch - git reset --hard - git clean -f + git clean -ffdx Same here. -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
Hi Quentin, On 03.10.22 19:04, Quentin Schulz wrote: From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx In both cases, why "-ffdx"? Isn't it the same as "-fdx" (just checking the manual page). Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
|
|
Re: [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
Hi all, On 10/3/22 19:04, Quentin Schulz wrote: From: Quentin Schulz <quentin.schulz@...> It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- Forgot to say this was not tested. Let's run this on the autobuilder and see if it helps? Is there a way to try without merging? Cheers, Quentin
|
|
[PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds
From: Quentin Schulz <quentin.schulz@...>
It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build
Cc: Quentin Schulz <foss+yocto@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- scripts/run-docs-build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..69e3257 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for fi cp -r ./_build/final/* $outputdir/bitbake/$branch - git reset --hard + git clean -ffdx done if [ "$PUBLISH" -ne 0 ]; then @@ -100,8 +101,7 @@ first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 git checkout origin/master set_versions.py #latest_tag=$(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" --sort="version:refname" 'yocto-*' | tail -1 | sed 's/yocto-//') latest_tag=$(./set_versions.py getlatest) -git reset --hard -git clean -f +git clean -ffdx 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 @@ -116,6 +116,7 @@ for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" -- echo Building $branch git checkout $branch + git clean -ffdx if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then echo Adding patch for $branch @@ -160,8 +161,7 @@ for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" -- fi cp -r ./_build/final/* $outputdir/$branch - git reset --hard - git clean -f + git clean -ffdx done # Update bitbake switchers.js with the copy from master ypdocs -- 2.37.3
|
|
Re: [meta-cgl][PATCH 1/2] layer.conf: add langdale to LAYERSERIES_COMPAT

Jeremy Puhlman
Merged.
toggle quoted message
Show quoted text
On 10/2/2022 6:53 AM, Yi Zhao wrote: Signed-off-by: Yi Zhao <yi.zhao@...> --- meta-cgl-common/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-cgl-common/conf/layer.conf b/meta-cgl-common/conf/layer.conf index 2e21879..865ed9f 100644 --- a/meta-cgl-common/conf/layer.conf +++ b/meta-cgl-common/conf/layer.conf @@ -11,6 +11,6 @@ BBFILE_PRIORITY_cgl-common = "7" LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux" -LAYERSERIES_COMPAT_cgl-common = "honister kirkstone" +LAYERSERIES_COMPAT_cgl-common = "honister kirkstone langdale" require conf/distro/include/cgl_common_security_flags.inc
|
|
Nikita Gupta <nikitagupta2509@...>
Hello Alexander,
Please find log.do_rootfs file for the image.
|
|