staging/pepe2k/include, branch v23.05.1

OpenWrt v23.05.1: adjust config defaults

2023-11-12T20:20:49Z

Signed-off-by: Hauke Mehrtens

image: fix image generation within ImageBuilder

2023-11-06T12:04:53Z

Changes introduced in commit d604a07225c5 ("build: add CycloneDX SBOM JSON support") broke ImageBuilder: Cannot open '/openwrt-imagebuilder-ath79-generic.Linux-x86_64/tmp/.packageinfo': No such file or directory So lets fix it by wrapping the BOM generation behind condition of IB feature check. Fixes: #13881 Fixes: d604a07225c5 ("build: add CycloneDX SBOM JSON support") Signed-off-by: Petr Štetiar (cherry picked from commit c4259a658673cc1a02ed17bfa8e94de17de00ad2)

build: add CycloneDX SBOM JSON support

2023-11-02T14:44:47Z

CycloneDX is an open source standard developed by the OWASP foundation. It supports a wide range of development ecosystems, a comprehensive set of use cases, and focuses on automation, ease of adoption, and progressive enhancement of SBOMs (Software Bill Of Materials) throughout build pipelines. So lets add support for CycloneDX SBOM for packages and images manifests. Signed-off-by: Petr Štetiar (cherry picked from commit d604a07225c5c82b942cd3374cc113ad676a2519)

package-dumpinfo,metadata: add ABI version information to package index

2023-11-02T14:44:46Z

There is no standard for ABI versioning, so its not possible to find out from `libext2fs2`, `libiwinfo20230701` or `libss2` package names if thats just package name or package name with ABI version included. To help with the decision, lets make ABI version aviable in package index. Signed-off-by: Petr Štetiar (cherry picked from commit 649655f427932fe79b96a41f883c8054b1806191)

package-dumpinfo: add CPE information to package index

2023-11-02T14:44:45Z

Common Platform Enumeration (CPE) is a structured naming scheme for information technology systems, software, and packages. In order for the information to be processed further, it should also be available in package index files. Signed-off-by: Petr Štetiar (cherry picked from commit 33b3fea70245068030ef64b6d7c5b344d08ba9d8)

kernel: bump 5.15 to 5.15.137

2023-10-29T12:00:28Z

Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.137 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens (cherry picked from commit 75aeb7ed627ba5ea6f10f365b232bed21e40b502)

kernel: bump 5.15 to 5.15.136

2023-10-29T12:00:28Z

Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.136 Removed bcm53xx patch backported from 5.15.136: target/linux/bcm53xx/patches-5.15/081-xhci-Keep-interrupt-disabled-in-initialization-until.patch [1] All other patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 1. https://github.com/openwrt/openwrt/pull/13751#issuecomment-1781206937 Signed-off-by: John Audia [rmilecki: updated commit description & tested on Luxul XWR-3150] Signed-off-by: Rafał Miłecki [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens (cherry picked from commit 5a6368e85deb1d751238447ea8b289576e701cb0)

kernel: bump 5.15 to 5.15.135

2023-10-29T12:00:28Z

Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.135 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens (cherry picked from commit 096bb8ed82cebeb8926a5b64466afec649385159)

prereq: merge common cases in SetupHostCommand

2023-10-26T23:03:38Z

Now that most cases do the same thing in SetupHostCommand, merge them together into one. To allow moving the generic symlink check, invert the check and let it check for relative links by matching on link targets that do not start with a slash. This then allows us to also drop the absolute link case, shortening the case statement further. This reorders the check to * if it is not a symlink, do not change it * if it is a symlink and it points to the found command, do not change it * if it is a symlink with a relative path, do not change it * else, update/replace it Signed-off-by: Jonas Gorski (cherry picked from commit 3210aa8e0a113cc4354628b08b608c5c8f792941)

prereq: make existing binary check work for sdk as well

2023-10-26T23:03:38Z

To avoid replacing host built binaries with symlinks again, a check for an appropriate stamp was added in 729909c07f ("prereq-build: do not replace binaries with symlinks"). Unfortunately the stamp directory does not exist in the SDK, so the fix was ineffective there. This caused the packages builders to e.g. use the host tar again, which in turn made the tarballs created different since it may lack reproducibility fixes, or implement these differently, causing spurious hash failures on source repository based packages. Fix this by dropping the stamp dir check, and just check that the file is usable. Fixes: 729909c07f ("prereq-build: do not replace binaries with symlinks") Signed-off-by: Jonas Gorski (cherry picked from commit c1ef10c8d873254ce7c1f3019d821c4a87227474)