wic crash when building image with multiple partitions
Marek Belisko
Hello,
I'm on dunfell release and building mender image with following wks file: | + echo '### Contents of wks file ###' | ### Contents of wks file ### | + cat /home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/mender-sdimg.wks | part --source rawcopy --sourceparams="file=/home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/uboot.env" --ondisk "mmcblk0" --align 8192 --no-table | part --source rootfs --rootfs-dir /home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/bootfs.image_sdimg --ondisk "mmcblk0" --fstype=vfat --label boot --align 8192 --fixed-size 16 --active | part --source rawcopy --sourceparams="file=/home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/deploy-core-image-minimal-image-complete/core-image-minimal-raspberrypi4.ext4" --ondisk "mmcblk0" --align 8192 --fixed-size 172032k | part --source rawcopy --sourceparams="file=/home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/deploy-core-image-minimal-image-complete/core-image-minimal-raspberrypi4.ext4" --ondisk "mmcblk0" --align 8192 --fixed-size 172032k | part swap --ondisk "mmcblk0" --fstype=swap --label swap --align 8192 --size 512 | part --source rawcopy --sourceparams="file=/home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/deploy-core-image-minimal-image-complete/core-image-minimal-raspberrypi4.dataimg" --ondisk "mmcblk0" --align 8192 --fixed-size 128 | | bootloader --ptable msdos | + echo '### End of contents of wks file ###' | ### End of contents of wks file ### Without a swap partition image is built fine without any issue. When swap partition is added to wks file I'm getting following error: | INFO: Creating image(s)... | | Traceback (most recent call last): | File "/home/marek/projects/kas-test/poky/scripts/wic", line 542, in <module> | sys.exit(main(sys.argv[1:])) | File "/home/marek/projects/kas-test/poky/scripts/wic", line 537, in main | return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands) | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/help.py", line 83, in invoke_subcommand | subcmd[0](args, usage) | File "/home/marek/projects/kas-test/poky/scripts/wic", line 219, in wic_create_subcommand | engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/engine.py", line 190, in wic_create | plugin.do_create() | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/plugins/imager/direct.py", line 96, in do_create | self.create() | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/plugins/imager/direct.py", line 180, in create | self._image.prepare(self) | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/plugins/imager/direct.py", line 354, in prepare | part.prepare(imager, imager.workdir, imager.oe_builddir, | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/partition.py", line 182, in prepare | plugin.do_prepare_partition(self, srcparams_dict, creator, | File "/home/marek/projects/kas-test/poky/scripts/lib/wic/plugins/source/rootfs.py", line 112, in do_prepare_partition | copyhardlinktree(orig_dir, new_rootfs) | File "/home/marek/projects/kas-test/poky/meta/lib/oe/path.py", line 121, in copyhardlinktree | subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) | File "/home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/recipe-sysroot-native/usr/lib/python3.8/subprocess.py", line 411, in check_output | return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, | File "/home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/recipe-sysroot-native/usr/lib/python3.8/subprocess.py", line 512, in run | raise CalledProcessError(retcode, process.args, | subprocess.CalledProcessError: Command 'cd /home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/bootfs.image_sdimg; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -S -C /home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/bootfs.image_sdimg -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C /home/marek/projects/kas-test/build/tmp/work/raspberrypi4-poky-linux-gnueabi/core-image-minimal/1.0-r0/deploy-core-image-minimal-image-complete/core-image-minimal-raspberrypi4-20211115212420-sdimg/tmp.wic.1oe9hwjw/rootfs2' returned non-zero exit status 2. I tried to debug it but didn't find anything obvious. I'm sure this was working fine in previous releases. Any ideas? Thanks and BR, marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: [meta-security][hardknott][PATCH] sssd: re-package to fix QA issues
Hold up, there is a problem with these.
toggle quoted message
Show quoted text
On 11/15/2021 7:50 PM, Jeremy A. Puhlman wrote:
It packages all file in ${libdir} to package sssd, including the .so |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: meta-intel / zeus
Anuj Mittal
On Mon, 2021-11-15 at 17:32 +0000, Monsees, Steven C (US) via
lists.yoctoproject.org wrote: meta-oe has recipes for both Khronos loader as well as ocl-icd that NEO prefers. Layerindex can also be used to check these sort of things: https://layers.openembedded.org/layerindex/branch/master/recipes/?q=icd Thanks, Anuj |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
M+ & H bugs with Milestone Movements WW46
Stephen Jolley
All,
Thanks,
Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Enhancements/Bugs closed WW46!
Stephen Jolley
All,
Thanks,
Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Current high bug count owners for Yocto Project 3.5
Stephen Jolley
All,
Thanks,
Stephen K. Jolley Yocto Project Program Manager ( Cell: (208) 244-4460 * Email: sjolley.yp.pm@...
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Yocto Project Newcomer & Unassigned Bugs - Help Needed
Stephen Jolley
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 392 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, “3.4”, “3.5, "3.99" and "Future", the more pressing/urgent issues being in "3.4" and then “3.5”.
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@...
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
meta-intel / zeus
Monsees, Steven C (US)
Recently I built in base intel NEO driver components under meta-intel… It appears I require a little more than just NEO.
Does yocto support the khronos icd loader ?, Is there something I can build/enable tp provide this ?
Currently running under zeus, but if a newer version of Yocto supports it that would be good to know.
Thanks, Steve |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
[meta-zephyr][PATCH] zephyr-kernel-src: fix build with latest dtc
Ross Burton <ross@...>
dtc is now built with Meson, which changes the version string in the
--version output. Zephyr matches this in a regular expression which now fails, so update it to match both Make and Meson formats. Signed-off-by: Ross Burton <ross.burton@...> --- recipes-kernel/zephyr-kernel/files/dtc.patch | 43 +++++++++++++++++++ .../zephyr-kernel/zephyr-kernel-src-2.7.0.inc | 1 + 2 files changed, 44 insertions(+) create mode 100644 recipes-kernel/zephyr-kernel/files/dtc.patch diff --git a/recipes-kernel/zephyr-kernel/files/dtc.patch b/recipes-kerne= l/zephyr-kernel/files/dtc.patch new file mode 100644 index 0000000..f23a438 --- /dev/null +++ b/recipes-kernel/zephyr-kernel/files/dtc.patch @@ -0,0 +1,43 @@ +Upstream-Status: Submitted [https://github.com/zephyrproject-rtos/zephyr= /pull/40364] +Signed-off-by: Ross Burton <ross.burton@...> + +From deb6e9b29d77f0d86eb188fb3c5fc6f470277d3d Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@...> +Date: Mon, 15 Nov 2021 14:01:47 +0000 +Subject: [PATCH] cmake: expand DTC version regex + +DTC can be built with both traditional Makefiles or Meson. When built +with Makefiles the --version output looks like 'Version: DTC +1.6.1-dirty' but when built with Meson the output is 'Version: DTC +v1.6.1+. + +This fails to match the version regex and the cmake then fails: + +CMake Error at cmake/host-tools.cmake:28 (if): + if given arguments: + "VERSION_GREATER" "1.4.6" + Unknown arguments specified + +Expanding the regex with an optional 'v' covers both cases and the build +succeeds. + +Signed-off-by: Ross Burton <ross.burton@...> +--- + cmake/host-tools.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/host-tools.cmake b/cmake/host-tools.cmake +index cb7bf2e281..93d33d6390 100644 +--- a/cmake/host-tools.cmake ++++ b/cmake/host-tools.cmake +@@ -20,7 +20,7 @@ if(DTC) + ) +=20 + if(${dtc_status} EQUAL 0) +- string(REGEX MATCH "Version: DTC ([0-9]+[.][0-9]+[.][0-9]+).*" out_= var ${dtc_version_output}) ++ string(REGEX MATCH "Version: DTC v?([0-9]+[.][0-9]+[.][0-9]+).*" ou= t_var ${dtc_version_output}) +=20 + # Since it is optional, an outdated version is not an error. If an + # outdated version is discovered, print a warning and proceed as if +--=20 +2.25.1 diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc b/r= ecipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc index a1619a7..db42418 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.0.inc @@ -14,4 +14,5 @@ PV =3D "2.7.0+git${SRCPV}" =20 SRC_URI:append =3D " file://0001-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-c= ross-compila.patch \ + file://dtc.patch \ " --=20 2.25.1 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
[meta-raspberrypi][PATCH] rpi-config: Take into consideration ENABLE_UART value of 0
Andrei Gherzan
Also, validate if the value of it is not 0 or 1.
Fixes: https://github.com/agherzan/meta-raspberrypi/issues/567 Signed-off-by: Andrei Gherzan <andrei@...> --- recipes-bsp/bootfiles/rpi-config_git.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb index 13a0714..fe18884 100644 --- a/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/recipes-bsp/bootfiles/rpi-config_git.bb @@ -174,9 +174,11 @@ do_deploy() { fi # UART support - if [ "${ENABLE_UART}" = "1" ]; then + if [ "${ENABLE_UART}" = "1" ] || [ "${ENABLE_UART}" = "0" ] ; then echo "# Enable UART" >>$CONFIG - echo "enable_uart=1" >>$CONFIG + echo "enable_uart=${ENABLE_UART}" >>$CONFIG + else + bbfatal "Invalid value for ENABLE_UART [${ENABLE_UART}]. The value for ENABLE_UART can be 0 or 1." fi # Infrared support -- 2.33.0 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
[meta-raspberrypi][PATCH] libwpe: Migrate build workaround from oe-core
Andrei Gherzan
This was removed from oe-core[1] so we pull in the change here where it
should have been in the first place. Fixes: https://github.com/agherzan/meta-raspberrypi/issues/893 [1] https://lists.openembedded.org/g/openembedded-core/topic/84653556 Signed-off-by: Andrei Gherzan <andrei@...> --- recipes-sato/libwpe_%.bbappend | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipes-sato/libwpe_%.bbappend diff --git a/recipes-sato/libwpe_%.bbappend b/recipes-sato/libwpe_%.bbappend new file mode 100644 index 0000000..fe1e59b --- /dev/null +++ b/recipes-sato/libwpe_%.bbappend @@ -0,0 +1,2 @@ +# Workaround build issue with RPi userland EGL libraries. +CFLAGS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" -- 2.33.0 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: [meta-selinux][PATCH] openssh: don't overwrite sshd_config unconditionally
akash hadke
Hi,
Is there any update for this patch? |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: Cross-compile custom ROS2 package for Yocto
#bitbake
Hello, Matthias.
It seems the issue was around naming. Now it works fine even without
FILES:${PN} at the end of .bb file. I am now good to move forward. Thank you very much for your assistance. It is really appreciated. Sincerely, Bojan. |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
[meta-mingw] [PATCH] dtc: update for recipe changes in oe-core
Ross Burton <ross@...>
The tools now build for MinGW so we don't need to disable them, but
as ncurses still fails we should continue to remove the bash RDEPENDS. Signed-off-by: Ross Burton <ross.burton@...> --- recipes-core/dtc/dtc_%.bbappend | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/recipes-core/dtc/dtc_%.bbappend b/recipes-core/dtc/dtc_%.bba= ppend index 2d27a0a..b71c46b 100644 --- a/recipes-core/dtc/dtc_%.bbappend +++ b/recipes-core/dtc/dtc_%.bbappend @@ -1,16 +1 @@ - -do_configure:append:mingw32 () { - # don't try to build the other dtc components when installing libs - sed -i 's/install-lib: all/install-lib: libfdt/g' ${S}/Makefile -} - -do_compile:mingw32 () { - oe_runmake libfdt -} - -do_install:mingw32 () { - oe_runmake install-lib install-includes -} - RDEPENDS:${PN}-misc:remove:mingw32 =3D "bash" - --=20 2.25.1 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: Cross-compile custom ROS2 package for Yocto
#bitbake
Matthias Schoepfer
Hi Bojan, you do not need the additional FILES:${PN} if your package is properly named (i.e. cmake project name same as recipe same as package). I have no clue why the executable is not found, did you source the environment before?! Regards, Matthias On 11/10/21 8:37 PM, bojankoce wrote:
In addition to the above changes, I also included instructions inside |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: Yocto suddenly creating directories with 700 instead 755.
Manuel Wagesreither
Am Fr, 12. Nov 2021, um 11:35, schrieb Richard Purdie:
On Thu, 2021-11-11 at 18:28 -0500, Stephen John Smoogen wrote:Thanks a lot. I will read through the links and commits provided and see if that helps us.On Thu, 11 Nov 2021 at 11:10, Manuel Wagesreither <ManWag@...> wrote:I'd note there were a number of fixes for umask issues in master/honister:when I did this to myself recently, I had changed the shells default We are currently using poky on dunfell as it were on early September: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=bdd30be1a3815f70062d8febca91eaf042a77c3d. Regards, Manuel |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: Yocto suddenly creating directories with 700 instead 755.
Richard Purdie
On Thu, 2021-11-11 at 18:28 -0500, Stephen John Smoogen wrote:
On Thu, 11 Nov 2021 at 11:10, Manuel Wagesreither <ManWag@...> wrote:I'd note there were a number of fixes for umask issues in master/honister:when I did this to myself recently, I had changed the shells default http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=f4fb74465787b50030d7fed5e0b293774ccb371b http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=c4ecf7c1122380cdbc74fe692aa91756dc5bdf6b http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=522607e704876c67ed093bac47dde9238709ccae http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=58c97902933cced2981dfc7480fc0a458b4fb900 Cheers, Richard |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: Yocto suddenly creating directories with 700 instead 755.
Stephen John Smoogen
On Thu, 11 Nov 2021 at 11:10, Manuel Wagesreither <ManWag@...> wrote:
when I did this to myself recently, I had changed the shells default umask value to 077 which caused exactly what you are listing. I would check to see if the users or system wide umask was changed recently by an update. -- Stephen J Smoogen. Let us be kind to one another, for most of us are fighting a hard battle. -- Ian MacClaren |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Re: Yocto suddenly creating directories with 700 instead 755.
Richard Purdie
On Thu, 2021-11-11 at 17:10 +0100, Manuel Wagesreither wrote:
tl;dr:You don't mention which version of the project this is with which may be important and relevant as we've fixed things related to these kinds of issues. Bottom line is that file mode you see on disk will be determined by the umask bitbake is being run under. The file modes on disk are not the file modes used though since pseudo emulates modes as well as users like root. The 134 exit code is usually pseudo aborting and there should be information in the rootfs logs about which files it had concerns over, likely inode mismatches. Also see the WORKDIR/pseudo/pseudo.log. This has it's own wiki page: https://wiki.yoctoproject.org/wiki/Pseudo_Abort I'd also add that the core directories have permissions determined by: http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/files/fs-perms.txt and code in package.bbclass should be ensuring those directories always have consistent permission bits. This brings me back to which release/version of the metadata is this? Cheers, Richard |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
[meta-rockchip][PATCH] trusted-firmware-a: replace baudrate with the one specified in machine conf
Quentin Schulz
Not all Rockchip boards have their console running at 1500000 baud in
U-Boot and the kernel. Such is the case for puma-haikou RK3399-based SoM+Carrierboard. In order to prepare for the addition of puma-haikou to meta-rockchip, let's replace the baudrate in TF-A by the one defined in the machine conf file in the RK_CONSOLE_BAUD variable. Cc: Quentin Schulz <foss@...> Signed-off-by: Quentin Schulz <quentin.schulz@...> --- .../files/serial-console-baudrate.patch | 36 ------------------- .../trusted-firmware-a_%.bbappend | 7 +++- 2 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch diff --git a/recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch b/recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch deleted file mode 100644 index 2d6e9bf..0000000 --- a/recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 840d6b6420e1fd8cdf6e4de7fa58a6f8de151622 Mon Sep 17 00:00:00 2001 -From: Yann Dirson <yann@...> -Date: Tue, 6 Apr 2021 17:28:45 +0200 -Subject: [PATCH] Set serial console baudrate back to 1500000. -Upstream-Status: Inappropriate[other] - -TF-A runs between two u-boot stages which both uses 1500000 baud, it -just makes no sense to use the same UART at a different rate. - -This effectively reverts part of 0c05748bdebfad9fa43a80962186438bb8fbce62. -Main reason for that change stated in https://developer.trustedfirmware.org/T762 -is ChromeOS compatibility. - -Looks like this patch may become unnecessary in the future, when -u-boot and TF-A get to communicate this value. - ---- - plat/rockchip/rk3399/rk3399_def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h -index ba83242eb..8d6ecfbe6 100644 ---- a/plat/rockchip/rk3399/rk3399_def.h -+++ b/plat/rockchip/rk3399/rk3399_def.h -@@ -17,7 +17,7 @@ - /************************************************************************** - * UART related constants - **************************************************************************/ --#define RK3399_BAUDRATE 115200 -+#define RK3399_BAUDRATE 1500000 - #define RK3399_UART_CLOCK 24000000 - - /****************************************************************************** --- -2.30.2 - diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index f7777a7..0d06c44 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -7,9 +7,14 @@ COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ - file://serial-console-baudrate.patch \ file://0001-Fix-build-with-gcc-11.patch \ file://0001-dram-Fix-build-with-gcc-11.patch \ file://0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch \ file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \ " + +fixup_rk3399_baudrate() { + sed -i "s/#define RK3399_BAUDRATE 115200/#define RK3399_BAUDRATE ${RK_CONSOLE_BAUD}/" ${S}/plat/rockchip/rk3399/rk3399_def.h +} + +do_patch[postfuncs] += "fixup_rk3399_baudrate" -- 2.30.2 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|