Compare commits

..
Author SHA1 Message Date
Peter Korsgaard 53f74f49c0 Update for 2025.02-rc2
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 11:09:27 +01:00
Gero Schwäricke ac300757f6 board/stmicroelectronics/stm32mp135f-dk: fix boot steps in readme
The instructions in the readme use incorrect connector names.

See also the official devkit documentation:
https://wiki.st.com/stm32mpu/wiki/Getting_started/STM32MP1_boards/STM32MP135x-DK/Let%27s_start/Unpack_the_STM32MP135x-DK_board#Out-of-the-box_kit

Also the board does not show the console on the screen.

This may have been a copy & paste oversight from the STM32MP157 readme.

Signed-off-by: Gero Schwäricke <gero.schwaericke@sevenlab.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 10:42:23 +01:00
Maxim Kochetkov dac8e9b303 package/postgresql: fix build with external gettext
Postgresql fails to build with NLS enabled against uclibc/musl after the
move to meson:

-------------------------------------------------------
/home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/aarch64-buildroot-linux-uclibc/12.4.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: scram-common.c:(.text+0x65c): undefined reference to `libintl_gettext'
/home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/aarch64-buildroot-linux-uclibc/12.4.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: scram-common.c:(.text+0x6cc): undefined reference to `libintl_gettext'
/home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/aarch64-buildroot-linux-uclibc/12.4.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: scram-common.c:(.text+0x73c): undefined reference to `libintl_gettext'
-------------------------------------------------------

uclibc/musl toolchains use GNU gettext for NLS support.
So we need to link against external libintl.

Fixes: https://autobuild.buildroot.org/results/244f154aece46d02747b875faba4c51e7b5d0dc2/
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
[Peter: also pass TARGET_LDFLAGS, mention the change to meson]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 10:32:58 +01:00
Yevhen Babiichuk (DustDFG) acc7ce7262 package/llvm-project/compiler-rt: remove duplicate parameter
The COMPILER_RT_STANDALONE_BUILD parameter was passed twice.  One time as
FALSE and immediately after as TRUE which overrides previous value, so drop
the first one.

Signed-off-by: Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 22:54:00 +01:00
Yevhen Babiichuk (DustDFG) 6979ee5db0 package/{odb,sdbusplus}: use "host <foo>" prompt
For consistency with the other host packages.

Signed-off-by: Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 22:53:48 +01:00
Thomas Devoogdt a199751e5b package/webkitgtk: bump to 2.46.4
Stable release to the 2.46 series.

Release notes:

  https://webkitgtk.org/2024/09/17/webkitgtk2.46.0-released.html
  https://webkitgtk.org/2024/09/30/webkitgtk2.46.1-released.html
  https://webkitgtk.org/2024/10/21/webkitgtk2.46.2-released.html
  https://webkitgtk.org/2024/10/30/webkitgtk2.46.3-released.html
  https://webkitgtk.org/2024/11/27/webkitgtk2.46.4-released.html

Added BR2_PACKAGE_WEBP_MUX to fix this error:

-- The following WebP libraries were not found:
--  mux (required)

Added USE_SYSTEM_SYSPROF_CAPTURE=OFF to fix this error:

-- Checking for module 'sysprof-capture-4'
--   Package 'sysprof-capture-4', required by 'virtual:world', not found
-- Could NOT find SysProfCapture (missing: SysProfCapture_LIBRARY SysProfCapture_INCLUDE_DIR)

For now, use USE_SKIA=OFF which is the replacement for cairo.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 20:00:18 +01:00
Daniel Palmer 3e88ba41a9 package/musl: Add upstream patch to fix building strace on m68k
Fixes:
http://autobuild.buildroot.net/results/ec3de790a66373f270f731519e2ef51c293ba683/

Currently it's not possible to build strace on m68k when using
musl because the version of musl in buildroot doesn't have the
m68k specific definitions of POLLWRNORM and POLLWRBAND.

This is already fixed upstream so manually apply the patch
until the next release.

Signed-off-by: Daniel Palmer <daniel@0x0f.com>
[Peter: add autobuilder ref and upstream link / s-o-b in patch description]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 19:13:33 +01:00
Bernd Kuhls a3c3c2cc3b {linux, linux-headers}: bump 6.{1, 6, 12}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 18:57:42 +01:00
Michael Nosthoff b7f154eab7 package/sqlite: json extension enabled by default
Since SQLite 3.38 [0] the JSON extension is enabled by default.
A new Option was introduced to actively disable the extension. [1]

The JSON support is very small (<4%) compared to the rest of sqlite, so
enable it unconditionally:

-rwxr-xr-x 1 peko peko 1470368 Mar 12 10:50 output-without/target/usr/lib/libsqlite3.so.0.8.6
-rwxr-xr-x 1 peko peko 1530232 Mar 12 10:46 output-with/target/usr/lib/libsqlite3.so.0.8.6

E.G. a delta of 59864 bytes or 3.9%

[0] https://sqlite.org/releaselog/3_38_0.html
[1] https://sqlite.org/json1.html#compiling_in_json_support

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
[Peter: unconditionally include JSON support]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 11:01:30 +01:00
Bernd Kuhls 8ea3365b61 package/libcdio: needs host-pkgconf
With commit
https://github.com/libcdio/libcdio/commit/1f94664f766ef66b992e1c53a5e817a37988d894
upstream added a mandatory dependency to pkgconf in version 2.1.1.

Buildroot bumped libcdio with 920f45bd24,
a backport is not needed.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-11 23:18:56 +01:00
Alex Bennée ae884111d2 package/elfutils: handle missing user_pac_mask on aarch64
Since Buildroot commit [1] "package/elfutils: bump to version 0.192"
elfutils fails to build on Aarch64 with toolchain including Kernel older
than version 5.0. Error shows:

    aarch64_initreg.c: In function 'aarch64_set_initial_registers_tid':
    aarch64_initreg.c:61:24: error: storage size of 'pac_mask' isn't
    known
       61 |   struct user_pac_mask pac_mask;
          |                        ^~~~~~~~

elfutils 0.192 introduced a Aarch64 pointer authentication support in
upstream commit [2].

For reference, the user_pac_mask structure was introduced in Kernel
upstream commit [3], included in Kernel v5.0.

This is fixed in the upstream [4] so bring that patch in.

Fixes:
- e.g https://autobuild.buildroot.org/results/5156901a73be52ce8ffbf10729e6852499a300be/
- 4/6 of the failures here: https://autobuild.buildroot.org/?reason=elfutils-0.192&arch=aarch64

[1] https://gitlab.com/buildroot.org/buildroot/-/commit/5eb734766b24de5fce6e586897cd4827f8855442
[2] https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=64e3b451ad2cec8d45661b1816e3d2dc4431f3ca
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ec6e822d1a22d0eef1d1fa260dff751dba9a4258
[4] https://sourceware.org/git/?p=elfutils.git;a=commit;h=52a747a316042e70a22acb489df9e51bfc6bf2d5

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-11 20:59:31 +01:00
Quentin Schulz 1c653dd19f package/libcamera: force-disable qcam for now
Fixes:
http://autobuild.buildroot.net/results/5b0dc8acd491f1d7b20f5b5f065b28212b9d4912/
http://autobuild.buildroot.net/results/61e4bce00a2aff3f531de6c1896d4dc1f92ba5e3/

qcam is based on Qt6 since commit 71aa3ceec30b ("apps: qcam: Port to Qt
6") which is part of the v0.3.1 release.

qcam being enabled when BR2_PACKAGE_QT5BASE_WIDGETS symbol is defined
breaks the build as it's missing the qt6 dependencies.

The migration to Qt 6 for the Buildroot package isn't straightforward
though as we're hitting a meson bug[1].

For now, let's just always disable qcam until we can get everything
fixed and migrated properly.

[1] https://github.com/mesonbuild/meson/issues/13018

Fixes: 72757d111a ("package/libcamera: bump to version 0.3.2")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-11 19:13:22 +01:00
Daniel Palmer ebcd82198f package/prboom: Fix big endian fix up
The hack to force big endian support when building
for a big endian machine doesn't work as there is
some whitespace between "#" and "undef" in config.h.

Add a wildcard between those two so that the target
line matches and the replacement is done.

Allows me to play DOOM on my LC475.

Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-11 19:04:56 +01:00
Julien Olivain 605f8f5432 package/fluidsynth: bump to version 2.4.3
For change log since v2.4.2, see:
https://github.com/FluidSynth/fluidsynth/releases/tag/v2.4.3

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-11 18:48:57 +01:00
Julien Olivain 5dab98d721 package/libjxl: security bump to version 0.11.1
For release notes since v0.11.0, see:
https://github.com/libjxl/libjxl/releases/tag/v0.11.1

Fixes:
https://www.cve.org/cverecord?id=CVE-2024-11403
https://www.cve.org/cverecord?id=CVE-2024-11498

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-11 18:46:30 +01:00
Vladimir Oltean 4809690d42 package/util-linux: add uuidd user and group
When util-linux is compiled with the uuidd daemon and with systemd
init, the rootfs creation fails in fakeroot as follows:

    printf 'host/bin/systemctl --root=build/buildroot-fs/ext2/target preset-all\n' >> build/buildroot-fs/ext2/fakeroot
    [...]
    FAKEROOTDONTTRYCHOWN=1 host/bin/fakeroot -- build/buildroot-fs/ext2/fakeroot
    rootdir=build/buildroot-fs/ext2/target
    table='build/buildroot-fs/full_devices_table.txt'
    ignored spec: h /var/log/journal/%m - - - - +C
    ignored spec: x /var/tmp/systemd-private-%b-*
    ignored spec: X /var/tmp/systemd-private-%b-*/tmp
    ignored spec: x  /var/lib/systemd/coredump/.#core*.%b*
    ignored spec: z /var/log/journal/%m 2755 root systemd-journal - -
    ignored spec: z /var/log/journal/%m/system.journal 0640 root systemd-journal - -
    <stdin>:37: Failed to resolve user 'uuidd': No such process
    make[1]: *** [fs/ext2/ext2.mk:66: images/rootfs.ext2] Error 65
    make: *** [Makefile:83: _all] Error 2

This error can be reproduced with the commands:

    cat <<EOF >.config
    BR2_aarch64=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_PACKAGE_UTIL_LINUX=y
    BR2_PACKAGE_UTIL_LINUX_UUIDD=y
    BR2_INIT_SYSTEMD=y
    BR2_TARGET_ROOTFS_EXT2=y
    EOF
    make olddefconfig
    make

The error comes from systemctl, which cannot find the uuidd user in
the target rootfs, needed in the uuidd.service unit file [1].

This commit fixes the issue by adding the uuidd user and group in
support/scripts/mkusers syntax.

[1] https://web.git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/misc-utils/uuidd.service.in?h=v2.40.2

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
[Julien: add commands to reproduce the issue in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-10 23:24:06 +01:00
Cherniaev Andrei 3fbc4e583f boot/grub2/readme.txt: typo
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-10 22:30:42 +01:00
Raphaël Mélotte 63c2dd2d40 package/jbig2dec: add upstream security fix for CVE-2023-46361
Fixes the following security issue:
CVE-2023-46361: Artifex Software jbig2dec v0.20 was discovered to
contain a SEGV vulnerability via jbig2_error at /jbig2dec/jbig2.c.

https://www.cve.org/CVERecord?id=CVE-2023-46361

Note that jbig2dec version 0.19 (used in Buildroot 2024.02.11) is not
officially listed as affected, but it actually has the same bug.

Also note that this CVE is about a crash in the CLI tool only.

Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
[Julien: add JBIG2DEC_IGNORE_CVES]
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-10 21:09:49 +01:00
Daniel Lang f2498258d4 boot/optee-os: add CPE identifier
cpe:2.3:o:linaro:op-tee:4.3.0:*:*:*:*:*:*:* is a valid CPE ID.

See:
https://nvd.nist.gov/products/cpe/detail/2754E8CF-9BD5-448D-9F32-CFAC92278CD9

Note: this commit needs to set _CPE_ID_PREFIX because optee-os CPE
"part" needs to be set to "o" (OS), while the default Buildroot prefix
is "a" (Application).

Signed-off-by: Daniel Lang <dalang@gmx.at>
[Julien:
 - add extra info in commit log (and fix CVE to CPE)
 - add a new line after OPTEE_OS_CPE_ID_PRODUCT for readability
]
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-07 22:12:46 +01:00
Thomas Devoogdt 1713472621 utils/generate-cyclonedx: use indent 2 by default
By default, use an indent of 2, which is the same as what 'jq' uses.
This omits the need for 'jq' in the example usage. Also, add a new
line to the output while at it.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-06 21:49:53 +01:00
Adam Duskett e070406523 board/mender/x86_64/post-image-efi.sh: fix bootstrap creation
As the mender_x86_64_efi_defconfig does not build the xz package, creating a
boostrap image with a lzma compression results in the following error on boot:

```
Error while handling bootstrap Artifact, continuing: invalid bootstrap
Artifact: readHeaderV3: handleHeaderReads: readHeader: readNext: Failed to get
next header: reader: error reading archive: unexpected EOF
```

This also results in the same error for the generated mender image, as it's
also created with lzma compression unconditionally.

Set the compression to none to resolve the above error.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 22:28:28 +01:00
Adam Duskett 14a7e99b6d board/mender/x86_64/post-build.sh: fix device_type location
Currently, the post-build.sh script adds device_type to /var/lib/mender,
however, this doesn't work for two reasons:
 1) /data/ mounts to /var/lib/mender
 2) The device_type location in mender.conf points to /etc/mender/device_type.

This leads to an error during the bootstrap process because mender reads the
default device_type file installed by mender.mk in /etc/mender, leading to the
following error:

```
Error while handling bootstrap Artifact, continuing: invalid bootstrap
Artifact: readHeaderV3: handleHeaderReads: image
(device types [buildroot-x86_64]) not compatible with device BUILDROOT_DEVICE
```

Set the creation of the device_type file in board/mender/x86_64/post-build.sh
to /etc/mender/device_type to fix the error.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 22:28:21 +01:00
Adam Duskett b19976abc9 package/systemd: enable tmpfs kernel option
systemd automatically creates tmpfs mounts for /tmp, /run, /dev/shm, and
others. If tmpfs is not enabled in the kernel, systemd crashes with an
unknown filesystem error on boot. This hasn't manifested itself during
tests with defconfigs such as pc_x86_64_efi_defconfig for a few reasons:

  - No defconfig uses systemd as the init system by default
  - Even if a user does use pc_x86_64_efi_defconfig and changes to systemd,
    the board/pc/linux.config file enables CONFIG_PCI, which selects
    CONFIG_TMPFS.
  - The systemd init tests use a prebuilt kernel with tmpfs enabled.

Enable tmpfs unconditionally to ensure that systemd always boots, even with
a minimal kernel built.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 22:06:44 +01:00
Fabio Estevam 4519670c62 package/freescale-imx: Forbid DDR selection for i.MX93/91
The DRAM controller on the i.MX93 and i.MX91 does not support DDR3
nor DDR4 memories.

Forbid the selection of DDR3 and DDR4 firmwares on those SoCs.

Fixes: 1ec956130d ("package/freescale-imx: Allow firmware installation on i.MX93")
Reported-by: Sebastien Szymanski <sebastien.szymanski@armadeus.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Sebastien Szymanski <sebastien.szymanski@armadeus.com>
[Julien: reword the commit log to also mention i.MX91]
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 21:56:23 +01:00
Peter Korsgaard 77674c6cfb package/go: security bump to version 1.23.7
go1.23.7 (released 2025-03-04) includes security fixes to the net/http
package, as well as bug fixes to cgo, the compiler, and the reflect,
runtime, and syscall package.

https://github.com/golang/go/issues?q=milestone%3AGo1.23.7+label%3ACherryPickApproved

Fixes:
https://www.cve.org/CVERecord?id=CVE-2025-22870

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Julien: add candidate CVE link]
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 21:07:48 +01:00
Romain Naour 33b23bfbd9 configs/acmesystems_acqua_a5_*: bump to Linux 6.12.9
Cc: Edgar Bonet <bonet@grenoble.cnrs.fr>
Acked-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
Tested-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 20:07:39 +01:00
Romain Naour 8a8b6a3a2f configs/acmesystems_acqua_a5_*: switch to BR2_LINUX_KERNEL_CUSTOM_DTS_DIR
Before updating the kernel to 6.12 version, use the newly introduced
BR2_LINUX_KERNEL_CUSTOM_DTS_DIR option to provide the Out-of-tree
Device Tree Source file with its vendor subdirectory that is needed
since kernel 6.12 [1].

Revert the sama5d31.dtsi include path update added by the previous
kernel version bump 6.6.12 [2].

As noticed by Michael Walle, newer OOT device trees should use the
same #include directives as the in-tree device trees to ease
sharing the files between u-boot, linux and OOT external trees [3].

[1] https://lists.buildroot.org/pipermail/buildroot/2024-October/765463.html
[2] 8fb5209885 ("configs/acmesystems_acqua_a5_*: bump to Linux 6.6.12")
[3] https://lore.kernel.org/buildroot/D6UG5Z1HUN9N.GWVHB4L823ZC@kernel.org/

Cc: Edgar Bonet <bonet@grenoble.cnrs.fr>
Acked-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
Tested-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 20:07:31 +01:00
Romain Naour 290f6bb45a linux: introduce BR2_LINUX_KERNEL_CUSTOM_DTS_DIR
Since Linux 6.12, the Buildroot option BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
does not work as expected on arm, arm64, mips and riscv[1]. These are
the architectures that store the in-tree DTS files in vendor-specific
subdirectories of arch/$ARCH/boot/dts/.

BR2_LINUX_KERNEL_CUSTOM_DTS_PATH was introduced in Buildroot 2012.08
(commit 69fc497df0 "Rework support for the device tree"). At the time,
the kernel kept all in-tree DTS files directly in arch/$ARCH/boot/dts/,
and this is where Buildroot drops the user's custom DTS. Vendor-specific
subdirectories appeared in Linux v3.19 for the arm64 architecture, and
this scheme was later adopted by mips, riscv and arm.

For these architectures, Linux 6.12 (commit e7e2941300d2, "kbuild: split
device tree build rules into scripts/Makefile.dtbs") made the DTB build
infrastructure incompatible with the way
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH is implemented. This infrastructure now
expects all DTS files to be in vendor-specific subdirectories on the
architectures that use this scheme.

We can't update easily the current behavior of
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH since it expect a list of files but
can also be used "unexpectedly" with directories [2].

  BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp135f-dk-mx"
  BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/[...]/linux-dts/st"

In this case, the st directory is copied into the arch/$ARCH/boot/dts/
and BR2_LINUX_KERNEL_INTREE_DTS_NAME is used to build stm32mp135f-dk-mx dtb
as if it was intree.

Introduce BR2_LINUX_KERNEL_CUSTOM_DTS_DIR configuration
parameter to specify a list of directories that are copied as-is over
the arch/<arch>/boot/dts/ directory before building the device tree
blob:

  board/acmesystems/acqua-a5/dts/
  └── microchip
      └── at91-sama5d3_acqua.dts

defconfig:
  BR2_LINUX_KERNEL_CUSTOM_DTS_DIR="board/acmesystems/acqua-a5/dts"

Each dts file found is automatically added to the list of devicetree
to build.

BR2_LINUX_KERNEL_CUSTOM_DTS_DIR can also be used for external
devicetree overlays files:

  board/ti/am574x-idk/dts/
  └── ti
      └── omap
          └── am57xx-evm.dtso

With this new option, BR2_LINUX_KERNEL_CUSTOM_DTS_PATH is now deprecated.

Note: We want to create a list of dts files (LINUX_DTS_LIST) present in
diectrories listed by BR2_LINUX_KERNEL_CUSTOM_DTS_DIR. But
LINUX_DTS_LIST must not contain BR2_LINUX_KERNEL_CUSTOM_DTS_DIR
paths. Use GNU 'find' print format %P to print each dts file path
without their respective dts overlay directory path.
Do the same for LINUX_DTSO_LIST.

Thanks to Edgar Bonet for the initial contribution [3].

[1] https://lists.buildroot.org/pipermail/buildroot/2024-October/765463.html
[2] https://github.com/bootlin/buildroot-external-st/blob/541ba7d96330cd7da5674b46806b549a7ccf9da8/configs/st_stm32mp135f_dk_demo_defconfig#L21
[3] https://lore.kernel.org/buildroot/93f83afb-6987-441c-8e06-dab4d43b828f@grenoble.cnrs.fr/

Cc: Michael Walle <michael@walle.cc>
Cc: Gaël PORTAY <gael.portay+rtone@gmail.com>
Reported-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
[Romain:
  - Rework the initial contribution by Edgar Bonet by
    BR2_LINUX_KERNEL_CUSTOM_DTS_DIR following
    Michael Walle comments and Gaël PORTAY review.
  - Reword the commit log accordingly.
]
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 20:07:21 +01:00
Niklas Cassel 8d1deb3d19 configs/rock5b: build and install rock5b device tree overlays
Build and install all in-tree rock5b device tree overlays.

The device tree overlays will be available in /boot, such that it is
possible for u-boot to apply one (or many) of them before booting Linux.

Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 20:07:12 +01:00
Michael Walle 5472d93d1c linux: add support for device tree overlays
The linux kernel can build device tree overlays (.dtbo) itself. Add
support to build and copy them along with the actual device trees.
These can either be in-tree device tree overlays
(BR2_LINUX_KERNEL_INTREE_DTSO_NAMES) or they can be provided outside of
the kernel (BR2_LINUX_KERNEL_CUSTOM_DTS_PATH). In the latter case, the
overlay source files will be copied into the kernel tree first.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-03-05 20:06:53 +01:00
Thomas Devoogdt 66a0513e0e utils/generate-cyclonedx: fix wrong example usage
The real file is utils/generate-cyclonedx,
not utils/generate-cyclonedx.py.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-05 19:55:43 +01:00
Peter Korsgaard 630c20a2b2 CHANGES: mention glibc / uclibc-ng bumps for 2025.02-rc1
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-05 19:55:42 +01:00
45 changed files with 339 additions and 85 deletions
+17
View File
@@ -1,3 +1,18 @@
2025.02-rc2, released March 13th 28th, 2025
Fixes all over the tree.
Linux: Support device tree overlays and support custom device
tree files with Linux >= 6.12, which changed the build
logic. For this a new BR2_LINUX_KERNEL_CUSTOM_DTS_DIR option
has been introduced and the existing _CUSTOM_DTS_PATH option
deprecated.
Updated/fixed packages: compiler-rt, elfutils, fluidsynth,
freescale-imx, go, jbig2dec, libcamera, libcdio, libjxl, musl,
optee-os, postgresql, prboom, sqlite, systemd, util-linux,
webkitgtk
2025.02-rc1, released February 28th, 2025
Fixes all over the tree and new features.
@@ -10,6 +25,8 @@
- gdb 16.1 added, gdb 15.1 becomes the default.
- glibc 2.41, uclibc-ng 1.0.51
- Synopsys external ARC toolchains marked as broken as they
are not "bare" toolchains, causing various build issues
+6
View File
@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2025.02"
config BR2_PACKAGE_SQLITE_ENABLE_JSON1
bool "Enable the JSON extensions for SQLite has been removed"
select BR2_LEGACY
help
Since SQLite 3.38 the JSON Extension is enabled by default.
config BR2_PACKAGE_ANGULARJS
bool "angularjs has been removed"
select BR2_LEGACY
+2 -2
View File
@@ -92,9 +92,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2025.02-rc1
export BR2_VERSION := 2025.02-rc2
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1740760000
BR2_VERSION_EPOCH = 1741860000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -9,7 +9,7 @@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
#include "microchip/sama5d31.dtsi"
#include "sama5d31.dtsi"
/ {
model = "Acme Systems Acqua SOM";
@@ -1,2 +1,2 @@
# Locally calculated
sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz
sha256 87be0360df0931b340d2bac35161a548070fbc3a8c352c49e21e96666c26aeb4 linux-6.12.9.tar.xz
+1 -1
View File
@@ -42,7 +42,7 @@ mender_fixup() {
main() {
parse_args "${@}"
mender_fixup
echo "device_type=${DEVICE_TYPE}" > "${TARGET_DIR}/var/lib/mender/device_type"
echo "device_type=${DEVICE_TYPE}" > "${TARGET_DIR}/etc/mender/device_type"
}
main "${@}"
+2 -2
View File
@@ -53,7 +53,7 @@ generate_mender_bootstrap_artifact() {
"${HOST_DIR}"/bin/mender-artifact \
write bootstrap-artifact \
--compression lzma \
--compression none \
--artifact-name "${ARTIFACT_NAME}" \
--device-type "${DEVICE_TYPE}" \
--provides "rootfs-image.version:${ARTIFACT_NAME}" \
@@ -68,7 +68,7 @@ generate_mender_image() {
echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender"
"${HOST_DIR}/bin/mender-artifact" \
write rootfs-image \
--compression lzma \
--compression none \
-t "${DEVICE_TYPE}" \
-n "${BR2_VERSION}" \
-f "${BINARIES_DIR}/rootfs.ext2" \
@@ -27,12 +27,11 @@ Copy the bootable "sdcard.img" onto an microSD card with "dd":
Boot the board
==============
(1) Insert the microSD card in connector CN15
(1) Insert the microSD card in connector CN3
(2) Plug a micro-USB cable in connector CN11 and run your serial
(2) Plug a micro-USB cable in connector CN10 and run your serial
communication program on /dev/ttyACM0.
(3) Plug a USB-C cable in CN6 to power-up the board.
(3) Plug a USB-C cable in CN12 to power-up the board.
(4) The system will start, with the console on UART, but also visible
on the screen.
(4) The system will start, with the console on UART.
+2 -2
View File
@@ -51,7 +51,7 @@ grub-bios-setup does but it works anyway.
To test your BIOS image in Qemu
-------------------------------
qemu-system-{i386,x86-64} -hda disk.img
qemu-system-{i386,x86_64} -hda disk.img
Notes on using Grub2 for x86/x86_64 EFI-based platforms
=======================================================
@@ -93,7 +93,7 @@ To test your i386/x86-64 EFI image in Qemu
[0] https://github.com/retrage/edk2-nightly
2. qemu-system-{i386,x86-64} -bios <path-to-OVMF.fd> -hda disk.img
2. qemu-system-{i386,x86_64} -bios <path-to-OVMF.fd> -hda disk.img
Notes on using Grub2 for ARM u-boot-based platforms
===================================================
+4
View File
@@ -10,6 +10,10 @@ ifeq ($(BR2_TARGET_OPTEE_OS_LATEST),y)
OPTEE_OS_LICENSE_FILES = LICENSE
endif
OPTEE_OS_CPE_ID_PREFIX = cpe:2.3:o
OPTEE_OS_CPE_ID_VENDOR = linaro
OPTEE_OS_CPE_ID_PRODUCT = op-tee
OPTEE_OS_INSTALL_STAGING = YES
OPTEE_OS_INSTALL_IMAGES = YES
+3 -3
View File
@@ -2,7 +2,7 @@ BR2_arm=y
BR2_cortex_a5=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_INSTRUCTIONS_THUMB2=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_SYSTEM_DHCP="eth0"
@@ -10,10 +10,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.9"
BR2_LINUX_KERNEL_DEFCONFIG="sama5"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts"
BR2_LINUX_KERNEL_CUSTOM_DTS_DIR="board/acmesystems/acqua-a5/dts"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+3 -3
View File
@@ -2,7 +2,7 @@ BR2_arm=y
BR2_cortex_a5=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_INSTRUCTIONS_THUMB2=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_SYSTEM_DHCP="eth0"
@@ -10,10 +10,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.9"
BR2_LINUX_KERNEL_DEFCONFIG="sama5"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts"
BR2_LINUX_KERNEL_CUSTOM_DTS_DIR="board/acmesystems/acqua-a5/dts"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+1
View File
@@ -17,6 +17,7 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b"
BR2_LINUX_KERNEL_INTREE_DTSO_NAMES="rockchip/rk3588-rock-5b-pcie-srns rockchip/rk3588-rock-5b-pcie-ep"
BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+9 -9
View File
@@ -76,37 +76,37 @@
</div>
</div>
<h3 style="text-align: center;">Latest release candidate: <b>2025.02-rc1</b></h3>
<h3 style="text-align: center;">Latest release candidate: <b>2025.02-rc2</b></h3>
<div class="row mt centered">
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2025.02-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2025.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2025.02-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2025.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2025.02-rc1.tar.gz">buildroot-2025.02-rc1.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2025.02-rc1.tar.gz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2025.02-rc2.tar.gz">buildroot-2025.02-rc2.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2025.02-rc2.tar.gz.sign">PGP signature</a></p>
</div>
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2025.02-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2025.02-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2025.02-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2025.02-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2025.02-rc1.tar.xz">buildroot-2025.02-rc1.tar.xz</a></h3>
<p><a href="/downloads/buildroot-2025.02-rc1.tar.xz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2025.02-rc2.tar.xz">buildroot-2025.02-rc2.tar.xz</a></h3>
<p><a href="/downloads/buildroot-2025.02-rc2.tar.xz.sign">PGP signature</a></p>
</div>
</div>
+21
View File
@@ -9,6 +9,27 @@
<h2>News</h2>
<ul class="timeline">
<li>
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h4 class="timeline-title">2025.02-rc2 released</h4>
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>13 March 2025</small></p>
</div>
<div class="timeline-body">
<p>Another 2 weeks, another release candidate with more cleanups and build fixes. See the
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02-rc2/CHANGES">CHANGES</a>
file for more details.</p>
<p>Go to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2025.02-rc2.tar.xz">2025.02-rc2
release</a>, and report any problems found to the
<a href="support.html">mailing list</a> or
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
</div>
</div>
</li>
<li class="timeline-inverted">
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
+41 -4
View File
@@ -137,7 +137,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES
config BR2_LINUX_KERNEL_VERSION
string
default "6.12.17" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.12.18" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
@@ -426,14 +426,51 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME
the trailing .dts. You can provide a list of
dts files to build, separated by spaces.
config BR2_LINUX_KERNEL_INTREE_DTSO_NAMES
string "In-tree Device Tree Overlay file names"
help
Names of in-tree device tree overlay, without the trailing
.dtso which should be built and installed into the target
system, separated by spaces.
config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
string "Out-of-tree Device Tree Source file paths"
depends on BR2_LINUX_KERNEL_CUSTOM_DTS_DIR = ""
help
Paths to out-of-tree Device Tree Source (.dts) and Device Tree
Source Include (.dtsi) files, separated by spaces. These files
will be copied to the kernel sources and the .dts files will
Paths to out-of-tree Device Tree Source (.dts), Device Tree
Source Include (.dtsi) and Device Tree Overlay Source (.dtso)
files, separated by spaces. These files will be copied to the
kernel sources and the .dts files will
be compiled from there.
Due to a kernel build system changes in 6.12,
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH is now deprecated and
replaced by BR2_LINUX_KERNEL_CUSTOM_DTS_DIR
config BR2_LINUX_KERNEL_CUSTOM_DTS_DIR
string "Out-of-tree Device Tree Source overlay directories"
help
Specify a list of directories that are copied as-is over the
arch/<arch>/boot/dts/ directory before building the device
tree blob.
This overlay can contain dts, dtso and dtsi files.
BR2_LINUX_KERNEL_CUSTOM_DTS_DIR should point to one or more
directories containing a vendor subdirectory (e.g. rockchip)
which contains the dts files. This vendor subdirectory should
match the vendor subdirectory used by the board in the kernel
(e.g. arch/arm64/boot/dts/rockchip/).
While most architechtures make use of vendor subdirectories,
like arm, arm64 and riscv, some architectures like powerpc
and xtensa do not.
In this case, BR2_LINUX_KERNEL_CUSTOM_DTS_DIR should point to
a directory containing the dts files directly.
Since the 6.12 release, each out-of-tree Device Tree Source
file must be copied into their corresponding sub-directory.
config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME
bool "Keep the directory name of the Device Tree"
help
+3 -3
View File
@@ -1,7 +1,7 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 5c205cd34f80974e4973e321cb008f5f6895a8aa8c2577f06a9448cd77de63b3 linux-6.12.17.tar.xz
sha256 6cf911d01324f45c9dd2f44cf06f55bda0ecf383bc498f132a0c549768531327 linux-6.6.80.tar.xz
sha256 9d63e3bfde75a44a99e18812b002e5e5c0797b4eb3db408a7a9225c2c719b52b linux-6.1.129.tar.xz
sha256 beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d linux-6.12.18.tar.xz
sha256 af483828e67f1b9918bc438d789cdbb06c13a4d43a41d5f35d44c9a6d620318f linux-6.6.81.tar.xz
sha256 9416b2c2d448ec7f54bb0ce5713fb34c32dae4a4edf1abd8cf7a8995cbac66fd linux-6.1.130.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 efe9f7eb5ea4d26cec6290689343e1804eb3b4a88ff5a60497a696fc08157c42 linux-5.15.178.tar.xz
sha256 9597c4fee2f1ce452acfec516f4325ad342155872052fd5f0d9ce2ddcc26ebe5 linux-5.10.234.tar.xz
+22 -2
View File
@@ -203,14 +203,33 @@ endif
LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
LINUX_DTSO_NAMES += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTSO_NAMES))
# We keep only the .dts files, so that the user can specify both .dts
# and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
# copied to arch/<arch>/boot/dts, but only the .dts files will
# actually be generated as .dtb.
LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
LINUX_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))
LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(LINUX_CUSTOM_DTS_PATH))))
LINUX_DTSO_NAMES += $(basename $(filter %.dtso,$(notdir $(LINUX_CUSTOM_DTS_PATH))))
LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME))
LINUX_KERNEL_CUSTOM_DTS_DIR = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_DIR))
ifneq ($(LINUX_KERNEL_CUSTOM_DTS_DIR),)
# Use evaluation-during-assignment using := to avoid any re-evaluation
# of LINUX_DTS_LIST when LINUX_DTS_NAME is used.
LINUX_DTS_LIST := $(shell find $(LINUX_KERNEL_CUSTOM_DTS_DIR) -name '*.dts' -printf '%P\n' 2>/dev/null)
LINUX_DTSO_LIST := $(shell find $(LINUX_KERNEL_CUSTOM_DTS_DIR) -name '*.dtso' -printf '%P\n' 2>/dev/null)
LINUX_DTS_NAME += $(basename $(LINUX_DTS_LIST))
LINUX_DTSO_NAMES += $(basename $(LINUX_DTSO_LIST))
define LINUX_COPY_CUSTOM_DTS_FILES
$(foreach d, $(LINUX_KERNEL_CUSTOM_DTS_DIR), \
@$(call MESSAGE,"Copying devicetree overlay $(d)")$(sep) \
$(Q)$(call SYSTEM_RSYNC,$(d),$(LINUX_ARCH_PATH)/boot/dts/)$(sep))
endef
endif
LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) $(addsuffix .dtbo,$(LINUX_DTSO_NAMES))
ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
@@ -524,6 +543,7 @@ define LINUX_BUILD_CMDS
$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
)
$(LINUX_COPY_CUSTOM_DTS_FILES)
$(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all
$(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
$(LINUX_BUILD_DTB)
@@ -0,0 +1,97 @@
From 52a747a316042e70a22acb489df9e51bfc6bf2d5 Mon Sep 17 00:00:00 2001
From: Markus Mayer <mmayer@broadcom.com>
Date: Fri, 21 Feb 2025 11:19:34 -0800
Subject: [PATCH] aarch64: define struct user_pac_mask if needed
On Aarch64, Linux is using Pointer Authentication Code (PAC) for pointer
authentication.[1] The struct "user_pac_mask" has been part of the Linux
kernel since version 5.0 as part of this feature. However, older kernels
do not define it.
Therefore, we want to check if the definition is present in the kernel
headers and provide one if it isn't. This ensures two things:
* elfutils will continue to compile against kernel headers from 4.x
* binaries built against older kernel headers will still be fully
functional if used on a newer system
For reference, the build error that is being avoided looks like this:
[...]
CC aarch64_initreg.o
aarch64_initreg.c: In function 'aarch64_set_initial_registers_tid':
aarch64_initreg.c:61:24: error: storage size of 'pac_mask' isn't known
struct user_pac_mask pac_mask;
^~~~~~~~
aarch64_initreg.c:61:24: warning: unused variable 'pac_mask' [-Wunused-variable]
make[4]: *** [Makefile:831: aarch64_initreg.o] Error 1
make[3]: *** [Makefile:547: all-recursive] Error 1
make[2]: *** [Makefile:463: all] Error 2
[1] https://docs.kernel.org/arch/arm64/pointer-authentication.html
https://sourceware.org/bugzilla/show_bug.cgi?id=32684
Fixes: 64e3b451ad2c ("aarch64: extend dwfl_thread_state_registers to handle PAC")
Signed-off-by: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Upstream: https://sourceware.org/git/?p=elfutils.git;a=commit;h=52a747a316042e70a22acb489df9e51bfc6bf2d5
---
backends/aarch64_initreg.c | 21 +++++++++++++++++++++
configure.ac | 8 ++++++++
2 files changed, 29 insertions(+)
diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c
index 5ec45ea60..a6badbb45 100644
--- a/backends/aarch64_initreg.c
+++ b/backends/aarch64_initreg.c
@@ -47,6 +47,27 @@
#define BACKEND aarch64_
#include "libebl_CPU.h"
+/*
+ * pointer authentication masks (NT_ARM_PAC_MASK)
+ *
+ * Defined by Linux kernel headers since Linux 5.0. Define it here if kernel
+ * headers are older than that, to ensure this file builds regardless.
+ */
+#if defined(__aarch64__) && defined(__linux__)
+
+#ifndef NT_ARM_PAC_MASK
+#define NT_ARM_PAC_MASK 0x406
+#endif
+
+#ifndef HAVE_USER_PACK_MASK
+struct user_pac_mask {
+ __u64 data_mask;
+ __u64 insn_mask;
+};
+#endif
+
+#endif /* __aarch64__ && __linux__ */
+
bool
aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)),
ebl_tid_registers_t *setfunc __attribute__ ((unused)),
diff --git a/configure.ac b/configure.ac
index e57d39275..3298f7fc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -777,6 +777,14 @@ if test "$sys_user_has_user_regs" = "yes"; then
[Define to 1 if <sys/user.h> defines struct user_regs_struct])
fi
+AC_CHECK_TYPE([struct user_pac_mask],
+ [has_user_pac_mask=yes], [has_user_pac_mask=no],
+ [[#include <asm/ptrace.h>]])
+if test "$has_user_pac_mask" = "yes"; then
+ AC_DEFINE(HAVE_USER_PACK_MASK, 1,
+ [Defined if struct user_pac_mask exists.])
+fi
+
# On a 64-bit host where can can use $CC -m32, we'll run two sets of tests.
utrace_BIARCH
CC_BIARCH="$CC $utrace_biarch"
--
2.43.5
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally computed
sha256 22797942575e10347dab52ec43ebb9d3ace1d9b8569b271f434e2e1b1a4fe897 fluidsynth-2.4.2.tar.gz
sha256 a92aa83d2ff09a1a6d6186e81d8182bd2958947dffca77a6490ffd41b3ec9dc7 fluidsynth-2.4.3.tar.gz
sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
FLUIDSYNTH_VERSION = 2.4.2
FLUIDSYNTH_VERSION = 2.4.3
FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION))
FLUIDSYNTH_LICENSE = LGPL-2.1+
FLUIDSYNTH_LICENSE_FILES = LICENSE
@@ -77,6 +77,7 @@ config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4
help
Use LPDDR4 binaries (i.e.: lpddr4_pmu_train_*.bin)
if !BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9
config BR2_PACKAGE_FIRMWARE_IMX_DDR4
bool "DDR4"
help
@@ -87,6 +88,7 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR3
help
Use DDR3 binaries (i.e.: ddr3_*_201810.bin).
endif
endchoice # DDR training FW
config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION
+7 -7
View File
@@ -1,9 +1,9 @@
# sha256 checksum from https://go.dev/dl/
sha256 039c5b04e65279daceee8a6f71e70bd05cf5b801782b6f77c6e19e2ed0511222 go1.23.6.src.tar.gz
sha256 e61f87693169c0bbcc43363128f1e929b9dff0b7f448573f1bdd4e4a0b9687ba go1.23.6.linux-386.tar.gz
sha256 9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go1.23.6.linux-amd64.tar.gz
sha256 561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202 go1.23.6.linux-arm64.tar.gz
sha256 27a4611010c16b8c4f37ade3aada55bd5781998f02f348b164302fd5eea4eb74 go1.23.6.linux-armv6l.tar.gz
sha256 0f817201e83d78ddbfa27f5f78d9b72450b92cc21d5e045145efacd0d3244a99 go1.23.6.linux-ppc64le.tar.gz
sha256 321e7ed0d5416f731479c52fa7610b52b8079a8061967bd48cec6d66f671a60e go1.23.6.linux-s390x.tar.gz
sha256 7cfabd46b73eb4c26b19d69515dd043d7183a6559acccd5cfdb25eb6b266a458 go1.23.7.src.tar.gz
sha256 9115f7d751efe5b17b63a7630d24cd0a2479976465eecb277b5deec8aa0f4143 go1.23.7.linux-386.tar.gz
sha256 4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3 go1.23.7.linux-amd64.tar.gz
sha256 597acbd0505250d4d98c4c83adf201562a8c812cbcd7b341689a07087a87a541 go1.23.7.linux-arm64.tar.gz
sha256 c9e9ecd6a8cf1429f1c65d81115c450258258ac65833d95a82d5f4e5ad7d2d7a go1.23.7.linux-armv6l.tar.gz
sha256 3ffc310bfd11fd0bcc713a764a0f7252c4d52d03f12abebfaebaaae77e027028 go1.23.7.linux-ppc64le.tar.gz
sha256 af1d4c5d01e32c2cf6e3cc00e44cb240e1a6cef539b28a64389b2b9ca284ac6c go1.23.7.linux-s390x.tar.gz
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
GO_VERSION = 1.23.6
GO_VERSION = 1.23.7
HOST_GO_GOPATH = $(HOST_DIR)/share/go-path
HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache
@@ -0,0 +1,28 @@
From e60a9f388bd5655cb514491ef8d55d403aef0773 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Sun, 5 Nov 2023 12:21:52 +0100
Subject: [PATCH] Bug 705041: jbig2dec: Avoid uninitialized allocator in
command-line tool.
Upstream: https://github.com/ArtifexSoftware/jbig2dec/commit/ee53a7e4bc7819d32e8c0b2057885bcc97586bf3
Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
---
jbig2dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jbig2dec.c b/jbig2dec.c
index 15d204d..1e1dad8 100644
--- a/jbig2dec.c
+++ b/jbig2dec.c
@@ -567,7 +567,7 @@ main(int argc, char **argv)
{
jbig2dec_params_t params;
jbig2dec_error_callback_state_t error_callback_state;
- jbig2dec_allocator_t allocator_;
+ jbig2dec_allocator_t allocator_ = { 0 };
jbig2dec_allocator_t *allocator = &allocator_;
Jbig2Ctx *ctx = NULL;
FILE *f = NULL, *f_page = NULL;
--
2.48.1
+3
View File
@@ -12,4 +12,7 @@ JBIG2DEC_LICENSE_FILES = LICENSE
JBIG2DEC_CPE_ID_VENDOR = artifex
JBIG2DEC_INSTALL_STAGING = YES
# 0001-Bug-705041-jbig2dec-Avoid-uninitialized-allocator-in.patch
JBIG2DEC_IGNORE_CVES += CVE-2023-46361
$(eval $(autotools-package))
+1 -10
View File
@@ -18,6 +18,7 @@ LIBCAMERA_DEPENDENCIES = \
LIBCAMERA_CONF_OPTS = \
-Dandroid=disabled \
-Ddocumentation=disabled \
-Dqcam=disabled \
-Dtest=false \
-Dwerror=false
LIBCAMERA_INSTALL_STAGING = YES
@@ -83,16 +84,6 @@ LIBCAMERA_CONF_OPTS += -Dgstreamer=enabled
LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base
endif
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
LIBCAMERA_CONF_OPTS += -Dqcam=enabled
LIBCAMERA_DEPENDENCIES += qt5base
ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y)
LIBCAMERA_DEPENDENCIES += qt5tools
endif
else
LIBCAMERA_CONF_OPTS += -Dqcam=disabled
endif
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
LIBCAMERA_CONF_OPTS += -Dcam=enabled
LIBCAMERA_DEPENDENCIES += libevent
+1
View File
@@ -12,6 +12,7 @@ LIBCDIO_LICENSE = GPL-3.0+
LIBCDIO_LICENSE_FILES = COPYING
LIBCDIO_CPE_ID_VENDOR = gnu
LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb
LIBCDIO_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_ENABLE_LOCALE),)
LIBCDIO_DEPENDENCIES += libiconv
+1 -1
View File
@@ -1,4 +1,4 @@
# Locally computed:
sha256 7ce4ec8bb37a435a73ac18c4c9ff56c2dc6c98892bf3f53a328e3eca42efb9cf libjxl-0.11.0.tar.gz
sha256 1492dfef8dd6c3036446ac3b340005d92ab92f7d48ee3271b5dac1d36945d3d9 libjxl-0.11.1.tar.gz
sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE
sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBJXL_VERSION = 0.11.0
LIBJXL_VERSION = 0.11.1
LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION))
LIBJXL_LICENSE = BSD-3-Clause
LIBJXL_LICENSE_FILES = LICENSE PATENTS
+3 -3
View File
@@ -431,9 +431,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.4.290" if BR2_KERNEL_HEADERS_5_4
default "5.10.234" if BR2_KERNEL_HEADERS_5_10
default "5.15.178" if BR2_KERNEL_HEADERS_5_15
default "6.1.129" if BR2_KERNEL_HEADERS_6_1
default "6.6.80" if BR2_KERNEL_HEADERS_6_6
default "6.12.17" if BR2_KERNEL_HEADERS_6_12
default "6.1.130" if BR2_KERNEL_HEADERS_6_1
default "6.6.81" if BR2_KERNEL_HEADERS_6_6
default "6.12.18" if BR2_KERNEL_HEADERS_6_12
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -16,7 +16,7 @@ COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO
COMPILER_RT_INSTALL_STAGING = YES
COMPILER_RT_INSTALL_TARGET = NO
COMPILER_RT_CONF_OPTS=-DCOMPILER_RT_STANDALONE_BUILD=OFF \
COMPILER_RT_CONF_OPTS = \
-DCOMPILER_RT_STANDALONE_BUILD=ON \
-DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \
-DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \
+26
View File
@@ -0,0 +1,26 @@
From b09e3174a695d1db60b2abc442d29ed3f87f0358 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 7 Aug 2024 08:51:03 +0300
Subject: m68k: fix POLLWRNORM and POLLWRBAND
As noted in commit f5011c62c3 ("fix POLLWRNORM and POLLWRBAND on mips")
m68k uses a different definition.
Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Upstream: https://git.musl-libc.org/cgit/musl/commit/?id=b09e3174a695d1db60b2abc442d29ed3f87f0358
---
arch/m68k/bits/poll.h | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 arch/m68k/bits/poll.h
diff --git a/arch/m68k/bits/poll.h b/arch/m68k/bits/poll.h
new file mode 100644
index 00000000..00063f41
--- /dev/null
+++ b/arch/m68k/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 256
--
cgit v1.2.1
+1 -1
View File
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_ODB
bool "host-odb"
bool "host odb"
select BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
help
This is a compiler that takes a specially crafted c++ header
+1 -1
View File
@@ -13,7 +13,7 @@ POSTGRESQL_CPE_ID_VENDOR = postgresql
POSTGRESQL_SELINUX_MODULES = postgresql
POSTGRESQL_INSTALL_STAGING = YES
POSTGRESQL_CONFIG_SCRIPTS = pg_config
POSTGRESQL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
POSTGRESQL_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
# We have to force invalid paths for xmllint and xsltproc, otherwise
# if detected they get used, even with -Ddocs=disabled and
# -Ddocs_pdf=disabled, and it causes build failures
+1 -1
View File
@@ -40,7 +40,7 @@ PRBOOM_CONF_OPTS = \
# endianness detection isn't used when cross compiling
define PRBOOM_BIG_ENDIAN_FIXUP
$(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \
$(SED) 's,.*#.*undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \
$(PRBOOM_DIR)/config.h
endef
+1 -1
View File
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_SDBUSPLUS
bool "host-sdbusplus"
bool "host sdbusplus"
select BR2_PACKAGE_HOST_PKGCONF
help
A C++ library for sd-bus with a bindings and doc generator.
-6
View File
@@ -30,12 +30,6 @@ config BR2_PACKAGE_SQLITE_ENABLE_FTS3
http://www.sqlite.org/amalgamation.html), version 3 of the
full-text search engine is added to the build automatically.
config BR2_PACKAGE_SQLITE_ENABLE_JSON1
bool "Enable the JSON extensions for SQLite"
help
When this option is defined in the amalgamation, the JSON
extensions are added to the build automatically.
config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY
bool "Enable sqlite3_unlock_notify() interface"
help
-4
View File
@@ -25,10 +25,6 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
endif
ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),y)
SQLITE_CFLAGS += -DSQLITE_ENABLE_JSON1
endif
ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y)
SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
endif
+1
View File
@@ -847,6 +847,7 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV)
SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
define SYSTEMD_LINUX_CONFIG_FIXUPS
$(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS)
$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS)
$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS)
$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)
+6
View File
@@ -60,6 +60,12 @@ HOST_UTIL_LINUX_CONF_OPTS = \
--with-systemdsystemunitdir=no \
--without-python
ifeq ($(BR2_PACKAGE_UTIL_LINUX_UUIDD),y)
define UTIL_LINUX_USERS
uuidd -1 uuidd -1 * - - - uuidd user
endef
endif
ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),)
UTIL_LINUX_SELINUX_MODULES = fstools
endif
+1
View File
@@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_WEBP
select BR2_PACKAGE_WEBP_DEMUX
select BR2_PACKAGE_WEBP_MUX
select BR2_PACKAGE_WOFF2
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
+3 -3
View File
@@ -1,6 +1,6 @@
# From https://www.webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.sums
sha1 3699ff9c9b84e755a0736e72dfd6e5a13151f7d6 webkitgtk-2.44.4.tar.xz
sha256 2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796 webkitgtk-2.44.4.tar.xz
# From https://www.webkitgtk.org/releases/webkitgtk-2.46.4.tar.xz.sums
sha1 10d4dbd222acec30b1d20ee3b7d02c0d9727c5a9 webkitgtk-2.46.4.tar.xz
sha256 0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176 webkitgtk-2.46.4.tar.xz
# Hashes for license files:
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
+3 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
WEBKITGTK_VERSION = 2.44.4
WEBKITGTK_VERSION = 2.46.4
WEBKITGTK_SITE = https://www.webkitgtk.org/releases
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
WEBKITGTK_INSTALL_STAGING = YES
@@ -30,6 +30,8 @@ WEBKITGTK_CONF_OPTS = \
-DUSE_AVIF=OFF \
-DUSE_GTK4=OFF \
-DUSE_LIBHYPHEN=OFF \
-DUSE_SKIA=OFF \
-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
-DUSE_WOFF2=ON
ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y)
+4 -3
View File
@@ -5,7 +5,7 @@
# to CycloneDX format.
#
# Example usage:
# > make show-info | utils/generate-cyclonedx.py | jq '.'
# $ make show-info | utils/generate-cyclonedx > sbom.json
import argparse
@@ -270,7 +270,7 @@ def br2_parse_deps_recursively(ref, show_info_dict, virtual=False, deps=[]):
def main():
parser = argparse.ArgumentParser(
description='''Create a CycloneDX SBoM for the Buildroot configuration.
Example usage: make show-info | utils/generate-cyclonedx.py | jq > sbom.json
Example usage: make show-info | utils/generate-cyclonedx > sbom.json
'''
)
parser.add_argument("-i", "--in-file", nargs="?", type=argparse.FileType("r"),
@@ -316,7 +316,8 @@ def main():
},
}
args.out_file.write(json.dumps(cyclonedx_dict))
args.out_file.write(json.dumps(cyclonedx_dict, indent=2))
args.out_file.write('\n')
if __name__ == "__main__":