diff --git a/CHANGES b/CHANGES index cf49ce56b3..56267752c8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,1476 @@ +2025.11, released December 11th, 2025 + + Fixes all over the tree. + + linux: Default to 6.18 for runtime kernel and kernel headers, + drop the now EOL 5.4.x series. + + Updated/fixed packages: apache, audit, cryptodev-linux, + dmraid, ficl, glibc, go, intel-mediadriver, intel-vpl-gpu-rt, + kbd, libcap, libdbi, libgit2, libpng, libtirpc, libxslt, + lugaru, mosh, pigz, podman, python-fonttools, python-urllib3, + python3, racehound, rdesktop, rtl8188eu, softhsm, sqlite, + strace, unbound, unzip, xapp_xkbutils, + xdriver_xf86-video-intel, xl2tp, xserver_xorg-server, xwayland + +2025.11-rc2, released November 30th, 2025 + + Fixes all over the tree. + + Infrastructure: support/scripts/check-merged (introduced in + 2025.11-rc1) no longer relies on getopt from util-linux + + Defconfigs: pine64 star: Update U-Boot and Linux kernel to fix + builds with GCC 14.x + + Updated/fixed packages: 18xx-ti-utils, depot-tools, e2fsprogs, + enscript, fio, gnutls, intel-mediadriver, intel-vpl-gpu-rt, + ledmon, libpng, libteam, lmbench, mongoose, netsnmp, + nss-pam-ldapd, open-plc-utils, oprofile, pdmenu, php-apcu, + php-pecl-dbus, php-xdebug, php-yaml, python-flask-restx, + python-pysocks, python-starlette, sane-backends, sbc, sdl, + stress-ng, swipl, syslinux, time, tmux, tor, uboot-tools, + woff2, xfsprogs, yaml-cpp + + Removed packages: libargtable2, starfive-spltool + +2025.11-rc1, released November 20th, 2025 + + Fixes all over the tree and new features. + + Infrastructure: + + - Support merged /usr/sbin/ (E.G. sbin a symlink to bin rather + than separate directories), which is required by systemd + 256+ + + - support/scripts/cve-check can now be used to enrich a SBOM + in CycloneDX format (as generated by + utils/generate-cyclonedx) with vulnerability analysis from + the NVD database. + + Dropped a number of old and unmaintained packages and external + toolchains. + + New defconfigs: Compulab IOT-GATE-iMX8 EBBR, QEMU x86-64 EFI + + Removed defconfigs: at91sam9260eknf, atmel_sama5d3xek, + roseapplepi + + New packages: broot, bvi, go-bootstrap-stage4, libpam-pkcs11, + llama-cpp, nnn, python-crccheck, python-fs, python-patch-ng, + python-pyfatfs, python-scp, python-whitenoise, snapboot, wmenu + + Removed packages: aufs, aufs-util, axfsutils, bctoolbox, + belle-sip, belr, dmenu-wayland, dvbsnoop, + ev3dev-linux-drivers, expect, fbtft, gtk2-engines, gtkperf, + leafpad, lesstif, libbson, libglade, libgtk2, libjwt, libsexy, + linphone, logsurfer, mediastreamer, metacity, mongrel2, ola, + ortp, procrank_linux, ramspeed, sylpheed + +2025.08.3, released December 11, 2025 + + Important / security related fixes: + + - asterisk: CVE-2025-1131, CVE-2025-57767, CVE-2025-49832, + CVE-2025-47780, CVE-2025-47779 + - gnutls: CVE-2025-9820 + - libpng: CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018 + - luksmeta: CVE-2025-11568 + - mariadb: CVE-2025-30693, CVE-2025-30722, CVE-2023-52969, + CVE-2023-52970, CVE-2023-52971 + - openvpn: CVE-2025-13086 + - postgresql: CVE-2025-12817, CVE-2025-12818 + - python-django: CVE-2025-64458, CVE-2025-64459 + - python-startlette: GHSA-7f5h-v6xp-fcq8 + + Infrastructure updates/fixes: + + - New script support/scripts/cve-check to enricht CycloneDX SBoM with + CVE information from NVD database. + + Updated / fixed packages: 18xx-ti-utils, asterisk, enscript, gnutls, + libpng, libroxml, libteam, linux-headers, luksmeta, mariadb, nbd, neard, + nss-pam-ldapd, open-plc-utils, openjdk, openjdk-bin, openvpn, oprofile, + pdmenu, perl-net-ssleay, postgresql, python-django, python-starlette, + redis, sane-bacends, sbc, sdbusplus, sdl, swipl, tailscale, thermald, + tmux, tor + + Removed packages: bctoolbox, belle-sip, belr, linphone, mediastreamer, + mongrel2, ortp + +2025.08.2, released November 20, 2025 + + Important / security related fixes: + + - bind: CVE-2025-8677, CVE-2025-40778, CVE-2025-40780 + - dante: CVE-2024-54662 + - erlang: CVE-2024-53846, CVE-2025-4748, CVE-2025-26618, CVE-2025-30211, + CVE-2025-32433, CVE-2025-46712, CVE-2025-48038, + CVE-2025-48039, CVE-2025-48040, CVE-2025-48041 + - hostapd: CVE-2025-24912 + - imagemagick: CVE-2025-62171 + - iptraf-ng: CVE-2024-52949 + - libarchive: CVE-2025-25724 + - libglib2: CVE-2024-54662 + - libvips: CVE-2025-29769, CVE-2025-59933 + - libvpx: CVE-2025-5283 + - libxslt: CVE-2025-24855, CVE-2024-55549 + - mbedtls: CVE-2025-54764, CVE-2025-59438 + - modsecurity2: CVE-2025-52891, CVE-2025-54571 + - netdata: CVE-2023-22496, CVE-2023-22497 + - podman: CVE-2025-9566 + - poppler: CVE-2024-6239, CVE-2024-56378, CVE-2025-32364, + CVE-2025-32365, CVE-2025-43903, CVE-2025-50420, + CVE-2025-52886 + - python3: gh-139312, gh-139700, gh-139400, gh-135661, gh-135661, + gh-102555, gh-135462, gh-118350, gh-86155 + - python-webpy: CVE-2025-3818 + - redis: CVE-2025-46817, CVE-2025-46818, CVE-2025-46819, CVE-2025-49844 + - samba: CVE-2025-3818, CVE-2025-10230 + - shairport-sync: Upstream security fixes without CVE + - squid: CVE-2025-59362 + - suricata: CVE-2024-37151, CVE-2024-38535 + - tpm2-tss: CVE-2024-29040 + - xerces: CVE-2024-23807 + - zabbix: CVE-2025-27231, CVE-2025-27236, CVE-2025-27238, CVE-2025-49641 + - zip: CVE-2018-13410 + + Infrastructure updates/fixes: + + - Improved matching of CPE ID with NVD database, resulting in more accurate + identification of CVEs. + - brmake: avoid garbled output with top-level parallel build + + Updated / fixed packages: 4th, audit, bind, cmake, crun, dante, + ebtables, erlang, freeradius-server, freerdp, gpsd, gstd, hostapd, + imagemagick, iptraf-ng, ledmon, libarchive, libcurl, libdbi-drivers, + libdisplay-info, libglib2, libgphoto2, libgtk3, libheif, libiconv, + libsemanage, libshout, libsolv, libtpms, libvips, libvpx, libwpe, + libxslt, linux, linux-headers, live555, mbedtls, micropython, + mjpg-streamer, modsecurity2, netdata, podman, poppler, python3, + python-flask-cors, python-webpy, quota, qt6multimedia, redis, refpolicy, + samba4, shairport-sync, selinux-python, sexpect, siproxd, sqlite, squid, + suricata, tor, tpm2-tss, waffle, webkitgtk, wireless-regdb, wpewebkit, + xerces, zabbix, zip + + Removed package: ramspeed + + Boards updated / fixed: andes_ae350_45, beaglebone, beagleboneai, + cubieboard1, cubieboard2, imx6ulz_bsh_smm_m2, imx8mn_bsh_smm_s2, + imx8mn_bsh_smm_s2_pro, olimex_a20_olinuxino_lime*, stm32f429_disco_xip, + stm32f746_disco_sd, stm32f769_disco_sd, stm32mp1*_dk*, ti_am62x_sk + + Test Improvements: + + - Capture output of failing commands on host. + +2025.08.1, released October 11, 2025 + + Important / security related fixes: + + - atop: CVE-2025-31160 + - civetweb: CVE-2025-55763 + - cjson: CVE-2025-57052 + - connman: CVE-2025-32366, CVE-2025-32743 + - cups: CVE-2025-58060, CVE-2025-58364 + - expat: CVE-2025-59375 + - fastd: CVE-2025-24356 + - fetchmail: CVE number pending + - ghostscript: CVE-2025-59798, CVE-2025-59799, CVE-2025-59800, + CVE-2025-59801 + - intel-microcode: CVE-2025-20053, CVE-2025-20109, CVE-2025-22839, + CVE-2025-22840, CVE-2025-22889, CVE-2025-26403 + - jasper: CVE-2023-51257, CVE-2025-8835 + - libcurl: CVE-2025-10148, CVE-2025-9086 + - libopenssl: CVE-2025-9230, CVE-2025-9231, CVE-2025-9232 + - libssh: CVE-2025-8114, CVE-2025-8277 + - lua: CVE-2014-5461 + - opencv4: CVE-2025-53644 + - pcre2: CVE-2025-58050 + - poco: CVE-2025-6375 + - postgresql: CVE-2025-8713, CVE-2025-8714, CVE-2025-8715 + - python-django: CVE-2025-57833, CVE-2025-59681, CVE-2025-59682 + - python-pip: CVE-2025-8869 + - raptor: CVE-2024-57822, CVE-2024-57823 + - syslog-ng: CVE-2024-47619 + - tiff: CVE-2024-13978, CVE-2025-8961, CVE-2025-9165 + + + Updated / fixed packages: asterisk, boinc, boot-wrapper-aarch64, c-icap, + chocolate-doom, cjson, cpp-httplib, cutekeyboard, docker-engine, fatcat, + fluent-bit, gnupg2, gnuplot, htpdate, iputils, kodi, libfreeimage, + libopenssl, libselinux, libsemanage, libxkbcommon, libxmlrpc, + linux-firmware, linuxptp, llvm, luaossl, luvi, mariadb, mdio-tools, + modsecurity2, openjpeg, pango, php-lua, policycoreutils, + python-aiohttp-session, python-certifi, python-cryptography, + python-flask-cors, python-pytz, python-trove-classifiers, + python-typing-extensions, rtl8723bu, rtl8723ds, rtl8821cu, rtl8822cs, + rtl_433, ruby, samba4, sysprof, ti-k3-boot-firmware, tiff, tor, uboot, + uclibc, upx, vulkan-headers, webkitgtk, wilc-driver, wlroots, x11r7, + xilinx-embeddedsw, xilinx-prebuilt, xlib_xtrans, xr819-xradio, zziplib + + Boards updated / fixed: beagleboneai, loongarch64-efi, qemu (all), + versal, zedboard + + Boards removed: at91sam9260eknf, atmel_sama5d3xek, roseapplepi + + Test Improvements: + + - test_docker_compose: update kernel & VM CPU + - TestZfsUclibc: use internal backend for uClibc-ng toolchain + - GitTestBase: remove git daemon due to Gitlab-CI security settings + +2025.08, released September 7th, 2025 + + Fixes all over the tree. + + Infrastructure: + + - 'make show-info' now also displays the package directory. + + - utils/bump-stable-kernel-versions helper script to bump + Linux (headers) kernel versions. + + Fixed defconfigs: QEMU ARM / Aarch64 EBBR / SBSA, Sipeed + licheepi zero, TI am62x sk + + Removed defconfigs (build failures): Bananapro, Beelink gs1, + Chromebook snow, Engicam i.MX6 boards, Galileo, Microchip + at91sam9g20df / at91sam9g45m10ek / at91sam9rlek, Odroid XU-4, + Orangepi lite2 / one+, Pcengine apu2, Pine64 rock64 / sopine, + Raxda rockpin8, Riotboard, Socrates cyclone5, Technologic + TS-7680, Toradex Apalis i.MX6 + + Updated/fixed packages: apitrace, avrdude, b43-firmware, bat, + brcm-patchram-plus, busybox, ecryptfs-utils, exiv2, ffmpeg, + firewalld, gdb, go, imagemagick, input-event-daemon, iozone, + ipmitool, jose, libcap-ng, libfreeglut, libftdi1, libgsm, + libkrb5, libsoxr, lighttpd, lirc-tools, lua-utf8, mariadb, + mbpfan, micropython, mosquitto, netavark, openal, postgis, + python-flask-cors, python-h2, python-yarl, python3, rtl8188eu, + rtl8821au, sqlite, squid, sslh, tcpreplay, timescaledb, + tstools, uclibc, udisks, unbound, vde2, + webrtc-audio-processing, wipe, wireshark, xlib_libXt + + Removed packages: libsvgtiny, netstat-nat, + netsurf-buildsystem, thttpd + +2025.08-rc3, released August 28th, 2025 + + Fixes all over the tree, mainly GCC 15.x build fixes + + support/misc/pkg-stats: Be more robust when parsing CVEs + + Fixed defconfigs: canaan_kd233, sipeed_maix*: Correct Linux + image name configuration, ci20: Needs host-openssl, + imx6ulz_bsh_smm_m2: Use correct FPU configuration + + Removed defconfigs: kontron_pitx_imx8m + + Updated/fixed packages: binutils, cpp-httplib, dtach, + dump1090, ffmpeg, gdbm, gpm, libjwt, liblog4c-localtime, + libv4l, lrzsz, mesa3d, p11-kit, php-lua, proftpd, + python-aexpect, python-pyroute2, python3, rpi-userland, sdl, + vim, wayland, weston, wpewebkit, xvisor + + Removed packages: liboauth + +2025.08-rc2, released August 21th, 2025 + + Fixes all over the tree. + + The release tarballs are now built reproducibly. + + Updated/fixed packages: bash, bcusdk, ed, elfutils, gcc, + gcc-bare-metal, go, grub, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, hwdata, iperf3, jq, + libcue, libtracefs, modem-manager, ofono, openconnect, + openjpeg, openocd, prboom, python-numpy, rpcbind, rrdtool, + rt-tests, rtl8812au-aircrack-ng, setserial, start-stop-daemon, + tinyssh, trace-cmd, vorbis-tools + +2025.08-rc1, released August 11th, 2025 + + Fixes all over the tree and new features. + + Arch: Add LoongArch64 architecture support + + Toolchains: + - ARC toolchain updated to 2024.12 + - Bootlin external toolchains updated to 2025.08-1 + - GCC 15.1.0 added, 12.x dropped, 14.x is now default + - GCC 13.x updated to 13.4.0, 14.x updated to 14.3.0 + - Default to Linux 6.16.x kernel headers + + Misc: + - Various tweaks to utils/generate-cyclonedx for better SBOM + compatibility and project name/version customization + + New defconfigs: BeagleY-AI, CoolPI 4B, Freescale i.MX91 + Freedom, LoongArch64 EFI, QEMU LoongArch64 Virt, Raspberrypi + Compute Module 5 IO + + New packages: containers-image-config, distribution-registry, + llvm-runtimes, lua-lrexlib-pcre2, msgpack-c, opencl-headers, + opencl-icd-loader, pocketpy, python-apscheduler, python-crc, + python-log-rate-limit, python-sdbus-modemmanager, soapy-sdr, + vulkan-sdk + + Removed packages: libebur128, libolm, libwebsock, + python-dunamai, python-poetry-dynamic-versioning + +2025.05.3, released October 11, 2025 + + This is the final release on the 2025.05.x branch. + + Important / security related fixes: + + - atop: CVE-2025-31160 + - civetweb: CVE-2025-55763 + - cjson: CVE-2025-57052 + - connman: CVE-2025-32366, CVE-2025-32743 + - cups: CVE-2025-58060, CVE-2025-58364 + - exiv2: CVE-2023-44398, CVE-2024-24826, CVE-2024-25112, CVE-2024-39695, + CVE-2025-26623, CVE-2025-54080, CVE-2025-55304 + - expat: CVE-2025-59375 + - fastd: CVE-2025-24356 + - fetchmail: CVE number pending + - ghostscript: CVE-2025-59798, CVE-2025-59799, CVE-2025-59800, + CVE-2025-59801 + - imagemagick: CVE-2023-5341, CVE-2025-55004, CVE-2025-55005, + CVE-2025-55160 + - intel-microcode: CVE-2025-20053, CVE-2025-20109, CVE-2025-22839, + CVE-2025-22840, CVE-2025-22889, CVE-2025-26403 + - jasper: CVE-2023-51257, CVE-2025-8835 + - libcurl: CVE-2025-10148, CVE-2025-9086 + - libopenssl: CVE-2025-9230, CVE-2025-9231, CVE-2025-9232 + - libssh: CVE-2025-8114, CVE-2025-8277 + - lua: CVE-2014-5461 + - opencv4: CVE-2025-53644 + - pcre2: CVE-2025-58050 + - poco: CVE-2025-6375 + - postgresql: CVE-2025-8713, CVE-2025-8714, CVE-2025-8715 + - python-django: CVE-2025-57833, CVE-2025-59681, CVE-2025-59682 + - python-flask-cors: CVE-2024-6839, CVE-2024-6844, CVE-2024-6866 + - python-pip: CVE-2025-8869 + - raptor: CVE-2024-57822, CVE-2024-57823 + - sqlite: CVE-2025-6965 + - syslog-ng: CVE-2024-47619 + - tiff: CVE-2024-13978, CVE-2025-8961, CVE-2025-9165 + - udisks: CVE-2025-8067 + - wireshark: CVE-2025-5601 + + Updated / fixed packages: asterisk, avrdude, boinc, boot-wrapper-aarch64, + cjson, cpp-httplib, cutekeyboard, docker-engine, ecryptfs-utils, fatcat, + fetchmail, firewalld, gnupg2, gnuplot, htpdate, iputils, jose, kodi, + libfreeimage, libopenssl, libselinux, libsemanage, libxkbcommon, + libxmlrpc, linux-firmware, linuxptp, llvm, lua-utf8, luaossl, luvi, + mariadb, mbpfan, micropython, modsecurity2, mosquitto, opencv4, openjpeg, + pango, php-lua, policycoreutils, python-aiohttp-session, python-certifi, + python-cryptography, python-flask-cors, python-pytz, python3, rtl_433, + ruby, samba4, sysprof, ti-k3-boot-firmware, tiff, tor, uclibc, upx, + webkitgtk, wlroots, x11r7, xilinx-embeddedsw, xilinx-prebuilt, zziplib + + Removed package: netstat-nat + + Boards updated / fixed: versal, ti_am62x_sk, qemu/{x86, x86_64}, + zedboard, beagleboneai + + Boards removed: roseapplepi, at91sam9260eknf, atmel_sama5d3xek + + Test Improvements: + + - TestSWIPL: increase timeout value + - TestOpenJdk: remove stime() function call + - test_hardening: update toolchain to aarch64 for checksec tests + - test_docker_compose: update kernel & VM CPU + - TestZfsUclibc: use internal backend for uClibc-ng toolchain + - GitTestBase: remove git daemon due to Gitlab-CI security settings + +2025.05.2, released September 09, 2025 + + Important / security related fixes: + + - libssh: CVE-2025-4878, CVE-2025-5318, CVE-2025-5351, CVE-2025-5372, + CVE-2025-5449, CVE-2025-5987 + - glibc: CVE-2025-5702, CVE-2025-5745, CVE-2025-8058 + - gnutls: CVE-2025-32989, CVE-2025-32988, CVE-2025-32990, CVE-2025-6395 + - python3: CVE-2025-8194 + - libhtp: CVE-2025-53537 + - tiff: CVE-2025-8176, CVE-2025-8177 + - libglib2: CVE-2025-6052 + - ofono: CVE-2023-2794, CVE-2024-7537, CVE-2024-7539, CVE-2024-7540, + CVE-2024-7541, CVE-2024-7542 + - elfutils: CVE-2025-1352, CVE-2025-1365, CVE-2025-1371, CVE-2025-1372, + CVE-2025-1376, CVE-2025-1377 + - grub2: CVE-2024-45777, CVE-2024-45778, CVE-2024-45779, + CVE-2024-45780, CVE-2024-45782, CVE-2024-56737, CVE-2024-56738, + CVE-2025-0678, CVE-2025-0684, CVE-2025-0685, CVE-2025-0686, + CVE-2025-0689, CVE-2025-1125 + - openjpeg: CVE-2025-54874 + - go: CVE-2025-4674, CVE-2025-47907 + - gst1-plugins-base: CVE-2025-47806, CVE-2025-47807 + - gst1-plugins-good: CVE-2025-47219, CVE-2025-47183 + - vorbis-tools: CVE-2023-43361 + - vim: CVE-2024-41957, CVE-2024-41965, CVE-2024-45306, CVE-2024-47814, + CVE-2025-1215, CVE-2025-22134, CVE-2025-24014, CVE-2025-26603, + CVE-2025-29768, CVE-2025-53905, CVE-2025-53906 + - ffmpeg: CVE-2023-6602 + - lighttpd: CVE-2025-8671 + - python-h2: CPE-2025-57804 + - cpp-httplib: CVE-2025-46728 + + Removed packages: liboauth, thttpd + + Removed defconfigs: at91sam9g20dfc, at91sam9g45m10ek, + at91sam9rlek, bananapro, beelink_gs1, chromebook_snow, galileo, + odroidxu4, orangepi_lite2, orangepi_one_plus, pcengines_apu2, + pine64_sopine, riotboard, rock64, rock_pi_n8, socrates_cyclone5, + toradex_apalis_imx6, ts7680, engicam_imx6*, kontron_pitx_imx8m, + imx6ulz_bsh_smm_m2, + + Test Improvements: + + - test_gstreamer1: raise tesseract-ocr timeout to 15s + - test_wine: fix test after bootlin toolchains update + - test_numactl: fix test after bootlin toolchains update + - test_dpdk: fix test after bootlin toolchains update + - test_msr_tools: fix test after bootlin toolchains update + - test_dmidecode: fix test after bootlin toolchains update + - test_iso9660: use a more recent toolchain + - test_grub: use glibc toolchain + - test_wget: replace thttpd by Busybox's httpd server + - test_libcurl: replace thttpd by Busybox's httpd server + - test_systemd_selinux: fix test after bootlin toolchains update + + Updated / fixed packages: python-propcache, pipewire, apache, xinetd, + libssh, glibc, libhtp, libapparmor, libopenssl, rpi-firmware, + brcmfmac_sdio-firmware-rpi, grout, php-pecl-dbus, tini, snooze, ngrep, + libzenoh-pico, janet, cjson, flatcc, nanocom, rtl8189es, gcc, ofono, + python-numpy, elfutils, libtracefs, tinyssh, start-stop-daemon, bcusdk, + prboom, setserial, grub2, openjpeg, go, gstreamer1, gst1-plugins-base, + gst1-plugins-good, gst1-plugins-bad, gst1-plugins-ugly, gst1-devtools, + gst1-libav, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1-editing-services, vorbis-tools, jq, lbijwt, vim, ffmpeg, + libv4l, python-yarl, lirc-tools, b43-firmware, tcpreplay, libsvgtiny, + libsoxr, lighttpd, uclibc, vde2, libcap-ng, python-h2, squid, ipmitool, + ell, proftpd, liblog4c-localtime, wpewebkit, weston, cpp-httplib, + ipset, python3, python-aexpect, libftdi1 + + Infrastructure updates/fixes: + - Various tweaks to utils/generate-cyclonedx for better SBOM + compatibility and project name/version customization + - go: make pre-built compiler provide target support too + - test-pkg: add new option -T/--toolchain-name + - pkg-utils.mk: include package directory in show-info output + - bump-stable-kernel-versions: new tool + + Boards updated / fixed: + + - qemu_sh4*: switch back to disk emulation + - acmesystems_acqua_a5_*: update linux + - sipeed_licheepi_zero: update linux & uboot + - zynqmp: increase vfat partition to 64M + - qemu_{arm,aarch64}_{ebbr,sbsa}*: linux needs host python3 + - canaan_kd233, sipeed*: use BR2_LINUX_KENREL_IMAGE_TARGET_NAME + - ci20: U-Boot needs host-openssl + +2025.05.1, released August 11th, 2025 + + Important / security related fixes: + - samba4: support Windows security hardening + - apache: CVE-2025-53020, CVE-2025-49812, CVE-2025-49630, CVE-2025-23048, + CVE-2024-47252, CVE-2024-43394, CVE-2024-43204, CVE-2024-42516, + CVE-2025-54090 + - assimp: CVE-2025-2750, CVE-2025-2751, CVE-2025-2757, CVE-2025-3158 + - clamav: CVE-2025-20260 + - edk2: CVE-2024-38805 + - git: CVE-2025-27613, CVE-2025-27614, CVE-2025-46835, CVE-2025-48384, + CVE-2025-48385, CVE-2025-48386 + - jose: CVE-2023-50967 + - libarchive: CVE-2025-5914, CVE-2025-5915, CVE-2025-5916, CVE-2025-5917, + CVE-2025-5918 + - libavif: CVE-2025-48174, CVE-2025-48175 + - libblockdev: CVE-2025-6019 + - libbpf: CVE-2025-29481 + - libglib2: CVE-2025-6052 + - libheif: CVE-2025-43966, CVE-2025-43967 + - libhtp: CVE-2024-45797 + - libopenssl: CVE-2025-4575 + - libsoup: CVE-2024-52530, CVE-2024-52531, CVE-2024-52532, CVE-2025-2784, + CVE-2025-4476, CVE-2025-4948, CVE-2025-4969, CVE-2025-32050, + CVE-2025-32052, CVE-2025-32053, CVE-2025-32906, CVE-2025-32910, + CVE-2025-32911, CVE-2025-32912, CVE-2025-32913, CVE-2025-32914, + CVE-2025-46420, CVE-2025-46421 + - libxml2: CVE-2025-6021, CVE-2025-49794, CVE-2025-49796, CVE-2025-49795, + CVE-2025-6170 + - mbedtls: CVE-2025-47917, CVE-2025-48965, CVE-2025-49087, CVE-2025-49600, + CVE-2025-49601, CVE-2025-52496, CVE-2025-52497 + - micropython: CVE-2024-8947 + - modsecurity2: 2025-47947, CVE-2025-48866 + - orc: CVE-2024-40897 + - php: CVE-2025-1735, CVE-2025-6491, CVE-2025-1220 + - podman: CVE-2025-6032 + - python-aiohttp: CVE-2025-53643 + - python-django: CVE-2025-48432 + - python-requests: CVE-2024-47081 + - python-starlette: CVE-2025-54121 + - python-urllib3: CVE-2025-50181, CVE-2025-50182 + - python3: 2024-12718, CVE 2025-4138, CVE 2025-4330, CVE 2025-4435, + 2025-4517 + - redis: CVE-2025-32023, CVE-2025-48367 + - rust-bindgen: CVE-2024-43806, RUSTSEC-2024-0006 + - samba4: CVE-2025-0620 + - shim: CVE-2024-2312 + - sngrep: CVE-2024-3119, CVE-2024-3120 + - sudo: CVE-2025-32462, CVE-2025-32463 + - tcpreplay: CVE-2023-4256, CVE-2023-43279, CVE-2024-22654 + - tinyxml: CVE-2023-34194 + - wpewebkit: CVE-2024-27856, CVE-2024-40866, CVE-2024-44185, + CVE-2024-44187, CVE-2024-44192, CVE-2024-44244, CVE-2024-44296, + CVE-2024-44308, CVE-2024-44309, CVE-2024-54467, CVE-2024-54479, + CVE-2024-54502, CVE-2024-54505, CVE-2024-54508, CVE-2024-54534, + CVE-2024-54543, CVE-2024-54551, CVE-2024-54658, CVE-2025-24143, + CVE-2025-24150, CVE-2025-24158, CVE-2025-24162, CVE-2025-24201, + CVE-2025-24208, CVE-2025-24209, CVE-2025-24213, CVE-2025-24216, + CVE-2025-24223, CVE-2025-24264, CVE-2025-30427, CVE-2025-31204, + CVE-2025-31205, CVE-2025-31206, CVE-2025-31215, CVE-2025-31257 + - xorg-server / xwayland: CVE-2025-49175, CVE-2025-49176, CVE-2025-49177, + CVE-2025-49178, CVE-2025-49179, CVE-2025-49180 + + Updated / fixed packages: amazon-ecr-credential-helper, at91bootstrap3, + avrdude, bcg729, berkeleydb, binutils, bmx7, boot/syslinux, ca-certificates, + chartjs, cifs-utils, cpp-httplib, cpulimit, daq, dht, + docker-credential-acr-env, docker-credential-gcr, elfutils, eudev, fwupd, + gcc, gnuplot, gstreamer1-editing-services, gumbo-parser, gvfs, hddtemp, + kvmtool, libargtable2, libcddb, libconfuse, libcrossguid, libcurl, libdex, + libesmtp, libgcrypt, libiec61850, libmanette, libmicrohttpd, libmpeg2, + libndp, libp11, libplatform, libspdm, libssh2, libuhttpd, libva, linux, + linux-tools (rtla), lpac, lrzsz, ltp-testsuite, lua, mjpg-streamer, + modem-manager, modsecurity2, mosquitto, mpv, mupdf, ncmpc, ncurses, + net-tools, network-manager, nginx-modsecurity, ntp, oniguruma, openblas, + parted, passt, php, python-asgiref, python-cython, python-dbus-fast, + python-dotenv, python-fastapi, python-future, python-glslang, + python-msgpack, python-multipart, python-remi, python-setuptools, + python-typing-extensions, qpid-proton, rapidjson, rauc-hawkbit-updater, + rtl8188eu, rtl8723bu, rtl8723ds, rtl8821au, rust, sdl2, shadowsocks-libev, + shairport-sync, sox, sqlite, squashfs, sudo, systemd, systemd, tailscale, + tor, uclibc, ustream-ssl, watchdog, webkitgtk, wpebackend-fdo, xen + + Removed package: libebur128, libolm, libwebsock + + Infrastructure updates / fixes: + - python-glslang is now a host package only + - Makefile unexports are now fixed and sorted + - hide gcc version for unsupported CPUs + - check-package: handle missing files + - test-pkg: stop on sigint + - toolchain/toolchain-wrapper.c: + - correct CCACHE_BASEDIR comment + - slightly simplify cmdline copying + - get rid of EXCLUSIVE_ARGS + - erofs: reword "all-fragments" Kconfig text + - utils/update-rust: fix MIT hash + + Test improvements: + - add new test for nginx-modsecurity + - new runtime test for gumbo-parser + - add a crun-based runtime test for docker-compose + - test_xen: add a base class + - test_xen: test on 32-bit Arm v7 + - test_xen: rename TestXen to TestXenAarch64 + + Boards updated / fixed: + - globalscale_espressobin: update linux + - freescale/mxs: fix Linux booting + - ti_am62x_sk: bump Linux version + - beaglebone: bump Linux to 6.12.23-ti-arm32-r11 + +2025.05, released June 9th, 2025 + + Various fixes. + + Updated/fixed packages: armadillo, busybox, dhcpcd, dovecot, + easyframes, exim, ghostscript, go, gst1-plugins-bad, iputils, + jq, libcurl, libftdi1, libglib2, lm-sensors, + mender-update-modules, mesa3d, mongoose, mpd, ninja, podman, + python-django, python-gobject, qoriq-mc-utils, qt5declarative, + qt5webengine, qt5webengine-chromium, qt6base, qt6tools, redis, + rtl8723ds, spirv-llvm-translator, unzip, yasm + +2025.05-rc2, released May 28th, 2025 + + Fixes all over the tree. + + Defconfigs: imx8mn-bsh-smm-s2: Unbreak boot after move to + U-Boot 2025.04. + + Updated/fixed packages: assimp, atkmm, atkmm2_28, binutils, + casync-nano, esp-hosted, gmrender-resurrect, gtkmm3, kmsxx, + libcamera, libglade, linux, lzo, python-click, python-django, + python-flask-restx, python-pydantic, python-pydantic-core, + python-referencing, python-tornado, sane-airscan, systemd, + uacme, uuu + +2025.05-rc1, released May 19th, 2025 + + Fixes all over the tree and package updates. + + Download: + + - Rust updated to version 1.86.0, which has slightly changed + the cargo fetching behaviour, so the generated tarballs now + use a -cargo4 suffix to reflect that. + + - Subversion download logic is now reproducible with non-US + locales + + - Sources can now be fetched from a smb:// location (using + curl). + + Dependencies: + + - AWK is now required on the build host. + + Toolchains: + + - Bootlin ARMv7-A toolchains are now also available for + ARMv8-A CPUs in 32bit mode + + Misc: + + - /etc/resolv.conf symlink now points to /run rather than /tmp + + - support/scripts/pkg-stats can now report stale CVE entries, + E.G. entries in _IGNORE_CVES that are no longer needed + after a NVD update. + + New defconfigs: Engicam PX30 SOM, Freescale i.IM 91 EVK and 93 + Freedom, HiFive Unmatched, Pine64 ROCKPro64 EBBR boot, + Raspberrypi 2 in 64bit mode, Sipeed LicheePi 4A + + New packages: aardvark-dns, amazon-ecr-credential-helper, + casync-nano, cgroupfs-v2-mount, docker-credential-acr-env, + docker-credential-gcr, grout, lowdown, lpac, + mender-update-modules, netavark, passt, podman, + python-aniso8601, python-cachelib, python-emailproxy, + python-flask-caching, python-flask-restx, python-mypy, + python-pyproj, python-simple-pid, python-smbus2, + python-types-psutil, python-types-setuptools, + python-typing-inspection, python-tzlocal, + qoriq-ddr-phy-binary, qoriq-firmware-inphi, qoriq-mc-binary, + qoriq-mc-utils, sane-airscan, sipeed-lpi4abin, ufs-utils, + xilinx-fpgautil + + Issues resolved: + + - openh264's build/ should not be removed + https://gitlab.com/buildroot.org/buildroot/-/issues/64 + + - package/dbus: incorrect session bus configuration file.. + https://gitlab.com/buildroot.org/buildroot/-/issues/67 + + - Update pkcs11-tool to v1.9.1 + https://gitlab.com/buildroot.org/buildroot/-/issues/109 + + - netsnmp: unexpected header length in /proc/net/snmp... + https://gitlab.com/buildroot.org/buildroot/-/issues/110 + +2025.02.9, released December 11, 2025 + + Important / security related fixes: + + - asterisk: CVE-2025-1131, CVE-2025-57767, CVE-2025-49832, + CVE-2025-47780, CVE-2025-47779 + - gnutls: CVE-2025-9820 + - libpng: CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018 + - luksmeta: CVE-2025-11568 + - mariadb: CVE-2025-30693, CVE-2025-30722, CVE-2023-52969, + CVE-2023-52970, CVE-2023-52971 + - openvpn: CVE-2025-13086 + - postgresql: CVE-2025-12817, CVE-2025-12818 + - python-django: CVE-2025-64458, CVE-2025-64459 + - python-startlette: GHSA-7f5h-v6xp-fcq8 + + Infrastructure updates/fixes: + + - New script support/scripts/cve-check to enricht CycloneDX SBoM with + CVE information from NVD database. + + Updated / fixed packages: 18xx-ti-utils, asterisk, gnutls, libpng, + libroxml, libteam, linux-headers, luksmeta, mariadb, nbd, neard, + openjdk, openjdk-bin, openvpn, oprofile, perl-net-ssleay, postgresql, + python-django, python-starlette, redis, sdbusplus, sdl, swipl, + tailscale, thermald, tmux, tor + + Removed packages: bctoolbox, belle-sip, belr, linphone, mediastreamer, + mongrel2, ortp + +2025.02.8, released November 20, 2025 + + Important / security related fixes: + + - bind: CVE-2025-8677, CVE-2025-40778, CVE-2025-40780 + - dante: CVE-2024-54662 + - erlang: CVE-2024-53846, CVE-2025-4748, CVE-2025-26618, CVE-2025-30211, + CVE-2025-32433, CVE-2025-46712, CVE-2025-48038, + CVE-2025-48039, CVE-2025-48040, CVE-2025-48041 + - hostapd: CVE-2025-24912 + - imagemagick: CVE-2025-62171 + - iptraf-ng: CVE-2024-52949 + - libarchive: CVE-2025-25724 + - libglib2: CVE-2024-54662 + - libvips: CVE-2025-29769, CVE-2025-59933 + - libvpx: CVE-2025-5283 + - libxslt: CVE-2025-24855, CVE-2024-55549 + - mbedtls: CVE-2025-54764, CVE-2025-59438 + - modsecurity2: CVE-2025-52891, CVE-2025-54571 + - netdata: CVE-2023-22496, CVE-2023-22497 + - poppler: CVE-2024-6239, CVE-2024-56378, CVE-2025-32364, + CVE-2025-32365, CVE-2025-43903, CVE-2025-50420, + CVE-2025-52886 + - python3: gh-139312, gh-139700, gh-139400, gh-135661, gh-135661, + gh-102555, gh-135462, gh-118350, gh-86155 + - python-webpy: CVE-2025-3818 + - redis: CVE-2025-46817, CVE-2025-46818, CVE-2025-46819, CVE-2025-49844 + - samba: CVE-2025-3818, CVE-2025-10230 + - shairport-sync: Upstream security fixes without CVE + - squid: CVE-2025-59362 + - suricata: CVE-2024-37151, CVE-2024-38535 + - tpm2-tss: CVE-2024-29040 + - xerces: CVE-2024-23807 + - zabbix: CVE-2025-27231, CVE-2025-27236, CVE-2025-27238, CVE-2025-49641 + - zip: CVE-2018-13410 + + Infrastructure updates/fixes: + + - Improved matching of CPE ID with NVD database, resulting in more + accurate identification of CVEs. + - brmake: avoid garbled output with top-level parallel build + + Updated / fixed packages: 4th, audit, bind, cmake, crun, dante, + ebtables, erlang, freeradius-server, gpsd, gstd, hostapd, imagemagick, + iptraf-ng, iozone, ledmon, libarchive, libcurl, libdbi-drivers, + libdisplay-info, libglib2, libgphoto2, libgtk3, libheif, libsemanage, + libshout, libsolv, libtpms, libvips, libvpx, libwpe, libxslt, linux, + linux-headers, live555, mbedtls, micropython, mjpg-streamer, + modsecurity2, netdata, netsnmp, poppler, python3, python-flask-cors, + python-webpy, quota, qt6multimedia, redis, refpolicy, samba4, + selinux-python, sexpect, shairport-sync, siproxd, sqlite, squid, + suricata, tor, tpm2-tss, waffle, webkitgtk, wireless-regdb, wpewebkit, + xerces, zabbix, zip + + Removed package: ramspeed + + Boards updated / fixed: beagleboneai, cubieboard1, cubieboard2, + stm32f429_disco_xip, stm32f746_disco_sd, stm32f769_disco_sd, + + Test Improvements: + + - Capture output of failing commands on host. + +2025.02.7, released October 11, 2025 + + Important / security related fixes: + + - asterisk: CVE-2024-42491 + - atop: CVE-2025-31160 + - civetweb: CVE-2025-55763 + - cjson: CVE-2025-57052 + - connman: CVE-2025-32366, CVE-2025-32743 + - cups: CVE-2025-58060, CVE-2025-58364 + - exiv2: CVE-2023-44398, CVE-2024-24826, CVE-2024-25112, CVE-2024-39695, + CVE-2025-26623, CVE-2025-54080, CVE-2025-55304 + - expat: CVE-2025-59375 + - fastd: CVE-2025-24356 + - fetchmail: CVE-2025-61962 + - ghostscript: CVE-2025-59798, CVE-2025-59799, CVE-2025-59800, CVE-2025-59801 + - imagemagick: CVE-2023-5341, CVE-2025-55004, CVE-2025-55005, CVE-2025-55160 + - intel-microcode: CVE-2025-20053, CVE-2025-20109, CVE-2025-22839, + CVE-2025-22840, CVE-2025-22889, CVE-2025-26403 + - jasper: CVE-2023-51257, CVE-2025-8835 + - libcurl: CVE-2025-10148, CVE-2025-9086 + - libopenssl: CVE-2025-9230, CVE-2025-9231, CVE-2025-9232 + - libssh: CVE-2025-8114, CVE-2025-8277 + - lua: CVE-2014-5461 + - opencv4: CVE-2025-53644 + - pcre2: CVE-2025-58050 + - poco: CVE-2025-6375 + - postgresql: CVE-2025-8713, CVE-2025-8714, CVE-2025-8715 + - python-django: CVE-2025-57833, CVE-2025-59681, CVE-2025-59682 + - python-flask-cors: CVE-2024-6839, CVE-2024-6844, CVE-2024-6866 + - python-pip: CVE-2025-8869 + - raptor: CVE-2024-57822, CVE-2024-57823 + - sqlite: CVE-2025-6965 + - syslog-ng: CVE-2024-47619 + - tiff: CVE-2024-13978, CVE-2025-8961, CVE-2025-9165 + - udisks: CVE-2025-8067 + - webkitgtk: CVE-2025-24189, CVE-2025-31273, CVE-2025-31278, CVE-2025-43211, + CVE-2025-43212, CVE-2025-43216, CVE-2025-43227, CVE-2025-43228, + CVE-2025-43240, CVE-2025-43265, CVE-2025-6558 + - wireshark: CVE-2025-5601 + + Updated / fixed packages: asterisk, atop, boinc, civetweb, cjson, + connman, cpp-httplib, cups, cutekeyboard, ecryptfs-utils, exiv2, expat, + fastd, fetchmail, ghostscript, gnupg2, gnuplot, htpdate, imagemagick, + intel-microcode, iputils, jasper, jose, kodi, libcurl, libopenssl, + libssh, libxkbcommon, libxmlrpc, linux-firmware, linux-headers, + linuxptp, llvm-project, lua, luaossl, luvi, mariadb, micropython, + modsecurity2, opencv4, opencv4-contrib, openjpeg, pango, pcre2, poco, + postgresql, python-certifi, python-cryptography, python-django, + python-flask-cors, python-pip, python-pyopenssl, python-pytz, raptor, + rtl_433, ruby, samba4, sqlite, syslog-ng, sysprof, tiff, tor, uclibc, + udisks, upx, webkitgtk, wireshark, wlroots, x11r7, zziplib + + Removed package: netstat-nat + + Boards updated / fixed: beagleboneai, qemu/{x86, x86_64}, ti_am62x_sk + versal, zedboard + + Boards removed: roseapplepi, atmel_sama5d3xek, at91sam9260eknf + + Test Improvements: + + - TestSWIPL: increase timeout value + - TestOpenJdk: remove stime() function call + - test_hardening: update toolchain to aarch64 for checksec tests + - test_docker_compose: update kernel & VM CPU + - TestZfsUclibc: use internal backend for uClibc-ng toolchain + - GitTestBase: remove git daemon due to Gitlab-CI security settings + +2025.02.6, released September 09, 2025 + + Important / security related fixes: + + - libssh: CVE-2025-4878, CVE-2025-5318, CVE-2025-5351, CVE-2025-5372, + CVE-2025-5449, CVE-2025-5987 + - glibc: CVE-2025-5702, CVE-2025-5745, CVE-2025-8058 + - gnutls: CVE-2025-32989, CVE-2025-32988, CVE-2025-32990, CVE-2025-6395 + - python3: CVE-2025-8194 + - libhtp: CVE-2025-53537 + - tiff: CVE-2025-8176, CVE-2025-8177 + - libglib2: CVE-2025-6052 + - ofono: CVE-2023-2794, CVE-2024-7537, CVE-2024-7539, CVE-2024-7540, + CVE-2024-7541, CVE-2024-7542 + - elfutils: CVE-2025-1352, CVE-2025-1365, CVE-2025-1371, CVE-2025-1372, + CVE-2025-1376, CVE-2025-1377 + - grub2: CVE-2024-45777, CVE-2024-45778, CVE-2024-45779, + CVE-2024-45780, CVE-2024-45782, CVE-2024-56737, CVE-2024-56738, + CVE-2025-0678, CVE-2025-0684, CVE-2025-0685, CVE-2025-0686, + CVE-2025-0689, CVE-2025-1125 + - openjpeg: CVE-2025-54874 + - go: CVE-2025-4674, CVE-2025-47907 + - gst1-plugins-base: CVE-2025-47806, CVE-2025-47807 + - gst1-plugins-good: CVE-2025-47219, CVE-2025-47183 + - vorbis-tools: CVE-2023-43361 + - quickjs: CVE-2025-46688 + - libde265: CVE-2024-38949, CVE-2024-38950 + - vim: CVE-2024-41957, CVE-2024-41965, CVE-2024-45306, CVE-2024-47814, + CVE-2025-1215, CVE-2025-22134, CVE-2025-24014, CVE-2025-26603, + CVE-2025-29768, CVE-2025-53905, CVE-2025-53906 + - ffmpeg: CVE-2023-6602 + - lighttpd: CVE-2025-8671 + - python-h2: CPE-2025-57804 + - cpp-httplib: CVE-2025-46728 + - iperf3: CVE-2025-54349, CVE-2025-54350 + + Removed package: liboauth, thttpd + + Removed defconfig: at91sam9g20dfc, at91sam9g45m10ek, + at91sam9rlek, bananapro, beelink_gs1, chromebook_snow, galileo, + odroidxu4, orangepi_lite2, orangepi_one_plus, pcengines_apu2, + pine64_sopine, riotboard, rock64, rock_pi_n8, socrates_cyclone5, + toradex_apalis_imx6, ts7680, engicam_imx6*, kontron_pitx_imx8m, imx6ulz_bsh_smm_m2, + + Test Improvements: + + - test_gstreamer1: raise tesseract-ocr timeout to 15s + - test_wine: fix test after bootlin toolchains update + - test_numactl: fix test after bootlin toolchains update + - test_dpdk: fix test after bootlin toolchains update + - test_msr_tools: fix test after bootlin toolchains update + - test_dmidecode: fix test after bootlin toolchains update + - test_iso9660: use a more recent toolchain + - test_gruby: use glibc toolchain + - test_wget: replace thttpd by Busybox's httpd server + - test_libcurl: replace thttpd by Busybox's httpd server + - test_systemd_selinux: fix test after bootlin toolchains update + + Updated / fixed packages: python-propcache, pipewire, apache, xinetd, + libssh, glibc, libhtp, libapparmor, php-pecl-dbus, tini, snooze, ngrep, + libzenoh-pico, janet, nanocom, rtl8189es, gcc, ofono, python-numpy, + elfutils, libtracefs, tinyssh, start-stop-daemon, bcusdk, prboom, + setserial, grub2, openjpeg, go, gstreamer1, gst1-plugins-base, + gst1-plugins-good, gst1-plugins-bad, gst1-plugins-ugly, gst1-devtools, + gst1-libav, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1-editing-services, vorbis-tools, quickjs, libde265, vim, + ffmpeg, libv4l, python-yarl, lirc-tools, b43-firmware, tcpreplay, + libsvgtiny, libsoxr, lighttpd, uclibc, vde2, libcap-ng, python-h2, + squid, ipmitool, ell, proftpd, liblog4c-localtime, wpewebkit, weston, + cpp-httplib, ipset, iperf3 + + Infrastructure updates/fixes: + - Various tweaks to utils/generate-cyclonedx for better SBOM + compatibility and project name/version customization + - go: make pre-built compiler provide target support too + - test-pkg: add new option -T/--toolchain-name + - pkg-utils.mk: include package directory in show-info output + - bump-stable-kernel-versions: new tool + + Boards updated / fixed: + + - qemu_sh4*: switch back to disk emulation + - acmesystems_acqua_a5_*: update linux + - sipeed_licheepi_zero: update linux & uboot + - zynqmp: increase vfat partition to 64M + - qemu_{arm,aarch64}_{ebbr,sbsa}*: linux needs host python3 + - canaan_kd233, sipeed*: use BR2_LINUX_KENREL_IMAGE_TARGET_NAME + - ci20: U-Boot needs host-openssl + +2025.02.5, released August 11, 2025 + + Important / security related fixes: + - Bump mbedtls to version 3.6.4, this affect many packages depending on it. + Also fixes CVE-2025-47917, CVE-2025-48965, CVE-2025-49087, + CVE-2025-49600, CVE-2025-49601, CVE-2025-52496, CVE-2025-52497 + - samba4: support Windows security hardening + - apache: CVE-2025-53020, CVE-2025-49812, CVE-2025-49630, CVE-2025-23048, + CVE-2024-47252, CVE-2024-43394, CVE-2024-43204, CVE-2024-42516, + CVE-2025-54090 + - assimp: CVE-2025-2750, CVE-2025-2751, CVE-2025-2757, CVE-2025-3158 + - clamav: CVE-2025-20260 + - edk2: CVE-2024-38805 + - git: CVE-2025-27613, CVE-2025-27614, CVE-2025-46835, CVE-2025-48384, + CVE-2025-48385, CVE-2025-48386 + - jose: CVE-2023-50967 + - libarchive: CVE-2025-5914, CVE-2025-5915, CVE-2025-5916, CVE-2025-5917, + CVE-2025-5918 + - libavif: CVE-2025-48174, CVE-2025-48175 + - libblockdev: CVE-2025-6019 + - libbpf: CVE-2025-29481 + - libheif: CVE-2025-43966, CVE-2025-43967 + - libhtp: CVE-2024-45797 + - libsoup: CVE-2024-52530, CVE-2024-52531, CVE-2024-52532, CVE-2025-2784, + CVE-2025-4476, CVE-2025-4948, CVE-2025-4969, CVE-2025-32050, + CVE-2025-32052, CVE-2025-32053, CVE-2025-32906, CVE-2025-32910, + CVE-2025-32911, CVE-2025-32912, CVE-2025-32913, CVE-2025-32914, + CVE-2025-46420, CVE-2025-46421 + - libxml2: CVE-2025-6021, CVE-2025-6170, CVE-2025-49794, CVE-2025-49796, + CVE-2025-49795 + - micropython: CVE-2024-8947 + - modsecurity2: CVE-2025-47947, CVE-2025-48866 + - orc: CVE-2024-40897 + - php: CVE-2025-1735, CVE-2025-6491, CVE-2025-1220 + - python-aiohttp: CVE-2025-53643 + - python-starlette: CVE-2025-54121 + - python-urllib3: CVE-2025-50181, CVE-2025-50182 + - python3: CVE-2024-12718, CVE-2025-4138, CVE-2025-4330, CVE-2025-4435, + CVE-2025-4517 + - redis: CVE-2025-32023, CVE-2025-48367 + - shim: CVE-2024-2312 + - sngrep: CVE-2024-3119, CVE-2024-3120 + - sudo: CVE-2025-32462, CVE-2025-32463 + - tcpreplay: CVE-2023-4256, CVE-2023-43279, CVE-2024-22654 + - tinyxml: CVE-2023-34194 + - wpewebkit: CVE-2024-27856, CVE-2024-40866, CVE-2024-44185, + CVE-2024-44187, CVE-2024-44192, CVE-2024-44244, CVE-2024-44296, + CVE-2024-44308, CVE-2024-44309, CVE-2024-54467, CVE-2024-54479, + CVE-2024-54502, CVE-2024-54505, CVE-2024-54508, CVE-2024-54534, + CVE-2024-54543, CVE-2024-54551, CVE-2024-54658, CVE-2025-24143, + CVE-2025-24150, CVE-2025-24158, CVE-2025-24162, CVE-2025-24201, + CVE-2025-24208, CVE-2025-24209, CVE-2025-24213, CVE-2025-24216, + CVE-2025-24223, CVE-2025-24264, CVE-2025-30427, CVE-2025-31204, + CVE-2025-31205, CVE-2025-31206, CVE-2025-31215, CVE-2025-31257 + - xorg-server / xwayland: CVE-2025-49175, CVE-2025-49176, CVE-2025-49177, + CVE-2025-49178, CVE-2025-49179, CVE-2025-49180 + + Updated / fixed packages: avrdude, berkeleydb, binutils, bmx7, boot/shim, + boot/syslinux, ca-certificates, chartjs, cifs-utils, cpp-httplib, cpulimit, + daq, elfutils, eudev, fwupd, gcc, gnuplot, gstreamer1-editing-services, + gumbo-parser, gvfs, haproxy, hddtemp, kvmtool, libargtable, libcddb, + libconfuse, libcrossguid, libcurl, libesmtp, libgcrypt, libiec61850, + libmanette, libmicrohttpd, libmpeg2, libndp, libopenssl, libp11, libssh2, + libuhttpd, libva, linux, linux-tools (rtla), lrzsz, ltp-testsuite, lua, + modem-manager, modsecurity2, mosquitto, mpv, mupdf, ncmpc, net-tools, + network-manager, nginx-modsecurity, ntp, oniguruma, openblas, orc, parted, + python-asgiref, python-cython, python-dbus-fast, python-fastapi, + python-future, python-msgpack, python-multipart, python-remi, + python-setuptools, qpid-proton, rauc-hawkbit-updater, rtl8188eu, rtl8723bu, + rtl8723ds, rtl8821au, rust, shadowsock-libev, shairport-sync, sox, sqlite, + squashfs, systemd, tailscale, tor, uclibc, ustream-ssl, watchdog, + webkitgtk, xen + + Removed package: libolm, libwebsock + + Infrastructure updates / fixes: + - python-glslang is now a host package only + - Makefile unexports are now fixed and sorted + - Hide GCC versions for unsupported CPUs + - check-package: handle missing files + - test-pkg: stop on sigint + - check-host-cmake.mk: set host-cmake max version + - toolchain/toolchain-wrapper.c: + - correct CCACHE_BASEDIR comment + - slightly simplify cmdline copying + - get rid of EXCLUSIVE_ARGS + + Test improvements: + - nginx-modsecurity: new test + - gumbo-parser: new runtime test + - add a crun-based runtime test for docker-compose + - test_xen: add a base class + - test_xen: test on 32-bit Arm v7 + - test_xen: rename TestXen to TestXenAarch64 + + Boards updated / fixed: + - globalscale_espressobin: update linux + - freescale/mxs: fix linux booting + - ti_am62x_sk: bump Linux version + - raspberrypi5: fix failing build because of missing in-kernel dts + +2025.02.4, released June 23th, 2025 + + Important / security related fixes: + + - assimp: CVE-2025-3015, CVE-2025-3016 + - binutils: CVE-2025-3198 + - connman: CVE-2025-32366, CVE-2025-32743 + - go: CVE-2025-0913, CVE-2025-4673, CVE-2025-22874 + - iputils: CVE-2025-47268, CVE-2025-48964 + - jq: CVE-2024-23337, CVE-2025-48060, CVE-2024-53427 + - libcurl: CVE-2025-4947, CVE-2025-5025, CVE-2025-5399 + - net-tools: CVE-2025-46836 + - nodejs: CVE-2025-23165, CVE-2025-23166 + - openvmtools: CVE-2025-22247 + - python-django: CVE-2025-48432 + - python-requests: CVE-2024-47081 + - python-tornado: CVE-2025-47287 + - redis: CVE-2025-21605, CVE-2025-27151 + - samba4: CVE-2025-0620 + - sox: CVE-2021-23159, CVE-2021-23172, CVE-2021-23210, CVE-2021-3643, + CVE-2021-40426, CVE-2022-31650, CVE-2022-31651, CVE-2023-26590, + CVE-2023-32627, CVE-2023-34318 + - webkitgtk: CVE-2025-24223, CVE-2025-31204, CVE-2025-31205, + CVE-2025-31206, CVE-2025-31215, CVE-2025-31257 + + Updated / fixed packages: alsa-utils, atkmm, atmm2_28, audit, + bluez5_utils, busybox, catch2, connman, dbus-glib, dlib, dovecot, + esp-hosted, execline, firmware-ele-imx, flex, fluent-bit, freescale-imx, + ghostscript, gmrender-resurrect, grub2, gst1-plugins-bad, gtkmm3, iputils, + kmsxx, libcamera, libcurl, libglade, libical, libuv, llvm-project, + lm-sensors, m4, mesa3d, mongoose, openvmtools, php, protobuf-c, + python-django, python-fastapi, python-flit-core, python-jc, + python-requests, python-uvicorn, qt5 (declarative, webengine, + webengine-chromium), qt6 (base, multimedia, tools), rpm, samba4, spdlog, + systemd, uacme, uboot-tools, yasm + + Removed package: libebur128 + + Infrastructure updates / fixes: + + - pkg-cmake now forces CMake>=3.5 + - pkg-meson now uses a dedicated buildroot build directory + see https://gitlab.com/buildroot.org/buildroot/-/issues/64 + - include defconfigs in sub-directories in make list-defconfigs + - new manual section about private repositories + - pkg-autotools: handle libtool 2.5.x + - pkg-cmake: force check_language(CXX) to be false when building w/o C++ + - pkg-stats: add support for reporting stale CVE entries + - add basic support for package file download over smb + - toolchain/wrapper: check unsafe paths earlier + - test_flutter: drop unneeded vga/vnc stanzas from QEMU invocation + + Test improvements + + - new python-pydantic runtime tests + - new dieharder runtime test + - test_xen: fix runtime test + - test_timezone: fix test by setting a fixed time + - new tree runtime test + + Boards fixes + + - imx6ulz-bsh-smm-m2: fix missing U-Boot + - freescale: fix cpu name in i.MX9 boards + - imx8mn-bsh-smm-s2: erase the entire NAND chip + - freescale_t1040d4rdb: fix kernel build + + In addition, thanks to the new stale CVE reporting, reported + vulnerabilities have been fixed for the following packages: + busybox, dnsmasq, dovecot, exim, exim, freeradius-server, grub2, + libopenh264, libssh, netsnmp, ninja, qt5base, ripgrep, sox, tinyxml + +2025.02.3, released May 19th, 2025 + + Build issues and other problems solved for packages: + + libcap + +2025.02.2, released May 18th, 2025 + + Important / security related fixes: + + - openvpn: CVE-2025-2704 + - ghostscript: CVE-2025-27830, CVE-2025-27831, CVE-2025-27832, + CVE-2025-27833, CVE-2025-27834, CVE-2025-27835, + CVE-2025-27836, CVE-2025-27837, + - libfcgi: CVE-2025-23016 + - perl: CVE-2024-56406 + - mosquitto: CVE-2023-28366 + - c-ares: CVE-2025-31498 + - graphicsmagick: CVE-2025-32460, CVE-2025-27795 + - libxml2: CVE-2025-32414, CVE-2025-32415 + - wireshark: CVE-2025-1492 + - yam: CVE-2021-33454 + - sqlite: CVE-2025-29087 + - xz: CVE-2025-31115 + - python-django: CVE-2025-32873 + - libraw: CVE-2025-43961, CVE-2025-43962, CVE-2025-43963, + CVE-2025-43964 + - dropbear: CVE-2025-47203 + - intel-microcode: CVE-2025-24495, CVE-2024-28956, CVE-2024-43420, + CVE-2025-20103 + - openssh: CVE-2025-32728 + - screen: CVE-2025-23395, CVE-2025-46802, CVE-2025-46803, + CVE-2025-46804, CVE-2025-46805 + - python-flask: CVE-2025-47278 + - python-h11: CVE-2025-43859 + - postgresql: CVE-2025-4207 + + Updated / fixed packages: sysklogd, libfcgi, double-conversion, + igh-ethercat, c-periphery, socat, lua-periphery, fluent-bit, + samba4, ca-certificates, dbus-cxx, atkmm2_28, pangomm2_46, + cairomm1_14, glibmm2_66, gtkmm3, file, opencsd, libopenmpt, + fwts, libtracefs, iproute2, ripgrep, bat, dust, trace-cmd, + libubootenv, micropython, python-cryptography, dnsmasq, + wireless-regdb, python-setuptools, libuci, libubox, ubus, waf, + armadillo, ncftp, expat, libxml2, wireshark, hiredis, zfs, + sunxi-mali-utgard-driver, ruby, mtools, hwdata, traceroute, + zic, tzdata, jo, gdb, tpm2-pkcs11, nss-pam-ldapd, ghostscript, + dropbear, intel-microcode, screen, python-flask, python-h11, + mariadb, ffmpeg, postgresql + + Test Improvements: + + - test_edk2: add a few build tests + - weston: fix the weston shutdown test + - lighttpd: runtime test + - openocd: runtime test + - hyperfine: runtime test + - python-urllib3: runtime test + - test_edk2: add macchiatobin build test + - bat: runtime test + - dust: runtime test + + Infrastructure updates / fixes: + + - libopenh264: ignore CVE-2025-27091 + - edk2: drop dependency on tf-a for macchiatobin + - vim: extend comment about vi symlink + - board/raspberrypi/readme.txt: various improvements + - raspberrypi5: install Raspberry Pi 500 device-tree blob + - gen-bootlin-toolchains: allows armv8-a CPU to use armv7-a toolchains + - libsigrokdecode: needs python3 w/ zlib support + - dejavu: update homepage + - pulseview: fix, update, and reorganise dependencies + - boost: move host variables closer together + - boost: move target library selection variables closer together + - support/download/git: use FOO_DL_OPTS + - stm32mp135f_dk: fix optee hash + - libcamera: various fixes + - apparmor don't reference libapparmor variables + - rpi-firmware: add note to keep in sync with kernel + - python-sdbus: fix upstream url + - qt5webengine: drop unused file + - warp7: Improve Wifi instructions + - cryptopp: add upstream URL in help text + - dpdk: fixup Config.in comment about dependencies + - ffmpeg: add support for libopenmpt + - pkg-stats: fix typo in --disable help text + - imx28evk: enable BR2_DOWNLOAD_FORCE_CHECK_HASHES + - friendlyarm_nanopi_r3s: fix host linux headers custom version + - support/dependencies/dependencies.sh: awk is needed by Buildroot + - Config.in: introduce BR2_HOST_GCC_AT_LEAST_{12..15} + - dbus: set session-socket-dir to /tmp + - fs/erofs: unbreak custom compression handling + - nodejs: make target nodejs package virtual + - mpd: update CPE/CVE information + - Various fix for GCC15 host + + Build issues and other problems solved for packages: + + sqlite, pahole, libv4l, arm-trusted-firmware, libopenmpt, iptables, + tailscale, wilc-driver, rtl8188eu, rtl8723ds, lmbench, fluent-bit, + mosquitto, iproutes2, pixman, linux-tools, libcoap, libcamera, + strongswan, mpv, hiredis, zfs, bird, netsnmp, libcap, musepack, + ffmpeg, libqrencode + +2025.02.1, released April 22nd, 2025 + + Changes with potentially large impact: + + - gstreamer1 and related packages: updated from 1.22.x to 1.24.x. + 1.22.x was already EOL when Buildroot 2025.02 was released, so + GStreamer should really already have been udpated to 1.24.x. + This update was needed to fix a lot of vulnerabilities. + - frr: updated from 9.1.3 to 10.3. Version 9 is no longer + maintained upstream, and not in any distro either. This update + was needed to fix a vulernability. + + Important / security related fixes: + + - libmodsecurity: CVE-2025-27110. + - tinyxml2: CVE-2024-50615. + - xserver_xorg-server & xwayland: CVE-2024-9632, CVE-2025-26594, + CVE-2025-26595, CVE-2025-26596, CVE-2025-26597, CVE-2025-26598, + CVE-2025-26599, CVE-2025-26600, CVE-2025-26601. + - exim: CVE-2025-30232. + - mbedtls: CVE-2025-27809, CVE-2025-27810. + - libfreeglut: CVE-2024-24258, CVE-2024-24259. + - libopenh264: CVE-2025-27091. + - gstreamer1: CVE-2024-47834, CVE-2024-47835, CVE-2024-47778, + CVE-2024-47777 CVE-2024-47776, CVE-2024-47775, CVE-2024-47774, + CVE-2024-47615, CVE-2024-47613, CVE-2024-47607, CVE-2024-47606, + CVE-2024-47603, CVE-2024-47602, CVE-2024-47601, CVE-2024-47600, + CVE-2024-47599, CVE-2024-47598, CVE-2024-47597, CVE-2024-47596, + CVE-2024-47546, CVE-2024-47545, CVE-2024-47544, CVE-2024-47543, + CVE-2024-47542, CVE-2024-47541, CVE-2024-47540, CVE-2024-47539, + CVE-2024-47538, CVE-2024-47537. + - augeas: CVE-2025-2588. + - libndp: CVE-2024-5564. + - python-jinja2: CVE-2025-27516. + - python-django: CVE-2025-26699. + - libarchive: CVE-2024-57970, CVE-2025-1632. + - frr: CVE-2024-55553. + + Updated / fixed packages: libmodsecurity, intel-mediadriver, + intel-vpl-gpu-rt, python-aerich, python-aiohttp, python-maturin, + python-tortoise-orm, python-sqlalchemy, kodi-pvr-waipu, tor, mc, + tinyxml2, libgeos, intel-vpl-gpu-rt, intel-mediadriver, ruby, + ncftp, xserver_xorg-server, exim, mbedtls, gdb, freerdp, uclibc, + libsoup3, cairo, zabbix, armadillo, spdlog, go, linux, linux-tools, + gstreamer, linux-header, ethtool, apr, mali-driver, libcoap, libcap + python-fastapi, python-twisted. + + Test Improvements: + + - linux-tools: selftests: Add path containing BPF binary. + - testing: make time setting portable. + - testing: set date in emulated machine. + - testing: add git runtime test. + - test_gstreamer1: fix test by using bootlin toolchain. + + Infrastructure updates/fixes: + + - kconfig: Handle backspace (^H) key. + - xilinx-embeddedsw: fix menuconfig visualization. + - DEVELOPERS: change arnout's address. + - support/download/svn: use 'svn info' whith LC_ALL=C + - glibc: disable on RISC-V ilp32f and lp64f, not supported. + - dillo: Fix an issue related to _SITE url for make show-info. + - pkg-stats: add -v/--verbose option + + Build issues/problems solved for packages: + + dillo, freerdp, freeswitch, gdb, glibc, linux-tools, + mesa3d-demos, ncftp, tesseract-ocr, + v4l2loopback, zabbix + +2025.02, released March 17th, 2025 + + Various fixes. + + Updated/fixed packages: expat, fio, libopenssl, php, rauc, + rt-tests + +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. + + Nios2 architecture support removed. + + Toolchain: + + - binutils 2.44 added, binutils 2.43.1 becomes the default. + + - 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 + + - ARM external toolchains bumped to 12.4.rel1 and are now also + available for Aarch64 build machines + + Infrastructure: + + - utils/generate-cyclonedx script added to generate SBOM in + CycloneDX format. To use it, run + + make show-info | utils/generate-cyclonedx > sbom.json + + new defconfigs: FriendlyARM NanoPi R3S, NXP imx8mm-evk / + imx8mm-ddr4 /imx8mp-evk / imx93-evk / ls1043a-rdb / + ls1046a-rdb, Orangepi 5 plus, Polyhex Debix model A, + Raspberrypi zero 2w 64bit, Raxda rock 4SE, STM STM32MP135F-DK + + New packages: bmap-writer, cpuinfo, cross-ldd, farmhash, + fft2d, fp16, gemmlowp, libecoli, libglib2-bootstrap, lynis, + nxp-bt-wifi-firmware, nxp-mwifiex, panel-mipi-dbi-firmware, + parsec, psimd, pthreadpool, python-aiohttp-sse-client, + python-asyncclick, python-changelog-chug, python-telnetlib3, + python-waitress, qt6graphs, qt6multimedia, qt6quick3d, + rnnoise, ruy, snooze, tensorflow-lite, usbip, utfcpp, + wlr-randr, xilinx-embeddedsw, xnnpack + + Removed packages: angularjs, angular-websocket, directfb, + directfb-examples, fconfig, genromfs, giblib, gst-omx, + hiwatha, latencytop, libhid, linux-fusion, lite, mimic, + mongodb, obsidian-cursors, python-m2crypto, quagga, ramsmp, + w_scan + + Issues resolved: + - bluetooth.service cannot connect to D-BUS + https://gitlab.com/buildroot.org/buildroot/-/issues/65 + - gdb package doesn't have a licence hash in the gdb.hash file + https://gitlab.com/buildroot.org/buildroot/-/issues/66 + - package/libsha1: Build failure with GCC 14 [-Wimplicit-int] + https://gitlab.com/buildroot.org/buildroot/-/issues/69 + - samba4 build failed in master + https://gitlab.com/buildroot.org/buildroot/-/issues/86 + +2024.11.4, released April 22nd, 2025 + + Important / security related fixes: + + - xserver_xorg-server & xwayland: CVE-2024-9632, CVE-2025-26594, + CVE-2025-26595, CVE-2025-26596, CVE-2025-26597, CVE-2025-26598 + CVE-2025-26599, CVE-2025-26600, CVE-2025-26601. + - exim: CVE-2025-30232. + - mbedtls: CVE-2025-27809, CVE-2025-27810. + - augeas: CVE-2025-2588. + - libarchive: CVE-2024-57970, CVE-2025-1632, CVE-2025-25724. + - xwayland: CVE-2024-31081, CVE-2024-31083, CVE-2024-9632, + CVE-2025-26594, CVE-2025-26595, CVE-2025-26596, + CVE-2025-26597, CVE-2025-26598, CVE-2025-26599, + CVE-2025-26600, CVE-2025-26601 + - libopenh264: CVE-2025-27091. + - libmodsecurity: CVE-2025-27110. + - tinyxml2: CVE-2024-50615. + + Updated/fixed packages: + + libgeos, freerdp, libsoup3, cairo, linux, apr, mali-driver, + libcoap, python-fastapi, python-twisted, tor, mc, linux-header, + linux-tools. + + Test Improvements: + + - linux-tools: selftests: Add path containing BPF binary. + - testing: add git runtime test. + + Infrastructure updates/fixes: + + - DEVELOPERS: change arnout's address. + - DEVELOPERS: add Dario Binacchi for ti-k3-boot-firmware. + - support/download/svn: use 'svn info' whith LC_ALL=C**. + - dillo: Fix an issue related to _SITE url for make show-info. + - kconfig: Handle backspace (^H) key. + - pkg-stats: add -v/--verbose option + + Build issues/problems solved for: + + freeswitch, glibc, v4l2loopback, ls1028ardb, ls1028ardb, + mesa3d-demos. + +2024.11.3, released March 24st, 2025 + + Important / security related fixes. + + Defconfigs: Octavo osd23mp1: Fix TF-A/Linux compilation after + move to newer toolchain versions. + + Updated/fixed packages: compiler-rt, exim, expat, fio, foot, + go, jbig2dec, libcamera, libjxl, libopenssl, libxml2, mokutil, + musl, optee-os, php, pkgconf, postgresql, prboom, + python-typing-extensions, rauc, systemd, util-linux, + watchdogd, webkitgtk + +2024.11.2, released February 21st, 2025 + + Important / security related fixes. + + Infrastructure: support/script/genimage.sh: exit on errors + + Defconfigs: ti_am62ax_sk: Include PMIC driver to fix boot + issue + + Updated/fixed packages: acpica, apache, assimp, asterisk, + bind, busybox, clamav, curlpp, dillo, elfutils, fakeroot, + ffmpeg, freetype, git, glibc, gnu-efi, gnutls, go, gpsd, + heimdal, imagemagick, intel-microcode, kodi, libbsd, libcurl, + libopenssl, libtasn1, libxml2, mdnsd, mpg123, musl, nettle, + nginx, nodejs, openjpeg, openssh, openvpn, php, pipewire, + postgresql, python-django, python3, redis, rsync, socat, + swipl, syslinux, tor, tzdata, uclibc, uemacs, unbound, + usbutils, util-linux, webkitgtk, xen, zic, zlog, zstd, + zxing-cpp + + Issues resolved: + - samba4 build failed in master + https://gitlab.com/buildroot.org/buildroot/-/issues/86 + +2024.11.1, released January 9th, 2025 + + Important / security related fixes. + + Infrastructure: + + - Ensure CONFIG_TRIM_UNUSED_KSYMS is disabled when building + external Linux kernel modules + + Updated/fixed packages: apr, bc, bluez5_utils, c-icap, + cryptodev-linux, dahdi-linux, dpdk, freeipmi, gdb, gnupg2, + gnuplot, gnutls, go, gobject-introspection, grub2, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, igt-gpu-tools, iperf3, libcurl, + libsha1, libsndfile, libsoup3, libvirt, libxcrypt, libxml2, + libzenoh-pico, linux, linux-pam, netatalk, nettle, octave, + opensc, perl, php, pixman, polkit, procps-ng, + python-autocommand, python-django, python3, quickjs, samba4, + skeleton, subversion, ti-k3-r5-loader, tzdata, v4l2loopback, + wayland, webkitgtk, weston, wget, wireshark, wpewebkit, + xr819-xradio, xxhash, zfs, zic + + Issues resolved: + - bluetooth.service cannot connect to D-BUS + https://gitlab.com/buildroot.org/buildroot/-/issues/65 + - gdb package doesn't have a licence hash in the gdb.hash file + https://gitlab.com/buildroot.org/buildroot/-/issues/66 + - package/libsha1: Build failure with GCC 14 [-Wimplicit-int] + https://gitlab.com/buildroot.org/buildroot/-/issues/69 + 2024.11, released December 8th, 2024 Various fixes. @@ -74,6 +1547,28 @@ - ripgrep leaves /usr/crates2.json / .crates.toml files https://gitlab.com/buildroot.org/buildroot/-/issues/17 +2024.08.3, released December 8th, 2024 + + Important / security related fixes. + + Defconfigs: fix mender_x86_64_efi_defconfig build on setups + where /bin/sh is not bash. + + Updated/fixed packages: alsa-lib, android-tools, bats-core, + bluez-alsa, bmap-tools, boost, checksec, ebtables, expat, fbv, + ffmpeg, foot, frr, gnuplot, gnutls, intel-microcode, irssi, + libcurl, libgit2, libkrb5, libmodbus, libpng, libvpl, + linux-pam, linux-tools, lmbench, mbedtls, mosquitto, musl, + musl-compat-headers, nfs-utils, ntp, php, picotool, + postgresql, procps-ng, python-psycopg2, python-sip, qt6base, + quagga, rt-tests, sexpect, sshguard, systemd, tiff, x11vnc + + Issues resolved: + - procps-ng: builderror in 2024.08 + https://gitlab.com/buildroot.org/buildroot/-/issues/38 + - fbv package download link is broken in long term support branch + https://gitlab.com/buildroot.org/buildroot/-/issues/73 + 2024.08.2, released November 14th, 2024 Important / security related fixes. @@ -466,6 +1961,128 @@ #16036: android-tools version is too old #16075: Cannot use linux kernel extensions from external tree.. +2024.02.13, released April 22nd, 2025 + + Important / security related fixes: + + - xserver_xorg-server & xwayland: CVE-2024-9632, CVE-2025-26594, + CVE-2025-26595, CVE-2025-26596, CVE-2025-26597, CVE-2025-26598, + CVE-2025-26599, CVE-2025-26600, CVE-2025-26601. + - exim: CVE-2025-30232. + - mbedtls: CVE-2025-27809, CVE-2025-27810. + - augeas: CVE-2025-2588. + - libarchive: CVE-2024-57970, CVE-2025-1632, CVE-2025-25724. + - libopenh264: CVE-2025-27091. + - libmodsecurity: CVE-2025-27110. + - tinyxml2: CVE-2024-50615. + - libndp: CVE-2024-5564. + - xwayland: CVE-2024-31080, CVE-2024-31081, CVE-2024-31083, + CVE-2024-9632, CVE-2025-26594, CVE-2025-26595, + CVE-2025-26596, CVE-2025-26597, CVE-2025-26598, + CVE-2025-26599, CVE-2025-26600, CVE-2025-26601. + - libfreeglut: CVE-2024-24258, CVE-2024-24259. + + Updated/fixed packages: + + libsoup3, linux, apr, mali-driver, + libcoap, python-fastapi, python-twisted, tor, linux-header, + linux-tools, libmodsecurity + + Test Improvements: + + - linux-tools: selftests: Add path containing BPF binary. + - testing: add git runtime test. + + Infrastructure updates/fixes: + + - DEVELOPERS: change arnout's address. + - DEVELOPERS: add Dario Binacchi for ti-k3-boot-firmware. + - support/download/svn: use 'svn info' whith LC_ALL=C. + - dillo: Fix an issue related to _SITE url for make show-info. + - kconfig: Handle backspace (^H) key. + - pkg-stats: add -v/--verbose option + + Build issues/problems solved for: + glibc, mesa3d-demos. + +2024.02.12, released March 24st, 2025 + + Important / security related fixes. + + Defconfigs: Octavo osd23mp1: Fix TF-A/Linux compilation after + move to newer toolchain versions. + + Updated/fixed packages: compiler-rt, exim, expat, fio, foot, + jbig2dec, libjxl, libxml2, musl, optee-os, php, postgresql, + prboom, python-typing-extensions, systemd, util-linux, + watchdogd, webkitgtk + +2024.02.11, released February 21st, 2025 + + Important / security related fixes. + + Updated/fixed packages: acpica, apache, assimp, asterisk, + bind, busybox, clamav, curlpp, dillo, elfutils, ffmpeg, foot, + freetype, git, gnutls, go, gpsd, heimdal, imagemagick, + intel-microcode, libbsd, libcurl, libopenssl, libtasn1, mdnsd, + mpg123, musl, nginx, nodejs, openjpeg, openssh, openvpn, + postgresql, python-django, redis, rsync, sdbus-cpp, socat, + tor, tzdata, uemacs, unbound, usbutils, webkitgtk, xen, zic, + zlog, zmqpp, zstd + + Issues resolved: + - OpenSSH 9.8 broken + https://gitlab.com/buildroot.org/buildroot/-/issues/11 + - samba4 build failed in master + https://gitlab.com/buildroot.org/buildroot/-/issues/86 + +2024.02.10, released January 9th, 2025 + + Important / security related fixes. + + Infrastructure: + + - Ensure CONFIG_TRIM_UNUSED_KSYMS is disabled when building + external Linux kernel modules + + Updated/fixed packages: apr, bc, cdrkit, cryptodev-linux, + freeipmi, gdb, gnupg2, gnutls, go, gobject-introspection, + grub2, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, iperf3, libcurl, libsha1, + libsndfile, libsoup3, libvirt, libxcrypt, linux, linux-pam, + mosquitto, netatalk, nettle, octave, opensc, perl, pixman, + procps-ng, python-django, python3, qt6base, samba4, skeleton, + subversion, tzdata, v4l2loopback, webkitgtk, wget, wireshark, + wpewebkit, zic + + Issues resolved: + - gdb package doesn't have a licence hash in the gdb.hash file + https://gitlab.com/buildroot.org/buildroot/-/issues/66 + - package/libsha1: Build failure with GCC 14 [-Wimplicit-int] + https://gitlab.com/buildroot.org/buildroot/-/issues/69 + - [2024.02.9] Mosquitto doesn't build + https://gitlab.com/buildroot.org/buildroot/-/issues/78 + +2024.02.9, released December 8th, 2024 + + Important / security related fixes. + + Updated/fixed packages: alsa-lib, android-tools, babeld, + bmap-tools, boost, ebtables, expat, fbv, foot, frr, gamin, + gnutls, intel-microcode, irssi, libcurl, libkrb5, libmodbus, + libvpl, linux-tools, lmbench, mbedtls, mosquitto, musl, + musl-compat-headers, nfs-utils, ntp, php, postgresql, + procps-ng, python-psycopg2, python-sip, qt6base, quagga, + rt-tests, sshguard, systemd, tiff, x11vnc + + Issues resolved: + - procps-ng: builderror in 2024.08 + https://gitlab.com/buildroot.org/buildroot/-/issues/38 + - fbv package download link is broken in long term support branch + https://gitlab.com/buildroot.org/buildroot/-/issues/73 + 2024.02.8, released November 14th, 2024 Important / security related fixes. diff --git a/Config.in b/Config.in index d7a8dc6848..d730f2034b 100644 --- a/Config.in +++ b/Config.in @@ -6,6 +6,15 @@ config BR2_HAVE_DOT_CONFIG bool default y +# Hidden symbol kept to false, to temporarily mark a configuration +# known to be broken (by depending on it). Ideally, we don't want to +# keep broken parts for too long. The intended use of this symbol is +# to give some time to a developer to fix the feature. Features marked +# as broken will be removed if they are not fixed in a reasonable +# amount of time. +config BR2_BROKEN + bool + config BR2_VERSION string option env="BR2_VERSION_FULL" @@ -65,6 +74,26 @@ config BR2_HOST_GCC_AT_LEAST_11 default y if BR2_HOST_GCC_VERSION = "11" select BR2_HOST_GCC_AT_LEAST_10 +config BR2_HOST_GCC_AT_LEAST_12 + bool + default y if BR2_HOST_GCC_VERSION = "12" + select BR2_HOST_GCC_AT_LEAST_11 + +config BR2_HOST_GCC_AT_LEAST_13 + bool + default y if BR2_HOST_GCC_VERSION = "13" + select BR2_HOST_GCC_AT_LEAST_12 + +config BR2_HOST_GCC_AT_LEAST_14 + bool + default y if BR2_HOST_GCC_VERSION = "14" + select BR2_HOST_GCC_AT_LEAST_13 + +config BR2_HOST_GCC_AT_LEAST_15 + bool + default y if BR2_HOST_GCC_VERSION = "15" + select BR2_HOST_GCC_AT_LEAST_14 + # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. @@ -105,15 +134,15 @@ menu "Commands" config BR2_CURL string "Curl command" - default "curl -q --ftp-pasv --retry 3" + default "curl -q --ftp-pasv --retry 3 --connect-timeout 10" config BR2_WGET string "Wget command" - default "wget -nd -t 3" + default "wget -nd -t 3 --connect-timeout=10" config BR2_SVN string "Subversion (svn) command" - default "svn --non-interactive" + default "svn --non-interactive --config-option servers:global:http-timeout=10" config BR2_BZR string "Bazaar (bzr) command" @@ -133,11 +162,11 @@ config BR2_LOCALFILES config BR2_SCP string "Secure copy (scp) command" - default "scp" + default "scp -o ConnectTimeout=10" config BR2_SFTP string "Secure file transfer (sftp) command" - default "sftp" + default "sftp -o ConnectTimeout=10" config BR2_HG string "Mercurial (hg) command" @@ -285,7 +314,7 @@ config BR2_KERNEL_MIRROR config BR2_GNU_MIRROR string "GNU Software mirror" - default "http://ftpmirror.gnu.org" + default "https://ftpmirror.gnu.org" help GNU has multiple software mirrors scattered around the world. The following allows you to select your preferred @@ -799,8 +828,6 @@ config BR2_PIC_PIE_ARCH_SUPPORTS default y # Microblaze glibc toolchains don't work with PIC/PIE enabled depends on !BR2_microblaze - # Nios2 toolchains produce non working binaries with -fPIC - depends on !BR2_nios2 config BR2_PIC_PIE bool "Build code with PIC/PIE" diff --git a/Config.in.legacy b/Config.in.legacy index 63360b42b8..64151b2f44 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,701 @@ endif ############################################################################### +comment "Legacy options removed in 2025.11" + +config BR2_KERNEL_HEADERS_5_4 + bool "kernel headers version 5.4.x are no longer supported" + select BR2_LEGACY + help + Version 5.4.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_LIBARGTABLE2 + bool "libargtable2 has been removed" + select BR2_LEGACY + help + libargtable2 is unmaintained and has been removed + +config BR2_PACKAGE_OLA + bool "ola has been removed" + select BR2_LEGACY + help + ola is incompatible with current versions of protobuf + +config BR2_PACKAGE_BATMAN_ADV_NC + bool "batman-adv removed network coding" + select BR2_LEGACY + help + batman-adv removed B.A.T.M.A.N. network coding + +config BR2_PACKAGE_DVBSNOOP + bool "dvbsnoop has been removed" + select BR2_LEGACY + help + dvbsnoop is unmaintained and has been removed + +config BR2_PACKAGE_PROCRANK_LINUX + bool "procrank_linux has been removed" + select BR2_LEGACY + help + procrank_linux is unmaintained and has been removed + +config BR2_PACKAGE_MONGREL2 + bool "mongrel2 has been removed" + select BR2_LEGACY + help + mongrel2 is incompatible with MbedTLS 3.6 and has been removed + +config BR2_PACKAGE_EXPECT + bool "expect has been removed" + select BR2_LEGACY + help + expect is unmaintained and has been removed + +config BR2_PACKAGE_BCTOOLBOX + bool "bctoolbox has been removed" + select BR2_LEGACY + help + This package has been removed as part of the linphone + removal. In addition, newer version of linphone directly + bundle bctoolbox making a separate package unnecessary. + +config BR2_PACKAGE_ORTP + bool "ortp has been removed" + select BR2_LEGACY + help + This package has been removed as part of the linphone + removal. In addition, newer version of linphone directly + bundle ortp making a separate package unnecessary. + +config BR2_PACKAGE_MEDIASTREAMER + bool "mediastreamer has been removed" + select BR2_LEGACY + help + This package has been removed as part of the linphone + removal. In addition, newer version of linphone directly + bundle mediastreamer making a separate package unnecessary. + +config BR2_PACKAGE_BELR + bool "belr has been removed" + select BR2_LEGACY + help + This package has been removed as part of the linphone + removal. In addition, newer version of linphone directly + bundle belr making a separate package unnecessary. + +config BR2_PACKAGE_BELLE_SIP + bool "belle-sip has been removed" + select BR2_LEGACY + help + This package has been removed as part of the linphone + removal. In addition, newer version of linphone directly + bundle belle-sip making a separate package unnecessary. + +config BR2_PACKAGE_LINPHONE + bool "linphone has been removed" + select BR2_LEGACY + help + This package was no longer maintained in Buildroot and was + no longer building. It can be re-added if someone volunteers + to fix the issues, update the package and maintain it. + +config BR2_PACKAGE_LIBJWT + bool "libjwt has been removed" + select BR2_LEGACY + help + The only dependee of libjwt, asterisk, is incompatible with + version 3 so the version bundled with asterisk is used and + this package has been removed. + +config BR2_PACKAGE_RAMSPEED + bool "ramspeed has been removed" + select BR2_LEGACY + help + The ramspeed package was removed as it is not maintained + anymore and the upstream repo is gone. + +config BR2_PACKAGE_LESSTIF + bool "lesstif has been removed" + select BR2_LEGACY + help + lesstif is unmaintained and has been removed + +config BR2_KERNEL_HEADERS_6_16 + bool "kernel headers version 6.16.x are no longer supported" + select BR2_LEGACY + help + Version 6.16.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK + bool "This firmware has been removed" + select BR2_LEGACY + help + This firmware has been removed from Murata package + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP + bool "BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_MURATA_CYW_FW_CYW4339 + help + The option has been renamed to + BR2_PACKAGE_MURATA_CYW_FW_CYW4339 + +config BR2_PACKAGE_LIBBSON + bool "libbson has been removed" + select BR2_LEGACY + help + libbson is officially deprecated upstream and has been removed + +config BR2_TARGET_ROOTFS_AXFS + bool "AXFS root filesystem has been removed" + select BR2_LEGACY + help + AXFS root filesystem support has been removed. + +config BR2_PACKAGE_LOGSURFER + bool "logsurfer has been removed" + select BR2_LEGACY + help + Logsurfer last updates was on 2011 and fails to build with + GCC14. + +config BR2_LINUX_KERNEL_EXT_FBTFT + bool "FB TFT drivers are deprecated" + select BR2_LEGACY + help + FB TFT drivers were only needed for linux kernels until v3.19, + since v4.0 the drivers are included in the staging area. + +config BR2_PACKAGE_DMENU_WAYLAND + bool "dmenu-wayland has been removed" + select BR2_LEGACY + help + The package has been abandoned for several years. + The only package that previously relied on dmenu-wayland + was sway, and that now relies on wmenu. Please select + wmenu instead. + +config BR2_PACKAGE_SYLPHEED + bool "sylpheed has been removed" + select BR2_LEGACY + help + Due to the removal of libgtk2, the sylpheed package has been + removed. + +config BR2_PACKAGE_PINENTRY_GTK2 + bool "gtk2 backend of pinentry has been removed" + select BR2_LEGACY + help + Due to the removal of libgtk2, the gtk2 backend of pinentry + has been removed. + +config BR2_PACKAGE_OPENCV4_WITH_GTK + bool "opencv4 gtk support has been removed" + select BR2_LEGACY + help + Due to the removal of libgtk2, the gtk support of opencv4 + has been removed. gtk3 support is still available. + +config BR2_PACKAGE_OPENCV3_WITH_GTK + bool "opencv3 gtk support has been removed" + select BR2_LEGACY + help + Due to the removal of libgtk2, the gtk support of opencv3 + has been removed. gtk3 support is still available. + +config BR2_PACKAGE_NETSURF_GTK + bool "gtk frontend of netsurf has been removed" + select BR2_LEGACY + help + Due to the removal of libgtk2, the gtk frontend of netsurf + has been removed. The gtk3 frontend can be used instead for + example. + +config BR2_PACKAGE_METACITY + bool "metacity has been removed" + select BR2_LEGACY + help + The metacity package has been removed, as libgtk2 has been + removed as well. + +config BR2_PACKAGE_LIBSEXY + bool "libsexy has been removed" + select BR2_LEGACY + help + The libsexy package has been removed, as libgtk2 has been + removed as well. + +config BR2_PACKAGE_LIBGLADE + bool "libglade has been removed" + select BR2_LEGACY + help + The libglade package has been removed, as libgtk2 has been + removed as well. + +config BR2_PACKAGE_LEAFPAD + bool "leafpad has been removed" + select BR2_LEGACY + help + The leafpad package has been removed, as libgtk2 has been + removed as well. + +config BR2_PACKAGE_GTKPERF + bool "gtkperf has been removed" + select BR2_LEGACY + help + The gtkperf package has been removed, as libgtk2 has been + removed as well. + +config BR2_PACKAGE_GTK2_ENGINES + bool "gtk2-engines has been removed" + select BR2_LEGACY + help + The gtk2-engines package has been removed, as libgtk2 has + been removed as well. + +config BR2_PACKAGE_GKRELLM_CLIENT + bool "gkrellm client has been removed" + select BR2_LEGACY + help + The gkrellm client option has been removed, as it required + libgtk2, which was removed from Buildroot. + +config BR2_PACKAGE_CWIID_WMGUI + bool "cwiid wmgui has been removed" + select BR2_LEGACY + help + The wmgui part of cwiid required libgtk2, which has been + removed from Buildroot. + +config BR2_LINUX_KERNEL_EXT_AUFS + bool "Aufs Filesystem Module patch has been removed" + select BR2_LEGACY + help + aufs kernel module patch is unmaintained and has been + removed. + +config BR2_PACKAGE_AUFS_UTIL + bool "aufs-util has been removed" + select BR2_LEGACY + help + aufs-util package is unmaintained and has been removed. + +config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB + bool "Linaro armeb 2018.05 external toolchain is deprecated" + select BR2_LEGACY + help + Linaro armeb 2018.05 is no longer maintained and has been + removed from Buildroot. + +config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM + bool "Linaro ARM 2018.05 external toolchain is deprecated" + select BR2_LEGACY + help + Linaro ARM 2018.05 is no longer maintained and has been + removed from Buildroot. + +config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE + bool "Linaro AArch64 BE 2018.05 external toolchain is deprecated" + select BR2_LEGACY + help + Linaro AArch64 2018.05 BE is no longer maintained and has been + removed from Buildroot. + +config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 + bool "Linaro AArch64 2018.05 external toolchain is deprecated" + select BR2_LEGACY + help + Linaro AArch64 2018.05 is no longer maintained and has been + removed from Buildroot. + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + bool "Sourcery CodeBench MIPS external toolchain is deprecated" + select BR2_LEGACY + help + Sourcery CodeBench MIPS 2016.05 is no longer maintained + and has been removed from Buildroot. + +config BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS + bool "ev3dev Linux drivers have been removed" + select BR2_LEGACY + help + Linux drivers for LEGO MINDSTORMS EV3 from the ev3dev project + are targeting an outdated kernel which is no longer supported. + +comment "Legacy options removed in 2025.08" + +config BR2_PACKAGE_NETSTAT_NAT + bool "netstat-nat has been removed" + select BR2_LEGACY + help + The upstream URL is gone and netstat-nat has been removed + from Buildroot. + +config BR2_PACKAGE_LIGHTTPD_LIBEV + bool "lighttpd removed libev support" + select BR2_LEGACY + help + Lighttpd 1.4.80 removed optional libev support. + +config BR2_PACKAGE_LIBSVGTINY + bool "libsvgtiny has been removed" + select BR2_LEGACY + help + Libsvgtiny has been removed from Buildroot. + +config BR2_PACKAGE_THTTPD + bool "thttpd has been removed" + select BR2_LEGACY + help + thttpd is no longer maintained actively by upstream and has + been removed from Buildroot. + +config BR2_KERNEL_HEADERS_6_15 + bool "kernel headers version 6.15.x are no longer supported" + select BR2_LEGACY + help + Version 6.15.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_LIBCURL_BEARSSL + bool "libcurl removed BearSSL support" + select BR2_LEGACY + help + Libcurl removed optional BearSSL support. + +config BR2_PACKAGE_LIBOLM + bool "libolm has been removed" + select BR2_LEGACY + help + libolm is deprecated and has been removed from Buildroot. + https://gitlab.matrix.org/matrix-org/olm#important-libolm-is-now-deprecated + +config BR2_PACKAGE_LIBWEBSOCK + bool "libwebsock has been removed" + select BR2_LEGACY + help + The upstream Github repository payden/libwebsock is no + longer available, and has been removed from Buildroot. + +config BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX + bool "EDK2 Socionext DeveloperBox support has been removed" + select BR2_LEGACY + help + The Socionext DeveloperBox support has been removed upstream + in EDK2 version edk2-stable202505. + +config BR2_PACKAGE_LIBEBUR128 + bool "libebur128 has been removed" + select BR2_LEGACY + help + The libebur128 package has been removed from Buildroot. + +config BR2_KERNEL_HEADERS_6_14 + bool "kernel headers version 6.14.x are no longer supported" + select BR2_LEGACY + help + Version 6.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_GPSD_OCEANSERVER + bool "gpsd OceanServer removed upstream" + select BR2_LEGACY + help + Support for OceanServer has been removed upstream in gpsd + v3.26. + +config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM + bool "mesa3d OSMesa (Gallium) library support removed" + select BR2_LEGACY + help + Mesa3d removed the OSMesa (Off-Screen) interface library. + +config BR2_PACKAGE_ALSA_LIB_ALISP + bool "alsa-lib alisp support removed" + select BR2_LEGACY + help + Support for alisp was removed from alsa-lib v1.12.14. + +comment "Legacy options removed in 2025.05" + +config BR2_GCC_VERSION_12_X + bool "gcc 12.x support removed" + select BR2_LEGACY + help + Support for building a toolchain based on GCC 12.x has been + removed, chose a newer GCC version instead. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + bool "mesa Gallium swrast driver was replaced by softpipe" + select BR2_LEGACY + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE + help + The Gallium swrast driver was replaced by softpipe. + +config BR2_PACKAGE_MBEDTLS_COMPRESSION + bool "mbedtls compression support removed" + select BR2_LEGACY + help + MbedTLS has dropped support for TLS record-level + compression. + +config BR2_KERNEL_HEADERS_6_13 + bool "kernel headers version 6.13.x are no longer supported" + select BR2_LEGACY + help + Version 6.13.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_MPD_SOUNDCLOUD + bool "mpd soundcloud support has been removed" + select BR2_LEGACY + help + MPD SoundCloud support has been removed. + +# BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT is still referenced in docker-engine +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT + bool "docker-engine init support is now a choice" + select BR2_LEGACY + help + docker-engine init support is now a choice. The original + setting has been adapted; be sure to review it in the + docker-engine package. + +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 + help + The angularjs package was removed as the upstream + project has been archived. + +config BR2_PACKAGE_ANGULAR_WEBSOCKET + bool "angular-websocket has been removed" + select BR2_LEGACY + help + The angular-websocket package was removed as the upstream + project has been archived. + +config BR2_PACKAGE_LATENCYTOP + bool "latencytop has been removed" + select BR2_LEGACY + help + The latencytop package is no longer available for download. + +config BR2_PACKAGE_OBSIDIAN_CURSORS + bool "obsidian-cursors has been removed" + select BR2_LEGACY + help + The obsidian cursors package is no longer available for + direct download. + +config BR2_PACKAGE_W_SCAN + bool "w_scan has been removed" + select BR2_LEGACY + help + The w_scan package was removed as it is not maintained + anymore and the upstream URL is gone. + +config BR2_PACKAGE_GENROMFS + bool "genromfs" + select BR2_LEGACY + help + Romfs root filesystem support has been removed. + +config BR2_TARGET_ROOTFS_ROMFS + bool "romfs root filesystem has been removed" + select BR2_LEGACY + help + Romfs root filesystem support has been removed. + +config BR2_BINUTILS_VERSION_2_41_X + bool "binutils 2.41 has been removed" + select BR2_LEGACY + help + binutils 2.41 has been removed, use a newer version. + +config BR2_TARGET_ROOTFS_EXT2_2r0 + bool "ext2 rev0 support been removed" + select BR2_LEGACY + help + Support for ext2 revision 0 format has been removed and + revision 1 is now unconditionally used. + +config BR2_GDB_VERSION_13 + bool "gdb 13.x has been removed" + select BR2_LEGACY + help + GDB 13.x support has been removed, a newer version should be + used instead. + +config BR2_nios2 + bool "nios2 architecture removed" + select BR2_LEGACY + help + The nios2 architecture was removed, by lack of toolchain + support. + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE + bool "Bootlin nios2 glibc bleeding-edge toolchain removed" + select BR2_LEGACY + help + The nios2 Bootlin toolchains have been removed. + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE + bool "Bootlin nios2 glibc stable toolchain removed" + select BR2_LEGACY + help + The nios2 Bootlin toolchains have been removed. + +config BR2_PACKAGE_DIRECTFB + bool "directfb has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_GST_OMX + bool "gst-omx has been removed" + select BR2_LEGACY + help + The gst-omx module has been removed from Gstreamer in + release 1.24 in favor of Video4Linux-based video encoders. + +config BR2_PACKAGE_MIMIC + bool "mimic has been removed" + select BR2_LEGACY + help + The mimic package has been removed from Buildroot. + +config BR2_PACKAGE_SDL2_DIRECTFB + bool "sdl2 directfb support removed" + select BR2_LEGACY + help + The directfb support from SDL2 is no longer available, as + directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_SDL_DIRECTFB + bool "sdl directfb support removed" + select BR2_LEGACY + help + The directfb support from SDL is no longer available, as + directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_QT5BASE_DIRECTFB + bool "qt5base directfb support removed" + select BR2_LEGACY + help + The directfb support from qt5base is no longer available, as + directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB + bool "gstreamer directfb plugin removed" + select BR2_LEGACY + help + The directfb plugin from GStreamer is no longer supported, + as directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_LITE + bool "lite has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_LINUX_FUSION + bool "linux-fusion has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_DIRECTFB_EXAMPLES + bool "directfb-examples has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_HIAWATHA + bool "hiwatha has been removed" + select BR2_LEGACY + help + This package is no longer maintained upstream, has no bug + tracker, and the latest versions cause build + failures. Therefore, it has been removed. + +config BR2_PACKAGE_MONGODB + bool "mongodb has been removed" + select BR2_LEGACY + help + The mongodb package has been removed as it was unmaintained. + +config BR2_PACKAGE_PYTHON_M2CRYPTO + bool "python-m2crypto has been removed" + select BR2_LEGACY + help + The python-m2crypto package was removed as it is in maintained + only mode and is not recommended for new projects. + +config BR2_KERNEL_HEADERS_4_19 + bool "kernel headers version 4.19.x are no longer supported" + select BR2_LEGACY + help + Version 4.19.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_6_11 + bool "kernel headers version 6.11.x are no longer supported" + select BR2_LEGACY + help + Version 6.11.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_GIBLIB + bool "giblib has been removed" + select BR2_LEGACY + help + The giblib package was removed as it is not maintained + anymore and the upstream URL is gone. + +config BR2_PACKAGE_FCONFIG + bool "fconfig has been removed" + select BR2_LEGACY + help + The fconfig package was removed as it is not maintained + anymore and the upstream URL is gone. + +config BR2_PACKAGE_LIBHID + bool "libhid has been removed" + select BR2_LEGACY + help + The libhid package was removed as it is not maintained + anymore and the upstream URL is gone. Consider using hidapi + instead. + +config BR2_PACKAGE_QUAGGA + bool "quagga has been removed" + select BR2_LEGACY + help + The quagga package was removed as it is not maintained + anymore and the upstream repo is gone. + +config BR2_PACKAGE_RAMSMP + bool "ramsmp has been removed" + select BR2_LEGACY + help + The ramsmp package was removed as it is not maintained + anymore and the upstream repo is gone. + comment "Legacy options removed in 2024.11" config BR2_PACKAGE_BSDIFF @@ -5707,7 +6402,6 @@ config BR2_PACKAGE_KOBS_NG config BR2_PACKAGE_SAWMAN bool "sawman package removed" select BR2_LEGACY - select BR2_PACKAGE_DIRECTFB_SAWMAN help This option has been removed because the sawman package no longer exists: it was merged inside DirectFB itself. This @@ -5717,7 +6411,6 @@ config BR2_PACKAGE_SAWMAN config BR2_PACKAGE_DIVINE bool "divine package removed" select BR2_LEGACY - select BR2_PACKAGE_DIRECTFB_DIVINE help This option has been removed because the divine package no longer exists: it was merged inside DirectFB itself. This diff --git a/DEVELOPERS b/DEVELOPERS index aedd736772..5c9eb94f56 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -28,9 +28,6 @@ N: Adam Duskett F: package/depot-tools/ -F: package/dmenu-wayland/ -F: package/fcft/ -F: package/foot/ F: package/flutter-engine/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ @@ -42,8 +39,7 @@ F: package/flutter-packages/flutter-rfw-local-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/ivi-homescreen/ -F: package/libutempter/ -F: package/tllist/ +F: package/mender-update-modules/ F: support/testing/tests/package/test_flutter.py N: Adam Heinrich @@ -72,6 +68,12 @@ N: Adrien Gallouët F: package/bird/ F: package/glorytun/ +N: Akhilesh Nema +F: board/freescale/ls1046a-rdb/ +F: configs/ls1046a-rdb_defconfig +F: board/freescale/ls1043a-rdb/ +F: configs/ls1043a-rdb_defconfig + N: Alejandro González F: package/qprint/ F: package/watchdog/ @@ -84,6 +86,10 @@ F: package/modem-manager/ N: Aleksandr Makarov F: package/cpp-httplib/ +N: Alexander Shirokov +F: package/broot/ +F: package/nnn/ + N: Alessandro Partesotti F: package/oatpp/ @@ -93,8 +99,6 @@ F: package/libzenoh-pico/ F: package/network-manager-openvpn/ N: Alex Suykov -F: board/chromebook/snow/ -F: configs/chromebook_snow_defconfig F: package/vboot-utils/ N: Alexander Clouter @@ -125,10 +129,6 @@ F: package/openpgm/ N: Aleksandr Makarov F: package/libest/ -N: Alexander Mukhin -F: package/tinyproxy/ -F: package/zfs/ - N: Alexander Sverdlin F: package/mini-snmpd/ @@ -149,6 +149,9 @@ F: configs/cubieboard2_defconfig N: Alexey Lukyanchuk F: package/zabbix/ +N: Alexis Lothoré +F: package/python-scp + N: Alistair Francis F: board/sifive/ F: boot/opensbi/ @@ -174,17 +177,20 @@ F: package/libkrb5/ F: package/p7zip/ F: package/wine/ +N: Andrea Ricchi +F: package/cutekeyboard/ + N: Andreas Klinger F: package/ply/ -N: Andreas Naumann +N: Andreas Naumann F: package/evemu/ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ F: package/qt6/qt6opcua/ -N: Andreas Ziegler +N: Andreas Ziegler F: package/mpd/ N: Andrey Smirnov @@ -269,7 +275,10 @@ F: configs/snps_archs38_hsdk_defconfig N: Arnaud Aujon F: package/espeak/ -N: Arnout Vandecappelle +N: Arno Messiaen +F: package/python-aiohttp-sse-client/ + +N: Arnout Vandecappelle F: package/arp-scan/ F: package/dehydrated/ F: package/dracut/ @@ -298,13 +307,15 @@ F: package/orbit/ N: Attila Wagner F: package/python-canopen/ +N: Ayoub Zaki +F: package/bmap-writer/ + N: Bagas Sanjaya F: package/git/ N: Bartosz Bilas F: board/stmicroelectronics/stm32mp157a-dk1/ F: configs/stm32mp157a_dk1_defconfig -F: package/cegui/ F: package/log4qt/ F: package/python-esptool/ F: package/python-pyaes/ @@ -330,6 +341,9 @@ F: package/tcpdump/ F: package/ti-uim/ F: package/uhubctl/ +N: Baxiche Su +F: package/qt6/qt6multimedia/ + N: Ben Boeckel F: package/taskd/ @@ -393,7 +407,6 @@ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libde265/ -F: package/libdecor/ F: package/libdeflate/ F: package/libdisplay-info/ F: package/libdrm/ @@ -401,8 +414,6 @@ F: package/libdvbcsa/ F: package/libdvdcss/ F: package/libdvdnav/ F: package/libdvdread/ -F: package/libebur128/ -F: package/libfreeglut/ F: package/libfribidi/ F: package/libg7221/ F: package/libglew/ @@ -475,11 +486,13 @@ F: package/perl-uri/ F: package/perl-www-robotrules/ F: package/php/ F: package/pngquant/ +F: package/postgresql/ F: package/pppd/ F: package/privoxy/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ +F: package/python-emailproxy/ F: package/python-glslang/ F: package/python-mako/ F: package/python-mwclient/ @@ -504,6 +517,7 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ +F: package/utfcpp/ F: package/vlc/ F: package/wget/ F: package/wireless-regdb/ @@ -568,7 +582,6 @@ F: package/jailhouse/ F: package/sunxi-boards/ N: Carsten Schoenert -F: package/dvbsnoop/ F: package/libdvbsi/ F: package/libsvg/ F: package/libsvg-cairo/ @@ -590,9 +603,6 @@ F: package/alsa-plugins/ N: Changming Huang F: package/qoriq-cadence-dp-firmware/ -N: Chris Dimich -F: package/freescale-imx/imx-vpu-hantro-daemon/ - N: Chris Packham F: package/coremark/ F: package/coremark-pro/ @@ -692,10 +702,6 @@ F: package/libsemanage/ F: package/libsepol/ F: package/policycoreutils/ -N: Clément Péron -F: board/beelink/gs1/ -F: configs/beelink_gs1_defconfig - N: Colin Foster F: package/python-tftpy/ F: package/rauc-hawkbit-updater/ @@ -715,6 +721,15 @@ F: configs/odroidc2_defconfig F: package/meson-tools/ F: package/odroidc2-firmware/ +N: Daniel Crowe +F: package/python-aniso8601/ +F: package/python-cachelib/ +F: package/python-flask-caching/ +F: package/python-flask-restx/ +F: package/python-pyproj/ +F: support/testing/tests/package/sample_python_pyproj.py +F: support/testing/tests/package/test_python_pyproj.py + N: Daniel J. Leach F: package/dacapo/ @@ -764,8 +779,6 @@ N: Daniel Sangue F: package/libftdi1/ N: Danilo Bargen -F: board/pcengines/apu2/ -F: configs/pcengines_apu2_defconfig F: package/tealdeer/ N: Danomi Manchego @@ -781,6 +794,7 @@ N: Dario Binacchi F: board/bsh/ F: board/stmicroelectronics/stm32f746-disco/ F: board/stmicroelectronics/stm32f769-disco/ +F: boot/ti-k3-boot-firmware/ F: configs/imx6ulz_bsh_smm_m2_defconfig F: configs/imx8mn_bsh_smm_s2_defconfig F: configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -788,10 +802,20 @@ F: configs/stm32f746_disco_sd_defconfig F: configs/stm32f769_disco_sd_defconfig F: package/aespipe/ F: package/armadillo/ +F: package/atf/ F: package/babeld/ +F: package/bc/ +F: package/cmocka/ +F: package/connman/ +F: package/empty/ F: package/iana-assignments/ +F: package/inih/ +F: package/less/ +F: package/libgphoto2/ +F: package/pocketpy/ F: package/sscep/ F: package/tinyinit/ +F: package/ufs-utils/ F: package/uuu/ N: Dario Binacchi @@ -814,9 +838,7 @@ F: package/libtalloc/ N: David Lechner F: board/lego/ev3/ F: configs/lego_ev3_defconfig -F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ -F: package/ev3dev-linux-drivers/ N: David Pierret F: package/bat/ @@ -856,6 +878,7 @@ N: Dimitar Tomov F: package/wolftpm/ N: Dimitrios Siganos +F: package/bvi/ F: package/wireless-regdb/ N: Dmitry Chestnykh @@ -863,9 +886,6 @@ F: board/qemu/sparc-ss10/ F: configs/qemu_sparc_ss10_defconfig F: package/uclibc-ng-test/ -N: Dominik Faessler -F: package/logsurfer/ - N: Dominik Michael Rauh F: package/gdal/ @@ -889,6 +909,11 @@ F: configs/acmesystems_acqua_a5_512mb_defconfig N: Eero Aaltonen F: package/docopt-cpp/ +N: El Mehdi YOUNES +F: package/opencl-headers/ +F: package/opencl-icd-loader/ +F: support/testing/tests/package/test_mesa3d.py + N: Eloi Bail F: package/bayer2rgb-neon/ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ @@ -951,11 +976,9 @@ F: package/tcf-agent/ N: Ezequiel Garcia F: board/ci20/ F: configs/ci20_defconfig -F: arch/Config.in.nios2 F: package/fio/ F: package/iptraf-ng/ F: package/jimtcl/ -F: package/mimic/ F: package/nodm/ F: package/openbox/ F: package/supertuxkart/ @@ -984,9 +1007,6 @@ F: package/atest/ F: package/crucible/ F: package/kmscube/ -N: Fabio Porcedda -F: package/netsurf-buildsystem/ - N: Fabio Urquiza F: package/bitcoin/ @@ -998,8 +1018,6 @@ F: package/openzwave/ N: Fabrice Fontaine F: package/bearssl/ -F: package/belle-sip/ -F: package/belr/ F: package/boinc/ F: package/cairo/ F: package/daq3/ @@ -1030,7 +1048,6 @@ F: package/libcue/ F: package/libebml/ F: package/libgee/ F: package/libglib2/ -F: package/libgtk2/ F: package/libgtk3/ F: package/libhtp/ F: package/libidn/ @@ -1060,7 +1077,6 @@ F: package/mbedtls/ F: package/minissdpd/ F: package/minizip/ F: package/minizip-zlib/ -F: package/mongodb/ F: package/motion/ F: package/mutt/ F: package/ncmpc/ @@ -1094,11 +1110,15 @@ F: package/python-pymodbus/ N: Fiona Klute F: package/*/S* +F: package/panel-mipi-dbi-firmware/ F: package/python-aiomqtt/ -F: package/python-dunamai/ -F: package/python-poetry-dynamic-versioning/ F: package/python-pyasynchat/ F: package/python-pyasyncore/ +F: support/testing/tests/package/sample_python_networkmanager_goi.py +F: support/testing/tests/package/sample_python_pyroute2.py +F: support/testing/tests/package/test_nftables.py +F: support/testing/tests/package/test_python_networkmanager_goi.py +F: support/testing/tests/package/test_python_pyroute2.py N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig @@ -1110,6 +1130,9 @@ F: package/rsyslog/ N: Florian Fainelli F: package/cpulimit/ +N: Florian Larysch +F: package/casync-nano/ + N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ @@ -1162,6 +1185,7 @@ F: package/lpty/ F: package/lrandom/ F: package/lsqlite3/ F: package/lua* +F: package/lynis/ F: package/lzlib/ F: package/moarvm/ F: package/mstpd/ @@ -1179,6 +1203,7 @@ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ F: package/xavante/ F: support/testing/tests/package/test_lua* +F: support/testing/tests/package/test_lynis.py F: utils/scancpan N: Frank Hunleth @@ -1196,6 +1221,10 @@ N: Frank Vanbever F: package/libmodsecurity/ F: package/nginx-modsecurity/ +N: Gaël PORTAY +F: board/raspberrypi/ +F: configs/raspberrypi* + N: Gao Xiang F: package/erofs-utils/ @@ -1203,6 +1232,7 @@ N: Gary Bisson F: board/boundarydevices/ F: configs/nitrogen* F: package/freescale-imx/ +F: package/freescale-imx/imx-vpu-hantro-daemon/ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ F: package/mfgtools/ @@ -1232,7 +1262,6 @@ F: package/httping/ F: package/iozone/ F: package/leptonica/ F: package/libeXosip2/ -F: package/libolm/ F: package/libosip2/ F: package/ocrad/ F: package/opencl-clhpp/ @@ -1268,6 +1297,7 @@ F: package/gcc/ F: package/harfbuzz/ F: package/libblockdev/ F: package/libfuse3/ +F: package/liblo/ F: package/libnspr/ F: package/libnss/ F: package/libnvme/ @@ -1310,7 +1340,6 @@ F: package/gengetopt/ F: package/janus-gateway/ F: package/libnice/ F: package/libsrtp/ -F: package/libwebsock/ F: package/sofia-sip/ N: Grzegorz Blach @@ -1333,6 +1362,9 @@ F: package/python-rpi-ws281x/ F: package/python-wtforms/ F: package/rpi-rgb-led-matrix/ +N: Guillaume Chaye +F: package/sane-airscan/ + N: Guillaume William Brs F: package/libnids/ F: package/libxcrypt/ @@ -1351,9 +1383,6 @@ F: support/testing/tests/package/sample_python_scipy.py F: support/testing/tests/package/test_python_pybind.py F: support/testing/tests/package/test_python_scipy.py -N: Gustavo Heinz -F: package/python-m2crypto/ - N: Gwenhael Goavec-Merou F: board/terasic/de10nano_cyclone5/ F: configs/terasic_de10nano_cyclone5_defconfig @@ -1373,10 +1402,8 @@ F: package/volk/ N: Heiko Thiery F: board/kontron/bl-imx8mm/ F: board/kontron/smarc-sal28/ -F: board/kontron/pitx-imx8m/ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig -F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ F: package/blake3/ F: package/ipmitool/ @@ -1431,9 +1458,6 @@ F: package/gcc-bare-metal/ F: package/newlib-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ -N: Ignacy Gawędzki -F: package/angularjs/ - N: Ilias Apalodimas F: package/keepalived/ @@ -1456,6 +1480,7 @@ F: package/s6-networking/ F: package/s6-portable-utils/ F: package/s6-rc/ F: package/skalibs/ +F: package/snooze/ F: package/tipidee/ N: Jagan Teki @@ -1465,24 +1490,14 @@ F: board/bananapi/ F: board/engicam/ F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ -F: board/orangepi/orangepi-lite2/ -F: board/orangepi/orangepi-one-plus F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/engicam_imx6qdl_icore_defconfig -F: configs/engicam_imx6qdl_icore_qt5_defconfig -F: configs/engicam_imx6qdl_icore_rqs_defconfig -F: configs/engicam_imx6ul_geam_defconfig -F: configs/engicam_imx6ul_isiot_defconfig F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig -F: configs/orangepi_lite2_defconfig -F: configs/orangepi_one_plus_defconfig F: configs/orangepi_zero_plus2_defconfig F: configs/pine64_defconfig -F: configs/pine64_sopine_defconfig F: package/python-scipy/ F: support/testing/tests/package/sample_python_scipy.py F: support/testing/tests/package/test_python_scipy.py @@ -1611,6 +1626,13 @@ F: package/libuhttpd/ F: package/libuwsc/ F: package/rtty/ +N: Jiaxun Yang +F: arch/Config.in.loongarch +F: board/loongarch64-efi +F: board/qemu/loongarch64-virt-efi +F: configs/loongarch64_efi_defconfig +F: configs/qemu_loongarch64_virt_efi_defconfig + N: Joachim Wiberg F: configs/globalscale_espressobin_defconfig F: board/globalscale/espressobin/ @@ -1620,6 +1642,7 @@ F: package/libite/ F: package/libnet/ F: package/libteam/ F: package/libuev/ +F: package/lowdown/ F: package/mg/ F: package/mdnsd/ F: package/mini-snmpd/ @@ -1727,6 +1750,7 @@ F: package/at-spi2-core/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ +F: package/llama-cpp/ F: package/llvm-project/clang/ F: package/llvm-project/lld/ F: package/llvm-project/llvm/ @@ -1744,15 +1768,6 @@ F: package/unclutter-xfixes/ N: Joshua Henderson F: package/qt5/qt5wayland/ -N: Jugurtha BELKALEM -F: package/bcc/ -F: package/python-aiofiles/ -F: package/python-crayons/ -F: package/python-cycler/ -F: package/python-matplotlib/ -F: package/python-opcua-asyncio/ -F: package/python-piexif/ - N: Juha Rantanen F: package/acsccid/ @@ -1774,20 +1789,17 @@ F: package/libmodbus/ F: package/ltris/ F: package/opentyrian/ -N: Julien Corjon -F: package/qt5/ - N: Julien Grossholtz F: board/raspberrypi/ -F: board/technologic/ts7680/ F: configs/raspberrypizero2w_defconfig -F: configs/ts7680_defconfig F: package/paho-mqtt-c N: Julien Olivain +F: board/freescale/imx93frdm/ F: board/qemu/riscv64-virt-efi/ F: board/spike/ F: board/technexion/imx8mmpico/ +F: configs/freescale_imx93frdm_defconfig F: configs/imx8mmpico_defconfig F: configs/qemu_riscv64_virt_efi_defconfig F: configs/spike_riscv32_defconfig @@ -1803,7 +1815,6 @@ F: package/libopenmpt/ F: package/mokutil/ F: package/oath-toolkit/ F: package/octave/ -F: package/ola/ F: package/openblas/ F: package/opencsd/ F: package/openmpi/ @@ -1864,10 +1875,12 @@ F: support/testing/tests/package/test_cryptsetup.py F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ +F: support/testing/tests/package/test_dieharder.py F: support/testing/tests/package/test_dmidecode.py F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_dosfstools.py F: support/testing/tests/package/test_dosfstools/ +F: support/testing/tests/package/test_dpdk.py F: support/testing/tests/package/test_ed.py F: support/testing/tests/package/test_ethtool.py F: support/testing/tests/package/test_ethtool/ @@ -1882,6 +1895,7 @@ F: support/testing/tests/package/test_fwts.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_ghostscript.py F: support/testing/tests/package/test_ghostscript/ +F: support/testing/tests/package/test_git.py F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py @@ -1891,9 +1905,11 @@ F: support/testing/tests/package/test_gnuradio.py F: support/testing/tests/package/test_gnuradio/ F: support/testing/tests/package/test_gpsd.py F: support/testing/tests/package/test_gpsd/ +F: support/testing/tests/package/test_gstreamer1.py F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_hyperfine.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py @@ -1913,12 +1929,16 @@ F: support/testing/tests/package/test_lame.py F: support/testing/tests/package/test_less.py F: support/testing/tests/package/test_libcamera.py F: support/testing/tests/package/test_libcamera/ +F: support/testing/tests/package/test_libcurl.py F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py +F: support/testing/tests/package/test_lighttpd.py F: support/testing/tests/package/test_links.py F: support/testing/tests/package/test_links/ +F: support/testing/tests/package/test_llama_cpp.py F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_lrzsz.py +F: support/testing/tests/package/test_ltp_testsuite.py F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lvm2.py F: support/testing/tests/package/test_lzip.py @@ -1950,16 +1970,18 @@ F: support/testing/tests/package/test_numactl.py F: support/testing/tests/package/test_numactl/ F: support/testing/tests/package/test_oath_toolkit.py F: support/testing/tests/package/test_octave.py -F: support/testing/tests/package/test_ola.py -F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_openblas.py +F: support/testing/tests/package/test_openocd.py F: support/testing/tests/package/test_parted.py +F: support/testing/tests/package/test_patch.py +F: support/testing/tests/package/test_patch/ F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py F: support/testing/tests/package/test_postgresql.py F: support/testing/tests/package/test_pppd.py F: support/testing/tests/package/test_pppd/ +F: support/testing/tests/package/test_proj.py F: support/testing/tests/package/test_pv.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py @@ -1991,20 +2013,25 @@ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py -F: support/testing/tests/package/test_thttpd.py F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ +F: support/testing/tests/package/test_tree.py F: support/testing/tests/package/test_unbound.py F: support/testing/tests/package/test_unbound/ +F: support/testing/tests/package/test_usbip.py +F: support/testing/tests/package/test_usbip/ F: support/testing/tests/package/test_usbutils.py F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_vorbis_tools.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ +F: support/testing/tests/package/test_wget.py F: support/testing/tests/package/test_which.py F: support/testing/tests/package/test_wine.py F: support/testing/tests/package/test_xfsprogs.py F: support/testing/tests/package/test_xfsprogs/ +F: support/testing/tests/package/test_xvisor.py +F: support/testing/tests/package/test_xxhash.py F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ @@ -2028,6 +2055,11 @@ F: package/libodb-mysql/ F: package/libqb/ F: package/usbguard/ +N: Kanak Shilledar +F: board/sipeed/licheepi_4a/ +F: configs/sipeed_licheepi_4a_defconfig +F: package/sipeed-lpi4abin/ + N: Karoly Kasza F: package/irqbalance/ F: package/openvmtools/ @@ -2035,7 +2067,6 @@ F: package/openvmtools/ N: Kelvin Cheung F: package/cpuload/ F: package/bwm-ng/ -F: package/ramsmp/ N: Kieran Bingham F: package/libcamera/ @@ -2097,9 +2128,6 @@ F: package/python-gunicorn/ F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/test_python_flask.py -N: Lionel Orry -F: package/mongrel2/ - N: Lothar Felten F: board/bananapi/bananapi-m2-ultra/ F: board/beagleboard/beaglebone/ @@ -2232,13 +2260,40 @@ N: Marcus Hoffmann F: package/nethogs/ F: package/pico-sdk/ F: package/picotool/ +F: package/python-apscheduler/ +F: package/python-crc/ +F: package/python-django/ F: package/python-immutabledict/ F: package/python-jc/ +F: package/python-log-rate-limit/ +F: package/python-pydantic/ +F: package/python-pydantic-core/ +F: package/python-pydantic-settings/ F: package/python-ruamel-yaml-clib/ +F: package/python-typing-inspection/ +F: package/python-tzlocal/ +F: package/python-sdbus-modemmanager/ +F: package/python-waitress/ +F: package/python-whitenoise/ +F: support/testing/tests/package/test_python_apscheduler.py +F: support/testing/tests/package/test_python_crc.py +F: support/testing/tests/package/test_python_django.py F: support/testing/tests/package/test_python_fastapi.py +F: support/testing/tests/package/test_python_pydantic.py +F: support/testing/tests/package/test_python_pydantic_settings.py F: support/testing/tests/package/test_python_ruamel_yaml.py +F: support/testing/tests/package/test_python_sdbus_modemmanager.py +F: support/testing/tests/package/test_python_tzlocal.py +F: support/testing/tests/package/test_python_waitress.py +F: support/testing/tests/package/test_python_whitenoise.py +F: support/testing/tests/package/sample_python_apscheduler.py +F: support/testing/tests/package/sample_python_crc.py +F: support/testing/tests/package/sample_python_django.py F: support/testing/tests/package/sample_python_fastapi.py +F: support/testing/tests/package/sample_python_pydantic.py +F: support/testing/tests/package/sample_python_pydantic_settings.py F: support/testing/tests/package/sample_python_ruamel_yaml.py +F: support/testing/tests/package/sample_python_sdbus_modemmanager.py N: Marek Belisko F: package/libatasmart/ @@ -2345,6 +2400,13 @@ F: package/libtraceevent/ F: package/libtracefs F: package/linux-tools/linux-tool-rtla.mk.in +N: Maxime Leroy +F: package/grout/ + +N: Meena Murthy +F: board/engicam/px30core/ +F: configs/engicam_px30_core_defconfig + N: Michael Durrant F: board/arcturus/ F: configs/arcturus_ucp1020_defconfig @@ -2386,10 +2448,6 @@ F: package/libavl/ F: package/rcw-smarc-sal28/ N: Michał Łyszczek -F: board/altera/socrates_cyclone5/ -F: board/pine64/rock64 -F: configs/rock64_defconfig -F: configs/socrates_cyclone5_defconfig F: package/netifrc/ F: package/openrc/ F: package/skeleton-init-openrc/ @@ -2426,6 +2484,7 @@ F: board/versal/ F: board/xilinx/ F: board/zynq/ F: board/zynqmp/ +F: boot/xilinx-embeddedsw/ F: boot/xilinx-prebuilt/ F: configs/versal_vck190_defconfig F: configs/versal_vek280_defconfig @@ -2442,15 +2501,12 @@ F: package/binutils-bare-metal/ F: package/bootgen/ F: package/gcc-bare-metal/ F: package/newlib-bare-metal/ +F: package/xilinx-fpgautil/ F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto F: package/uacme/ -N: Nicholas Sielicki -F: board/intel/galileo/ -F: configs/galileo_defconfig - N: Nicolas Carrier F: package/bmap-tools/ F: package/composer/ @@ -2494,10 +2550,6 @@ F: package/ofono/ N: Niklas Cassel F: configs/qemu_riscv64_nommu_virt_defconfig -N: Nikolay Dimitrov -F: board/embest/riotboard/ -F: configs/riotboard_defconfig - N: Nimai Mahajan F: package/libucl/ @@ -2564,6 +2616,10 @@ F: support/testing/tests/package/test_lxc/ N: Patrick Oppenlander F: package/minisign/ +N: Patrik Olsson +F: board/radxa/rock4se +F: configs/rock4se_defconfig + N: Paul Cercueil F: package/libiio/ F: package/lightning/ @@ -2583,7 +2639,6 @@ F: board/librecomputer/lafrite/ F: board/nexbox/a95x/ F: board/openblocks/a6/ F: board/orangepi/ -F: board/roseapplepi/ F: board/visionfive/ F: boot/shim/ F: configs/avenger96_defconfig @@ -2595,7 +2650,6 @@ F: configs/nezha_defconfig F: configs/openblocks_a6_defconfig F: configs/orangepi_pc_defconfig F: configs/orangepi_r1_defconfig -F: configs/roseapplepi_defconfig F: configs/sheevaplug_defconfig F: configs/visionfive_defconfig F: package/bats-core/ @@ -2625,6 +2679,7 @@ F: package/python-texttable/ F: package/python-validators/ F: package/python-webob/ F: package/python-websocket-client/ +F: package/rnnoise/ F: package/sedutil/ F: package/tpm2-totp/ F: package/triggerhappy/ @@ -2681,10 +2736,6 @@ F: package/liburcu/ N: Philippe Reynes F: package/ibm-sw-tpm2/ -N: Pierre Crokaert -F: board/hardkernel/odroidxu4/ -F: configs/odroidxu4_defconfig - N: Pierre Ducroquet F: package/kf5/ @@ -2718,9 +2769,6 @@ F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ -N: Prabhu Sannachi -F: package/redis-plus-plus/ - N: Qais Yousef F: package/bpftrace/ @@ -2767,12 +2815,16 @@ F: support/testing/tests/package/sample_python_rsa.py F: support/testing/tests/package/sample_python_s3transfer.py F: support/testing/tests/package/sample_python_sdbus.py F: support/testing/tests/package/sample_python_sdbus_networkmanager.py +F: support/testing/tests/package/sample_python_urllib3.py +F: support/testing/tests/package/test_nginx_modsecurity/ +F: support/testing/tests/package/test_nginx_modsecurity.py F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_pymupdf.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py F: support/testing/tests/package/test_python_sdbus.py F: support/testing/tests/package/test_python_sdbus_networkmanager.py +F: support/testing/tests/package/test_python_urllib3.py N: Raphael Pavlidis F: package/nvidia-persistenced/ @@ -2831,11 +2883,13 @@ F: package/vnstat/ N: Romain Naour F: board/beagleboard/beagleboneai64/ +F: board/beagleboard/beagley-ai/ F: board/qemu/ F: board/ti/am574x-idk/ F: configs/qemu_* F: configs/am574x_idk_defconfig F: configs/beagleboneai64_defconfig +F: configs/beagley_ai_defconfig F: package/alure/ F: package/aubio/ F: package/bcc/ @@ -2906,6 +2960,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ F: package/fd/ +F: package/parsec/ F: package/parsec-tool/ F: package/procs/ F: package/mxt-app/ @@ -2920,14 +2975,16 @@ F: package/ripgrep/ N: Sébastien Szymanski F: board/armadeus/ F: configs/armadeus* +F: package/nxp-bt-wifi-firmware/ +F: package/nxp-mwifiex/ F: package/mmc-utils/ F: package/python-flask-jsonrpc/ F: package/python-flask-login/ F: package/qt5/qt5charts/ +F: package/wlr-randr/ N: Semyon Kolganov F: package/fmt/ -F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ @@ -2942,12 +2999,14 @@ F: package/sdbus-cpp/ N: Sergey Matyukevich F: boot/arm-trusted-firmware/ F: board/linksprite/pcduino +F: board/orangepi/orangepi-5-plus F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ F: board/orangepi/orangepi-zero-plus2/ F: board/orangepi/orangepi-zero2w/ F: configs/linksprite_pcduino_defconfig +F: configs/orangepi_5_plus_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig @@ -2960,8 +3019,6 @@ F: package/wpa_supplicant/ F: package/xr819-xradio/ N: Sergio Prado -F: board/toradex/apalis-imx6/ -F: configs/toradex_apalis_imx6_defconfig F: package/aoetools/ F: package/asn1c/ F: package/azure-iot-sdk-c/ @@ -3023,6 +3080,18 @@ F: package/libvpx/ F: package/mesa3d-demos/ F: package/ti-gfx/ +N: Stefan Hager +F: package/cpuinfo/ +F: package/farmhash/ +F: package/fp16/ +F: package/fft2d/ +F: package/gemmlowp/ +F: package/psimd/ +F: package/pthreadpool/ +F: package/ruy/ +F: package/tensorflow-lite/ +F: package/xnnpack/ + N: Stefan Nickl F: board/freescale/imx8dxlevk/ F: configs/freescale_imx8dxlevk_defconfig @@ -3067,13 +3136,6 @@ N: Steven Noonan F: package/hwloc/ F: package/powertop/ -N: Suniel Mahesh -F: board/pine64/rockpro64 -F: board/radxa/rockpi-n8 -F: configs/rock_pi_n8_defconfig -F: configs/rockpro64_defconfig -F: package/arm-gnu-toolchain/ - N: Sven Oliver Moll F: package/most/ @@ -3107,7 +3169,6 @@ F: package/x265/ N: Thomas Bonnefille F: board/pine64/star64 F: configs/pine64_star64_defconfig -F: package/starfive-spltool/ N: Thomas Claveirole F: package/fcgiwrap/ @@ -3119,13 +3180,16 @@ N: Thomas Devoogdt F: package/fluent-bit/ F: package/libsoup3/ -N: Thomas Huth +N: Thomas Huth F: package/ascii-invaders/ F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Perale F: package/go/ +F: utils/generate-cyclonedx +F: support/scripts/cve-check +F: support/scripts/cve.py N: Thomas Petazzoni F: arch/Config.in.arm @@ -3143,16 +3207,15 @@ F: package/cifs-utils/ F: package/cloop/ F: package/cmake/ F: package/cramfs/ +F: package/cross-ldd/ F: package/dmidecode/ F: package/double-conversion/ F: package/flashrom/ F: package/gcc/ F: package/genext2fs/ -F: package/genromfs/ F: package/getent/ F: package/gnu-efi/ F: package/heirloom-mailx/ -F: package/hiawatha/ F: package/igh-ethercat/ F: package/intltool/ F: package/jh71xx-tools/ @@ -3177,8 +3240,11 @@ F: package/pkg-autotools.mk F: package/pkg-generic.mk F: package/python3/ F: package/python-augeas/ +F: package/python-crccheck/ F: package/python-flask-expects-json/ +F: package/python-fs/ F: package/python-git/ +F: package/python-pyfatfs/ F: package/python-qrcode/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ @@ -3190,6 +3256,7 @@ F: package/rt-tests/ F: package/rtc-tools/ F: package/sam-ba/ F: package/scons/ +F: package/snagboot/ F: package/squashfs/ F: package/tinifier/ F: package/wayland/ @@ -3206,18 +3273,24 @@ F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py +F: support/testing/tests/package/test_python_crccheck.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py +F: support/testing/tests/package/test_python_fs.py F: support/testing/tests/package/test_python_git.py +F: support/testing/tests/package/test_python_pyfatfs.py +F: support/testing/tests/package/test_python_pyusb.py +F: support/testing/tests/package/test_python_serial.py +F: support/testing/tests/package/test_snagboot.py F: support/testing/tests/package/test_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_python_xmodem.py F: support/testing/tests/toolchain/test_external_arm.py -F: support/testing/tests/toolchain/test_external_synopsys.py F: toolchain/ N: Timo Ketola F: package/fbgrab/ -N: Titouan Christophe +N: Titouan Christophe F: package/avro-c/ F: package/mosquitto/ F: package/python-avro/ @@ -3268,6 +3341,7 @@ F: board/nvidia/bf3/ F: configs/nvidia_bf3_defconfig F: package/bfscripts/ F: package/dpdk/ +F: package/libecoli/ N: Vincent Prince F: package/nss-myhostname/ @@ -3275,15 +3349,22 @@ F: package/utp_com/ N: Vincent Stehlé F: board/arm/fvp-ebbr/ +F: board/compulab/iot-gate-imx8-ebbr/ +F: board/pine64/rockpro64-ebbr/ F: board/qemu/aarch64-ebbr/ F: board/qemu/arm-ebbr/ F: configs/arm_fvp_ebbr_defconfig +F: configs/iot-gate-imx8_ebbr_defconfig F: configs/qemu_aarch64_ebbr_defconfig F: configs/qemu_arm_ebbr_defconfig +F: configs/rockpro64_ebbr_defconfig F: package/edk2-non-osi/ +F: support/testing/tests/boot/test_edk2.py N: Vincent Stehlé +F: board/arm/foundation-v8/ F: board/bananapi/bananapi-m2-zero/ +F: configs/arm_foundationv8_defconfig F: configs/bananapi_m2_zero_defconfig F: configs/uevm5432_defconfig F: package/i7z/ @@ -3292,6 +3373,8 @@ F: package/pixz/ F: package/zerofree/ F: support/testing/tests/package/test_msr_tools* F: support/testing/tests/package/test_pixz.py +F: support/testing/tests/package/test_xen.py +F: support/testing/tests/package/test_xen/ F: support/testing/tests/package/test_zerofree.py N: Vinicius Tinti @@ -3301,6 +3384,12 @@ N: Vivien Didelot F: board/technologic/ts5500/ F: configs/ts5500_defconfig +N: Vladimir Oltean +F: package/qoriq-ddr-phy-binary/ +F: package/qoriq-firmware-inphi/ +F: package/qoriq-mc-binary/ +F: package/qoriq-mc-utils/ + N: Volkov Viacheslav F: package/v4l2grab/ F: package/zbar/ @@ -3316,7 +3405,7 @@ F: configs/stm32f746_disco_sd_defconfig F: package/asterisk/ F: package/evilwm/ F: package/fbv/ -F: package/libjwt/ +F: package/libpam-pkcs11/ F: package/mksh/ F: package/ruby/ F: package/uclibc/ @@ -3383,7 +3472,6 @@ F: package/can-utils/ F: package/circus/ F: package/dhcpcd/ F: package/feh/ -F: package/giblib/ F: package/hostapd/ F: package/imlib2/ F: package/jquery-datetimepicker/ @@ -3401,8 +3489,10 @@ F: package/libsocketcan/ F: package/libubox/ F: package/libuci/ F: package/libxmlb/ +F: package/libxmlrpc/ F: package/linux-firmware/ F: package/linux-serial-test/ +F: package/lpac/ F: package/modem-manager/ F: package/ncftp/ F: package/nftables/ @@ -3436,7 +3526,7 @@ F: utils/scanpypi N: Yunhao Tian F: package/libopenaptx/ -N: Zoltan Gyarmati +N: Zoltan Gyarmati F: package/crudini/ F: package/grantlee/ F: package/libusb/ diff --git a/Makefile b/Makefile index 764148f715..4145574db0 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.11 +export BR2_VERSION := 2025.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1733653000 +BR2_VERSION_EPOCH = 1765493000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -353,7 +353,7 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \ # When adding a new host gcc version in Config.in, # update the HOSTCC_MAX_VERSION variable: -HOSTCC_MAX_VERSION := 11 +HOSTCC_MAX_VERSION := 15 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \ sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \ @@ -407,27 +407,28 @@ ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Hide troublesome environment variables from sub processes # ################################################################################ -unexport CROSS_COMPILE +unexport AR unexport ARCH unexport CC -unexport LD -unexport AR -unexport CXX -unexport CPP -unexport RANLIB unexport CFLAGS -unexport CXXFLAGS -unexport GREP_OPTIONS -unexport TAR_OPTIONS unexport CONFIG_SITE -unexport QMAKESPEC -unexport TERMINFO +unexport CPP +unexport CROSS_COMPILE +unexport CXX +unexport CXXFLAGS +unexport DEVICE_TREE +unexport GCC_COLORS +unexport GREP_OPTIONS +unexport LD unexport MACHINE unexport O -unexport GCC_COLORS -unexport PLATFORM unexport OS -unexport DEVICE_TREE +unexport PLATFORM +unexport QMAKESPEC +unexport RANLIB +unexport TAR_OPTIONS +unexport TERMINFO +unexport TOPDIR GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) @@ -780,19 +781,12 @@ endif # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr # counterparts are appropriately setup as symlinks ones to the others. -ifeq ($(BR2_ROOTFS_MERGED_USR),y) - - $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ - @$(call MESSAGE,"Sanity check in overlay $(d)")$(sep) \ - $(Q)not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \ - test -n "$$not_merged_dirs" && { \ - echo "ERROR: The overlay in $(d) is not" \ - "using a merged /usr for the following directories:" \ - $$not_merged_dirs; \ - exit 1; \ - } || true$(sep)) - -endif # merged /usr + @$(call MESSAGE,"Sanity check in overlays $(call qstrip,$(BR2_ROOTFS_OVERLAY))") + support/scripts/check-merged \ + -t overlay \ + $(if $(BR2_ROOTFS_MERGED_USR),-u) \ + $(if $(BR2_ROOTFS_MERGED_BIN),-b) \ + $(call qstrip,$(BR2_ROOTFS_OVERLAY)) $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ @$(call MESSAGE,"Copying overlay $(d)")$(sep) \ @@ -1218,17 +1212,17 @@ help: # $(2): br2-external name, empty for bundled define list-defconfigs @first=true; \ - for defconfig in $(1)/configs/*_defconfig; do \ + for defconfig in $$([ -d $(1)/configs ] && find $(1)/configs -name '*_defconfig' |sort); do \ [ -f "$${defconfig}" ] || continue; \ if $${first}; then \ if [ "$(2)" ]; then \ - printf 'External configs in "$(call qstrip,$(2))":\n'; \ + printf 'External configs in "%s":\n' "$(call qstrip,$(2))"; \ else \ printf "Built-in configs:\n"; \ fi; \ first=false; \ fi; \ - defconfig="$${defconfig##*/}"; \ + defconfig="$${defconfig#$(1)/configs/}"; \ printf " %-35s - Build for %s\n" "$${defconfig}" "$${defconfig%_defconfig}"; \ done; \ $${first} || printf "\n" @@ -1249,10 +1243,12 @@ release: OUT = buildroot-$(BR2_VERSION) # documentation to the git output release: git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar - $(MAKE) O=$(OUT) manual-html manual-text manual-pdf + SOURCE_DATE_EPOCH=$$(git log -1 --format=%at 2> /dev/null) \ + $(MAKE) O=$(OUT) manual-html manual-text manual-pdf $(MAKE) O=$(OUT) distclean - tar rf $(OUT).tar $(OUT) - gzip -9 -c < $(OUT).tar > $(OUT).tar.gz + tar rf $(OUT).tar --owner=0 --group=0 \ + --mtime="$$(git log -1 --pretty=format:%ci)" $(OUT) + gzip -9 -n -c < $(OUT).tar > $(OUT).tar.gz xz -9 -c < $(OUT).tar > $(OUT).tar.xz rm -rf $(OUT) $(OUT).tar diff --git a/arch/Config.in b/arch/Config.in index e57f4b2baa..34422c0d50 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -80,6 +80,16 @@ config BR2_i386 Intel i386 architecture compatible microprocessor http://en.wikipedia.org/wiki/I386 +config BR2_loongarch64 + bool "LoongArch64" + select BR2_USE_MMU + select BR2_ARCH_IS_64 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_12 + help + LoongArch64 is 64-bit architecture developed by Loongson. + http://www.loongson.cn/ + https://en.wikipedia.org/wiki/Loongson + config BR2_m68k bool "m68k" # MMU support is set by the subarchitecture file, arch/Config.in.m68k @@ -143,14 +153,6 @@ config BR2_mips64el http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies -config BR2_nios2 - bool "Nios II" - select BR2_USE_MMU - help - Nios II is a soft core processor from Altera Corporation. - http://www.altera.com/ - http://en.wikipedia.org/wiki/Nios_II - config BR2_or1k bool "OpenRISC" select BR2_USE_MMU @@ -319,6 +321,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_15 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -357,6 +363,12 @@ config BR2_GCC_TARGET_FPU config BR2_GCC_TARGET_FLOAT_ABI string +# The value of this option will be passed as --with-simd= when +# building gcc (internal backend) or -simd= in the toolchain +# wrapper (external toolchain) +config BR2_GCC_TARGET_SIMD + string + # The value of this option will be passed as --with-mode= when # building gcc (internal backend) or -m in the toolchain # wrapper (external toolchain) @@ -381,6 +393,10 @@ if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be source "arch/Config.in.arm" endif +if BR2_loongarch64 +source "arch/Config.in.loongarch" +endif + if BR2_m68k source "arch/Config.in.m68k" endif @@ -393,10 +409,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el source "arch/Config.in.mips" endif -if BR2_nios2 -source "arch/Config.in.nios2" -endif - if BR2_or1k source "arch/Config.in.or1k" endif diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 219215d122..a0bf6c3386 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -95,6 +95,14 @@ config BR2_ARM_CPU_ARMV8A bool select BR2_USE_MMU +# Armv9.0-A base specification is a super-set of Armv8.5-A. It is +# fully compatible with Armv8. This symbol is defined to allow checks +# for doing Armv9 optimization. Armv8 is also selected for +# compatibility. +config BR2_ARM_CPU_ARMV9A + bool + select BR2_ARM_CPU_ARMV8A + choice prompt "Target Architecture Variant" default BR2_cortex_a53 if BR2_ARCH_IS_64 @@ -466,6 +474,14 @@ config BR2_cortex_a76_a55 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_cortex_a78 + bool "cortex-A78" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_neoverse_n1 bool "neoverse-N1 (aka ares)" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -488,6 +504,28 @@ config BR2_saphira select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 + +comment "armv9.0a cores" +config BR2_cortex_a710 + bool "Cortex-A710 (aka matterhorn)" + depends on BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV9A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_12 +config BR2_neoverse_n2 + bool "neoverse-N2 (aka perseus)" + depends on BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV9A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + +comment "armv9.2a cores" +config BR2_cortex_a720 + bool "Cortex-A720 (aka hunter)" + depends on BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV9A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 endchoice config BR2_ARM_ENABLE_NEON @@ -747,7 +785,7 @@ config BR2_ARM_INSTRUCTIONS_THUMB # Thumb-1 and VFP are not compatible depends on BR2_ARM_SOFT_FLOAT help - This option instructions the compiler to generate Thumb + This option instructs the compiler to generate Thumb instructions, which allows to mix 16 bits instructions and 32 bits instructions. This generally provides a much smaller compiled binary size. @@ -760,7 +798,7 @@ config BR2_ARM_INSTRUCTIONS_THUMB2 bool "Thumb2" depends on BR2_ARM_CPU_HAS_THUMB2 help - This option instructions the compiler to generate Thumb2 + This option instructs the compiler to generate Thumb2 instructions, which allows to mix 16 bits instructions and 32 bits instructions. This generally provides a much smaller compiled binary size. @@ -876,10 +914,16 @@ config BR2_GCC_TARGET_CPU default "cortex-a75.cortex-a55" if BR2_cortex_a75_a55 default "cortex-a76" if BR2_cortex_a76 default "cortex-a76.cortex-a55" if BR2_cortex_a76_a55 + default "cortex-a78" if BR2_cortex_a78 default "neoverse-n1" if BR2_neoverse_n1 default "tsv110" if BR2_tsv110 # armv8.4a default "saphira" if BR2_saphira + # armv9.0a + default "cortex-a710" if BR2_cortex_a710 + default "neoverse-n2" if BR2_neoverse_n2 + # armv9.2a + default "cortex-a720" if BR2_cortex_a720 config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb diff --git a/arch/Config.in.loongarch b/arch/Config.in.loongarch new file mode 100644 index 0000000000..4b50b98710 --- /dev/null +++ b/arch/Config.in.loongarch @@ -0,0 +1,138 @@ +# LoongArch CPU + +choice + prompt "Target Architecture Variant" + default BR2_loongarch64_generic if BR2_ARCH_IS_64 + +config BR2_loongarch64_generic + bool "Generic LoongArch 64-bit" + depends on BR2_ARCH_IS_64 + help + Generic LoongArch 64-bit processor. + +config BR2_loongarch64_v1_0 + bool "LoongArch64 ISA version 1.0" + depends on BR2_ARCH_IS_64 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + help + LoongArch64 ISA version 1.0 processor. + +config BR2_loongarch64_v1_1 + bool "LoongArch64 ISA version 1.1" + depends on BR2_ARCH_IS_64 + select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + help + LoongArch64 ISA version 1.1 processor. + +endchoice + +choice + prompt "FPU Type" + default BR2_LOONGARCH_FPU_64 + +config BR2_LOONGARCH_FPU_64 + bool "64" + help + Allow the use of hardware floating-point instructions for + 32-bit and 64-bit operations. + +config BR2_LOONGARCH_FPU_32 + bool "32" + # Only supported by lp64s and lp64f ABIs which are marked as broken + depends on BR2_BROKEN + help + Allow the use of hardware floating-point instructions for + 32-bit operations only. + +config BR2_LOONGARCH_FPU_NONE + bool "none" + # Only supported by lp64s ABI which is marked as broken + depends on BR2_BROKEN + help + Prevent the use of hardware floating-point instructions. +endchoice + +choice + prompt "SIMD Type" + default BR2_LOONGARCH_SIMD_NONE + +config BR2_LOONGARCH_SIMD_NONE + bool "none" + help + Prevent the use of hardware SIMD instructions. + +config BR2_LOONGARCH_SIMD_LSX + bool "LSX" + depends on BR2_LOONGARCH_FPU_64 + help + Enable generating instructions from the 128-bit LoongArch SIMD + Extension (LSX). + +config BR2_LOONGARCH_SIMD_LASX + bool "LASX" + depends on BR2_LOONGARCH_FPU_64 + help + Enable generating instructions from the 256-bit LoongArch + Advanced SIMD Extension (LASX) and the 128-bit LoongArch + SIMD Extension (LSX). +endchoice + +choice + prompt "Target ABI" + default BR2_LOONGARCH_ABI_LP64D if BR2_ARCH_IS_64 && BR2_LOONGARCH_FPU_64 + default BR2_LOONGARCH_ABI_LP64F if BR2_ARCH_IS_64 && BR2_LOONGARCH_FPU_32 + default BR2_LOONGARCH_ABI_LP64S if BR2_ARCH_IS_64 && BR2_LOONGARCH_SIMD_NONE + +config BR2_LOONGARCH_ABI_LP64D + bool "lp64d" + depends on BR2_ARCH_IS_64 + depends on BR2_LOONGARCH_FPU_64 + +config BR2_LOONGARCH_ABI_LP64F + bool "lp64f" + depends on BR2_ARCH_IS_64 + # Failed to build host GCC initial, pending investigation + depends on BR2_BROKEN + depends on BR2_LOONGARCH_FPU_64 || BR2_LOONGARCH_FPU_32 + +config BR2_LOONGARCH_ABI_LP64S + bool "lp64s" + depends on BR2_ARCH_IS_64 + # GCC can't find libraries, pending investigation + depends on BR2_BROKEN +endchoice + +config BR2_ARCH + default "loongarch64" if BR2_ARCH_IS_64 + +config BR2_NORMALIZED_ARCH + default "loongarch" + +config BR2_ENDIAN + default "LITTLE" + +config BR2_GCC_TARGET_ARCH + default "loongarch64" if BR2_loongarch64_generic + default "la64v1.0" if BR2_loongarch64_v1_0 + default "la64v1.1" if BR2_loongarch64_v1_1 + +config BR2_GCC_TARGET_FPU + default "64" if BR2_LOONGARCH_FPU_64 + default "32" if BR2_LOONGARCH_FPU_32 + default "none" if BR2_LOONGARCH_FPU_NONE + +config BR2_GCC_TARGET_SIMD + default "lasx" if BR2_LOONGARCH_SIMD_LASX + default "lsx" if BR2_LOONGARCH_SIMD_LSX + default "none" if BR2_LOONGARCH_FPU_NONE + +config BR2_GCC_TARGET_ABI + default "lp64d" if BR2_LOONGARCH_ABI_LP64D + default "lp64f" if BR2_LOONGARCH_ABI_LP64F + default "lp64s" if BR2_LOONGARCH_ABI_LP64S + +config BR2_READELF_ARCH_NAME + default "LoongArch" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/arch/arch.mk b/arch/arch.mk index 4174d33df5..4a7851a9fd 100644 --- a/arch/arch.mk +++ b/arch/arch.mk @@ -16,6 +16,7 @@ GCC_TARGET_FP32_MODE := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE)) GCC_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)) GCC_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU)) GCC_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) +GCC_TARGET_SIMD := $(call qstrip,$(BR2_GCC_TARGET_SIMD)) GCC_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE)) # Explicitly set LD's "max-page-size" instead of relying on some defaults diff --git a/board/aarch64-efi/patches/linux/linux.hash b/board/aarch64-efi/patches/linux/linux.hash index 20941a269b..50983eb42b 100644 --- a/board/aarch64-efi/patches/linux/linux.hash +++ b/board/aarch64-efi/patches/linux/linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz +sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz diff --git a/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts new file mode 100644 index 0000000000..60be8a67cd --- /dev/null +++ b/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts @@ -0,0 +1,340 @@ +/* + * acme-acqua.dts - Device Tree file for Acqua A5 Board + * + * Copyright (C) 2014 Atmel, + * 2014 Nicolas Ferre + * + * 2022 Sergio Tanzilli + * + * Licensed under GPLv2 or later. + */ +/dts-v1/; +#include "sama5d31.dtsi" + +/ { + model = "Acme Systems Acqua SOM"; + compatible = "acme,acqua", "atmel,sama5d3", "atmel,sama5"; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait net.ifnames=0"; + }; + + memory { + reg = <0x20000000 0x10000000>; + }; + + clocks { + slow_xtal { + clock-frequency = <32768>; + }; + + main_xtal { + clock-frequency = <12000000>; + }; + }; + + ahb { + apb { + hlcdc: hlcdc@f0030000 { + status = "disabled"; + hlcdc-display-controller { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888_alt>; + port@0 { + hlcdc_panel_output: endpoint@0 { + remote-endpoint = <&panel_input>; + }; + }; + }; + }; + + /* MicroSD mounted on the SOM */ + + mmc0: mmc@f0000000 { + pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>; + status = "okay"; + slot@0 { + reg = <0>; + bus-width = <4>; + }; + }; + + /* Optional MicroSD to mount on the carrier board */ + + mmc1: mmc@f8000000 { + pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>; + status = "disabled"; + slot@0 { + reg = <0>; + bus-width = <4>; + cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>; + }; + }; + + spi0: spi@f0004000 { + cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; + status = "disabled"; + }; + + can0: can@f000c000 { + status = "disabled"; + }; + + tcb0: timer@f0010000 { + timer0: timer@0 { + compatible = "atmel,tcb-timer"; + reg = <0>; + }; + + timer1: timer@1 { + compatible = "atmel,tcb-timer"; + reg = <1>; + }; + }; + + i2c0: i2c@f0014000 { + pinctrl-0 = <&pinctrl_i2c0_pu>; + status = "disabled"; + }; + + i2c1: i2c@f0018000 { + status = "disabled"; + }; + + macb1: ethernet@f802c000 { + compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb"; + + status = "okay"; + phy-mode = "rmii"; + #address-cells = <1>; + #size-cells = <0>; + + nvmem-cells = <ð0_addr>; + nvmem-cell-names = "mac-address"; + + phy0: ethernet-phy@1 { + interrupt-parent = <&pioE>; + interrupts = <30 IRQ_TYPE_EDGE_FALLING>; + reg = <1>; + }; + + /*ethernet-phy@1 { + reg = <0x1>; + };*/ + }; + + /* Bit banging internal I2C to manage the AT24MAC402 chip */ + + i2c3@ { + compatible = "i2c-gpio"; + + sda-gpios = <&pioE 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + scl-gpios = <&pioE 2 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_gpio>; + + i2c-gpio,delay-us = <4>; /* ~178 kHz */ + #address-cells = <1>; + #size-cells = <0>; + + /* EEPROM contains the eth0 MAC address */ + + eeprom@58 { + compatible = "atmel,24mac402"; + pagesize = <256>; + read-only; + reg = <0x58>; + #address-cells = <1>; + #size-cells = <1>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eth0_addr: eth-mac-addr@9A { + reg = <0x0 0x06>; + }; + }; + }; + + }; + + pwm0: pwm@f002c000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_pwmh0_0 &pinctrl_pwm0_pwmh1_0>; + status = "disabled"; + }; + + usart0: serial@f001c000 { + status = "okay"; + }; + + usart1: serial@f0020000 { + pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>; + status = "disabled"; + }; + + uart0: serial@f0024000 { + status = "disabled"; + }; + + + spi1: spi@f8008000 { + cs-gpios = <&pioC 25 0>; + status = "disabled"; + }; + + adc0: adc@f8018000 { + atmel,adc-vref = <3300>; + atmel,adc-channels-used = <0xfe>; + pinctrl-0 = < + &pinctrl_adc0_adtrg + &pinctrl_adc0_ad1 + &pinctrl_adc0_ad2 + &pinctrl_adc0_ad3 + &pinctrl_adc0_ad4 + &pinctrl_adc0_ad5 + &pinctrl_adc0_ad6 + &pinctrl_adc0_ad7 + >; + status = "disabled"; + }; + + i2c2: i2c@f801c000 { + dmas = <0>, <0>; /* Do not use DMA for i2c2 */ + pinctrl-0 = <&pinctrl_i2c2_pu>; + status = "disabled"; + }; + + + dbgu: serial@ffffee00 { + status = "okay"; + }; + + pinctrl@fffff200 { + + atmel,mux-mask = < + /* A B C */ + 0xffffffff 0xc0fc0000 0xc0ff0000 /* pioA */ + 0xffffffff 0x0ff8ffff 0x00000000 /* pioB */ + 0xffffffff 0xbc00f1ff 0x7c00fc00 /* pioC */ + 0xffffffff 0xc001c0e0 0x0001c1e0 /* pioD */ + 0xfffffff9 0xbf9f8000 0x18000000 /* pioE */ + /* 0xffffffff 0xb8000000 0x18000000 */ /* pioE */ + >; + + board { + pinctrl_i2c0_pu: i2c0_pu { + atmel,pins = + , + ; + }; + + pinctrl_i2c2_pu: i2c2_pu { + atmel,pins = + , + ; + }; + + pinctrl_i2c3_gpio: i2c3-gpio { + atmel,pins = + ; + }; + + + pinctrl_key_gpio: key_gpio_0 { + atmel,pins = + ; + }; + + pinctrl_mmc0_cd: mmc0_cd { + atmel,pins = + ; + }; + + pinctrl_mmc1_cd: mmc1_cd { + atmel,pins = + ; + }; + + pinctrl_usba_vbus: usba_vbus { + atmel,pins = + ; /* PE9, conflicts with A9 */ + }; + + pinctrl_gpio_leds: gpio_leds_default { + atmel,pins = + ; + }; + }; + }; + }; + + usb0: gadget@500000 { + status = "disabled"; + }; + + usb1: ohci@600000 { + status = "okay"; + }; + + usb2: ehci@700000 { + status = "okay"; + }; + + }; + + + panel: panel { + /* compatible = "acme,43inch", "simple-panel"; */ + compatible = "acme,50inch", "simple-panel"; + /* compatible = "acme,70inch", "simple-panel"; */ + + status = "disable"; + + port@0 { + panel_input: endpoint@0 { + remote-endpoint = <&hlcdc_panel_output>; + }; + }; + }; + + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + led0 { + label = "led0"; + gpios = <&pioE 3 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + + led1 { + label = "led1"; + gpios = <&pioE 4 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + + led2 { + label = "led2"; + gpios = <&pioE 5 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; + + led3 { + label = "led3"; + gpios = <&pioE 6 GPIO_ACTIVE_LOW>; + linux,default-trigger = "mmc0"; + default-state = "off"; + }; + }; +}; diff --git a/board/acmesystems/acqua-a5/patches/linux/linux.hash b/board/acmesystems/acqua-a5/patches/linux/linux.hash index 4b20a009a7..2c86a53263 100644 --- a/board/acmesystems/acqua-a5/patches/linux/linux.hash +++ b/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz +sha256 6b19a3ae99423de2416964d67251d745910277af258b4c4c63e88fd87dbf0e27 linux-6.12.41.tar.xz diff --git a/board/andes/ae350/patches/linux-headers/linux-headers.hash b/board/andes/ae350/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/andes/ae350/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/andes/ae350/patches/linux/linux.hash b/board/andes/ae350/patches/linux/linux.hash new file mode 100644 index 0000000000..1a6a136b71 --- /dev/null +++ b/board/andes/ae350/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c71af3d2c86c0a0deca4f54b51d1c35217082b030052cc3513dc42e852652733 linux-v6.0.y-andes.tar.gz diff --git a/board/andes/ae350/patches/opensbi/opensbi.hash b/board/andes/ae350/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..d7893a1dee --- /dev/null +++ b/board/andes/ae350/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 opensbi-1.6.tar.gz diff --git a/board/andes/ae350/patches/uboot/uboot.hash b/board/andes/ae350/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/andes/ae350/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/andes/ae350/post-build.sh b/board/andes/ae350/post-build.sh index 84187a064b..e1669c2bcd 100755 --- a/board/andes/ae350/post-build.sh +++ b/board/andes/ae350/post-build.sh @@ -1,3 +1,3 @@ #!/bin/sh -cp $BINARIES_DIR/Image $TARGET_DIR/boot -cp $BINARIES_DIR/ae350_ax45mp.dtb $TARGET_DIR/boot +cp "$BINARIES_DIR"/Image "$TARGET_DIR"/boot +cp "$BINARIES_DIR"/ae350_ax45mp.dtb "$TARGET_DIR"/boot diff --git a/board/arm/foundation-v8/patches/linux/linux.hash b/board/arm/foundation-v8/patches/linux/linux.hash index 559b53be2d..e58afb7bc7 100644 --- a/board/arm/foundation-v8/patches/linux/linux.hash +++ b/board/arm/foundation-v8/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 b0bb92d982f88380e5b2059349c3a862e0afa712e0646eb0e082b9c2c5cb5176 linux-6.8.10.tar.xz +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 3507dd105b0a0e1101bd43d294472fccf853429a259a5fa7c67467bba318f8e9 linux-6.15.7.tar.xz diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index 701cf3ceb0..c281faf9d6 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -1,16 +1,39 @@ +Introduction +============ + This is the support for the ARM Foundation v8 machine emulated by the ARM software simulator of the AArch64 architecture. -First, one has to download the AArch64 software simulator from: +Building +======== - https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FM_11_25/Foundation_Platform_11.25_15_Linux64.tgz + $ make arm_foundationv8_defconfig + $ make -Then, use the arm_foundationv8_defconfig configuration to build your -Buildroot system. +Generated files under output/images: + +* linux-system.axf: An image comprising the boot-wrapper-aarch64 minimal + firmware and bootloader, a Devicetree and the Linux kernel. +* rootfs.ext2: The OS root filesystem. + +Running on the simulator +======================== + +Download the AArch64 software simulator from one of the following sources, +corresponding to your host computer: + +- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.29/Foundation_Platform_11.29_27_Linux64.tgz +- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.29/Foundation_Platform_11.29_27_Linux64_armv8l.tgz + +The model will be located under one of the corresponding folders: + +- Foundation_Platformpkg/models/Linux64_GCC-9.3 +- Foundation_Platformpkg/models/Linux64_armv8l_GCC-9.3 Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ + Foundation_Platform \ + --arm-v8.0 \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/aspeed/ast2500-evb/genimage.cfg b/board/aspeed/ast2500-evb/genimage.cfg index 498a71e4d7..952a7b7820 100644 --- a/board/aspeed/ast2500-evb/genimage.cfg +++ b/board/aspeed/ast2500-evb/genimage.cfg @@ -30,11 +30,11 @@ image flash.img { partition fitimage { image = "image.itb" offset = 512K - size = 4352K + size = 7000K } partition spare { - offset = 4864K - size = 27904K + offset = 7512K + size = 25256K } } diff --git a/board/aspeed/ast2500-evb/patches/linux/linux.hash b/board/aspeed/ast2500-evb/patches/linux/linux.hash new file mode 100644 index 0000000000..e1da9b309e --- /dev/null +++ b/board/aspeed/ast2500-evb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5be3daa1f9427b1bdb34c4894d9c1adfac38cff674376fe0611a3065729a1a81 linux-6.16.7.tar.xz diff --git a/board/aspeed/ast2500-evb/patches/uboot/uboot.hash b/board/aspeed/ast2500-evb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/aspeed/ast2500-evb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/aspeed/ast2600-evb/patches/linux/linux.hash b/board/aspeed/ast2600-evb/patches/linux/linux.hash new file mode 100644 index 0000000000..e1da9b309e --- /dev/null +++ b/board/aspeed/ast2600-evb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5be3daa1f9427b1bdb34c4894d9c1adfac38cff674376fe0611a3065729a1a81 linux-6.16.7.tar.xz diff --git a/board/aspeed/ast2600-evb/patches/uboot/uboot.hash b/board/aspeed/ast2600-evb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..de387741d2 --- /dev/null +++ b/board/aspeed/ast2600-evb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 16da36d1832f058cf1a6673b6a2eedeef1260576c15e76c4998e30d0fb13d339 uboot-66672e5af36fe294df56f8e7942069e3909f3790-git4.tar.gz diff --git a/board/aspeed/common/post-image.sh b/board/aspeed/common/post-image.sh index ea65a49aff..8c953e038c 100755 --- a/board/aspeed/common/post-image.sh +++ b/board/aspeed/common/post-image.sh @@ -3,8 +3,8 @@ BOARD_DIR="$(dirname $0)" mkimage=$HOST_DIR/bin/mkimage -BOARD_DT=$(sed -n \ - 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ +BOARD_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(aspeed/)?([a-z0-9\-]*).*"$|\2|p' \ ${BR2_CONFIG}) sed -e "s/%BOARD_DTB%/${BOARD_DT}.dtb/" \ diff --git a/board/beagleboard/beaglebone/patches/linux/linux.hash b/board/beagleboard/beaglebone/patches/linux/linux.hash index 4a7384d036..e70a999129 100644 --- a/board/beagleboard/beaglebone/patches/linux/linux.hash +++ b/board/beagleboard/beaglebone/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f1ae7325c6c146e0f852866a3bfd3f90ae1b5f46e414bc99a38384ed677e3721 linux-6.6.32-ti-arm32-r7.tar.gz +sha256 1db327d0743e97ec725fefe05065a6fb779abe3063845fc3b551a4a716247c0a linux-6.12.34-ti-arm32-r12.tar.gz diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone/patches/uboot/uboot.hash index 904fa56c02..98a5c53aaf 100644 --- a/board/beagleboard/beaglebone/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglebone/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/beagleboard/beaglebone/post-build.sh b/board/beagleboard/beaglebone/post-build.sh index b7afd92ffe..dc84d26eca 100755 --- a/board/beagleboard/beaglebone/post-build.sh +++ b/board/beagleboard/beaglebone/post-build.sh @@ -1,6 +1,6 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt +cp "${BOARD_DIR}/uEnv.txt" "${BINARIES_DIR}/uEnv.txt" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux/extlinux.conf" diff --git a/board/beagleboard/beagleboneai/patches/linux/linux.hash b/board/beagleboard/beagleboneai/patches/linux/linux.hash index ec1a3601b7..4ae61c9e4f 100644 --- a/board/beagleboard/beagleboneai/patches/linux/linux.hash +++ b/board/beagleboard/beagleboneai/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c52bc1ffc396c11bce335c9ee5cd55fe4213cbc1fb4026ff62bb90c864c61f62 linux-5.10.217.tar.xz +sha256 c435bd74d1c21fc5a950781a50d78bae2b93944144694843359948ad3afc72a5 linux-6.12.50.tar.xz diff --git a/board/beagleboard/beagleboneai/patches/uboot/0001-am57xx-board.c-assume-on-failure-its-a-BBONE-AI.patch b/board/beagleboard/beagleboneai/patches/uboot/0001-am57xx-board.c-assume-on-failure-its-a-BBONE-AI.patch new file mode 100644 index 0000000000..0f2975bfaa --- /dev/null +++ b/board/beagleboard/beagleboneai/patches/uboot/0001-am57xx-board.c-assume-on-failure-its-a-BBONE-AI.patch @@ -0,0 +1,31 @@ +From 0b161f8e89a411fe54059cf1d0ba61354ee1e8a2 Mon Sep 17 00:00:00 2001 +From: Robert Nelson +Date: Wed, 3 Aug 2022 11:28:10 -0500 +Subject: [PATCH] am57xx/board.c: assume on failure its a BBONE-AI + +Signed-off-by: Robert Nelson +Upstream: https://github.com/beagleboard/u-boot/commit/0b161f8e89a411fe54059cf1d0ba61354ee1e8a2 +Signed-off-by: Peter Korsgaard +--- + board/ti/am57xx/board.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c +index cfc825e52a3..f369693f382 100644 +--- a/board/ti/am57xx/board.c ++++ b/board/ti/am57xx/board.c +@@ -529,8 +529,10 @@ void do_board_detect(void) + + rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS, + CONFIG_EEPROM_CHIP_ADDRESS); +- if (rc) ++ if (rc) { + printf("ti_i2c_eeprom_init failed %d\n", rc); ++ ti_i2c_eeprom_am_set("BBONE-AI", "A"); ++ }; + + #ifdef CONFIG_SUPPORT_EMMC_BOOT + rc = board_bootmode_has_emmc(); +-- +2.39.5 + diff --git a/board/beagleboard/beagleboneai/patches/uboot/uboot.hash b/board/beagleboard/beagleboneai/patches/uboot/uboot.hash index 4b82872f31..80ea21b7cb 100644 --- a/board/beagleboard/beagleboneai/patches/uboot/uboot.hash +++ b/board/beagleboard/beagleboneai/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a u-boot-2021.04.tar.bz2 +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/beagleboard/beagleboneai/post-build.sh b/board/beagleboard/beagleboneai/post-build.sh index 384b4d8745..8d94a8f1e4 100755 --- a/board/beagleboard/beagleboneai/post-build.sh +++ b/board/beagleboard/beagleboneai/post-build.sh @@ -1,4 +1,3 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" -cp board/beagleboard/beagleboneai/uEnv.txt $BINARIES_DIR/uEnv.txt +cp board/beagleboard/beagleboneai/uEnv.txt "$BINARIES_DIR/uEnv.txt" diff --git a/board/beagleboard/beaglev_fire/README.txt b/board/beagleboard/beaglev_fire/README.txt index c9a824b67f..18b6e761ea 100644 --- a/board/beagleboard/beaglev_fire/README.txt +++ b/board/beagleboard/beaglev_fire/README.txt @@ -108,12 +108,12 @@ https://docs.beagleboard.org/latest/boards/beaglev/fire/demos-and-tutorials/gate Unzip the downloaded artifacts.zip file. Go to the custom FPGA design directory: - 'cd artifacts/bitstreams/my_custom_fpga_design' + 'cd artifacts/bitstreams/my_custom_fpga_design/LinuxProgramming/' On your Linux host development computer, copy the bitstream to BeagleV-Fire board, replacing with the path to your BeagleV-Fire root file system. - 'cp -r ./LinuxProgramming /path/to/your/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/etc/' + 'cp ./* /path/to/your/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/lib/firmware/' To apply these changes to your image, make sure to re-build it with: `make` @@ -121,14 +121,7 @@ https://docs.beagleboard.org/latest/boards/beaglev/fire/demos-and-tutorials/gate Then, re-flash your image - to ensure you have the necessary firmware files - by following the above section "Flashing the image to your eMMC". - On BeagleV-Fire, - 1. Make your update gateware script executable - 'chmod +x /usr/share/microchip/update-gateware.sh' - 2. Create a firmware directory - 'mkdir /lib/firmware' - 3. Change to the directory of your gateware script - `cd /usr/share/microchip/` - 3. initiate the reprogramming of the FPGA with your gateware bitstream: - './update-gateware.sh /etc/LinuxProgramming/' + On BeagleV-Fire initiate the reprogramming of the FPGA with your gateware bitstream: + `/usr/share/microchip/update-gateware.sh` Wait for a couple of minutes for the BeagleV-Fire to reprogram itself. diff --git a/board/beagleboard/beaglev_fire/boot.cmd b/board/beagleboard/beaglev_fire/boot.cmd index 05f4858bac..1402458d8b 100644 --- a/board/beagleboard/beaglev_fire/boot.cmd +++ b/board/beagleboard/beaglev_fire/boot.cmd @@ -12,4 +12,5 @@ bootm loados ${scriptaddr}; bootm ramdisk; bootm prep; fdt set /soc/ethernet@20110000 mac-address ${beaglevfire_mac_addr0}; +run design_overlays; bootm go; diff --git a/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh b/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh old mode 100644 new mode 100755 index f455037b60..6d92dec012 --- a/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh +++ b/board/beagleboard/beaglev_fire/rootfs-overlay/usr/share/microchip/update-gateware.sh @@ -1,32 +1,66 @@ #!/bin/sh -if [ ! -e "$1"/mpfs_bitstream.spi ]; then +if [ $# -eq 0 ]; then + echo "No gateware location provided. Checking default location." + if [ ! -e /lib/firmware/mpfs_bitstream.spi ]; then echo "No gateware file found." exit 1 + fi +else + echo "Gateware location provided: $1" + if [ ! -e "$1"/mpfs_bitstream.spi ]; then + echo "No gateware file found." + exit 1 + else + if [ ! -d /lib/firmware ]; then + mkdir /lib/firmware + fi + cp "$1"/mpfs_dtbo.spi /lib/firmware/mpfs_dtbo.spi + cp "$1"/mpfs_bitstream.spi /lib/firmware/mpfs_bitstream.spi + fi fi -if [ ! -d /lib/firmware ] -then - mkdir /lib/firmware -fi - -cp "$1"/mpfs_dtbo.spi /lib/firmware/mpfs_dtbo.spi -cp "$1"/mpfs_bitstream.spi /lib/firmware/mpfs_bitstream.spi - -mount -t debugfs none /sys/kernel/debug - # Trash existing device tree overlay in case the rest of the process fails: -flash_erase /dev/mtd0 0 1024 +flash_erase /dev/mtd0 0 16 -# # Write device tree overlay -dd if=/lib/firmware/mpfs_dtbo.spi of=/dev/mtd0 seek=1024 +# Initiate FPGA update for dtbo +echo 1 > /sys/class/firmware/mpfs-auto-update/loading + +# Write device tree overlay +cat /lib/firmware/mpfs_dtbo.spi > /sys/class/firmware/mpfs-auto-update/data + +# Signal completion for dtbo load +echo 0 > /sys/class/firmware/mpfs-auto-update/loading + +while [ "$(cat /sys/class/firmware/mpfs-auto-update/status)" != "idle" ]; do + # Do nothing, just keep checking + sleep 1 +done # Fake the presence of a golden image for now. -dd if=/dev/zero of=/dev/mtd0 count=4 bs=1 +dd if=/dev/zero of=/dev/mtd0 count=1 bs=4 -# Initiate FPGA update. -echo 1 > /sys/kernel/debug/fpga/microchip_exec_update +# Initiate FPGA update for bitstream +echo 1 > /sys/class/firmware/mpfs-auto-update/loading -# Reboot Linux for the gateware update to take effect. -# FPGA reprogramming takes places between Linux shut-down and HSS restarting the board. -reboot +# Write the firmware image to the data sysfs file +cat /lib/firmware/mpfs_bitstream.spi > /sys/class/firmware/mpfs-auto-update/data + +# Signal completion for bitstream load +echo 0 > /sys/class/firmware/mpfs-auto-update/loading + +while [ "$(cat /sys/class/firmware/mpfs-auto-update/status)" != "idle" ]; do + # Do nothing, just keep checking + sleep 1 +done + +# When the status is 'idle' and no error has occured, reboot the system for +# the gateware update to take effect. FPGA reprogramming takes places between +# Linux shut-down and HSS restarting the board. +if [ "$(cat /sys/class/firmware/mpfs-auto-update/error)" = "" ]; then + echo "FPGA update ready. Rebooting." + reboot +else + echo "FPGA update failed with status: $(cat /sys/class/firmware/mpfs-auto-update/error)" + exit 1 +fi diff --git a/board/beagleboard/beagley-ai/extlinux.conf b/board/beagleboard/beagley-ai/extlinux.conf new file mode 100644 index 0000000000..582d510b5d --- /dev/null +++ b/board/beagleboard/beagley-ai/extlinux.conf @@ -0,0 +1,5 @@ +default buildroot +label buildroot + kernel /Image + devicetreedir / +append root=/dev/mmcblk1p2 rootwait rw console=ttyS2,115200n8 diff --git a/board/beagleboard/beagley-ai/genimage.cfg b/board/beagleboard/beagley-ai/genimage.cfg new file mode 100644 index 0000000000..3965b9388e --- /dev/null +++ b/board/beagleboard/beagley-ai/genimage.cfg @@ -0,0 +1,32 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "Image", + "ti", + "extlinux", + } + + label = "boot" + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/beagleboard/beagley-ai/patches/linux-headers/linux-headers.hash b/board/beagleboard/beagley-ai/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/beagleboard/beagley-ai/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/beagleboard/beagley-ai/patches/linux/linux.hash b/board/beagleboard/beagley-ai/patches/linux/linux.hash new file mode 100644 index 0000000000..794837b285 --- /dev/null +++ b/board/beagleboard/beagley-ai/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2bb586c954277d070c8fdf6d7275faa93b4807d9bf3353b491d8149cca02b4fc linux-6.15.6.tar.xz diff --git a/board/beagleboard/beagley-ai/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/beagleboard/beagley-ai/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/beagleboard/beagley-ai/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/beagleboard/beagley-ai/patches/uboot/uboot.hash b/board/beagleboard/beagley-ai/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/beagleboard/beagley-ai/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/beagleboard/beagley-ai/post-build.sh b/board/beagleboard/beagley-ai/post-build.sh new file mode 100755 index 0000000000..8dae08a47c --- /dev/null +++ b/board/beagleboard/beagley-ai/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/board/beagleboard/beagley-ai/readme.txt b/board/beagleboard/beagley-ai/readme.txt new file mode 100644 index 0000000000..6d16e5e172 --- /dev/null +++ b/board/beagleboard/beagley-ai/readme.txt @@ -0,0 +1,38 @@ +BeagleBoard.org BeagleY-AI Development Board + +Description +=========== + +This configuration will build a basic image for the BeagleBoard.org +BeagleY-AI. For more details about the board, visit: + +https://www.beagleboard.org/boards/beagley-ai + +How to Build +============ + +Select the default configuration for the target: + +$ make beagley_ai_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +Build: + +$ make + +To copy the resulting output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the BeagleY-AI board, and power it up +through the USB Type-C connector. The system should come up. +You can use a USB to serial adapter to connect to the connector +labeled UART0 (J13) to communicate with the board. + +https://docs.beagle.cc/boards/beagley/ai/02-quick-start.html diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash index 53eb143894..b61e87cec6 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 55432b2af352f7bf3053c348d8549df2f2deeaa4a361c65d638c2f3b2ca7ec96 linux-6.12.56.tar.xz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash index fe9b4f53dc..98a5c53aaf 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst b/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst index 7c5a884d65..bf3866e414 100644 --- a/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst +++ b/board/bsh/imx6ulz-bsh-smm-m2/nand-full.lst @@ -25,6 +25,8 @@ SDPV: jump FB: ucmd setenv fastboot_buffer ${loadaddr} FB[-t 60000]: ucmd nand erase.chip +FB: download -f _image +FB: ucmd nandbcb init ${fastboot_buffer} nandboot ${filesize} FB[-t 60000]: ucmd ubi part rootfs FB[-t 60000]: ucmd ubi create root - FB: download -f _filesystem diff --git a/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash b/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash index 25e4464adb..75072f26f7 100644 --- a/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash +++ b/board/bsh/imx6ulz-bsh-smm-m2/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1 linux-6.1.68.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 55432b2af352f7bf3053c348d8549df2f2deeaa4a361c65d638c2f3b2ca7ec96 linux-6.12.56.tar.xz diff --git a/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash b/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash index c0b3bcdd04..98a5c53aaf 100644 --- a/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash +++ b/board/bsh/imx6ulz-bsh-smm-m2/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900 u-boot-2023.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst index c01d2d6c1d..f5b94c24d8 100644 --- a/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst +++ b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst @@ -10,6 +10,8 @@ SDPS: boot -f _flash.bin FB: ucmd setenv fastboot_buffer ${loadaddr} FB: download -f _image +FB[-t 10000]: ucmd nand erase.chip + # Burn image to nandfit partition if needed FB: ucmd if env exists nandfit_part; then nand erase.part nandfit; nand write ${fastboot_buffer} nandfit ${filesize}; else true; fi; FB: ucmd nandbcb init ${fastboot_buffer} nandboot ${filesize} diff --git a/board/compulab/iot-gate-imx8-ebbr/genimage.cfg b/board/compulab/iot-gate-imx8-ebbr/genimage.cfg new file mode 100644 index 0000000000..feda4c7c09 --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/genimage.cfg @@ -0,0 +1,45 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 64M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + # When in eMMC user data, this protects U-Boot environment + partition env { + partition-type-uuid = u-boot-env + offset = 17K + size = 16K + } + + # This allows to boot from recovery SD card + partition firmware { + image = "flash.bin" + # Linux reserved + partition-type-uuid = 8DA63339-0007-60C0-C436-083AC8230908 + offset = 33K + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = esp + bootable = true + } + + partition root { + partition-type-uuid = root-arm64 + image = "rootfs.ext2" + } +} diff --git a/board/compulab/iot-gate-imx8-ebbr/grub.cfg b/board/compulab/iot-gate-imx8-ebbr/grub.cfg new file mode 100644 index 0000000000..d99e19c4cd --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTLABEL=root rootwait +} diff --git a/board/compulab/iot-gate-imx8-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/compulab/iot-gate-imx8-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..49079ecd7e --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e11880bf39dabfcb5945b58e848ddba661a1cd92425a997c626dec62b2dac6a9 arm-trusted-firmware-v2.13-git4.tar.gz diff --git a/board/compulab/iot-gate-imx8-ebbr/patches/linux-headers/linux-headers.hash b/board/compulab/iot-gate-imx8-ebbr/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/compulab/iot-gate-imx8-ebbr/patches/linux/linux.hash b/board/compulab/iot-gate-imx8-ebbr/patches/linux/linux.hash new file mode 100644 index 0000000000..3f3de0911f --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 231311bd7084dc3129944d26bb43be6ff837da82fb2104a67704aebca8bfa69f linux-6.16.8.tar.xz diff --git a/board/compulab/iot-gate-imx8-ebbr/patches/optee-client/optee-client.hash b/board/compulab/iot-gate-imx8-ebbr/patches/optee-client/optee-client.hash new file mode 100644 index 0000000000..e82a2dff1d --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/patches/optee-client/optee-client.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e6c6b93e2be417df57ceb05a2eb6505744e3fbdd3b2ae5e5bf79bf6028b6f84d optee-client-4.7.0.tar.gz diff --git a/board/compulab/iot-gate-imx8-ebbr/patches/optee-os/optee-os.hash b/board/compulab/iot-gate-imx8-ebbr/patches/optee-os/optee-os.hash new file mode 100644 index 0000000000..672e2a9203 --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/patches/optee-os/optee-os.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 976b9c184678516038d4e79766608e81d10bf136f76fd0db2dc48f90f994fbd9 optee-os-4.7.0.tar.gz diff --git a/board/compulab/iot-gate-imx8-ebbr/patches/uboot/uboot.hash b/board/compulab/iot-gate-imx8-ebbr/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/compulab/iot-gate-imx8-ebbr/post-image.sh b/board/compulab/iot-gate-imx8-ebbr/post-image.sh new file mode 100755 index 0000000000..4e60504300 --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/post-image.sh @@ -0,0 +1,69 @@ +#!/bin/sh +set -eux + +BOARD_DIR=$(dirname "$0") + +# Override the default GRUB configuration file with our own. +cp -vf "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" + +BINMAN_DIR="$BINARIES_DIR/binman" +BINMAN_DTB="$BINMAN_DIR/u-boot.dtb" +UBOOT_DIR=$(find "$BUILD_DIR" -maxdepth 1 -type d -name 'uboot-*') + +# Adjust binman dtb. +rm -fr "$BINMAN_DIR" +mkdir -v "$BINMAN_DIR" +cp -v "$UBOOT_DIR/u-boot.dtb" "$BINMAN_DTB" +# Add the fip image to the list of loadables. +fdtput -t s "$BINMAN_DTB" /binman/section/fit/configurations/@config-SEQ loadables atf fip +# Remove the tee node to avoid duplicate, as it is in the FIP image. +fdtput --remove "$BINMAN_DTB" /binman/section/fit/images/tee + +# Generate flash image with binman. +# We do this here to break the build dependency loop involving tf-a, op-tee, and +# u-boot. +# We use BL2 instead of BL31 in this configuration. +(cd "${UBOOT_DIR}" && \ +./tools/binman/binman \ + --toolpath ./tools \ + -v5 \ + build \ + -u \ + -d "$BINMAN_DTB" \ + -O . \ + -m \ + --allow-missing \ + --fake-ext-blobs \ + -I "$BINMAN_DIR" \ + -I . \ + -I ./board/compulab/imx8mm-cl-iot-gate \ + -I arch/arm/dts \ + -a of-list="imx8mm-cl-iot-gate-optee" \ + -I "$BINARIES_DIR" \ + -a atf-bl31-path=bl2.bin \ + -a tee-os-path= \ + -a ti-dm-path= \ + -a opensbi-path= \ + -a default-dt="imx8mm-cl-iot-gate-optee" \ + -a scp-path= \ + -a rockchip-tpl-path= \ + -a spl-bss-pad= \ + -a tpl-bss-pad=1 \ + -a vpl-bss-pad=1 \ + -a spl-dtb=y \ + -a tpl-dtb= \ + -a vpl-dtb= \ + -a pre-load-key-path= \ + -a of-spl-remove-props="interrupt-parent interrupts" \ + ) + +# Copy the flash image. +cp -v "$UBOOT_DIR/flash.bin" "$BINARIES_DIR/" + +# Verify that it will fit in the eMMC boot partition. +size=$(du -b "$BINARIES_DIR/flash.bin" |cut -f 1) + +if [ "$size" -gt 4160512 ]; then + echo "Flash image is too big! (${size} bytes)" >&2 + exit 1 +fi diff --git a/board/compulab/iot-gate-imx8-ebbr/readme.txt b/board/compulab/iot-gate-imx8-ebbr/readme.txt new file mode 100644 index 0000000000..2b6183e13f --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/readme.txt @@ -0,0 +1,131 @@ +Introduction +============ + +The iot-gate-imx8_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady Devicetree band[2]. +It allows building an AArch64 disk image with a U-Boot based firmware +implementing the subset of UEFI defined by EBBR, as well as a Linux OS booting +with UEFI, to run on the Compulab IOT-GATE-iMX8. [3] + +This configuration is not related with the official BSP from Compulab. [4] + +Building +======== + + $ make iot-gate-imx8_ebbr_defconfig + $ make + +Generated files under output/images/: + +* disk.img: An eMMC or USB key disk image comprising TF-A, OP-TEE, the U-Boot + bootloader, the GRUB bootloader, the Linux kernel and the root filesystem. + +* flash.bin: A firmware image suitable for flashing in eMMC boot partition + comprising TF-A, OP-TEE and the U-Boot bootloader. + +Running +======= + +Before flashing the firmware to eMMC, make sure that you have the IOTG-ACC-M2SD +M.2 to SD adapter for recovery and prepare a recovery SD card. [5] +Insert the SD card and the M.2 adapter. + +Prepare a USB key on a PC: + + # dd if=output/images/disk.img of= ; sync + +Insert the USB key, close jumper E1 on the board to select recovery boot, +connect to the UART console on the micro USB connector (a Silicon Labs CP2104 +UART bridge) with baudrate 115200, power on the board and break to U-Boot +prompt. + +Flash the firmware from the USB key to the eMMC boot partition: + + u-boot=> usb start + u-boot=> usb dev 0 + u-boot=> usb read ${loadaddr} 0x42 0x1fbe + u-boot=> mmc dev 2 1 + u-boot=> mmc write ${loadaddr} 0x42 0x1fbe + u-boot=> mmc partconf 2 0 1 0 + +Power off the board, remove jumper E1 and the M.2 SD card adapter, then restart +the board; it should boot to Linux, with the root filesystem on the USB key. + +Other setups are also possible, with the firmware and/or the root filesystem in +the eMMC user data. The firmware binary is also available as flash.bin for +convenience, to allow network download for example. + +With the firmware in the eMMC boot partition, it is possible to install or run +another OS supporting the EBBR specification. + +The image generated by the aarch64_efi_defconfig, the images from Linux +distributions such as Debian, Fedora, openSUSE, Ubuntu, OpenWrt and Yocto, and +the Arm ACS Devicetree images[6] are examples of compatible OS images. + +When installing other OSes to eMMC, it is recommended to protect the first 32KB +of the user data with a partition, as this is where the U-Boot environment can +be saved. + +Firmware details +================ + +Noteworthy firmware features: + +- TF-A, OP-TEE & U-Boot +- UEFI, with EFI variables stored on disk in the ESP +- Support for ethernet, USB and RTC +- U-Boot environment in eMMC user data (starting from byte 0x4400) + +Architecture diagram: + + Non-Secure : Secure + : + +---------------------------+ : + EL0 | Busybox | : + +---------------------------+ : +--------+ + EL1 | Linux | : | OP-TEE | S-EL1 + +---------------------------+ : +--------+ + EL2 | U-Boot, GRUB, Linux (kvm) | : + +---------------------------+ : + ...................................: + +----------------------------------------+ + | ROM, U-Boot SPL, TF-A | EL3 + +----------------------------------------+ + +Boot flow: + + ROM -+-> SPL -> TF-A -+-> OP-TEE + `-> U-Boot -> GRUB -> Linux -> Busybox + +The ROM loads U-Boot SPL. +U-Boot SPL does the DRAM setup, loads the fit image with TF-A, OP-TEE, U-Boot +and the Devicetree. +In this configuration TF-A is booting with BL2 and BL31. +OP-TEE amends the Devicetree, calls back TF-A to go to normal world. +U-Boot loads GRUB with UEFI, boots Linux at EL2. + +Miscellaneous +============= + +This configuration is based on the work of Paul Liu[7] and is inspired by the +other configurations related with EBBR, and the Arm SystemReady Devicetree Band +Integration and Testing Guide[8]. + +To avoid a circular build dependency, we skip the binman step during U-Boot +build: + + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="cmd_binman=:" + +Then we run binman manually in the post-image script. + +Firmware update and UEFI Secure Boot are currently not supported. +The disk image cannot be used for SD card recovery at this point. + +[1] https://github.com/ARM-software/ebbr +[2] https://www.arm.com/architecture/system-architectures/systemready-compliance-program/systemready-devicetree-band +[3] https://www.compulab.com/products/iot-gateways/iot-gate-imx8-industrial-arm-iot-gateway/ +[4] https://mediawiki.compulab.com/w/index.php?title=Building_IOT-GATE-iMX8_and_SBC-IOT-iMX8_Yocto_Linux_images +[5] https://mediawiki.compulab.com/w/index.php?title=IOT-GATE-iMX8_and_SBC-IOT-iMX8:_U-Boot:_Recovery +[6] https://github.com/ARM-software/arm-systemready/tree/main/SystemReady-devicetree-band/prebuilt_images +[7] https://git.linaro.org/plugins/gitiles/people/paul.liu/systemready/build-scripts +[8] https://developer.arm.com/documentation/DUI1101/latest/ diff --git a/board/compulab/iot-gate-imx8-ebbr/u-boot.fragment b/board/compulab/iot-gate-imx8-ebbr/u-boot.fragment new file mode 100644 index 0000000000..d72664dc5c --- /dev/null +++ b/board/compulab/iot-gate-imx8-ebbr/u-boot.fragment @@ -0,0 +1,6 @@ +CONFIG_ARCH_MISC_INIT=y +CONFIG_CMD_RNG=y +CONFIG_DM_REGULATOR_ANATOP=y +CONFIG_DM_RNG=y +CONFIG_FSL_CAAM=y +CONFIG_PHY_ANEG_TIMEOUT=5000 diff --git a/board/coolpi/coolpi-4b/extlinux.conf b/board/coolpi/coolpi-4b/extlinux.conf new file mode 100644 index 0000000000..466ab1eed6 --- /dev/null +++ b/board/coolpi/coolpi-4b/extlinux.conf @@ -0,0 +1,4 @@ +label coolpi-4b-buildroot + kernel /Image.gz + devicetree /rk3588s-coolpi-4b.dtb + append root=/dev/mmcblk1p2 rw rootfstype=ext4 earlycon earlyprintk console=ttyS2,1500000n8 rootwait diff --git a/board/coolpi/coolpi-4b/genimage.cfg b/board/coolpi/coolpi-4b/genimage.cfg new file mode 100644 index 0000000000..826d899c95 --- /dev/null +++ b/board/coolpi/coolpi-4b/genimage.cfg @@ -0,0 +1,35 @@ +# SD card image for Cool PI 4b + +image boot.vfat { + vfat { + files = { + "Image.gz", + "rk3588s-coolpi-4b.dtb", + "extlinux" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + partition-table-type = "hybrid" + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-rockchip.bin" + offset = 32K + } + + partition boot { + partition-type = "0xC" + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/coolpi/coolpi-4b/patches/linux-headers/linux-headers.hash b/board/coolpi/coolpi-4b/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/coolpi/coolpi-4b/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/coolpi/coolpi-4b/patches/linux/linux.hash b/board/coolpi/coolpi-4b/patches/linux/linux.hash new file mode 100644 index 0000000000..ae11c54bfd --- /dev/null +++ b/board/coolpi/coolpi-4b/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 de8b97cfeae74c22f832ee4ca2333c157cc978d98baa122f0ee9c01796a2fe43 linux-6.14.10.tar.xz diff --git a/board/coolpi/coolpi-4b/patches/uboot/uboot.hash b/board/coolpi/coolpi-4b/patches/uboot/uboot.hash new file mode 100644 index 0000000000..80ea21b7cb --- /dev/null +++ b/board/coolpi/coolpi-4b/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/coolpi/coolpi-4b/post-image.sh b/board/coolpi/coolpi-4b/post-image.sh new file mode 100755 index 0000000000..65b79e81c8 --- /dev/null +++ b/board/coolpi/coolpi-4b/post-image.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -e + +BOARD_DIR="$(dirname "$0")" +gzip -fk "${BINARIES_DIR}/Image" +install -m 0644 -D "$BOARD_DIR/extlinux.conf" "$BINARIES_DIR/extlinux/extlinux.conf" +support/scripts/genimage.sh -c board/coolpi/coolpi-4b/genimage.cfg diff --git a/board/coolpi/coolpi-4b/readme.txt b/board/coolpi/coolpi-4b/readme.txt new file mode 100644 index 0000000000..7213ab3bae --- /dev/null +++ b/board/coolpi/coolpi-4b/readme.txt @@ -0,0 +1,57 @@ +Cool Pi 4B +============== +https://www.cool-pi.com/product/cp4b/ + +Build: +====== + $ make coolpi_4b_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +output/images/ +├── boot.vfat +├── extlinux +│   └── extlinux.conf +├── Image +├── Image.gz +├── rk3588_bl31_v1.40.elf +├── rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +├── rk3588s-coolpi-4b.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot-rockchip.bin + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Serial console: +--------------- +The Cool Pi 4B has a 40-pin GPIO header. + +The Uart pins are as follows: + +pin 6: gnd +pin 8: tx +pin 10: rx + +Baudrate for this board is 1500000. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. diff --git a/board/cubietech/cubieboard1/patches/linux/linux.hash b/board/cubietech/cubieboard1/patches/linux/linux.hash index 42d02c9f78..9ef8b4af9c 100644 --- a/board/cubietech/cubieboard1/patches/linux/linux.hash +++ b/board/cubietech/cubieboard1/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce linux-6.11.6.tar.xz +sha256 b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 linux-6.12.52.tar.xz diff --git a/board/cubietech/cubieboard1/patches/uboot/uboot.hash b/board/cubietech/cubieboard1/patches/uboot/uboot.hash index 904fa56c02..98a5c53aaf 100644 --- a/board/cubietech/cubieboard1/patches/uboot/uboot.hash +++ b/board/cubietech/cubieboard1/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf index 2fde683f38..5b071dce84 100644 --- a/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf +++ b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf @@ -1,5 +1,4 @@ -DEFAULT linux -LABEL linux - KERNEL /boot/zImage - DEVICETREE /boot/sun4i-a10-cubieboard.dtb - APPEND console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait +label cubieboard-buildroot + kernel /boot/zImage + devicetree /boot/sun4i-a10-cubieboard.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/cubietech/cubieboard2/genimage.cfg b/board/cubietech/cubieboard2/genimage.cfg index 0ba74d6be3..92c8677545 100644 --- a/board/cubietech/cubieboard2/genimage.cfg +++ b/board/cubietech/cubieboard2/genimage.cfg @@ -1,18 +1,3 @@ -# Minimal SD card image for the Cubieboard2 -# Based in the Orange Pi genimage.cfg - -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-cubieboard2.dtb", - "boot.scr" - } - } - - size = 10M -} - image sdcard.img { hdimage { } @@ -24,15 +9,8 @@ image sdcard.img { size = 1016K # 1MB - 8KB } - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 512M } } diff --git a/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash b/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/cubietech/cubieboard2/patches/linux/linux.hash b/board/cubietech/cubieboard2/patches/linux/linux.hash new file mode 100644 index 0000000000..9ef8b4af9c --- /dev/null +++ b/board/cubietech/cubieboard2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 linux-6.12.52.tar.xz diff --git a/board/cubietech/cubieboard2/patches/uboot/uboot.hash b/board/cubietech/cubieboard2/patches/uboot/uboot.hash new file mode 100644 index 0000000000..98a5c53aaf --- /dev/null +++ b/board/cubietech/cubieboard2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf b/board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..14c873e167 --- /dev/null +++ b/board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label cubieboard-buildroot + kernel /boot/zImage + devicetree /boot/sun7i-a20-cubieboard2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/engicam/px30core/extlinux.conf b/board/engicam/px30core/extlinux.conf new file mode 100644 index 0000000000..6d5a845cb0 --- /dev/null +++ b/board/engicam/px30core/extlinux.conf @@ -0,0 +1,4 @@ +label Engicam-EDIMM linux + kernel /boot/Image + devicetree /boot/px30-engicam-px30-core-ctouch2-of10.dtb + append earlycon=uart8250,mmio32,0xff160000 root=/dev/mmcblk1p1 rootwait diff --git a/board/engicam/px30core/genimage.cfg b/board/engicam/px30core/genimage.cfg new file mode 100644 index 0000000000..966c869273 --- /dev/null +++ b/board/engicam/px30core/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + size = 30M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/engicam/px30core/patches/linux-headers/linux-headers.hash b/board/engicam/px30core/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/engicam/px30core/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/engicam/px30core/patches/linux/linux.hash b/board/engicam/px30core/patches/linux/linux.hash new file mode 100644 index 0000000000..b8704508bc --- /dev/null +++ b/board/engicam/px30core/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 ab48800ab49985a78d2318ae8ac5f28fd3e123ea17357ef21498105a53337336 linux-6.12.22.tar.xz diff --git a/board/engicam/px30core/patches/uboot/uboot.hash b/board/engicam/px30core/patches/uboot/uboot.hash new file mode 100644 index 0000000000..80ea21b7cb --- /dev/null +++ b/board/engicam/px30core/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/engicam/px30core/post-build.sh b/board/engicam/px30core/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/engicam/px30core/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/engicam/px30core/readme.txt b/board/engicam/px30core/readme.txt new file mode 100644 index 0000000000..0693792d56 --- /dev/null +++ b/board/engicam/px30core/readme.txt @@ -0,0 +1,60 @@ +ENGICAM PX30-EDIMM2.2 carrier board +=================================== + +Build: + + $ make engicam_px30_core_defconfig + $ make + +Files created in output directory +--------------------------------- + +output/images + +├── bl31.elf +├── idbloader.img +├── Image +├── px30-engicam-px30-core-ctouch2-of10.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +How to connect the board and get started: +----------------------------------------- +Ensure that the power supply is stable and provides enough current to handle +the board's needs, especially when peripherals are connected. + +Insert micro SD card on the board micro SD slot J17 + +Creating bootable SD card: +-------------------------- +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +/dev/sdX is the path in host via which SD card is detected +Where X is your SD card device + +Connect UART port on the board J26 + +Serial console +-------------- +Launch minicom at host with 1152008N1 + +Power on the kit using J4 + +Refer link on checking board booting + +Program eMMC +------------ +Connect USB otg cable A-type to host pc, Micro USB end to board. + +Close Jumper JM5. + +Boot the Kit with SD boot. + +Program eMMC in U-Boot. (Refer link for the steps) + +Wiki link: +https://wiki.amarulasolutions.com/bsp/rockchip/px30/engicam-px30-edimm2.2.html diff --git a/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash b/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/firefly/roc-rk3399-pc/patches/linux/linux.hash b/board/firefly/roc-rk3399-pc/patches/linux/linux.hash new file mode 100644 index 0000000000..98edd13a58 --- /dev/null +++ b/board/firefly/roc-rk3399-pc/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz diff --git a/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash b/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash new file mode 100644 index 0000000000..fe9b4f53dc --- /dev/null +++ b/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh index 8ab5a241b0..a267114d43 100755 --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -18,19 +18,19 @@ main () if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ - -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ - -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ - -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ + -ap "${BINARIES_DIR}/bl31.bin" a55 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a55 0x80200000 \ + -ap "${BINARIES_DIR}/tee-raw.bin" a55 0x96000000 \ -out "${BINARIES_DIR}/u-boot-atf-container.img" else "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ - -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ - -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -ap "${BINARIES_DIR}/bl31.bin" a55 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a55 0x80200000 \ -out "${BINARIES_DIR}/u-boot-atf-container.img" fi "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -append "${BINARIES_DIR}/ahab-container.img" -c \ - -ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a35 ${SPL_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a55 ${SPL_LOAD_ADDR} \ -out "${BINARIES_DIR}/imx9-boot-sd.bin" flashbin_size="$(wc -c "${BINARIES_DIR}/imx9-boot-sd.bin" | awk '{print $1}')" diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index a440bfb75c..8d9bce5328 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + # # dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME # in ${BR_CONFIG}, then prints the corresponding list of file names for the diff --git a/board/freescale/common/mxs/post-image.sh b/board/freescale/common/mxs/post-image.sh index 0bfb835c6e..97c8ee9079 100755 --- a/board/freescale/common/mxs/post-image.sh +++ b/board/freescale/common/mxs/post-image.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + # # dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME # in ${BR_CONFIG}, then prints the corresponding list of file names for the @@ -7,10 +9,12 @@ # dtb_list() { - local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" + local DTB_LIST + + DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' "${BR2_CONFIG}")" for dt in $DTB_LIST; do - echo -n "\"$dt.dtb\", " + echo -n "\"$(basename "${dt}").dtb\", " done } diff --git a/board/freescale/imx28evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx28evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx28evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx28evk/patches/linux/linux.hash b/board/freescale/imx28evk/patches/linux/linux.hash new file mode 100644 index 0000000000..8aeb3785b4 --- /dev/null +++ b/board/freescale/imx28evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 af54b449f4fb93b8e8daa346144a7309e8e95174bd962c4b5917cf56120456d9 linux-6.6.26.tar.xz diff --git a/board/freescale/imx28evk/patches/uboot/uboot.hash b/board/freescale/imx28evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..97a2b4eaf9 --- /dev/null +++ b/board/freescale/imx28evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/freescale/imx28evk/readme.txt b/board/freescale/imx28evk/readme.txt index 3b77634fe1..5520ff1f05 100644 --- a/board/freescale/imx28evk/readme.txt +++ b/board/freescale/imx28evk/readme.txt @@ -12,7 +12,7 @@ Build First, configure Buildroot for your i.MX28 EVK board: - make freescale_imx28evk_defconfig + make imx28evk_defconfig Build all components: diff --git a/board/freescale/imx6sabre/patches/linux/linux.hash b/board/freescale/imx6sabre/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx6sabre/patches/linux/linux.hash +++ b/board/freescale/imx6sabre/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx6sabre/patches/uboot/uboot.hash b/board/freescale/imx6sabre/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx6sabre/patches/uboot/uboot.hash +++ b/board/freescale/imx6sabre/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx6ullevk/patches/linux/linux.hash b/board/freescale/imx6ullevk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx6ullevk/patches/linux/linux.hash +++ b/board/freescale/imx6ullevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx6ullevk/patches/uboot/uboot.hash b/board/freescale/imx6ullevk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx6ullevk/patches/uboot/uboot.hash +++ b/board/freescale/imx6ullevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx7dsdb/patches/linux/linux.hash b/board/freescale/imx7dsdb/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx7dsdb/patches/linux/linux.hash +++ b/board/freescale/imx7dsdb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx7dsdb/patches/uboot/uboot.hash b/board/freescale/imx7dsdb/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx7dsdb/patches/uboot/uboot.hash +++ b/board/freescale/imx7dsdb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8dxlevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/linux/linux.hash b/board/freescale/imx8dxlevk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8dxlevk/patches/linux/linux.hash +++ b/board/freescale/imx8dxlevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8dxlevk/patches/uboot/uboot.hash b/board/freescale/imx8dxlevk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8dxlevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8dxlevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mm-evk/extlinux.conf.in b/board/freescale/imx8mm-evk/extlinux.conf.in new file mode 100644 index 0000000000..f647394cf3 --- /dev/null +++ b/board/freescale/imx8mm-evk/extlinux.conf.in @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mm-evk.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/freescale/imx8mm-evk/genimage.cfg.in b/board/freescale/imx8mm-evk/genimage.cfg.in new file mode 100644 index 0000000000..bc100b171d --- /dev/null +++ b/board/freescale/imx8mm-evk/genimage.cfg.in @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 33K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/freescale/imx8mm-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mm-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/freescale/imx8mm-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/freescale/imx8mm-evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mm-evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx8mm-evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mm-evk/patches/linux/linux.hash b/board/freescale/imx8mm-evk/patches/linux/linux.hash new file mode 100644 index 0000000000..5e0df51126 --- /dev/null +++ b/board/freescale/imx8mm-evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5f81362a694f51520bff9faecb73f1cc9bc7bece6fdd10d5c27e348df39d7dc4 linux-6.12.16.tar.xz diff --git a/board/freescale/imx8mm-evk/patches/uboot/uboot.hash b/board/freescale/imx8mm-evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/freescale/imx8mm-evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/freescale/imx8mm-evk/post-build.sh b/board/freescale/imx8mm-evk/post-build.sh new file mode 100755 index 0000000000..604f387768 --- /dev/null +++ b/board/freescale/imx8mm-evk/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" +PARTUUID="$("$HOST_DIR"/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf.in" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg.in" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/freescale/imx8mm-evk/readme.txt b/board/freescale/imx8mm-evk/readme.txt new file mode 100644 index 0000000000..452a066c70 --- /dev/null +++ b/board/freescale/imx8mm-evk/readme.txt @@ -0,0 +1,31 @@ +NXP i.MX8MM EVK +=============== + +This is a Buildroot target for building an image for the imx8mm-evk +board using upstream components: TF-A, U-Boot and kernel. + +How to build it +=============== + +Configure Buildroot and build it: + + $ make imx8mm-evk_defconfig + $ make + +Flashing the SD card image +========================== + +Copy the sdcard.img file into the SD card: + + $ sudo dd if=output/images/sdcard.img of=; sync + + +Booting the board +================= + +To boot your newly created system: + +- Insert the SD card in the MicroSD slot of the board. +- Connect a serial to USB cable to the DEBUG port. +- Open a terminal on the ttyUSB1 port. For example: sudo picocom -b 115200 /dev/ttyUSB1 +- Power on the board. diff --git a/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mmevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mmevk/patches/linux/linux.hash b/board/freescale/imx8mmevk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8mmevk/patches/linux/linux.hash +++ b/board/freescale/imx8mmevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mmevk/patches/uboot/uboot.hash b/board/freescale/imx8mmevk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8mmevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mmevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mn-evk/extlinux.conf.in b/board/freescale/imx8mn-evk/extlinux.conf.in new file mode 100644 index 0000000000..fa9ad09813 --- /dev/null +++ b/board/freescale/imx8mn-evk/extlinux.conf.in @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-ddr4-evk.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/freescale/imx8mn-evk/genimage.cfg.in b/board/freescale/imx8mn-evk/genimage.cfg.in new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/board/freescale/imx8mn-evk/genimage.cfg.in @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/freescale/imx8mn-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mn-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/freescale/imx8mn-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/freescale/imx8mn-evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mn-evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx8mn-evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mn-evk/patches/linux/linux.hash b/board/freescale/imx8mn-evk/patches/linux/linux.hash new file mode 100644 index 0000000000..5e0df51126 --- /dev/null +++ b/board/freescale/imx8mn-evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5f81362a694f51520bff9faecb73f1cc9bc7bece6fdd10d5c27e348df39d7dc4 linux-6.12.16.tar.xz diff --git a/board/freescale/imx8mn-evk/patches/uboot/uboot.hash b/board/freescale/imx8mn-evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/freescale/imx8mn-evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/freescale/imx8mn-evk/post-build.sh b/board/freescale/imx8mn-evk/post-build.sh new file mode 100755 index 0000000000..604f387768 --- /dev/null +++ b/board/freescale/imx8mn-evk/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" +PARTUUID="$("$HOST_DIR"/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf.in" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg.in" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/freescale/imx8mn-evk/readme.txt b/board/freescale/imx8mn-evk/readme.txt new file mode 100644 index 0000000000..c5b4c05c48 --- /dev/null +++ b/board/freescale/imx8mn-evk/readme.txt @@ -0,0 +1,31 @@ +NXP i.MX8MN DDR4 EVK +==================== + +This is a Buildroot target for building an image for the imx8mn-ddr4-evk +board using upstream components: TF-A, U-Boot and kernel. + +How to build it +=============== + +Configure Buildroot and build it: + + $ make imx8mn-ddr4-evk_defconfig + $ make + +Flashing the SD card image +========================== + +Copy the sdcard.img file into the SD card: + + $ sudo dd if=output/images/sdcard.img of=; sync + + +Booting the board +================= + +To boot your newly created system: + +- Insert the SD card in the MicroSD slot of the board. +- Connect a serial to USB cable to the DEBUG port. +- Open a terminal on ttyUSB2 port. For example: sudo picocom -b 115200 /dev/ttyUSB1 +- Power on the board. diff --git a/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mnevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mnevk/patches/linux/linux.hash b/board/freescale/imx8mnevk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8mnevk/patches/linux/linux.hash +++ b/board/freescale/imx8mnevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mnevk/patches/uboot/uboot.hash b/board/freescale/imx8mnevk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8mnevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mnevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mp-evk/extlinux.conf.in b/board/freescale/imx8mp-evk/extlinux.conf.in new file mode 100644 index 0000000000..5348a01c07 --- /dev/null +++ b/board/freescale/imx8mp-evk/extlinux.conf.in @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mp-evk.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/freescale/imx8mp-evk/genimage.cfg.in b/board/freescale/imx8mp-evk/genimage.cfg.in new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/board/freescale/imx8mp-evk/genimage.cfg.in @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/freescale/imx8mp-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mp-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/freescale/imx8mp-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/freescale/imx8mp-evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mp-evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx8mp-evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mp-evk/patches/linux/linux.hash b/board/freescale/imx8mp-evk/patches/linux/linux.hash new file mode 100644 index 0000000000..5e0df51126 --- /dev/null +++ b/board/freescale/imx8mp-evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5f81362a694f51520bff9faecb73f1cc9bc7bece6fdd10d5c27e348df39d7dc4 linux-6.12.16.tar.xz diff --git a/board/freescale/imx8mp-evk/patches/uboot/uboot.hash b/board/freescale/imx8mp-evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/freescale/imx8mp-evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/freescale/imx8mp-evk/post-build.sh b/board/freescale/imx8mp-evk/post-build.sh new file mode 100755 index 0000000000..604f387768 --- /dev/null +++ b/board/freescale/imx8mp-evk/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" +PARTUUID="$("$HOST_DIR"/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf.in" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg.in" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/freescale/imx8mp-evk/readme.txt b/board/freescale/imx8mp-evk/readme.txt new file mode 100644 index 0000000000..ef52b403b6 --- /dev/null +++ b/board/freescale/imx8mp-evk/readme.txt @@ -0,0 +1,31 @@ +NXP i.MX8MP EVK +=============== + +This is a Buildroot target for building an image for the imx8mp-evk +board using upstream components: TF-A, U-Boot and kernel. + +How to build it +=============== + +Configure Buildroot and build it: + + $ make imx8mp-evk_defconfig + $ make + +Flashing the SD card image +========================== + +Copy the sdcard.img file into the SD card: + + $ sudo dd if=output/images/sdcard.img of=; sync + + +Booting the board +================= + +To boot your newly created system: + +- Insert the SD card in the MicroSD slot of the board. +- Connect a serial to USB cable to the DEBUG port. +- Open a terminal on ttyUSB2 port. For example: sudo picocom -b 115200 /dev/ttyUSB2 +- Power on the board. diff --git a/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mpevk/patches/linux/linux.hash b/board/freescale/imx8mpevk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8mpevk/patches/linux/linux.hash +++ b/board/freescale/imx8mpevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mpevk/patches/uboot/uboot.hash b/board/freescale/imx8mpevk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8mpevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mpevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8mqevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/linux/linux.hash b/board/freescale/imx8mqevk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8mqevk/patches/linux/linux.hash +++ b/board/freescale/imx8mqevk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8mqevk/patches/uboot/uboot.hash b/board/freescale/imx8mqevk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8mqevk/patches/uboot/uboot.hash +++ b/board/freescale/imx8mqevk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8qmmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/linux/linux.hash b/board/freescale/imx8qmmek/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8qmmek/patches/linux/linux.hash +++ b/board/freescale/imx8qmmek/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8qmmek/patches/uboot/uboot.hash b/board/freescale/imx8qmmek/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8qmmek/patches/uboot/uboot.hash +++ b/board/freescale/imx8qmmek/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/linux/linux.hash b/board/freescale/imx8qxpmek/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx8qxpmek/patches/linux/linux.hash +++ b/board/freescale/imx8qxpmek/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/uboot/uboot.hash b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx8qxpmek/patches/uboot/uboot.hash +++ b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx91evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx91evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..da0200d9ac --- /dev/null +++ b/board/freescale/imx91evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx91evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx91evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx91evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx91evk/patches/linux/linux.hash b/board/freescale/imx91evk/patches/linux/linux.hash new file mode 100644 index 0000000000..b4f534dcc8 --- /dev/null +++ b/board/freescale/imx91evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx91evk/patches/uboot/uboot.hash b/board/freescale/imx91evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..309a684c2d --- /dev/null +++ b/board/freescale/imx91evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx91evk/readme.txt b/board/freescale/imx91evk/readme.txt new file mode 100644 index 0000000000..42c9f41fa2 --- /dev/null +++ b/board/freescale/imx91evk/readme.txt @@ -0,0 +1,83 @@ +********************* +NXP i.MX91 EVK board +********************* + +This file documents the Buildroot support for the i.MX 91 EVK board. +See [1]. + + +Build +===== + +First, configure Buildroot for the i.MX 91 EVK board: + + make freescale_imx91evk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - ddr_fw.bin + - Image + - imx91-11x11-evk.dtb + - imx9-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf-container.img + - u-boot.bin + - u-boot-hash.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + - u-boot-spl-padded.bin + + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + + +Boot the i.MX 91 EVK board +=============================== + +To boot your newly created system (refer to the i.MX 91 EVK +Documentation [2] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1301: 0100 SW1301[1-4] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), +the Cortex-A55 UART is the 3rd one (in the previous example, /dev/ttyUSB2). +Refer to the documentation [2] for more details. + +Enjoy! + + +References +========== +[1] https://www.nxp.com/imx93evk +[2] https://www.nxp.com/document/guide/getting-started-with-the-i-mx-91-evk:GS-i.MX91EVK diff --git a/board/freescale/imx91frdm/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx91frdm/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..7561385cb8 --- /dev/null +++ b/board/freescale/imx91frdm/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8cfe0afc903ebbc03f27e4874aa9ce82be78843a8b42ed4c906871e7f311b510 imx-atf-lf-6.6.36-2.1.0.tar.gz diff --git a/board/freescale/imx91frdm/patches/linux-headers/linux-headers.hash b/board/freescale/imx91frdm/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx91frdm/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx91frdm/patches/linux/linux.hash b/board/freescale/imx91frdm/patches/linux/linux.hash new file mode 100644 index 0000000000..f03ffd5b55 --- /dev/null +++ b/board/freescale/imx91frdm/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3f5017e85ba6c490be597670033a7eaba14e3c34af4e53d24dc3762c3deece83 linux-imx-lf-6.6.36-2.1.0-imx91frdm.tar.gz diff --git a/board/freescale/imx91frdm/patches/uboot/uboot.hash b/board/freescale/imx91frdm/patches/uboot/uboot.hash new file mode 100644 index 0000000000..f285dff490 --- /dev/null +++ b/board/freescale/imx91frdm/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f7d9a6e99825926d0bc597e0fdfeafffcc76ad6267f1d4e9aae1fe9a8d400c22 uboot-imx-lf-6.6.36-2.1.0-imx91frdm.tar.gz diff --git a/board/freescale/imx91frdm/readme.txt b/board/freescale/imx91frdm/readme.txt new file mode 100644 index 0000000000..ec839b1dca --- /dev/null +++ b/board/freescale/imx91frdm/readme.txt @@ -0,0 +1,74 @@ +********************** +NXP i.MX 91 FRDM board +********************** + +This file documents the Buildroot support for the i.MX 91 FRDM +(Freedom) board. For more information on this board, see [1]. + + +Build +===== + +First, configure Buildroot for the i.MX 91 FRDM board: + + make freescale_imx91frdm_defconfig + +Build all components: + + make + +When this command completes, the generated image containing everything +to boot from the SD card is located in "output/images/sdcard.img". + + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + + +Boot the i.MX 91 FRDM board +=========================== + +To boot your newly created system (refer to the i.MX 91 FRDM +Documentation [2] for guidance): +- insert the SD card in the SD slot (P13) of the board; +- Configure the SW1 boot switches as follows: + SW1: 1100 SW1[1-4] ("USDHC2 4-bit SD3.0" Boot Mode) +- connect a USB Type-C cable into the P16 Debug USB Port and connect + using a terminal emulator at 115200 bps, 8n1; +- power on the board by connecting a USB Type-C cable into the P1 + Power USB Port. + +Note 1: the board boot switches default configuration is: +SW1: 0100 SW1[1-4] ("USDHC1 8-bit eMMC 5.1" Boot Mode) +and the board is also pre-flashed with a reference Linux demo +image. It is important to change the boot config switches to make +sure the system will boot on the SD Card. + +Note 2: the debug USB connector presents 2 UARTs (for example +/dev/ttyACM[0-1]), the Cortex-A55 UART should be the 1st one (in the +previous example, /dev/ttyACM0). Refer to the documentation [2] for +more details. + +Enjoy! + + +References +========== +[1] https://www.nxp.com/FRDM-IMX91 +[2] https://www.nxp.com/document/guide/getting-started-with-frdm-imx91:GS-FRDM-IMX91 diff --git a/board/freescale/imx93-evk/extlinux.conf.in b/board/freescale/imx93-evk/extlinux.conf.in new file mode 100644 index 0000000000..143e28a823 --- /dev/null +++ b/board/freescale/imx93-evk/extlinux.conf.in @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx93-11x11-evk.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/freescale/imx93-evk/genimage.cfg.in b/board/freescale/imx93-evk/genimage.cfg.in new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/board/freescale/imx93-evk/genimage.cfg.in @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/freescale/imx93-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx93-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/freescale/imx93-evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/freescale/imx93-evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx93-evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx93-evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx93-evk/patches/linux/linux.hash b/board/freescale/imx93-evk/patches/linux/linux.hash new file mode 100644 index 0000000000..5e0df51126 --- /dev/null +++ b/board/freescale/imx93-evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5f81362a694f51520bff9faecb73f1cc9bc7bece6fdd10d5c27e348df39d7dc4 linux-6.12.16.tar.xz diff --git a/board/freescale/imx93-evk/patches/uboot/uboot.hash b/board/freescale/imx93-evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/freescale/imx93-evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/freescale/imx93-evk/post-build.sh b/board/freescale/imx93-evk/post-build.sh new file mode 100755 index 0000000000..604f387768 --- /dev/null +++ b/board/freescale/imx93-evk/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" +PARTUUID="$("$HOST_DIR"/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf.in" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg.in" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/freescale/imx93-evk/readme.txt b/board/freescale/imx93-evk/readme.txt new file mode 100644 index 0000000000..9d3302a0ca --- /dev/null +++ b/board/freescale/imx93-evk/readme.txt @@ -0,0 +1,31 @@ +NXP i.MX93 EVK +============== + +This is a Buildroot target for building an image for the imx93-evk +board using upstream components: TF-A, U-Boot and kernel. + +How to build it +=============== + +Configure Buildroot and build it: + + $ make imx93-evk_defconfig + $ make + +Flashing the SD card image +========================== + +Copy the sdcard.img file into the SD card: + + $ sudo dd if=output/images/sdcard.img of=; sync + + +Booting the board +================= + +To boot your newly created system: + +- Insert the SD card in the MicroSD slot of the board. +- Connect a serial to USB cable to the DBG port. +- Open a terminal on the ttyUSB2 port. For example: sudo picocom -b 115200 /dev/ttyUSB2 +- Power on the board. diff --git a/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 0266b45d6a..da0200d9ac 100644 --- a/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz +sha256 a696ee1c75140cd5ddb9d4349c921952f80e2a8a21bc6bd92f905959a6b1798f imx-atf-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 3c4223976b..b4f534dcc8 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz +sha256 4c1147a9bbe4bf36fbcbd8b1e6b0d73ec0da3c454821c58a61d32d3879afc146 linux-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx93evk/patches/optee-os/optee-os.hash b/board/freescale/imx93evk/patches/optee-os/optee-os.hash new file mode 100644 index 0000000000..6ab7c41aa1 --- /dev/null +++ b/board/freescale/imx93evk/patches/optee-os/optee-os.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4b685080a094cb0f0489b8114ae8b73c37ec13eda9f5618c8b6311ff1f472f57 imx-optee-os-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx93evk/patches/uboot/uboot.hash b/board/freescale/imx93evk/patches/uboot/uboot.hash index 4e0d729ca0..309a684c2d 100644 --- a/board/freescale/imx93evk/patches/uboot/uboot.hash +++ b/board/freescale/imx93evk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz +sha256 18a32d6c79538e4f90746674873b196f9c48be24caef0ab5c1bec920a1816825 uboot-imx-lf-6.12.3-1.0.0.tar.gz diff --git a/board/freescale/imx93frdm/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx93frdm/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..7561385cb8 --- /dev/null +++ b/board/freescale/imx93frdm/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8cfe0afc903ebbc03f27e4874aa9ce82be78843a8b42ed4c906871e7f311b510 imx-atf-lf-6.6.36-2.1.0.tar.gz diff --git a/board/freescale/imx93frdm/patches/linux-headers/linux-headers.hash b/board/freescale/imx93frdm/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx93frdm/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx93frdm/patches/linux/linux.hash b/board/freescale/imx93frdm/patches/linux/linux.hash new file mode 100644 index 0000000000..0da8c03384 --- /dev/null +++ b/board/freescale/imx93frdm/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3244dc3c62c990d9de90e1c7193aa3099e0e74e720de5c9c13edfbfdd802f596 linux-imx-lf-6.6.36-2.1.0-imx93frdm.tar.gz diff --git a/board/freescale/imx93frdm/patches/uboot/uboot.hash b/board/freescale/imx93frdm/patches/uboot/uboot.hash new file mode 100644 index 0000000000..e512c27f7d --- /dev/null +++ b/board/freescale/imx93frdm/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 bced4334363199d5465532d221d06dc3a5b49271067d74408019c825ed2ca715 uboot-imx-lf-6.6.36-2.1.0-imx93frdm.tar.gz diff --git a/board/freescale/imx93frdm/readme.txt b/board/freescale/imx93frdm/readme.txt new file mode 100644 index 0000000000..3e5f404029 --- /dev/null +++ b/board/freescale/imx93frdm/readme.txt @@ -0,0 +1,74 @@ +********************** +NXP i.MX 93 FRDM board +********************** + +This file documents the Buildroot support for the i.MX 93 FRDM +(Freedom) board. For more information on this board, see [1]. + + +Build +===== + +First, configure Buildroot for the i.MX 93 FRDM board: + + make freescale_imx93frdm_defconfig + +Build all components: + + make + +When this command completes, the generated image containing everything +to boot from the SD card is located in "output/images/sdcard.img". + + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + + +Boot the i.MX 93 FRDM board +=========================== + +To boot your newly created system (refer to the i.MX 93 FRDM +Documentation [2] for guidance): +- insert the SD card in the SD slot (P13) of the board; +- Configure the SW1 boot switches as follows: + SW1: 1100 SW1[1-4] ("USDHC2 4-bit SD3.0" Boot Mode) +- connect a USB Type-C cable into the P16 Debug USB Port and connect + using a terminal emulator at 115200 bps, 8n1; +- power on the board by connecting a USB Type-C cable into the P1 + Power USB Port. + +Note 1: the board boot switches default configuration is: +SW1: 0100 SW1[1-4] ("USDHC1 8-bit eMMC 5.1" Boot Mode) +and the board is also pre-flashed with a reference Linux demo +image. It is important to change the boot config switches to make +sure the system will boot on the SD Card. + +Note 2: the debug USB connector presents 2 UARTs (for example +/dev/ttyACM[0-1]), the Cortex-A55 UART should be the 1st one (in the +previous example, /dev/ttyACM0). Refer to the documentation [2] for +more details. + +Enjoy! + + +References +========== +[1] https://www.nxp.com/FRDM-IMX93 +[2] https://www.nxp.com/document/guide/getting-started-with-frdm-imx93:GS-FRDM-IMX93 diff --git a/board/freescale/imxrt1050evk/genimage.cfg b/board/freescale/imxrt1050evk/genimage.cfg index 64fc8452f8..3a4c4fb792 100644 --- a/board/freescale/imxrt1050evk/genimage.cfg +++ b/board/freescale/imxrt1050evk/genimage.cfg @@ -1,14 +1,3 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "imxrt1050-evk.dtb", - } - } - - size = 8M -} - image sdcard.img { hdimage { } @@ -27,12 +16,6 @@ image sdcard.img { size = 512K } - partition boot { - partition-type = 0xc - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/freescale/imxrt1050evk/patches/linux-headers/linuux-headers.hash b/board/freescale/imxrt1050evk/patches/linux-headers/linuux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imxrt1050evk/patches/linux-headers/linuux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imxrt1050evk/patches/linux/linux.hash b/board/freescale/imxrt1050evk/patches/linux/linux.hash new file mode 100644 index 0000000000..216d9b9d39 --- /dev/null +++ b/board/freescale/imxrt1050evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 0fcbbbbcd456e87bbbfc8bf37af541fda62ccfcce76903503424fd101ef7bdee linux-6.12.43.tar.xz diff --git a/board/freescale/imxrt1050evk/patches/uboot/uboot.hash b/board/freescale/imxrt1050evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/freescale/imxrt1050evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/freescale/imxrt1050evk/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/imxrt1050evk/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..1818d2702d --- /dev/null +++ b/board/freescale/imxrt1050evk/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/zImage + devicetree /boot/imxrt1050-evk.dtb + append console=ttyLP0 root=/dev/mmcblk0p1 rootwait rw diff --git a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash index f9af28ab3c..c05084df76 100644 --- a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz +sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1028ardb/patches/linux/linux.hash b/board/freescale/ls1028ardb/patches/linux/linux.hash index e038c22862..3aea05469c 100644 --- a/board/freescale/ls1028ardb/patches/linux/linux.hash +++ b/board/freescale/ls1028ardb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz +sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1028ardb/patches/uboot/uboot.hash b/board/freescale/ls1028ardb/patches/uboot/uboot.hash index a5ccd82b2b..1072686160 100644 --- a/board/freescale/ls1028ardb/patches/uboot/uboot.hash +++ b/board/freescale/ls1028ardb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz +sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1028ardb/readme.txt b/board/freescale/ls1028ardb/readme.txt index 6633d60b90..28b8fdff3a 100644 --- a/board/freescale/ls1028ardb/readme.txt +++ b/board/freescale/ls1028ardb/readme.txt @@ -4,19 +4,28 @@ NXP LS1028ARDB This file documents the Buildroot support for the LS1028A Reference Design Board. -for more details about the board and the QorIQ Layerscape SoC, see the following pages: +For more details about the board and the QorIQ Layerscape SoC, see the following pages: - https://www.nxp.com/design/qoriq-developer-resources/layerscape-ls1028a-reference-design-board:LS1028ARDB - https://www.nxp.com/LS1028A -for the software NXP LSDK (Layerscape Software Development Kit), see - - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf +Layerscape platforms are officially supported by NXP under the Layerscape +Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project +common with i.MX), but has a slower release cadence than LF. The currently used +tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +Buildroot, the latest Linux Factory release tag is always used, which may be +considered pre-release software, as it may contain features which are not yet +documented, and it generally undergoes less testing. -the components from NXP are: - - rcw, lf-6.6.23-2.0.0 - - atf (fork), lf-6.6.23-2.0.0 - - uboot (fork), lf-6.6.23-2.0.0 - - cadence-dp-firmware (blob), LSDK 20.12 - - linux (fork), lf-6.6.23-2.0.0 +For the software Layerscape Debian Linux SDK User Guide, see: + - https://docs.nxp.com/bundle/UG10143/page/topics/about_this_document.html + - https://www.nxp.com/docs/en/user-guide/UG10143.pdf + +The components from NXP are: + - rcw, lf-6.12.20-2.0.0 + - atf (fork), lf-6.12.20-2.0.0 + - uboot (fork), lf-6.12.20-2.0.0 + - cadence-dp-firmware (blob), 8.16 + - linux (fork), lf-6.12.20-2.0.0 Build ===== diff --git a/board/freescale/ls1043a-rdb/genimage.cfg b/board/freescale/ls1043a-rdb/genimage.cfg new file mode 100644 index 0000000000..b0ccec0a72 --- /dev/null +++ b/board/freescale/ls1043a-rdb/genimage.cfg @@ -0,0 +1,29 @@ +image sdcard.img { + hdimage { + } + + partition fsbl { + offset = 4K + in-partition-table = "no" + image = "bl2_sd.pbl" + } + + partition ssbl { + offset = 1M + in-partition-table = "no" + image = "fip.bin" + } + + partition fman { + offset = 9M + in-partition-table = "no" + image = "fsl_fman_ucode_ls1043_r1.1_108_4_9.bin" + } + + partition rootfs { + offset = 16M + partition-type = 0x83 + bootable = "true" + image = "rootfs.ext4" + } +} diff --git a/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..c05084df76 --- /dev/null +++ b/board/freescale/ls1043a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1043a-rdb/patches/linux-headers/linux-headers.hash b/board/freescale/ls1043a-rdb/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/ls1043a-rdb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/ls1043a-rdb/patches/linux/linux.hash b/board/freescale/ls1043a-rdb/patches/linux/linux.hash new file mode 100644 index 0000000000..3aea05469c --- /dev/null +++ b/board/freescale/ls1043a-rdb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash b/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..1072686160 --- /dev/null +++ b/board/freescale/ls1043a-rdb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1043a-rdb/readme.txt b/board/freescale/ls1043a-rdb/readme.txt new file mode 100644 index 0000000000..b106c96471 --- /dev/null +++ b/board/freescale/ls1043a-rdb/readme.txt @@ -0,0 +1,96 @@ +*************** +NXP LS1043A-RDB +*************** + +This file documents the Buildroot support for the LS1043A Reference Design Board. + +for more details about the board and the QorIQ Layerscape SoC, see the following pages: + - https://www.nxp.com/design/design-center/development-boards-and-designs/LS1043A-RDB + - https://www.nxp.com/products/LS1043A + +Layerscape platforms are officially supported by NXP under the Layerscape +Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project +common with i.MX), but has a slower release cadence than LF. The currently used +tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +Buildroot, the latest Linux Factory release tag is always used, which may be +considered pre-release software, as it may contain features which are not yet +documented, and it generally undergoes less testing. + +For the software Layerscape Debian Linux SDK User Guide, see: + - https://docs.nxp.com/bundle/UG10143/page/topics/about_this_document.html + - https://www.nxp.com/docs/en/user-guide/UG10143.pdf + +The components from NXP are: + - rcw, lf-6.12.20-2.0.0 + - atf (fork), lf-6.12.20-2.0.0 + - uboot (fork), lf-6.12.20-2.0.0 + - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 + - linux (fork), lf-6.12.20-2.0.0 + - fmlib, lf-6.12.20-2.0.0 + - fmc, lf-6.12.20-2.0.0 + +Build +===== + +First, configure Buildroot for the LS1043A-RDB board: + + make ls1043a-rdb_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl2_sd.pbl + - fip.bin + - fsl_fman_ucode_ls1043_r1.1_106_4_18.bin + - fsl_fman_ucode_ls1043_r1.1_108_4_9.bin + - fsl-ls1043a-rdb.dtb + - fsl-ls1043a-rdb-sdk.dtb + - Image + - PBL.bin + - rootfs.ext2 + - rootfs.ext4 + - sdcard.img + - u-boot.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/sdX + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/ls1043a-rdb/genimage.cfg. + +Boot the LS1043A-ARDB board +=========================== + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the DIP switches + SW3[1:8] = 10110011 + SW4[1:8] = 00100000 + SW5[1:8] = 00100010 + (SW5[1:8] and SW4[1] should be set to 001000000_0 for the SD card boot) +- put a Micro-USB cable into the console port and connect using a terminal emulator + at 115200 bps, 8n1. +- power on the board. + +Alternatively, SD card boot can also be selected from the uboot command prompt: +- insert the SD card in the SD slot of the board; +- put a Micro-USB cable into console Port and connect using a terminal emulator +- power on the board. +- press any key to stop at the uboot command prompt. +- run the following uboot command + => cpld reset sd diff --git a/board/freescale/ls1043a-rdb/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/ls1043a-rdb/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..b521b335df --- /dev/null +++ b/board/freescale/ls1043a-rdb/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label ls1043ardb-buildroot + kernel /boot/Image + devicetree /boot/fsl-ls1043a-rdb-sdk.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p1 earlycon=uart8250,mmio,0x21c0500 rootwait diff --git a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash index f9af28ab3c..c05084df76 100644 --- a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz +sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/linux/linux.hash b/board/freescale/ls1046a-frwy/patches/linux/linux.hash index e038c22862..3aea05469c 100644 --- a/board/freescale/ls1046a-frwy/patches/linux/linux.hash +++ b/board/freescale/ls1046a-frwy/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz +sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash index a5ccd82b2b..1072686160 100644 --- a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash +++ b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz +sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/readme.txt b/board/freescale/ls1046a-frwy/readme.txt index 4d1e0e1dcd..79a2ecdecf 100644 --- a/board/freescale/ls1046a-frwy/readme.txt +++ b/board/freescale/ls1046a-frwy/readme.txt @@ -4,20 +4,31 @@ NXP LS1046A-FRWY This file documents the Buildroot support for the LS1046A Freeway Board. -for more details about the board and the QorIQ Layerscape SoC, see the following pages: +For more details about the board and the QorIQ Layerscape SoC, see the following pages: - https://www.nxp.com/design/software/qoriq-developer-resources/ls1046a-freeway-board:FRWY-LS1046A - https://www.nxp.com/FRWY-LS1046A - https://www.nxp.com/docs/en/quick-reference-guide/FRWY-LS1046AGSG.pdf -for the software NXP LSDK (Layerscape Software Development Kit), see - - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf +Layerscape platforms are officially supported by NXP under the Layerscape +Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project +common with i.MX), but has a slower release cadence than LF. The currently used +tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +Buildroot, the latest Linux Factory release tag is always used, which may be +considered pre-release software, as it may contain features which are not yet +documented, and it generally undergoes less testing. -the components from NXP are: - - rcw, lf-6.6.23-2.0.0 - - atf (fork), lf-6.6.23-2.0.0 - - uboot (fork), lf-6.6.23-2.0.0 - - qoriq-fm-ucode (blob), lf-6.6.23-2.0.0 - - linux (fork), lf-6.6.23-2.0.0 +For the software Layerscape Debian Linux SDK User Guide, see: + - https://docs.nxp.com/bundle/UG10143/page/topics/about_this_document.html + - https://www.nxp.com/docs/en/user-guide/UG10143.pdf + +The components from NXP are: + - rcw, lf-6.12.20-2.0.0 + - atf (fork), lf-6.12.20-2.0.0 + - uboot (fork), lf-6.12.20-2.0.0 + - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 + - linux (fork), lf-6.12.20-2.0.0 + - fmlib, lf-6.12.20-2.0.0 + - fmc, lf-6.12.20-2.0.0 Build ===== diff --git a/board/freescale/ls1046a-rdb/genimage.cfg b/board/freescale/ls1046a-rdb/genimage.cfg new file mode 100644 index 0000000000..63cca042b2 --- /dev/null +++ b/board/freescale/ls1046a-rdb/genimage.cfg @@ -0,0 +1,29 @@ +image sdcard.img { + hdimage { + } + + partition fsbl { + offset = 4K + in-partition-table = "no" + image = "bl2_sd.pbl" + } + + partition ssbl { + offset = 1M + in-partition-table = "no" + image = "fip.bin" + } + + partition fman { + offset = 9M + in-partition-table = "no" + image = "fsl_fman_ucode_ls1046_r1.0_106_4_18.bin" + } + + partition rootfs { + offset = 16M + partition-type = 0x83 + bootable = "true" + image = "rootfs.ext4" + } +} diff --git a/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..c05084df76 --- /dev/null +++ b/board/freescale/ls1046a-rdb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8 atf-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-rdb/patches/linux-headers/linux-headers.hash b/board/freescale/ls1046a-rdb/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/ls1046a-rdb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/ls1046a-rdb/patches/linux/linux.hash b/board/freescale/ls1046a-rdb/patches/linux/linux.hash new file mode 100644 index 0000000000..3aea05469c --- /dev/null +++ b/board/freescale/ls1046a-rdb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8 linux-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash b/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..1072686160 --- /dev/null +++ b/board/freescale/ls1046a-rdb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3 u-boot-lf-6.12.20-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-rdb/readme.txt b/board/freescale/ls1046a-rdb/readme.txt new file mode 100644 index 0000000000..ede7a607a8 --- /dev/null +++ b/board/freescale/ls1046a-rdb/readme.txt @@ -0,0 +1,95 @@ +*************** +NXP LS1046A-RDB +*************** + +This file documents the Buildroot support for the LS1046A Reference Design Board. + +for more details about the board and the QorIQ Layerscape SoC, see the following pages: + - https://www.nxp.com/design/design-center/development-boards-and-designs/LS1046A-RDB + - https://www.nxp.com/products/LS1046A + +Layerscape platforms are officially supported by NXP under the Layerscape +Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project +common with i.MX), but has a slower release cadence than LF. The currently used +tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in +Buildroot, the latest Linux Factory release tag is always used, which may be +considered pre-release software, as it may contain features which are not yet +documented, and it generally undergoes less testing. + +For the software Layerscape Debian Linux SDK User Guide, see: + - https://docs.nxp.com/bundle/UG10143/page/topics/about_this_document.html + - https://www.nxp.com/docs/en/user-guide/UG10143.pdf + +The components from NXP are: + - rcw, lf-6.12.20-2.0.0 + - atf (fork), lf-6.12.20-2.0.0 + - uboot (fork), lf-6.12.20-2.0.0 + - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0 + - linux (fork), lf-6.12.20-2.0.0 + - fmlib, lf-6.12.20-2.0.0 + - fmc, lf-6.12.20-2.0.0 + +Build +===== + +First, configure Buildroot for the LS1046A-RDB board: + + make ls1046a-rdb_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl2_sd.pbl + - fip.bin + - fsl_fman_ucode_ls1046_r1.0_106_4_18.bin + - fsl_fman_ucode_ls1046_r1.0_108_4_9.bin + - fsl-ls1046a-rdb.dtb + - fsl-ls1046a-rdb-sdk.dtb + - Image + - PBL.bin + - rootfs.ext2 + - rootfs.ext4 + - sdcard.img + - u-boot.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/sdX + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/ls1046a-rdb/genimage.cfg. + +Boot the LS1046A-ARDB board +=========================== + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the DIP switches + SW3[1:8] = 01000110 + SW4[1:8] = 00111011 + SW5[1:8] = 00100000 (select SD Card boot option) +- put a Micro-USB cable into the console port and connect using a terminal emulator + at 115200 bps, 8n1. +- power on the board. + +Alternatively, SD card boot can also be selected from the uboot command prompt: +- insert the SD card in the SD slot of the board; +- put a Micro-USB cable into console Port and connect using a terminal emulator +- power on the board. +- press any key to stop at the uboot command prompt. +- run the following uboot command + => cpld reset sd diff --git a/board/freescale/ls1046a-rdb/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/ls1046a-rdb/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..bbf26e2e4f --- /dev/null +++ b/board/freescale/ls1046a-rdb/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label ls1046ardb-buildroot + kernel /boot/Image + devicetree /boot/fsl-ls1046a-rdb-sdk.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p1 earlycon=uart8250,mmio,0x21c0500 rootwait diff --git a/board/friendlyarm/nanopi-r3s/extlinux.conf.in b/board/friendlyarm/nanopi-r3s/extlinux.conf.in new file mode 100644 index 0000000000..ecddbc420e --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/extlinux.conf.in @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/Image + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait diff --git a/board/friendlyarm/nanopi-r3s/genimage.cfg.in b/board/friendlyarm/nanopi-r3s/genimage.cfg.in new file mode 100644 index 0000000000..f3babe465a --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/genimage.cfg.in @@ -0,0 +1,19 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-no-backup = true + } + + partition uboot { + in-partition-table = false + image = "u-boot-rockchip.bin" + offset = 32K + } + + partition rootfs { + offset = 16M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + bootable = true + } +} diff --git a/board/friendlyarm/nanopi-r3s/kernel.config b/board/friendlyarm/nanopi-r3s/kernel.config new file mode 100644 index 0000000000..b6fdca8b86 --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/kernel.config @@ -0,0 +1,118 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_ARM64_VA_BITS_39=y +CONFIG_NR_CPUS=4 +# CONFIG_EFI is not set +# CONFIG_SUSPEND is not set +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_ENERGY_MODEL=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPUFREQ_DT=y +CONFIG_JUMP_LABEL=y +# CONFIG_GCC_PLUGINS is not set +# CONFIG_SWAP is not set +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_PCI=y +CONFIG_PCIE_ROCKCHIP_HOST=y +CONFIG_PCIE_ROCKCHIP_DW_HOST=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_NETDEVICES=y +CONFIG_R8169=y +CONFIG_STMMAC_ETH=y +CONFIG_ROCKCHIP_PHY=y +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_LEGACY_PTY_COUNT=4 +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_RK3X=y +CONFIG_PINCTRL_RK805=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y +CONFIG_ROCKCHIP_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_DW_WATCHDOG=y +CONFIG_MFD_RK8XX_I2C=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_RK808=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_DWC3=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=32 +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_DWCMSHC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_ACTIVITY=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_LEDS_TRIGGER_NETDEV=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_HYM8563=y +CONFIG_DMADEVICES=y +CONFIG_PL330_DMA=y +CONFIG_COMMON_CLK_RK808=y +# CONFIG_CLK_PX30 is not set +# CONFIG_CLK_RK3308 is not set +# CONFIG_CLK_RK3328 is not set +# CONFIG_CLK_RK3368 is not set +# CONFIG_CLK_RK3399 is not set +# CONFIG_CLK_RK3576 is not set +# CONFIG_CLK_RK3588 is not set +CONFIG_ROCKCHIP_IOMMU=y +CONFIG_ROCKCHIP_IODOMAIN=y +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_PHY_ROCKCHIP_EMMC=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y +CONFIG_PHY_ROCKCHIP_PCIE=y +CONFIG_PHY_ROCKCHIP_USB=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_TMPFS=y +CONFIG_SECURITY=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_GHASH=y +CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_CHACHA20_NEON=y +CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_SHA512_ARM64_CE=y +CONFIG_CRYPTO_SHA3_ARM64=y +CONFIG_CRYPTO_AES_ARM64_BS=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_DEV_ROCKCHIP=y +CONFIG_DMA_CMA=y +CONFIG_STRIP_ASM_SYMS=y diff --git a/board/friendlyarm/nanopi-r3s/patches/linux-headers/linux-headers.hash b/board/friendlyarm/nanopi-r3s/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash b/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash new file mode 100644 index 0000000000..451159a6dc --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 21817f1998e2230f81f7e4f605fa6fdcb040e14fa27d99c27ddb16ce749797a9 linux-6.14.6.tar.xz diff --git a/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash b/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash new file mode 100644 index 0000000000..b550824126 --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/friendlyarm/nanopi-r3s/post-build.sh b/board/friendlyarm/nanopi-r3s/post-build.sh new file mode 100755 index 0000000000..604f387768 --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" +PARTUUID="$("$HOST_DIR"/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf.in" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg.in" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/friendlyarm/nanopi-r3s/readme.txt b/board/friendlyarm/nanopi-r3s/readme.txt new file mode 100644 index 0000000000..515620218a --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/readme.txt @@ -0,0 +1,41 @@ +FriendlyARM NanoPi R3S +======================= +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R3S + +How to build +============ + $ make friendlyarm_nanopi_r3s_defconfig + $ make + +Files created in output directory +================================= + +output/images +├── bl31.elf +├── genimage.cfg +├── Image +├── rk3566_ddr_1056MHz_v1.18.bin +├── rockchip +│   └── rk3566-nanopi-r3s.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rtl_nic +│   ├── ... +│   ├── rtl8168h-2.fw +│   └── ... +├── sdcard.img +├── u-boot.bin +└── u-boot-rockchip.bin + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync + +Insert the micro SDcard in your Nanopi R3S and power it up. +The console is on the serial line, 1500000 8N1. diff --git a/board/friendlyarm/nanopi-r3s/rootfs_overlay/etc/network/interfaces b/board/friendlyarm/nanopi-r3s/rootfs_overlay/etc/network/interfaces new file mode 100644 index 0000000000..d49e95de75 --- /dev/null +++ b/board/friendlyarm/nanopi-r3s/rootfs_overlay/etc/network/interfaces @@ -0,0 +1,8 @@ +auto lo +iface lo inet loopback + +auto eth0 +iface eth0 inet dhcp + +auto eth1 +iface eth1 inet dhcp diff --git a/board/grinn/chiliboard/patches/linux-headers/linux-headers.hash b/board/grinn/chiliboard/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/grinn/chiliboard/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/grinn/chiliboard/patches/linux/linux.hash b/board/grinn/chiliboard/patches/linux/linux.hash new file mode 100644 index 0000000000..80e573540f --- /dev/null +++ b/board/grinn/chiliboard/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 d450ab215de4e1f8bb85e0f4216760fa33fd024b4526b144f4ce0d9012b29c9e linux-6.12.6.tar.xz diff --git a/board/grinn/chiliboard/patches/uboot/uboot.hash b/board/grinn/chiliboard/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/grinn/chiliboard/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/grinn/liteboard/patches/linux-headers/linux-headers.hash b/board/grinn/liteboard/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/grinn/liteboard/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/grinn/liteboard/patches/linux/linux.hash b/board/grinn/liteboard/patches/linux/linux.hash new file mode 100644 index 0000000000..80e573540f --- /dev/null +++ b/board/grinn/liteboard/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 d450ab215de4e1f8bb85e0f4216760fa33fd024b4526b144f4ce0d9012b29c9e linux-6.12.6.tar.xz diff --git a/board/grinn/liteboard/patches/uboot/uboot.hash b/board/grinn/liteboard/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/grinn/liteboard/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/imx7d-sdb/patches/linux-headers/linux-headers.hash b/board/imx7d-sdb/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/imx7d-sdb/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/imx7d-sdb/patches/linux/linux.hash b/board/imx7d-sdb/patches/linux/linux.hash new file mode 100644 index 0000000000..5fb7057e04 --- /dev/null +++ b/board/imx7d-sdb/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db linux-6.6.58.tar.xz diff --git a/board/imx7d-sdb/patches/uboot/uboot.hash b/board/imx7d-sdb/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/imx7d-sdb/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/linksprite/pcduino/patches/linux-headers/linux-headers.hash b/board/linksprite/pcduino/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/linksprite/pcduino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/linksprite/pcduino/patches/linux/linux.hash b/board/linksprite/pcduino/patches/linux/linux.hash new file mode 100644 index 0000000000..aea771e7bf --- /dev/null +++ b/board/linksprite/pcduino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/linksprite/pcduino/patches/uboot/uboot.hash b/board/linksprite/pcduino/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/linksprite/pcduino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/loongarch64-efi/genimage-efi.cfg b/board/loongarch64-efi/genimage-efi.cfg new file mode 100644 index 0000000000..24b9a8d943 --- /dev/null +++ b/board/loongarch64-efi/genimage-efi.cfg @@ -0,0 +1,30 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + file vmlinux.efi { + image = "vmlinux.efi" + } + } + + size = 64M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = root-loongarch64 + image = "rootfs.ext2" + } +} diff --git a/board/loongarch64-efi/grub.cfg b/board/loongarch64-efi/grub.cfg new file mode 100644 index 0000000000..c84a7f646b --- /dev/null +++ b/board/loongarch64-efi/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /vmlinux.efi root=PARTLABEL=root rootwait console=ttyS0,115200 +} diff --git a/board/loongarch64-efi/patches/linux-headers/linux-headers.hash b/board/loongarch64-efi/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/loongarch64-efi/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/loongarch64-efi/patches/linux/linux.hash b/board/loongarch64-efi/patches/linux/linux.hash new file mode 100644 index 0000000000..381f3427a6 --- /dev/null +++ b/board/loongarch64-efi/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 a9b020721778384507010177d3929e7d4058f7f6120f05a99d56b5c5c0346a70 linux-6.12.32.tar.xz diff --git a/board/loongarch64-efi/post-image.sh b/board/loongarch64-efi/post-image.sh new file mode 100755 index 0000000000..fdb17ece70 --- /dev/null +++ b/board/loongarch64-efi/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/loongarch64-efi/readme.txt b/board/loongarch64-efi/readme.txt new file mode 100644 index 0000000000..8b92f620f9 --- /dev/null +++ b/board/loongarch64-efi/readme.txt @@ -0,0 +1,38 @@ +The loongarch64_efi_defconfig allows to build a minimal Linux system that +can boot on all loongarch64 systems providing an New World [1] EFI firmware. + +This includes almost all LoongArch Loongson-3 series workstations and servers, +see [2] for hardware and firmware information. + +Building and booting +==================== + +$ make loongarch64_efi_defconfig +$ make + +The file output/images/disk.img is a complete disk image that can be +booted, it includes the grub2 bootloader, Linux kernel and root +filesystem. + +Testing under Qemu +================== + +This image can also be tested using Qemu: + +qemu-system-loongarch64 \ + -M virt \ + -cpu la464 \ + -nographic \ + -bios \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -device virtio-blk-pci,drive=hd0 \ + -netdev user,id=eth0 \ + -device virtio-net-pci,netdev=eth0 + +Note that needs to point to a valid loongarch64 UEFI +firmware image for qemu. +It may be provided by your distribution as a edk2-loongarch64 package, +in path such as /usr/share/edk2/loongarch64/QEMU_EFI.fd . + +[1]: https://areweloongyet.com/en/docs/old-and-new-worlds/ +[2]: https://github.com/loongson/Firmware diff --git a/board/mender/x86_64/post-build.sh b/board/mender/x86_64/post-build.sh index bc4f4b8f11..9e909e9281 100755 --- a/board/mender/x86_64/post-build.sh +++ b/board/mender/x86_64/post-build.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e DEVICE_TYPE="buildroot-x86_64" -ARTIFACT_NAME="1.0" parse_args() { local o O opts @@ -19,7 +18,8 @@ parse_args() { DEVICE_TYPE="${2}"; shift 2 ;; (-a|--artifact-name) - ARTIFACT_NAME="${2}"; shift 2 + # Ignored to have same options as other scripts + shift 2 ;; (--) shift; break @@ -31,11 +31,6 @@ parse_args() { # Create a persistent directory to mount the data partition at. mender_fixup() { pushd "${TARGET_DIR}" - if [[ -L var/lib/mender ]]; then - rm var/lib/mender - mkdir -p var/lib/mender - fi - # The common paradigm is to have the persistent data volume at /data for mender. if [[ ! -L data ]]; then ln -s var/lib/mender data @@ -48,7 +43,6 @@ main() { parse_args "${@}" mender_fixup echo "device_type=${DEVICE_TYPE}" > "${TARGET_DIR}/etc/mender/device_type" - echo "artifact_name=${ARTIFACT_NAME}" > "${TARGET_DIR}/etc/mender/artifact_info" } main "${@}" diff --git a/board/mender/x86_64/post-image-efi.sh b/board/mender/x86_64/post-image-efi.sh index ab12386076..a3e262f8fe 100755 --- a/board/mender/x86_64/post-image-efi.sh +++ b/board/mender/x86_64/post-image-efi.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e BOARD_DIR="$(realpath "$(dirname "$0")")" +DATA_PART="${BINARIES_DIR}"/data-part DATA_PART_SIZE="32M" DEVICE_TYPE="buildroot-x86_64" ARTIFACT_NAME="1.0" @@ -33,6 +34,7 @@ parse_args() { # Create the data partition make_data_partition() { "${HOST_DIR}/sbin/mkfs.ext4" \ + -d "${DATA_PART}" \ -F \ -r 1 \ -N 0 \ @@ -41,12 +43,32 @@ make_data_partition() { "${BINARIES_DIR}/data-part.ext4" "${DATA_PART_SIZE}" } +# Generate a mender bootstrap artifact. +# See https://github.com/mendersoftware/mender/blob/3.5.3/Documentation/automatic-bootstrap-artifact.md +generate_mender_bootstrap_artifact() { + + rm -rf "${DATA_PART}" + mkdir -p "${DATA_PART}" + img_checksum=$(sha256sum "${BINARIES_DIR}"/rootfs.ext4 |awk '{print $1}') + + "${HOST_DIR}"/bin/mender-artifact \ + write bootstrap-artifact \ + --compression none \ + --artifact-name "${ARTIFACT_NAME}" \ + --device-type "${DEVICE_TYPE}" \ + --provides "rootfs-image.version:${ARTIFACT_NAME}" \ + --provides "rootfs-image.checksum:${img_checksum}" \ + --clears-provides "rootfs-image.*" \ + --output-path "${DATA_PART}"/bootstrap.mender \ + --version 3 +} + # Create a mender image. generate_mender_image() { echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" "${HOST_DIR}/bin/mender-artifact" \ - --compression lzma \ write rootfs-image \ + --compression none \ -t "${DEVICE_TYPE}" \ -n "${BR2_VERSION}" \ -f "${BINARIES_DIR}/rootfs.ext2" \ @@ -60,6 +82,7 @@ generate_image() { # Main function. main() { parse_args "${@}" + generate_mender_bootstrap_artifact make_data_partition generate_image generate_mender_image diff --git a/board/mender/x86_64/readme.txt b/board/mender/x86_64/readme.txt index a9755ec58b..01a0254511 100644 --- a/board/mender/x86_64/readme.txt +++ b/board/mender/x86_64/readme.txt @@ -11,14 +11,14 @@ Mender UEFI PC sample config $ make -2. Write the Pendrive +2. Write the image - The build process will create a Pendrive image called disk.img in + The build process will create a all-in-one image called disk.img in output/images. Write the image to a pendrive: - $ dd if=output/images/disk.img of=/dev/${pendrive}; sync + $ dd if=output/images/disk.img of=/dev/sdX; sync Once the process is complete, insert it into the target PC and boot. @@ -66,4 +66,4 @@ particular needs, as this option changes the mender artifact name. Using mender ======================== Please read the mender documentation at: -https://docs.mender.io/2.2/getting-started +https://docs.mender.io diff --git a/board/nvidia/bf3/rootfs_overlay/etc/init.d/S04ifnames b/board/nvidia/bf3/rootfs_overlay/etc/init.d/S04ifnames new file mode 100755 index 0000000000..88c03fd044 --- /dev/null +++ b/board/nvidia/bf3/rootfs_overlay/etc/init.d/S04ifnames @@ -0,0 +1,66 @@ +#!/bin/sh +# Rename the board's interfaces according to Mellanox/NVIDIA's documentation + +DESC="bf3 interface renaming" +DAEMON=ifnames + +rename_interface() { + bus_info=$1 + new_name=$2 + alt_name=$3 + + # Find the current interface name based on bus-info + iface=$(find /sys/class/net -type l -exec sh -c ' + for i; do + [ "$(basename "$(readlink -f "$i"/device)")" = "$0" ] && basename "$i" + done + ' "$bus_info" {} +) + + # Rename the interface if found + if [ -n "$iface" ]; then + ip link set "$iface" name "$new_name" + printf "%s to %s" "$iface" "$new_name" + + # Set altname if provided + if [ -n "$alt_name" ]; then + ip link property add dev "$new_name" altname "$alt_name" + printf "/%s" "$alt_name" + fi + printf "; " + else + echo "$bus_info not found" + fi +} + +case "$1" in + start) + printf "Starting %s [%s]: " "$DESC" "$DAEMON" + # Initialize success flag + rename_allok=0 + rename_interface "0000:03:00.0" "p0" "enp3s0f0np0" || rename_allok=1 + rename_interface "0000:03:00.1" "p1" "enp3s0f1np1" || rename_allok=1 + rename_interface "MLNXBF17:00" "oob_net0" "enamlnxbf17i0" || rename_allok=1 + rename_interface "virtio1" "tmfifo_net0" || rename_allok=1 + + if [ "$rename_allok" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + ;; + + stop) ;; + + restart) + # Optional: Handle restart by calling start after stop + $0 stop + $0 start + ;; + + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 diff --git a/board/octavo/osd32mp1-brk/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/board/octavo/osd32mp1-brk/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/board/octavo/osd32mp1-brk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/octavo/osd32mp1-brk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..2ba1cc0972 --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 83d744c155097f27682a06fdba5f7e976fde6edf61474d40a5a44e71862a3822 arm-trusted-firmware-v2.4-stm32mp-r1-git4.tar.gz diff --git a/board/octavo/osd32mp1-brk/patches/linux/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch b/board/octavo/osd32mp1-brk/patches/linux/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch new file mode 100644 index 0000000000..fe5402e639 --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/linux/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch @@ -0,0 +1,357 @@ +From 201719b670b0861f5846ebcda1ad3e4626ae0a33 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Sat, 3 Dec 2022 11:54:25 +0100 +Subject: [PATCH] ata: ahci: fix enum constants for gcc-13 + +commit f07788079f515ca4a681c5f595bdad19cfbd7b1d upstream. + +gcc-13 slightly changes the type of constant expressions that are defined +in an enum, which triggers a compile time sanity check in libata: + +linux/drivers/ata/libahci.c: In function 'ahci_led_store': +linux/include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) +357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) + +The new behavior is that sizeof() returns the same value for the +constant as it does for the enum type, which is generally more sensible +and consistent. + +The problem in libata is that it contains a single enum definition for +lots of unrelated constants, some of which are large positive (unsigned) +integers like 0xffffffff, while others like (1<<31) are interpreted as +negative integers, and this forces the enum type to become 64 bit wide +even though most constants would still fit into a signed 32-bit 'int'. + +Fix this by changing the entire enum definition to use BIT(x) in place +of (1< +Cc: linux-ide@vger.kernel.org +Cc: Damien Le Moal +Cc: stable@vger.kernel.org +Cc: Randy Dunlap +Signed-off-by: Arnd Bergmann +Tested-by: Luis Machado +Signed-off-by: Damien Le Moal +[Backport to linux-4.19.y] +Signed-off-by: Paul Barker +Signed-off-by: Greg Kroah-Hartman +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 +--- + drivers/ata/ahci.h | 232 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 115 deletions(-) + +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index d1f284f0c83d..de1bc374e1b6 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + /* Enclosure Management Control */ + #define EM_CTRL_MSG_TYPE 0x000f0000 +@@ -54,12 +55,12 @@ enum { + AHCI_PORT_PRIV_FBS_DMA_SZ = AHCI_CMD_SLOT_SZ + + AHCI_CMD_TBL_AR_SZ + + (AHCI_RX_FIS_SZ * 16), +- AHCI_IRQ_ON_SG = (1 << 31), +- AHCI_CMD_ATAPI = (1 << 5), +- AHCI_CMD_WRITE = (1 << 6), +- AHCI_CMD_PREFETCH = (1 << 7), +- AHCI_CMD_RESET = (1 << 8), +- AHCI_CMD_CLR_BUSY = (1 << 10), ++ AHCI_IRQ_ON_SG = BIT(31), ++ AHCI_CMD_ATAPI = BIT(5), ++ AHCI_CMD_WRITE = BIT(6), ++ AHCI_CMD_PREFETCH = BIT(7), ++ AHCI_CMD_RESET = BIT(8), ++ AHCI_CMD_CLR_BUSY = BIT(10), + + RX_FIS_PIO_SETUP = 0x20, /* offset of PIO Setup FIS data */ + RX_FIS_D2H_REG = 0x40, /* offset of D2H Register FIS data */ +@@ -77,37 +78,37 @@ enum { + HOST_CAP2 = 0x24, /* host capabilities, extended */ + + /* HOST_CTL bits */ +- HOST_RESET = (1 << 0), /* reset controller; self-clear */ +- HOST_IRQ_EN = (1 << 1), /* global IRQ enable */ +- HOST_MRSM = (1 << 2), /* MSI Revert to Single Message */ +- HOST_AHCI_EN = (1 << 31), /* AHCI enabled */ ++ HOST_RESET = BIT(0), /* reset controller; self-clear */ ++ HOST_IRQ_EN = BIT(1), /* global IRQ enable */ ++ HOST_MRSM = BIT(2), /* MSI Revert to Single Message */ ++ HOST_AHCI_EN = BIT(31), /* AHCI enabled */ + + /* HOST_CAP bits */ +- HOST_CAP_SXS = (1 << 5), /* Supports External SATA */ +- HOST_CAP_EMS = (1 << 6), /* Enclosure Management support */ +- HOST_CAP_CCC = (1 << 7), /* Command Completion Coalescing */ +- HOST_CAP_PART = (1 << 13), /* Partial state capable */ +- HOST_CAP_SSC = (1 << 14), /* Slumber state capable */ +- HOST_CAP_PIO_MULTI = (1 << 15), /* PIO multiple DRQ support */ +- HOST_CAP_FBS = (1 << 16), /* FIS-based switching support */ +- HOST_CAP_PMP = (1 << 17), /* Port Multiplier support */ +- HOST_CAP_ONLY = (1 << 18), /* Supports AHCI mode only */ +- HOST_CAP_CLO = (1 << 24), /* Command List Override support */ +- HOST_CAP_LED = (1 << 25), /* Supports activity LED */ +- HOST_CAP_ALPM = (1 << 26), /* Aggressive Link PM support */ +- HOST_CAP_SSS = (1 << 27), /* Staggered Spin-up */ +- HOST_CAP_MPS = (1 << 28), /* Mechanical presence switch */ +- HOST_CAP_SNTF = (1 << 29), /* SNotification register */ +- HOST_CAP_NCQ = (1 << 30), /* Native Command Queueing */ +- HOST_CAP_64 = (1 << 31), /* PCI DAC (64-bit DMA) support */ ++ HOST_CAP_SXS = BIT(5), /* Supports External SATA */ ++ HOST_CAP_EMS = BIT(6), /* Enclosure Management support */ ++ HOST_CAP_CCC = BIT(7), /* Command Completion Coalescing */ ++ HOST_CAP_PART = BIT(13), /* Partial state capable */ ++ HOST_CAP_SSC = BIT(14), /* Slumber state capable */ ++ HOST_CAP_PIO_MULTI = BIT(15), /* PIO multiple DRQ support */ ++ HOST_CAP_FBS = BIT(16), /* FIS-based switching support */ ++ HOST_CAP_PMP = BIT(17), /* Port Multiplier support */ ++ HOST_CAP_ONLY = BIT(18), /* Supports AHCI mode only */ ++ HOST_CAP_CLO = BIT(24), /* Command List Override support */ ++ HOST_CAP_LED = BIT(25), /* Supports activity LED */ ++ HOST_CAP_ALPM = BIT(26), /* Aggressive Link PM support */ ++ HOST_CAP_SSS = BIT(27), /* Staggered Spin-up */ ++ HOST_CAP_MPS = BIT(28), /* Mechanical presence switch */ ++ HOST_CAP_SNTF = BIT(29), /* SNotification register */ ++ HOST_CAP_NCQ = BIT(30), /* Native Command Queueing */ ++ HOST_CAP_64 = BIT(31), /* PCI DAC (64-bit DMA) support */ + + /* HOST_CAP2 bits */ +- HOST_CAP2_BOH = (1 << 0), /* BIOS/OS handoff supported */ +- HOST_CAP2_NVMHCI = (1 << 1), /* NVMHCI supported */ +- HOST_CAP2_APST = (1 << 2), /* Automatic partial to slumber */ +- HOST_CAP2_SDS = (1 << 3), /* Support device sleep */ +- HOST_CAP2_SADM = (1 << 4), /* Support aggressive DevSlp */ +- HOST_CAP2_DESO = (1 << 5), /* DevSlp from slumber only */ ++ HOST_CAP2_BOH = BIT(0), /* BIOS/OS handoff supported */ ++ HOST_CAP2_NVMHCI = BIT(1), /* NVMHCI supported */ ++ HOST_CAP2_APST = BIT(2), /* Automatic partial to slumber */ ++ HOST_CAP2_SDS = BIT(3), /* Support device sleep */ ++ HOST_CAP2_SADM = BIT(4), /* Support aggressive DevSlp */ ++ HOST_CAP2_DESO = BIT(5), /* DevSlp from slumber only */ + + /* registers for each SATA port */ + PORT_LST_ADDR = 0x00, /* command list DMA addr */ +@@ -129,24 +130,25 @@ enum { + PORT_DEVSLP = 0x44, /* device sleep */ + + /* PORT_IRQ_{STAT,MASK} bits */ +- PORT_IRQ_COLD_PRES = (1 << 31), /* cold presence detect */ +- PORT_IRQ_TF_ERR = (1 << 30), /* task file error */ +- PORT_IRQ_HBUS_ERR = (1 << 29), /* host bus fatal error */ +- PORT_IRQ_HBUS_DATA_ERR = (1 << 28), /* host bus data error */ +- PORT_IRQ_IF_ERR = (1 << 27), /* interface fatal error */ +- PORT_IRQ_IF_NONFATAL = (1 << 26), /* interface non-fatal error */ +- PORT_IRQ_OVERFLOW = (1 << 24), /* xfer exhausted available S/G */ +- PORT_IRQ_BAD_PMP = (1 << 23), /* incorrect port multiplier */ +- +- PORT_IRQ_PHYRDY = (1 << 22), /* PhyRdy changed */ +- PORT_IRQ_DEV_ILCK = (1 << 7), /* device interlock */ +- PORT_IRQ_CONNECT = (1 << 6), /* port connect change status */ +- PORT_IRQ_SG_DONE = (1 << 5), /* descriptor processed */ +- PORT_IRQ_UNK_FIS = (1 << 4), /* unknown FIS rx'd */ +- PORT_IRQ_SDB_FIS = (1 << 3), /* Set Device Bits FIS rx'd */ +- PORT_IRQ_DMAS_FIS = (1 << 2), /* DMA Setup FIS rx'd */ +- PORT_IRQ_PIOS_FIS = (1 << 1), /* PIO Setup FIS rx'd */ +- PORT_IRQ_D2H_REG_FIS = (1 << 0), /* D2H Register FIS rx'd */ ++ PORT_IRQ_COLD_PRES = BIT(31), /* cold presence detect */ ++ PORT_IRQ_TF_ERR = BIT(30), /* task file error */ ++ PORT_IRQ_HBUS_ERR = BIT(29), /* host bus fatal error */ ++ PORT_IRQ_HBUS_DATA_ERR = BIT(28), /* host bus data error */ ++ PORT_IRQ_IF_ERR = BIT(27), /* interface fatal error */ ++ PORT_IRQ_IF_NONFATAL = BIT(26), /* interface non-fatal error */ ++ PORT_IRQ_OVERFLOW = BIT(24), /* xfer exhausted available S/G */ ++ PORT_IRQ_BAD_PMP = BIT(23), /* incorrect port multiplier */ ++ ++ PORT_IRQ_PHYRDY = BIT(22), /* PhyRdy changed */ ++ PORT_IRQ_DEV_ILCK = BIT(7), /* device interlock */ ++ PORT_IRQ_DMPS = BIT(7), /* mechanical presence status */ ++ PORT_IRQ_CONNECT = BIT(6), /* port connect change status */ ++ PORT_IRQ_SG_DONE = BIT(5), /* descriptor processed */ ++ PORT_IRQ_UNK_FIS = BIT(4), /* unknown FIS rx'd */ ++ PORT_IRQ_SDB_FIS = BIT(3), /* Set Device Bits FIS rx'd */ ++ PORT_IRQ_DMAS_FIS = BIT(2), /* DMA Setup FIS rx'd */ ++ PORT_IRQ_PIOS_FIS = BIT(1), /* PIO Setup FIS rx'd */ ++ PORT_IRQ_D2H_REG_FIS = BIT(0), /* D2H Register FIS rx'd */ + + PORT_IRQ_FREEZE = PORT_IRQ_HBUS_ERR | + PORT_IRQ_IF_ERR | +@@ -162,34 +164,34 @@ enum { + PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS, + + /* PORT_CMD bits */ +- PORT_CMD_ASP = (1 << 27), /* Aggressive Slumber/Partial */ +- PORT_CMD_ALPE = (1 << 26), /* Aggressive Link PM enable */ +- PORT_CMD_ATAPI = (1 << 24), /* Device is ATAPI */ +- PORT_CMD_FBSCP = (1 << 22), /* FBS Capable Port */ +- PORT_CMD_ESP = (1 << 21), /* External Sata Port */ +- PORT_CMD_HPCP = (1 << 18), /* HotPlug Capable Port */ +- PORT_CMD_PMP = (1 << 17), /* PMP attached */ +- PORT_CMD_LIST_ON = (1 << 15), /* cmd list DMA engine running */ +- PORT_CMD_FIS_ON = (1 << 14), /* FIS DMA engine running */ +- PORT_CMD_FIS_RX = (1 << 4), /* Enable FIS receive DMA engine */ +- PORT_CMD_CLO = (1 << 3), /* Command list override */ +- PORT_CMD_POWER_ON = (1 << 2), /* Power up device */ +- PORT_CMD_SPIN_UP = (1 << 1), /* Spin up device */ +- PORT_CMD_START = (1 << 0), /* Enable port DMA engine */ +- +- PORT_CMD_ICC_MASK = (0xf << 28), /* i/f ICC state mask */ +- PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */ +- PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */ +- PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */ ++ PORT_CMD_ASP = BIT(27), /* Aggressive Slumber/Partial */ ++ PORT_CMD_ALPE = BIT(26), /* Aggressive Link PM enable */ ++ PORT_CMD_ATAPI = BIT(24), /* Device is ATAPI */ ++ PORT_CMD_FBSCP = BIT(22), /* FBS Capable Port */ ++ PORT_CMD_ESP = BIT(21), /* External Sata Port */ ++ PORT_CMD_HPCP = BIT(18), /* HotPlug Capable Port */ ++ PORT_CMD_PMP = BIT(17), /* PMP attached */ ++ PORT_CMD_LIST_ON = BIT(15), /* cmd list DMA engine running */ ++ PORT_CMD_FIS_ON = BIT(14), /* FIS DMA engine running */ ++ PORT_CMD_FIS_RX = BIT(4), /* Enable FIS receive DMA engine */ ++ PORT_CMD_CLO = BIT(3), /* Command list override */ ++ PORT_CMD_POWER_ON = BIT(2), /* Power up device */ ++ PORT_CMD_SPIN_UP = BIT(1), /* Spin up device */ ++ PORT_CMD_START = BIT(0), /* Enable port DMA engine */ ++ ++ PORT_CMD_ICC_MASK = (0xfu << 28), /* i/f ICC state mask */ ++ PORT_CMD_ICC_ACTIVE = (0x1u << 28), /* Put i/f in active state */ ++ PORT_CMD_ICC_PARTIAL = (0x2u << 28), /* Put i/f in partial state */ ++ PORT_CMD_ICC_SLUMBER = (0x6u << 28), /* Put i/f in slumber state */ + + /* PORT_FBS bits */ + PORT_FBS_DWE_OFFSET = 16, /* FBS device with error offset */ + PORT_FBS_ADO_OFFSET = 12, /* FBS active dev optimization offset */ + PORT_FBS_DEV_OFFSET = 8, /* FBS device to issue offset */ + PORT_FBS_DEV_MASK = (0xf << PORT_FBS_DEV_OFFSET), /* FBS.DEV */ +- PORT_FBS_SDE = (1 << 2), /* FBS single device error */ +- PORT_FBS_DEC = (1 << 1), /* FBS device error clear */ +- PORT_FBS_EN = (1 << 0), /* Enable FBS */ ++ PORT_FBS_SDE = BIT(2), /* FBS single device error */ ++ PORT_FBS_DEC = BIT(1), /* FBS device error clear */ ++ PORT_FBS_EN = BIT(0), /* Enable FBS */ + + /* PORT_DEVSLP bits */ + PORT_DEVSLP_DM_OFFSET = 25, /* DITO multiplier offset */ +@@ -197,45 +199,45 @@ enum { + PORT_DEVSLP_DITO_OFFSET = 15, /* DITO offset */ + PORT_DEVSLP_MDAT_OFFSET = 10, /* Minimum assertion time */ + PORT_DEVSLP_DETO_OFFSET = 2, /* DevSlp exit timeout */ +- PORT_DEVSLP_DSP = (1 << 1), /* DevSlp present */ +- PORT_DEVSLP_ADSE = (1 << 0), /* Aggressive DevSlp enable */ ++ PORT_DEVSLP_DSP = BIT(1), /* DevSlp present */ ++ PORT_DEVSLP_ADSE = BIT(0), /* Aggressive DevSlp enable */ + + /* hpriv->flags bits */ + + #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) + +- AHCI_HFLAG_NO_NCQ = (1 << 0), +- AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */ +- AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */ +- AHCI_HFLAG_32BIT_ONLY = (1 << 3), /* force 32bit */ +- AHCI_HFLAG_MV_PATA = (1 << 4), /* PATA port */ +- AHCI_HFLAG_NO_MSI = (1 << 5), /* no PCI MSI */ +- AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */ +- AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */ +- AHCI_HFLAG_YES_NCQ = (1 << 9), /* force NCQ cap on */ +- AHCI_HFLAG_NO_SUSPEND = (1 << 10), /* don't suspend */ +- AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as +- link offline */ +- AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */ +- AHCI_HFLAG_NO_FPDMA_AA = (1 << 13), /* no FPDMA AA */ +- AHCI_HFLAG_YES_FBS = (1 << 14), /* force FBS cap on */ +- AHCI_HFLAG_DELAY_ENGINE = (1 << 15), /* do not start engine on +- port start (wait until +- error-handling stage) */ +- AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */ +- AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */ ++ AHCI_HFLAG_NO_NCQ = BIT(0), ++ AHCI_HFLAG_IGN_IRQ_IF_ERR = BIT(1), /* ignore IRQ_IF_ERR */ ++ AHCI_HFLAG_IGN_SERR_INTERNAL = BIT(2), /* ignore SERR_INTERNAL */ ++ AHCI_HFLAG_32BIT_ONLY = BIT(3), /* force 32bit */ ++ AHCI_HFLAG_MV_PATA = BIT(4), /* PATA port */ ++ AHCI_HFLAG_NO_MSI = BIT(5), /* no PCI MSI */ ++ AHCI_HFLAG_NO_PMP = BIT(6), /* no PMP */ ++ AHCI_HFLAG_SECT255 = BIT(8), /* max 255 sectors */ ++ AHCI_HFLAG_YES_NCQ = BIT(9), /* force NCQ cap on */ ++ AHCI_HFLAG_NO_SUSPEND = BIT(10), /* don't suspend */ ++ AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = BIT(11), /* treat SRST timeout as ++ link offline */ ++ AHCI_HFLAG_NO_SNTF = BIT(12), /* no sntf */ ++ AHCI_HFLAG_NO_FPDMA_AA = BIT(13), /* no FPDMA AA */ ++ AHCI_HFLAG_YES_FBS = BIT(14), /* force FBS cap on */ ++ AHCI_HFLAG_DELAY_ENGINE = BIT(15), /* do not start engine on ++ port start (wait until ++ error-handling stage) */ ++ AHCI_HFLAG_NO_DEVSLP = BIT(17), /* no device sleep */ ++ AHCI_HFLAG_NO_FBS = BIT(18), /* no FBS */ + + #ifdef CONFIG_PCI_MSI +- AHCI_HFLAG_MULTI_MSI = (1 << 20), /* per-port MSI(-X) */ ++ AHCI_HFLAG_MULTI_MSI = BIT(20), /* per-port MSI(-X) */ + #else + /* compile out MSI infrastructure */ + AHCI_HFLAG_MULTI_MSI = 0, + #endif +- AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */ +- AHCI_HFLAG_YES_ALPM = (1 << 23), /* force ALPM cap on */ +- AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read +- only registers */ +- AHCI_HFLAG_IS_MOBILE = (1 << 25), /* mobile chipset, use ++ AHCI_HFLAG_WAKE_BEFORE_STOP = BIT(22), /* wake before DMA stop */ ++ AHCI_HFLAG_YES_ALPM = BIT(23), /* force ALPM cap on */ ++ AHCI_HFLAG_NO_WRITE_TO_RO = BIT(24), /* don't write to read ++ only registers */ ++ AHCI_HFLAG_IS_MOBILE = BIT(25), /* mobile chipset, use + SATA_MOBILE_LPM_POLICY + as default lpm_policy */ + AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during +@@ -258,22 +260,22 @@ enum { + EM_MAX_RETRY = 5, + + /* em_ctl bits */ +- EM_CTL_RST = (1 << 9), /* Reset */ +- EM_CTL_TM = (1 << 8), /* Transmit Message */ +- EM_CTL_MR = (1 << 0), /* Message Received */ +- EM_CTL_ALHD = (1 << 26), /* Activity LED */ +- EM_CTL_XMT = (1 << 25), /* Transmit Only */ +- EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ +- EM_CTL_SGPIO = (1 << 19), /* SGPIO messages supported */ +- EM_CTL_SES = (1 << 18), /* SES-2 messages supported */ +- EM_CTL_SAFTE = (1 << 17), /* SAF-TE messages supported */ +- EM_CTL_LED = (1 << 16), /* LED messages supported */ ++ EM_CTL_RST = BIT(9), /* Reset */ ++ EM_CTL_TM = BIT(8), /* Transmit Message */ ++ EM_CTL_MR = BIT(0), /* Message Received */ ++ EM_CTL_ALHD = BIT(26), /* Activity LED */ ++ EM_CTL_XMT = BIT(25), /* Transmit Only */ ++ EM_CTL_SMB = BIT(24), /* Single Message Buffer */ ++ EM_CTL_SGPIO = BIT(19), /* SGPIO messages supported */ ++ EM_CTL_SES = BIT(18), /* SES-2 messages supported */ ++ EM_CTL_SAFTE = BIT(17), /* SAF-TE messages supported */ ++ EM_CTL_LED = BIT(16), /* LED messages supported */ + + /* em message type */ +- EM_MSG_TYPE_LED = (1 << 0), /* LED */ +- EM_MSG_TYPE_SAFTE = (1 << 1), /* SAF-TE */ +- EM_MSG_TYPE_SES2 = (1 << 2), /* SES-2 */ +- EM_MSG_TYPE_SGPIO = (1 << 3), /* SGPIO */ ++ EM_MSG_TYPE_LED = BIT(0), /* LED */ ++ EM_MSG_TYPE_SAFTE = BIT(1), /* SAF-TE */ ++ EM_MSG_TYPE_SES2 = BIT(2), /* SES-2 */ ++ EM_MSG_TYPE_SGPIO = BIT(3), /* SGPIO */ + }; + + struct ahci_cmd_hdr { +-- +2.34.1 + diff --git a/board/octavo/osd32mp1-brk/patches/linux/linux.hash b/board/octavo/osd32mp1-brk/patches/linux/linux.hash new file mode 100644 index 0000000000..ec9218e388 --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c2e22c6d13e5970839231ca29cfbe3bb66ef4d4d1cd3c2b5afb61f591f89d71a linux-v5.10-stm32mp-r2.1-git4.tar.gz diff --git a/board/octavo/osd32mp1-brk/patches/uboot/uboot.hash b/board/octavo/osd32mp1-brk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..6b51c2685b --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 49a2470ecd29c29cc712861372335c9e2020e5c56392c6417faf66dc7a782261 uboot-v2020.10-stm32mp-r2.1-git4.tar.gz diff --git a/board/octavo/osd32mp1-red/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/board/octavo/osd32mp1-red/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..335c18553a --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,61 @@ +From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001 +From: Marco Felsch +Date: Wed, 9 Nov 2022 12:59:09 +0100 +Subject: [PATCH] feat(build): add support for new binutils versions + +Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces +of a new warning when linking the bl*.elf in the form: + + ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack + ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker + ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions + ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions + +These new warnings are enbaled by default to secure elf binaries: + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 + - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774 + +Fix it in a similar way to what the Linux kernel does, see: +https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/ + +Following the reasoning there, we set "-z noexecstack" for all linkers +(although LLVM's LLD defaults to it) and optional add +--no-warn-rwx-segments since this a ld.bfd related. + +Signed-off-by: Marco Felsch +Signed-off-by: Robert Schwebel +Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617 +Signed-off-by: Heiko Thiery +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ddb7b844..470956b19 100644 +--- a/Makefile ++++ b/Makefile +@@ -416,6 +416,8 @@ endif + + GCC_V_OUTPUT := $(shell $(CC) -v 2>&1) + ++TF_LDFLAGS += -z noexecstack ++ + # LD = armlink + ifneq ($(findstring armlink,$(notdir $(LD))),) + TF_LDFLAGS += --diag_error=warning --lto_level=O1 +@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) + + # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other + else +-TF_LDFLAGS += --fatal-warnings -O1 ++# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we ++# are not loaded by a elf loader. ++TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments) ++TF_LDFLAGS += -O1 + TF_LDFLAGS += --gc-sections + # ld.lld doesn't recognize the errata flags, + # therefore don't add those in that case +-- +2.30.2 + diff --git a/board/octavo/osd32mp1-red/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/octavo/osd32mp1-red/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..2ba1cc0972 --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 83d744c155097f27682a06fdba5f7e976fde6edf61474d40a5a44e71862a3822 arm-trusted-firmware-v2.4-stm32mp-r1-git4.tar.gz diff --git a/board/octavo/osd32mp1-red/patches/linux/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch b/board/octavo/osd32mp1-red/patches/linux/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch new file mode 100644 index 0000000000..fe5402e639 --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/linux/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch @@ -0,0 +1,357 @@ +From 201719b670b0861f5846ebcda1ad3e4626ae0a33 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Sat, 3 Dec 2022 11:54:25 +0100 +Subject: [PATCH] ata: ahci: fix enum constants for gcc-13 + +commit f07788079f515ca4a681c5f595bdad19cfbd7b1d upstream. + +gcc-13 slightly changes the type of constant expressions that are defined +in an enum, which triggers a compile time sanity check in libata: + +linux/drivers/ata/libahci.c: In function 'ahci_led_store': +linux/include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) +357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) + +The new behavior is that sizeof() returns the same value for the +constant as it does for the enum type, which is generally more sensible +and consistent. + +The problem in libata is that it contains a single enum definition for +lots of unrelated constants, some of which are large positive (unsigned) +integers like 0xffffffff, while others like (1<<31) are interpreted as +negative integers, and this forces the enum type to become 64 bit wide +even though most constants would still fit into a signed 32-bit 'int'. + +Fix this by changing the entire enum definition to use BIT(x) in place +of (1< +Cc: linux-ide@vger.kernel.org +Cc: Damien Le Moal +Cc: stable@vger.kernel.org +Cc: Randy Dunlap +Signed-off-by: Arnd Bergmann +Tested-by: Luis Machado +Signed-off-by: Damien Le Moal +[Backport to linux-4.19.y] +Signed-off-by: Paul Barker +Signed-off-by: Greg Kroah-Hartman +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 +--- + drivers/ata/ahci.h | 232 +++++++++++++++++++++++---------------------- + 1 file changed, 117 insertions(+), 115 deletions(-) + +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index d1f284f0c83d..de1bc374e1b6 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + /* Enclosure Management Control */ + #define EM_CTRL_MSG_TYPE 0x000f0000 +@@ -54,12 +55,12 @@ enum { + AHCI_PORT_PRIV_FBS_DMA_SZ = AHCI_CMD_SLOT_SZ + + AHCI_CMD_TBL_AR_SZ + + (AHCI_RX_FIS_SZ * 16), +- AHCI_IRQ_ON_SG = (1 << 31), +- AHCI_CMD_ATAPI = (1 << 5), +- AHCI_CMD_WRITE = (1 << 6), +- AHCI_CMD_PREFETCH = (1 << 7), +- AHCI_CMD_RESET = (1 << 8), +- AHCI_CMD_CLR_BUSY = (1 << 10), ++ AHCI_IRQ_ON_SG = BIT(31), ++ AHCI_CMD_ATAPI = BIT(5), ++ AHCI_CMD_WRITE = BIT(6), ++ AHCI_CMD_PREFETCH = BIT(7), ++ AHCI_CMD_RESET = BIT(8), ++ AHCI_CMD_CLR_BUSY = BIT(10), + + RX_FIS_PIO_SETUP = 0x20, /* offset of PIO Setup FIS data */ + RX_FIS_D2H_REG = 0x40, /* offset of D2H Register FIS data */ +@@ -77,37 +78,37 @@ enum { + HOST_CAP2 = 0x24, /* host capabilities, extended */ + + /* HOST_CTL bits */ +- HOST_RESET = (1 << 0), /* reset controller; self-clear */ +- HOST_IRQ_EN = (1 << 1), /* global IRQ enable */ +- HOST_MRSM = (1 << 2), /* MSI Revert to Single Message */ +- HOST_AHCI_EN = (1 << 31), /* AHCI enabled */ ++ HOST_RESET = BIT(0), /* reset controller; self-clear */ ++ HOST_IRQ_EN = BIT(1), /* global IRQ enable */ ++ HOST_MRSM = BIT(2), /* MSI Revert to Single Message */ ++ HOST_AHCI_EN = BIT(31), /* AHCI enabled */ + + /* HOST_CAP bits */ +- HOST_CAP_SXS = (1 << 5), /* Supports External SATA */ +- HOST_CAP_EMS = (1 << 6), /* Enclosure Management support */ +- HOST_CAP_CCC = (1 << 7), /* Command Completion Coalescing */ +- HOST_CAP_PART = (1 << 13), /* Partial state capable */ +- HOST_CAP_SSC = (1 << 14), /* Slumber state capable */ +- HOST_CAP_PIO_MULTI = (1 << 15), /* PIO multiple DRQ support */ +- HOST_CAP_FBS = (1 << 16), /* FIS-based switching support */ +- HOST_CAP_PMP = (1 << 17), /* Port Multiplier support */ +- HOST_CAP_ONLY = (1 << 18), /* Supports AHCI mode only */ +- HOST_CAP_CLO = (1 << 24), /* Command List Override support */ +- HOST_CAP_LED = (1 << 25), /* Supports activity LED */ +- HOST_CAP_ALPM = (1 << 26), /* Aggressive Link PM support */ +- HOST_CAP_SSS = (1 << 27), /* Staggered Spin-up */ +- HOST_CAP_MPS = (1 << 28), /* Mechanical presence switch */ +- HOST_CAP_SNTF = (1 << 29), /* SNotification register */ +- HOST_CAP_NCQ = (1 << 30), /* Native Command Queueing */ +- HOST_CAP_64 = (1 << 31), /* PCI DAC (64-bit DMA) support */ ++ HOST_CAP_SXS = BIT(5), /* Supports External SATA */ ++ HOST_CAP_EMS = BIT(6), /* Enclosure Management support */ ++ HOST_CAP_CCC = BIT(7), /* Command Completion Coalescing */ ++ HOST_CAP_PART = BIT(13), /* Partial state capable */ ++ HOST_CAP_SSC = BIT(14), /* Slumber state capable */ ++ HOST_CAP_PIO_MULTI = BIT(15), /* PIO multiple DRQ support */ ++ HOST_CAP_FBS = BIT(16), /* FIS-based switching support */ ++ HOST_CAP_PMP = BIT(17), /* Port Multiplier support */ ++ HOST_CAP_ONLY = BIT(18), /* Supports AHCI mode only */ ++ HOST_CAP_CLO = BIT(24), /* Command List Override support */ ++ HOST_CAP_LED = BIT(25), /* Supports activity LED */ ++ HOST_CAP_ALPM = BIT(26), /* Aggressive Link PM support */ ++ HOST_CAP_SSS = BIT(27), /* Staggered Spin-up */ ++ HOST_CAP_MPS = BIT(28), /* Mechanical presence switch */ ++ HOST_CAP_SNTF = BIT(29), /* SNotification register */ ++ HOST_CAP_NCQ = BIT(30), /* Native Command Queueing */ ++ HOST_CAP_64 = BIT(31), /* PCI DAC (64-bit DMA) support */ + + /* HOST_CAP2 bits */ +- HOST_CAP2_BOH = (1 << 0), /* BIOS/OS handoff supported */ +- HOST_CAP2_NVMHCI = (1 << 1), /* NVMHCI supported */ +- HOST_CAP2_APST = (1 << 2), /* Automatic partial to slumber */ +- HOST_CAP2_SDS = (1 << 3), /* Support device sleep */ +- HOST_CAP2_SADM = (1 << 4), /* Support aggressive DevSlp */ +- HOST_CAP2_DESO = (1 << 5), /* DevSlp from slumber only */ ++ HOST_CAP2_BOH = BIT(0), /* BIOS/OS handoff supported */ ++ HOST_CAP2_NVMHCI = BIT(1), /* NVMHCI supported */ ++ HOST_CAP2_APST = BIT(2), /* Automatic partial to slumber */ ++ HOST_CAP2_SDS = BIT(3), /* Support device sleep */ ++ HOST_CAP2_SADM = BIT(4), /* Support aggressive DevSlp */ ++ HOST_CAP2_DESO = BIT(5), /* DevSlp from slumber only */ + + /* registers for each SATA port */ + PORT_LST_ADDR = 0x00, /* command list DMA addr */ +@@ -129,24 +130,25 @@ enum { + PORT_DEVSLP = 0x44, /* device sleep */ + + /* PORT_IRQ_{STAT,MASK} bits */ +- PORT_IRQ_COLD_PRES = (1 << 31), /* cold presence detect */ +- PORT_IRQ_TF_ERR = (1 << 30), /* task file error */ +- PORT_IRQ_HBUS_ERR = (1 << 29), /* host bus fatal error */ +- PORT_IRQ_HBUS_DATA_ERR = (1 << 28), /* host bus data error */ +- PORT_IRQ_IF_ERR = (1 << 27), /* interface fatal error */ +- PORT_IRQ_IF_NONFATAL = (1 << 26), /* interface non-fatal error */ +- PORT_IRQ_OVERFLOW = (1 << 24), /* xfer exhausted available S/G */ +- PORT_IRQ_BAD_PMP = (1 << 23), /* incorrect port multiplier */ +- +- PORT_IRQ_PHYRDY = (1 << 22), /* PhyRdy changed */ +- PORT_IRQ_DEV_ILCK = (1 << 7), /* device interlock */ +- PORT_IRQ_CONNECT = (1 << 6), /* port connect change status */ +- PORT_IRQ_SG_DONE = (1 << 5), /* descriptor processed */ +- PORT_IRQ_UNK_FIS = (1 << 4), /* unknown FIS rx'd */ +- PORT_IRQ_SDB_FIS = (1 << 3), /* Set Device Bits FIS rx'd */ +- PORT_IRQ_DMAS_FIS = (1 << 2), /* DMA Setup FIS rx'd */ +- PORT_IRQ_PIOS_FIS = (1 << 1), /* PIO Setup FIS rx'd */ +- PORT_IRQ_D2H_REG_FIS = (1 << 0), /* D2H Register FIS rx'd */ ++ PORT_IRQ_COLD_PRES = BIT(31), /* cold presence detect */ ++ PORT_IRQ_TF_ERR = BIT(30), /* task file error */ ++ PORT_IRQ_HBUS_ERR = BIT(29), /* host bus fatal error */ ++ PORT_IRQ_HBUS_DATA_ERR = BIT(28), /* host bus data error */ ++ PORT_IRQ_IF_ERR = BIT(27), /* interface fatal error */ ++ PORT_IRQ_IF_NONFATAL = BIT(26), /* interface non-fatal error */ ++ PORT_IRQ_OVERFLOW = BIT(24), /* xfer exhausted available S/G */ ++ PORT_IRQ_BAD_PMP = BIT(23), /* incorrect port multiplier */ ++ ++ PORT_IRQ_PHYRDY = BIT(22), /* PhyRdy changed */ ++ PORT_IRQ_DEV_ILCK = BIT(7), /* device interlock */ ++ PORT_IRQ_DMPS = BIT(7), /* mechanical presence status */ ++ PORT_IRQ_CONNECT = BIT(6), /* port connect change status */ ++ PORT_IRQ_SG_DONE = BIT(5), /* descriptor processed */ ++ PORT_IRQ_UNK_FIS = BIT(4), /* unknown FIS rx'd */ ++ PORT_IRQ_SDB_FIS = BIT(3), /* Set Device Bits FIS rx'd */ ++ PORT_IRQ_DMAS_FIS = BIT(2), /* DMA Setup FIS rx'd */ ++ PORT_IRQ_PIOS_FIS = BIT(1), /* PIO Setup FIS rx'd */ ++ PORT_IRQ_D2H_REG_FIS = BIT(0), /* D2H Register FIS rx'd */ + + PORT_IRQ_FREEZE = PORT_IRQ_HBUS_ERR | + PORT_IRQ_IF_ERR | +@@ -162,34 +164,34 @@ enum { + PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS, + + /* PORT_CMD bits */ +- PORT_CMD_ASP = (1 << 27), /* Aggressive Slumber/Partial */ +- PORT_CMD_ALPE = (1 << 26), /* Aggressive Link PM enable */ +- PORT_CMD_ATAPI = (1 << 24), /* Device is ATAPI */ +- PORT_CMD_FBSCP = (1 << 22), /* FBS Capable Port */ +- PORT_CMD_ESP = (1 << 21), /* External Sata Port */ +- PORT_CMD_HPCP = (1 << 18), /* HotPlug Capable Port */ +- PORT_CMD_PMP = (1 << 17), /* PMP attached */ +- PORT_CMD_LIST_ON = (1 << 15), /* cmd list DMA engine running */ +- PORT_CMD_FIS_ON = (1 << 14), /* FIS DMA engine running */ +- PORT_CMD_FIS_RX = (1 << 4), /* Enable FIS receive DMA engine */ +- PORT_CMD_CLO = (1 << 3), /* Command list override */ +- PORT_CMD_POWER_ON = (1 << 2), /* Power up device */ +- PORT_CMD_SPIN_UP = (1 << 1), /* Spin up device */ +- PORT_CMD_START = (1 << 0), /* Enable port DMA engine */ +- +- PORT_CMD_ICC_MASK = (0xf << 28), /* i/f ICC state mask */ +- PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */ +- PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */ +- PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */ ++ PORT_CMD_ASP = BIT(27), /* Aggressive Slumber/Partial */ ++ PORT_CMD_ALPE = BIT(26), /* Aggressive Link PM enable */ ++ PORT_CMD_ATAPI = BIT(24), /* Device is ATAPI */ ++ PORT_CMD_FBSCP = BIT(22), /* FBS Capable Port */ ++ PORT_CMD_ESP = BIT(21), /* External Sata Port */ ++ PORT_CMD_HPCP = BIT(18), /* HotPlug Capable Port */ ++ PORT_CMD_PMP = BIT(17), /* PMP attached */ ++ PORT_CMD_LIST_ON = BIT(15), /* cmd list DMA engine running */ ++ PORT_CMD_FIS_ON = BIT(14), /* FIS DMA engine running */ ++ PORT_CMD_FIS_RX = BIT(4), /* Enable FIS receive DMA engine */ ++ PORT_CMD_CLO = BIT(3), /* Command list override */ ++ PORT_CMD_POWER_ON = BIT(2), /* Power up device */ ++ PORT_CMD_SPIN_UP = BIT(1), /* Spin up device */ ++ PORT_CMD_START = BIT(0), /* Enable port DMA engine */ ++ ++ PORT_CMD_ICC_MASK = (0xfu << 28), /* i/f ICC state mask */ ++ PORT_CMD_ICC_ACTIVE = (0x1u << 28), /* Put i/f in active state */ ++ PORT_CMD_ICC_PARTIAL = (0x2u << 28), /* Put i/f in partial state */ ++ PORT_CMD_ICC_SLUMBER = (0x6u << 28), /* Put i/f in slumber state */ + + /* PORT_FBS bits */ + PORT_FBS_DWE_OFFSET = 16, /* FBS device with error offset */ + PORT_FBS_ADO_OFFSET = 12, /* FBS active dev optimization offset */ + PORT_FBS_DEV_OFFSET = 8, /* FBS device to issue offset */ + PORT_FBS_DEV_MASK = (0xf << PORT_FBS_DEV_OFFSET), /* FBS.DEV */ +- PORT_FBS_SDE = (1 << 2), /* FBS single device error */ +- PORT_FBS_DEC = (1 << 1), /* FBS device error clear */ +- PORT_FBS_EN = (1 << 0), /* Enable FBS */ ++ PORT_FBS_SDE = BIT(2), /* FBS single device error */ ++ PORT_FBS_DEC = BIT(1), /* FBS device error clear */ ++ PORT_FBS_EN = BIT(0), /* Enable FBS */ + + /* PORT_DEVSLP bits */ + PORT_DEVSLP_DM_OFFSET = 25, /* DITO multiplier offset */ +@@ -197,45 +199,45 @@ enum { + PORT_DEVSLP_DITO_OFFSET = 15, /* DITO offset */ + PORT_DEVSLP_MDAT_OFFSET = 10, /* Minimum assertion time */ + PORT_DEVSLP_DETO_OFFSET = 2, /* DevSlp exit timeout */ +- PORT_DEVSLP_DSP = (1 << 1), /* DevSlp present */ +- PORT_DEVSLP_ADSE = (1 << 0), /* Aggressive DevSlp enable */ ++ PORT_DEVSLP_DSP = BIT(1), /* DevSlp present */ ++ PORT_DEVSLP_ADSE = BIT(0), /* Aggressive DevSlp enable */ + + /* hpriv->flags bits */ + + #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) + +- AHCI_HFLAG_NO_NCQ = (1 << 0), +- AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */ +- AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */ +- AHCI_HFLAG_32BIT_ONLY = (1 << 3), /* force 32bit */ +- AHCI_HFLAG_MV_PATA = (1 << 4), /* PATA port */ +- AHCI_HFLAG_NO_MSI = (1 << 5), /* no PCI MSI */ +- AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */ +- AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */ +- AHCI_HFLAG_YES_NCQ = (1 << 9), /* force NCQ cap on */ +- AHCI_HFLAG_NO_SUSPEND = (1 << 10), /* don't suspend */ +- AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as +- link offline */ +- AHCI_HFLAG_NO_SNTF = (1 << 12), /* no sntf */ +- AHCI_HFLAG_NO_FPDMA_AA = (1 << 13), /* no FPDMA AA */ +- AHCI_HFLAG_YES_FBS = (1 << 14), /* force FBS cap on */ +- AHCI_HFLAG_DELAY_ENGINE = (1 << 15), /* do not start engine on +- port start (wait until +- error-handling stage) */ +- AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */ +- AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */ ++ AHCI_HFLAG_NO_NCQ = BIT(0), ++ AHCI_HFLAG_IGN_IRQ_IF_ERR = BIT(1), /* ignore IRQ_IF_ERR */ ++ AHCI_HFLAG_IGN_SERR_INTERNAL = BIT(2), /* ignore SERR_INTERNAL */ ++ AHCI_HFLAG_32BIT_ONLY = BIT(3), /* force 32bit */ ++ AHCI_HFLAG_MV_PATA = BIT(4), /* PATA port */ ++ AHCI_HFLAG_NO_MSI = BIT(5), /* no PCI MSI */ ++ AHCI_HFLAG_NO_PMP = BIT(6), /* no PMP */ ++ AHCI_HFLAG_SECT255 = BIT(8), /* max 255 sectors */ ++ AHCI_HFLAG_YES_NCQ = BIT(9), /* force NCQ cap on */ ++ AHCI_HFLAG_NO_SUSPEND = BIT(10), /* don't suspend */ ++ AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = BIT(11), /* treat SRST timeout as ++ link offline */ ++ AHCI_HFLAG_NO_SNTF = BIT(12), /* no sntf */ ++ AHCI_HFLAG_NO_FPDMA_AA = BIT(13), /* no FPDMA AA */ ++ AHCI_HFLAG_YES_FBS = BIT(14), /* force FBS cap on */ ++ AHCI_HFLAG_DELAY_ENGINE = BIT(15), /* do not start engine on ++ port start (wait until ++ error-handling stage) */ ++ AHCI_HFLAG_NO_DEVSLP = BIT(17), /* no device sleep */ ++ AHCI_HFLAG_NO_FBS = BIT(18), /* no FBS */ + + #ifdef CONFIG_PCI_MSI +- AHCI_HFLAG_MULTI_MSI = (1 << 20), /* per-port MSI(-X) */ ++ AHCI_HFLAG_MULTI_MSI = BIT(20), /* per-port MSI(-X) */ + #else + /* compile out MSI infrastructure */ + AHCI_HFLAG_MULTI_MSI = 0, + #endif +- AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */ +- AHCI_HFLAG_YES_ALPM = (1 << 23), /* force ALPM cap on */ +- AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read +- only registers */ +- AHCI_HFLAG_IS_MOBILE = (1 << 25), /* mobile chipset, use ++ AHCI_HFLAG_WAKE_BEFORE_STOP = BIT(22), /* wake before DMA stop */ ++ AHCI_HFLAG_YES_ALPM = BIT(23), /* force ALPM cap on */ ++ AHCI_HFLAG_NO_WRITE_TO_RO = BIT(24), /* don't write to read ++ only registers */ ++ AHCI_HFLAG_IS_MOBILE = BIT(25), /* mobile chipset, use + SATA_MOBILE_LPM_POLICY + as default lpm_policy */ + AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during +@@ -258,22 +260,22 @@ enum { + EM_MAX_RETRY = 5, + + /* em_ctl bits */ +- EM_CTL_RST = (1 << 9), /* Reset */ +- EM_CTL_TM = (1 << 8), /* Transmit Message */ +- EM_CTL_MR = (1 << 0), /* Message Received */ +- EM_CTL_ALHD = (1 << 26), /* Activity LED */ +- EM_CTL_XMT = (1 << 25), /* Transmit Only */ +- EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ +- EM_CTL_SGPIO = (1 << 19), /* SGPIO messages supported */ +- EM_CTL_SES = (1 << 18), /* SES-2 messages supported */ +- EM_CTL_SAFTE = (1 << 17), /* SAF-TE messages supported */ +- EM_CTL_LED = (1 << 16), /* LED messages supported */ ++ EM_CTL_RST = BIT(9), /* Reset */ ++ EM_CTL_TM = BIT(8), /* Transmit Message */ ++ EM_CTL_MR = BIT(0), /* Message Received */ ++ EM_CTL_ALHD = BIT(26), /* Activity LED */ ++ EM_CTL_XMT = BIT(25), /* Transmit Only */ ++ EM_CTL_SMB = BIT(24), /* Single Message Buffer */ ++ EM_CTL_SGPIO = BIT(19), /* SGPIO messages supported */ ++ EM_CTL_SES = BIT(18), /* SES-2 messages supported */ ++ EM_CTL_SAFTE = BIT(17), /* SAF-TE messages supported */ ++ EM_CTL_LED = BIT(16), /* LED messages supported */ + + /* em message type */ +- EM_MSG_TYPE_LED = (1 << 0), /* LED */ +- EM_MSG_TYPE_SAFTE = (1 << 1), /* SAF-TE */ +- EM_MSG_TYPE_SES2 = (1 << 2), /* SES-2 */ +- EM_MSG_TYPE_SGPIO = (1 << 3), /* SGPIO */ ++ EM_MSG_TYPE_LED = BIT(0), /* LED */ ++ EM_MSG_TYPE_SAFTE = BIT(1), /* SAF-TE */ ++ EM_MSG_TYPE_SES2 = BIT(2), /* SES-2 */ ++ EM_MSG_TYPE_SGPIO = BIT(3), /* SGPIO */ + }; + + struct ahci_cmd_hdr { +-- +2.34.1 + diff --git a/board/octavo/osd32mp1-red/patches/linux/linux.hash b/board/octavo/osd32mp1-red/patches/linux/linux.hash new file mode 100644 index 0000000000..ec9218e388 --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c2e22c6d13e5970839231ca29cfbe3bb66ef4d4d1cd3c2b5afb61f591f89d71a linux-v5.10-stm32mp-r2.1-git4.tar.gz diff --git a/board/octavo/osd32mp1-red/patches/uboot/uboot.hash b/board/octavo/osd32mp1-red/patches/uboot/uboot.hash new file mode 100644 index 0000000000..6b51c2685b --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 49a2470ecd29c29cc712861372335c9e2020e5c56392c6417faf66dc7a782261 uboot-v2020.10-stm32mp-r2.1-git4.tar.gz diff --git a/board/olimex/a20_olinuxino/patches/linux/linux.hash b/board/olimex/a20_olinuxino/patches/linux/linux.hash index 4769129ac1..52688f83e8 100644 --- a/board/olimex/a20_olinuxino/patches/linux/linux.hash +++ b/board/olimex/a20_olinuxino/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 5fae869d6a24055c16ffc2d92669e3fb2b258e34d36c850bb8cf9def417ecfa0 linux-6.6.54.tar.xz +sha256 c435bd74d1c21fc5a950781a50d78bae2b93944144694843359948ad3afc72a5 linux-6.12.50.tar.xz diff --git a/board/olimex/a20_olinuxino/patches/uboot/uboot.hash b/board/olimex/a20_olinuxino/patches/uboot/uboot.hash index 8491435683..a2725383c9 100644 --- a/board/olimex/a20_olinuxino/patches/uboot/uboot.hash +++ b/board/olimex/a20_olinuxino/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/olimex/stmp1_olinuxino/patches/linux/linux.hash b/board/olimex/stmp1_olinuxino/patches/linux/linux.hash index 8691d5ffd3..48b74dae9a 100644 --- a/board/olimex/stmp1_olinuxino/patches/linux/linux.hash +++ b/board/olimex/stmp1_olinuxino/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 5d3ca43b81056305860d7407c871eac4f8eafa603029ee67816574a31444fd93 linux-fc74113e14d76aea9482264ff42e07397b94553d-git4.tar.gz +sha256 58c00229e95817918f9310f5c9adb0e3d1cfa7f28377aa7292431a110b6111a9 linux-e9b70672e21c96c02d9a731a9379baa897ea2ac7-git4.tar.gz diff --git a/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash b/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash index a991a1922f..153acf3828 100644 --- a/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash +++ b/board/olimex/stmp1_olinuxino/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6aaa18a9023db29ceaad5bca240605990b68a6bf348aaefad0bee8be8d37648e uboot-efadf793a0a5924e2c96362dc1df3e56622ebb97-git4.tar.gz +sha256 1b99d3fd4fc778562c011de42193f9c29b3f2d0d7717ba22ac0c412446186382 uboot-23d8f769a94ae230b7a68fa812cc3c4dc0cbf1c9-git4.tar.gz diff --git a/board/orangepi/orangepi-5-plus/extlinux.conf b/board/orangepi/orangepi-5-plus/extlinux.conf new file mode 100644 index 0000000000..c6421c3bf4 --- /dev/null +++ b/board/orangepi/orangepi-5-plus/extlinux.conf @@ -0,0 +1,4 @@ +label OrangePi 5 Plus Linux + kernel /boot/Image + devicetreedir /boot + append root=PARTLABEL=rootfs earlycon rootwait panic=10 diff --git a/board/orangepi/orangepi-5-plus/genimage.cfg b/board/orangepi/orangepi-5-plus/genimage.cfg new file mode 100644 index 0000000000..1f3ff3ec25 --- /dev/null +++ b/board/orangepi/orangepi-5-plus/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-rockchip.bin" + offset = 32K + } + + partition uboot-env { + partition-type-uuid = 3de21764-95bd-54bd-a5c3-4abe786f38a8 + offset = 16M + size = 64K + } + + partition rootfs { + partition-type-uuid = L + image = "rootfs.ext2" + bootable = true + } +} diff --git a/board/orangepi/orangepi-5-plus/linux.fragment b/board/orangepi/orangepi-5-plus/linux.fragment new file mode 100644 index 0000000000..d5a4a6f24f --- /dev/null +++ b/board/orangepi/orangepi-5-plus/linux.fragment @@ -0,0 +1,9 @@ +# net +CONFIG_R8169=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y + +# usbcam +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_UVC_COMMON=y diff --git a/board/orangepi/orangepi-5-plus/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-5-plus/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/orangepi/orangepi-5-plus/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/orangepi/orangepi-5-plus/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-5-plus/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-5-plus/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-5-plus/patches/linux/linux.hash b/board/orangepi/orangepi-5-plus/patches/linux/linux.hash new file mode 100644 index 0000000000..d00eed9a49 --- /dev/null +++ b/board/orangepi/orangepi-5-plus/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 6f35f821433d8421be7167990747c7c4a0c451958fb96883446301af13d71152 linux-6.12.4.tar.xz diff --git a/board/orangepi/orangepi-5-plus/patches/uboot/uboot.hash b/board/orangepi/orangepi-5-plus/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-5-plus/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/orangepi/orangepi-5-plus/post-build.sh b/board/orangepi/orangepi-5-plus/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/orangepi/orangepi-5-plus/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/orangepi/orangepi-5-plus/readme.txt b/board/orangepi/orangepi-5-plus/readme.txt new file mode 100644 index 0000000000..83f84a0efe --- /dev/null +++ b/board/orangepi/orangepi-5-plus/readme.txt @@ -0,0 +1,46 @@ +Intro +===== + +This default configuration allows to start experimenting with the Buildroot +environment for the OrangePi 5 Plus board. Default configuration brings up +the board and allows access through the serial console. + +Orangepi 5 Plus links: +- http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5-plus-32GB.html + +Upstream support +================ + +Linux v6.12.x provides a good starting point for experiments with this board. +All the basic features are already enabled including all the basic low-speed +I2C/SPI/PWM peripherals, ethernet networking, USB 2.0, PCIe, eMMC, Audio. +However advanced features such as graphics, display controllers, multimedia +codecs, camera and image processing units are still in work. For details and +updates check RK3588 hardware enablement status at Collabora gitlab, see: + +- https://gitlab.collabora.com/hardware-enablement/rockchip-3588/notes-for-rockchip-3588/-/blob/main/mainline-status.md + +Also keep an eye on RK3588 updates in kernel release announcements, e.g. +- https://kernelnewbies.org/Linux_6.12 + +How to Build +============ + $ make orangepi_5_plus_defconfig + $ make + +How to write the SD card +======================== + +Once the build process is finished there will be an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX status=progress + $ sudo sync + +Insert the micro SDcard into the Orangepi 5 Plus board and power it up. +The console is on the TTL Debug UART 3-pin connector which is located +near RTC connector and Type-C Power port. + +Note that baudrate for this board is 1500000 8N1. diff --git a/board/orangepi/orangepi-5-plus/u-boot.fragment b/board/orangepi/orangepi-5-plus/u-boot.fragment new file mode 100644 index 0000000000..ceba8d609a --- /dev/null +++ b/board/orangepi/orangepi-5-plus/u-boot.fragment @@ -0,0 +1,5 @@ +CONFIG_ENV_SIZE=0x10000 +CONFIG_PARTITION_TYPE_GUID=y +# CONFIG_ENV_IS_NOWHERE is not set +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_MMC_ENV_DEV=1 diff --git a/board/orangepi/orangepi-one/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-one/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-one/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-one/patches/linux/linux.hash b/board/orangepi/orangepi-one/patches/linux/linux.hash new file mode 100644 index 0000000000..aea771e7bf --- /dev/null +++ b/board/orangepi/orangepi-one/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/orangepi/orangepi-one/patches/uboot/uboot.hash b/board/orangepi/orangepi-one/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-one/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/orangepi/orangepi-pc-plus/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-pc-plus/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-pc-plus/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-pc-plus/patches/linux/linux.hash b/board/orangepi/orangepi-pc-plus/patches/linux/linux.hash new file mode 100644 index 0000000000..aea771e7bf --- /dev/null +++ b/board/orangepi/orangepi-pc-plus/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/orangepi/orangepi-pc-plus/patches/uboot/uboot.hash b/board/orangepi/orangepi-pc-plus/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-pc-plus/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/orangepi/orangepi-zero-plus2/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-zero-plus2/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-zero-plus2/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-zero-plus2/patches/linux/linux.hash b/board/orangepi/orangepi-zero-plus2/patches/linux/linux.hash new file mode 100644 index 0000000000..aea771e7bf --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/orangepi/orangepi-zero-plus2/patches/uboot/uboot.hash b/board/orangepi/orangepi-zero-plus2/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-zero-plus2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch index 6a5aa0bb63..600fd0f5b3 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch @@ -1,8 +1,7 @@ -From 321faaf4b78d46a0c77782c1798856746f0619e9 Mon Sep 17 00:00:00 2001 +From 7a24ce9f5045ac6faf66a08bbb814f3a82c919b1 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Fri, 19 May 2017 23:39:48 +0300 -Subject: [PATCH] ARM: dts: orange-pi-zero: specify XR819 WiFi chip - interrupts +Subject: [PATCH] ARM: dts: orange-pi-zero: specify XR819 WiFi chip interrupts The orange-pi-zero board has Allwinner XR819 SDIO wifi chip. The board dts file provides a node enabling mmc1 controller. Together with an @@ -17,12 +16,12 @@ Signed-off-by: Sergey Matyukevich 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index b7ca916d871d..4e1a9050c6b4 100644 +index 2a45770f7b83..667038973bb7 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -125,6 +125,9 @@ +@@ -152,6 +152,9 @@ &mmc1 { */ - xr819: sdio_wifi@1 { + xr819: wifi@1 { reg = <1>; + compatible = "xradio,xr819"; + interrupt-parent = <&pio>; @@ -31,5 +30,5 @@ index b7ca916d871d..4e1a9050c6b4 100644 }; -- -2.11.0 +2.47.1 diff --git a/board/orangepi/orangepi-zero/patches/linux/linux.hash b/board/orangepi/orangepi-zero/patches/linux/linux.hash new file mode 100644 index 0000000000..aea771e7bf --- /dev/null +++ b/board/orangepi/orangepi-zero/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/orangepi/orangepi-zero/patches/uboot/uboot.hash b/board/orangepi/orangepi-zero/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-zero/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8b3df439a0..8b77e1f165 100644 --- a/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/orangepi/orangepi-zero2w/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/orangepi/orangepi-zero2w/patches/linux/linux.hash b/board/orangepi/orangepi-zero2w/patches/linux/linux.hash index 5a6f308c7b..aea771e7bf 100644 --- a/board/orangepi/orangepi-zero2w/patches/linux/linux.hash +++ b/board/orangepi/orangepi-zero2w/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 9e723232d603ab45ebf043c34714c48f277ab195c29abcb8472f2a4c3a5a1995 linux-6.8.6.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash b/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash index 97a2b4eaf9..904fa56c02 100644 --- a/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash +++ b/board/orangepi/orangepi-zero2w/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/orangepi/orangepi-zero3/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/orangepi/orangepi-zero3/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/board/orangepi/orangepi-zero3/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/orangepi/orangepi-zero3/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-zero3/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-zero3/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-zero3/patches/linux/linux.hash b/board/orangepi/orangepi-zero3/patches/linux/linux.hash new file mode 100644 index 0000000000..80e573540f --- /dev/null +++ b/board/orangepi/orangepi-zero3/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 d450ab215de4e1f8bb85e0f4216760fa33fd024b4526b144f4ce0d9012b29c9e linux-6.12.6.tar.xz diff --git a/board/orangepi/orangepi-zero3/patches/uboot/uboot.hash b/board/orangepi/orangepi-zero3/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-zero3/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/pc/patches/linux-headers/linux-headers.hash b/board/pc/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/pc/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/pc/patches/linux/linux.hash b/board/pc/patches/linux/linux.hash new file mode 100644 index 0000000000..bf565408ee --- /dev/null +++ b/board/pc/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 e82fe40871743048226987bd349ef107168b15aab90140e872ca4ed470922e25 linux-6.12.47.tar.xz diff --git a/board/pc/readme.txt b/board/pc/readme.txt index 99e8f442ea..18b1e3dcf0 100644 --- a/board/pc/readme.txt +++ b/board/pc/readme.txt @@ -17,14 +17,14 @@ Bare PC sample config $ make -2. Write the pendrive +2. Write the image - The build process will create a pendrive image called sdcard.img in + The build process will create a all-in-one image called disk.img in output/images. Write the image to a pendrive: - $ dd if=output/images/disk.img of=/dev/sdc; sync + $ dd if=output/images/disk.img of=/dev/sdX; sync Once it's done insert it into the target PC and boot. @@ -43,7 +43,9 @@ Emulation in qemu (BIOS) Since the driver will show up in the virtual machine as /dev/vda, change board/pc/grub-bios.cfg to use root=/dev/vda1 instead of - root=/dev/sda1. Then rebuild grub2 and the image. + root=/dev/sda1. Then rebuild grub2 and the image: + + make grub2-rebuild && make 2. Run the emulation with: diff --git a/board/pine64/rockpro64-ebbr/genimage.cfg b/board/pine64/rockpro64-ebbr/genimage.cfg new file mode 100644 index 0000000000..be1aadbaf8 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/genimage.cfg @@ -0,0 +1,43 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 64M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition loader1 { + image = "idbloader.img" + partition-type-uuid = 8DA63339-0007-60C0-C436-083AC8230908 + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + partition-type-uuid = 8DA63339-0007-60C0-C436-083AC8230908 + offset = 8M + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = esp + offset = 16M + bootable = true + } + + partition root { + partition-type-uuid = root-arm64 + image = "rootfs.ext2" + } +} diff --git a/board/pine64/rockpro64-ebbr/grub.cfg b/board/pine64/rockpro64-ebbr/grub.cfg new file mode 100644 index 0000000000..d99e19c4cd --- /dev/null +++ b/board/pine64/rockpro64-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTLABEL=root rootwait +} diff --git a/board/pine64/rockpro64-ebbr/linux.fragment b/board/pine64/rockpro64-ebbr/linux.fragment new file mode 100644 index 0000000000..cc5ceeafad --- /dev/null +++ b/board/pine64/rockpro64-ebbr/linux.fragment @@ -0,0 +1,6 @@ +CONFIG_BLK_DEV_NVME=y +CONFIG_DWMAC_ROCKCHIP=y +CONFIG_PCIE_ROCKCHIP_HOST=y +CONFIG_PHY_ROCKCHIP_PCIE=y +CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y diff --git a/board/pine64/rockpro64-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/pine64/rockpro64-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/pine64/rockpro64-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/pine64/rockpro64-ebbr/patches/linux-headers/linux-headers.hash b/board/pine64/rockpro64-ebbr/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/pine64/rockpro64-ebbr/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/pine64/rockpro64-ebbr/patches/linux/linux.hash b/board/pine64/rockpro64-ebbr/patches/linux/linux.hash new file mode 100644 index 0000000000..7635b8ccb3 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d linux-6.12.18.tar.xz diff --git a/board/pine64/rockpro64-ebbr/patches/optee-client/optee-client.hash b/board/pine64/rockpro64-ebbr/patches/optee-client/optee-client.hash new file mode 100644 index 0000000000..e1f486e7a5 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/patches/optee-client/optee-client.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 ac6dc2c0c253ea228ea230e537211a45475771050faf4e66fe64321de3a0a652 optee-client-4.5.0.tar.gz diff --git a/board/pine64/rockpro64-ebbr/patches/optee-os/optee-os.hash b/board/pine64/rockpro64-ebbr/patches/optee-os/optee-os.hash new file mode 100644 index 0000000000..3e981c142d --- /dev/null +++ b/board/pine64/rockpro64-ebbr/patches/optee-os/optee-os.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 43c389f0505e8bc21d6fbaa8ea83ec67d1746ed14a537e3f505cd0e5b4cc2db9 optee-os-4.5.0.tar.gz diff --git a/board/pine64/rockpro64-ebbr/patches/uboot/uboot.hash b/board/pine64/rockpro64-ebbr/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/pine64/rockpro64-ebbr/post-build.sh b/board/pine64/rockpro64-ebbr/post-build.sh new file mode 100755 index 0000000000..344251be12 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/post-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -eu + +# Copy the firmware for the SPI NOR flash into the filesystem. +install -v -D -m 0644 "$BINARIES_DIR/u-boot-rockchip-spi.bin" \ + "$TARGET_DIR/lib/firmware/u-boot-rockchip-spi.bin" diff --git a/board/pine64/rockpro64-ebbr/post-image.sh b/board/pine64/rockpro64-ebbr/post-image.sh new file mode 100755 index 0000000000..5a3222fcf7 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/post-image.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Override the default GRUB configuration file with our own. +cp -vf "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/pine64/rockpro64-ebbr/readme.txt b/board/pine64/rockpro64-ebbr/readme.txt new file mode 100644 index 0000000000..6c2e0eec3f --- /dev/null +++ b/board/pine64/rockpro64-ebbr/readme.txt @@ -0,0 +1,116 @@ +Introduction +============ + +The rockpro64_ebbr_defconfig is meant to illustrate some aspects of the Arm EBBR +specification[1] and the Arm SystemReady Devicetree band[2]. +It allows building an AArch64 disk image with a U-Boot based firmware +implementing the subset of UEFI defined by EBBR, as well as a Linux OS booting +with UEFI, to run on the PINE64 ROCKPro64. [3] + +Building +======== + + $ make rockpro64_ebbr_defconfig + $ make + +Generated files under output/images: + +* disk.img: An eMMC or SD card disk image comprising TF-A, OP-TEE, the U-Boot + bootloader, the GRUB bootloader, the Linux kernel and the root filesystem. + +* u-boot-rockchip-spi.bin: A firmware image suitable for flashing in SPI NOR + comprising TF-A, OP-TEE and the U-Boot bootloader (also included in the + root filesystem). + +Running +======= + +Create a bootable SD card: + + # dd if=output/images/disk.img of= ; sync + +Connect to the UART console; the pin layout for serial console on PI-2 GPIO Bus +is as follows: + + Pin Signal + --- ------ + 6 GND + 8 Tx out of RK3399 + 10 Rx into RK3399 + +Voltage is 3V3, baudrate is 1500000. + +If necessary, connect a jumper between pins 23 and 25 to force SD card boot. [4] + +Flashing the firmware to SPI NOR +-------------------------------- + +It is possible to flash the firmware into the embedded SPI NOR, which makes the +SD card fully available to the OS and also allows to boot from USB2 or NVMe. + +The SPI image and the mtd tools are included in the root filesystem; flash the +firmware from Linux with the following command: + + # flashcp -v /lib/firmware/u-boot-rockchip-spi.bin /dev/mtd0 + +With the firmware in SPI NOR, it is possible to install or run another OS +supporting the EBBR specification. + +The image generated by the aarch64_efi_defconfig, the images from Linux +distributions such as Debian, Fedora, openSUSE or Ubuntu, and the Arm ACS +Devicetree images[5] are examples of compatible OS images. + +Firmware details +================ + +Noteworthy firmware features: + +- TF-A, OP-TEE & U-Boot +- UEFI, with EFI variables stored on disk in the ESP +- Support for ethernet, USB2 and NVMe +- RTC emulation +- U-Boot environment in SPI NOR + +Architecture diagram: + + Non-Secure : Secure + : + +---------------------+ : + EL0 | Busybox | : + +---------------------+ : +--------+ + EL1 | U-Boot, GRUB, Linux | : | OP-TEE | S-EL1 + +---------------------+ : +--------+ + .............................: + +----------------------------------+ + | ROM, U-Boot TPL, SPL, TF-A | EL3 + +----------------------------------+ + +Boot flow: + + ROM -+-> TPL + `-> SPL -> TF-A -+-> OP-TEE + `-> U-Boot -> GRUB -> Linux -> Busybox + +The ROM loads U-Boot TPL and SPL. [7][8] +U-Boot TPL does the DRAM setup, goes back to the ROM, which calls SPL. +U-Boot SPL loads the fit image with TF-A, OP-TEE, U-Boot and the Devicetree. +OP-TEE amends the Devicetree, calls back TF-A to go to normal world. +U-Boot loads GRUB with UEFI, boots Linux. + +Miscellaneous +============= + +This configuration is inspired by the rockpro64_defconfig, the other +configurations related with EBBR and the Arm SystemReady Devicetree Band +Integration and Testing Guide[6]. + +Firmware update, eMMC and battery-backed RTC are currently not supported. + +[1] https://github.com/ARM-software/ebbr +[2] https://www.arm.com/architecture/system-architectures/systemready-compliance-program/systemready-devicetree-band +[3] https://www.pine64.org/rockpro64/ +[4] https://pine64.org/documentation/ROCKPro64/Getting_started/ +[5] https://github.com/ARM-software/arm-systemready/tree/main/SystemReady-devicetree-band/prebuilt_images +[6] https://developer.arm.com/documentation/DUI1101/latest/ +[7] https://wiki.pine64.org/wiki/RK3399_boot_sequence +[8] https://opensource.rock-chips.com/wiki_Boot_option diff --git a/board/pine64/rockpro64-ebbr/u-boot.fragment b/board/pine64/rockpro64-ebbr/u-boot.fragment new file mode 100644 index 0000000000..d943343df6 --- /dev/null +++ b/board/pine64/rockpro64-ebbr/u-boot.fragment @@ -0,0 +1,19 @@ +# CONFIG_SPL_ATF_NO_PLATFORM_PARAM is not set +CONFIG_BOOTM_OPTEE=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_DATE=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_CMD_SETEXPR=y +CONFIG_DM_RTC=y +CONFIG_EFI_HTTP_BOOT=y +CONFIG_EFI_RT_VOLATILE_STORE=y +CONFIG_EFI_SET_TIME=y +CONFIG_OPTEE=y +CONFIG_OPTEE_LIB=y +CONFIG_OPTEE_TZDRAM_SIZE=0x02000000 +CONFIG_RTC_EMULATION=y +CONFIG_TEE=y diff --git a/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..8b77e1f165 --- /dev/null +++ b/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/pine64/star64/genimage.cfg b/board/pine64/star64/genimage.cfg index 74940016f4..20326710c5 100644 --- a/board/pine64/star64/genimage.cfg +++ b/board/pine64/star64/genimage.cfg @@ -12,8 +12,8 @@ image sdcard.img { } partition uboot { - image = "opensbi_uboot_payload.img" - partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + image = "u-boot.itb" + partition-type-uuid = xbootldr offset = 4M } diff --git a/board/pine64/star64/overlay/boot/extlinux/extlinux.conf b/board/pine64/star64/overlay/boot/extlinux/extlinux.conf index db7cfb7b8b..4a76fc1624 100644 --- a/board/pine64/star64/overlay/boot/extlinux/extlinux.conf +++ b/board/pine64/star64/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label star64 kernel /boot/Image devicetree /boot/jh7110-pine64-star64.dtb - append root=/dev/mmcblk1p3 earlycon=sbi + append root=/dev/mmcblk1p3 rootwait earlycon=sbi diff --git a/board/pine64/star64/patches/linux/linux.hash b/board/pine64/star64/patches/linux/linux.hash new file mode 100644 index 0000000000..8549cf1037 --- /dev/null +++ b/board/pine64/star64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 165ca1c37c4607b90e731996b7c1e3311285167d13deeedf08f3f1f0b9d2541a linux-6.12.57.tar.xz diff --git a/board/pine64/star64/patches/uboot/uboot.hash b/board/pine64/star64/patches/uboot/uboot.hash new file mode 100644 index 0000000000..98a5c53aaf --- /dev/null +++ b/board/pine64/star64/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/polyhex/debix-model-a/extlinux.conf.in b/board/polyhex/debix-model-a/extlinux.conf.in new file mode 100644 index 0000000000..ed6b881772 --- /dev/null +++ b/board/polyhex/debix-model-a/extlinux.conf.in @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mp-debix-model-a.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/polyhex/debix-model-a/genimage.cfg.in b/board/polyhex/debix-model-a/genimage.cfg.in new file mode 100644 index 0000000000..10c52548cd --- /dev/null +++ b/board/polyhex/debix-model-a/genimage.cfg.in @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition imx-boot { + in-partition-table = "no" + image = "flash.bin" + offset = 32K + } + + partition rootfs { + offset = 8M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/polyhex/debix-model-a/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/polyhex/debix-model-a/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..b5898cba3f --- /dev/null +++ b/board/polyhex/debix-model-a/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/polyhex/debix-model-a/patches/linux-headers/linux-headers.hash b/board/polyhex/debix-model-a/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/polyhex/debix-model-a/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/polyhex/debix-model-a/patches/linux/linux.hash b/board/polyhex/debix-model-a/patches/linux/linux.hash new file mode 100644 index 0000000000..47eab71641 --- /dev/null +++ b/board/polyhex/debix-model-a/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 9423f4bfb4d875417e39cb0b017b5499fea47da56119f0cd28a201735d898f14 linux-6.12.14.tar.xz diff --git a/board/polyhex/debix-model-a/patches/uboot/uboot.hash b/board/polyhex/debix-model-a/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/polyhex/debix-model-a/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/polyhex/debix-model-a/post-build.sh b/board/polyhex/debix-model-a/post-build.sh new file mode 100755 index 0000000000..604f387768 --- /dev/null +++ b/board/polyhex/debix-model-a/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" +PARTUUID="$("$HOST_DIR"/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf.in" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg.in" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/polyhex/debix-model-a/readme.txt b/board/polyhex/debix-model-a/readme.txt new file mode 100644 index 0000000000..bea204520e --- /dev/null +++ b/board/polyhex/debix-model-a/readme.txt @@ -0,0 +1,112 @@ +Polyhex Debix Model A +===================== + +DEBIX Model A is an industrial grade single board computer +powered by NXP i.MX 8M Plus applications processor + +https://www.debix.io/hardware/model-a.html +User Manual: [1] + + +How to build it +=============== + +Configure buildroot: + + $ make polyhex_debix_model_a_defconfig + +Change settings to fit your needs (optional): + + $ make menuconfig + +Compile everything and build the rootfs image: + + $ make + + +Result of the build +=================== + +After building, the output/images directory contains: + +output/images/ +├── bl31.bin +├── ddr_fw.bin -> /home/gilles/buildroot-dev/output/images/lpddr4_pmu_train_fw.bin +├── flash.bin +├── freescale +│   └── imx8mp-debix-model-a.dtb +├── genimage.cfg +├── Image +├── lpddr4_dmem_1d_v202201.bin +├── lpddr4_dmem_2d_v202201.bin +├── lpddr4_dmem_qb_v202201.bin +├── lpddr4_imem_1d_v202201.bin +├── lpddr4_imem_2d_v202201.bin +├── lpddr4_imem_qb_v202201.bin +├── lpddr4_pmu_train_1d_dmem_201904.bin +├── lpddr4_pmu_train_1d_dmem_202006.bin +├── lpddr4_pmu_train_1d_dmem.bin +├── lpddr4_pmu_train_1d_dmem_pad.bin +├── lpddr4_pmu_train_1d_fw.bin +├── lpddr4_pmu_train_1d_imem_201904.bin +├── lpddr4_pmu_train_1d_imem_202006.bin +├── lpddr4_pmu_train_1d_imem.bin +├── lpddr4_pmu_train_1d_imem_pad.bin +├── lpddr4_pmu_train_2d_dmem_201904.bin +├── lpddr4_pmu_train_2d_dmem_202006.bin +├── lpddr4_pmu_train_2d_dmem.bin +├── lpddr4_pmu_train_2d_dmem_pad.bin +├── lpddr4_pmu_train_2d_fw.bin +├── lpddr4_pmu_train_2d_imem_201904.bin +├── lpddr4_pmu_train_2d_imem_202006.bin +├── lpddr4_pmu_train_2d_imem.bin +├── lpddr4_pmu_train_2d_imem_pad.bin +├── lpddr4_pmu_train_fw.bin +├── lpddr4x_dmem_qb_v202306.bin +├── lpddr4x_dmem_qb_v202311.bin +├── lpddr4x_dmem_v202306.bin +├── lpddr4x_dmem_v202311.bin +├── lpddr4x_imem_qb_v202306.bin +├── lpddr4x_imem_qb_v202311.bin +├── lpddr4x_imem_v202306.bin +├── lpddr4x_imem_v202311.bin +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot-spl.bin + + +Flashing the SD card image +========================== + +To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC) + + $ sudo dd if=output/images/sdcard.img of= + + +Booting the board +================= + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- if you use a Debix I/O daughter card, follow the instructions provided +in [2], section 3.1 for the hardware connection between the main board +and the I/O daughter card. Then, put a micro USB cable into the I/0 daughter card +Debug USB Port and connect using a terminal emulator at 115200 bps, 8n1; +- if you do not use a Debix I/O daughter card, connect a USB-to-TTL serial cable to +the 40-pin header (J2) on the main board, the following way: + USB-to-TTL cable GND pin to J2 pin 05 + USB-to-TTL cable TX pin to J2 pin 09 + USB-to-TTL cable RX pin to J2 pin 11 + connect using a terminal emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! + + +References +========== +[1] https://www.debix.io/Uploads/Temp/file/20250207/DEBIX%20User%20Manual-V3.5.pdf +[2] https://www.debix.io/Uploads/Temp/file/20241225/DEBIX%20IO%20Board%20User%20Manual-V1.1.pdf diff --git a/board/qemu/aarch64-sbsa/readme.txt b/board/qemu/aarch64-sbsa/readme.txt index 7d97d7f6ab..acba9808a0 100644 --- a/board/qemu/aarch64-sbsa/readme.txt +++ b/board/qemu/aarch64-sbsa/readme.txt @@ -17,7 +17,7 @@ Run the emulation with: qemu-system-aarch64 \ -M sbsa-ref \ - -cpu neoverse-n1 \ + -cpu neoverse-n2 \ -smp 4 \ -m 1024 \ -nographic \ diff --git a/board/qemu/loongarch64-virt-efi/genimage.cfg b/board/qemu/loongarch64-virt-efi/genimage.cfg new file mode 100644 index 0000000000..24b9a8d943 --- /dev/null +++ b/board/qemu/loongarch64-virt-efi/genimage.cfg @@ -0,0 +1,30 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + file vmlinux.efi { + image = "vmlinux.efi" + } + } + + size = 64M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = root-loongarch64 + image = "rootfs.ext2" + } +} diff --git a/board/qemu/loongarch64-virt-efi/grub.cfg b/board/qemu/loongarch64-virt-efi/grub.cfg new file mode 100644 index 0000000000..dc3452fe6a --- /dev/null +++ b/board/qemu/loongarch64-virt-efi/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /vmlinux.efi root=PARTLABEL=root rootwait console=ttyS0 +} diff --git a/board/qemu/loongarch64-virt-efi/post-image.sh b/board/qemu/loongarch64-virt-efi/post-image.sh new file mode 100755 index 0000000000..fdb17ece70 --- /dev/null +++ b/board/qemu/loongarch64-virt-efi/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/qemu/loongarch64-virt-efi/readme.txt b/board/qemu/loongarch64-virt-efi/readme.txt new file mode 100644 index 0000000000..7c35ee1efe --- /dev/null +++ b/board/qemu/loongarch64-virt-efi/readme.txt @@ -0,0 +1,31 @@ +Intro +===== + +This is a LoongArch 64bit UEFI Linux boot demo in QEMU virt machine. + +Build +===== + + make qemu_loongarch64_virt-efi_defconfig + make + +Emulation +========= + +Run the emulation with: + + qemu-system-loongarch64 \ + -M virt \ + -smp 2 \ + -m 1024 \ + -nographic \ + -bios output/images/QEMU_EFI.fd \ + -drive file=output/images/disk.img,format=raw \ + -netdev user,id=net0 \ + -device virtio-net-pci,netdev=net0 # qemu_loongarch64_virt_efi_defconfig + +Note: for information, qemu version >= 9.0.0 is needed for this UEFI +Linux demo. The host-qemu package in Buildroot (enabled in this +defconfig) is sufficient to run this demo. In case another qemu is +used (for example, from the host OS), make sure to check the version +requirement. diff --git a/board/qemu/patches/linux/linux.hash b/board/qemu/patches/linux/linux.hash index deb1ad0ce5..9bcf1f561d 100644 --- a/board/qemu/patches/linux/linux.hash +++ b/board/qemu/patches/linux/linux.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz +sha256 e82fe40871743048226987bd349ef107168b15aab90140e872ca4ed470922e25 linux-6.12.47.tar.xz # sha256 locally computed sha256 a76052c0c71d4025b117dcfc18ca7e189ac495a7645fa98c1bdaddca15cce815 xtensa_dc233c.tar.gz diff --git a/board/qemu/patches/opensbi/opensbi.hash b/board/qemu/patches/opensbi/opensbi.hash index 1408f547b8..d7893a1dee 100644 --- a/board/qemu/patches/opensbi/opensbi.hash +++ b/board/qemu/patches/opensbi/opensbi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz +sha256 d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 opensbi-1.6.tar.gz diff --git a/board/qemu/riscv32-virt/readme.txt b/board/qemu/riscv32-virt/readme.txt index b4336e9357..cda8870c96 100644 --- a/board/qemu/riscv32-virt/readme.txt +++ b/board/qemu/riscv32-virt/readme.txt @@ -1,6 +1,6 @@ Run Linux in emulation with: - qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig + qemu-system-riscv32 -M virt -bios output/images/fw_jump.bin -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig qemu-system-riscv32 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0,if=none -device virtio-blk-device,drive=hd0 -nographic -cpu rv32,mmu=off -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 # qemu_riscv32_nommu_virt_defconfig diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt index f9e920a88b..fc6bfffb5d 100644 --- a/board/qemu/riscv64-virt/readme.txt +++ b/board/qemu/riscv64-virt/readme.txt @@ -1,6 +1,6 @@ Run Linux in emulation with: - qemu-system-riscv64 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig + qemu-system-riscv64 -M virt -bios output/images/fw_jump.bin -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig qemu-system-riscv64 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0,if=none -device virtio-blk-device,drive=hd0 -nographic -cpu rv64,mmu=off -netdev user,id=net0 -device virtio-net-device,netdev=net0 # qemu_riscv64_nommu_virt_defconfig diff --git a/board/qemu/sh4-r2d/linux.config b/board/qemu/sh4-r2d/linux.config index a3d6544549..dd4bf5204f 100644 --- a/board/qemu/sh4-r2d/linux.config +++ b/board/qemu/sh4-r2d/linux.config @@ -5,6 +5,7 @@ CONFIG_MEMORY_START=0x0c000000 CONFIG_FLATMEM_MANUAL=y CONFIG_SH_RTS7751R2D=y CONFIG_RTS7751R2D_PLUS=y +CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_HEARTBEAT=y CONFIG_PCI=y CONFIG_NET=y diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index 24c3676d8a..b0799e47a8 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig + qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/board/qemu/sh4eb-r2d/linux.config b/board/qemu/sh4eb-r2d/linux.config index 6ead626c41..5f94bee77d 100644 --- a/board/qemu/sh4eb-r2d/linux.config +++ b/board/qemu/sh4eb-r2d/linux.config @@ -6,6 +6,7 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_SH_RTS7751R2D=y CONFIG_RTS7751R2D_PLUS=y +CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_HEARTBEAT=y CONFIG_PCI=y CONFIG_NET=y diff --git a/board/qemu/sh4eb-r2d/readme.txt b/board/qemu/sh4eb-r2d/readme.txt index 577c54cd9d..9f3dd8b20b 100644 --- a/board/qemu/sh4eb-r2d/readme.txt +++ b/board/qemu/sh4eb-r2d/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-sh4eb -M r2d -kernel output/images/zImage -append "console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig + qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user # qemu_sh4eb_r2d_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/board/qemu/x86/post-build.sh b/board/qemu/x86/post-build.sh index bf83a002c2..24eee7f0e5 100755 --- a/board/qemu/x86/post-build.sh +++ b/board/qemu/x86/post-build.sh @@ -4,8 +4,8 @@ set -u set -e # Add a console on tty1 -if [ -e ${TARGET_DIR}/etc/inittab ]; then - grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ +if [ -e "${TARGET_DIR}/etc/inittab" ]; then + grep -qE '^tty1::' "${TARGET_DIR}/etc/inittab" || \ sed -i '/GENERIC_SERIAL/a\ -tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' "${TARGET_DIR}/etc/inittab" fi diff --git a/board/qemu/x86_64-efi/genimage.cfg.in b/board/qemu/x86_64-efi/genimage.cfg.in new file mode 100644 index 0000000000..0d50ed2ba4 --- /dev/null +++ b/board/qemu/x86_64-efi/genimage.cfg.in @@ -0,0 +1,32 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file bzImage { + image = "bzImage" + } + } + + size = 16352K # 16MB - 32KB +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = root-x86-64 + partition-uuid = %PARTUUID% + image = "rootfs.ext2" + } +} diff --git a/board/qemu/x86_64-efi/grub.cfg.in b/board/qemu/x86_64-efi/grub.cfg.in new file mode 100644 index 0000000000..16a1b17516 --- /dev/null +++ b/board/qemu/x86_64-efi/grub.cfg.in @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /bzImage root=PARTUUID=%PARTUUID% rootwait console=tty1 console=ttyS0 +} diff --git a/board/qemu/x86_64-efi/linux.config b/board/qemu/x86_64-efi/linux.config new file mode 100644 index 0000000000..9362b7ecb5 --- /dev/null +++ b/board/qemu/x86_64-efi/linux.config @@ -0,0 +1,59 @@ +CONFIG_SYSVIPC=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_EFI=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_WIRELESS is not set +CONFIG_PCI=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +# CONFIG_WLAN is not set +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_DRM=y +CONFIG_DRM_I915=y +CONFIG_DRM_QXL=y +CONFIG_DRM_VIRTIO_GPU=y +CONFIG_DRM_BOCHS=y +CONFIG_FB=y +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +CONFIG_FIRMWARE_EDID=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_HDA_INTEL=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_SQUASHFS=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/qemu/x86_64-efi/post-build.sh b/board/qemu/x86_64-efi/post-build.sh new file mode 100755 index 0000000000..24eee7f0e5 --- /dev/null +++ b/board/qemu/x86_64-efi/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e "${TARGET_DIR}/etc/inittab" ]; then + grep -qE '^tty1::' "${TARGET_DIR}/etc/inittab" || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' "${TARGET_DIR}/etc/inittab" +fi diff --git a/board/qemu/x86_64-efi/post-image.sh b/board/qemu/x86_64-efi/post-image.sh new file mode 100755 index 0000000000..119d7aca8f --- /dev/null +++ b/board/qemu/x86_64-efi/post-image.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +PARTUUID=$(dumpe2fs "${BINARIES_DIR}/rootfs.ext2" 2>/dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p') +sed "s/%PARTUUID%/$PARTUUID/g" "${BOARD_DIR}/grub.cfg.in" > "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" +sed "s/%PARTUUID%/$PARTUUID/g" "${BOARD_DIR}/genimage.cfg.in" > "${BINARIES_DIR}/genimage.cfg" +support/scripts/genimage.sh -c "${BINARIES_DIR}/genimage.cfg" diff --git a/board/qemu/x86_64-efi/readme.txt b/board/qemu/x86_64-efi/readme.txt new file mode 100644 index 0000000000..7f69be065f --- /dev/null +++ b/board/qemu/x86_64-efi/readme.txt @@ -0,0 +1,28 @@ +Intro +===== + +This is a x86_64 UEFI Linux boot demo in QEMU virt machine. + +Build +===== + + make qemu_x86_64_efi_defconfig + make + +Emulation +========= + +Run the emulation with: + + qemu-system-x86_64 \ + -M pc \ + -m 1024 \ + -serial stdio \ + -bios output/images/OVMF.fd \ + -drive file=output/images/disk.img,format=raw \ + -netdev user,id=net0 \ + -device virtio-net-pci,netdev=net0 # qemu_x86_64_efi_defconfig + +Optionally add -smp N to emulate a SMP system with N CPUs. + +The login prompt will appear in the graphical window. diff --git a/board/qemu/x86_64/post-build.sh b/board/qemu/x86_64/post-build.sh index bf83a002c2..24eee7f0e5 100755 --- a/board/qemu/x86_64/post-build.sh +++ b/board/qemu/x86_64/post-build.sh @@ -4,8 +4,8 @@ set -u set -e # Add a console on tty1 -if [ -e ${TARGET_DIR}/etc/inittab ]; then - grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ +if [ -e "${TARGET_DIR}/etc/inittab" ]; then + grep -qE '^tty1::' "${TARGET_DIR}/etc/inittab" || \ sed -i '/GENERIC_SERIAL/a\ -tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' "${TARGET_DIR}/etc/inittab" fi diff --git a/board/radxa/rock4se/extlinux.conf b/board/radxa/rock4se/extlinux.conf new file mode 100644 index 0000000000..eb037e0e0f --- /dev/null +++ b/board/radxa/rock4se/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa ROCK 4SE Linux + kernel /boot/Image + devicetree /boot/rk3399-rock-4se.dtb + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait diff --git a/board/radxa/rock4se/genimage.cfg b/board/radxa/rock4se/genimage.cfg new file mode 100644 index 0000000000..966c869273 --- /dev/null +++ b/board/radxa/rock4se/genimage.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "idbloader.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot.itb" + offset = 8M + size = 30M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/radxa/rock4se/patches/linux-headers/linux-headers.hash b/board/radxa/rock4se/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/radxa/rock4se/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/radxa/rock4se/patches/linux/linux.hash b/board/radxa/rock4se/patches/linux/linux.hash new file mode 100644 index 0000000000..8ad0e7d8c0 --- /dev/null +++ b/board/radxa/rock4se/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 e8a099182562aecff781de72ce769461e706d97af42d740dff20eb450dd5771e linux-6.12.28.tar.xz diff --git a/board/radxa/rock4se/patches/uboot/uboot.hash b/board/radxa/rock4se/patches/uboot/uboot.hash new file mode 100644 index 0000000000..80ea21b7cb --- /dev/null +++ b/board/radxa/rock4se/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/radxa/rock4se/post-build.sh b/board/radxa/rock4se/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/radxa/rock4se/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/radxa/rock4se/readme.txt b/board/radxa/rock4se/readme.txt new file mode 100644 index 0000000000..30cf621746 --- /dev/null +++ b/board/radxa/rock4se/readme.txt @@ -0,0 +1,37 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Radxa ROCK 4SE. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Radxa ROCK 4SE link: +https://radxa.com/products/rock4/4se/ + +Wiki link: +https://forum.radxa.com/c/rockpi4 + +GPIO connector pinout link: +https://wiki.radxa.com/Rockpi4/hardware/gpio + +This configuration uses mainline ATF, U-Boot and kernel. + +How to build +============ + + $ make rock4se_defconfig + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Radxa ROCK 4SE and power it up. The console +is available on UART2 on the GPIO connector, 1500000bps 8N1. diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash index 005667b1f1..d00eed9a49 100644 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ b/board/radxa/rock5b/patches/linux/linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz +sha256 6f35f821433d8421be7167990747c7c4a0c451958fb96883446301af13d71152 linux-6.12.4.tar.xz diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash index 904fa56c02..9acf6071ac 100644 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ b/board/radxa/rock5b/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +# Locally computed: +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt index 123e09cf56..0267210e2d 100644 --- a/board/raspberrypi/config_0w.txt +++ b/board/raspberrypi/config_0w.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_2_64bit.txt b/board/raspberrypi/config_2_64bit.txt new file mode 100644 index 0000000000..5b531b1cae --- /dev/null +++ b/board/raspberrypi/config_2_64bit.txt @@ -0,0 +1,26 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# enable 64bits support +arm_64bit=1 diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt index 123e09cf56..0267210e2d 100644 --- a/board/raspberrypi/config_3.txt +++ b/board/raspberrypi/config_3.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt index 88206e9b14..bbd8b69363 100644 --- a/board/raspberrypi/config_3_64bit.txt +++ b/board/raspberrypi/config_3_64bit.txt @@ -25,8 +25,5 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on - # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt index 9b77d23d74..13a7238f6e 100644 --- a/board/raspberrypi/config_4.txt +++ b/board/raspberrypi/config_4.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index fcb1c5c30a..2eef6dd1a2 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -25,8 +25,5 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on - # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_cm5io.txt b/board/raspberrypi/config_cm5io.txt new file mode 100644 index 0000000000..b66efef661 --- /dev/null +++ b/board/raspberrypi/config_cm5io.txt @@ -0,0 +1,24 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host + +# Enable UART0 for serial console on ttyAMA0 +dtparam=uart0_console=on diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt index 123e09cf56..0267210e2d 100644 --- a/board/raspberrypi/config_zero2w.txt +++ b/board/raspberrypi/config_zero2w.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_zero2w_64bit.txt b/board/raspberrypi/config_zero2w_64bit.txt new file mode 100644 index 0000000000..bbd8b69363 --- /dev/null +++ b/board/raspberrypi/config_zero2w_64bit.txt @@ -0,0 +1,29 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# Enable UART0 for serial console on ttyAMA0 +dtoverlay=miniuart-bt + +# enable 64bits support +arm_64bit=1 diff --git a/board/raspberrypi/patches/linux/linux.hash b/board/raspberrypi/patches/linux/linux.hash index 8d43c25151..51b0684b20 100644 --- a/board/raspberrypi/patches/linux/linux.hash +++ b/board/raspberrypi/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 dab3052783c68c46a5bc645b1c38d9705da995ab42823566518b62eb1fa1ef97 linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz +sha256 afc44e2899a3c32a1b968272a5816e5c90bea346341153807553396621e65dde linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 81cd81a7f3..31ff424a83 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -6,11 +6,21 @@ Intro These instructions apply to all models of the Raspberry Pi: - the original models A and B, - the "enhanced" models A+ and B+, + - the model CM (aka Raspberry Pi Compute Module). + - the model Zero (aka Raspberry Pi Zero) + - the model Zero W (aka Raspberry Pi Zero W) + - the model Zero 2 W (aka Raspberry Pi Zero 2 W) - the model B2 (aka Raspberry Pi 2) - the model B3 (aka Raspberry Pi 3). + - the model CM3 (aka Raspberry Pi Compute Module 3). + - the model CM3+ (aka Raspberry Pi Compute Module 3+). - the model B4 (aka Raspberry Pi 4). + - the model 400 (aka Raspberry Pi 400). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model CM4s (aka Raspberry Pi Compute Module 4s). - the model B5 (aka Raspberry Pi 5). + - the model 500 (aka Raspberry Pi 500). + - the model CM5 (aka Raspberry Pi Compute Module 5 and IO Board). How to build it =============== @@ -21,7 +31,7 @@ Configure Buildroot There are several Raspberry Pi defconfig files in Buildroot, one for each major variant, which you should base your work on: -For models A, B, A+ or B+: +For models A, B, A+, B+ and CM: $ make raspberrypi_defconfig @@ -37,23 +47,31 @@ For model Zero 2 W (model B3 in smaller form factor): $ make raspberrypizero2w_defconfig +or for model Zero 2 W (model B3 in smaller form factor, 64-bit): + + $ make raspberrypizero2w_64_defconfig + For model 2 B: $ make raspberrypi2_defconfig -For model 3 B and B+: +or for model 2 B (Rev 1.2, model B3 without wireless LAN and Bluetooth, 64 bit): + + $ make raspberrypi2_64_defconfig + +For model 3 B, B+, CM3 and CM3+: $ make raspberrypi3_defconfig -or for model 3 B and B+ (64 bit): +or for model 3 B, B+, CM3 and CM3+ (64 bit): $ make raspberrypi3_64_defconfig -For model 4 B: +For model 4 B, 400, CM4 and CM4s: $ make raspberrypi4_defconfig -or for model 4 B (64 bit): +or for model 4 B, 400, CM4 and CM4s (64 bit): $ make raspberrypi4_64_defconfig @@ -65,10 +83,14 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig -For model 5 B: +For model 5 B and 500: $ make raspberrypi5_defconfig +For model CM5 (on IO Board): + + $ make raspberrypicm5io_defconfig + Build the rootfs ---------------- @@ -93,29 +115,32 @@ After building, you should obtain this tree: +-- bcm2708-rpi-cm.dtb [1] +-- bcm2708-rpi-zero.dtb [1] +-- bcm2708-rpi-zero-w.dtb [1] - +-- bcm2710-rpi-zero-2-w.dtb [1] +-- bcm2709-rpi-2-b.dtb [1] +-- bcm2710-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] +-- bcm2710-rpi-cm3.dtb [1] + +-- bcm2710-rpi-zero-2-w.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-400.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] +-- bcm2711-rpi-cm4s.dtb [1] +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2712d0-rpi-5-b.dtb [1] + +-- bcm2712-rpi-500.dtb [1] + +-- bcm2712-rpi-cm5-cm5io [1] + +-- bcm2712-rpi-cm5l-cm5io [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ - | +-- bootcode.bin + | +-- bootcode.bin [2] | +-- cmdline.txt | +-- config.txt - | +-- fixup.dat [1] - | +-- fixup4.dat [1] - | +-- start.elf [1] - | +-- start4.elf [1] - | `-- overlays/ [2] + | +-- fixup.dat [3] + | +-- fixup4.dat [4] + | +-- start.elf [3] + | +-- start4.elf [4] + | `-- overlays/ [5] +-- sdcard.img +-- Image [1] `-- zImage [1] @@ -123,10 +148,19 @@ After building, you should obtain this tree: [1] Not all of them will be present, depending on the RaspberryPi model you are using. -[2] Only for the Raspberry Pi 3/4 Models (overlay miniuart-bt is needed - to enable the RPi3 serial console otherwise occupied by the bluetooth - chip). Alternative would be to disable the serial console in cmdline.txt - and /etc/inittab. +[2] Only for the Raspberry Pi 1, 2, 3, Zero, Zero W and Zero 2 W. The Raspberry + Pi 4, 400, 5 and the Compute Module 4, 4s and 5 load the second stage + bootloader from a SPI flash EEPROM. + +[3] Only for the Raspberry Pi 1, 2, 3, Zero and Zero 2. + +[4] Only for the Raspberry Pi 4, 400, Compute Module 4 and 4s. + +[5] Only for the Raspberry Pi installing device-tree overlays. The Raspberry Pi + with Bluetooth connectivity (Zero W, Zero 2 W, 3, 4, 400, Compute Module 4 + and 4s) use the miniuart-bt overlay to enable UART0 for the serial console; + the Bluetooth uses the mini-UART instead. Alternative would be to disable + the serial console in cmdline.txt and /etc/inittab. How to write the SD card ======================== @@ -170,3 +204,33 @@ for CM4 modules with eMMC memory proceed as following: - power down CM4/IO Board - remove jumper on IO Board header J2 to re-enable eMMC boot - power up CM4/IO Board + +CM5 debug UART +============== + +The debug UART header is not assembled on the Compute Module 5. + + 2.23. Debug UART + + Space is provided for the user to fit a debug UART connector. This + connector provides the same functionality as Raspberry Pi 5. The + connector is a three-pin 1mm pitch JST-SH connector, Part number + BM03B-SRSS-TB. The signals are replicated on the bottom as test points. + + Appendix B: Test Points + + | Reference | X | Y | NAME | + | TP35 | 11 | 37.8 | DEBUG_UART_TX | + | TP36 | 8.5 | 37.1 | DEBUG_UART_RX | + + Debug UART + + TP35 and TP36 are a TX and RX of the debug UART. TP46 should be used as + the ground. It is very useful to have access to these pins during + programming and initial boot. + +See https://datasheets.raspberrypi.com/cm5/cm5-datasheet.pdf. + +The signals are not wired up to 100-pin headers either. And thus, it is +impossible to output early boot traces in the EEPROM firmware without +assembling a JST-SH connector (or using the test points). diff --git a/board/raspberrypi2-64 b/board/raspberrypi2-64 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi2-64 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/board/raspberrypicm5io b/board/raspberrypicm5io new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypicm5io @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/board/raspberrypizero2w-64 b/board/raspberrypizero2w-64 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypizero2w-64 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/board/shredos/fsoverlay/etc/shredos/version.txt b/board/shredos/fsoverlay/etc/shredos/version.txt index d5f846665e..6c6154b7ee 100644 --- a/board/shredos/fsoverlay/etc/shredos/version.txt +++ b/board/shredos/fsoverlay/etc/shredos/version.txt @@ -1 +1 @@ -2024.11_27.1_x86-64_0.40-dev +2024.11_27.1_x86-64_0.40-dev-1 diff --git a/board/shredos/fsoverlay/usr/bin/pdf.diff b/board/shredos/fsoverlay/usr/bin/pdf.diff new file mode 100644 index 0000000000..5cd3233f2a --- /dev/null +++ b/board/shredos/fsoverlay/usr/bin/pdf.diff @@ -0,0 +1,105 @@ +diff --git a/board/shredos/fsoverlay/usr/bin/archive_log.sh b/board/shredos/fsoverlay/usr/bin/archive_log.sh +index XXXXXXX..YYYYYYY 100755 +--- a/board/shredos/fsoverlay/usr/bin/archive_log.sh ++++ b/board/shredos/fsoverlay/usr/bin/archive_log.sh +@@ -42,8 +42,67 @@ date_format="+%Y/%m/%d %H:%M:%S" + # This is the temporary directory that the exFAT/FAT32 drive is to be mounted on + archive_drive_directory="/archive_drive" + +-# The nwipe logs that have been sent are moved into this directory in RAM disk. ++# The nwipe logs that have been sent are moved into this directory in RAM disk. + sent_directory="/sent" ++ ++# Default PDF report path (same as nwipe default: current working directory, ++# mapped here to the RAM disk root). ++pdf_report_path="/" ++ ++# Source directory on the RAM disk that contains nwipe PDF reports. ++pdf_src_dir="/" ++ ++# Destination subdirectory on the USB drive (relative to $archive_drive_directory). ++pdf_dst_subpath="" ++ ++# Extract nwipe_options from the kernel command line and honour -P / --PDFreportpath. ++cmdline="$(cat /proc/cmdline 2>/dev/null)" ++if [ -n "$cmdline" ]; then ++ # Try quoted form: nwipe_options="..." ++ nwipe_opts="$(printf '%s\n' "$cmdline" | sed -n 's/.*nwipe_options="\([^"]*\)".*/\1/p')" ++ ++ # Fallback: unquoted form: nwipe_options=... ++ if [ -z "$nwipe_opts" ]; then ++ nwipe_opts="$(printf '%s\n' "$cmdline" | sed -n 's/.*nwipe_options=\([^ ]*\).*/\1/p')" ++ fi ++ ++ if [ -n "$nwipe_opts" ]; then ++ set -- $nwipe_opts ++ while [ $# -gt 0 ]; do ++ case "$1" in ++ -P|--PDFreportpath) ++ shift ++ if [ $# -gt 0 ]; then ++ pdf_report_path="$1" ++ fi ++ ;; ++ --PDFreportpath=*) ++ pdf_report_path="${1#--PDFreportpath=}" ++ ;; ++ esac ++ shift ++ done ++ fi ++fi ++ ++# Normalise PDF path: ++# - treat empty, "." and "noPDF" as "root" ("/") for the purpose of archiving ++# - ensure it is an absolute path without trailing slash ++if [ -z "$pdf_report_path" ] || [ "$pdf_report_path" = "." ] || [ "$pdf_report_path" = "noPDF" ]; then ++ pdf_report_path="/" ++fi ++ ++pdf_report_path="${pdf_report_path%/}" ++case "$pdf_report_path" in ++ "") pdf_report_path="/";; ++ /*) ;; ++ *) pdf_report_path="/$pdf_report_path";; ++esac ++ ++if [ "$pdf_report_path" = "/" ]; then ++ pdf_src_dir="/" ++ pdf_dst_subpath="" ++else ++ pdf_src_dir="$pdf_report_path" ++ pdf_dst_subpath="$pdf_report_path" ++fi + + # From all the drives on the system, try to locate the ShredOS boot disc + drive_partition=$(find_shredos_boot_disc.sh) +@@ -84,9 +143,17 @@ else + printf "[`date "$date_format"`] archive_log.sh: Copied $dmesg_file to $drive_partition:/\n" 2>&1 | tee -a transfer.log + fi + +- # Copy the PDF certificates over to the exFAT/FAT32 partition +- cp /nwipe_report_*pdf "$archive_drive_directory/" +- if [ $? != 0 ]; then ++ # Copy the PDF certificates over to the exFAT/FAT32 partition. ++ # If a custom PDF report path was specified via nwipe_options (-P / --PDFreportpath), ++ # mirror that subdirectory on the USB drive. ++ if [ -n "$pdf_dst_subpath" ]; then ++ mkdir -p "$archive_drive_directory$pdf_dst_subpath" ++ fi ++ ++ cp "$pdf_src_dir"/nwipe_report_*pdf "$archive_drive_directory$pdf_dst_subpath/" ++ ++ if [ $? != 0 ]; then + printf "[`date "$date_format"`] archive_log.sh: Unable to copy ... to the root of $drive_partition:/\n" 2>&1 | tee -a transfer.log + else + printf "[`date "$date_format"`] archive_log.sh: Copied nwipe_report...pdf to $drive_partition:/\n" 2>&1 | tee -a transfer.log +@@ -118,7 +185,7 @@ else + printf "[`date "$date_format"`] arch...wipe logs into the $sent_directory\n" 2>&1 | tee -a transfer.log + fi + # Move the nwipe PDF certificates into the RAM disc sent directory +- mv /nwipe_report*pdf "$sent_directory/" ++ mv "$pdf_src_dir"/nwipe_report*pdf "$sent_directory/" + if [ $? != 0 ]; then + printf "[`date "$date_format"`] arch...he $sent_directory on the RAM disc\n" 2>&1 | tee -a transfer.log + else diff --git a/board/shredos/genimage.cfg b/board/shredos/genimage.cfg index ef3b90872d..b368a739c5 100644 --- a/board/shredos/genimage.cfg +++ b/board/shredos/genimage.cfg @@ -12,7 +12,7 @@ image boot.vfat { file autorun.inf { image = 'autorun.inf' } } - size = 310000000 + size = 380000000 } image shredos.img { diff --git a/board/shredos/kernel-6.6.22-defconfig.config b/board/shredos/kernel-6.6.22-defconfig.config index 6289a8b34d..b06ad5521d 100644 --- a/board/shredos/kernel-6.6.22-defconfig.config +++ b/board/shredos/kernel-6.6.22-defconfig.config @@ -28,7 +28,6 @@ CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio" CONFIG_EXPERT=y CONFIG_PROFILING=y CONFIG_SMP=y -CONFIG_X86_X2APIC=y CONFIG_X86_NUMACHIP=y CONFIG_X86_VSMP=y CONFIG_PROCESSOR_SELECT=y @@ -67,7 +66,6 @@ CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y CONFIG_NETFILTER=y CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y CONFIG_NET_SCHED=y CONFIG_DCB=y CONFIG_DNS_RESOLVER=y @@ -402,7 +400,6 @@ CONFIG_SKFP=y CONFIG_HIPPI=y CONFIG_ROADRUNNER=y CONFIG_ROADRUNNER_LARGE_RINGS=y -CONFIG_MICREL_KS8995MA=y CONFIG_USB_CATC=y CONFIG_USB_KAWETH=y CONFIG_USB_PEGASUS=y @@ -441,18 +438,15 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADP5520=y CONFIG_KEYBOARD_ADP5588=y -CONFIG_KEYBOARD_ADP5589=y CONFIG_KEYBOARD_QT1050=y CONFIG_KEYBOARD_QT1070=y CONFIG_KEYBOARD_QT2160=y CONFIG_KEYBOARD_DLINK_DIR685=y CONFIG_KEYBOARD_LKKBD=y -CONFIG_KEYBOARD_TCA6416=y CONFIG_KEYBOARD_TCA8418=y CONFIG_KEYBOARD_LM8323=y CONFIG_KEYBOARD_LM8333=y CONFIG_KEYBOARD_MAX7359=y -CONFIG_KEYBOARD_MCS=y CONFIG_KEYBOARD_MPR121=y CONFIG_KEYBOARD_NEWTON=y CONFIG_KEYBOARD_OPENCORES=y @@ -562,9 +556,6 @@ CONFIG_MFD_MENF21BMC=y CONFIG_EZX_PCAP=y CONFIG_MFD_VIPERBOARD=y CONFIG_MFD_RETU=y -CONFIG_MFD_PCF50633=y -CONFIG_PCF50633_ADC=y -CONFIG_PCF50633_GPIO=y CONFIG_MFD_RDC321X=y CONFIG_MFD_RT5033=y CONFIG_MFD_RC5T583=y @@ -617,10 +608,7 @@ CONFIG_AGP_SIS=y CONFIG_AGP_VIA=y CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=y -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set -CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_DRM_I2C_NXP_TDA9950=y +CONFIG_DRM_SIMPLEDRM=y CONFIG_DRM_RADEON=y CONFIG_DRM_RADEON_USERPTR=y CONFIG_DRM_AMDGPU=y @@ -639,6 +627,7 @@ CONFIG_DRM_VIRTIO_GPU=y CONFIG_DRM_CHIPONE_ICN6211=y CONFIG_DRM_CHRONTEL_CH7033=y CONFIG_DRM_DISPLAY_CONNECTOR=y +CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_ITE_IT6505=y CONFIG_DRM_LONTIUM_LT8912B=y CONFIG_DRM_LONTIUM_LT9211=y @@ -677,7 +666,6 @@ CONFIG_DRM_ETNAVIV=y CONFIG_DRM_BOCHS=y CONFIG_DRM_CIRRUS_QEMU=y CONFIG_DRM_PANEL_MIPI_DBI=y -CONFIG_DRM_SIMPLEDRM=y CONFIG_TINYDRM_HX8357D=y CONFIG_TINYDRM_ILI9163=y CONFIG_TINYDRM_ILI9225=y @@ -685,8 +673,6 @@ CONFIG_TINYDRM_ILI9341=y CONFIG_TINYDRM_ILI9486=y CONFIG_TINYDRM_MI0283QT=y CONFIG_TINYDRM_REPAPER=y -CONFIG_TINYDRM_ST7586=y -CONFIG_TINYDRM_ST7735R=y CONFIG_DRM_VBOXVIDEO=y CONFIG_DRM_SSD130X=y CONFIG_DRM_SSD130X_I2C=y @@ -747,7 +733,6 @@ CONFIG_FB_IBM_GXT4500=y CONFIG_FB_MB862XX=y CONFIG_FB_SSD1307=y CONFIG_FB_SM712=y -CONFIG_FIRMWARE_EDID=y CONFIG_FB_FOREIGN_ENDIAN=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y @@ -775,7 +760,6 @@ CONFIG_BACKLIGHT_ADP5520=y CONFIG_BACKLIGHT_ADP8860=y CONFIG_BACKLIGHT_ADP8870=y CONFIG_BACKLIGHT_88PM860X=y -CONFIG_BACKLIGHT_PCF50633=y CONFIG_BACKLIGHT_LM3639=y CONFIG_BACKLIGHT_PANDORA=y CONFIG_BACKLIGHT_SKY81452=y @@ -785,6 +769,7 @@ CONFIG_BACKLIGHT_LV5207LP=y CONFIG_BACKLIGHT_BD6107=y CONFIG_BACKLIGHT_ARCXCNN=y CONFIG_BACKLIGHT_LED=y +CONFIG_FIRMWARE_EDID=y CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y @@ -855,14 +840,14 @@ CONFIG_HID_SENSOR_HUB=y CONFIG_HID_SENSOR_CUSTOM_SENSOR=y CONFIG_HID_ALPS=y CONFIG_HID_MCP2221=y -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y CONFIG_I2C_HID_ACPI=y CONFIG_INTEL_ISH_HID=y CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=y CONFIG_AMD_SFH_HID=y CONFIG_SURFACE_HID=y CONFIG_SURFACE_KBD=y +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y CONFIG_USB_LED_TRIG=y CONFIG_USB_CONN_GPIO=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -973,13 +958,9 @@ CONFIG_USB_GADGET=y CONFIG_USB_GR_UDC=y CONFIG_USB_R8A66597=y CONFIG_USB_PXA27X=y -CONFIG_USB_MV_UDC=y -CONFIG_USB_MV_U3D=y CONFIG_USB_M66592=y CONFIG_USB_BDC_UDC=y CONFIG_USB_AMD5536UDC=y -CONFIG_USB_NET2272=y -CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=y CONFIG_USB_GOKU=y CONFIG_USB_EG20T=y @@ -1014,7 +995,6 @@ CONFIG_MMC_VIA_SDMMC=y CONFIG_MMC_VUB300=y CONFIG_MMC_USHC=y CONFIG_MMC_USDHI6ROL0=y -CONFIG_MMC_HSQ=y CONFIG_MMC_TOSHIBA_PCI=y CONFIG_MMC_MTK=y CONFIG_MMC_SDHCI_XENON=y @@ -1102,7 +1082,6 @@ CONFIG_RTC_DRV_ISL1208=y CONFIG_RTC_DRV_ISL12022=y CONFIG_RTC_DRV_X1205=y CONFIG_RTC_DRV_PCF8523=y -CONFIG_RTC_DRV_PCF85063=y CONFIG_RTC_DRV_PCF85363=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_PCF8583=y @@ -1135,6 +1114,7 @@ CONFIG_RTC_DRV_PCF2123=y CONFIG_RTC_DRV_MCP795=y CONFIG_RTC_DRV_DS3232=y CONFIG_RTC_DRV_PCF2127=y +CONFIG_RTC_DRV_PCF85063=y CONFIG_RTC_DRV_RV3029C2=y CONFIG_RTC_DRV_RX6110=y CONFIG_RTC_DRV_DS1286=y @@ -1220,7 +1200,6 @@ CONFIG_COMEDI_USBDUXSIGMA=y CONFIG_COMEDI_VMK80XX=y CONFIG_COMEDI_8255_SA=y CONFIG_STAGING=y -CONFIG_RTS5208=y CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_ACPI=y CONFIG_CHROMEOS_LAPTOP=y @@ -1275,7 +1254,6 @@ CONFIG_PHY_CADENCE_SIERRA=y CONFIG_PHY_CADENCE_SALVO=y CONFIG_PHY_PXA_28NM_HSIC=y CONFIG_PHY_PXA_28NM_USB2=y -CONFIG_PHY_LAN966X_SERDES=y CONFIG_PHY_CPCAP_USB=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_QCOM_USB_HSIC=y diff --git a/board/sifive/common/genimage_sdcard.cfg b/board/sifive/common/genimage_sdcard.cfg new file mode 100644 index 0000000000..99e3525a8c --- /dev/null +++ b/board/sifive/common/genimage_sdcard.cfg @@ -0,0 +1,24 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition u-boot-spl { + image = "u-boot-spl.bin" + offset = 17K + partition-type-uuid = 5b193300-fc78-40cd-8002-e86c45580b47 + } + + partition u-boot { + image = "u-boot.itb" + offset = 1041K + partition-type-uuid = 2e54b353-1271-4842-806f-e436d6af6985 + } + + partition rootfs { + image = "rootfs.ext4" + offset = 4076K + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 + bootable = true + } +} diff --git a/board/sifive/common/genimage_spi-nor.cfg b/board/sifive/common/genimage_spi-nor.cfg new file mode 100644 index 0000000000..14b7bb1e1c --- /dev/null +++ b/board/sifive/common/genimage_spi-nor.cfg @@ -0,0 +1,19 @@ +image spi-nor.img { + size = 32M + + hdimage { + partition-table-type = "gpt" + } + + partition u-boot-spl { + image = "u-boot-spl.bin" + offset = 20K + partition-type-uuid = 5b193300-fc78-40cd-8002-e86c45580b47 + } + + partition u-boot { + image = "u-boot.itb" + offset = 1044K + partition-type-uuid = 2e54b353-1271-4842-806f-e436d6af6985 + } +} diff --git a/board/sifive/common/linux.config.fragment b/board/sifive/common/linux.config.fragment new file mode 100644 index 0000000000..385a961dd4 --- /dev/null +++ b/board/sifive/common/linux.config.fragment @@ -0,0 +1,10 @@ +CONFIG_HZ_100=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_SIFIVE=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_SPI_NOR=y +CONFIG_PWM=y +CONFIG_PWM_SIFIVE=y diff --git a/board/sifive/common/post-build.sh b/board/sifive/common/post-build.sh new file mode 100755 index 0000000000..14c80558d5 --- /dev/null +++ b/board/sifive/common/post-build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cp "$BINARIES_DIR/boot.scr" "$TARGET_DIR/boot/boot.scr" diff --git a/board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash b/board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sifive/hifive-unleashed/patches/linux/linux.hash b/board/sifive/hifive-unleashed/patches/linux/linux.hash new file mode 100644 index 0000000000..b356207dc4 --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 230e89b07b0ab82e74f07ecc1bee3105dca81d0ef4a97f900929c407249b6ac7 linux-6.12.20.tar.xz diff --git a/board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash b/board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..1408f547b8 --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz diff --git a/board/sifive/hifive-unleashed/patches/uboot/uboot.hash b/board/sifive/hifive-unleashed/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/sifive/hifive-unleashed/readme.txt b/board/sifive/hifive-unleashed/readme.txt index e9ccb26fa6..45cb8ece55 100644 --- a/board/sifive/hifive-unleashed/readme.txt +++ b/board/sifive/hifive-unleashed/readme.txt @@ -97,7 +97,7 @@ Adjust Buildroot configuration by: $ make menuconfig Change "System configuration" -> "Extra arguments passed to custom scripts" -value to "-c board/sifive/hifive-unleashed/genimage_spi-nor.cfg", save the +value to "-c board/sifive/common/genimage_spi-nor.cfg", save the configuration and build. This creates a output/images/spi-nor.img that can be programmed to the on-board SPI flash. diff --git a/board/sifive/hifive-unmatched/boot.cmd b/board/sifive/hifive-unmatched/boot.cmd new file mode 100644 index 0000000000..3f7b1d9ce3 --- /dev/null +++ b/board/sifive/hifive-unmatched/boot.cmd @@ -0,0 +1,4 @@ +setenv bootargs earlycon=sbi root=/dev/mmcblk0p3 rootwait +load mmc 0:3 ${kernel_addr_r} boot/Image +load mmc 0:3 ${fdt_addr_r} boot/hifive-unmatched-a00.dtb +booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/board/sifive/hifive-unmatched/patches/linux-headers/linux-headers.hash b/board/sifive/hifive-unmatched/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/sifive/hifive-unmatched/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sifive/hifive-unmatched/patches/linux/linux.hash b/board/sifive/hifive-unmatched/patches/linux/linux.hash new file mode 100644 index 0000000000..b356207dc4 --- /dev/null +++ b/board/sifive/hifive-unmatched/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 230e89b07b0ab82e74f07ecc1bee3105dca81d0ef4a97f900929c407249b6ac7 linux-6.12.20.tar.xz diff --git a/board/sifive/hifive-unmatched/patches/opensbi/opensbi.hash b/board/sifive/hifive-unmatched/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..1408f547b8 --- /dev/null +++ b/board/sifive/hifive-unmatched/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz diff --git a/board/sifive/hifive-unmatched/patches/uboot/uboot.hash b/board/sifive/hifive-unmatched/patches/uboot/uboot.hash new file mode 100644 index 0000000000..50674352d7 --- /dev/null +++ b/board/sifive/hifive-unmatched/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/board/sifive/hifive-unmatched/readme.txt b/board/sifive/hifive-unmatched/readme.txt new file mode 100644 index 0000000000..0a4ebcd2f1 --- /dev/null +++ b/board/sifive/hifive-unmatched/readme.txt @@ -0,0 +1,100 @@ +SiFive HiFive Unmatched +======================= + +This file describes how to use the pre-defined Buildroot +configuration for the SiFive HiFive Unmatched board. + +Further information about the HiFive Unmatched board can be found +at https://www.sifive.com/boards/hifive-unmatched + +Building +======== + +Configure Buildroot using the default board configuration: + + $ make hifive_unmatched_defconfig + +Customise the build as necessary: + + $ make menuconfig + +Start the build: + + $ make + +Result of the build +=================== + +Once the build has finished you will have the following files: + + output/images/ + +-- boot.scr + +-- fw_dynamic.bin + +-- fw_dynamic.elf + +-- fw_jump.bin + +-- fw_jump.elf + +-- hifive-unmatched-a00.dtb + +-- Image + +-- rootfs.cpio + +-- rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + +-- u-boot.bin + +-- u-boot.itb + +-- u-boot-spl.bin + + +Creating a bootable SD card with genimage +========================================= + +By default Buildroot builds a SD card image for you. All you need to do +is dd the image to your SD card, which can be done with the following +command on your development host: + + $ sudo dd if=output/images/sdcard.img of=/dev/sdb bs=4096 + +The above example command assumes the SD card is accessed via a USB card +reader and shows up as /dev/sdb on the host. Adjust it accordingly per +your actual setup. + +Booting the SD card on the board +================================ + +Make sure that the all DIP switches are set to the off position for +default boot mode (MSEL mode = 1011), insert the SD card and power +up the board. + +Connect the USB cable and open minicom (/dev/ttyUSB1, 115200, 8N1). + +See the 'SiFive HiFive Unmatched Getting Started Guide' for +more details (https://www.sifive.com/documentation). + +You will get a warning reported by fdisk when you examine the SD card. +This is because the genimage_sdcard.cfg file doesn't specify the SD card +size (as people will naturally have different sized cards), so the +secondary GPT header is placed after the rootfs rather than at the end +of the disk where it is expected to be. + +You will see something like this at boot time: + +[ 0.989458] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.996772] mmc0: new SDHC card on SPI +[ 1.001634] mmcblk0: mmc0:0000 SD8GB 7.28 GiB +[ 1.038079] GPT:Primary header thinks Alt. header is not at the end of the disk. +[ 1.044759] GPT:52389 != 15264767 +[ 1.048051] GPT:Alternate GPT header not at the end of the disk. +[ 1.054015] GPT:52389 != 15264767 +[ 1.057323] GPT: Use GNU Parted to correct GPT errors. +[ 1.062479] mmcblk0: p1 p2 p3 + + +Testing under QEMU +================== + +The SD card image can be tested using QEMU: + +$ qemu-system-riscv64 -M sifive_u,msel=11 -smp 5 -m 8G \ + -display none -serial stdio -nic user \ + -bios output/images/u-boot-spl.bin \ + -drive file=output/images/sdcard.img,if=sd diff --git a/board/sipeed/licheepi_4a/extlinux/extlinux.conf b/board/sipeed/licheepi_4a/extlinux/extlinux.conf new file mode 100644 index 0000000000..add3954184 --- /dev/null +++ b/board/sipeed/licheepi_4a/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /th1520-lichee-pi-4a.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p4 rootfstype=ext4 rootwait rw earlycon clk_ignore_unused init=/sbin/init diff --git a/board/sipeed/licheepi_4a/genimage.cfg b/board/sipeed/licheepi_4a/genimage.cfg new file mode 100644 index 0000000000..54cef1db9b --- /dev/null +++ b/board/sipeed/licheepi_4a/genimage.cfg @@ -0,0 +1,7 @@ +image boot.ext4 { + ext4 { + label = "boot" + } + + size = 64M +} diff --git a/board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash b/board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sipeed/licheepi_4a/patches/linux/linux.hash b/board/sipeed/licheepi_4a/patches/linux/linux.hash new file mode 100644 index 0000000000..7835000bc9 --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d linux-6.12.18.tar.xz diff --git a/board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash b/board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..5ced5c95cc --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 2510c0e867b4f8c28579def9a21e97fa2e8de95b8c7d66bb8b6642202bcee3b4 opensbi-61d7484c752a5e4c464d5dc18e21d9ac67fbbefa-git4.tar.gz diff --git a/board/sipeed/licheepi_4a/patches/uboot/uboot.hash b/board/sipeed/licheepi_4a/patches/uboot/uboot.hash new file mode 100644 index 0000000000..b63a8d79d4 --- /dev/null +++ b/board/sipeed/licheepi_4a/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6158b9c6faee41a1e790ad4ba2e1b3e18a122ecdb5749fa77c7495a2d1c56262 uboot-b5ee6e549a7b5ff382a14021a5d6a3c94017bddd-git4.tar.gz diff --git a/board/sipeed/licheepi_4a/post-image.sh b/board/sipeed/licheepi_4a/post-image.sh new file mode 100755 index 0000000000..6d188d7994 --- /dev/null +++ b/board/sipeed/licheepi_4a/post-image.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +BOARD_DIR="$(dirname "$0")" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" +rm -rf "${GENIMAGE_TMP}" + +cp "${BINARIES_DIR}"/Image "${BINARIES_DIR}"/*.dtb "${BINARIES_DIR}"/fw_dynamic.bin "${ROOTPATH_TMP}" +cp -a "${BINARIES_DIR}"/bootbins/* "${ROOTPATH_TMP}" +cp -a "${BOARD_DIR}"/extlinux "${ROOTPATH_TMP}" + +genimage \ + --rootpath "${ROOTPATH_TMP}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/board/sipeed/licheepi_4a/readme.txt b/board/sipeed/licheepi_4a/readme.txt new file mode 100644 index 0000000000..90a0347046 --- /dev/null +++ b/board/sipeed/licheepi_4a/readme.txt @@ -0,0 +1,97 @@ +Intro +===== + +This directory contains a Buildroot configuration for building a +LicheePi 4A image. For more information, see the board wiki page [1]. + + +How to build it +=============== + + +Configure Buildroot +------------------- + + make sipeed_licheepi_4a_defconfig + + +Build the boot and rootfs +------------------------- + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +You may now build your rootfs with: + + make + +(This may take a while, consider getting yourself a coffee ;-) ) + + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- boot.ext4 + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- rootfs.tar + +-- u-boot.bin + +-- u-boot-with-spl.bin + +-- fw_dynamic.bin + `-- Image + + +How to flash the board +====================== + +Once the build process is finished you will have to flash the +correspoding images to the respective partitions in the eMMC. +LicheePi 4A uses fastboot to flash the images. + +The board needs to be booted in "Burning Mode". For that, check first +the boot switches (SW1, SW2) on the base board are set up on the +"eMMC" mode (this is the factory default). Then, boot the board while +pressing the "BOOT" button. See [2]. + +Note that the board can be booted by either: +- attaching the USB-C power cable, or +- pressing the "RESET" button (near the USB-C power connector) if the + power cable is already connected to the host computer. + +The board should be enumerated from the host computer. This can be +confirmed with "lsusb". The board should be listed as: + + ID 2345:7654 T-HEAD USB download gadget + +The device should also be listed by the "fastboot devices" command: + + ???????????? Android Fastboot + +The board can be flashed with the commands: + + fastboot flash ram output/images/u-boot-with-spl.bin + fastboot reboot + fastboot flash uboot output/images/u-boot-with-spl.bin + fastboot flash boot output/images/boot.ext4 + fastboot flash root output/images/rootfs.ext2 + + +Boot the board +============== + +Connect the console on the System Serial Port on pins +U0-RX, U0-TX and GND. For more details, see [3]. + +When resetting or powering up the board on the USB-C port, the U-Boot +prompt and Linux console will appear on this System Serial Port. + + +References +========== + +[1] https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/1_intro.html +[2] https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/4_burn_image.html#How-to-enter-burning-mode +[3] https://wiki.sipeed.com/hardware/en/lichee/th1520/lpi4a/6_peripheral.html#System-Serial-Port diff --git a/board/sipeed/licheepi_zero/patches/linux/linux.hash b/board/sipeed/licheepi_zero/patches/linux/linux.hash new file mode 100644 index 0000000000..216d9b9d39 --- /dev/null +++ b/board/sipeed/licheepi_zero/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 0fcbbbbcd456e87bbbfc8bf37af541fda62ccfcce76903503424fd101ef7bdee linux-6.12.43.tar.xz diff --git a/board/sipeed/licheepi_zero/patches/uboot/uboot.hash b/board/sipeed/licheepi_zero/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/sipeed/licheepi_zero/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/spike/riscv32/patches/opensbi/opensbi.hash b/board/spike/riscv32/patches/opensbi/opensbi.hash index bc4058abe6..d7893a1dee 100644 --- a/board/spike/riscv32/patches/opensbi/opensbi.hash +++ b/board/spike/riscv32/patches/opensbi/opensbi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz +sha256 d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 opensbi-1.6.tar.gz diff --git a/board/spike/riscv64/patches/opensbi/opensbi.hash b/board/spike/riscv64/patches/opensbi/opensbi.hash index bc4058abe6..d7893a1dee 100644 --- a/board/spike/riscv64/patches/opensbi/opensbi.hash +++ b/board/spike/riscv64/patches/opensbi/opensbi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz +sha256 d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 opensbi-1.6.tar.gz diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash index 95bd23c8d0..4ac46f027b 100644 --- a/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f048267b7b88316c9ca708c68d15a9ae802dcfc943c3188c1273eb958c433281 linux-6.9.8.tar.xz +sha256 663507accae673afcf4e210b4ae8d4352e61d926202e5da3f04bf71ca1d2c0b5 linux-6.12.53.tar.xz diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/optee-client/optee-client.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/optee-client/optee-client.hash new file mode 100644 index 0000000000..5423bf93a5 --- /dev/null +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/optee-client/optee-client.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a9a91bdb433df795c87a6d15198effbd648e3671ae611f2a3f8b41229d61cce0 optee-client-4.3.0.tar.gz diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/optee-os/optee-os.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/optee-os/optee-os.hash new file mode 100644 index 0000000000..2e12a5cdea --- /dev/null +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/optee-os/optee-os.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096 optee-os-4.3.0.tar.gz diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash index fe9b4f53dc..98a5c53aaf 100644 --- a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash index fc2057c3f2..6450f4b2d4 100644 --- a/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz +sha256 c29387aeee085fbcbd91236224b9df805063bac43615e75cea2c6b29604a5c73 linux-6.1.155.tar.xz diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash index b241c795ba..68e85f8a21 100644 --- a/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz +sha256 9c4efdd7ee550d524c017b5dae27725374526311e983661850cd880af671cb2a linux-5.15.186.tar.xz diff --git a/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash index 904fa56c02..440526977b 100644 --- a/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash index b241c795ba..27549bda93 100644 --- a/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz +sha256 348d6faada05fd4684450cd7c4e666c3c98cdb96f2309b1520c9a92a378c267e linux-5.15.194.tar.xz diff --git a/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash index 904fa56c02..98a5c53aaf 100644 --- a/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash index b241c795ba..27549bda93 100644 --- a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz +sha256 348d6faada05fd4684450cd7c4e666c3c98cdb96f2309b1520c9a92a378c267e linux-5.15.194.tar.xz diff --git a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash index 904fa56c02..98a5c53aaf 100644 --- a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/stmicroelectronics/stm32mp135f-dk/linux.config b/board/stmicroelectronics/stm32mp135f-dk/linux.config new file mode 100644 index 0000000000..25f570846a --- /dev/null +++ b/board/stmicroelectronics/stm32mp135f-dk/linux.config @@ -0,0 +1,190 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_USELIB=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_BLK_DEV_INITRD=y +CONFIG_ARCH_STM32=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +CONFIG_SMP=y +CONFIG_MCPM=y +CONFIG_HIGHMEM=y +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_SECCOMP=y +# CONFIG_ATAGS is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CAN=y +CONFIG_CAN_M_CAN=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 +CONFIG_SIMPLE_PM_BUS=y +CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SRAM=y +CONFIG_EEPROM_AT24=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_KS8851=y +CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +CONFIG_MDIO_BITBANG=y +CONFIG_INPUT_JOYDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_STPMIC1_ONKEY=y +CONFIG_SERIAL_STM32=y +CONFIG_SERIAL_STM32_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_HW_RANDOM=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_STM32F7=y +CONFIG_SPI=y +CONFIG_SPI_STM32=y +CONFIG_SPI_STM32_QSPI=y +CONFIG_PINCTRL_MCP23S08=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_STMFX=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_WATCHDOG=y +CONFIG_STPMIC1_WATCHDOG=y +CONFIG_MFD_STM32_LPTIMER=y +CONFIG_MFD_STPMIC1=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_ARM_SCMI=y +CONFIG_REGULATOR_STM32_BOOSTER=y +CONFIG_REGULATOR_STM32_VREFBUF=y +CONFIG_REGULATOR_STM32_PWR=y +CONFIG_REGULATOR_STPMIC1=y +CONFIG_DRM=y +CONFIG_DRM_STM=y +CONFIG_DRM_STM_DSI=y +CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y +CONFIG_DRM_SII902X=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_USB=m +CONFIG_USB_OTG=y +CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_DWC2=m +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=m +CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_GPIO_VBUS=y +CONFIG_USB_ISP1301=m +CONFIG_USB_ULPI=y +CONFIG_TYPEC=y +CONFIG_TYPEC_STUSB=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_DW=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_STM32=y +CONFIG_DMADEVICES=y +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +CONFIG_COMMON_CLK_SCMI=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y +CONFIG_STM32_IPCC=y +CONFIG_REMOTEPROC=y +CONFIG_STM32_RPROC=y +CONFIG_RPMSG_VIRTIO=y +CONFIG_RPMSG_TTY=y +CONFIG_IIO=y +CONFIG_IIO_SW_TRIGGER=y +CONFIG_SD_ADC_MODULATOR=y +CONFIG_STM32_ADC_CORE=y +CONFIG_STM32_ADC=y +CONFIG_STM32_ADC_TEMP=y +CONFIG_STM32_DFSDM_ADC=y +CONFIG_STM32_LPTIMER_CNT=y +CONFIG_STM32_DAC=y +CONFIG_IIO_HRTIMER_TRIGGER=y +CONFIG_IIO_STM32_LPTIMER_TRIGGER=y +CONFIG_PWM=y +CONFIG_PWM_STM32=y +CONFIG_PWM_STM32_LP=y +CONFIG_RESET_SCMI=y +CONFIG_PHY_STM32_USBPHYC=y +CONFIG_NVMEM_STM32_ROMEM=y +CONFIG_TEE=y +CONFIG_OPTEE=y +CONFIG_COUNTER=y +CONFIG_STM32_LPTIMER_CNT=y +CONFIG_STM32_TIMER_CNT=y +CONFIG_EXT4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_PRINTK_TIME=y diff --git a/board/stmicroelectronics/stm32mp135f-dk/overlay/boot/extlinux/extlinux.conf b/board/stmicroelectronics/stm32mp135f-dk/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..0cc49d6a56 --- /dev/null +++ b/board/stmicroelectronics/stm32mp135f-dk/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label stm32mp135f-dk-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp135f-dk.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/board/stmicroelectronics/stm32mp135f-dk/readme.txt b/board/stmicroelectronics/stm32mp135f-dk/readme.txt new file mode 100644 index 0000000000..44472840b3 --- /dev/null +++ b/board/stmicroelectronics/stm32mp135f-dk/readme.txt @@ -0,0 +1,37 @@ +STM32MP135F Discovery Kit + +Intro +===== + +This configuration supports the STM32MP135F Discovery Kit (DK) +platform: + + https://www.st.com/en/evaluation-tools/stm32mp135f-dk.html + +How to build +============ + + $ make stm32mp135f_dk_defconfig + $ make + +How to write the microSD card +============================= + +Once the build process is finished you will have an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card in connector CN3 + + (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 CN12 to power-up the board. + + (4) The system will start, with the console on UART. diff --git a/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc b/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc index fed2b0b45d..6cf307b80b 100644 --- a/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc +++ b/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc @@ -1,5 +1,6 @@ #!/bin/sh +# shellcheck disable=SC2276 global.bootm.oftree="/boot/socfpga_cyclone5_de0_nano_soc.dtb" global.bootm.image="/boot/zImage" diff --git a/board/ti/am62ax-sk/linux.config b/board/ti/am62ax-sk/linux.config new file mode 100644 index 0000000000..b0f9d1b737 --- /dev/null +++ b/board/ti/am62ax-sk/linux.config @@ -0,0 +1,3 @@ +CONFIG_MFD_TPS6594=y +CONFIG_MFD_TPS6594_I2C=y +CONFIG_REGULATOR_TPS6594=y diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash index 706ddb8dbb..4ac46f027b 100644 --- a/board/ti/am62x-sk/patches/linux/linux.hash +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5ffceb2350db1547e69231a63df2d3beed015a313d7d7adf8b5cb71dedaeb16a linux-6.10.13.tar.xz +sha256 663507accae673afcf4e210b4ae8d4352e61d926202e5da3f04bf71ca1d2c0b5 linux-6.12.53.tar.xz diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash index 904fa56c02..98a5c53aaf 100644 --- a/board/ti/am62x-sk/patches/uboot/uboot.hash +++ b/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/versal/genimage.cfg b/board/versal/genimage.cfg index d994d3a2bf..8870777f19 100644 --- a/board/versal/genimage.cfg +++ b/board/versal/genimage.cfg @@ -10,7 +10,7 @@ image boot.vfat { } } - size = 32M + size = 64M } image sdcard.img { diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh deleted file mode 100755 index faa75a0de3..0000000000 --- a/board/versal/post-build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# genimage will need to find the extlinux.conf -# in the binaries directory - -CONSOLE="$2" -ROOT="$3" - -mkdir -p "${BINARIES_DIR}" -cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" - label linux - kernel /Image - devicetree /system.dtb - append console=${CONSOLE} root=/dev/${ROOT} rw rootwait - __HEADER_EOF diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh new file mode 120000 index 0000000000..0130ff23d2 --- /dev/null +++ b/board/versal/post-build.sh @@ -0,0 +1 @@ +../zynqmp/post-build.sh \ No newline at end of file diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 22367d5028..3242e4384a 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -12,12 +12,11 @@ FIRST_DT=$(sed -nr \ BOARD_DIR="$(dirname "$0")" -mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" the_ROM_image: { image { - { type=bootimage, file=${BINARIES_DIR}/vpl_gen_fixed.pdi } + { type=bootimage, file=${BINARIES_DIR}/boot.pdi } { type=bootloader, file=${BINARIES_DIR}/plm.elf } { core=psm, file=${BINARIES_DIR}/psmfw.elf } } diff --git a/board/versal/readme.txt b/board/versal/readme.txt index 4d8406fb1f..3bcaccbb0e 100644 --- a/board/versal/readme.txt +++ b/board/versal/readme.txt @@ -11,13 +11,13 @@ Xilinx VPK180 board Evaluation board features can be found here with the links below. VCK190: -https://www.xilinx.com/products/boards-and-kits/vck190.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vck190.html VEK280: -https://www.xilinx.com/products/boards-and-kits/vek280.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vek280.html VPK180: -https://www.xilinx.com/products/boards-and-kits/vpk180.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vpk180.html How to build it @@ -60,3 +60,49 @@ card: Where 'sdX' is the device node of the SD. Eject the SD card, insert it in the board, and power it up. + +Support for other boards: +========================= + +If you want to build a system for other boards based on the same SoC, and the +board is already supported by the upstream kernel, U-Boot, and +xilinx-prebuilt, you simply need to change the following Buildroot options: + + - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME) + - U-Boot (BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=") + - xilinx-prebuilt (BR2_TARGET_XILINX_PREBUILT_BOARD) + +Custom versal board support: + +To generate a boot.bin image, Versal boards require a PDI (Programmable Device +Image) generated by Xilinx Vivado which contains all the hardware specific +boot information, such as clock, MIO and DDR initializations as well as any +customizations in the programmable logic. Since this PDI can only be generated +by Xilinx Vivado, Buildroot needs access to the prebuilt image. The Buildroot +xilinx-prebuilt package has support for Versal XSA files exported from Xilinx +Vivado. + +Using the option BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA, Buildroot can obtain +the prebuilt PDI from the XSA file. + +1) Start with a defconfig supported by Buildroot (e.g. VCK190) + make versal_vck190_defconfig + +2) make menuconfig + Visit the following menu and enable BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA + + Bootloaders ---> + xilinx-prebuilt ---> + [*] download a prebuilt Versal XSA + +3) Within the same menuconfig, configure location of XSA. It can be in the + local file system or downloadable from an https:// location. + + Bootloaders ---> + xilinx-prebuilt ---> + () URL of custom XSA + +4) make + +The resulting output/images will contain a boot.bin that includes the custom +PDI file extracted from the Xilinx Vivado exported XSA file. diff --git a/board/visionfive2/linux_defconfig b/board/visionfive2/linux_defconfig index d6d1a65247..06942928b5 100644 --- a/board/visionfive2/linux_defconfig +++ b/board/visionfive2/linux_defconfig @@ -1,104 +1,181 @@ +CONFIG_COMPILE_TEST=y +# CONFIG_WERROR is not set +CONFIG_DEFAULT_HOSTNAME="StarFive" CONFIG_SYSVIPC=y -# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_USELIB=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_PSI=y -# CONFIG_CPU_ISOLATION is not set +CONFIG_BPF_SYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_CGROUPS=y CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_CPUACCT=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_CGROUP_BPF=y CONFIG_NAMESPACES=y +CONFIG_USER_NS=y +CONFIG_CHECKPOINT_RESTORE=y CONFIG_BLK_DEV_INITRD=y -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_XZ is not set -# CONFIG_RD_LZO is not set -# CONFIG_RD_LZ4 is not set CONFIG_EXPERT=y -# CONFIG_SYSFS_SYSCALL is not set CONFIG_PERF_EVENTS=y CONFIG_SOC_STARFIVE=y -CONFIG_ERRATA_SIFIVE=y CONFIG_NONPORTABLE=y CONFIG_SMP=y -# CONFIG_RISCV_ISA_SVPBMT is not set -# CONFIG_COMPAT is not set +CONFIG_RISCV_AMP=y +CONFIG_HZ_100=y CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="PARTLABEL=hibernation" +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y CONFIG_CPU_IDLE=y CONFIG_RISCV_SBI_CPUIDLE=y CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y -CONFIG_JUMP_LABEL=y -# CONFIG_STACKPROTECTOR is not set -# CONFIG_GCC_PLUGINS is not set +# CONFIG_SECCOMP is not set CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_COMPRESS_ZSTD=y -# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set -CONFIG_BLK_WBT=y -# CONFIG_BLK_DEBUG_FS is not set -CONFIG_PARTITION_ADVANCED=y -# CONFIG_MQ_IOSCHED_DEADLINE is not set -# CONFIG_MQ_IOSCHED_KYBER is not set -CONFIG_KSM=y -# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_BINFMT_MISC=y +CONFIG_PAGE_REPORTING=y CONFIG_NET=y CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y +CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_PNP=y -CONFIG_INET_DIAG=m -# CONFIG_IPV6_SIT is not set -CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_WIRELESS is not set -# CONFIG_ETHTOOL_NETLINK is not set +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_NETLINK_ACCT=y +CONFIG_NETFILTER_NETLINK_QUEUE=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_TABLES=y +CONFIG_NFT_CT=y +CONFIG_NFT_COMPAT=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_IPCOMP=y +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y +CONFIG_NETFILTER_XT_MATCH_SOCKET=y +CONFIG_NETFILTER_XT_MATCH_STATE=y +CONFIG_NETFILTER_XT_MATCH_STRING=y +CONFIG_NETFILTER_XT_MATCH_U32=y +CONFIG_NF_TABLES_IPV4=y +CONFIG_NFT_DUP_IPV4=y +CONFIG_NFT_FIB_IPV4=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_NETLINK_DIAG=y +CONFIG_CAN=y +CONFIG_BT=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_AICUSB=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_RFKILL=y +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_HOST_GENERIC=y +# CONFIG_PCIEASPM is not set +CONFIG_PCIE_STARFIVE_HOST=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=m CONFIG_SIFIVE_CCACHE=y -CONFIG_EFI_DISABLE_RUNTIME=y CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_SPI_NOR=y -CONFIG_ZRAM=y -CONFIG_ZRAM_MEMORY_TRACKING=y +CONFIG_OF_CONFIGFS=y CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=1 +CONFIG_VIRTIO_BLK=y CONFIG_BLK_DEV_NVME=y -CONFIG_SCSI=y +CONFIG_EEPROM_AT24=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM=m CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +# CONFIG_NET_VENDOR_ALACRITECH is not set +# CONFIG_NET_VENDOR_AMAZON is not set +# CONFIG_NET_VENDOR_AQUANTIA is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CADENCE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set +# CONFIG_NET_VENDOR_CORTINA is not set +# CONFIG_NET_VENDOR_EZCHIP is not set +# CONFIG_NET_VENDOR_GOOGLE is not set +# CONFIG_NET_VENDOR_HUAWEI is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_MICROSEMI is not set +# CONFIG_NET_VENDOR_NI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NETRONOME is not set +# CONFIG_NET_VENDOR_PENSANDO is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_R8169=y +# CONFIG_NET_VENDOR_RENESAS is not set +# CONFIG_NET_VENDOR_ROCKER is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SOLARFLARE is not set +# CONFIG_NET_VENDOR_SOCIONEXT is not set CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_SELFTESTS=y CONFIG_DWMAC_DWC_QOS_ETH=y -# CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_STARFIVE=y +# CONFIG_NET_VENDOR_SYNOPSYS is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_NET_VENDOR_XILINX is not set +CONFIG_MARVELL_PHY=y +CONFIG_MICREL_PHY=y CONFIG_MICROCHIP_PHY=y CONFIG_MOTORCOMM_PHY=y -# CONFIG_WLAN is not set +CONFIG_IPMS_CAN=y +CONFIG_IWLWIFI=y +CONFIG_IWLDVM=y +CONFIG_IWLMVM=y +# CONFIG_RTL_CARDS is not set +CONFIG_USB_WIFI_ECR6600U=y +CONFIG_AIC_WLAN_SUPPORT=y +CONFIG_AIC8800_WLAN_SUPPORT=m +CONFIG_AIC_LOADFW_SUPPORT=m +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_LDISC_AUTOLOAD is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_GOODIX=y +CONFIG_TOUCHSCREEN_TINKER_FT5406=y +CONFIG_SERIO_LIBPS2=y CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -# CONFIG_SERIAL_8250_16550A_VARIANTS is not set CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6 @@ -106,51 +183,220 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_TTY_PRINTK=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_JH7110=y -# CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_SPI=y CONFIG_SPI_CADENCE_QUADSPI=y CONFIG_SPI_PL022=y +CONFIG_SPI_SIFIVE=y CONFIG_SPI_SPIDEV=y # CONFIG_PTP_1588_CLOCK is not set -CONFIG_GPIOLIB_FASTPATH_LIMIT=128 CONFIG_GPIO_SYSFS=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_SENSORS_SFCTEMP=y CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y +CONFIG_DEVFREQ_THERMAL=y CONFIG_THERMAL_EMULATION=y +# CONFIG_HISI_THERMAL is not set CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_SYSFS=y CONFIG_MFD_AXP20X_I2C=y CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_AXP20X=y +CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=y +# CONFIG_MEDIA_CEC_SUPPORT is not set CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CADENCE_CSI2RX=y +CONFIG_VIDEO_WAVE_VPU=m +CONFIG_VIN_SENSOR_OV4689=y +CONFIG_VIDEO_STF_VIN=y CONFIG_VIDEO_IMX219=y +CONFIG_VIDEO_IMX708=y +# CONFIG_CXD2880_SPI_DRV is not set +# CONFIG_MEDIA_TUNER_E4000 is not set +# CONFIG_MEDIA_TUNER_FC0011 is not set +# CONFIG_MEDIA_TUNER_FC0012 is not set +# CONFIG_MEDIA_TUNER_FC0013 is not set +# CONFIG_MEDIA_TUNER_FC2580 is not set +# CONFIG_MEDIA_TUNER_IT913X is not set +# CONFIG_MEDIA_TUNER_M88RS6000T is not set +# CONFIG_MEDIA_TUNER_MAX2165 is not set +# CONFIG_MEDIA_TUNER_MC44S803 is not set +# CONFIG_MEDIA_TUNER_MSI001 is not set +# CONFIG_MEDIA_TUNER_MT2060 is not set +# CONFIG_MEDIA_TUNER_MT2063 is not set +# CONFIG_MEDIA_TUNER_MT20XX is not set +# CONFIG_MEDIA_TUNER_MT2131 is not set +# CONFIG_MEDIA_TUNER_MT2266 is not set +# CONFIG_MEDIA_TUNER_MXL301RF is not set +# CONFIG_MEDIA_TUNER_MXL5005S is not set +# CONFIG_MEDIA_TUNER_MXL5007T is not set +# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set +# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set +# CONFIG_MEDIA_TUNER_QT1010 is not set +# CONFIG_MEDIA_TUNER_R820T is not set +# CONFIG_MEDIA_TUNER_SI2157 is not set +# CONFIG_MEDIA_TUNER_SIMPLE is not set +# CONFIG_MEDIA_TUNER_TDA18212 is not set +# CONFIG_MEDIA_TUNER_TDA18218 is not set +# CONFIG_MEDIA_TUNER_TDA18250 is not set +# CONFIG_MEDIA_TUNER_TDA18271 is not set +# CONFIG_MEDIA_TUNER_TDA827X is not set +# CONFIG_MEDIA_TUNER_TDA8290 is not set +# CONFIG_MEDIA_TUNER_TDA9887 is not set +# CONFIG_MEDIA_TUNER_TEA5761 is not set +# CONFIG_MEDIA_TUNER_TEA5767 is not set +# CONFIG_MEDIA_TUNER_TUA9001 is not set +# CONFIG_MEDIA_TUNER_XC2028 is not set +# CONFIG_MEDIA_TUNER_XC4000 is not set +# CONFIG_MEDIA_TUNER_XC5000 is not set +# CONFIG_DVB_MXL5XX is not set +# CONFIG_DVB_STB0899 is not set +# CONFIG_DVB_STB6100 is not set +# CONFIG_DVB_STV090x is not set +# CONFIG_DVB_STV0910 is not set +# CONFIG_DVB_STV6110x is not set +# CONFIG_DVB_STV6111 is not set +# CONFIG_DVB_DRXK is not set +# CONFIG_DVB_MN88472 is not set +# CONFIG_DVB_MN88473 is not set +# CONFIG_DVB_SI2165 is not set +# CONFIG_DVB_TDA18271C2DD is not set +# CONFIG_DVB_CX24110 is not set +# CONFIG_DVB_CX24116 is not set +# CONFIG_DVB_CX24117 is not set +# CONFIG_DVB_CX24120 is not set +# CONFIG_DVB_CX24123 is not set +# CONFIG_DVB_DS3000 is not set +# CONFIG_DVB_MB86A16 is not set +# CONFIG_DVB_MT312 is not set +# CONFIG_DVB_S5H1420 is not set +# CONFIG_DVB_SI21XX is not set +# CONFIG_DVB_STB6000 is not set +# CONFIG_DVB_STV0288 is not set +# CONFIG_DVB_STV0299 is not set +# CONFIG_DVB_STV0900 is not set +# CONFIG_DVB_STV6110 is not set +# CONFIG_DVB_TDA10071 is not set +# CONFIG_DVB_TDA10086 is not set +# CONFIG_DVB_TDA8083 is not set +# CONFIG_DVB_TDA8261 is not set +# CONFIG_DVB_TDA826X is not set +# CONFIG_DVB_TS2020 is not set +# CONFIG_DVB_TUA6100 is not set +# CONFIG_DVB_TUNER_CX24113 is not set +# CONFIG_DVB_TUNER_ITD1000 is not set +# CONFIG_DVB_VES1X93 is not set +# CONFIG_DVB_ZL10036 is not set +# CONFIG_DVB_ZL10039 is not set +# CONFIG_DVB_CX22700 is not set +# CONFIG_DVB_CX22702 is not set +# CONFIG_DVB_CXD2820R is not set +# CONFIG_DVB_CXD2841ER is not set +# CONFIG_DVB_DIB3000MB is not set +# CONFIG_DVB_DIB3000MC is not set +# CONFIG_DVB_DIB7000M is not set +# CONFIG_DVB_DIB7000P is not set +# CONFIG_DVB_DIB9000 is not set +# CONFIG_DVB_DRXD is not set +# CONFIG_DVB_EC100 is not set +# CONFIG_DVB_L64781 is not set +# CONFIG_DVB_MT352 is not set +# CONFIG_DVB_NXT6000 is not set +# CONFIG_DVB_S5H1432 is not set +# CONFIG_DVB_SP887X is not set +# CONFIG_DVB_STV0367 is not set +# CONFIG_DVB_TDA10048 is not set +# CONFIG_DVB_TDA1004X is not set +# CONFIG_DVB_ZD1301_DEMOD is not set +# CONFIG_DVB_ZL10353 is not set +# CONFIG_DVB_CXD2880 is not set +# CONFIG_DVB_STV0297 is not set +# CONFIG_DVB_TDA10021 is not set +# CONFIG_DVB_TDA10023 is not set +# CONFIG_DVB_VES1820 is not set +# CONFIG_DVB_AU8522_DTV is not set +# CONFIG_DVB_AU8522_V4L is not set +# CONFIG_DVB_BCM3510 is not set +# CONFIG_DVB_LG2160 is not set +# CONFIG_DVB_LGDT3305 is not set +# CONFIG_DVB_LGDT330X is not set +# CONFIG_DVB_MXL692 is not set +# CONFIG_DVB_NXT200X is not set +# CONFIG_DVB_OR51132 is not set +# CONFIG_DVB_OR51211 is not set +# CONFIG_DVB_S5H1409 is not set +# CONFIG_DVB_S5H1411 is not set +# CONFIG_DVB_DIB8000 is not set +# CONFIG_DVB_MB86A20S is not set +# CONFIG_DVB_S921 is not set +# CONFIG_DVB_MN88443X is not set +# CONFIG_DVB_TC90522 is not set +# CONFIG_DVB_PLL is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_DIB0090 is not set +# CONFIG_DVB_A8293 is not set +# CONFIG_DVB_AF9033 is not set +# CONFIG_DVB_ASCOT2E is not set +# CONFIG_DVB_ATBM8830 is not set +# CONFIG_DVB_HELENE is not set +# CONFIG_DVB_HORUS3A is not set +# CONFIG_DVB_ISL6405 is not set +# CONFIG_DVB_ISL6421 is not set +# CONFIG_DVB_ISL6423 is not set +# CONFIG_DVB_IX2505V is not set +# CONFIG_DVB_LGS8GL5 is not set +# CONFIG_DVB_LGS8GXX is not set +# CONFIG_DVB_LNBH25 is not set +# CONFIG_DVB_LNBH29 is not set +# CONFIG_DVB_LNBP21 is not set +# CONFIG_DVB_LNBP22 is not set +# CONFIG_DVB_M88RS2000 is not set +# CONFIG_DVB_TDA665x is not set +# CONFIG_DVB_DRX39XYJ is not set +# CONFIG_DVB_CXD2099 is not set +# CONFIG_DVB_SP2 is not set CONFIG_DRM=y +CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=y +CONFIG_DRM_PANEL_STARFIVE_JADARD=y +CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_TOSHIBA_TC358762=y +CONFIG_DRM_VERISILICON=y +CONFIG_STARFIVE_INNO_HDMI=y +CONFIG_STARFIVE_DSI=y +CONFIG_DRM_IMG_ROGUE=y +CONFIG_FB=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y +CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_DESIGNWARE_I2S=y +CONFIG_SND_SOC_RZ=m CONFIG_SND_SOC_STARFIVE=y CONFIG_SND_SOC_JH7110_PWMDAC=y CONFIG_SND_SOC_JH7110_TDM=y +CONFIG_SND_SOC_AC108=y CONFIG_SND_SOC_WM8960=y CONFIG_SND_SIMPLE_CARD=y +CONFIG_UHID=y CONFIG_USB=y +CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y CONFIG_USB_CDNS_SUPPORT=y @@ -158,77 +404,167 @@ CONFIG_USB_CDNS3=y CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_CDNS3_HOST=y CONFIG_USB_CDNS3_STARFIVE=y +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_DEBUG=m CONFIG_USB_GADGET=y +CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y CONFIG_MMC=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_MMC_DEBUG=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_DWCMSHC=y +CONFIG_MMC_SPI=y +CONFIG_MMC_SDHI=y CONFIG_MMC_DW=y CONFIG_MMC_DW_STARFIVE=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_STARFIVE=y +CONFIG_RTC_DRV_GOLDFISH=y CONFIG_DMADEVICES=y CONFIG_AMBA_PL08X=y CONFIG_DW_AXI_DMAC=y CONFIG_DMATEST=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set -CONFIG_STAGING=y -CONFIG_STAGING_MEDIA=y -CONFIG_VIDEO_STARFIVE_CAMSS=y +CONFIG_GOLDFISH=y +# CONFIG_CLK_STARFIVE_JH7100_AUDIO is not set CONFIG_CLK_STARFIVE_JH7110_AON=y CONFIG_CLK_STARFIVE_JH7110_STG=y CONFIG_CLK_STARFIVE_JH7110_ISP=y CONFIG_CLK_STARFIVE_JH7110_VOUT=y +CONFIG_MAILBOX=y +CONFIG_STARFIVE_IPI_MBOX=y +CONFIG_STARFIVE_MBOX=m +CONFIG_STARFIVE_MBOX_TEST=m # CONFIG_IOMMU_SUPPORT is not set +CONFIG_RPMSG_CHAR=y +CONFIG_RPMSG_CTRL=y +CONFIG_RPMSG_STARFIVE=m +CONFIG_RPMSG_VIRTIO=y +CONFIG_PM_DEVFREQ=y +CONFIG_IIO=y +CONFIG_IIO_ST_ACCEL_3AXIS=y CONFIG_PWM=y -CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=y +CONFIG_PWM_OCORES=y CONFIG_PHY_STARFIVE_JH7110_PCIE=y CONFIG_PHY_STARFIVE_JH7110_USB=y +CONFIG_PHY_M31_DPHY_RX0=y +CONFIG_RAS=y CONFIG_EXT4_FS=y -CONFIG_BTRFS_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_DNOTIFY is not set -CONFIG_FANOTIFY=y CONFIG_AUTOFS_FS=y +CONFIG_FUSE_FS=y +CONFIG_CUSE=y +CONFIG_VIRTIO_FS=y +CONFIG_FSCACHE=y +CONFIG_FSCACHE_STATS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=y CONFIG_NTFS_FS=y -CONFIG_NTFS_RW=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_CHILDREN=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_EFIVAR_FS=y +CONFIG_HUGETLBFS=y CONFIG_JFFS2_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_ROOT_NFS=y -CONFIG_NLS_DEFAULT="iso8859-15" +CONFIG_CIFS=m +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_SMB_SERVER=m CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_15=y -CONFIG_LSM="" -CONFIG_CRYPTO_ZSTD=y -# CONFIG_RAID6_PQ_BENCHMARK is not set -# CONFIG_DEBUG_MISC is not set -CONFIG_STRIP_ASM_SYMS=y -CONFIG_DEBUG_SECTION_MISMATCH=y -# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set +CONFIG_NLS_ISO8859_1=y +CONFIG_INIT_STACK_NONE=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_USER_API_AEAD=y +CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_CRYPTO_DEV_JH7110=y +CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y -# CONFIG_SLUB_DEBUG is not set -CONFIG_DEBUG_RODATA_TEST=y -CONFIG_DEBUG_WX=y CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_STACKTRACE=y -CONFIG_RCU_CPU_STALL_TIMEOUT=60 +CONFIG_DEBUG_RT_MUTEXES=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_RWSEMS=y +CONFIG_DEBUG_LIST=y +CONFIG_DEBUG_PLIST=y +CONFIG_DEBUG_SG=y # CONFIG_RCU_TRACE is not set +CONFIG_RCU_EQS_DEBUG=y # CONFIG_FTRACE is not set # CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_MEMTEST=y diff --git a/board/visionfive2/patches/linux/linux.hash b/board/visionfive2/patches/linux/linux.hash index ccad8068dd..1213da86b1 100644 --- a/board/visionfive2/patches/linux/linux.hash +++ b/board/visionfive2/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04 linux-6.8.2.tar.xz +sha256 643142c1b5991560dd12f950825cc19e4497b95b82641918ecff1177f4130c1d linux-6.12.24.tar.xz diff --git a/board/visionfive2/patches/opensbi/opensbi.hash b/board/visionfive2/patches/opensbi/opensbi.hash index bc4058abe6..d7893a1dee 100644 --- a/board/visionfive2/patches/opensbi/opensbi.hash +++ b/board/visionfive2/patches/opensbi/opensbi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 opensbi-1.4.tar.gz +sha256 d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 opensbi-1.6.tar.gz diff --git a/board/visionfive2/patches/uboot/uboot.hash b/board/visionfive2/patches/uboot/uboot.hash index 97a2b4eaf9..80ea21b7cb 100644 --- a/board/visionfive2/patches/uboot/uboot.hash +++ b/board/visionfive2/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/board/warp7/readme.txt b/board/warp7/readme.txt index aff7a601e5..39d845bd32 100644 --- a/board/warp7/readme.txt +++ b/board/warp7/readme.txt @@ -107,11 +107,9 @@ To boot your newly created system: Using Wifi ========== -# modprobe brcmfmac -# iwconfig wlan0 essid ACCESSPOINTNAME # wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf (enter the wifi password and press enter) -# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf & +# wpa_supplicant -iwlan0 -c /etc/wpa.conf & # udhcpc -i wlan0 # ping buildroot.org diff --git a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash index e300398541..d7bd1e73ef 100644 --- a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c3369c89eab4e452bbc76c630e5dccb6c0ae588c0175b6c8549aa0241deb06ef xlnx_rebase_v2.10_2024.1.tar.gz +sha256 4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d xlnx_rebase_v2.12_2025.1.tar.gz diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash index b007db4303..994d637d50 100644 --- a/board/xilinx/patches/linux/linux.hash +++ b/board/xilinx/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz +sha256 ea55acf69bead3d4cf121de414cccfbe75a3c36465c93d9500cc00688d9b8d9d xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz diff --git a/board/xilinx/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash index a5ab9fae05..19192b182c 100644 --- a/board/xilinx/patches/uboot/uboot.hash +++ b/board/xilinx/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 58e391a001d9d8ed347ab3258ff7c8435c866b1ff2b2c22ebc95af592444c0f5 xlnx_rebase_v2024.01_2024.1.tar.gz +sha256 b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93 xlnx_rebase_v2025.01_2025.1.tar.gz diff --git a/board/zynq/readme.txt b/board/zynq/readme.txt index b2a4cefedd..225af4b9dc 100644 --- a/board/zynq/readme.txt +++ b/board/zynq/readme.txt @@ -36,14 +36,16 @@ myboot=... References: - ZC702 information including schematics, reference designs, and manuals are available from - https://www.xilinx.com/products/boards-and-kits/ek-z7-zc702-g.html + https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/ek-z7-zc702-g.html - ZC706 information including schematics, reference designs, and manuals are available from - http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html. + https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/ek-z7-zc706-g.html - Zedboard/Microzed information including schematics, reference designs, and - manuals are available from http://www.zedboard.org . + manuals are available from + https://www.avnet.com/americas/products/avnet-boards/avnet-board-families/zedboard/ + https://www.tria-technologies.com/product/microzed/ Support for other boards: @@ -62,7 +64,7 @@ the U-Boot source tree. Without those files, boot.bin will be built successfully but it will not be functional at all. Those files are output from the Xilinx tools, but for convenience, U-Boot includes the default ps7_init_gpl.c/h of popular boards. Those files may need to be -updated for any programmable logic customizations which impact +updated for any programmable logic or DDR customizations which impact ps7_init (clock/pin setup & mapping/AXI bridge setup/etc). See board/xilinx/zynq/ directory of U-Boot for natively supported ps7_init files. If the ps7_init files for your board are not found in U-Boot, @@ -71,17 +73,18 @@ you need to add them by yourself. 1) Start with a defconfig supported by Buildroot (e.g. Zedboard) make zynq_zed_defconfig -2) make uboot-menuconfig - Visit the following menu and enable CONFIG_ZYNQ_CUSTOM_INIT. +2) make menuconfig + Visit the following menu to enable BR2_TARGET_UBOOT_ZYNQ - ARM architecture ---> - [*] Use custom ps7_init provided by Xilinx tool + Bootloaders ---> + U-Boot ---> + [*] Boot on the Xilinx Zynq SoCs -3) Copy ps7_init_gpl.c/h generated by the Xilinx tools into - output/build/uboot-xilinx-/board/xilinx/zynq/custom_hw_platform/ +3) make menuconfig + In the same menu, configure BR2_TARGET_UBOOT_ZYNQ_PS7_INIT_FILE + + Bootloaders ---> + U-Boot ---> + () Custom ps7_init_gpl file 4) make - -Note: The files in step 3 will need to be re-copied after cleaning the -output directory and at this time, there is no way to save them as -part of the buildroot configuration, except as a U-Boot patch. diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index 20d8352c08..193aff2a2d 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -3,6 +3,7 @@ image boot.vfat { files = { "boot.bin", "u-boot.itb", + "qspi.bin", "system.dtb", "Image" } @@ -11,7 +12,7 @@ image boot.vfat { } } - size = 32M + size = 64M } image sdcard.img { diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index 7d3a520fde..8d008332bf 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -10,13 +10,13 @@ the KD240, KR260 and KV260 production boards. Evaluation board features can be found here with the links below. KD240: -https://www.xilinx.com/products/som/kria/kd240-drives-starter-kit.html +https://www.amd.com/en/products/system-on-modules/kria/k24/kd240-drives-starter-kit.html KR260: -https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html +https://www.amd.com/en/products/system-on-modules/kria/k26/kr260-robotics-starter-kit.html KV260: -https://www.xilinx.com/products/som/kria/kv260-vision-starter-kit.html +https://www.amd.com/en/products/system-on-modules/kria/k26/kv260-vision-starter-kit.html How to build it =============== @@ -42,6 +42,7 @@ After building, you should get a tree like this: +-- boot.bin +-- boot.vfat +-- Image + +-- qspi.bin +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img @@ -80,39 +81,28 @@ easier. Instructions for using these utilities to update the files in QSPI flash can be found on the wiki link below. -https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM#Boot-Firmware-Updates +Please note that since the BIRT utility requires a single file +for flashing, the qspi.bin should be used as either ImageA or +ImageB. The qspi.bin is a unified binary containing both the +boot.bin and u-boot.itb files in a single binary. + +https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+SOMs+Starter+Kits#Boot-FW-Update-Process Additionally, it is possible to use u-boot for updating the -QSPI with new boot.bin and u-boot.itb images with the u-boot -commands below. +QSPI with new qspi.bin image with the u-boot commands below. KV260 Flashing Instructions: -Flashing u-boot.itb: $ sf probe - $ fatload mmc 1 0x1000000 u-boot.itb - $ sf erase 0x280000 +$filesize - $ sf write 0x1000000 0x280000 $filesize - -Flashing boot.bin: - $ sf probe - $ fatload mmc 1 0x1000000 boot.bin + $ fatload mmc 1 0x1000000 qspi.bin $ sf erase 0x200000 +$filesize $ sf write 0x1000000 0x200000 $filesize KD240 / KR260 Flashing Instructions: -Flashing u-boot.itb: $ usb start $ sf probe - $ fatload usb 0 0x1000000 u-boot.itb - $ sf erase 0x280000 +$filesize - $ sf write 0x1000000 0x280000 $filesize - -Flashing boot.bin: - $ usb start - $ sf probe - $ fatload usb 0 0x1000000 boot.bin + $ fatload usb 0 0x1000000 qspi.bin $ sf erase 0x200000 +$filesize $ sf write 0x1000000 0x200000 $filesize It is possible to boot the Buildroot generated SD card image without -updating the QSPI boot.bin image, so this is an optional step. +updating the QSPI qspi.bin image, so this is an optional step. diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index 3f1b3a80c2..12b81f4a07 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -10,13 +10,13 @@ boards. Evaluation board features can be found here with the links below. ZCU102: -https://www.xilinx.com/products/boards-and-kits/zcu102.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/ek-u1-zcu102-g.html ZCU104: -https://www.xilinx.com/products/boards-and-kits/zcu104.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/zcu104.html ZCU106: -https://www.xilinx.com/products/boards-and-kits/zcu106.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/zcu106.html How to build it @@ -65,6 +65,41 @@ Where 'sdX' is the device node of the SD. Eject the SD card, insert it in the board, and power it up. +Support for other boards: +========================= + +If you want to build a system for other boards based on the same SoC, and the +board is already supported by the upstream kernel and U-Boot, you simply need +to change the following Buildroot options: + + - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME) + - U-Boot (BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=") + +Custom psu_init_gpl.c/h support: + +To generate a working boot.bin image, psu_init_gpl.c/h are required in +the U-Boot source tree. Without those files, boot.bin will be built +successfully but it will not be functional at all. Those files are +output from the Xilinx tools, but for convenience, U-Boot includes the +default psu_init_gpl.c/h of popular boards. Those files may need to be +updated for any programmable logic or DDR customizations which impact +psu_init (clock/pin setup & mapping/AXI bridge setup/etc). See +board/xilinx/zynqmp/ directory of U-Boot for natively supported psu_init +files. If the psu_init files for your board are not found in U-Boot, +you need to add them using BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE. + +1) Start with a defconfig supported by Buildroot (e.g. ZCU106) + make zynqmp_zcu106_defconfig + +2) make menuconfig + Visit the following menu to configure BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE + + Bootloaders ---> + U-Boot ---> + () Custom psu_init_gpl file + +3) make + ============== Important Note ============== diff --git a/boot/Config.in b/boot/Config.in index 5c8d0e7ee5..08a6c8353d 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -1,3 +1,11 @@ +config BR2_TARGET_XILINX_FIRMWARE_ARCH_SUPPORTS + bool + default y + # All Xilinx SoCs using this package are aarch64 only + depends on BR2_aarch64 + # only CPUs with corresponding firmwares: + depends on BR2_cortex_a53 || BR2_cortex_a72 + menu "Bootloaders" source "boot/afboot-stm32/Config.in" @@ -19,6 +27,10 @@ source "boot/ti-k3-boot-firmware/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" + +if BR2_TARGET_XILINX_FIRMWARE_ARCH_SUPPORTS +source "boot/xilinx-embeddedsw/Config.in" source "boot/xilinx-prebuilt/Config.in" +endif endmenu diff --git a/boot/afboot-stm32/Config.in b/boot/afboot-stm32/Config.in index 23372705ad..23d6eda5d4 100644 --- a/boot/afboot-stm32/Config.in +++ b/boot/afboot-stm32/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_AFBOOT_STM32 +menuconfig BR2_TARGET_AFBOOT_STM32 bool "afboot-stm32" depends on BR2_arm help diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 5ba4e08370..72684e5974 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_ARM_TRUSTED_FIRMWARE +menuconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) help @@ -14,7 +14,12 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.11" + bool "v2.12" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION + bool "latest lts-v2.12.x" + help + Select the latest LTS v2.12.x version available config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION bool "latest lts-v2.10.x" @@ -52,7 +57,8 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.11" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.12" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.12.1" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION default "lts-v2.10.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION default "lts-v2.8.20" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL @@ -249,7 +255,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN bool "Needs arm-none-eabi toolchain" depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86_64" + depends on BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS help Select this option if your ATF board configuration requires an ARM32 bare metal toolchain to be available. diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 172a930b5c..dca16d3960 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -20,7 +20,7 @@ ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmwar ARM_TRUSTED_FIRMWARE_SITE_METHOD = git # The licensing of custom or from-git versions is unknown. # This is valid only for the latest (i.e. known) version. -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif diff --git a/boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..80307beae7 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From 70be9272d8d8b8e205fc60b41704d470a6798e36 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 752ab419d2..78de01686c 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..c92852afa7 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From 83487cb4f74aa25cc3a03cbfa784d7b410cc3d07 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 5ab6123904..654f291732 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + $(q)+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash new file mode 100644 index 0000000000..649ae8df44 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.12.1/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3ab7e90d6fc3364815ad7770d7aa7af9cfd68edde43da7123f5f38f80e034c44 arm-trusted-firmware-lts-v2.12.1-git4.tar.gz +sha256 b2c79635797bafcde84c6edadadde290b9d5e05deb3ea16a847210fd2ca83669 docs/license.rst diff --git a/boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..09e4270f46 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From 26073dca5982e86b45d6ff82176418f8624315f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 160e98f12a..569f5f1552 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..e3826c0881 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From ea879d9dcb7f22b9a0921613bf2f530e2787d0db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 752ab419d2..78de01686c 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..35d1d62bf6 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From f0f29a693064915f5df7ab9369f93353c6c692cc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 752ab419d2..78de01686c 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..c428168168 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From afa038938b5bc54703a10f9103e6b85e07fd562f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 5ab6123904..654f291732 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + $(q)+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash new file mode 100644 index 0000000000..55ea515481 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz +sha256 b2c79635797bafcde84c6edadadde290b9d5e05deb3ea16a847210fd2ca83669 docs/license.rst diff --git a/boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..77c6edb446 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From e94c6513bad0a2cdb2a2266129c06e5a55826d74 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 160e98f12a..569f5f1552 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..725745bc9d --- /dev/null +++ b/boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From bbb06a551951a96b738f1aac70f8c2fc44b39e50 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 160e98f12a..569f5f1552 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..3d59640ec4 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From e349eb61b8b5f058ad9d54fc063b66ca26cf5a5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 160e98f12a..569f5f1552 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch new file mode 100644 index 0000000000..4813464559 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch @@ -0,0 +1,34 @@ +From 51d35780d42b53c5215019c9d6ffe28ce768e886 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 8 Apr 2025 13:27:53 +0200 +Subject: [PATCH] build(plat/marvell): allow building with non-git + mv-ddr-marvell +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the mv-ddr-marvell folder is not a git tree the build fails +complaining that it "does not contain valid mv-ddr-marvell git +repository". + +Remove this check to allow building in Buildroot. + +Upstream: Not applicable. Buildroot specific. +Signed-off-by: Vincent Stehlé +--- + plat/marvell/armada/a8k/common/ble/ble.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk +index 752ab419d2..78de01686c 100644 +--- a/plat/marvell/armada/a8k/common/ble/ble.mk ++++ b/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble +-- +2.48.1 + diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index b3e18fce7c..35bdb28162 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_AT91BOOTSTRAP3 +menuconfig BR2_TARGET_AT91BOOTSTRAP3 bool "AT91 Bootstrap 3+" depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7 help diff --git a/boot/at91bootstrap3/v3.10.3/0001-include-types.h-conditionally-define-bool-false-and-.patch b/boot/at91bootstrap3/v3.10.3/0001-include-types.h-conditionally-define-bool-false-and-.patch new file mode 100644 index 0000000000..352c1c0a43 --- /dev/null +++ b/boot/at91bootstrap3/v3.10.3/0001-include-types.h-conditionally-define-bool-false-and-.patch @@ -0,0 +1,47 @@ +From 908c65678867565a934ea5a967bfe7e204d1ccaf Mon Sep 17 00:00:00 2001 +From: Edgar Bonet +Date: Wed, 25 Jun 2025 11:13:43 +0200 +Subject: [PATCH] include/types.h: conditionally define bool, false and true +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +include/types.h typedefs ‘bool’ and macro-defines ‘false’ and ‘true’. +However, since C23, these are predefine keywords. As C23 is the default +C dialect for GCC 15, building with this compiler fails with: + + include/types.h:23:23: error: ‘bool’ cannot be defined via ‘typedef’ + 23 | typedef unsigned char bool; + | ^~~~ + include/types.h:23:23: note: ‘bool’ is a keyword with ‘-std=c23’ onwards + +Fix this build failure by only defining ‘bool’, ‘false’ and ‘true’ on C +dialects older than C23. + +Upstream: https://github.com/linux4sam/at91bootstrap/pull/188 +[Edgar: backport to v3.10.3] + +Signed-off-by: Edgar Bonet +--- + include/types.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/types.h b/include/types.h +index 1246a4df..2c1a41cf 100644 +--- a/include/types.h ++++ b/include/types.h +@@ -42,8 +42,11 @@ typedef signed long long s64; + typedef unsigned long size_t; + typedef signed long ssize_t; + ++/* bool, false and true are predefined since C23. */ ++#if __STDC_VERSION__ < 202311L + typedef unsigned char bool; + #define false 0U + #define true 1U ++#endif + + #endif /* TYPES_H_ */ +-- +2.43.0 + diff --git a/boot/at91bootstrap3/v4.0.0/0001-include-types.h-conditionally-define-bool-false-and-.patch b/boot/at91bootstrap3/v4.0.0/0001-include-types.h-conditionally-define-bool-false-and-.patch new file mode 100644 index 0000000000..772a808690 --- /dev/null +++ b/boot/at91bootstrap3/v4.0.0/0001-include-types.h-conditionally-define-bool-false-and-.patch @@ -0,0 +1,46 @@ +From 4aab60e634d588dffbd3154fd0cfce78272b750a Mon Sep 17 00:00:00 2001 +From: Edgar Bonet +Date: Wed, 25 Jun 2025 11:13:43 +0200 +Subject: [PATCH] include/types.h: conditionally define bool, false and true +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +include/types.h typedefs ‘bool’ and macro-defines ‘false’ and ‘true’. +However, since C23, these are predefine keywords. As C23 is the default +C dialect for GCC 15, building with this compiler fails with: + + include/types.h:23:23: error: ‘bool’ cannot be defined via ‘typedef’ + 23 | typedef unsigned char bool; + | ^~~~ + include/types.h:23:23: note: ‘bool’ is a keyword with ‘-std=c23’ onwards + +Fix this build failure by only defining ‘bool’, ‘false’ and ‘true’ on C +dialects older than C23. + +Upstream: https://github.com/linux4sam/at91bootstrap/pull/188 + +Signed-off-by: Edgar Bonet +--- + include/types.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/types.h b/include/types.h +index 950b1a46..0ad9ae61 100644 +--- a/include/types.h ++++ b/include/types.h +@@ -20,8 +20,11 @@ typedef signed long long s64; + typedef unsigned long size_t; + typedef signed long ssize_t; + ++/* bool, false and true are predefined since C23. */ ++#if __STDC_VERSION__ < 202311L + typedef unsigned char bool; + #define false 0U + #define true 1U ++#endif + + #endif /* TYPES_H_ */ +-- +2.43.0 + diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 0bd3386795..c3cb0b3332 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_BAREBOX +menuconfig BR2_TARGET_BAREBOX bool "Barebox" help The Barebox bootloader, formerly known as U-Boot v2. diff --git a/boot/boot-wrapper-aarch64/Config.in b/boot/boot-wrapper-aarch64/Config.in index cf7389282f..7271336166 100644 --- a/boot/boot-wrapper-aarch64/Config.in +++ b/boot/boot-wrapper-aarch64/Config.in @@ -2,7 +2,7 @@ comment "boot-wrapper-aarch64 needs a Linux kernel to be built" depends on BR2_aarch64 depends on !BR2_LINUX_KERNEL -config BR2_TARGET_BOOT_WRAPPER_AARCH64 +menuconfig BR2_TARGET_BOOT_WRAPPER_AARCH64 bool "boot-wrapper-aarch64" depends on BR2_aarch64 depends on BR2_LINUX_KERNEL @@ -11,7 +11,7 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64 possible to start an Aarch64 kernel inside the available software simulators for the Aarch64 architecture. - git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git + https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git if BR2_TARGET_BOOT_WRAPPER_AARCH64 diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.hash b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.hash new file mode 100644 index 0000000000..d818161002 --- /dev/null +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 c9fcac5e28e1501bcffb3b36d56487cbefcf7cb708e00f48fe6360ef82fb3847 boot-wrapper-aarch64-b621b157b42f1fe398520cf499db88aa654c78e2-git4.tar.gz + +# Hash for license files: +sha256 bdaa479b497358151fc1166dc75a613e68321320b945e92ea07a4b6dc9a63271 LICENSE.txt diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 95f7e22760..75be23f243 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa +BOOT_WRAPPER_AARCH64_VERSION = b621b157b42f1fe398520cf499db88aa654c78e2 BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in index 4e6e7d122c..850b9a39de 100644 --- a/boot/edk2/Config.in +++ b/boot/edk2/Config.in @@ -2,6 +2,7 @@ config BR2_TARGET_EDK2_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_i386 + default y if BR2_loongarch64 default y if BR2_RISCV_64 default y if BR2_x86_64 @@ -21,6 +22,8 @@ if BR2_TARGET_EDK2 choice prompt "Platform" default BR2_TARGET_EDK2_PLATFORM_OVMF_I386 if BR2_i386 + default BR2_TARGET_EDK2_PLATFORM_OVMF_LOONGARCH64 if \ + BR2_loongarch64 default BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV if BR2_RISCV_64 default BR2_TARGET_EDK2_PLATFORM_OVMF_X64 if BR2_x86_64 default BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU if BR2_aarch64 @@ -31,7 +34,15 @@ config BR2_TARGET_EDK2_PLATFORM_OVMF_I386 help Platform configuration for a generic i386 target. This platform will boot from flash address 0x0. - It should therefore be used as the first bootloader. + +config BR2_TARGET_EDK2_PLATFORM_OVMF_LOONGARCH64 + bool "LoongArch64" + depends on BR2_loongarch64 + help + Platform configuration for LoongArch QEMU targeting the + Virt machine. This platform will only boot from flash + address 0x1c000000. It should therefore be used as the first + bootloader. config BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV bool "RISC-V" @@ -80,20 +91,6 @@ config BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64 Platform configuration for ARM Versatile Express targeting the Aarch64 Fixed Virtual Platform (FVP). -config BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX - bool "Socionext DeveloperBox" - depends on BR2_aarch64 - depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE - depends on !BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 - select BR2_PACKAGE_HOST_DTC - select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP - help - Platform configuration for Socionext SynQuacer DeveloperBox - (SC2A11). - -comment "Socionext DeveloperBox depends on ATF not using EDK2 as BL33" - depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 - config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN bool "SolidRun MacchiatoBin" depends on BR2_aarch64 @@ -139,9 +136,9 @@ config BR2_TARGET_EDK2_FD_NAME default "OVMF" if BR2_TARGET_EDK2_PLATFORM_OVMF_X64 default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL + default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_OVMF_LOONGARCH64 default "BL33_AP_UEFI" if BR2_TARGET_EDK2_PLATFORM_ARM_SGI575 default "FVP_AARCH64_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64 - default "FVP_AARCH64_EFI" if BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX default "ARMADA_EFI" if BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN endif diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index abcf3c6b8e..a7170a67cc 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4595b9d9d14c06bd03f575e4b7623574a4a874ef465652ecdc224099a5b14fc7 edk2-edk2-stable202405-git4.tar.gz +sha256 1e675a98f6bcf81fbae1141779b9e72ec28773d0e5ec77bdcc890f14502615a4 edk2-edk2-stable202508-git4.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 145a9a80ae..05e44c711b 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202405 +EDK2_VERSION = edk2-stable202508 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent @@ -44,10 +44,10 @@ endif # Third, where applicable, the dependency direction between EDK2 and # ARM Trusted Firmware (ATF) will go in different direction for different # platforms. Most commonly, ATF will depend on EDK2 via the BL33 payload. -# But for some platforms (e.g. QEMU SBSA or DeveloperBox) EDK2 will package -# the ATF images within its own build system. In such cases, intermediary -# "EDK2 packages" will be built in $(EDK2_BUILD_PACKAGES) in order for EDK2 -# to be able to use them in subsequent build stages. +# But for some platforms (e.g. QEMU SBSA) EDK2 will package the ATF +# images within its own build system. In such cases, intermediary +# "EDK2 packages" will be built in $(EDK2_BUILD_PACKAGES) in order for +# EDK2 to be able to use them in subsequent build stages. # # For more information about the build setup: # https://edk2-docs.gitbook.io/edk-ii-build-specification/4_edk_ii_build_process_overview @@ -94,28 +94,9 @@ EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg EDK2_PLATFORM_NAME = ArmVExpress-FVP-AArch64 EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) -else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX),y) -EDK2_ARCH = AARCH64 -EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware -EDK2_PACKAGE_NAME = Platform/Socionext/DeveloperBox -EDK2_PLATFORM_NAME = DeveloperBox -EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) -EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ -EDK2_BUILD_OPTS += -D DO_X86EMU=TRUE -EDK2_PRE_BUILD_HOOKS += EDK2_PRE_BUILD_SOCIONEXT_DEVELOPERBOX - -define EDK2_PRE_BUILD_SOCIONEXT_DEVELOPERBOX - mkdir -p $(EDK2_BUILD_PACKAGES)/Platform/Socionext/DeveloperBox - $(ARM_TRUSTED_FIRMWARE_DIR)/tools/fiptool/fiptool create \ - --tb-fw $(BINARIES_DIR)/bl31.bin \ - --soc-fw $(BINARIES_DIR)/bl31.bin \ - --scp-fw $(BINARIES_DIR)/bl31.bin \ - $(EDK2_BUILD_PACKAGES)/Platform/Socionext/DeveloperBox/fip_all_arm_tf.bin -endef - else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y) EDK2_ARCH = AARCH64 -EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi +EDK2_DEPENDENCIES += host-dtc edk2-non-osi EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin EDK2_PLATFORM_NAME = Armada80x0McBin EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) @@ -142,6 +123,12 @@ EDK2_PACKAGE_NAME = OvmfPkg/RiscVVirt EDK2_PLATFORM_NAME = RiscVVirtQemu EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_LOONGARCH64),y) +EDK2_ARCH = LOONGARCH64 +EDK2_PACKAGE_NAME = OvmfPkg/LoongArchVirt +EDK2_PLATFORM_NAME = LoongArchVirtQemu +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + endif EDK2_BASETOOLS_OPTS = \ diff --git a/boot/grub2/0002-misc-Implement-grub_strlcpy.patch b/boot/grub2/0002-misc-Implement-grub_strlcpy.patch new file mode 100644 index 0000000000..f512df4440 --- /dev/null +++ b/boot/grub2/0002-misc-Implement-grub_strlcpy.patch @@ -0,0 +1,70 @@ +From 67241595d3dae392589ee74b65cd40ea090d1837 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sat, 15 Jun 2024 02:33:08 +0100 +Subject: [PATCH] misc: Implement grub_strlcpy() + +grub_strlcpy() acts the same way as strlcpy() does on most *NIX, +returning the length of src and ensuring dest is always NUL +terminated except when size is 0. + +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: ea703528a8581a2ea7e0bad424a70fdf0aec7d8f +Signed-off-by: Thomas Petazzoni +--- + include/grub/misc.h | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +diff --git a/include/grub/misc.h b/include/grub/misc.h +index 1b35a167f..103175480 100644 +--- a/include/grub/misc.h ++++ b/include/grub/misc.h +@@ -64,6 +64,45 @@ grub_stpcpy (char *dest, const char *src) + return d - 1; + } + ++static inline grub_size_t ++grub_strlcpy (char *dest, const char *src, grub_size_t size) ++{ ++ char *d = dest; ++ grub_size_t res = 0; ++ /* ++ * We do not subtract one from size here to avoid dealing with underflowing ++ * the value, which is why to_copy is always checked to be greater than one ++ * throughout this function. ++ */ ++ grub_size_t to_copy = size; ++ ++ /* Copy size - 1 bytes to dest. */ ++ if (to_copy > 1) ++ while ((*d++ = *src++) != '\0' && ++res && --to_copy > 1) ++ ; ++ ++ /* ++ * NUL terminate if size != 0. The previous step may have copied a NUL byte ++ * if it reached the end of the string, but we know dest[size - 1] must always ++ * be a NUL byte. ++ */ ++ if (size != 0) ++ dest[size - 1] = '\0'; ++ ++ /* If there is still space in dest, but are here, we reached the end of src. */ ++ if (to_copy > 1) ++ return res; ++ ++ /* ++ * If we haven't reached the end of the string, iterate through to determine ++ * the strings total length. ++ */ ++ while (*src++ != '\0' && ++res) ++ ; ++ ++ return res; ++} ++ + /* XXX: If grub_memmove is too slow, we must implement grub_memcpy. */ + static inline void * + grub_memcpy (void *dest, const void *src, grub_size_t n) +-- +2.50.1 + diff --git a/boot/grub2/0003-fs-ufs-Fix-a-heap-OOB-write.patch b/boot/grub2/0003-fs-ufs-Fix-a-heap-OOB-write.patch new file mode 100644 index 0000000000..0d822cba24 --- /dev/null +++ b/boot/grub2/0003-fs-ufs-Fix-a-heap-OOB-write.patch @@ -0,0 +1,36 @@ +From ab0f52dadcda56782b3e82be0b15fa6eb0e9cee1 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 02:03:33 +0100 +Subject: [PATCH] fs/ufs: Fix a heap OOB write + +grub_strcpy() was used to copy a symlink name from the filesystem +image to a heap allocated buffer. This led to a OOB write to adjacent +heap allocations. Fix by using grub_strlcpy(). + +Fixes: CVE-2024-45781 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: c1a291b01f4f1dcd6a22b61f1c81a45a966d16ba +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/ufs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c +index a354c92d9..01235101b 100644 +--- a/grub-core/fs/ufs.c ++++ b/grub-core/fs/ufs.c +@@ -463,7 +463,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino) + /* Check against zero is paylindromic, no need to swap. */ + if (data->inode.nblocks == 0 + && INODE_SIZE (data) <= sizeof (data->inode.symlink)) +- grub_strcpy (symlink, (char *) data->inode.symlink); ++ grub_strlcpy (symlink, (char *) data->inode.symlink, sz); + else + { + if (grub_ufs_read_file (data, 0, 0, 0, sz, symlink) < 0) +-- +2.50.1 + diff --git a/boot/grub2/0004-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch b/boot/grub2/0004-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch new file mode 100644 index 0000000000..40df727a60 --- /dev/null +++ b/boot/grub2/0004-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch @@ -0,0 +1,36 @@ +From 157e6e2a3da139dc2e08cf41b49115965cdaa1d3 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 02:48:33 +0100 +Subject: [PATCH] fs/hfs: Fix stack OOB write with grub_strcpy() + +Replaced with grub_strlcpy(). + +Fixes: CVE-2024-45782 +Fixes: CVE-2024-56737 +Fixes: https://savannah.gnu.org/bugs/?66599 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 417547c10410b714e43f08f74137c24015f8f4c3 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/hfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c +index 91dc0e69c..920112b03 100644 +--- a/grub-core/fs/hfs.c ++++ b/grub-core/fs/hfs.c +@@ -379,7 +379,7 @@ grub_hfs_mount (grub_disk_t disk) + volume name. */ + key.parent_dir = grub_cpu_to_be32_compile_time (1); + key.strlen = data->sblock.volname[0]; +- grub_strcpy ((char *) key.str, (char *) (data->sblock.volname + 1)); ++ grub_strlcpy ((char *) key.str, (char *) (data->sblock.volname + 1), sizeof (key.str)); + + if (grub_hfs_find_node (data, (char *) &key, data->cat_root, + 0, (char *) &dir, sizeof (dir)) == 0) +-- +2.50.1 + diff --git a/boot/grub2/0005-fs-tar-Initialize-name-in-grub_cpio_find_file.patch b/boot/grub2/0005-fs-tar-Initialize-name-in-grub_cpio_find_file.patch new file mode 100644 index 0000000000..444c02c44f --- /dev/null +++ b/boot/grub2/0005-fs-tar-Initialize-name-in-grub_cpio_find_file.patch @@ -0,0 +1,45 @@ +From 2233c409ada20d1ab4a6a00a50cdde35e5a36589 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 02:47:54 +0100 +Subject: [PATCH] fs/tar: Initialize name in grub_cpio_find_file() + +It was possible to iterate through grub_cpio_find_file() without +allocating name and not setting mode to GRUB_ARCHELP_ATTR_END, which +would cause the uninitialized value for name to be used as an argument +for canonicalize() in grub_archelp_dir(). + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 2c8ac08c99466c0697f704242363fc687f492a0d +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/tar.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c +index c551ed6b5..646bce5eb 100644 +--- a/grub-core/fs/tar.c ++++ b/grub-core/fs/tar.c +@@ -78,6 +78,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + int reread = 0, have_longname = 0, have_longlink = 0; + + data->hofs = data->next_hofs; ++ *name = NULL; + + for (reread = 0; reread < 3; reread++) + { +@@ -202,6 +203,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + } + return GRUB_ERR_NONE; + } ++ ++ if (*name == NULL) ++ return grub_error (GRUB_ERR_BAD_FS, "invalid tar archive"); ++ + return GRUB_ERR_NONE; + } + +-- +2.50.1 + diff --git a/boot/grub2/0006-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch b/boot/grub2/0006-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch new file mode 100644 index 0000000000..c3c845a50a --- /dev/null +++ b/boot/grub2/0006-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch @@ -0,0 +1,94 @@ +From 472e180b6aac8cb4f25affa687e68f9be4e3df79 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Fri, 22 Nov 2024 06:27:58 +0000 +Subject: [PATCH] fs/tar: Integer overflow leads to heap OOB write + +Both namesize and linksize are derived from hd.size, a 12-digit octal +number parsed by read_number(). Later direct arithmetic calculation like +"namesize + 1" and "linksize + 1" may exceed the maximum value of +grub_size_t leading to heap OOB write. This patch fixes the issue by +using grub_add() and checking for an overflow. + +Fixes: CVE-2024-45780 + +Reported-by: Nils Langius +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Alec Brown +Upstream: 0087bc6902182fe5cedce2d034c75a79cf6dd4f3 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/tar.c | 23 ++++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) + +diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c +index 646bce5eb..386c09022 100644 +--- a/grub-core/fs/tar.c ++++ b/grub-core/fs/tar.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -76,6 +77,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + { + struct head hd; + int reread = 0, have_longname = 0, have_longlink = 0; ++ grub_size_t sz; + + data->hofs = data->next_hofs; + *name = NULL; +@@ -98,7 +100,11 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + { + grub_err_t err; + grub_size_t namesize = read_number (hd.size, sizeof (hd.size)); +- *name = grub_malloc (namesize + 1); ++ ++ if (grub_add (namesize, 1, &sz)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("name size overflow")); ++ ++ *name = grub_malloc (sz); + if (*name == NULL) + return grub_errno; + err = grub_disk_read (data->disk, 0, +@@ -118,15 +124,19 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + { + grub_err_t err; + grub_size_t linksize = read_number (hd.size, sizeof (hd.size)); +- if (data->linkname_alloc < linksize + 1) ++ ++ if (grub_add (linksize, 1, &sz)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("link size overflow")); ++ ++ if (data->linkname_alloc < sz) + { + char *n; +- n = grub_calloc (2, linksize + 1); ++ n = grub_calloc (2, sz); + if (!n) + return grub_errno; + grub_free (data->linkname); + data->linkname = n; +- data->linkname_alloc = 2 * (linksize + 1); ++ data->linkname_alloc = 2 * (sz); + } + + err = grub_disk_read (data->disk, 0, +@@ -149,7 +159,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + while (extra_size < sizeof (hd.prefix) + && hd.prefix[extra_size]) + extra_size++; +- *name = grub_malloc (sizeof (hd.name) + extra_size + 2); ++ ++ if (grub_add (sizeof (hd.name) + 2, extra_size, &sz)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("long name size overflow")); ++ *name = grub_malloc (sz); + if (*name == NULL) + return grub_errno; + if (hd.prefix[0]) +-- +2.50.1 + diff --git a/boot/grub2/0007-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch b/boot/grub2/0007-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch new file mode 100644 index 0000000000..320240b266 --- /dev/null +++ b/boot/grub2/0007-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch @@ -0,0 +1,36 @@ +From 95f391673c0a08c2410454536614ef543cac6629 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 06:15:03 +0100 +Subject: [PATCH] fs/f2fs: Set a grub_errno if mount fails + +It was previously possible for grub_errno to not be set when +grub_f2fs_mount() failed if nat_bitmap_ptr() returned NULL. + +This issue is solved by ensuring a grub_errno is set in the fail case. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 563436258cde64da6b974880abff1bf0959f4da3 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/f2fs.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c +index 855e24618..db8a65f8d 100644 +--- a/grub-core/fs/f2fs.c ++++ b/grub-core/fs/f2fs.c +@@ -872,6 +872,9 @@ grub_f2fs_mount (grub_disk_t disk) + return data; + + fail: ++ if (grub_errno == GRUB_ERR_NONE) ++ grub_error (GRUB_ERR_BAD_FS, "not a F2FS filesystem"); ++ + grub_free (data); + + return NULL; +-- +2.50.1 + diff --git a/boot/grub2/0008-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch b/boot/grub2/0008-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch new file mode 100644 index 0000000000..3493ab8af3 --- /dev/null +++ b/boot/grub2/0008-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch @@ -0,0 +1,40 @@ +From 947e9e98d35edd7b359498b5f31338dc228f5081 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 06:22:51 +0100 +Subject: [PATCH] fs/hfsplus: Set a grub_errno if mount fails + +It was possible for mount to fail but not set grub_errno. This led to +a possible double decrement of the module reference count if the NULL +page was mapped. + +Fixing in general as a similar bug was fixed in commit 61b13c187 +(fs/hfsplus: Set grub_errno to prevent NULL pointer access) and there +are likely more variants around. + +Fixes: CVE-2024-45783 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: f7c070a2e28dfab7137db0739fb8db1dc02d8898 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/hfsplus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c +index 295822f69..de71fd486 100644 +--- a/grub-core/fs/hfsplus.c ++++ b/grub-core/fs/hfsplus.c +@@ -405,7 +405,7 @@ grub_hfsplus_mount (grub_disk_t disk) + + fail: + +- if (grub_errno == GRUB_ERR_OUT_OF_RANGE) ++ if (grub_errno == GRUB_ERR_OUT_OF_RANGE || grub_errno == GRUB_ERR_NONE) + grub_error (GRUB_ERR_BAD_FS, "not a HFS+ filesystem"); + + grub_free (data); +-- +2.50.1 + diff --git a/boot/grub2/0009-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch b/boot/grub2/0009-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch new file mode 100644 index 0000000000..d9c38b62ba --- /dev/null +++ b/boot/grub2/0009-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch @@ -0,0 +1,38 @@ +From a0e37c98e6f330110e4009f8e5ba73ca0c2eaff5 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 06:37:08 +0100 +Subject: [PATCH] fs/iso9660: Set a grub_errno if mount fails + +It was possible for a grub_errno to not be set if mount of an ISO 9660 +filesystem failed when set_rockridge() returned 0. + +This isn't known to be exploitable as the other filesystems due to +filesystem helper checking the requested file type. Though fixing +as a precaution. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 965db5970811d18069b34f28f5f31ddadde90a97 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/iso9660.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c +index 8c348b59a..8d480e602 100644 +--- a/grub-core/fs/iso9660.c ++++ b/grub-core/fs/iso9660.c +@@ -551,6 +551,9 @@ grub_iso9660_mount (grub_disk_t disk) + return data; + + fail: ++ if (grub_errno == GRUB_ERR_NONE) ++ grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem"); ++ + grub_free (data); + return 0; + } +-- +2.50.1 + diff --git a/boot/grub2/0010-fs-iso9660-Fix-invalid-free.patch b/boot/grub2/0010-fs-iso9660-Fix-invalid-free.patch new file mode 100644 index 0000000000..6bd1665234 --- /dev/null +++ b/boot/grub2/0010-fs-iso9660-Fix-invalid-free.patch @@ -0,0 +1,55 @@ +From 3acd964eafdd32e8ab7d7c04b18171052a859d3a Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 31 May 2024 15:14:42 +0800 +Subject: [PATCH] fs/iso9660: Fix invalid free + +The ctx->filename can point to either a string literal or a dynamically +allocated string. The ctx->filename_alloc field is used to indicate the +type of allocation. + +An issue has been identified where ctx->filename is reassigned to +a string literal in susp_iterate_dir() but ctx->filename_alloc is not +correctly handled. This oversight causes a memory leak and an invalid +free operation later. + +The fix involves checking ctx->filename_alloc, freeing the allocated +string if necessary and clearing ctx->filename_alloc for string literals. + +Reported-by: Daniel Axtens +Signed-off-by: Michael Chang +Reviewed-by: Daniel Kiper +Upstream: 1443833a9535a5873f7de3798cf4d8389f366611 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/iso9660.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c +index 8d480e602..8e3c95c4f 100644 +--- a/grub-core/fs/iso9660.c ++++ b/grub-core/fs/iso9660.c +@@ -628,9 +628,19 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + filename type is stored. */ + /* FIXME: Fix this slightly improper cast. */ + if (entry->data[0] & GRUB_ISO9660_RR_DOT) +- ctx->filename = (char *) "."; ++ { ++ if (ctx->filename_alloc) ++ grub_free (ctx->filename); ++ ctx->filename_alloc = 0; ++ ctx->filename = (char *) "."; ++ } + else if (entry->data[0] & GRUB_ISO9660_RR_DOTDOT) +- ctx->filename = (char *) ".."; ++ { ++ if (ctx->filename_alloc) ++ grub_free (ctx->filename); ++ ctx->filename_alloc = 0; ++ ctx->filename = (char *) ".."; ++ } + else if (entry->len >= 5) + { + grub_size_t off = 0, csize = 1; +-- +2.50.1 + diff --git a/boot/grub2/0011-fs-jfs-Fix-OOB-read-in-jfs_getent.patch b/boot/grub2/0011-fs-jfs-Fix-OOB-read-in-jfs_getent.patch new file mode 100644 index 0000000000..96e34b0e9f --- /dev/null +++ b/boot/grub2/0011-fs-jfs-Fix-OOB-read-in-jfs_getent.patch @@ -0,0 +1,68 @@ +From b01accc4d132a252f02bf57c31f5fff8ce98a339 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Fri, 22 Nov 2024 06:27:59 +0000 +Subject: [PATCH] fs/jfs: Fix OOB read in jfs_getent() + +The JFS fuzzing revealed an OOB read in grub_jfs_getent(). The crash +was caused by an invalid leaf nodes count, diro->dirpage->header.count, +which was larger than the maximum number of leaf nodes allowed in an +inode. This fix is to ensure that the leaf nodes count is validated in +grub_jfs_opendir() before calling grub_jfs_getent(). + +On the occasion replace existing raw numbers with newly defined constant. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Alec Brown +Upstream: 66175696f3a385b14bdf1ebcda7755834bd2d5fb +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/jfs.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index 6f7c43904..32dec7fb7 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -41,6 +41,12 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + #define GRUB_JFS_TREE_LEAF 2 + ++/* ++ * Define max entries stored in-line in an inode. ++ * https://jfs.sourceforge.net/project/pub/jfslayout.pdf ++ */ ++#define GRUB_JFS_INODE_INLINE_ENTRIES 8 ++ + struct grub_jfs_sblock + { + /* The magic for JFS. It should contain the string "JFS1". */ +@@ -203,9 +209,9 @@ struct grub_jfs_inode + grub_uint8_t freecnt; + grub_uint8_t freelist; + grub_uint32_t idotdot; +- grub_uint8_t sorted[8]; ++ grub_uint8_t sorted[GRUB_JFS_INODE_INLINE_ENTRIES]; + } header; +- struct grub_jfs_leaf_dirent dirents[8]; ++ struct grub_jfs_leaf_dirent dirents[GRUB_JFS_INODE_INLINE_ENTRIES]; + } GRUB_PACKED dir; + /* Fast symlink. */ + struct +@@ -453,6 +459,13 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode) + /* Check if the entire tree is contained within the inode. */ + if (inode->file.tree.flags & GRUB_JFS_TREE_LEAF) + { ++ if (inode->dir.header.count > GRUB_JFS_INODE_INLINE_ENTRIES) ++ { ++ grub_free (diro); ++ grub_error (GRUB_ERR_BAD_FS, N_("invalid JFS inode")); ++ return 0; ++ } ++ + diro->leaf = inode->dir.dirents; + diro->next_leaf = (struct grub_jfs_leaf_next_dirent *) de; + diro->sorted = inode->dir.header.sorted; +-- +2.50.1 + diff --git a/boot/grub2/0012-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch b/boot/grub2/0012-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch new file mode 100644 index 0000000000..6257a4b887 --- /dev/null +++ b/boot/grub2/0012-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch @@ -0,0 +1,69 @@ +From b35b73b9d779e88fb4e6f53fb10a5bfebf3475aa Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Fri, 22 Nov 2024 06:28:00 +0000 +Subject: [PATCH] fs/jfs: Fix OOB read caused by invalid dir slot index + +While fuzz testing JFS with ASAN enabled an OOB read was detected in +grub_jfs_opendir(). The issue occurred due to an invalid directory slot +index in the first entry of the sorted directory slot array in the inode +directory header. The fix ensures the slot index is validated before +accessing it. Given that an internal or a leaf node in a directory B+ +tree is a 4 KiB in size and each directory slot is always 32 bytes, the +max number of slots in a node is 128. The validation ensures that the +slot index doesn't exceed this limit. + +[1] https://jfs.sourceforge.net/project/pub/jfslayout.pdf + + JFS will allocate 4K of disk space for an internal node of the B+ tree. + An internal node looks the same as a leaf node. + - page 10 + + Fixed number of Directory Slots depending on the size of the node. These are + the slots to be used for storing the directory slot array and the directory + entries or router entries. A directory slot is always 32 bytes. + ... + A Directory Slot Array which is a sorted array of indices to the directory + slots that are currently in use. + ... + An internal or a leaf node in the directory B+ tree is a 4K page. + - page 25 + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Alec Brown +Upstream: ab09fd0531f3523ac0ef833404526c98c08248f7 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/jfs.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index 32dec7fb7..88fb884df 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -46,6 +46,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + * https://jfs.sourceforge.net/project/pub/jfslayout.pdf + */ + #define GRUB_JFS_INODE_INLINE_ENTRIES 8 ++#define GRUB_JFS_DIR_MAX_SLOTS 128 + + struct grub_jfs_sblock + { +@@ -481,6 +482,14 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode) + return 0; + } + ++ if (inode->dir.header.sorted[0] >= GRUB_JFS_DIR_MAX_SLOTS) ++ { ++ grub_error (GRUB_ERR_BAD_FS, N_("invalid directory slot index")); ++ grub_free (diro->dirpage); ++ grub_free (diro); ++ return 0; ++ } ++ + blk = grub_le_to_cpu32 (de[inode->dir.header.sorted[0]].ex.blk2); + blk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS); + +-- +2.50.1 + diff --git a/boot/grub2/0013-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch b/boot/grub2/0013-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch new file mode 100644 index 0000000000..cd5d69cf74 --- /dev/null +++ b/boot/grub2/0013-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch @@ -0,0 +1,133 @@ +From 978c4c79935a375cb16d94e8114d96fee013c288 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Mon, 16 Dec 2024 20:22:39 +0000 +Subject: [PATCH] fs/jfs: Use full 40 bits offset and address for a data extent + +An extent's logical offset and address are represented as a 40-bit value +split into two parts: the most significant 8 bits and the least +significant 32 bits. Currently the JFS code uses only the least +significant 32 bits value for offsets and addresses assuming the data +size will never exceed the 32-bit range. This approach ignores the most +significant 8 bits potentially leading to incorrect offsets and +addresses for larger values. The patch fixes it by incorporating the +most significant 8 bits into the calculation to get the full 40-bits +value for offsets and addresses. + +https://jfs.sourceforge.net/project/pub/jfslayout.pdf + + "off1,off2 is a 40-bit field, containing the logical offset of the first + block in the extent. + ... + addr1,addr2 is a 40-bit field, containing the address of the extent." + +Signed-off-by: Lidong Chen +Reviewed-by: Alec Brown +Reviewed-by: Ross Philipson +Reviewed-by: Daniel Kiper +Upstream: bd999310fe67f35a66de3bfa2836da91589d04ef +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/jfs.c | 41 +++++++++++++++++++++++++++++------------ + 1 file changed, 29 insertions(+), 12 deletions(-) + +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index 88fb884df..2bde48d45 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -265,6 +265,20 @@ static grub_dl_t my_mod; + + static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, grub_uint32_t ino); + ++/* ++ * An extent's offset, physical and logical, is represented as a 40-bit value. ++ * This 40-bit value is split into two parts: ++ * - offset1: the most signficant 8 bits of the offset, ++ * - offset2: the least significant 32 bits of the offset. ++ * ++ * This function calculates and returns the 64-bit offset of an extent. ++ */ ++static grub_uint64_t ++get_ext_offset (grub_uint8_t offset1, grub_uint32_t offset2) ++{ ++ return (((grub_uint64_t) offset1 << 32) | grub_le_to_cpu32 (offset2)); ++} ++ + static grub_int64_t + getblk (struct grub_jfs_treehead *treehead, + struct grub_jfs_tree_extent *extents, +@@ -274,22 +288,25 @@ getblk (struct grub_jfs_treehead *treehead, + { + int found = -1; + int i; ++ grub_uint64_t ext_offset, ext_blk; + + for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 && + i < max_extents; i++) + { ++ ext_offset = get_ext_offset (extents[i].offset1, extents[i].offset2); ++ ext_blk = get_ext_offset (extents[i].extent.blk1, extents[i].extent.blk2); ++ + if (treehead->flags & GRUB_JFS_TREE_LEAF) + { + /* Read the leafnode. */ +- if (grub_le_to_cpu32 (extents[i].offset2) <= blk ++ if (ext_offset <= blk + && ((grub_le_to_cpu16 (extents[i].extent.length)) + + (extents[i].extent.length2 << 16) +- + grub_le_to_cpu32 (extents[i].offset2)) > blk) +- return (blk - grub_le_to_cpu32 (extents[i].offset2) +- + grub_le_to_cpu32 (extents[i].extent.blk2)); ++ + ext_offset) > blk) ++ return (blk - ext_offset + ext_blk); + } + else +- if (blk >= grub_le_to_cpu32 (extents[i].offset2)) ++ if (blk >= ext_offset) + found = i; + } + +@@ -307,10 +324,9 @@ getblk (struct grub_jfs_treehead *treehead, + return -1; + + if (!grub_disk_read (data->disk, +- ((grub_disk_addr_t) grub_le_to_cpu32 (extents[found].extent.blk2)) +- << (grub_le_to_cpu16 (data->sblock.log2_blksz) +- - GRUB_DISK_SECTOR_BITS), 0, +- sizeof (*tree), (char *) tree)) ++ (grub_disk_addr_t) ext_blk ++ << (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS), ++ 0, sizeof (*tree), (char *) tree)) + { + if (grub_memcmp (&tree->treehead, treehead, sizeof (struct grub_jfs_treehead)) || + grub_memcmp (&tree->extents, extents, 254 * sizeof (struct grub_jfs_tree_extent))) +@@ -361,7 +377,7 @@ grub_jfs_read_inode (struct grub_jfs_data *data, grub_uint32_t ino, + sizeof (iag_inodes), &iag_inodes)) + return grub_errno; + +- inoblk = grub_le_to_cpu32 (iag_inodes[inoext].blk2); ++ inoblk = get_ext_offset (iag_inodes[inoext].blk1, iag_inodes[inoext].blk2); + inoblk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz) + - GRUB_DISK_SECTOR_BITS); + inoblk += inonum; +@@ -490,7 +506,8 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode) + return 0; + } + +- blk = grub_le_to_cpu32 (de[inode->dir.header.sorted[0]].ex.blk2); ++ blk = get_ext_offset (de[inode->dir.header.sorted[0]].ex.blk1, ++ de[inode->dir.header.sorted[0]].ex.blk2); + blk <<= (grub_le_to_cpu16 (data->sblock.log2_blksz) - GRUB_DISK_SECTOR_BITS); + + /* Read in the nodes until we are on the leaf node level. */ +@@ -508,7 +525,7 @@ grub_jfs_opendir (struct grub_jfs_data *data, struct grub_jfs_inode *inode) + + de = (struct grub_jfs_internal_dirent *) diro->dirpage->dirent; + index = diro->dirpage->sorted[diro->dirpage->header.sindex * 32]; +- blk = (grub_le_to_cpu32 (de[index].ex.blk2) ++ blk = (get_ext_offset (de[index].ex.blk1, de[index].ex.blk2) + << (grub_le_to_cpu16 (data->sblock.log2_blksz) + - GRUB_DISK_SECTOR_BITS)); + } while (!(diro->dirpage->header.flags & GRUB_JFS_TREE_LEAF)); +-- +2.50.1 + diff --git a/boot/grub2/0014-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch b/boot/grub2/0014-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch new file mode 100644 index 0000000000..f08e797b37 --- /dev/null +++ b/boot/grub2/0014-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch @@ -0,0 +1,90 @@ +From 32f319d100c3b8f9b04e6a175f599c7411a54555 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Mon, 16 Dec 2024 20:22:40 +0000 +Subject: [PATCH] fs/jfs: Inconsistent signed/unsigned types usage in return + values + +The getblk() returns a value of type grub_int64_t which is assigned to +iagblk and inoblk, both of type grub_uint64_t, in grub_jfs_read_inode() +via grub_jfs_blkno(). This patch fixes the type mismatch in the +functions. Additionally, the getblk() will return 0 instead of -1 on +failure cases. This change is safe because grub_errno is always set in +getblk() to indicate errors and it is later checked in the callers. + +Signed-off-by: Lidong Chen +Reviewed-by: Alec Brown +Reviewed-by: Ross Philipson +Reviewed-by: Daniel Kiper +Upstream: edd995a26ec98654d907a9436a296c2d82bc4b28 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/jfs.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index 2bde48d45..70a2f4947 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -279,7 +279,7 @@ get_ext_offset (grub_uint8_t offset1, grub_uint32_t offset2) + return (((grub_uint64_t) offset1 << 32) | grub_le_to_cpu32 (offset2)); + } + +-static grub_int64_t ++static grub_uint64_t + getblk (struct grub_jfs_treehead *treehead, + struct grub_jfs_tree_extent *extents, + int max_extents, +@@ -290,6 +290,8 @@ getblk (struct grub_jfs_treehead *treehead, + int i; + grub_uint64_t ext_offset, ext_blk; + ++ grub_errno = GRUB_ERR_NONE; ++ + for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 && + i < max_extents; i++) + { +@@ -312,7 +314,7 @@ getblk (struct grub_jfs_treehead *treehead, + + if (found != -1) + { +- grub_int64_t ret = -1; ++ grub_uint64_t ret = 0; + struct + { + struct grub_jfs_treehead treehead; +@@ -321,7 +323,7 @@ getblk (struct grub_jfs_treehead *treehead, + + tree = grub_zalloc (sizeof (*tree)); + if (!tree) +- return -1; ++ return 0; + + if (!grub_disk_read (data->disk, + (grub_disk_addr_t) ext_blk +@@ -334,19 +336,20 @@ getblk (struct grub_jfs_treehead *treehead, + else + { + grub_error (GRUB_ERR_BAD_FS, "jfs: infinite recursion detected"); +- ret = -1; ++ ret = 0; + } + } + grub_free (tree); + return ret; + } + +- return -1; ++ grub_error (GRUB_ERR_READ_ERROR, "jfs: block %" PRIuGRUB_UINT64_T " not found", blk); ++ return 0; + } + + /* Get the block number for the block BLK in the node INODE in the + mounted filesystem DATA. */ +-static grub_int64_t ++static grub_uint64_t + grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode, + grub_uint64_t blk) + { +-- +2.50.1 + diff --git a/boot/grub2/0015-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch b/boot/grub2/0015-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch new file mode 100644 index 0000000000..c04fb8eae0 --- /dev/null +++ b/boot/grub2/0015-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch @@ -0,0 +1,51 @@ +From 7da8e2e23db5f1ddb9c4dc992c69349149163c4c Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 31 May 2024 15:14:23 +0800 +Subject: [PATCH] fs/ext2: Fix out-of-bounds read for inline extents + +When inline extents are used, i.e. the extent tree depth equals zero, +a maximum of four entries can fit into the inode's data block. If the +extent header states a number of entries greater than four the current +ext2 implementation causes an out-of-bounds read. Fix this issue by +capping the number of extents to four when reading inline extents. + +Reported-by: Daniel Axtens +Signed-off-by: Michael Chang +Reviewed-by: Daniel Kiper +Upstream: 7e2f750f0a795c4d64ec7dc7591edac8da2e978c +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/ext2.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c +index e1cc5e62a..3f9f6b208 100644 +--- a/grub-core/fs/ext2.c ++++ b/grub-core/fs/ext2.c +@@ -495,6 +495,8 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) + struct grub_ext4_extent *ext; + int i; + grub_disk_addr_t ret; ++ grub_uint16_t nent; ++ const grub_uint16_t max_inline_ext = sizeof (inode->blocks) / sizeof (*ext) - 1; /* Minus 1 extent header. */ + + if (grub_ext4_find_leaf (data, (struct grub_ext4_extent_header *) inode->blocks.dir_blocks, + fileblock, &leaf) != GRUB_ERR_NONE) +@@ -508,7 +510,13 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) + return 0; + + ext = (struct grub_ext4_extent *) (leaf + 1); +- for (i = 0; i < grub_le_to_cpu16 (leaf->entries); i++) ++ ++ nent = grub_le_to_cpu16 (leaf->entries); ++ ++ if (leaf->depth == 0) ++ nent = grub_min (nent, max_inline_ext); ++ ++ for (i = 0; i < nent; i++) + { + if (fileblock < grub_le_to_cpu32 (ext[i].block)) + break; +-- +2.50.1 + diff --git a/boot/grub2/0016-fs-xfs-Fix-out-of-bounds-read.patch b/boot/grub2/0016-fs-xfs-Fix-out-of-bounds-read.patch new file mode 100644 index 0000000000..c42627b7cd --- /dev/null +++ b/boot/grub2/0016-fs-xfs-Fix-out-of-bounds-read.patch @@ -0,0 +1,48 @@ +From 854503d76e7dbc25f999d6be3e2ef4e8067f4152 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 31 May 2024 15:14:57 +0800 +Subject: [PATCH] fs/xfs: Fix out-of-bounds read + +The number of records in the root key array read from disk was not being +validated against the size of the root node. This could lead to an +out-of-bounds read. + +This patch adds a check to ensure that the number of records in the root +key array does not exceed the expected size of a root node read from +disk. If this check detects an out-of-bounds condition the operation is +aborted to prevent random errors due to metadata corruption. + +Reported-by: Daniel Axtens +Signed-off-by: Michael Chang +Reviewed-by: Daniel Kiper +Upstream: 6ccc77b59d16578b10eaf8a4fe85c20b229f0d8a +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/xfs.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index bc2224dbb..d2d533531 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -595,6 +595,17 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) + do + { + grub_uint64_t i; ++ grub_addr_t keys_end, data_end; ++ ++ if (grub_mul (sizeof (grub_uint64_t), nrec, &keys_end) || ++ grub_add ((grub_addr_t) keys, keys_end, &keys_end) || ++ grub_add ((grub_addr_t) node->data, node->data->data_size, &data_end) || ++ keys_end > data_end) ++ { ++ grub_error (GRUB_ERR_BAD_FS, "invalid number of XFS root keys"); ++ grub_free (leaf); ++ return 0; ++ } + + for (i = 0; i < nrec; i++) + { +-- +2.50.1 + diff --git a/boot/grub2/0017-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch b/boot/grub2/0017-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch new file mode 100644 index 0000000000..98d1be1544 --- /dev/null +++ b/boot/grub2/0017-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch @@ -0,0 +1,47 @@ +From 9a5c23756f2e2d4ee8438bf449881c8f854e59ab Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 06:03:58 +0100 +Subject: [PATCH] fs/xfs: Ensuring failing to mount sets a grub_errno + +It was previously possible for grub_xfs_mount() to return NULL without +setting grub_errno if the XFS version was invalid. This resulted in it +being possible for grub_dl_unref() to be called twice allowing the XFS +module to be unloaded while there were still references to it. + +Fixing this problem in general by ensuring a grub_errno is set if the +fail label is reached. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: d1d6b7ea58aa5a80a4c4d0666b49460056c8ef0a +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/xfs.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index d2d533531..56738a135 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -327,6 +327,8 @@ static int grub_xfs_sb_valid(struct grub_xfs_data *data) + } + return 1; + } ++ ++ grub_error (GRUB_ERR_BAD_FS, "unsupported XFS filesystem version"); + return 0; + } + +@@ -1058,7 +1060,7 @@ grub_xfs_mount (grub_disk_t disk) + return data; + fail: + +- if (grub_errno == GRUB_ERR_OUT_OF_RANGE) ++ if (grub_errno == GRUB_ERR_OUT_OF_RANGE || grub_errno == GRUB_ERR_NONE) + grub_error (GRUB_ERR_BAD_FS, "not an XFS filesystem"); + + grub_free (data); +-- +2.50.1 + diff --git a/boot/grub2/0018-kern-file-Ensure-file-data-is-set.patch b/boot/grub2/0018-kern-file-Ensure-file-data-is-set.patch new file mode 100644 index 0000000000..1b84ef304b --- /dev/null +++ b/boot/grub2/0018-kern-file-Ensure-file-data-is-set.patch @@ -0,0 +1,37 @@ +From 816fb20ed0a80032e2eaf4c4ccaf989bf20908be Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 03:01:40 +0100 +Subject: [PATCH] kern/file: Ensure file->data is set + +This is to avoid a generic issue were some filesystems would not set +data and also not set a grub_errno. This meant it was possible for many +filesystems to grub_dl_unref() themselves multiple times resulting in +it being possible to unload the filesystems while there were still +references to them, e.g., via a loopback. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: a7910687294b29288ac649e71b47493c93294f17 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/file.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c +index 750177248..e990507fc 100644 +--- a/grub-core/kern/file.c ++++ b/grub-core/kern/file.c +@@ -114,6 +114,9 @@ grub_file_open (const char *name, enum grub_file_type type) + if ((file->fs->fs_open) (file, file_name) != GRUB_ERR_NONE) + goto fail; + ++ if (file->data == NULL) ++ goto fail; ++ + file->name = grub_strdup (name); + grub_errno = GRUB_ERR_NONE; + +-- +2.50.1 + diff --git a/boot/grub2/0019-kern-file-Implement-filesystem-reference-counting.patch b/boot/grub2/0019-kern-file-Implement-filesystem-reference-counting.patch new file mode 100644 index 0000000000..71c53efd44 --- /dev/null +++ b/boot/grub2/0019-kern-file-Implement-filesystem-reference-counting.patch @@ -0,0 +1,449 @@ +From a27c4b6da2f4a014e5d096e75790e860bcdb2472 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 10:15:03 +0100 +Subject: [PATCH] kern/file: Implement filesystem reference counting + +The grub_file_open() and grub_file_close() should be the only places +that allow a reference to a filesystem to stay open. So, add grub_dl_t +to grub_fs_t and set this in the GRUB_MOD_INIT() for each filesystem to +avoid issues when filesystems forget to do it themselves or do not track +their own references, e.g. squash4. + +The fs_label(), fs_uuid(), fs_mtime() and fs_read() should all ref and +unref in the same function but it is essentially redundant in GRUB +single threaded model. + +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/fs/erofs.c + +Upstream: 16f196874fbe360a1b3c66064ec15adadf94c57b +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/affs.c | 1 + + grub-core/fs/bfs.c | 1 + + grub-core/fs/btrfs.c | 1 + + grub-core/fs/cbfs.c | 1 + + grub-core/fs/cpio.c | 1 + + grub-core/fs/cpio_be.c | 1 + + grub-core/fs/ext2.c | 1 + + grub-core/fs/f2fs.c | 1 + + grub-core/fs/fat.c | 1 + + grub-core/fs/hfs.c | 1 + + grub-core/fs/hfsplus.c | 1 + + grub-core/fs/iso9660.c | 1 + + grub-core/fs/jfs.c | 1 + + grub-core/fs/minix.c | 1 + + grub-core/fs/newc.c | 1 + + grub-core/fs/nilfs2.c | 1 + + grub-core/fs/ntfs.c | 1 + + grub-core/fs/odc.c | 1 + + grub-core/fs/proc.c | 1 + + grub-core/fs/reiserfs.c | 1 + + grub-core/fs/romfs.c | 1 + + grub-core/fs/sfs.c | 1 + + grub-core/fs/squash4.c | 1 + + grub-core/fs/tar.c | 1 + + grub-core/fs/udf.c | 1 + + grub-core/fs/ufs.c | 1 + + grub-core/fs/xfs.c | 1 + + grub-core/fs/zfs/zfs.c | 1 + + grub-core/kern/file.c | 7 +++++++ + include/grub/fs.h | 4 ++++ + 30 files changed, 39 insertions(+) + +diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c +index ed606b3f1..9b0afb954 100644 +--- a/grub-core/fs/affs.c ++++ b/grub-core/fs/affs.c +@@ -703,6 +703,7 @@ static struct grub_fs grub_affs_fs = + + GRUB_MOD_INIT(affs) + { ++ grub_affs_fs.mod = mod; + grub_fs_register (&grub_affs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c +index 07cb3e3ac..f37b16895 100644 +--- a/grub-core/fs/bfs.c ++++ b/grub-core/fs/bfs.c +@@ -1106,6 +1106,7 @@ GRUB_MOD_INIT (bfs) + { + COMPILE_TIME_ASSERT (1 << LOG_EXTENT_SIZE == + sizeof (struct grub_bfs_extent)); ++ grub_bfs_fs.mod = mod; + grub_fs_register (&grub_bfs_fs); + } + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index ba0c58352..aae81482b 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -2413,6 +2413,7 @@ static struct grub_fs grub_btrfs_fs = { + + GRUB_MOD_INIT (btrfs) + { ++ grub_btrfs_fs.mod = mod; + grub_fs_register (&grub_btrfs_fs); + } + +diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c +index 8ab7106af..2332745fe 100644 +--- a/grub-core/fs/cbfs.c ++++ b/grub-core/fs/cbfs.c +@@ -390,6 +390,7 @@ GRUB_MOD_INIT (cbfs) + #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN) + init_cbfsdisk (); + #endif ++ grub_cbfs_fs.mod = mod; + grub_fs_register (&grub_cbfs_fs); + } + +diff --git a/grub-core/fs/cpio.c b/grub-core/fs/cpio.c +index dab5f9898..1799f7ff5 100644 +--- a/grub-core/fs/cpio.c ++++ b/grub-core/fs/cpio.c +@@ -52,6 +52,7 @@ read_number (const grub_uint16_t *arr, grub_size_t size) + + GRUB_MOD_INIT (cpio) + { ++ grub_cpio_fs.mod = mod; + grub_fs_register (&grub_cpio_fs); + } + +diff --git a/grub-core/fs/cpio_be.c b/grub-core/fs/cpio_be.c +index 846548892..7bed1b848 100644 +--- a/grub-core/fs/cpio_be.c ++++ b/grub-core/fs/cpio_be.c +@@ -52,6 +52,7 @@ read_number (const grub_uint16_t *arr, grub_size_t size) + + GRUB_MOD_INIT (cpio_be) + { ++ grub_cpio_fs.mod = mod; + grub_fs_register (&grub_cpio_fs); + } + +diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c +index 3f9f6b208..c3058f7e7 100644 +--- a/grub-core/fs/ext2.c ++++ b/grub-core/fs/ext2.c +@@ -1131,6 +1131,7 @@ static struct grub_fs grub_ext2_fs = + + GRUB_MOD_INIT(ext2) + { ++ grub_ext2_fs.mod = mod; + grub_fs_register (&grub_ext2_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c +index db8a65f8d..f6d6beaa5 100644 +--- a/grub-core/fs/f2fs.c ++++ b/grub-core/fs/f2fs.c +@@ -1353,6 +1353,7 @@ static struct grub_fs grub_f2fs_fs = { + + GRUB_MOD_INIT (f2fs) + { ++ grub_f2fs_fs.mod = mod; + grub_fs_register (&grub_f2fs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c +index c5efed724..6e62b915d 100644 +--- a/grub-core/fs/fat.c ++++ b/grub-core/fs/fat.c +@@ -1312,6 +1312,7 @@ GRUB_MOD_INIT(fat) + #endif + { + COMPILE_TIME_ASSERT (sizeof (struct grub_fat_dir_entry) == 32); ++ grub_fat_fs.mod = mod; + grub_fs_register (&grub_fat_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c +index 920112b03..ce7581dd5 100644 +--- a/grub-core/fs/hfs.c ++++ b/grub-core/fs/hfs.c +@@ -1434,6 +1434,7 @@ static struct grub_fs grub_hfs_fs = + + GRUB_MOD_INIT(hfs) + { ++ grub_hfs_fs.mod = mod; + if (!grub_is_lockdown ()) + grub_fs_register (&grub_hfs_fs); + my_mod = mod; +diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c +index de71fd486..3f203abcc 100644 +--- a/grub-core/fs/hfsplus.c ++++ b/grub-core/fs/hfsplus.c +@@ -1176,6 +1176,7 @@ static struct grub_fs grub_hfsplus_fs = + + GRUB_MOD_INIT(hfsplus) + { ++ grub_hfsplus_fs.mod = mod; + grub_fs_register (&grub_hfsplus_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c +index 8e3c95c4f..c73cb9ce0 100644 +--- a/grub-core/fs/iso9660.c ++++ b/grub-core/fs/iso9660.c +@@ -1260,6 +1260,7 @@ static struct grub_fs grub_iso9660_fs = + + GRUB_MOD_INIT(iso9660) + { ++ grub_iso9660_fs.mod = mod; + grub_fs_register (&grub_iso9660_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index 70a2f4947..b0283ac00 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -1005,6 +1005,7 @@ static struct grub_fs grub_jfs_fs = + + GRUB_MOD_INIT(jfs) + { ++ grub_jfs_fs.mod = mod; + grub_fs_register (&grub_jfs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c +index 5354951d1..b7679c3e2 100644 +--- a/grub-core/fs/minix.c ++++ b/grub-core/fs/minix.c +@@ -734,6 +734,7 @@ GRUB_MOD_INIT(minix) + #endif + #endif + { ++ grub_minix_fs.mod = mod; + grub_fs_register (&grub_minix_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/newc.c b/grub-core/fs/newc.c +index 4fb8b2e3d..43b7f8b64 100644 +--- a/grub-core/fs/newc.c ++++ b/grub-core/fs/newc.c +@@ -64,6 +64,7 @@ read_number (const char *str, grub_size_t size) + + GRUB_MOD_INIT (newc) + { ++ grub_cpio_fs.mod = mod; + grub_fs_register (&grub_cpio_fs); + } + +diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c +index fc7374ead..4e1e71738 100644 +--- a/grub-core/fs/nilfs2.c ++++ b/grub-core/fs/nilfs2.c +@@ -1231,6 +1231,7 @@ GRUB_MOD_INIT (nilfs2) + grub_nilfs2_dat_entry)); + COMPILE_TIME_ASSERT (1 << LOG_INODE_SIZE + == sizeof (struct grub_nilfs2_inode)); ++ grub_nilfs2_fs.mod = mod; + grub_fs_register (&grub_nilfs2_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c +index de435aa14..560917dc2 100644 +--- a/grub-core/fs/ntfs.c ++++ b/grub-core/fs/ntfs.c +@@ -1320,6 +1320,7 @@ static struct grub_fs grub_ntfs_fs = + + GRUB_MOD_INIT (ntfs) + { ++ grub_ntfs_fs.mod = mod; + grub_fs_register (&grub_ntfs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/odc.c b/grub-core/fs/odc.c +index 790000622..8e4e8aeac 100644 +--- a/grub-core/fs/odc.c ++++ b/grub-core/fs/odc.c +@@ -52,6 +52,7 @@ read_number (const char *str, grub_size_t size) + + GRUB_MOD_INIT (odc) + { ++ grub_cpio_fs.mod = mod; + grub_fs_register (&grub_cpio_fs); + } + +diff --git a/grub-core/fs/proc.c b/grub-core/fs/proc.c +index 5f516502d..bcde43349 100644 +--- a/grub-core/fs/proc.c ++++ b/grub-core/fs/proc.c +@@ -192,6 +192,7 @@ static struct grub_fs grub_procfs_fs = + + GRUB_MOD_INIT (procfs) + { ++ grub_procfs_fs.mod = mod; + grub_disk_dev_register (&grub_procfs_dev); + grub_fs_register (&grub_procfs_fs); + } +diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c +index 36b26ac98..c3850e013 100644 +--- a/grub-core/fs/reiserfs.c ++++ b/grub-core/fs/reiserfs.c +@@ -1417,6 +1417,7 @@ static struct grub_fs grub_reiserfs_fs = + + GRUB_MOD_INIT(reiserfs) + { ++ grub_reiserfs_fs.mod = mod; + grub_fs_register (&grub_reiserfs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/romfs.c b/grub-core/fs/romfs.c +index 1f7dcfca1..56b0b2b2f 100644 +--- a/grub-core/fs/romfs.c ++++ b/grub-core/fs/romfs.c +@@ -475,6 +475,7 @@ static struct grub_fs grub_romfs_fs = + + GRUB_MOD_INIT(romfs) + { ++ grub_romfs_fs.mod = mod; + grub_fs_register (&grub_romfs_fs); + } + +diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c +index 983e88008..f0d7cac43 100644 +--- a/grub-core/fs/sfs.c ++++ b/grub-core/fs/sfs.c +@@ -779,6 +779,7 @@ static struct grub_fs grub_sfs_fs = + + GRUB_MOD_INIT(sfs) + { ++ grub_sfs_fs.mod = mod; + grub_fs_register (&grub_sfs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c +index a30e6ebe1..6e9d63874 100644 +--- a/grub-core/fs/squash4.c ++++ b/grub-core/fs/squash4.c +@@ -1044,6 +1044,7 @@ static struct grub_fs grub_squash_fs = + + GRUB_MOD_INIT(squash4) + { ++ grub_squash_fs.mod = mod; + grub_fs_register (&grub_squash_fs); + } + +diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c +index 386c09022..fd2ec1f74 100644 +--- a/grub-core/fs/tar.c ++++ b/grub-core/fs/tar.c +@@ -354,6 +354,7 @@ static struct grub_fs grub_cpio_fs = { + + GRUB_MOD_INIT (tar) + { ++ grub_cpio_fs.mod = mod; + grub_fs_register (&grub_cpio_fs); + } + +diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c +index b836e6107..8765c633c 100644 +--- a/grub-core/fs/udf.c ++++ b/grub-core/fs/udf.c +@@ -1455,6 +1455,7 @@ static struct grub_fs grub_udf_fs = { + + GRUB_MOD_INIT (udf) + { ++ grub_udf_fs.mod = mod; + grub_fs_register (&grub_udf_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c +index 01235101b..e82d9356d 100644 +--- a/grub-core/fs/ufs.c ++++ b/grub-core/fs/ufs.c +@@ -899,6 +899,7 @@ GRUB_MOD_INIT(ufs1) + #endif + #endif + { ++ grub_ufs_fs.mod = mod; + grub_fs_register (&grub_ufs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index 56738a135..74feeb86a 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -1294,6 +1294,7 @@ static struct grub_fs grub_xfs_fs = + + GRUB_MOD_INIT(xfs) + { ++ grub_xfs_fs.mod = mod; + grub_fs_register (&grub_xfs_fs); + my_mod = mod; + } +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c +index b5453e006..a497b1869 100644 +--- a/grub-core/fs/zfs/zfs.c ++++ b/grub-core/fs/zfs/zfs.c +@@ -4424,6 +4424,7 @@ static struct grub_fs grub_zfs_fs = { + GRUB_MOD_INIT (zfs) + { + COMPILE_TIME_ASSERT (sizeof (zap_leaf_chunk_t) == ZAP_LEAF_CHUNKSIZE); ++ grub_zfs_fs.mod = mod; + grub_fs_register (&grub_zfs_fs); + #ifndef GRUB_UTIL + my_mod = mod; +diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c +index e990507fc..6e7efe89a 100644 +--- a/grub-core/kern/file.c ++++ b/grub-core/kern/file.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + void (*EXPORT_VAR (grub_grubnet_fini)) (void); + +@@ -117,6 +118,9 @@ grub_file_open (const char *name, enum grub_file_type type) + if (file->data == NULL) + goto fail; + ++ if (file->fs->mod) ++ grub_dl_ref (file->fs->mod); ++ + file->name = grub_strdup (name); + grub_errno = GRUB_ERR_NONE; + +@@ -197,6 +201,9 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len) + grub_err_t + grub_file_close (grub_file_t file) + { ++ if (file->fs->mod) ++ grub_dl_unref (file->fs->mod); ++ + if (file->fs->fs_close) + (file->fs->fs_close) (file); + +diff --git a/include/grub/fs.h b/include/grub/fs.h +index 026bc3bb8..df4c93b16 100644 +--- a/include/grub/fs.h ++++ b/include/grub/fs.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + /* For embedding types. */ +@@ -57,6 +58,9 @@ struct grub_fs + /* My name. */ + const char *name; + ++ /* My module */ ++ grub_dl_t mod; ++ + /* Call HOOK with each file under DIR. */ + grub_err_t (*fs_dir) (grub_device_t device, const char *path, + grub_fs_dir_hook_t hook, void *hook_data); +-- +2.50.1 + diff --git a/boot/grub2/0020-disk-loopback-Reference-tracking-for-the-loopback.patch b/boot/grub2/0020-disk-loopback-Reference-tracking-for-the-loopback.patch new file mode 100644 index 0000000000..5295251e15 --- /dev/null +++ b/boot/grub2/0020-disk-loopback-Reference-tracking-for-the-loopback.patch @@ -0,0 +1,108 @@ +From a81ef3044791e7ee02bd349b5ec0adcbf6947555 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 03:26:19 +0100 +Subject: [PATCH] disk/loopback: Reference tracking for the loopback + +It was possible to delete a loopback while there were still references +to it. This led to an exploitable use-after-free. + +Fixed by implementing a reference counting in the grub_loopback struct. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 67f70f70a36b6e87a65f928fe1e840a12eafb7ae +Signed-off-by: Thomas Petazzoni +--- + grub-core/disk/loopback.c | 18 ++++++++++++++++++ + include/grub/err.h | 3 ++- + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c +index 4635dcfde..2bea4e922 100644 +--- a/grub-core/disk/loopback.c ++++ b/grub-core/disk/loopback.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -33,6 +34,7 @@ struct grub_loopback + grub_file_t file; + struct grub_loopback *next; + unsigned long id; ++ grub_uint64_t refcnt; + }; + + static struct grub_loopback *loopback_list; +@@ -64,6 +66,8 @@ delete_loopback (const char *name) + if (! dev) + return grub_error (GRUB_ERR_BAD_DEVICE, "device not found"); + ++ if (dev->refcnt > 0) ++ return grub_error (GRUB_ERR_STILL_REFERENCED, "device still referenced"); + /* Remove the device from the list. */ + *prev = dev->next; + +@@ -120,6 +124,7 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args) + + newdev->file = file; + newdev->id = last_id++; ++ newdev->refcnt = 0; + + /* Add the new entry to the list. */ + newdev->next = loopback_list; +@@ -161,6 +166,9 @@ grub_loopback_open (const char *name, grub_disk_t disk) + if (! dev) + return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device"); + ++ if (grub_add (dev->refcnt, 1, &dev->refcnt)) ++ grub_fatal ("Reference count overflow"); ++ + /* Use the filesize for the disk size, round up to a complete sector. */ + if (dev->file->size != GRUB_FILE_SIZE_UNKNOWN) + disk->total_sectors = ((dev->file->size + GRUB_DISK_SECTOR_SIZE - 1) +@@ -178,6 +186,15 @@ grub_loopback_open (const char *name, grub_disk_t disk) + return 0; + } + ++static void ++grub_loopback_close (grub_disk_t disk) ++{ ++ struct grub_loopback *dev = disk->data; ++ ++ if (grub_sub (dev->refcnt, 1, &dev->refcnt)) ++ grub_fatal ("Reference count underflow"); ++} ++ + static grub_err_t + grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector, + grub_size_t size, char *buf) +@@ -220,6 +237,7 @@ static struct grub_disk_dev grub_loopback_dev = + .id = GRUB_DISK_DEVICE_LOOPBACK_ID, + .disk_iterate = grub_loopback_iterate, + .disk_open = grub_loopback_open, ++ .disk_close = grub_loopback_close, + .disk_read = grub_loopback_read, + .disk_write = grub_loopback_write, + .next = 0 +diff --git a/include/grub/err.h b/include/grub/err.h +index 1c07034cd..b0e54e0a0 100644 +--- a/include/grub/err.h ++++ b/include/grub/err.h +@@ -73,7 +73,8 @@ typedef enum + GRUB_ERR_NET_NO_DOMAIN, + GRUB_ERR_EOF, + GRUB_ERR_BAD_SIGNATURE, +- GRUB_ERR_BAD_FIRMWARE ++ GRUB_ERR_BAD_FIRMWARE, ++ GRUB_ERR_STILL_REFERENCED + } + grub_err_t; + +-- +2.50.1 + diff --git a/boot/grub2/0021-kern-disk-Limit-recursion-depth.patch b/boot/grub2/0021-kern-disk-Limit-recursion-depth.patch new file mode 100644 index 0000000000..8d2390ac55 --- /dev/null +++ b/boot/grub2/0021-kern-disk-Limit-recursion-depth.patch @@ -0,0 +1,125 @@ +From 195331a7a64c2a4ba754e2527ca8973012db68c9 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 04:09:24 +0100 +Subject: [PATCH] kern/disk: Limit recursion depth + +The grub_disk_read() may trigger other disk reads, e.g. via loopbacks. +This may lead to very deep recursion which can corrupt the heap. So, fix +the issue by limiting reads depth. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 18212f0648b6de7d71d4c8f41eb4d8b78b3a299b +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/disk.c | 27 ++++++++++++++++++++------- + include/grub/err.h | 3 ++- + 2 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c +index 1eda58fe9..82e04fd00 100644 +--- a/grub-core/kern/disk.c ++++ b/grub-core/kern/disk.c +@@ -28,6 +28,10 @@ + + #define GRUB_CACHE_TIMEOUT 2 + ++/* Disk reads may trigger other disk reads. So, limit recursion depth. */ ++#define MAX_READ_RECURSION_DEPTH 16 ++static unsigned int read_recursion_depth = 0; ++ + /* The last time the disk was used. */ + static grub_uint64_t grub_last_time = 0; + +@@ -417,6 +421,8 @@ grub_err_t + grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, + grub_off_t offset, grub_size_t size, void *buf) + { ++ grub_err_t err = GRUB_ERR_NONE; ++ + /* First of all, check if the region is within the disk. */ + if (grub_disk_adjust_range (disk, §or, &offset, size) != GRUB_ERR_NONE) + { +@@ -427,12 +433,17 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, + return grub_errno; + } + ++ if (++read_recursion_depth >= MAX_READ_RECURSION_DEPTH) ++ { ++ grub_error (GRUB_ERR_RECURSION_DEPTH, "grub_disk_read(): Maximum recursion depth exceeded"); ++ goto error; ++ } ++ + /* First read until first cache boundary. */ + if (offset || (sector & (GRUB_DISK_CACHE_SIZE - 1))) + { + grub_disk_addr_t start_sector; + grub_size_t pos; +- grub_err_t err; + grub_size_t len; + + start_sector = sector & ~((grub_disk_addr_t) GRUB_DISK_CACHE_SIZE - 1); +@@ -444,7 +455,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, + err = grub_disk_read_small (disk, start_sector, + offset + pos, len, buf); + if (err) +- return err; ++ goto error; + buf = (char *) buf + len; + size -= len; + offset += len; +@@ -457,7 +468,6 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, + { + char *data = NULL; + grub_disk_addr_t agglomerate; +- grub_err_t err; + + /* agglomerate read until we find a first cached entry. */ + for (agglomerate = 0; agglomerate +@@ -493,7 +503,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, + - disk->log_sector_size), + buf); + if (err) +- return err; ++ goto error; + + for (i = 0; i < agglomerate; i ++) + grub_disk_cache_store (disk->dev->id, disk->id, +@@ -527,13 +537,16 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, + /* And now read the last part. */ + if (size) + { +- grub_err_t err; + err = grub_disk_read_small (disk, sector, 0, size, buf); + if (err) +- return err; ++ goto error; + } + +- return grub_errno; ++ err = grub_errno; ++ ++ error: ++ read_recursion_depth--; ++ return err; + } + + grub_uint64_t +diff --git a/include/grub/err.h b/include/grub/err.h +index b0e54e0a0..202fa8a7a 100644 +--- a/include/grub/err.h ++++ b/include/grub/err.h +@@ -74,7 +74,8 @@ typedef enum + GRUB_ERR_EOF, + GRUB_ERR_BAD_SIGNATURE, + GRUB_ERR_BAD_FIRMWARE, +- GRUB_ERR_STILL_REFERENCED ++ GRUB_ERR_STILL_REFERENCED, ++ GRUB_ERR_RECURSION_DEPTH + } + grub_err_t; + +-- +2.50.1 + diff --git a/boot/grub2/0022-kern-partition-Limit-recursion-in-part_iterate.patch b/boot/grub2/0022-kern-partition-Limit-recursion-in-part_iterate.patch new file mode 100644 index 0000000000..03183abf2f --- /dev/null +++ b/boot/grub2/0022-kern-partition-Limit-recursion-in-part_iterate.patch @@ -0,0 +1,49 @@ +From 3f1c5f55e7ef7b872c3ae59c0c41f1e07508a943 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sat, 16 Nov 2024 21:24:19 +0000 +Subject: [PATCH] kern/partition: Limit recursion in part_iterate() + +The part_iterate() is used by grub_partition_iterate() as a callback in +the partition iterate functions. However, part_iterate() may also call +the partition iterate functions which may lead to recursion. Fix potential +issue by limiting the recursion depth. + +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 8a7103fddfd6664f41081f3bb88eebbf2871da2a +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/partition.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c +index edad9f9e4..704512a20 100644 +--- a/grub-core/kern/partition.c ++++ b/grub-core/kern/partition.c +@@ -28,6 +28,9 @@ + + grub_partition_map_t grub_partition_map_list; + ++#define MAX_RECURSION_DEPTH 32 ++static unsigned int recursion_depth = 0; ++ + /* + * Checks that disk->partition contains part. This function assumes that the + * start of part is relative to the start of disk->partition. Returns 1 if +@@ -208,7 +211,12 @@ part_iterate (grub_disk_t dsk, const grub_partition_t partition, void *data) + FOR_PARTITION_MAPS(partmap) + { + grub_err_t err; +- err = partmap->iterate (dsk, part_iterate, ctx); ++ recursion_depth++; ++ if (recursion_depth <= MAX_RECURSION_DEPTH) ++ err = partmap->iterate (dsk, part_iterate, ctx); ++ else ++ err = grub_error (GRUB_ERR_RECURSION_DEPTH, "maximum recursion depth exceeded"); ++ recursion_depth--; + if (err) + grub_errno = GRUB_ERR_NONE; + if (ctx->ret) +-- +2.50.1 + diff --git a/boot/grub2/0023-script-execute-Limit-the-recursion-depth.patch b/boot/grub2/0023-script-execute-Limit-the-recursion-depth.patch new file mode 100644 index 0000000000..f0e922c27a --- /dev/null +++ b/boot/grub2/0023-script-execute-Limit-the-recursion-depth.patch @@ -0,0 +1,60 @@ +From 2a094a7116c56519a42a13c96e77bdeda6069076 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 18 Apr 2024 19:04:13 +0100 +Subject: [PATCH] script/execute: Limit the recursion depth + +If unbounded recursion is allowed it becomes possible to collide the +stack with the heap. As UEFI firmware often lacks guard pages this +becomes an exploitable issue as it is possible in some cases to do +a controlled overwrite of a section of this heap region with +arbitrary data. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: d8a937ccae5c6d86dc4375698afca5cefdcd01e1 +Signed-off-by: Thomas Petazzoni +--- + grub-core/script/execute.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c +index 14ff09094..e1450f45d 100644 +--- a/grub-core/script/execute.c ++++ b/grub-core/script/execute.c +@@ -33,10 +33,18 @@ + is sizeof (int) * 3, and one extra for a possible -ve sign. */ + #define ERRNO_DIGITS_MAX (sizeof (int) * 3 + 1) + ++/* ++ * A limit on recursion, to avoid colliding with the heap. UEFI defines a baseline ++ * stack size of 128 KiB. So, assuming at most 1-2 KiB per iteration this should ++ * keep us safe. ++ */ ++#define MAX_RECURSION_DEPTH 64 ++ + static unsigned long is_continue; + static unsigned long active_loops; + static unsigned long active_breaks; + static unsigned long function_return; ++static unsigned long recursion_depth; + + #define GRUB_SCRIPT_SCOPE_MALLOCED 1 + #define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2 +@@ -816,7 +824,13 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd) + if (cmd == 0) + return 0; + ++ recursion_depth++; ++ ++ if (recursion_depth >= MAX_RECURSION_DEPTH) ++ return grub_error (GRUB_ERR_RECURSION_DEPTH, N_("maximum recursion depth exceeded")); ++ + ret = cmd->exec (cmd); ++ recursion_depth--; + + grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret); + grub_env_set ("?", errnobuf); +-- +2.50.1 + diff --git a/boot/grub2/0024-net-Unregister-net_default_ip-and-net_default_mac-va.patch b/boot/grub2/0024-net-Unregister-net_default_ip-and-net_default_mac-va.patch new file mode 100644 index 0000000000..881493e567 --- /dev/null +++ b/boot/grub2/0024-net-Unregister-net_default_ip-and-net_default_mac-va.patch @@ -0,0 +1,34 @@ +From b9a8d2cb984f0a5fd92fe7275dfa280466dd82ce Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 28 Nov 2024 04:05:04 +0000 +Subject: [PATCH] net: Unregister net_default_ip and net_default_mac variables + hooks on unload + +The net module is a dependency of normal. So, it shouldn't be possible +to unload the net. Though unregister variables hooks as a precaution. +It also gets in line with unregistering the other net module hooks. + +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: a1dd8e59da26f1a9608381d3a1a6c0f465282b1d +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/net.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 8cad4fb6d..f69c67b64 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -2072,6 +2072,8 @@ GRUB_MOD_FINI(net) + { + grub_register_variable_hook ("net_default_server", 0, 0); + grub_register_variable_hook ("pxe_default_server", 0, 0); ++ grub_register_variable_hook ("net_default_ip", 0, 0); ++ grub_register_variable_hook ("net_default_mac", 0, 0); + + grub_bootp_fini (); + grub_dns_fini (); +-- +2.50.1 + diff --git a/boot/grub2/0025-net-Remove-variables-hooks-when-interface-is-unregis.patch b/boot/grub2/0025-net-Remove-variables-hooks-when-interface-is-unregis.patch new file mode 100644 index 0000000000..3c6bd1fc83 --- /dev/null +++ b/boot/grub2/0025-net-Remove-variables-hooks-when-interface-is-unregis.patch @@ -0,0 +1,93 @@ +From 883c8721591c1f7a186e2f3cdc8a4f140bd81ce9 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Fri, 1 Nov 2024 23:49:48 +0000 +Subject: [PATCH] net: Remove variables hooks when interface is unregisted + +The grub_net_network_level_interface_unregister(), previously +implemented in a header, did not remove the variables hooks that +were registered in grub_net_network_level_interface_register(). +Fix this by implementing the same logic used to register the +variables and move the function into the grub-core/net/net.c. + +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/net/net.c + +Upstream: aa8b4d7facef7b75a2703274b1b9d4e0e734c401 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/net.c | 33 +++++++++++++++++++++++++++++++++ + include/grub/net.h | 11 +---------- + 2 files changed, 34 insertions(+), 10 deletions(-) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index f69c67b64..8dbb0eada 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -1094,6 +1094,39 @@ grub_cmd_delroute (struct grub_command *cmd __attribute__ ((unused)), + return GRUB_ERR_NONE; + } + ++void ++grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter) ++{ ++ char *name; ++ ++ { ++ char buf[GRUB_NET_MAX_STR_HWADDR_LEN]; ++ ++ grub_net_hwaddr_to_str (&inter->hwaddress, buf); ++ name = grub_xasprintf ("net_%s_mac", inter->name); ++ if (name != NULL) ++ grub_register_variable_hook (name, NULL, NULL); ++ grub_free (name); ++ } ++ ++ { ++ char buf[GRUB_NET_MAX_STR_ADDR_LEN]; ++ ++ grub_net_addr_to_str (&inter->address, buf); ++ name = grub_xasprintf ("net_%s_ip", inter->name); ++ if (name != NULL) ++ grub_register_variable_hook (name, NULL, NULL); ++ grub_free (name); ++ } ++ ++ inter->card->num_ifaces--; ++ *inter->prev = inter->next; ++ if (inter->next) ++ inter->next->prev = inter->prev; ++ inter->next = 0; ++ inter->prev = 0; ++} ++ + grub_err_t + grub_net_add_route (const char *name, + grub_net_network_level_netaddress_t target, +diff --git a/include/grub/net.h b/include/grub/net.h +index 844e501c1..228d04963 100644 +--- a/include/grub/net.h ++++ b/include/grub/net.h +@@ -540,16 +540,7 @@ void grub_bootp_fini (void); + void grub_dns_init (void); + void grub_dns_fini (void); + +-static inline void +-grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter) +-{ +- inter->card->num_ifaces--; +- *inter->prev = inter->next; +- if (inter->next) +- inter->next->prev = inter->prev; +- inter->next = 0; +- inter->prev = 0; +-} ++void grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter); + + void + grub_net_tcp_retransmit (void); +-- +2.50.1 + diff --git a/boot/grub2/0026-net-Fix-OOB-write-in-grub_net_search_config_file.patch b/boot/grub2/0026-net-Fix-OOB-write-in-grub_net_search_config_file.patch new file mode 100644 index 0000000000..b047b150bc --- /dev/null +++ b/boot/grub2/0026-net-Fix-OOB-write-in-grub_net_search_config_file.patch @@ -0,0 +1,89 @@ +From 7ad4117be44d8cf0443bbc58d49e592a33aaac89 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Fri, 15 Nov 2024 13:12:09 +0000 +Subject: [PATCH] net: Fix OOB write in grub_net_search_config_file() + +The function included a call to grub_strcpy() which copied data from an +environment variable to a buffer allocated in grub_cmd_normal(). The +grub_cmd_normal() didn't consider the length of the environment variable. +So, the copy operation could exceed the allocation and lead to an OOB +write. Fix the issue by replacing grub_strcpy() with grub_strlcpy() and +pass the underlying buffers size to the grub_net_search_config_file(). + +Fixes: CVE-2025-0624 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/normal/main.c + +Upstream: 5eef88152833062a3f7e017535372d64ac8ef7e1 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/net.c | 7 ++++--- + grub-core/normal/main.c | 2 +- + include/grub/net.h | 2 +- + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 8dbb0eada..2bd490279 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -1942,14 +1942,15 @@ grub_config_search_through (char *config, char *suffix, + } + + grub_err_t +-grub_net_search_config_file (char *config) ++grub_net_search_config_file (char *config, grub_size_t config_buf_len) + { +- grub_size_t config_len; ++ grub_size_t config_len, suffix_len; + char *suffix; + + config_len = grub_strlen (config); + config[config_len] = '-'; + suffix = config + config_len + 1; ++ suffix_len = config_buf_len - (config_len + 1); + + struct grub_net_network_level_interface *inf; + FOR_NET_NETWORK_LEVEL_INTERFACES (inf) +@@ -1975,7 +1976,7 @@ grub_net_search_config_file (char *config) + + if (client_uuid) + { +- grub_strcpy (suffix, client_uuid); ++ grub_strlcpy (suffix, client_uuid, suffix_len); + if (grub_config_search_through (config, suffix, 1, 0) == 0) + return GRUB_ERR_NONE; + } +diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c +index bd4431000..3b48cd333 100644 +--- a/grub-core/normal/main.c ++++ b/grub-core/normal/main.c +@@ -344,7 +344,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), + + if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0 && + !disable_net_search) +- grub_net_search_config_file (config); ++ grub_net_search_config_file (config, config_len); + + grub_enter_normal_mode (config); + grub_free (config); +diff --git a/include/grub/net.h b/include/grub/net.h +index 228d04963..58a4f83fc 100644 +--- a/include/grub/net.h ++++ b/include/grub/net.h +@@ -570,7 +570,7 @@ void + grub_net_remove_dns_server (const struct grub_net_network_level_address *s); + + grub_err_t +-grub_net_search_config_file (char *config); ++grub_net_search_config_file (char *config, grub_size_t config_buf_len); + + extern char *grub_net_default_server; + +-- +2.50.1 + diff --git a/boot/grub2/0027-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch b/boot/grub2/0027-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch new file mode 100644 index 0000000000..76b18ace8f --- /dev/null +++ b/boot/grub2/0027-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch @@ -0,0 +1,120 @@ +From 8284fca0f096d01f566eadfdc790232df9f2934e Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 18 Apr 2024 17:32:34 +0100 +Subject: [PATCH] net/tftp: Fix stack buffer overflow in tftp_open() + +An overly long filename can be passed to tftp_open() which would cause +grub_normalize_filename() to write out of bounds. + +Fixed by adding an extra argument to grub_normalize_filename() for the +space available, making it act closer to a strlcpy(). As several fixed +strings are strcpy()'d after into the same buffer, their total length is +checked to see if they exceed the remaining space in the buffer. If so, +return an error. + +On the occasion simplify code a bit by removing unneeded rrqlen zeroing. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 0707accab1b9be5d3645d4700dde3f99209f9367 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/tftp.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) + +diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c +index 409b1d09b..336b78691 100644 +--- a/grub-core/net/tftp.c ++++ b/grub-core/net/tftp.c +@@ -266,17 +266,19 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), + * forward slashes to a single forward slash. + */ + static void +-grub_normalize_filename (char *normalized, const char *filename) ++grub_normalize_filename (char *normalized, const char *filename, int c) + { + char *dest = normalized; + const char *src = filename; + +- while (*src != '\0') ++ while (*src != '\0' && c > 0) + { + if (src[0] == '/' && src[1] == '/') + src++; +- else ++ else { ++ c--; + *dest++ = *src++; ++ } + } + *dest = '\0'; + } +@@ -287,7 +289,7 @@ tftp_open (struct grub_file *file, const char *filename) + struct tftphdr *tftph; + char *rrq; + int i; +- int rrqlen; ++ int rrqlen, rrqsize; + int hdrlen; + grub_uint8_t open_data[1500]; + struct grub_net_buff nb; +@@ -315,37 +317,45 @@ tftp_open (struct grub_file *file, const char *filename) + + tftph = (struct tftphdr *) nb.data; + +- rrq = (char *) tftph->u.rrq; +- rrqlen = 0; +- + tftph->opcode = grub_cpu_to_be16_compile_time (TFTP_RRQ); + ++ rrq = (char *) tftph->u.rrq; ++ rrqsize = sizeof (tftph->u.rrq); ++ + /* + * Copy and normalize the filename to work-around issues on some TFTP + * servers when file names are being matched for remapping. + */ +- grub_normalize_filename (rrq, filename); +- rrqlen += grub_strlen (rrq) + 1; ++ grub_normalize_filename (rrq, filename, rrqsize); ++ ++ rrqlen = grub_strlen (rrq) + 1; + rrq += grub_strlen (rrq) + 1; + +- grub_strcpy (rrq, "octet"); ++ /* Verify there is enough space for the remaining components. */ + rrqlen += grub_strlen ("octet") + 1; ++ rrqlen += grub_strlen ("blksize") + 1; ++ rrqlen += grub_strlen ("1024") + 1; ++ rrqlen += grub_strlen ("tsize") + 1; ++ rrqlen += grub_strlen ("0") + 1; ++ ++ if (rrqlen >= rrqsize) { ++ grub_free (data); ++ return grub_error (GRUB_ERR_BAD_FILENAME, N_("filename too long")); ++ } ++ ++ grub_strcpy (rrq, "octet"); + rrq += grub_strlen ("octet") + 1; + + grub_strcpy (rrq, "blksize"); +- rrqlen += grub_strlen ("blksize") + 1; + rrq += grub_strlen ("blksize") + 1; + + grub_strcpy (rrq, "1024"); +- rrqlen += grub_strlen ("1024") + 1; + rrq += grub_strlen ("1024") + 1; + + grub_strcpy (rrq, "tsize"); +- rrqlen += grub_strlen ("tsize") + 1; + rrq += grub_strlen ("tsize") + 1; + + grub_strcpy (rrq, "0"); +- rrqlen += grub_strlen ("0") + 1; + rrq += grub_strlen ("0") + 1; + hdrlen = sizeof (tftph->opcode) + rrqlen; + +-- +2.50.1 + diff --git a/boot/grub2/0028-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch b/boot/grub2/0028-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch new file mode 100644 index 0000000000..6ea951225a --- /dev/null +++ b/boot/grub2/0028-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch @@ -0,0 +1,38 @@ +From 8368710fbce5c040227fca8bf10828ad1632f84f Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Fri, 8 Mar 2024 22:47:20 +1100 +Subject: [PATCH] video/readers/jpeg: Do not permit duplicate SOF0 markers in + JPEG + +Otherwise a subsequent header could change the height and width +allowing future OOB writes. + +Fixes: CVE-2024-45774 + +Reported-by: Nils Langius +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 2c34af908ebf4856051ed29e46d88abd2b20387f +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/jpeg.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c +index ae634fd41..631a89356 100644 +--- a/grub-core/video/readers/jpeg.c ++++ b/grub-core/video/readers/jpeg.c +@@ -339,6 +339,10 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data) + if (grub_errno != GRUB_ERR_NONE) + return grub_errno; + ++ if (data->image_height != 0 || data->image_width != 0) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "jpeg: cannot have duplicate SOF0 markers"); ++ + if (grub_jpeg_get_byte (data) != 8) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "jpeg: only 8-bit precision is supported"); +-- +2.50.1 + diff --git a/boot/grub2/0029-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch b/boot/grub2/0029-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch new file mode 100644 index 0000000000..cea0dede41 --- /dev/null +++ b/boot/grub2/0029-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch @@ -0,0 +1,143 @@ +From 4d70ddc5255b6d3f752da4120f593d7007222ca2 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 18 Apr 2024 15:59:26 +0100 +Subject: [PATCH] kern/dl: Fix for an integer overflow in grub_dl_ref() + +It was possible to overflow the value of mod->ref_count, a signed +integer, by repeatedly invoking insmod on an already loaded module. +This led to a use-after-free. As once ref_count was overflowed it became +possible to unload the module while there was still references to it. + +This resolves the issue by using grub_add() to check if the ref_count +will overflow and then stops further increments. Further changes were +also made to grub_dl_unref() to check for the underflow condition and +the reference count was changed to an unsigned 64-bit integer. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 500e5fdd82ca40412b0b73f5e5dda38e4a3af96d +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/minicmd.c | 2 +- + grub-core/kern/dl.c | 17 ++++++++++++----- + include/grub/dl.h | 8 ++++---- + util/misc.c | 4 ++-- + 4 files changed, 19 insertions(+), 12 deletions(-) + +diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c +index fa498931e..286290866 100644 +--- a/grub-core/commands/minicmd.c ++++ b/grub-core/commands/minicmd.c +@@ -167,7 +167,7 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)), + { + grub_dl_dep_t dep; + +- grub_printf ("%s\t%d\t\t", mod->name, mod->ref_count); ++ grub_printf ("%s\t%" PRIuGRUB_UINT64_T "\t\t", mod->name, mod->ref_count); + for (dep = mod->dep; dep; dep = dep->next) + { + if (dep != mod->dep) +diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c +index 0bf40caa6..1a38742e6 100644 +--- a/grub-core/kern/dl.c ++++ b/grub-core/kern/dl.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + /* Platforms where modules are in a readonly area of memory. */ + #if defined(GRUB_MACHINE_QEMU) +@@ -532,7 +533,7 @@ grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e) + return GRUB_ERR_NONE; + } + +-int ++grub_uint64_t + grub_dl_ref (grub_dl_t mod) + { + grub_dl_dep_t dep; +@@ -543,10 +544,13 @@ grub_dl_ref (grub_dl_t mod) + for (dep = mod->dep; dep; dep = dep->next) + grub_dl_ref (dep->mod); + +- return ++mod->ref_count; ++ if (grub_add (mod->ref_count, 1, &mod->ref_count)) ++ grub_fatal ("Module reference count overflow"); ++ ++ return mod->ref_count; + } + +-int ++grub_uint64_t + grub_dl_unref (grub_dl_t mod) + { + grub_dl_dep_t dep; +@@ -557,10 +561,13 @@ grub_dl_unref (grub_dl_t mod) + for (dep = mod->dep; dep; dep = dep->next) + grub_dl_unref (dep->mod); + +- return --mod->ref_count; ++ if (grub_sub (mod->ref_count, 1, &mod->ref_count)) ++ grub_fatal ("Module reference count underflow"); ++ ++ return mod->ref_count; + } + +-int ++grub_uint64_t + grub_dl_ref_count (grub_dl_t mod) + { + if (mod == NULL) +diff --git a/include/grub/dl.h b/include/grub/dl.h +index cd1f46c8b..f0a94e273 100644 +--- a/include/grub/dl.h ++++ b/include/grub/dl.h +@@ -174,7 +174,7 @@ typedef struct grub_dl_dep *grub_dl_dep_t; + struct grub_dl + { + char *name; +- int ref_count; ++ grub_uint64_t ref_count; + int persistent; + grub_dl_dep_t dep; + grub_dl_segment_t segment; +@@ -203,9 +203,9 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char *name); + grub_dl_t grub_dl_load_core (void *addr, grub_size_t size); + grub_dl_t EXPORT_FUNC(grub_dl_load_core_noinit) (void *addr, grub_size_t size); + int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod); +-extern int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod); +-extern int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod); +-extern int EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod); ++extern grub_uint64_t EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod); ++extern grub_uint64_t EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod); ++extern grub_uint64_t EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod); + + extern grub_dl_t EXPORT_VAR(grub_dl_head); + +diff --git a/util/misc.c b/util/misc.c +index d545212d9..0f928e5b4 100644 +--- a/util/misc.c ++++ b/util/misc.c +@@ -190,14 +190,14 @@ grub_xputs_real (const char *str) + + void (*grub_xputs) (const char *str) = grub_xputs_real; + +-int ++grub_uint64_t + grub_dl_ref (grub_dl_t mod) + { + (void) mod; + return 0; + } + +-int ++grub_uint64_t + grub_dl_unref (grub_dl_t mod) + { + (void) mod; +-- +2.50.1 + diff --git a/boot/grub2/0030-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch b/boot/grub2/0030-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch new file mode 100644 index 0000000000..9ca04547d4 --- /dev/null +++ b/boot/grub2/0030-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch @@ -0,0 +1,46 @@ +From 91c2e44d3d29d11b339bec954142521148924ed1 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 7 Nov 2024 06:00:36 +0000 +Subject: [PATCH] kern/dl: Check for the SHF_INFO_LINK flag in + grub_dl_relocate_symbols() + +The grub_dl_relocate_symbols() iterates through the sections in +an ELF looking for relocation sections. According to the spec [1] +the SHF_INFO_LINK flag should be set if the sh_info field is meant +to be a section index. + +[1] https://refspecs.linuxbase.org/elf/gabi4+/ch4.sheader.html + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/kern/dl.c + +Conflicts: + grub-core/kern/dl.c + +Upstream: 98ad84328dcabfa603dcf5bd217570aa6b4bdd99 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/dl.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c +index 1a38742e6..958de3bf1 100644 +--- a/grub-core/kern/dl.c ++++ b/grub-core/kern/dl.c +@@ -599,6 +599,9 @@ grub_dl_relocate_symbols (grub_dl_t mod, void *ehdr) + grub_dl_segment_t seg; + grub_err_t err; + ++ if (!(s->sh_flags & SHF_INFO_LINK)) ++ continue; ++ + /* Find the target segment. */ + for (seg = mod->segment; seg; seg = seg->next) + if (seg->section == s->sh_info) +-- +2.50.1 + diff --git a/boot/grub2/0031-commands-extcmd-Missing-check-for-failed-allocation.patch b/boot/grub2/0031-commands-extcmd-Missing-check-for-failed-allocation.patch new file mode 100644 index 0000000000..8a1cdd867d --- /dev/null +++ b/boot/grub2/0031-commands-extcmd-Missing-check-for-failed-allocation.patch @@ -0,0 +1,39 @@ +From 239a16a303228574f61a82c6fbb041688dff65d0 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Fri, 22 Nov 2024 06:27:55 +0000 +Subject: [PATCH] commands/extcmd: Missing check for failed allocation + +The grub_extcmd_dispatcher() calls grub_arg_list_alloc() to allocate +a grub_arg_list struct but it does not verify the allocation was successful. +In case of failed allocation the NULL state pointer can be accessed in +parse_option() through grub_arg_parse() which may lead to a security issue. + +Fixes: CVE-2024-45775 + +Reported-by: Nils Langius +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Alec Brown +Upstream: 05be856a8c3aae41f5df90cab7796ab7ee34b872 +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/extcmd.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c +index 90a5ca24a..c236be13a 100644 +--- a/grub-core/commands/extcmd.c ++++ b/grub-core/commands/extcmd.c +@@ -49,6 +49,9 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args, + } + + state = grub_arg_list_alloc (ext, argc, args); ++ if (state == NULL) ++ return grub_errno; ++ + if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc)) + { + context.state = state; +-- +2.50.1 + diff --git a/boot/grub2/0032-commands-ls-Fix-NULL-dereference.patch b/boot/grub2/0032-commands-ls-Fix-NULL-dereference.patch new file mode 100644 index 0000000000..48b03e74f4 --- /dev/null +++ b/boot/grub2/0032-commands-ls-Fix-NULL-dereference.patch @@ -0,0 +1,37 @@ +From 322d82364cc0db30b1ae4fc0adfdf7a43adc91ef Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Sun, 12 May 2024 11:08:23 +0100 +Subject: [PATCH] commands/ls: Fix NULL dereference + +The grub_strrchr() may return NULL when the dirname do not contain "/". +This can happen on broken filesystems. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 0bf56bce47489c059e50e61a3db7f682d8c44b56 +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/ls.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c +index 6a1c7f5d3..f660946a2 100644 +--- a/grub-core/commands/ls.c ++++ b/grub-core/commands/ls.c +@@ -241,7 +241,11 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human) + + grub_file_close (file); + +- p = grub_strrchr (dirname, '/') + 1; ++ p = grub_strrchr (dirname, '/'); ++ if (p == NULL) ++ goto fail; ++ ++p; ++ + ctx.dirname = grub_strndup (dirname, p - dirname); + if (ctx.dirname == NULL) + goto fail; +-- +2.50.1 + diff --git a/boot/grub2/0033-commands-pgp-Unregister-the-check_signatures-hooks-o.patch b/boot/grub2/0033-commands-pgp-Unregister-the-check_signatures-hooks-o.patch new file mode 100644 index 0000000000..6bfc0dd7c3 --- /dev/null +++ b/boot/grub2/0033-commands-pgp-Unregister-the-check_signatures-hooks-o.patch @@ -0,0 +1,36 @@ +From c05c4d591ef5f21fefd95fc928fe123a12f2bfb0 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Fri, 1 Nov 2024 19:24:29 +0000 +Subject: [PATCH] commands/pgp: Unregister the "check_signatures" hooks on + module unload + +If the hooks are not removed they can be called after the module has +been unloaded leading to an use-after-free. + +Fixes: CVE-2025-0622 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 2123c5bca7e21fbeb0263df4597ddd7054700726 +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/pgp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c +index c6766f044..5fadc33c4 100644 +--- a/grub-core/commands/pgp.c ++++ b/grub-core/commands/pgp.c +@@ -1010,6 +1010,8 @@ GRUB_MOD_INIT(pgp) + + GRUB_MOD_FINI(pgp) + { ++ grub_register_variable_hook ("check_signatures", NULL, NULL); ++ grub_env_unset ("check_signatures"); + grub_verifier_unregister (&grub_pubkey_verifier); + grub_unregister_extcmd (cmd); + grub_unregister_extcmd (cmd_trust); +-- +2.50.1 + diff --git a/boot/grub2/0034-normal-Remove-variables-hooks-on-module-unload.patch b/boot/grub2/0034-normal-Remove-variables-hooks-on-module-unload.patch new file mode 100644 index 0000000000..a2028ad6c0 --- /dev/null +++ b/boot/grub2/0034-normal-Remove-variables-hooks-on-module-unload.patch @@ -0,0 +1,42 @@ +From 6290cc499f0fcaa82b3764cf1d9beb2ff27d82a1 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Fri, 1 Nov 2024 23:46:55 +0000 +Subject: [PATCH] normal: Remove variables hooks on module unload + +The normal module does not entirely cleanup after itself in +its GRUB_MOD_FINI() leaving a few variables hooks in place. +It is not possible to unload normal module now but fix the +issues for completeness. + +On the occasion replace 0s with NULLs for "pager" variable +hooks unregister. + +Fixes: CVE-2025-0622 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 9c16197734ada8d0838407eebe081117799bfe67 +Signed-off-by: Thomas Petazzoni +--- + grub-core/normal/main.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c +index 3b48cd333..5d848c864 100644 +--- a/grub-core/normal/main.c ++++ b/grub-core/normal/main.c +@@ -582,7 +582,9 @@ GRUB_MOD_FINI(normal) + grub_xputs = grub_xputs_saved; + + grub_set_history (0); +- grub_register_variable_hook ("pager", 0, 0); ++ grub_register_variable_hook ("pager", NULL, NULL); ++ grub_register_variable_hook ("color_normal", NULL, NULL); ++ grub_register_variable_hook ("color_highlight", NULL, NULL); + grub_fs_autoload_hook = 0; + grub_unregister_command (cmd_clear); + } +-- +2.50.1 + diff --git a/boot/grub2/0035-gettext-Remove-variables-hooks-on-module-unload.patch b/boot/grub2/0035-gettext-Remove-variables-hooks-on-module-unload.patch new file mode 100644 index 0000000000..caf9764131 --- /dev/null +++ b/boot/grub2/0035-gettext-Remove-variables-hooks-on-module-unload.patch @@ -0,0 +1,39 @@ +From 69e0cb299c479e01e1c13a032172d29293db8e69 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Fri, 1 Nov 2024 23:52:06 +0000 +Subject: [PATCH] gettext: Remove variables hooks on module unload + +The gettext module does not entirely cleanup after itself in +its GRUB_MOD_FINI() leaving a few variables hooks in place. +It is not possible to unload gettext module because normal +module depends on it. Though fix the issues for completeness. + +Fixes: CVE-2025-0622 + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 7580addfc8c94cedb0cdfd7a1fd65b539215e637 +Signed-off-by: Thomas Petazzoni +--- + grub-core/gettext/gettext.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c +index 7a1c14e4f..e4f4f8ee6 100644 +--- a/grub-core/gettext/gettext.c ++++ b/grub-core/gettext/gettext.c +@@ -535,6 +535,10 @@ GRUB_MOD_INIT (gettext) + + GRUB_MOD_FINI (gettext) + { ++ grub_register_variable_hook ("locale_dir", NULL, NULL); ++ grub_register_variable_hook ("secondary_locale_dir", NULL, NULL); ++ grub_register_variable_hook ("lang", NULL, NULL); ++ + grub_gettext_delete_list (&main_context); + grub_gettext_delete_list (&secondary_context); + +-- +2.50.1 + diff --git a/boot/grub2/0036-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch b/boot/grub2/0036-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch new file mode 100644 index 0000000000..84d2fd9bc8 --- /dev/null +++ b/boot/grub2/0036-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch @@ -0,0 +1,40 @@ +From 31b3e24947c6dbb65ea2eca30ddd168dc47513ce Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Fri, 22 Nov 2024 06:27:56 +0000 +Subject: [PATCH] gettext: Integer overflow leads to heap OOB write or read + +Calculation of ctx->grub_gettext_msg_list size in grub_mofile_open() may +overflow leading to subsequent OOB write or read. This patch fixes the +issue by replacing grub_zalloc() and explicit multiplication with +grub_calloc() which does the same thing in safe manner. + +Fixes: CVE-2024-45776 + +Reported-by: Nils Langius +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Alec Brown +Upstream: 09bd6eb58b0f71ec273916070fa1e2de16897a91 +Signed-off-by: Thomas Petazzoni +--- + grub-core/gettext/gettext.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c +index e4f4f8ee6..63bb1ab73 100644 +--- a/grub-core/gettext/gettext.c ++++ b/grub-core/gettext/gettext.c +@@ -323,8 +323,8 @@ grub_mofile_open (struct grub_gettext_context *ctx, + for (ctx->grub_gettext_max_log = 0; ctx->grub_gettext_max >> ctx->grub_gettext_max_log; + ctx->grub_gettext_max_log++); + +- ctx->grub_gettext_msg_list = grub_zalloc (ctx->grub_gettext_max +- * sizeof (ctx->grub_gettext_msg_list[0])); ++ ctx->grub_gettext_msg_list = grub_calloc (ctx->grub_gettext_max, ++ sizeof (ctx->grub_gettext_msg_list[0])); + if (!ctx->grub_gettext_msg_list) + { + grub_file_close (fd); +-- +2.50.1 + diff --git a/boot/grub2/0037-gettext-Integer-overflow-leads-to-heap-OOB-write.patch b/boot/grub2/0037-gettext-Integer-overflow-leads-to-heap-OOB-write.patch new file mode 100644 index 0000000000..bb3cfb1813 --- /dev/null +++ b/boot/grub2/0037-gettext-Integer-overflow-leads-to-heap-OOB-write.patch @@ -0,0 +1,58 @@ +From dfe673e457e9eb5c7c0c68d8385ba176476de7d7 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Fri, 22 Nov 2024 06:27:57 +0000 +Subject: [PATCH] gettext: Integer overflow leads to heap OOB write + +The size calculation of the translation buffer in +grub_gettext_getstr_from_position() may overflow +to 0 leading to heap OOB write. This patch fixes +the issue by using grub_add() and checking for +an overflow. + +Fixes: CVE-2024-45777 + +Reported-by: Nils Langius +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Alec Brown +Upstream: b970a5ed967816bbca8225994cd0ee2557bad515 +Signed-off-by: Thomas Petazzoni +--- + grub-core/gettext/gettext.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c +index 63bb1ab73..9ffc73428 100644 +--- a/grub-core/gettext/gettext.c ++++ b/grub-core/gettext/gettext.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -99,6 +100,7 @@ grub_gettext_getstr_from_position (struct grub_gettext_context *ctx, + char *translation; + struct string_descriptor desc; + grub_err_t err; ++ grub_size_t alloc_sz; + + internal_position = (off + position * sizeof (desc)); + +@@ -109,7 +111,10 @@ grub_gettext_getstr_from_position (struct grub_gettext_context *ctx, + length = grub_cpu_to_le32 (desc.length); + offset = grub_cpu_to_le32 (desc.offset); + +- translation = grub_malloc (length + 1); ++ if (grub_add (length, 1, &alloc_sz)) ++ return NULL; ++ ++ translation = grub_malloc (alloc_sz); + if (!translation) + return NULL; + +-- +2.50.1 + diff --git a/boot/grub2/0038-commands-read-Fix-an-integer-overflow-when-supplying.patch b/boot/grub2/0038-commands-read-Fix-an-integer-overflow-when-supplying.patch new file mode 100644 index 0000000000..c3e1d8b5bf --- /dev/null +++ b/boot/grub2/0038-commands-read-Fix-an-integer-overflow-when-supplying.patch @@ -0,0 +1,74 @@ +From 762eda67c7b0e83011040d5dbcc2ddc9a03b90cd Mon Sep 17 00:00:00 2001 +From: Jonathan Bar Or +Date: Thu, 23 Jan 2025 19:17:05 +0100 +Subject: [PATCH] commands/read: Fix an integer overflow when supplying more + than 2^31 characters + +The grub_getline() function currently has a signed integer variable "i" +that can be overflown when user supplies more than 2^31 characters. +It results in a memory corruption of the allocated line buffer as well +as supplying large negative values to grub_realloc(). + +Fixes: CVE-2025-0690 + +Reported-by: Jonathan Bar Or +Signed-off-by: Jonathan Bar Or +Reviewed-by: Daniel Kiper +Upstream: dad8f502974ed9ad0a70ae6820d17b4b142558fc +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/read.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/grub-core/commands/read.c b/grub-core/commands/read.c +index 597c90706..8d72e45c9 100644 +--- a/grub-core/commands/read.c ++++ b/grub-core/commands/read.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -37,13 +38,14 @@ static const struct grub_arg_option options[] = + static char * + grub_getline (int silent) + { +- int i; ++ grub_size_t i; + char *line; + char *tmp; + int c; ++ grub_size_t alloc_size; + + i = 0; +- line = grub_malloc (1 + i + sizeof('\0')); ++ line = grub_malloc (1 + sizeof('\0')); + if (! line) + return NULL; + +@@ -59,8 +61,17 @@ grub_getline (int silent) + line[i] = (char) c; + if (!silent) + grub_printf ("%c", c); +- i++; +- tmp = grub_realloc (line, 1 + i + sizeof('\0')); ++ if (grub_add (i, 1, &i)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); ++ return NULL; ++ } ++ if (grub_add (i, 1 + sizeof('\0'), &alloc_size)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); ++ return NULL; ++ } ++ tmp = grub_realloc (line, alloc_size); + if (! tmp) + { + grub_free (line); +-- +2.50.1 + diff --git a/boot/grub2/0039-commands-test-Stack-overflow-due-to-unlimited-recurs.patch b/boot/grub2/0039-commands-test-Stack-overflow-due-to-unlimited-recurs.patch new file mode 100644 index 0000000000..73675cc3d9 --- /dev/null +++ b/boot/grub2/0039-commands-test-Stack-overflow-due-to-unlimited-recurs.patch @@ -0,0 +1,88 @@ +From 926fe49003b6b46d595d5900893c8ca79710bbd2 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Mon, 16 Dec 2024 20:22:41 +0000 +Subject: [PATCH] commands/test: Stack overflow due to unlimited recursion + depth + +The test_parse() evaluates test expression recursively. Due to lack of +recursion depth check a specially crafted expression may cause a stack +overflow. The recursion is only triggered by the parentheses usage and +it can be unlimited. However, sensible expressions are unlikely to +contain more than a few parentheses. So, this patch limits the recursion +depth to 100, which should be sufficient. + +Reported-by: Nils Langius +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: c68b7d23628a19da67ebe2e06f84165ee04961af +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/test.c | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/grub-core/commands/test.c b/grub-core/commands/test.c +index 62d3fb398..b585c3d70 100644 +--- a/grub-core/commands/test.c ++++ b/grub-core/commands/test.c +@@ -29,6 +29,9 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + ++/* Set a limit on recursion to avoid stack overflow. */ ++#define MAX_TEST_RECURSION_DEPTH 100 ++ + /* A simple implementation for signed numbers. */ + static int + grub_strtosl (char *arg, const char ** const end, int base) +@@ -150,7 +153,7 @@ get_fileinfo (char *path, struct test_parse_ctx *ctx) + + /* Parse a test expression starting from *argn. */ + static int +-test_parse (char **args, int *argn, int argc) ++test_parse (char **args, int *argn, int argc, int *depth) + { + struct test_parse_ctx ctx = { + .and = 1, +@@ -387,13 +390,24 @@ test_parse (char **args, int *argn, int argc) + if (grub_strcmp (args[*argn], ")") == 0) + { + (*argn)++; ++ if (*depth > 0) ++ (*depth)--; ++ + return ctx.or || ctx.and; + } + /* Recursively invoke if parenthesis. */ + if (grub_strcmp (args[*argn], "(") == 0) + { + (*argn)++; +- update_val (test_parse (args, argn, argc), &ctx); ++ ++ if (++(*depth) > MAX_TEST_RECURSION_DEPTH) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("max recursion depth exceeded")); ++ depth--; ++ return ctx.or || ctx.and; ++ } ++ ++ update_val (test_parse (args, argn, argc, depth), &ctx); + continue; + } + +@@ -428,11 +442,12 @@ grub_cmd_test (grub_command_t cmd __attribute__ ((unused)), + int argc, char **args) + { + int argn = 0; ++ int depth = 0; + + if (argc >= 1 && grub_strcmp (args[argc - 1], "]") == 0) + argc--; + +- return test_parse (args, &argn, argc) ? GRUB_ERR_NONE ++ return test_parse (args, &argn, argc, &depth) ? GRUB_ERR_NONE + : grub_error (GRUB_ERR_TEST_FAILURE, N_("false")); + } + +-- +2.50.1 + diff --git a/boot/grub2/0040-commands-minicmd-Block-the-dump-command-in-lockdown-.patch b/boot/grub2/0040-commands-minicmd-Block-the-dump-command-in-lockdown-.patch new file mode 100644 index 0000000000..23e02cfa1a --- /dev/null +++ b/boot/grub2/0040-commands-minicmd-Block-the-dump-command-in-lockdown-.patch @@ -0,0 +1,38 @@ +From 2864e6ca7ac492d5215c369a6a52a57c6e602f55 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 18 Apr 2024 20:29:39 +0100 +Subject: [PATCH] commands/minicmd: Block the dump command in lockdown mode + +The dump enables a user to read memory which should not be possible +in lockdown mode. + +Fixes: CVE-2025-1118 + +Reported-by: B Horn +Reported-by: Jonathan Bar Or +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 34824806ac6302f91e8cabaa41308eaced25725f +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/minicmd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c +index 286290866..8c5ee3e60 100644 +--- a/grub-core/commands/minicmd.c ++++ b/grub-core/commands/minicmd.c +@@ -203,8 +203,8 @@ GRUB_MOD_INIT(minicmd) + grub_register_command ("help", grub_mini_cmd_help, + 0, N_("Show this message.")); + cmd_dump = +- grub_register_command ("dump", grub_mini_cmd_dump, +- N_("ADDR [SIZE]"), N_("Show memory contents.")); ++ grub_register_command_lockdown ("dump", grub_mini_cmd_dump, ++ N_("ADDR [SIZE]"), N_("Show memory contents.")); + cmd_rmmod = + grub_register_command ("rmmod", grub_mini_cmd_rmmod, + N_("MODULE"), N_("Remove a module.")); +-- +2.50.1 + diff --git a/boot/grub2/0041-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch b/boot/grub2/0041-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch new file mode 100644 index 0000000000..968a42f4f9 --- /dev/null +++ b/boot/grub2/0041-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch @@ -0,0 +1,55 @@ +From 51c3e37bb23b3ce1919f3ff582cb31fc32a10b4b Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Thu, 18 Apr 2024 20:37:10 +0100 +Subject: [PATCH] commands/memrw: Disable memory reading in lockdown mode + +With the rest of module being blocked in lockdown mode it does not make +a lot of sense to leave memory reading enabled. This also goes in par +with disabling the dump command. + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 340e4d058f584534f4b90b7dbea2b64a9f8c418c +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/memrw.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c +index d401a6db0..3542683d1 100644 +--- a/grub-core/commands/memrw.c ++++ b/grub-core/commands/memrw.c +@@ -122,17 +122,20 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv) + GRUB_MOD_INIT(memrw) + { + cmd_read_byte = +- grub_register_extcmd ("read_byte", grub_cmd_read, 0, +- N_("ADDR"), N_("Read 8-bit value from ADDR."), +- options); ++ grub_register_extcmd_lockdown ("read_byte", grub_cmd_read, 0, ++ N_("ADDR"), ++ N_("Read 8-bit value from ADDR."), ++ options); + cmd_read_word = +- grub_register_extcmd ("read_word", grub_cmd_read, 0, +- N_("ADDR"), N_("Read 16-bit value from ADDR."), +- options); ++ grub_register_extcmd_lockdown ("read_word", grub_cmd_read, 0, ++ N_("ADDR"), ++ N_("Read 16-bit value from ADDR."), ++ options); + cmd_read_dword = +- grub_register_extcmd ("read_dword", grub_cmd_read, 0, +- N_("ADDR"), N_("Read 32-bit value from ADDR."), +- options); ++ grub_register_extcmd_lockdown ("read_dword", grub_cmd_read, 0, ++ N_("ADDR"), ++ N_("Read 32-bit value from ADDR."), ++ options); + cmd_write_byte = + grub_register_command_lockdown ("write_byte", grub_cmd_write, + N_("ADDR VALUE [MASK]"), +-- +2.50.1 + diff --git a/boot/grub2/0042-commands-hexdump-Disable-memory-reading-in-lockdown-.patch b/boot/grub2/0042-commands-hexdump-Disable-memory-reading-in-lockdown-.patch new file mode 100644 index 0000000000..fcced2b3b8 --- /dev/null +++ b/boot/grub2/0042-commands-hexdump-Disable-memory-reading-in-lockdown-.patch @@ -0,0 +1,42 @@ +From d5028a608b21c6fa6ff02e4d84a96ab28034d170 Mon Sep 17 00:00:00 2001 +From: B Horn +Date: Fri, 19 Apr 2024 22:31:45 +0100 +Subject: [PATCH] commands/hexdump: Disable memory reading in lockdown mode + +Reported-by: B Horn +Signed-off-by: B Horn +Reviewed-by: Daniel Kiper +Upstream: 5f31164aed51f498957cdd6ed733ec71a8592c99 +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/hexdump.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/grub-core/commands/hexdump.c b/grub-core/commands/hexdump.c +index eaa12465b..d6f61d98a 100644 +--- a/grub-core/commands/hexdump.c ++++ b/grub-core/commands/hexdump.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -51,7 +52,11 @@ grub_cmd_hexdump (grub_extcmd_context_t ctxt, int argc, char **args) + length = (state[1].set) ? grub_strtoul (state[1].arg, 0, 0) : 256; + + if (!grub_strcmp (args[0], "(mem)")) +- hexdump (skip, (char *) (grub_addr_t) skip, length); ++ { ++ if (grub_is_lockdown() == GRUB_LOCKDOWN_ENABLED) ++ return grub_error (GRUB_ERR_ACCESS_DENIED, N_("memory reading is disabled in lockdown mode")); ++ hexdump (skip, (char *) (grub_addr_t) skip, length); ++ } + else if ((args[0][0] == '(') && (args[0][namelen - 1] == ')')) + { + grub_disk_t disk; +-- +2.50.1 + diff --git a/boot/grub2/0043-fs-bfs-Disable-under-lockdown.patch b/boot/grub2/0043-fs-bfs-Disable-under-lockdown.patch new file mode 100644 index 0000000000..58a63985cd --- /dev/null +++ b/boot/grub2/0043-fs-bfs-Disable-under-lockdown.patch @@ -0,0 +1,57 @@ +From 71487b0cf0f7c3fa45f450ed1f3ea4cedd8002a1 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Sat, 23 Mar 2024 15:59:43 +1100 +Subject: [PATCH] fs/bfs: Disable under lockdown + +The BFS is not fuzz-clean. Don't allow it to be loaded under lockdown. +This will also disable the AFS. + +Fixes: CVE-2024-45778 +Fixes: CVE-2024-45779 + +Reported-by: Nils Langius +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 26db6605036bd9e5b16d9068a8cc75be63b8b630 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/bfs.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c +index f37b16895..c92fd7916 100644 +--- a/grub-core/fs/bfs.c ++++ b/grub-core/fs/bfs.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -1106,8 +1107,11 @@ GRUB_MOD_INIT (bfs) + { + COMPILE_TIME_ASSERT (1 << LOG_EXTENT_SIZE == + sizeof (struct grub_bfs_extent)); +- grub_bfs_fs.mod = mod; +- grub_fs_register (&grub_bfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_bfs_fs.mod = mod; ++ grub_fs_register (&grub_bfs_fs); ++ } + } + + #ifdef MODE_AFS +@@ -1116,5 +1120,6 @@ GRUB_MOD_FINI (afs) + GRUB_MOD_FINI (bfs) + #endif + { +- grub_fs_unregister (&grub_bfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_bfs_fs); + } +-- +2.50.1 + diff --git a/boot/grub2/0044-fs-Disable-many-filesystems-under-lockdown.patch b/boot/grub2/0044-fs-Disable-many-filesystems-under-lockdown.patch new file mode 100644 index 0000000000..9120f8c872 --- /dev/null +++ b/boot/grub2/0044-fs-Disable-many-filesystems-under-lockdown.patch @@ -0,0 +1,396 @@ +From f0846530aef66583064a6707430437912dda5fa9 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Sat, 23 Mar 2024 16:20:45 +1100 +Subject: [PATCH] fs: Disable many filesystems under lockdown + +The idea is to permit the following: btrfs, cpio, exfat, ext, f2fs, fat, +hfsplus, iso9660, squash4, tar, xfs and zfs. + +The JFS, ReiserFS, romfs, UDF and UFS security vulnerabilities were +reported by Jonathan Bar Or . + +Fixes: CVE-2025-0677 +Fixes: CVE-2025-0684 +Fixes: CVE-2025-0685 +Fixes: CVE-2025-0686 +Fixes: CVE-2025-0689 + +Suggested-by: Daniel Axtens +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: c4bc55da28543d2522a939ba4ee0acde45f2fa74 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/affs.c | 11 ++++++++--- + grub-core/fs/cbfs.c | 11 ++++++++--- + grub-core/fs/jfs.c | 11 ++++++++--- + grub-core/fs/minix.c | 11 ++++++++--- + grub-core/fs/nilfs2.c | 11 ++++++++--- + grub-core/fs/ntfs.c | 11 ++++++++--- + grub-core/fs/reiserfs.c | 11 ++++++++--- + grub-core/fs/romfs.c | 11 ++++++++--- + grub-core/fs/sfs.c | 11 ++++++++--- + grub-core/fs/udf.c | 11 ++++++++--- + grub-core/fs/ufs.c | 11 ++++++++--- + 11 files changed, 88 insertions(+), 33 deletions(-) + +diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c +index 9b0afb954..520a001c7 100644 +--- a/grub-core/fs/affs.c ++++ b/grub-core/fs/affs.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -703,12 +704,16 @@ static struct grub_fs grub_affs_fs = + + GRUB_MOD_INIT(affs) + { +- grub_affs_fs.mod = mod; +- grub_fs_register (&grub_affs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_affs_fs.mod = mod; ++ grub_fs_register (&grub_affs_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI(affs) + { +- grub_fs_unregister (&grub_affs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_affs_fs); + } +diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c +index 2332745fe..b62c8777c 100644 +--- a/grub-core/fs/cbfs.c ++++ b/grub-core/fs/cbfs.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -390,13 +391,17 @@ GRUB_MOD_INIT (cbfs) + #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN) + init_cbfsdisk (); + #endif +- grub_cbfs_fs.mod = mod; +- grub_fs_register (&grub_cbfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_cbfs_fs.mod = mod; ++ grub_fs_register (&grub_cbfs_fs); ++ } + } + + GRUB_MOD_FINI (cbfs) + { +- grub_fs_unregister (&grub_cbfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_cbfs_fs); + #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN) + fini_cbfsdisk (); + #endif +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index b0283ac00..ab175c7f1 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -1005,12 +1006,16 @@ static struct grub_fs grub_jfs_fs = + + GRUB_MOD_INIT(jfs) + { +- grub_jfs_fs.mod = mod; +- grub_fs_register (&grub_jfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_jfs_fs.mod = mod; ++ grub_fs_register (&grub_jfs_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI(jfs) + { +- grub_fs_unregister (&grub_jfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_jfs_fs); + } +diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c +index b7679c3e2..4440fcca8 100644 +--- a/grub-core/fs/minix.c ++++ b/grub-core/fs/minix.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -734,8 +735,11 @@ GRUB_MOD_INIT(minix) + #endif + #endif + { +- grub_minix_fs.mod = mod; +- grub_fs_register (&grub_minix_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_minix_fs.mod = mod; ++ grub_fs_register (&grub_minix_fs); ++ } + my_mod = mod; + } + +@@ -757,5 +761,6 @@ GRUB_MOD_FINI(minix) + #endif + #endif + { +- grub_fs_unregister (&grub_minix_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_minix_fs); + } +diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c +index 4e1e71738..26e6077ff 100644 +--- a/grub-core/fs/nilfs2.c ++++ b/grub-core/fs/nilfs2.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -1231,12 +1232,16 @@ GRUB_MOD_INIT (nilfs2) + grub_nilfs2_dat_entry)); + COMPILE_TIME_ASSERT (1 << LOG_INODE_SIZE + == sizeof (struct grub_nilfs2_inode)); +- grub_nilfs2_fs.mod = mod; +- grub_fs_register (&grub_nilfs2_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_nilfs2_fs.mod = mod; ++ grub_fs_register (&grub_nilfs2_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI (nilfs2) + { +- grub_fs_unregister (&grub_nilfs2_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_nilfs2_fs); + } +diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c +index 560917dc2..bce81947c 100644 +--- a/grub-core/fs/ntfs.c ++++ b/grub-core/fs/ntfs.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -1320,12 +1321,16 @@ static struct grub_fs grub_ntfs_fs = + + GRUB_MOD_INIT (ntfs) + { +- grub_ntfs_fs.mod = mod; +- grub_fs_register (&grub_ntfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_ntfs_fs.mod = mod; ++ grub_fs_register (&grub_ntfs_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI (ntfs) + { +- grub_fs_unregister (&grub_ntfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_ntfs_fs); + } +diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c +index c3850e013..5d3c85950 100644 +--- a/grub-core/fs/reiserfs.c ++++ b/grub-core/fs/reiserfs.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -1417,12 +1418,16 @@ static struct grub_fs grub_reiserfs_fs = + + GRUB_MOD_INIT(reiserfs) + { +- grub_reiserfs_fs.mod = mod; +- grub_fs_register (&grub_reiserfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_reiserfs_fs.mod = mod; ++ grub_fs_register (&grub_reiserfs_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI(reiserfs) + { +- grub_fs_unregister (&grub_reiserfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_reiserfs_fs); + } +diff --git a/grub-core/fs/romfs.c b/grub-core/fs/romfs.c +index 56b0b2b2f..eafab03b2 100644 +--- a/grub-core/fs/romfs.c ++++ b/grub-core/fs/romfs.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -475,11 +476,15 @@ static struct grub_fs grub_romfs_fs = + + GRUB_MOD_INIT(romfs) + { +- grub_romfs_fs.mod = mod; +- grub_fs_register (&grub_romfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_romfs_fs.mod = mod; ++ grub_fs_register (&grub_romfs_fs); ++ } + } + + GRUB_MOD_FINI(romfs) + { +- grub_fs_unregister (&grub_romfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_romfs_fs); + } +diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c +index f0d7cac43..88705b3a2 100644 +--- a/grub-core/fs/sfs.c ++++ b/grub-core/fs/sfs.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + GRUB_MOD_LICENSE ("GPLv3+"); +@@ -779,12 +780,16 @@ static struct grub_fs grub_sfs_fs = + + GRUB_MOD_INIT(sfs) + { +- grub_sfs_fs.mod = mod; +- grub_fs_register (&grub_sfs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_sfs_fs.mod = mod; ++ grub_fs_register (&grub_sfs_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI(sfs) + { +- grub_fs_unregister (&grub_sfs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_sfs_fs); + } +diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c +index 8765c633c..3d5ee5af5 100644 +--- a/grub-core/fs/udf.c ++++ b/grub-core/fs/udf.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -1455,12 +1456,16 @@ static struct grub_fs grub_udf_fs = { + + GRUB_MOD_INIT (udf) + { +- grub_udf_fs.mod = mod; +- grub_fs_register (&grub_udf_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_udf_fs.mod = mod; ++ grub_fs_register (&grub_udf_fs); ++ } + my_mod = mod; + } + + GRUB_MOD_FINI (udf) + { +- grub_fs_unregister (&grub_udf_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_udf_fs); + } +diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c +index e82d9356d..8b5adbd48 100644 +--- a/grub-core/fs/ufs.c ++++ b/grub-core/fs/ufs.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -899,8 +900,11 @@ GRUB_MOD_INIT(ufs1) + #endif + #endif + { +- grub_ufs_fs.mod = mod; +- grub_fs_register (&grub_ufs_fs); ++ if (!grub_is_lockdown ()) ++ { ++ grub_ufs_fs.mod = mod; ++ grub_fs_register (&grub_ufs_fs); ++ } + my_mod = mod; + } + +@@ -914,6 +918,7 @@ GRUB_MOD_FINI(ufs1) + #endif + #endif + { +- grub_fs_unregister (&grub_ufs_fs); ++ if (!grub_is_lockdown ()) ++ grub_fs_unregister (&grub_ufs_fs); + } + +-- +2.50.1 + diff --git a/boot/grub2/0045-disk-Use-safe-math-macros-to-prevent-overflows.patch b/boot/grub2/0045-disk-Use-safe-math-macros-to-prevent-overflows.patch new file mode 100644 index 0000000000..3ddd168ad5 --- /dev/null +++ b/boot/grub2/0045-disk-Use-safe-math-macros-to-prevent-overflows.patch @@ -0,0 +1,551 @@ +From b6bdea00ea1a3d6b0b7551133279cbc7ff23bdf6 Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Wed, 22 Jan 2025 02:55:09 +0000 +Subject: [PATCH] disk: Use safe math macros to prevent overflows + +Replace direct arithmetic operations with macros from include/grub/safemath.h +to prevent potential overflow issues when calculating the memory sizes. + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/disk/cryptodisk.c + +Upstream: c407724dad6c3e2fc1571e57adbda71cc03f82aa +Signed-off-by: Thomas Petazzoni +--- + grub-core/disk/cryptodisk.c | 36 ++++++++++++++----- + grub-core/disk/diskfilter.c | 9 +++-- + grub-core/disk/ieee1275/obdisk.c | 43 +++++++++++++++++++---- + grub-core/disk/ieee1275/ofdisk.c | 59 +++++++++++++++++++++++++++----- + grub-core/disk/ldm.c | 36 ++++++++++++++++--- + grub-core/disk/luks2.c | 7 +++- + grub-core/disk/memdisk.c | 7 +++- + grub-core/disk/plainmount.c | 9 +++-- + 8 files changed, 172 insertions(+), 34 deletions(-) + +diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c +index 2246af51b..6f7445665 100644 +--- a/grub-core/disk/cryptodisk.c ++++ b/grub-core/disk/cryptodisk.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #ifdef GRUB_UTIL + #include +@@ -1473,7 +1474,7 @@ static char * + luks_script_get (grub_size_t *sz) + { + grub_cryptodisk_t i; +- grub_size_t size = 0; ++ grub_size_t size = 0, mul; + char *ptr, *ret; + + *sz = 0; +@@ -1482,10 +1483,6 @@ luks_script_get (grub_size_t *sz) + if (grub_strcmp (i->modname, "luks") == 0 || + grub_strcmp (i->modname, "luks2") == 0) + { +- size += grub_strlen (i->modname); +- size += sizeof ("_mount"); +- size += grub_strlen (i->uuid); +- size += grub_strlen (i->cipher->cipher->name); + /* + * Add space in the line for (in order) spaces, cipher mode, cipher IV + * mode, sector offset, sector size and the trailing newline. This is +@@ -1493,14 +1490,35 @@ luks_script_get (grub_size_t *sz) + * in an earlier version of this code that are unaccounted for. It is + * left in the calculations in case it is needed. At worst, its short- + * lived wasted space. ++ * ++ * 60 = 5 + 5 + 8 + 20 + 6 + 1 + 15 + */ +- size += 5 + 5 + 8 + 20 + 6 + 1 + 15; ++ if (grub_add (size, grub_strlen (i->modname), &size) || ++ grub_add (size, sizeof ("_mount") + 60, &size) || ++ grub_add (size, grub_strlen (i->uuid), &size) || ++ grub_add (size, grub_strlen (i->cipher->cipher->name), &size) || ++ grub_mul (i->keysize, 2, &mul) || ++ grub_add (size, mul, &size)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining size of luks script"); ++ return 0; ++ } + if (i->essiv_hash) +- size += grub_strlen (i->essiv_hash->name); +- size += i->keysize * 2; ++ { ++ if (grub_add (size, grub_strlen (i->essiv_hash->name), &size)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining size of luks script"); ++ return 0; ++ } ++ } + } ++ if (grub_add (size, 1, &size)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining size of luks script"); ++ return 0; ++ } + +- ret = grub_malloc (size + 1); ++ ret = grub_malloc (size); + if (!ret) + return 0; + +diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c +index 21e239511..de5a564d4 100644 +--- a/grub-core/disk/diskfilter.c ++++ b/grub-core/disk/diskfilter.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #ifdef GRUB_UTIL + #include + #include +@@ -1039,7 +1040,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb, + { + struct grub_diskfilter_vg *array; + int i; +- grub_size_t j; ++ grub_size_t j, sz; + grub_uint64_t totsize; + struct grub_diskfilter_pv *pv; + grub_err_t err; +@@ -1140,7 +1141,11 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb, + } + array->lvs->vg = array; + +- array->lvs->idname = grub_malloc (sizeof ("mduuid/") + 2 * uuidlen); ++ if (grub_mul (uuidlen, 2, &sz) || ++ grub_add (sz, sizeof ("mduuid/"), &sz)) ++ goto fail; ++ ++ array->lvs->idname = grub_malloc (sz); + if (!array->lvs->idname) + goto fail; + +diff --git a/grub-core/disk/ieee1275/obdisk.c b/grub-core/disk/ieee1275/obdisk.c +index cd923b90f..9d4c42665 100644 +--- a/grub-core/disk/ieee1275/obdisk.c ++++ b/grub-core/disk/ieee1275/obdisk.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -128,9 +129,17 @@ count_commas (const char *src) + static char * + decode_grub_devname (const char *name) + { +- char *devpath = grub_malloc (grub_strlen (name) + 1); ++ char *devpath; + char *p, c; ++ grub_size_t sz; + ++ if (grub_add (grub_strlen (name), 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of device name")); ++ return NULL; ++ } ++ ++ devpath = grub_malloc (sz); + if (devpath == NULL) + return NULL; + +@@ -156,12 +165,20 @@ static char * + encode_grub_devname (const char *path) + { + char *encoding, *optr; ++ grub_size_t sz; + + if (path == NULL) + return NULL; + +- encoding = grub_malloc (sizeof (IEEE1275_DEV) + count_commas (path) + +- grub_strlen (path) + 1); ++ if (grub_add (sizeof (IEEE1275_DEV) + 1, count_commas (path), &sz) || ++ grub_add (sz, grub_strlen (path), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining encoding size")); ++ grub_print_error (); ++ return NULL; ++ } ++ ++ encoding = grub_malloc (sz); + + if (encoding == NULL) + { +@@ -396,6 +413,14 @@ canonicalise_disk (const char *devname) + + real_unit_str_len = grub_strlen (op->name) + sizeof (IEEE1275_DISK_ALIAS) + + grub_strlen (real_unit_address); ++ if (grub_add (grub_strlen (op->name), sizeof (IEEE1275_DISK_ALIAS), &real_unit_str_len) || ++ grub_add (real_unit_str_len, grub_strlen (real_unit_address), &real_unit_str_len)) ++ { ++ grub_free (parent); ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of canonical name")); ++ grub_print_error (); ++ return NULL; ++ } + + real_canon = grub_malloc (real_unit_str_len); + +@@ -413,6 +438,7 @@ canonicalise_disk (const char *devname) + static struct disk_dev * + add_canon_disk (const char *cname) + { ++ grub_size_t sz; + struct disk_dev *dev; + + dev = grub_zalloc (sizeof (struct disk_dev)); +@@ -428,13 +454,18 @@ add_canon_disk (const char *cname) + * arguments and allows a client program to open + * the entire (raw) disk. Any disk label is ignored. + */ +- dev->raw_name = grub_malloc (grub_strlen (cname) + sizeof (":nolabel")); ++ if (grub_add (grub_strlen (cname), sizeof (":nolabel"), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while appending :nolabel to end of canonical name"); ++ goto failed; ++ } ++ ++ dev->raw_name = grub_malloc (sz); + + if (dev->raw_name == NULL) + goto failed; + +- grub_snprintf (dev->raw_name, grub_strlen (cname) + sizeof (":nolabel"), +- "%s:nolabel", cname); ++ grub_snprintf (dev->raw_name, sz, "%s:nolabel", cname); + } + + /* +diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c +index c6cba0c8a..4c5b89cbc 100644 +--- a/grub-core/disk/ieee1275/ofdisk.c ++++ b/grub-core/disk/ieee1275/ofdisk.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + static char *last_devpath; + static grub_ieee1275_ihandle_t last_ihandle; +@@ -80,6 +81,7 @@ ofdisk_hash_add_real (char *devpath) + struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)]; + const char *iptr; + char *optr; ++ grub_size_t sz; + + p = grub_zalloc (sizeof (*p)); + if (!p) +@@ -87,8 +89,14 @@ ofdisk_hash_add_real (char *devpath) + + p->devpath = devpath; + +- p->grub_devpath = grub_malloc (sizeof ("ieee1275/") +- + 2 * grub_strlen (p->devpath)); ++ if (grub_mul (grub_strlen (p->devpath), 2, &sz) || ++ grub_add (sz, sizeof ("ieee1275/"), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of device path")); ++ return NULL; ++ } ++ ++ p->grub_devpath = grub_malloc (sz); + + if (!p->grub_devpath) + { +@@ -98,7 +106,13 @@ ofdisk_hash_add_real (char *devpath) + + if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0)) + { +- p->open_path = grub_malloc (grub_strlen (p->devpath) + 3); ++ if (grub_add (grub_strlen (p->devpath), 3, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of an open path")); ++ return NULL; ++ } ++ ++ p->open_path = grub_malloc (sz); + if (!p->open_path) + { + grub_free (p->grub_devpath); +@@ -224,6 +238,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) + args; + char *buf, *bufptr; + unsigned i; ++ grub_size_t sz; + + if (grub_ieee1275_open (alias->path, &ihandle)) + return; +@@ -243,7 +258,14 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) + return; + } + +- buf = grub_malloc (grub_strlen (alias->path) + 32); ++ if (grub_add (grub_strlen (alias->path), 32, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while creating buffer for vscsi"); ++ grub_ieee1275_close (ihandle); ++ return; ++ } ++ ++ buf = grub_malloc (sz); + if (!buf) + return; + bufptr = grub_stpcpy (buf, alias->path); +@@ -287,9 +309,15 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) + grub_uint64_t *table; + grub_uint16_t table_size; + grub_ieee1275_ihandle_t ihandle; ++ grub_size_t sz; + +- buf = grub_malloc (grub_strlen (alias->path) + +- sizeof ("/disk@7766554433221100")); ++ if (grub_add (grub_strlen (alias->path), sizeof ("/disk@7766554433221100"), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while creating buffer for sas_ioa"); ++ return; ++ } ++ ++ buf = grub_malloc (sz); + if (!buf) + return; + bufptr = grub_stpcpy (buf, alias->path); +@@ -427,9 +455,17 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data, + static char * + compute_dev_path (const char *name) + { +- char *devpath = grub_malloc (grub_strlen (name) + 3); ++ char *devpath; + char *p, c; ++ grub_size_t sz; + ++ if (grub_add (grub_strlen (name), 3, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining size of device path")); ++ return NULL; ++ } ++ ++ devpath = grub_malloc (sz); + if (!devpath) + return NULL; + +@@ -625,6 +661,7 @@ insert_bootpath (void) + char *bootpath; + grub_ssize_t bootpath_size; + char *type; ++ grub_size_t sz; + + if (grub_ieee1275_get_property_length (grub_ieee1275_chosen, "bootpath", + &bootpath_size) +@@ -635,7 +672,13 @@ insert_bootpath (void) + return; + } + +- bootpath = (char *) grub_malloc ((grub_size_t) bootpath_size + 64); ++ if (grub_add (bootpath_size, 64, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining bootpath size")); ++ return; ++ } ++ ++ bootpath = (char *) grub_malloc (sz); + if (! bootpath) + { + grub_print_error (); +diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c +index 34bfe6bd1..4101b15d8 100644 +--- a/grub-core/disk/ldm.c ++++ b/grub-core/disk/ldm.c +@@ -220,6 +220,7 @@ make_vg (grub_disk_t disk, + struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE + / sizeof (struct grub_ldm_vblk)]; + unsigned i; ++ grub_size_t sz; + err = grub_disk_read (disk, cursec, 0, + sizeof(vblk), &vblk); + if (err) +@@ -251,7 +252,13 @@ make_vg (grub_disk_t disk, + grub_free (pv); + goto fail2; + } +- pv->internal_id = grub_malloc (ptr[0] + 2); ++ if (grub_add (ptr[0], 2, &sz)) ++ { ++ grub_free (pv); ++ goto fail2; ++ } ++ ++ pv->internal_id = grub_malloc (sz); + if (!pv->internal_id) + { + grub_free (pv); +@@ -276,7 +283,15 @@ make_vg (grub_disk_t disk, + goto fail2; + } + pv->id.uuidlen = *ptr; +- pv->id.uuid = grub_malloc (pv->id.uuidlen + 1); ++ ++ if (grub_add (pv->id.uuidlen, 1, &sz)) ++ { ++ grub_free (pv->internal_id); ++ grub_free (pv); ++ goto fail2; ++ } ++ ++ pv->id.uuid = grub_malloc (sz); + grub_memcpy (pv->id.uuid, ptr + 1, pv->id.uuidlen); + pv->id.uuid[pv->id.uuidlen] = 0; + +@@ -343,7 +358,13 @@ make_vg (grub_disk_t disk, + grub_free (lv); + goto fail2; + } +- lv->internal_id = grub_malloc ((grub_size_t) ptr[0] + 2); ++ if (grub_add (ptr[0], 2, &sz)) ++ { ++ grub_free (lv->segments); ++ grub_free (lv); ++ goto fail2; ++ } ++ lv->internal_id = grub_malloc (sz); + if (!lv->internal_id) + { + grub_free (lv); +@@ -455,6 +476,7 @@ make_vg (grub_disk_t disk, + struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE + / sizeof (struct grub_ldm_vblk)]; + unsigned i; ++ grub_size_t sz; + err = grub_disk_read (disk, cursec, 0, + sizeof(vblk), &vblk); + if (err) +@@ -490,7 +512,12 @@ make_vg (grub_disk_t disk, + grub_free (comp); + goto fail2; + } +- comp->internal_id = grub_malloc ((grub_size_t) ptr[0] + 2); ++ if (grub_add (ptr[0], 2, &sz)) ++ { ++ grub_free (comp); ++ goto fail2; ++ } ++ comp->internal_id = grub_malloc (sz); + if (!comp->internal_id) + { + grub_free (comp); +@@ -640,7 +667,6 @@ make_vg (grub_disk_t disk, + if (lv->segments->node_alloc == lv->segments->node_count) + { + void *t; +- grub_size_t sz; + + if (grub_mul (lv->segments->node_alloc, 2, &lv->segments->node_alloc) || + grub_mul (lv->segments->node_alloc, sizeof (*lv->segments->nodes), &sz)) +diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c +index d5106402f..8036d76ff 100644 +--- a/grub-core/disk/luks2.c ++++ b/grub-core/disk/luks2.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -569,6 +570,7 @@ luks2_recover_key (grub_disk_t source, + gcry_err_code_t gcry_ret; + grub_json_t *json = NULL, keyslots; + grub_err_t ret; ++ grub_size_t sz; + + if (cargs->key_data == NULL || cargs->key_len == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "no key data"); +@@ -577,7 +579,10 @@ luks2_recover_key (grub_disk_t source, + if (ret) + return ret; + +- json_header = grub_zalloc (grub_be_to_cpu64 (header.hdr_size) - sizeof (header)); ++ if (grub_sub (grub_be_to_cpu64 (header.hdr_size), sizeof (header), &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while calculating json header size"); ++ ++ json_header = grub_zalloc (sz); + if (!json_header) + return GRUB_ERR_OUT_OF_MEMORY; + +diff --git a/grub-core/disk/memdisk.c b/grub-core/disk/memdisk.c +index 613779cf3..36de3bfab 100644 +--- a/grub-core/disk/memdisk.c ++++ b/grub-core/disk/memdisk.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -96,7 +97,11 @@ GRUB_MOD_INIT(memdisk) + + grub_dprintf ("memdisk", "Found memdisk image at %p\n", memdisk_orig_addr); + +- memdisk_size = header->size - sizeof (struct grub_module_header); ++ if (grub_sub (header->size, sizeof (struct grub_module_header), &memdisk_size)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while obtaining memdisk size"); ++ return; ++ } + memdisk_addr = grub_malloc (memdisk_size); + + grub_dprintf ("memdisk", "Copying memdisk image to dynamic memory\n"); +diff --git a/grub-core/disk/plainmount.c b/grub-core/disk/plainmount.c +index 47e64805f..21ec4072c 100644 +--- a/grub-core/disk/plainmount.c ++++ b/grub-core/disk/plainmount.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -126,7 +127,7 @@ plainmount_configure_password (grub_cryptodisk_t dev, const char *hash, + grub_uint8_t *derived_hash, *dh; + char *p; + unsigned int round, i, len, size; +- grub_size_t alloc_size; ++ grub_size_t alloc_size, sz; + grub_err_t err = GRUB_ERR_NONE; + + /* Support none (plain) hash */ +@@ -145,7 +146,11 @@ plainmount_configure_password (grub_cryptodisk_t dev, const char *hash, + * Allocate buffer for the password and for an added prefix character + * for each hash round ('alloc_size' may not be a multiple of 'len'). + */ +- p = grub_zalloc (alloc_size + (alloc_size / len) + 1); ++ if (grub_add (alloc_size, (alloc_size / len), &sz) || ++ grub_add (sz, 1, &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while allocating size of password buffer")); ++ ++ p = grub_zalloc (sz); + derived_hash = grub_zalloc (GRUB_CRYPTODISK_MAX_KEYLEN * 2); + if (p == NULL || derived_hash == NULL) + { +-- +2.50.1 + diff --git a/boot/grub2/0046-disk-Prevent-overflows-when-allocating-memory-for-ar.patch b/boot/grub2/0046-disk-Prevent-overflows-when-allocating-memory-for-ar.patch new file mode 100644 index 0000000000..1c1cb0ee3a --- /dev/null +++ b/boot/grub2/0046-disk-Prevent-overflows-when-allocating-memory-for-ar.patch @@ -0,0 +1,47 @@ +From d9f900247eb886176aace7888be941348a9c8fc8 Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Wed, 22 Jan 2025 02:55:10 +0000 +Subject: [PATCH] disk: Prevent overflows when allocating memory for arrays + +Use grub_calloc() when allocating memory for arrays to ensure proper +overflow checks are in place. + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/disk/cryptodisk.c + +Upstream: d8151f98331ee4d15fcca59edffa59246d8fc15f +Signed-off-by: Thomas Petazzoni +--- + grub-core/disk/lvm.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c +index 794248540..a395b200d 100644 +--- a/grub-core/disk/lvm.c ++++ b/grub-core/disk/lvm.c +@@ -671,8 +671,7 @@ grub_lvm_detect (grub_disk_t disk, + goto lvs_segment_fail; + } + +- seg->nodes = grub_zalloc (sizeof (seg->nodes[0]) +- * seg->node_count); ++ seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0])); + + p = grub_strstr (p, "mirrors = ["); + if (p == NULL) +@@ -760,8 +759,7 @@ grub_lvm_detect (grub_disk_t disk, + } + } + +- seg->nodes = grub_zalloc (sizeof (seg->nodes[0]) +- * seg->node_count); ++ seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0])); + + p = grub_strstr (p, "raids = ["); + if (p == NULL) +-- +2.50.1 + diff --git a/boot/grub2/0047-disk-Check-if-returned-pointer-for-allocated-memory-.patch b/boot/grub2/0047-disk-Check-if-returned-pointer-for-allocated-memory-.patch new file mode 100644 index 0000000000..f00d37d977 --- /dev/null +++ b/boot/grub2/0047-disk-Check-if-returned-pointer-for-allocated-memory-.patch @@ -0,0 +1,157 @@ +From 04621aac0412b99323fda050074d4e77c00bc8e8 Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Wed, 22 Jan 2025 02:55:11 +0000 +Subject: [PATCH] disk: Check if returned pointer for allocated memory is NULL + +When using grub_malloc(), grub_zalloc() or grub_calloc(), these functions can +fail if we are out of memory. After allocating memory we should check if these +functions returned NULL and handle this error if they did. + +On the occasion make a NULL check in ATA code more obvious. + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: 33bd6b5ac5c77b346769ab5284262f94e695e464 +Signed-off-by: Thomas Petazzoni +--- + grub-core/disk/ata.c | 4 ++-- + grub-core/disk/ieee1275/obdisk.c | 6 ++++++ + grub-core/disk/ldm.c | 6 ++++++ + grub-core/disk/lvm.c | 14 ++++++++++++++ + grub-core/disk/memdisk.c | 2 ++ + 5 files changed, 30 insertions(+), 2 deletions(-) + +diff --git a/grub-core/disk/ata.c b/grub-core/disk/ata.c +index 7b6ac7bfc..a2433e29e 100644 +--- a/grub-core/disk/ata.c ++++ b/grub-core/disk/ata.c +@@ -112,10 +112,10 @@ grub_ata_identify (struct grub_ata *dev) + return grub_atapi_identify (dev); + + info64 = grub_malloc (GRUB_DISK_SECTOR_SIZE); ++ if (info64 == NULL) ++ return grub_errno; + info32 = (grub_uint32_t *) info64; + info16 = (grub_uint16_t *) info64; +- if (! info16) +- return grub_errno; + + grub_memset (&parms, 0, sizeof (parms)); + parms.buffer = info16; +diff --git a/grub-core/disk/ieee1275/obdisk.c b/grub-core/disk/ieee1275/obdisk.c +index 9d4c42665..fcc39e0a2 100644 +--- a/grub-core/disk/ieee1275/obdisk.c ++++ b/grub-core/disk/ieee1275/obdisk.c +@@ -423,6 +423,12 @@ canonicalise_disk (const char *devname) + } + + real_canon = grub_malloc (real_unit_str_len); ++ if (real_canon == NULL) ++ { ++ grub_free (parent); ++ grub_print_error (); ++ return NULL; ++ } + + grub_snprintf (real_canon, real_unit_str_len, "%s/disk@%s", + op->name, real_unit_address); +diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c +index 4101b15d8..048e29cd0 100644 +--- a/grub-core/disk/ldm.c ++++ b/grub-core/disk/ldm.c +@@ -292,6 +292,12 @@ make_vg (grub_disk_t disk, + } + + pv->id.uuid = grub_malloc (sz); ++ if (pv->id.uuid == NULL) ++ { ++ grub_free (pv->internal_id); ++ grub_free (pv); ++ goto fail2; ++ } + grub_memcpy (pv->id.uuid, ptr + 1, pv->id.uuidlen); + pv->id.uuid[pv->id.uuidlen] = 0; + +diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c +index a395b200d..b2dff76d1 100644 +--- a/grub-core/disk/lvm.c ++++ b/grub-core/disk/lvm.c +@@ -370,6 +370,8 @@ grub_lvm_detect (grub_disk_t disk, + break; + + pv = grub_zalloc (sizeof (*pv)); ++ if (pv == NULL) ++ goto fail4; + q = p; + while (*q != ' ' && q < mda_end) + q++; +@@ -379,6 +381,8 @@ grub_lvm_detect (grub_disk_t disk, + + s = q - p; + pv->name = grub_malloc (s + 1); ++ if (pv->name == NULL) ++ goto pvs_fail_noname; + grub_memcpy (pv->name, p, s); + pv->name[s] = '\0'; + +@@ -451,6 +455,8 @@ grub_lvm_detect (grub_disk_t disk, + break; + + lv = grub_zalloc (sizeof (*lv)); ++ if (lv == NULL) ++ goto fail4; + + q = p; + while (*q != ' ' && q < mda_end) +@@ -545,6 +551,8 @@ grub_lvm_detect (grub_disk_t disk, + goto lvs_fail; + } + lv->segments = grub_calloc (lv->segment_count, sizeof (*seg)); ++ if (lv->segments == NULL) ++ goto lvs_fail; + seg = lv->segments; + + for (i = 0; i < lv->segment_count; i++) +@@ -612,6 +620,8 @@ grub_lvm_detect (grub_disk_t disk, + + seg->nodes = grub_calloc (seg->node_count, + sizeof (*stripe)); ++ if (seg->nodes == NULL) ++ goto lvs_segment_fail; + stripe = seg->nodes; + + p = grub_strstr (p, "stripes = ["); +@@ -672,6 +682,8 @@ grub_lvm_detect (grub_disk_t disk, + } + + seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0])); ++ if (seg->nodes == NULL) ++ goto lvs_segment_fail; + + p = grub_strstr (p, "mirrors = ["); + if (p == NULL) +@@ -760,6 +772,8 @@ grub_lvm_detect (grub_disk_t disk, + } + + seg->nodes = grub_calloc (seg->node_count, sizeof (seg->nodes[0])); ++ if (seg->nodes == NULL) ++ goto lvs_segment_fail; + + p = grub_strstr (p, "raids = ["); + if (p == NULL) +diff --git a/grub-core/disk/memdisk.c b/grub-core/disk/memdisk.c +index 36de3bfab..2d7afaea3 100644 +--- a/grub-core/disk/memdisk.c ++++ b/grub-core/disk/memdisk.c +@@ -103,6 +103,8 @@ GRUB_MOD_INIT(memdisk) + return; + } + memdisk_addr = grub_malloc (memdisk_size); ++ if (memdisk_addr == NULL) ++ return; + + grub_dprintf ("memdisk", "Copying memdisk image to dynamic memory\n"); + grub_memmove (memdisk_addr, memdisk_orig_addr, memdisk_size); +-- +2.50.1 + diff --git a/boot/grub2/0048-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch b/boot/grub2/0048-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch new file mode 100644 index 0000000000..fd0ddda674 --- /dev/null +++ b/boot/grub2/0048-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch @@ -0,0 +1,36 @@ +From 2dcfad49316cc757138a8c69f6b44ee1a240aa3d Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Wed, 22 Jan 2025 02:55:12 +0000 +Subject: [PATCH] disk/ieee1275/ofdisk: Call grub_ieee1275_close() when + grub_malloc() fails + +In the dev_iterate() function a handle is opened but isn't closed when +grub_malloc() returns NULL. We should fix this by closing it on error. + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: fbaddcca541805c333f0fc792b82772594e73753 +Signed-off-by: Thomas Petazzoni +--- + grub-core/disk/ieee1275/ofdisk.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c +index 4c5b89cbc..dbc0f1aba 100644 +--- a/grub-core/disk/ieee1275/ofdisk.c ++++ b/grub-core/disk/ieee1275/ofdisk.c +@@ -267,7 +267,10 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) + + buf = grub_malloc (sz); + if (!buf) +- return; ++ { ++ grub_ieee1275_close (ihandle); ++ return; ++ } + bufptr = grub_stpcpy (buf, alias->path); + + for (i = 0; i < args.nentries; i++) +-- +2.50.1 + diff --git a/boot/grub2/0049-fs-Use-safe-math-macros-to-prevent-overflows.patch b/boot/grub2/0049-fs-Use-safe-math-macros-to-prevent-overflows.patch new file mode 100644 index 0000000000..4ad7463a13 --- /dev/null +++ b/boot/grub2/0049-fs-Use-safe-math-macros-to-prevent-overflows.patch @@ -0,0 +1,362 @@ +From 005280a4b3ba41ab0b4fea5e1d2a874646e6e12d Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Tue, 21 Jan 2025 19:02:36 +0000 +Subject: [PATCH] fs: Use safe math macros to prevent overflows + +Replace direct arithmetic operations with macros from include/grub/safemath.h +to prevent potential overflow issues when calculating the memory sizes. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/fs/erofs.c + +Upstream: 6608163b08a7a8be4b0ab2a5cd4593bba07fe2b7 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/archelp.c | 9 ++++++++- + grub-core/fs/btrfs.c | 34 ++++++++++++++++++++++++++++------ + grub-core/fs/cpio_common.c | 16 ++++++++++++++-- + grub-core/fs/f2fs.c | 17 +++++++++++++++-- + grub-core/fs/ntfscomp.c | 9 ++++++++- + grub-core/fs/squash4.c | 12 +++++++++--- + grub-core/fs/xfs.c | 17 +++++++++++++++-- + 7 files changed, 97 insertions(+), 17 deletions(-) + +diff --git a/grub-core/fs/archelp.c b/grub-core/fs/archelp.c +index c1dcc6285..0816b28de 100644 +--- a/grub-core/fs/archelp.c ++++ b/grub-core/fs/archelp.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -68,6 +69,7 @@ handle_symlink (struct grub_archelp_data *data, + char *rest; + char *linktarget; + grub_size_t linktarget_len; ++ grub_size_t sz; + + *restart = 0; + +@@ -98,7 +100,12 @@ handle_symlink (struct grub_archelp_data *data, + if (linktarget[0] == '\0') + return GRUB_ERR_NONE; + linktarget_len = grub_strlen (linktarget); +- target = grub_malloc (linktarget_len + grub_strlen (*name) + 2); ++ ++ if (grub_add (linktarget_len, grub_strlen (*name), &sz) || ++ grub_add (sz, 2, &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("link target length overflow")); ++ ++ target = grub_malloc (sz); + if (!target) + return grub_errno; + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index aae81482b..0625b1166 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -1801,6 +1801,7 @@ find_path (struct grub_btrfs_data *data, + char *path_alloc = NULL; + char *origpath = NULL; + unsigned symlinks_max = 32; ++ grub_size_t sz; + + err = get_root (data, key, tree, type); + if (err) +@@ -1891,9 +1892,15 @@ find_path (struct grub_btrfs_data *data, + struct grub_btrfs_dir_item *cdirel; + if (elemsize > allocated) + { +- allocated = 2 * elemsize; ++ if (grub_mul (2, elemsize, &allocated) || ++ grub_add (allocated, 1, &sz)) ++ { ++ grub_free (path_alloc); ++ grub_free (origpath); ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory item size overflow")); ++ } + grub_free (direl); +- direl = grub_malloc (allocated + 1); ++ direl = grub_malloc (sz); + if (!direl) + { + grub_free (path_alloc); +@@ -1955,8 +1962,16 @@ find_path (struct grub_btrfs_data *data, + grub_free (origpath); + return err; + } +- tmp = grub_malloc (grub_le_to_cpu64 (inode.size) +- + grub_strlen (path) + 1); ++ ++ if (grub_add (grub_le_to_cpu64 (inode.size), grub_strlen (path), &sz) || ++ grub_add (sz, 1, &sz)) ++ { ++ grub_free (direl); ++ grub_free (path_alloc); ++ grub_free (origpath); ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("buffer size overflow")); ++ } ++ tmp = grub_malloc (sz); + if (!tmp) + { + grub_free (direl); +@@ -2078,6 +2093,7 @@ grub_btrfs_dir (grub_device_t device, const char *path, + grub_uint64_t tree; + grub_uint8_t type; + grub_size_t est_size = 0; ++ grub_size_t sz; + + if (!data) + return grub_errno; +@@ -2119,9 +2135,15 @@ grub_btrfs_dir (grub_device_t device, const char *path, + } + if (elemsize > allocated) + { +- allocated = 2 * elemsize; ++ if (grub_mul (2, elemsize, &allocated) || ++ grub_add (allocated, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory element size overflow")); ++ r = -grub_errno; ++ break; ++ } + grub_free (direl); +- direl = grub_malloc (allocated + 1); ++ direl = grub_malloc (sz); + if (!direl) + { + r = -grub_errno; +diff --git a/grub-core/fs/cpio_common.c b/grub-core/fs/cpio_common.c +index 5d41b6fdb..6ba58b354 100644 +--- a/grub-core/fs/cpio_common.c ++++ b/grub-core/fs/cpio_common.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -48,6 +49,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + struct head hd; + grub_size_t namesize; + grub_uint32_t modeval; ++ grub_size_t sz; + + data->hofs = data->next_hofs; + +@@ -76,7 +78,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + + *mode = modeval; + +- *name = grub_malloc (namesize + 1); ++ if (grub_add (namesize, 1, &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("file name size overflow")); ++ ++ *name = grub_malloc (sz); + if (*name == NULL) + return grub_errno; + +@@ -110,10 +115,17 @@ grub_cpio_get_link_target (struct grub_archelp_data *data) + { + char *ret; + grub_err_t err; ++ grub_size_t sz; + + if (data->size == 0) + return grub_strdup (""); +- ret = grub_malloc (data->size + 1); ++ ++ if (grub_add (data->size, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("target data size overflow")); ++ return NULL; ++ } ++ ret = grub_malloc (sz); + if (!ret) + return NULL; + +diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c +index f6d6beaa5..72b4aa1e6 100644 +--- a/grub-core/fs/f2fs.c ++++ b/grub-core/fs/f2fs.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -958,6 +959,7 @@ grub_f2fs_read_symlink (grub_fshelp_node_t node) + char *symlink; + struct grub_fshelp_node *diro = node; + grub_uint64_t filesize; ++ grub_size_t sz; + + if (!diro->inode_read) + { +@@ -968,7 +970,12 @@ grub_f2fs_read_symlink (grub_fshelp_node_t node) + + filesize = grub_f2fs_file_size(&diro->inode.i); + +- symlink = grub_malloc (filesize + 1); ++ if (grub_add (filesize, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink size overflow")); ++ return 0; ++ } ++ symlink = grub_malloc (sz); + if (!symlink) + return 0; + +@@ -997,6 +1004,7 @@ grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx) + enum FILE_TYPE ftype; + int name_len; + int ret; ++ int sz; + + if (grub_f2fs_test_bit_le (i, ctx->bitmap) == 0) + { +@@ -1010,7 +1018,12 @@ grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx) + if (name_len >= F2FS_NAME_LEN) + return 0; + +- filename = grub_malloc (name_len + 1); ++ if (grub_add (name_len, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory entry name length overflow")); ++ return 0; ++ } ++ filename = grub_malloc (sz); + if (!filename) + return 0; + +diff --git a/grub-core/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c +index a009f2c2d..f168a318e 100644 +--- a/grub-core/fs/ntfscomp.c ++++ b/grub-core/fs/ntfscomp.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -310,6 +311,7 @@ ntfscomp (grub_uint8_t *dest, grub_disk_addr_t ofs, + { + grub_err_t ret; + grub_disk_addr_t vcn; ++ int log_sz; + + if (ctx->attr->sbuf) + { +@@ -349,7 +351,12 @@ ntfscomp (grub_uint8_t *dest, grub_disk_addr_t ofs, + } + + ctx->comp.comp_head = ctx->comp.comp_tail = 0; +- ctx->comp.cbuf = grub_malloc (1 << (ctx->comp.log_spc + GRUB_NTFS_BLK_SHR)); ++ if (grub_add (ctx->comp.log_spc, GRUB_NTFS_BLK_SHR, &log_sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("compression buffer size overflow")); ++ return 0; ++ } ++ ctx->comp.cbuf = grub_malloc (1 << log_sz); + if (!ctx->comp.cbuf) + return 0; + +diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c +index 6e9d63874..f91ff3bfa 100644 +--- a/grub-core/fs/squash4.c ++++ b/grub-core/fs/squash4.c +@@ -460,11 +460,11 @@ grub_squash_read_symlink (grub_fshelp_node_t node) + { + char *ret; + grub_err_t err; +- grub_size_t sz; ++ grub_uint32_t sz; + + if (grub_add (grub_le_to_cpu32 (node->ino.symlink.namelen), 1, &sz)) + { +- grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink name length overflow")); + return NULL; + } + +@@ -580,6 +580,7 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, + struct grub_squash_dirent di; + struct grub_squash_inode ino; + grub_size_t sz; ++ grub_uint16_t nlen; + + err = read_chunk (dir->data, &di, sizeof (di), + grub_le_to_cpu64 (dir->data->sb.diroffset) +@@ -595,7 +596,12 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, + if (err) + return 0; + +- buf = grub_malloc (grub_le_to_cpu16 (di.namelen) + 2); ++ if (grub_add (grub_le_to_cpu16 (di.namelen), 2, &nlen)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow")); ++ return 0; ++ } ++ buf = grub_malloc (nlen); + if (!buf) + return 0; + err = read_chunk (dir->data, buf, +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index 74feeb86a..70c9f449b 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -718,6 +718,7 @@ static char * + grub_xfs_read_symlink (grub_fshelp_node_t node) + { + grub_ssize_t size = grub_be_to_cpu64 (node->inode.size); ++ grub_size_t sz; + + if (size < 0) + { +@@ -739,7 +740,12 @@ grub_xfs_read_symlink (grub_fshelp_node_t node) + if (node->data->hascrc) + off = 56; + +- symlink = grub_malloc (size + 1); ++ if (grub_add (size, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink size overflow")); ++ return 0; ++ } ++ symlink = grub_malloc (sz); + if (!symlink) + return 0; + +@@ -789,8 +795,15 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename, + { + struct grub_fshelp_node *fdiro; + grub_err_t err; ++ grub_size_t sz; + +- fdiro = grub_malloc (grub_xfs_fshelp_size(ctx->diro->data) + 1); ++ if (grub_add (grub_xfs_fshelp_size(ctx->diro->data), 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory data size overflow")); ++ grub_print_error (); ++ return 0; ++ } ++ fdiro = grub_malloc (sz); + if (!fdiro) + { + grub_print_error (); +-- +2.50.1 + diff --git a/boot/grub2/0050-fs-Prevent-overflows-when-allocating-memory-for-arra.patch b/boot/grub2/0050-fs-Prevent-overflows-when-allocating-memory-for-arra.patch new file mode 100644 index 0000000000..e7bf8d543b --- /dev/null +++ b/boot/grub2/0050-fs-Prevent-overflows-when-allocating-memory-for-arra.patch @@ -0,0 +1,87 @@ +From 593d7b8659bef80b1f6ae3b793332d8eca8b8131 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Tue, 21 Jan 2025 19:02:37 +0000 +Subject: [PATCH] fs: Prevent overflows when allocating memory for arrays + +Use grub_calloc() when allocating memory for arrays to ensure proper +overflow checks are in place. + +The HFS+ and squash4 security vulnerabilities were reported by +Jonathan Bar Or . + +Fixes: CVE-2025-0678 +Fixes: CVE-2025-1125 + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: 84bc0a9a68835952ae69165c11709811dae7634e +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/btrfs.c | 4 ++-- + grub-core/fs/hfspluscomp.c | 9 +++++++-- + grub-core/fs/squash4.c | 8 ++++---- + 3 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 0625b1166..9c1e925c9 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -1276,8 +1276,8 @@ grub_btrfs_mount (grub_device_t dev) + } + + data->n_devices_allocated = 16; +- data->devices_attached = grub_malloc (sizeof (data->devices_attached[0]) +- * data->n_devices_allocated); ++ data->devices_attached = grub_calloc (data->n_devices_allocated, ++ sizeof (data->devices_attached[0])); + if (!data->devices_attached) + { + grub_free (data); +diff --git a/grub-core/fs/hfspluscomp.c b/grub-core/fs/hfspluscomp.c +index 48ae438d8..a80954ee6 100644 +--- a/grub-core/fs/hfspluscomp.c ++++ b/grub-core/fs/hfspluscomp.c +@@ -244,14 +244,19 @@ hfsplus_open_compressed_real (struct grub_hfsplus_file *node) + return 0; + } + node->compress_index_size = grub_le_to_cpu32 (index_size); +- node->compress_index = grub_malloc (node->compress_index_size +- * sizeof (node->compress_index[0])); ++ node->compress_index = grub_calloc (node->compress_index_size, ++ sizeof (node->compress_index[0])); + if (!node->compress_index) + { + node->compressed = 0; + grub_free (attr_node); + return grub_errno; + } ++ ++ /* ++ * The node->compress_index_size * sizeof (node->compress_index[0]) is safe here ++ * due to relevant checks done in grub_calloc() above. ++ */ + if (grub_hfsplus_read_file (node, 0, 0, + 0x104 + sizeof (index_size), + node->compress_index_size +diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c +index f91ff3bfa..cf2bca822 100644 +--- a/grub-core/fs/squash4.c ++++ b/grub-core/fs/squash4.c +@@ -822,10 +822,10 @@ direct_read (struct grub_squash_data *data, + break; + } + total_blocks = ((total_size + data->blksz - 1) >> data->log2_blksz); +- ino->block_sizes = grub_malloc (total_blocks +- * sizeof (ino->block_sizes[0])); +- ino->cumulated_block_sizes = grub_malloc (total_blocks +- * sizeof (ino->cumulated_block_sizes[0])); ++ ino->block_sizes = grub_calloc (total_blocks, ++ sizeof (ino->block_sizes[0])); ++ ino->cumulated_block_sizes = grub_calloc (total_blocks, ++ sizeof (ino->cumulated_block_sizes[0])); + if (!ino->block_sizes || !ino->cumulated_block_sizes) + { + grub_free (ino->block_sizes); +-- +2.50.1 + diff --git a/boot/grub2/0051-fs-Prevent-overflows-when-assigning-returned-values-.patch b/boot/grub2/0051-fs-Prevent-overflows-when-assigning-returned-values-.patch new file mode 100644 index 0000000000..f1438a28fe --- /dev/null +++ b/boot/grub2/0051-fs-Prevent-overflows-when-assigning-returned-values-.patch @@ -0,0 +1,110 @@ +From 639711967a296edb0704c3d2c31691076d46f565 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Tue, 21 Jan 2025 19:02:38 +0000 +Subject: [PATCH] fs: Prevent overflows when assigning returned values from + read_number() + +The direct assignment of the unsigned long long value returned by +read_number() can potentially lead to an overflow on a 32-bit systems. +The fix replaces the direct assignments with calls to grub_cast() +which detects the overflows and safely assigns the values if no +overflow is detected. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: cde9f7f338f8f5771777f0e7dfc423ddf952ad31 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/cpio_common.c | 18 ++++++++++++++---- + grub-core/fs/tar.c | 23 ++++++++++++++++------- + 2 files changed, 30 insertions(+), 11 deletions(-) + +diff --git a/grub-core/fs/cpio_common.c b/grub-core/fs/cpio_common.c +index 6ba58b354..45ac119a8 100644 +--- a/grub-core/fs/cpio_common.c ++++ b/grub-core/fs/cpio_common.c +@@ -62,11 +62,21 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + #endif + ) + return grub_error (GRUB_ERR_BAD_FS, "invalid cpio archive"); +- data->size = read_number (hd.filesize, ARRAY_SIZE (hd.filesize)); ++ ++ if (grub_cast (read_number (hd.filesize, ARRAY_SIZE (hd.filesize)), &data->size)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("data size overflow")); ++ + if (mtime) +- *mtime = read_number (hd.mtime, ARRAY_SIZE (hd.mtime)); +- modeval = read_number (hd.mode, ARRAY_SIZE (hd.mode)); +- namesize = read_number (hd.namesize, ARRAY_SIZE (hd.namesize)); ++ { ++ if (grub_cast (read_number (hd.mtime, ARRAY_SIZE (hd.mtime)), mtime)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("mtime overflow")); ++ } ++ ++ if (grub_cast (read_number (hd.mode, ARRAY_SIZE (hd.mode)), &modeval)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("mode overflow")); ++ ++ if (grub_cast (read_number (hd.namesize, ARRAY_SIZE (hd.namesize)), &namesize)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("namesize overflow")); + + /* Don't allow negative numbers. */ + if (namesize >= 0x80000000) +diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c +index fd2ec1f74..1eaa5349f 100644 +--- a/grub-core/fs/tar.c ++++ b/grub-core/fs/tar.c +@@ -99,9 +99,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + if (hd.typeflag == 'L') + { + grub_err_t err; +- grub_size_t namesize = read_number (hd.size, sizeof (hd.size)); ++ grub_size_t namesize; + +- if (grub_add (namesize, 1, &sz)) ++ if (grub_cast (read_number (hd.size, sizeof (hd.size)), &namesize) || ++ grub_add (namesize, 1, &sz)) + return grub_error (GRUB_ERR_BAD_FS, N_("name size overflow")); + + *name = grub_malloc (sz); +@@ -123,9 +124,10 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + if (hd.typeflag == 'K') + { + grub_err_t err; +- grub_size_t linksize = read_number (hd.size, sizeof (hd.size)); ++ grub_size_t linksize; + +- if (grub_add (linksize, 1, &sz)) ++ if (grub_cast (read_number (hd.size, sizeof (hd.size)), &linksize) || ++ grub_add (linksize, 1, &sz)) + return grub_error (GRUB_ERR_BAD_FS, N_("link size overflow")); + + if (data->linkname_alloc < sz) +@@ -174,15 +176,22 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + (*name)[extra_size + sizeof (hd.name)] = 0; + } + +- data->size = read_number (hd.size, sizeof (hd.size)); ++ if (grub_cast (read_number (hd.size, sizeof (hd.size)), &data->size)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("data size overflow")); ++ + data->dofs = data->hofs + GRUB_DISK_SECTOR_SIZE; + data->next_hofs = data->dofs + ((data->size + GRUB_DISK_SECTOR_SIZE - 1) & + ~(GRUB_DISK_SECTOR_SIZE - 1)); + if (mtime) +- *mtime = read_number (hd.mtime, sizeof (hd.mtime)); ++ { ++ if (grub_cast (read_number (hd.mtime, sizeof (hd.mtime)), mtime)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("mtime overflow")); ++ } + if (mode) + { +- *mode = read_number (hd.mode, sizeof (hd.mode)); ++ if (grub_cast (read_number (hd.mode, sizeof (hd.mode)), mode)) ++ return grub_error (GRUB_ERR_BAD_FS, N_("mode overflow")); ++ + switch (hd.typeflag) + { + /* Hardlink. */ +-- +2.50.1 + diff --git a/boot/grub2/0052-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch b/boot/grub2/0052-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch new file mode 100644 index 0000000000..bbf93dd0b4 --- /dev/null +++ b/boot/grub2/0052-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch @@ -0,0 +1,143 @@ +From bd4fcbdbd9835716213debce07f08c81311ce9a6 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 22 Jan 2025 07:17:02 +0000 +Subject: [PATCH] fs/zfs: Use safe math macros to prevent overflows + +Replace direct arithmetic operations with macros from include/grub/safemath.h +to prevent potential overflow issues when calculating the memory sizes. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: 88e491a0f744c6b19b6d4caa300a576ba56db7c9 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/zfs/zfs.c | 50 +++++++++++++++++++++++++++++++++++++----- + 1 file changed, 44 insertions(+), 6 deletions(-) + +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c +index a497b1869..2f303d655 100644 +--- a/grub-core/fs/zfs/zfs.c ++++ b/grub-core/fs/zfs/zfs.c +@@ -2387,6 +2387,7 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap, + zap_dnode->endian) << DNODE_SHIFT); + grub_err_t err; + grub_zfs_endian_t endian; ++ grub_size_t sz; + + if (zap_verify (zap, zap_dnode->endian)) + return 0; +@@ -2448,8 +2449,14 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap, + if (le->le_type != ZAP_CHUNK_ENTRY) + continue; + +- buf = grub_malloc (grub_zfs_to_cpu16 (le->le_name_length, endian) +- * name_elem_length + 1); ++ if (grub_mul (grub_zfs_to_cpu16 (le->le_name_length, endian), name_elem_length, &sz) || ++ grub_add (sz, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("buffer size overflow")); ++ grub_free (l); ++ return grub_errno; ++ } ++ buf = grub_malloc (sz); + if (zap_leaf_array_get (l, endian, blksft, + grub_zfs_to_cpu16 (le->le_name_chunk, + endian), +@@ -2872,6 +2879,7 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, + && ((grub_zfs_to_cpu64(((znode_phys_t *) DN_BONUS (&dnode_path->dn.dn))->zp_mode, dnode_path->dn.endian) >> 12) & 0xf) == 0xa) + { + char *sym_value; ++ grub_size_t sz; + grub_size_t sym_sz; + int free_symval = 0; + char *oldpath = path, *oldpathbuf = path_buf; +@@ -2923,7 +2931,18 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, + break; + free_symval = 1; + } +- path = path_buf = grub_malloc (sym_sz + grub_strlen (oldpath) + 1); ++ ++ if (grub_add (sym_sz, grub_strlen (oldpath), &sz) || ++ grub_add (sz, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("path buffer size overflow")); ++ grub_free (oldpathbuf); ++ if (free_symval) ++ grub_free (sym_value); ++ err = grub_errno; ++ break; ++ } ++ path = path_buf = grub_malloc (sz); + if (!path_buf) + { + grub_free (oldpathbuf); +@@ -2960,6 +2979,7 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, + { + void *sahdrp; + int hdrsize; ++ grub_size_t sz; + + if (dnode_path->dn.dn.dn_bonuslen != 0) + { +@@ -2993,7 +3013,15 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, + + SA_SIZE_OFFSET), + dnode_path->dn.endian); + char *oldpath = path, *oldpathbuf = path_buf; +- path = path_buf = grub_malloc (sym_sz + grub_strlen (oldpath) + 1); ++ if (grub_add (sym_sz, grub_strlen (oldpath), &sz) || ++ grub_add (sz, 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("path buffer size overflow")); ++ grub_free (oldpathbuf); ++ err = grub_errno; ++ break; ++ } ++ path = path_buf = grub_malloc (sz); + if (!path_buf) + { + grub_free (oldpathbuf); +@@ -3568,6 +3596,7 @@ grub_zfs_nvlist_lookup_nvlist_array (const char *nvlist, const char *name, + unsigned i; + grub_size_t nelm; + int elemsize = 0; ++ int sz; + + found = nvlist_find_value (nvlist, name, DATA_TYPE_NVLIST_ARRAY, &nvpair, + &size, &nelm); +@@ -3602,7 +3631,12 @@ grub_zfs_nvlist_lookup_nvlist_array (const char *nvlist, const char *name, + return 0; + } + +- ret = grub_zalloc (elemsize + sizeof (grub_uint32_t)); ++ if (grub_add (elemsize, sizeof (grub_uint32_t), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("elemsize overflow")); ++ return 0; ++ } ++ ret = grub_zalloc (sz); + if (!ret) + return 0; + grub_memcpy (ret, nvlist, sizeof (grub_uint32_t)); +@@ -4193,6 +4227,7 @@ iterate_zap_snap (const char *name, grub_uint64_t val, + struct grub_dirhook_info info; + char *name2; + int ret; ++ grub_size_t sz; + + dnode_end_t mdn; + +@@ -4213,7 +4248,10 @@ iterate_zap_snap (const char *name, grub_uint64_t val, + return 0; + } + +- name2 = grub_malloc (grub_strlen (name) + 2); ++ if (grub_add (grub_strlen (name), 2, &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow")); ++ ++ name2 = grub_malloc (sz); + name2[0] = '@'; + grub_memcpy (name2 + 1, name, grub_strlen (name) + 1); + ret = ctx->hook (name2, &info, ctx->hook_data); +-- +2.50.1 + diff --git a/boot/grub2/0053-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch b/boot/grub2/0053-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch new file mode 100644 index 0000000000..7cf5524195 --- /dev/null +++ b/boot/grub2/0053-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch @@ -0,0 +1,45 @@ +From b39a42a7de6639c32829a5f4aff603190c69d689 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 22 Jan 2025 07:17:03 +0000 +Subject: [PATCH] fs/zfs: Prevent overflows when allocating memory for arrays + +Use grub_calloc() when allocating memory for arrays to ensure proper +overflow checks are in place. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: 7f38e32c7ebeaebb79e2c71e3c7d5ea367d3a39c +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/zfs/zfs.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c +index 2f303d655..9ab7bf319 100644 +--- a/grub-core/fs/zfs/zfs.c ++++ b/grub-core/fs/zfs/zfs.c +@@ -723,8 +723,8 @@ fill_vdev_info_real (struct grub_zfs_data *data, + { + fill->n_children = nelm; + +- fill->children = grub_zalloc (fill->n_children +- * sizeof (fill->children[0])); ++ fill->children = grub_calloc (fill->n_children, ++ sizeof (fill->children[0])); + } + + for (i = 0; i < nelm; i++) +@@ -3712,8 +3712,8 @@ zfs_mount (grub_device_t dev) + #endif + + data->n_devices_allocated = 16; +- data->devices_attached = grub_malloc (sizeof (data->devices_attached[0]) +- * data->n_devices_allocated); ++ data->devices_attached = grub_calloc (data->n_devices_allocated, ++ sizeof (data->devices_attached[0])); + data->n_devices_attached = 0; + err = scan_disk (dev, data, 1, &inserted); + if (err) +-- +2.50.1 + diff --git a/boot/grub2/0054-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch b/boot/grub2/0054-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch new file mode 100644 index 0000000000..1c208a7540 --- /dev/null +++ b/boot/grub2/0054-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch @@ -0,0 +1,93 @@ +From 177ae1f6b05fbe5a8c8e83d468c189ff339d608f Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 22 Jan 2025 07:17:01 +0000 +Subject: [PATCH] fs/zfs: Check if returned pointer for allocated memory is + NULL + +When using grub_malloc() or grub_zalloc(), these functions can fail if +we are out of memory. After allocating memory we should check if these +functions returned NULL and handle this error if they did. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: 13065f69dae0eeb60813809026de5bd021051892 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/zfs/zfs.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c +index 9ab7bf319..6e6d1c921 100644 +--- a/grub-core/fs/zfs/zfs.c ++++ b/grub-core/fs/zfs/zfs.c +@@ -614,6 +614,8 @@ zfs_fetch_nvlist (struct grub_zfs_device_desc *diskdesc, char **nvlist) + return grub_error (GRUB_ERR_BUG, "member drive unknown"); + + *nvlist = grub_malloc (VDEV_PHYS_SIZE); ++ if (!*nvlist) ++ return grub_errno; + + /* Read in the vdev name-value pair list (112K). */ + err = grub_disk_read (diskdesc->dev->disk, diskdesc->vdev_phys_sector, 0, +@@ -725,6 +727,11 @@ fill_vdev_info_real (struct grub_zfs_data *data, + + fill->children = grub_calloc (fill->n_children, + sizeof (fill->children[0])); ++ if (!fill->children) ++ { ++ grub_free (type); ++ return grub_errno; ++ } + } + + for (i = 0; i < nelm; i++) +@@ -2457,6 +2464,11 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap, + return grub_errno; + } + buf = grub_malloc (sz); ++ if (!buf) ++ { ++ grub_free (l); ++ return grub_errno; ++ } + if (zap_leaf_array_get (l, endian, blksft, + grub_zfs_to_cpu16 (le->le_name_chunk, + endian), +@@ -2472,6 +2484,12 @@ fzap_iterate (dnode_end_t * zap_dnode, zap_phys_t * zap, + val_length = ((int) le->le_value_length + * (int) le->le_int_size); + val = grub_malloc (grub_zfs_to_cpu16 (val_length, endian)); ++ if (!val) ++ { ++ grub_free (l); ++ grub_free (buf); ++ return grub_errno; ++ } + if (zap_leaf_array_get (l, endian, blksft, + grub_zfs_to_cpu16 (le->le_value_chunk, + endian), +@@ -3714,6 +3732,11 @@ zfs_mount (grub_device_t dev) + data->n_devices_allocated = 16; + data->devices_attached = grub_calloc (data->n_devices_allocated, + sizeof (data->devices_attached[0])); ++ if (!data->devices_attached) ++ { ++ grub_free (data); ++ return NULL; ++ } + data->n_devices_attached = 0; + err = scan_disk (dev, data, 1, &inserted); + if (err) +@@ -4252,6 +4275,9 @@ iterate_zap_snap (const char *name, grub_uint64_t val, + return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow")); + + name2 = grub_malloc (sz); ++ if (!name2) ++ return grub_errno; ++ + name2[0] = '@'; + grub_memcpy (name2 + 1, name, grub_strlen (name) + 1); + ret = ctx->hook (name2, &info, ctx->hook_data); +-- +2.50.1 + diff --git a/boot/grub2/0055-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch b/boot/grub2/0055-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch new file mode 100644 index 0000000000..0fcb427b74 --- /dev/null +++ b/boot/grub2/0055-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch @@ -0,0 +1,29 @@ +From f60272b284e98ecd4ee38ec06aab6587cf525616 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 22 Jan 2025 07:17:04 +0000 +Subject: [PATCH] fs/zfs: Add missing NULL check after grub_strdup() call + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: dd6a4c8d10e02ca5056681e75795041a343636e4 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/zfs/zfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c +index 6e6d1c921..5ff647ffb 100644 +--- a/grub-core/fs/zfs/zfs.c ++++ b/grub-core/fs/zfs/zfs.c +@@ -3309,6 +3309,8 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol, + filename = 0; + snapname = 0; + fsname = grub_strdup (fullpath); ++ if (!fsname) ++ return grub_errno; + } + else + { +-- +2.50.1 + diff --git a/boot/grub2/0056-net-Use-safe-math-macros-to-prevent-overflows.patch b/boot/grub2/0056-net-Use-safe-math-macros-to-prevent-overflows.patch new file mode 100644 index 0000000000..111bfdf58a --- /dev/null +++ b/boot/grub2/0056-net-Use-safe-math-macros-to-prevent-overflows.patch @@ -0,0 +1,250 @@ +From 6cb15ce33f7c7153ef986f3fe710e22062d37ba7 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 22 Jan 2025 18:04:42 +0000 +Subject: [PATCH] net: Use safe math macros to prevent overflows + +Replace direct arithmetic operations with macros from include/grub/safemath.h +to prevent potential overflow issues when calculating the memory sizes. + +Signed-off-by: Lidong Chen +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper + +Conflicts: + grub-core/net/bootp.c + grub-core/net/net.c + +Upstream: 4beeff8a31c4fb4071d2225533cfa316b5a58391 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/bootp.c | 16 ++++++++-- + grub-core/net/dns.c | 9 +++++- + grub-core/net/drivers/ieee1275/ofnet.c | 20 ++++++++++-- + grub-core/net/net.c | 43 +++++++++++++++++++++----- + 4 files changed, 75 insertions(+), 13 deletions(-) + +diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c +index abe45ef7b..2f45a3cc2 100644 +--- a/grub-core/net/bootp.c ++++ b/grub-core/net/bootp.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + struct grub_dhcp_discover_options + { +@@ -686,6 +687,7 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + unsigned num; + const grub_uint8_t *ptr; + grub_uint8_t taglength; ++ grub_uint8_t len; + + if (argc < 4) + return grub_error (GRUB_ERR_BAD_ARGUMENT, +@@ -727,7 +729,12 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + if (grub_strcmp (args[3], "string") == 0) + { + grub_err_t err = GRUB_ERR_NONE; +- char *val = grub_malloc (taglength + 1); ++ char *val; ++ ++ if (grub_add (taglength, 1, &len)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("tag length overflow")); ++ ++ val = grub_malloc (len); + if (!val) + return grub_errno; + grub_memcpy (val, ptr, taglength); +@@ -760,7 +767,12 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + if (grub_strcmp (args[3], "hex") == 0) + { + grub_err_t err = GRUB_ERR_NONE; +- char *val = grub_malloc (2 * taglength + 1); ++ char *val; ++ ++ if (grub_mul (taglength, 2, &len) || grub_add (len, 1, &len)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("tag length overflow")); ++ ++ val = grub_malloc (len); + int i; + if (!val) + return grub_errno; +diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c +index fcc09aa65..39b0c46cf 100644 +--- a/grub-core/net/dns.c ++++ b/grub-core/net/dns.c +@@ -224,10 +224,17 @@ get_name (const grub_uint8_t *name_at, const grub_uint8_t *head, + { + int length; + char *ret; ++ int len; + + if (!check_name_real (name_at, head, tail, NULL, &length, NULL)) + return NULL; +- ret = grub_malloc (length + 1); ++ ++ if (grub_add (length, 1, &len)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("name length overflow")); ++ return NULL; ++ } ++ ret = grub_malloc (len); + if (!ret) + return NULL; + if (!check_name_real (name_at, head, tail, NULL, NULL, ret)) +diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c +index 78f03df8e..c35b107ad 100644 +--- a/grub-core/net/drivers/ieee1275/ofnet.c ++++ b/grub-core/net/drivers/ieee1275/ofnet.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -391,6 +392,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias) + grub_uint8_t *pprop; + char *shortname; + char need_suffix = 1; ++ grub_size_t sz; + + if (grub_strcmp (alias->type, "network") != 0) + return 0; +@@ -448,9 +450,23 @@ search_net_devices (struct grub_ieee1275_devalias *alias) + } + + if (need_suffix) +- ofdata->path = grub_malloc (grub_strlen (alias->path) + sizeof (SUFFIX)); ++ { ++ if (grub_add (grub_strlen (alias->path), sizeof (SUFFIX), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obatining size of ofdata path")); ++ grub_print_error (); ++ return 0; ++ } ++ } + else +- ofdata->path = grub_malloc (grub_strlen (alias->path) + 1); ++ { ++ if (grub_add (grub_strlen (alias->path), 1, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obatining size of ofdata path")); ++ grub_print_error (); ++ return 0; ++ } ++ } + if (!ofdata->path) + { + grub_print_error (); +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 2bd490279..27df4669a 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -206,6 +207,7 @@ grub_net_ipv6_get_slaac (struct grub_net_card *card, + { + struct grub_net_slaac_mac_list *slaac; + char *ptr; ++ grub_size_t sz; + + for (slaac = card->slaac_list; slaac; slaac = slaac->next) + if (grub_net_hwaddr_cmp (&slaac->address, hwaddr) == 0) +@@ -215,9 +217,16 @@ grub_net_ipv6_get_slaac (struct grub_net_card *card, + if (!slaac) + return NULL; + +- slaac->name = grub_malloc (grub_strlen (card->name) +- + GRUB_NET_MAX_STR_HWADDR_LEN +- + sizeof (":slaac")); ++ if (grub_add (grub_strlen (card->name), ++ (GRUB_NET_MAX_STR_HWADDR_LEN + sizeof (":slaac")), &sz)) ++ { ++ grub_free (slaac); ++ grub_error (GRUB_ERR_OUT_OF_RANGE, ++ "overflow detected while obtaining size of slaac name"); ++ return NULL; ++ } ++ ++ slaac->name = grub_malloc (sz); + ptr = grub_stpcpy (slaac->name, card->name); + if (grub_net_hwaddr_cmp (&card->default_address, hwaddr) != 0) + { +@@ -288,6 +297,7 @@ grub_net_ipv6_get_link_local (struct grub_net_card *card, + char *name; + char *ptr; + grub_net_network_level_address_t addr; ++ grub_size_t sz; + + addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6; + addr.ipv6[0] = grub_cpu_to_be64_compile_time (0xfe80ULL << 48); +@@ -302,9 +312,14 @@ grub_net_ipv6_get_link_local (struct grub_net_card *card, + return inf; + } + +- name = grub_malloc (grub_strlen (card->name) +- + GRUB_NET_MAX_STR_HWADDR_LEN +- + sizeof (":link")); ++ if (grub_add (grub_strlen (card->name), ++ (GRUB_NET_MAX_STR_HWADDR_LEN + sizeof (":link")), &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, ++ "overflow detected while obtaining size of link name"); ++ return NULL; ++ } ++ name = grub_malloc (sz); + if (!name) + return NULL; + +@@ -1435,9 +1450,15 @@ grub_net_open_real (const char *name) + if (grub_strchr (port_start + 1, ':')) + { + int iplen = grub_strlen (server); ++ grub_size_t sz; + + /* Bracket bare IPv6 addr. */ +- host = grub_malloc (iplen + 3); ++ if (grub_add (iplen, 3, &sz)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow detected while obtaining length of host")); ++ return NULL; ++ } ++ host = grub_malloc (sz); + if (!host) + return NULL; + +@@ -1692,6 +1713,7 @@ grub_env_set_net_property (const char *intername, const char *suffix, + { + char *varname, *varvalue; + char *ptr; ++ grub_size_t sz; + + varname = grub_xasprintf ("net_%s_%s", intername, suffix); + if (!varname) +@@ -1699,7 +1721,12 @@ grub_env_set_net_property (const char *intername, const char *suffix, + for (ptr = varname; *ptr; ptr++) + if (*ptr == ':') + *ptr = '_'; +- varvalue = grub_malloc (len + 1); ++ if (grub_add (len, 1, &sz)) ++ { ++ grub_free (varname); ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow detected while obtaining the size of an env variable"); ++ } ++ varvalue = grub_malloc (sz); + if (!varvalue) + { + grub_free (varname); +-- +2.50.1 + diff --git a/boot/grub2/0057-net-Prevent-overflows-when-allocating-memory-for-arr.patch b/boot/grub2/0057-net-Prevent-overflows-when-allocating-memory-for-arr.patch new file mode 100644 index 0000000000..b4a50f6a4f --- /dev/null +++ b/boot/grub2/0057-net-Prevent-overflows-when-allocating-memory-for-arr.patch @@ -0,0 +1,50 @@ +From 5d483e4c7c5a20a17a413f0cc51decfbb5828a5a Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 22 Jan 2025 18:04:43 +0000 +Subject: [PATCH] net: Prevent overflows when allocating memory for arrays + +Use grub_calloc() when allocating memory for arrays to ensure proper +overflow checks are in place. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: dee2c14fd66bc497cdc74c69fde8c9b84637c8eb +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/dns.c | 4 ++-- + grub-core/net/net.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c +index 39b0c46cf..f20cd6f83 100644 +--- a/grub-core/net/dns.c ++++ b/grub-core/net/dns.c +@@ -470,8 +470,8 @@ grub_net_dns_lookup (const char *name, + && grub_get_time_ms () < dns_cache[h].limit_time) + { + grub_dprintf ("dns", "retrieved from cache\n"); +- *addresses = grub_malloc (dns_cache[h].naddresses +- * sizeof ((*addresses)[0])); ++ *addresses = grub_calloc (dns_cache[h].naddresses, ++ sizeof ((*addresses)[0])); + if (!*addresses) + return grub_errno; + *naddresses = dns_cache[h].naddresses; +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 27df4669a..ea88ae8a8 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -88,8 +88,8 @@ grub_net_link_layer_add_address (struct grub_net_card *card, + /* Add sender to cache table. */ + if (card->link_layer_table == NULL) + { +- card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE +- * sizeof (card->link_layer_table[0])); ++ card->link_layer_table = grub_calloc (LINK_LAYER_CACHE_SIZE, ++ sizeof (card->link_layer_table[0])); + if (card->link_layer_table == NULL) + return; + } +-- +2.50.1 + diff --git a/boot/grub2/0058-net-Check-if-returned-pointer-for-allocated-memory-i.patch b/boot/grub2/0058-net-Check-if-returned-pointer-for-allocated-memory-i.patch new file mode 100644 index 0000000000..4ed78b82bf --- /dev/null +++ b/boot/grub2/0058-net-Check-if-returned-pointer-for-allocated-memory-i.patch @@ -0,0 +1,36 @@ +From cc4c75dd3bf99f08fc2ef796b613c9413cf46399 Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Wed, 22 Jan 2025 18:04:44 +0000 +Subject: [PATCH] net: Check if returned pointer for allocated memory is NULL + +When using grub_malloc(), the function can fail if we are out of memory. +After allocating memory we should check if this function returned NULL +and handle this error if it did. + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: 1c06ec900591d1fab6fbacf80dc010541d0a5ec8 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/net.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index ea88ae8a8..6774f4ad0 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -227,6 +227,11 @@ grub_net_ipv6_get_slaac (struct grub_net_card *card, + } + + slaac->name = grub_malloc (sz); ++ if (slaac->name == NULL) ++ { ++ grub_free (slaac); ++ return NULL; ++ } + ptr = grub_stpcpy (slaac->name, card->name); + if (grub_net_hwaddr_cmp (&card->default_address, hwaddr) != 0) + { +-- +2.50.1 + diff --git a/boot/grub2/0059-fs-sfs-Check-if-allocated-memory-is-NULL.patch b/boot/grub2/0059-fs-sfs-Check-if-allocated-memory-is-NULL.patch new file mode 100644 index 0000000000..baf4efbac6 --- /dev/null +++ b/boot/grub2/0059-fs-sfs-Check-if-allocated-memory-is-NULL.patch @@ -0,0 +1,37 @@ +From afacc73c48934b66e18d9d12fef2ae6b44f105ea Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Tue, 28 Jan 2025 05:15:50 +0000 +Subject: [PATCH] fs/sfs: Check if allocated memory is NULL + +When using grub_zalloc(), if we are out of memory, this function can fail. +After allocating memory, we should check if grub_zalloc() returns NULL. +If so, we should handle this error. + +Fixes: CID 473856 + +Signed-off-by: Alec Brown +Reviewed-by: Ross Philipson +Reviewed-by: Daniel Kiper +Upstream: e3c578a56f9294e286b6028ca7c1def997a17b15 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/sfs.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c +index 88705b3a2..bad4ae8d1 100644 +--- a/grub-core/fs/sfs.c ++++ b/grub-core/fs/sfs.c +@@ -429,6 +429,9 @@ grub_sfs_mount (grub_disk_t disk) + - 24 /* offsetof (struct grub_sfs_objc, objects) */ + - 25); /* offsetof (struct grub_sfs_obj, filename) */ + data->label = grub_zalloc (max_len + 1); ++ if (data->label == NULL) ++ goto fail; ++ + grub_strncpy (data->label, (char *) rootobjc->objects[0].filename, max_len); + + grub_free (rootobjc_data); +-- +2.50.1 + diff --git a/boot/grub2/0060-script-execute-Fix-potential-underflow-and-NULL-dere.patch b/boot/grub2/0060-script-execute-Fix-potential-underflow-and-NULL-dere.patch new file mode 100644 index 0000000000..f84ee5de1f --- /dev/null +++ b/boot/grub2/0060-script-execute-Fix-potential-underflow-and-NULL-dere.patch @@ -0,0 +1,37 @@ +From 6cb70802581222ba80a37c3e2fd4b8357a859dad Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 29 Jan 2025 06:48:37 +0000 +Subject: [PATCH] script/execute: Fix potential underflow and NULL dereference + +The result is initialized to 0 in grub_script_arglist_to_argv(). +If the for loop condition is not met both result.args and result.argc +remain 0 causing result.argc - 1 to underflow and/or result.args NULL +dereference. Fix the issues by adding relevant checks. + +Fixes: CID 473880 + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: d13b6e8ebd10b4eb16698a002aa40258cf6e6f0e +Signed-off-by: Thomas Petazzoni +--- + grub-core/script/execute.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c +index e1450f45d..a86e0051f 100644 +--- a/grub-core/script/execute.c ++++ b/grub-core/script/execute.c +@@ -760,6 +760,9 @@ cleanup: + } + } + ++ if (result.args == NULL || result.argc == 0) ++ goto fail; ++ + if (! result.args[result.argc - 1]) + result.argc--; + +-- +2.50.1 + diff --git a/boot/grub2/0061-osdep-unix-getroot-Fix-potential-underflow.patch b/boot/grub2/0061-osdep-unix-getroot-Fix-potential-underflow.patch new file mode 100644 index 0000000000..6a5588c34e --- /dev/null +++ b/boot/grub2/0061-osdep-unix-getroot-Fix-potential-underflow.patch @@ -0,0 +1,40 @@ +From 050f09a5e16a935be4a4770f59f2a7ff977fc088 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Wed, 29 Jan 2025 06:48:38 +0000 +Subject: [PATCH] osdep/unix/getroot: Fix potential underflow + +The entry_len is initialized in grub_find_root_devices_from_mountinfo() +to 0 before the while loop iterates through /proc/self/mountinfo. If the +file is empty or contains only invalid entries entry_len remains +0 causing entry_len - 1 in the subsequent for loop initialization +to underflow. To prevent this add a check to ensure entry_len > 0 before +entering the for loop. + +Fixes: CID 473877 + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Reviewed-by: Ross Philipson +Upstream: 66733f7c7dae889861ea3ef3ec0710811486019e +Signed-off-by: Thomas Petazzoni +--- + grub-core/osdep/linux/getroot.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c +index 7dd775d2a..527d4f0c5 100644 +--- a/grub-core/osdep/linux/getroot.c ++++ b/grub-core/osdep/linux/getroot.c +@@ -484,6 +484,9 @@ again: + } + } + ++ if (!entry_len) ++ goto out; ++ + /* Now scan visible mounts for the ones we're interested in. */ + for (i = entry_len - 1; i >= 0; i--) + { +-- +2.50.1 + diff --git a/boot/grub2/0062-misc-Ensure-consistent-overflow-error-messages.patch b/boot/grub2/0062-misc-Ensure-consistent-overflow-error-messages.patch new file mode 100644 index 0000000000..2add69d943 --- /dev/null +++ b/boot/grub2/0062-misc-Ensure-consistent-overflow-error-messages.patch @@ -0,0 +1,60 @@ +From 3a844f1139dd6fdcc90278239c8f6ea43aad9f2e Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Tue, 21 Jan 2025 19:02:39 +0000 +Subject: [PATCH] misc: Ensure consistent overflow error messages + +Update the overflow error messages to make them consistent +across the GRUB code. + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: f8795cde217e21539c2f236bcbb1a4bf521086b3 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/ntfs.c | 2 +- + grub-core/fs/ntfscomp.c | 2 +- + grub-core/video/readers/png.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c +index bce81947c..b4c70a71d 100644 +--- a/grub-core/fs/ntfs.c ++++ b/grub-core/fs/ntfs.c +@@ -364,7 +364,7 @@ retry: + goto retry; + } + } +- return grub_error (GRUB_ERR_BAD_FS, "run list overflown"); ++ return grub_error (GRUB_ERR_BAD_FS, "run list overflow"); + } + ctx->curr_vcn = ctx->next_vcn; + ctx->next_vcn += read_run_data (run, c1, 0); /* length of current VCN */ +diff --git a/grub-core/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c +index f168a318e..b68bf5e40 100644 +--- a/grub-core/fs/ntfscomp.c ++++ b/grub-core/fs/ntfscomp.c +@@ -30,7 +30,7 @@ static grub_err_t + decomp_nextvcn (struct grub_ntfs_comp *cc) + { + if (cc->comp_head >= cc->comp_tail) +- return grub_error (GRUB_ERR_BAD_FS, "compression block overflown"); ++ return grub_error (GRUB_ERR_BAD_FS, "compression block overflow"); + if (grub_disk_read + (cc->disk, + (cc->comp_table[cc->comp_head].next_lcn - +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 3163e97bf..aa7524b7d 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -626,7 +626,7 @@ static grub_err_t + grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n) + { + if (--data->raw_bytes < 0) +- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflown"); ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflow"); + + if (data->cur_column == 0) + { +-- +2.50.1 + diff --git a/boot/grub2/0063-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch b/boot/grub2/0063-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch new file mode 100644 index 0000000000..18d5e88087 --- /dev/null +++ b/boot/grub2/0063-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch @@ -0,0 +1,35 @@ +From 12dae049169b978aaa1e162f40954910ad90f2df Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Tue, 4 Feb 2025 15:11:10 +0000 +Subject: [PATCH] bus/usb/ehci: Define GRUB_EHCI_TOGGLE as grub_uint32_t + +The Coverity indicates that GRUB_EHCI_TOGGLE is an int that contains +a negative value and we are using it for the variable token which is +grub_uint32_t. To remedy this we can cast the definition to grub_uint32_t. + +Fixes: CID 473851 + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: 9907d9c2723304b42cf6da74f1cc6c4601391956 +Signed-off-by: Thomas Petazzoni +--- + grub-core/bus/usb/ehci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c +index 9abebc6bd..2db07c7c0 100644 +--- a/grub-core/bus/usb/ehci.c ++++ b/grub-core/bus/usb/ehci.c +@@ -218,7 +218,7 @@ enum + + #define GRUB_EHCI_TERMINATE (1<<0) + +-#define GRUB_EHCI_TOGGLE (1<<31) ++#define GRUB_EHCI_TOGGLE ((grub_uint32_t) 1<<31) + + enum + { +-- +2.50.1 + diff --git a/boot/grub2/0064-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch b/boot/grub2/0064-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch new file mode 100644 index 0000000000..8dffc38fa4 --- /dev/null +++ b/boot/grub2/0064-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch @@ -0,0 +1,46 @@ +From 6fa61b113427cb9db600a4a2a2f38ce09595f15f Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Tue, 4 Feb 2025 15:11:11 +0000 +Subject: [PATCH] normal/menu: Use safe math to avoid an integer overflow + +The Coverity indicates that the variable current_entry might overflow. +To prevent this use safe math when adding GRUB_MENU_PAGE_SIZE to current_entry. + +On the occasion fix limiting condition which was broken. + +Fixes: CID 473853 + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: 5b36a5210e21bee2624f8acc36aefd8f10266adb +Signed-off-by: Thomas Petazzoni +--- + grub-core/normal/menu.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c +index 6a90e091f..7ac6abf93 100644 +--- a/grub-core/normal/menu.c ++++ b/grub-core/normal/menu.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + /* Time to delay after displaying an error message about a default/fallback + entry failing to boot. */ +@@ -751,9 +752,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot, int *notify_boot) + + case GRUB_TERM_CTRL | 'c': + case GRUB_TERM_KEY_NPAGE: +- if (current_entry + GRUB_MENU_PAGE_SIZE < menu->size) +- current_entry += GRUB_MENU_PAGE_SIZE; +- else ++ if (grub_add (current_entry, GRUB_MENU_PAGE_SIZE, ¤t_entry) || current_entry >= menu->size) + current_entry = menu->size - 1; + menu_set_chosen_entry (current_entry); + break; +-- +2.50.1 + diff --git a/boot/grub2/0065-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch b/boot/grub2/0065-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch new file mode 100644 index 0000000000..3f35ba5019 --- /dev/null +++ b/boot/grub2/0065-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch @@ -0,0 +1,51 @@ +From d5385ae4e4d0c443e188e43c2b0703b68aaf55a3 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Thu, 6 Feb 2025 18:16:56 +0000 +Subject: [PATCH] kern/partition: Add sanity check after grub_strtoul() call + +The current code incorrectly assumes that both the input and the values +returned by grub_strtoul() are always valid which can lead to potential +errors. This fix ensures proper validation to prevent any unintended issues. + +Fixes: CID 473843 + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: 8e6e87e7923ca2ae880021cb42a35cc9bb4c8fe2 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/partition.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c +index 704512a20..c6a578cf4 100644 +--- a/grub-core/kern/partition.c ++++ b/grub-core/kern/partition.c +@@ -125,14 +125,22 @@ grub_partition_probe (struct grub_disk *disk, const char *str) + for (ptr = str; *ptr;) + { + grub_partition_map_t partmap; +- int num; ++ unsigned long num; + const char *partname, *partname_end; + + partname = ptr; + while (*ptr && grub_isalpha (*ptr)) + ptr++; + partname_end = ptr; +- num = grub_strtoul (ptr, &ptr, 0) - 1; ++ ++ num = grub_strtoul (ptr, &ptr, 0); ++ if (*ptr != '\0' || num == 0 || num > GRUB_INT_MAX) ++ { ++ grub_error (GRUB_ERR_BAD_NUMBER, N_("invalid partition number")); ++ return 0; ++ } ++ ++ num -= 1; + + curpart = 0; + /* Use the first partition map type found. */ +-- +2.50.1 + diff --git a/boot/grub2/0066-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch b/boot/grub2/0066-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch new file mode 100644 index 0000000000..7e9e377154 --- /dev/null +++ b/boot/grub2/0066-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch @@ -0,0 +1,62 @@ +From 009d1b7189c6eba0b8d284c94a9ef7dc9db351d1 Mon Sep 17 00:00:00 2001 +From: Lidong Chen +Date: Thu, 6 Feb 2025 18:16:57 +0000 +Subject: [PATCH] kern/misc: Add sanity check after grub_strtoul() call + +When the format string, fmt0, includes a positional argument +grub_strtoul() or grub_strtoull() is called to extract the argument +position. However, the returned argument position isn't fully validated. +If the format is something like "%0$x" then these functions return +0 which leads to an underflow in the calculation of the args index, curn. +The fix is to add a check to ensure the extracted argument position is +greater than 0 before computing curn. Additionally, replace one +grub_strtoull() with grub_strtoul() and change curn type to make code +more correct. + +Fixes: CID 473841 + +Signed-off-by: Lidong Chen +Reviewed-by: Daniel Kiper +Upstream: a8d6b06331a75d75b46f3dd6cc6fcd40dcf604b7 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/misc.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c +index 7cee5d75c..2b7922393 100644 +--- a/grub-core/kern/misc.c ++++ b/grub-core/kern/misc.c +@@ -830,7 +830,7 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args, + while ((c = *fmt++) != 0) + { + int longfmt = 0; +- grub_size_t curn; ++ unsigned long curn; + const char *p; + + if (c != '%') +@@ -848,7 +848,10 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args, + + if (*fmt == '$') + { +- curn = grub_strtoull (p, 0, 10) - 1; ++ curn = grub_strtoul (p, 0, 10); ++ if (curn == 0) ++ continue; ++ curn--; + fmt++; + } + +@@ -1034,6 +1037,8 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, + + if (*fmt == '$') + { ++ if (format1 == 0) ++ continue; + curn = format1 - 1; + fmt++; + format1 = 0; +-- +2.50.1 + diff --git a/boot/grub2/0067-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch b/boot/grub2/0067-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch new file mode 100644 index 0000000000..7cdef992be --- /dev/null +++ b/boot/grub2/0067-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch @@ -0,0 +1,35 @@ +From 3668d0c12b0604d08cf290529797c348a59483ea Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Fri, 7 Feb 2025 01:47:57 +0000 +Subject: [PATCH] loader/i386/linux: Cast left shift to grub_uint32_t + +The Coverity complains that we might overflow into a negative value when +setting linux_params.kernel_alignment to (1 << align). We can remedy +this by casting it to grub_uint32_t. + +Fixes: CID 473876 + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: 490a6ab71cebd96fae7a1ceb9067484f5ccbec2a +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/i386/linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c +index 977757f2c..b051600c8 100644 +--- a/grub-core/loader/i386/linux.c ++++ b/grub-core/loader/i386/linux.c +@@ -806,7 +806,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), + } + + linux_params.code32_start = prot_mode_target + lh.code32_start - GRUB_LINUX_BZIMAGE_ADDR; +- linux_params.kernel_alignment = (1 << align); ++ linux_params.kernel_alignment = ((grub_uint32_t) 1 << align); + linux_params.ps_mouse = linux_params.padding11 = 0; + linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE; + +-- +2.50.1 + diff --git a/boot/grub2/0068-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch b/boot/grub2/0068-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch new file mode 100644 index 0000000000..e9a7acc084 --- /dev/null +++ b/boot/grub2/0068-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch @@ -0,0 +1,61 @@ +From 02a0365799f5ca3d70c4e28b5d11ade56c4c1652 Mon Sep 17 00:00:00 2001 +From: Alec Brown +Date: Wed, 5 Feb 2025 22:04:08 +0000 +Subject: [PATCH] loader/i386/bsd: Use safe math to avoid underflow + +The operation kern_end - kern_start may underflow when we input it into +grub_relocator_alloc_chunk_addr() call. To avoid this we can use safe +math for this subtraction. + +Fixes: CID 73845 + +Signed-off-by: Alec Brown +Reviewed-by: Daniel Kiper +Upstream: 4dc6166571645780c459dde2cdc1b001a5ec844c +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/i386/bsd.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c +index 1f9128f6f..578433402 100644 +--- a/grub-core/loader/i386/bsd.c ++++ b/grub-core/loader/i386/bsd.c +@@ -1340,6 +1340,7 @@ static grub_err_t + grub_bsd_load_elf (grub_elf_t elf, const char *filename) + { + grub_err_t err; ++ grub_size_t sz; + + kern_end = 0; + kern_start = ~0; +@@ -1370,8 +1371,11 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename) + + if (grub_errno) + return grub_errno; +- err = grub_relocator_alloc_chunk_addr (relocator, &ch, +- kern_start, kern_end - kern_start); ++ ++ if (grub_sub (kern_end, kern_start, &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while determining size of kernel for relocator"); ++ ++ err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start, sz); + if (err) + return err; + +@@ -1431,8 +1435,10 @@ grub_bsd_load_elf (grub_elf_t elf, const char *filename) + { + grub_relocator_chunk_t ch; + +- err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start, +- kern_end - kern_start); ++ if (grub_sub (kern_end, kern_start, &sz)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, "underflow detected while determining size of kernel for relocator"); ++ ++ err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start, sz); + if (err) + return err; + kern_chunk_src = get_virtual_current_address (ch); +-- +2.50.1 + diff --git a/boot/grub2/0069-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch b/boot/grub2/0069-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch new file mode 100644 index 0000000000..f39210c0c6 --- /dev/null +++ b/boot/grub2/0069-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch @@ -0,0 +1,69 @@ +From 156ee67f3e76aee99d6e40e5e029f56d681cb80a Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 21 Feb 2025 09:06:12 +0800 +Subject: [PATCH] fs/ext2: Rework out-of-bounds read for inline and external + extents + +Previously, the number of extent entries was not properly capped based +on the actual available space. This could lead to insufficient reads for +external extents, since the computation was based solely on the inline +extent layout. + +In this patch, when processing the extent header, we determine whether +the header is stored inline (i.e., at inode->blocks.dir_blocks) or in an +external extent block. We then clamp the number of entries accordingly +(using max_inline_ext for inline extents and max_external_ext for +external extent blocks). + +This change ensures that only the valid number of extent entries is +processed, preventing out-of-bound reads and potential filesystem +corruption. + +Fixes: 7e2f750f0a (fs/ext2: Fix out-of-bounds read for inline extents) + +Signed-off-by: Michael Chang +Upstream: 348cd416a3574348f4255bf2b04ec95938990997 +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/ext2.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c +index c3058f7e7..a38c86c4f 100644 +--- a/grub-core/fs/ext2.c ++++ b/grub-core/fs/ext2.c +@@ -496,7 +496,10 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) + int i; + grub_disk_addr_t ret; + grub_uint16_t nent; ++ /* maximum number of extent entries in the inode's inline extent area */ + const grub_uint16_t max_inline_ext = sizeof (inode->blocks) / sizeof (*ext) - 1; /* Minus 1 extent header. */ ++ /* maximum number of extent entries in the external extent block */ ++ const grub_uint16_t max_external_ext = EXT2_BLOCK_SIZE(data) / sizeof (*ext) - 1; /* Minus 1 extent header. */ + + if (grub_ext4_find_leaf (data, (struct grub_ext4_extent_header *) inode->blocks.dir_blocks, + fileblock, &leaf) != GRUB_ERR_NONE) +@@ -513,8 +516,18 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) + + nent = grub_le_to_cpu16 (leaf->entries); + +- if (leaf->depth == 0) +- nent = grub_min (nent, max_inline_ext); ++ /* ++ * Determine the effective number of extent entries (nent) to process: ++ * If the extent header (leaf) is stored inline in the inode's block ++ * area (i.e. at inode->blocks.dir_blocks), then only max_inline_ext ++ * entries can fit. ++ * Otherwise, if the header was read from an external extent block, use ++ * the larger limit, max_external_ext, based on the full block size. ++ */ ++ if (leaf == (struct grub_ext4_extent_header *) inode->blocks.dir_blocks) ++ nent = grub_min (nent, max_inline_ext); ++ else ++ nent = grub_min (nent, max_external_ext); + + for (i = 0; i < nent; i++) + { +-- +2.50.1 + diff --git a/boot/grub2/0070-fs-xfs-Fix-grub_xfs_iterate_dir-return-value-in-case.patch b/boot/grub2/0070-fs-xfs-Fix-grub_xfs_iterate_dir-return-value-in-case.patch new file mode 100644 index 0000000000..3a5769e6cc --- /dev/null +++ b/boot/grub2/0070-fs-xfs-Fix-grub_xfs_iterate_dir-return-value-in-case.patch @@ -0,0 +1,53 @@ +From f5234334c2c5958a55c2bdfbcaf63b6814d31d5f Mon Sep 17 00:00:00 2001 +From: Egor Ignatov +Date: Thu, 23 Jan 2025 20:44:14 +0300 +Subject: [PATCH] fs/xfs: Fix grub_xfs_iterate_dir return value in case of + failure + +Commit ef7850c757 introduced multiple boundary checks in grub_xfs_iterate_dir() +but handled the error incorrectly returning error code instead of 0. + +Also change the error message so that it doesn't match the message +in grub_xfs_read_inode(). + +Fixes: ef7850c757 (fs/xfs: Fix issues found while fuzzing the XFS filesystem) + +Signed-off-by: Egor Ignatov +Upstream: f209887381a56dea79152ab26ffb485718e3218e +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/xfs.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index 70c9f449b..e0daeb45f 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -870,7 +870,11 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + grub_uint8_t c; + + if ((inopos + (smallino ? 4 : 8)) > (grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data)) +- return grub_error (GRUB_ERR_BAD_FS, "not a correct XFS inode"); ++ { ++ grub_error (GRUB_ERR_BAD_FS, "invalid XFS inode"); ++ return 0; ++ } ++ + + /* inopos might be unaligned. */ + if (smallino) +@@ -979,7 +983,10 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + + filename = (char *)(direntry + 1); + if (filename + direntry->len + 1 > (char *) end) +- return grub_error (GRUB_ERR_BAD_FS, "invalid XFS directory entry"); ++ { ++ grub_error (GRUB_ERR_BAD_FS, "invalid XFS directory entry"); ++ return 0; ++ } + + /* The byte after the filename is for the filetype, padding, or + tag, which is not used by GRUB. So it can be overwritten. */ +-- +2.50.1 + diff --git a/boot/grub2/0071-fs-xfs-Propagate-incorrect-inode-error-from-grub_xfs.patch b/boot/grub2/0071-fs-xfs-Propagate-incorrect-inode-error-from-grub_xfs.patch new file mode 100644 index 0000000000..05e31957c5 --- /dev/null +++ b/boot/grub2/0071-fs-xfs-Propagate-incorrect-inode-error-from-grub_xfs.patch @@ -0,0 +1,77 @@ +From 6becb747027c4f9cdb10f23d6eb24fcc238e8b68 Mon Sep 17 00:00:00 2001 +From: Egor Ignatov +Date: Thu, 23 Jan 2025 20:44:15 +0300 +Subject: [PATCH] fs/xfs: Propagate incorrect inode error from + grub_xfs_read_inode + +The incorrect inode error from grub_xfs_read_inode did not propagate because +grub_print_error() resetted grub_errno, and grub_xfs_iterate_dir() did not +handle it at all. + +Signed-off-by: Egor Ignatov +Upstream: https://www.mail-archive.com/grub-devel@gnu.org/msg40098.html +[Not accepted upstream, but in Debian] +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/xfs.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index e0daeb45f..28a342996 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -806,7 +806,6 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename, + fdiro = grub_malloc (sz); + if (!fdiro) + { +- grub_print_error (); + return 0; + } + +@@ -818,7 +817,6 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename, + err = grub_xfs_read_inode (ctx->diro->data, ino, &fdiro->inode); + if (err) + { +- grub_print_error (); + grub_free (fdiro); + return 0; + } +@@ -858,9 +856,13 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + /* Synthesize the direntries for `.' and `..'. */ + if (iterate_dir_call_hook (diro->ino, ".", &ctx)) + return 1; ++ else if (grub_errno) ++ return 0; + + if (iterate_dir_call_hook (parent, "..", &ctx)) + return 1; ++ else if (grub_errno) ++ return 0; + + for (i = 0; i < head->count && + (grub_uint8_t *) de < ((grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data)); i++) +@@ -901,6 +903,9 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + } + de->name[de->len] = c; + ++ if (grub_errno) ++ return 0; ++ + de = grub_xfs_inline_next_de(dir->data, head, de); + } + break; +@@ -998,6 +1003,11 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + grub_free (dirblock); + return 1; + } ++ else if (grub_errno) ++ { ++ grub_free (dirblock); ++ return 0; ++ } + + /* + * The expected number of directory entries is only tracked for the +-- +2.50.1 + diff --git a/boot/grub2/0072-fs-xfs-Handle-root-inode-read-failure-in-grub_xfs_mo.patch b/boot/grub2/0072-fs-xfs-Handle-root-inode-read-failure-in-grub_xfs_mo.patch new file mode 100644 index 0000000000..2d5887dfca --- /dev/null +++ b/boot/grub2/0072-fs-xfs-Handle-root-inode-read-failure-in-grub_xfs_mo.patch @@ -0,0 +1,29 @@ +From 462f1d1a64e57310d10dcd325b36587a1a367d0a Mon Sep 17 00:00:00 2001 +From: Egor Ignatov +Date: Thu, 23 Jan 2025 20:44:13 +0300 +Subject: [PATCH] fs/xfs: Handle root inode read failure in grub_xfs_mount + +Signed-off-by: Egor Ignatov +Upstream: https://www.mail-archive.com/grub-devel@gnu.org/msg40099.html +[Not accepted upstream, but in Debian] +Signed-off-by: Thomas Petazzoni +--- + grub-core/fs/xfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index 28a342996..59bdee5f9 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -1086,6 +1086,8 @@ grub_xfs_mount (grub_disk_t disk) + grub_cpu_to_be64(data->sblock.rootino)); + + grub_xfs_read_inode (data, data->diropen.ino, &data->diropen.inode); ++ if (grub_errno) ++ goto fail; + + return data; + fail: +-- +2.50.1 + diff --git a/boot/grub2/0073-net-drivers-ieee1275-ofnet-Add-missing-grub_malloc.patch b/boot/grub2/0073-net-drivers-ieee1275-ofnet-Add-missing-grub_malloc.patch new file mode 100644 index 0000000000..97bad8c635 --- /dev/null +++ b/boot/grub2/0073-net-drivers-ieee1275-ofnet-Add-missing-grub_malloc.patch @@ -0,0 +1,36 @@ +From 516af0a5bd172123d4c7ff281d65b1f4b0035258 Mon Sep 17 00:00:00 2001 +From: Nicolas Frayer +Date: Wed, 19 Mar 2025 17:39:41 +0100 +Subject: [PATCH] net/drivers/ieee1275/ofnet: Add missing grub_malloc() + +The grub_malloc() has been inadvertently removed from the code after it +has been modified to use safe math functions. + +Fixes: 4beeff8a (net: Use safe math macros to prevent overflows) + +Signed-off-by: Nicolas Frayer +Tested-by: Marta Lewandowska +Reviewed-by: Daniel Kiper +Upstream: 3b25e494d47e7a728e7ce6264b10f2aa1063f9c7 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/drivers/ieee1275/ofnet.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c +index c35b107ad..3004b970e 100644 +--- a/grub-core/net/drivers/ieee1275/ofnet.c ++++ b/grub-core/net/drivers/ieee1275/ofnet.c +@@ -467,6 +467,9 @@ search_net_devices (struct grub_ieee1275_devalias *alias) + return 0; + } + } ++ ++ ofdata->path = grub_malloc (sz); ++ + if (!ofdata->path) + { + grub_print_error (); +-- +2.50.1 + diff --git a/boot/grub2/0074-Constant-time-grub_crypto_memcmp.patch b/boot/grub2/0074-Constant-time-grub_crypto_memcmp.patch new file mode 100644 index 0000000000..7449e08191 --- /dev/null +++ b/boot/grub2/0074-Constant-time-grub_crypto_memcmp.patch @@ -0,0 +1,63 @@ +From 4bbd6ae38efc7c0ae9ffd343157b7f3f37bd729c Mon Sep 17 00:00:00 2001 +From: Gary Lin +Date: Fri, 25 Jul 2025 13:50:23 +0800 +Subject: [PATCH] Constant-time grub_crypto_memcmp() + +Use the constant-time algorithm to compare the given memory blocks. +The code is extracted from the upstream commit: +0739d24cd1648531d0708d1079ff6bbfa6140268 + +Fix: bsc#1234959 + +Signed-off-by: Gary Lin +Upstream: not submitted upstream, as upstream has switched to gcrypt +Taken-from: https://build.opensuse.org/projects/SUSE:SLE-15-SP5:Update/packages/grub2.39923/files/grub2-constant-time-grub_crypto_memcmp.patch?expand=0 +Fixes: https://www.cve.org/CVERecord?id=CVE-2024-56738 +Signed-off-by: Thomas Petazzoni +--- + grub-core/lib/crypto.c | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c +index 396f76410..19db7870a 100644 +--- a/grub-core/lib/crypto.c ++++ b/grub-core/lib/crypto.c +@@ -433,19 +433,28 @@ grub_crypto_gcry_error (gcry_err_code_t in) + return GRUB_ACCESS_DENIED; + } + ++/* ++ * Compare byte arrays of length LEN, return 1 if it's not same, ++ * 0, otherwise. ++ */ + int +-grub_crypto_memcmp (const void *a, const void *b, grub_size_t n) ++grub_crypto_memcmp (const void *b1, const void *b2, grub_size_t len) + { +- register grub_size_t counter = 0; +- const grub_uint8_t *pa, *pb; ++ const grub_uint8_t *a = b1; ++ const grub_uint8_t *b = b2; ++ int ab, ba; ++ grub_size_t i; + +- for (pa = a, pb = b; n; pa++, pb++, n--) ++ /* Constant-time compare. */ ++ for (i = 0, ab = 0, ba = 0; i < len; i++) + { +- if (*pa != *pb) +- counter++; ++ /* If a[i] != b[i], either ab or ba will be negative. */ ++ ab |= a[i] - b[i]; ++ ba |= b[i] - a[i]; + } + +- return !!counter; ++ /* 'ab | ba' is negative when buffers are not equal, extract sign bit. */ ++ return ((unsigned int)(ab | ba) >> (sizeof(unsigned int) * 8 - 1)) & 1; + } + + #ifndef GRUB_UTIL +-- +2.50.1 + diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index e1f2fc105e..3a50ec0ad7 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -5,9 +5,10 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS default y if BR2_arm default y if BR2_aarch64 default y if BR2_RISCV_64 + default y if BR2_loongarch64 depends on BR2_USE_MMU -config BR2_TARGET_GRUB2 +menuconfig BR2_TARGET_GRUB2 bool "grub2" depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS depends on BR2_USE_WCHAR @@ -112,6 +113,15 @@ config BR2_TARGET_GRUB2_RISCV64_EFI 64bit RISC-V platform and you want to boot Grub 2 as an EFI application. +config BR2_TARGET_GRUB2_LOONGARCH64_EFI + bool "loongarch64-efi" + depends on BR2_loongarch64 + select BR2_TARGET_GRUB2_HAS_EFI_BOOT + help + Select this option if the platform you're targetting is a + 64bit LoongArch platform and you want to boot Grub 2 as an EFI + application. + if BR2_TARGET_GRUB2_HAS_LEGACY_BOOT comment "Options for the x86 legacy BIOS or ARM U-Boot support" diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 4df12774a3..f543c53cd8 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -5,7 +5,7 @@ ################################################################################ GRUB2_VERSION = 2.12 -GRUB2_SITE = http://ftp.gnu.org/gnu/grub +GRUB2_SITE = $(BR2_GNU_MIRROR)/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING @@ -19,14 +19,6 @@ GRUB2_INSTALL_IMAGES = YES # doesn't exist upstream, but is added by the Redhat/Fedora # packaging. Not applicable to Buildroot. GRUB2_IGNORE_CVES += CVE-2019-14865 -# CVE-2020-15705 is related to a flaw in the use of the -# grub_linuxefi_secure_validate(), which was added by Debian/Ubuntu -# patches. The issue doesn't affect upstream Grub, and -# grub_linuxefi_secure_validate() is not implemented in the grub2 -# version available in Buildroot. -GRUB2_IGNORE_CVES += CVE-2020-15705 -# vulnerability is specific to the SUSE distribution -GRUB2_IGNORE_CVES += CVE-2021-46705 # vulnerability is specific to the Redhat distribution, affects a # downstream change from Redhat related to password authentication GRUB2_IGNORE_CVES += CVE-2023-4001 @@ -34,6 +26,37 @@ GRUB2_IGNORE_CVES += CVE-2023-4001 # grub2-set-bootflag tool, which doesn't exist upstream GRUB2_IGNORE_CVES += CVE-2024-1048 +# 0004-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch (yes, two +# CVEs are fixed by this patch) +GRUB2_IGNORE_CVES += CVE-2024-45782 +GRUB2_IGNORE_CVES += CVE-2024-56737 + +# 0006-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch +GRUB2_IGNORE_CVES += CVE-2024-45780 + +# 0037-gettext-Integer-overflow-leads-to-heap-OOB-write.patch +GRUB2_IGNORE_CVES += CVE-2024-45777 + +# 0043-fs-bfs-Disable-under-lockdown.patch (yes, two CVEs are fixed by +# this patch) +GRUB2_IGNORE_CVES += CVE-2024-45778 +GRUB2_IGNORE_CVES += CVE-2024-45779 + +# 0044-fs-Disable-many-filesystems-under-lockdown.patch (yes, four +# CVEs are fixed by this patch) +GRUB2_IGNORE_CVES += CVE-2025-0684 +GRUB2_IGNORE_CVES += CVE-2025-0685 +GRUB2_IGNORE_CVES += CVE-2025-0686 +GRUB2_IGNORE_CVES += CVE-2025-0689 + +# 0050-fs-Prevent-overflows-when-allocating-memory-for-arra.patch +# (yes, two CVEs are fixed by this patch) +GRUB2_IGNORE_CVES += CVE-2025-0678 +GRUB2_IGNORE_CVES += CVE-2025-1125 + +# 0074-Constant-time-grub_crypto_memcmp.patch +GRUB2_IGNORE_CVES += CVE-2024-56738 + ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES else @@ -110,6 +133,15 @@ GRUB2_BUILTIN_CONFIG_riscv64-efi = $(GRUB2_BUILTIN_CONFIG_EFI) GRUB2_BUILTIN_MODULES_riscv64-efi = $(GRUB2_BUILTIN_MODULES_EFI) GRUB2_TUPLES-$(BR2_TARGET_GRUB2_RISCV64_EFI) += riscv64-efi +GRUB2_IMAGE_loongarch64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootloongarch64.efi +GRUB2_CFG_loongarch64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg +GRUB2_PREFIX_loongarch64-efi = /EFI/BOOT +GRUB2_TARGET_loongarch64-efi = loongarch64 +GRUB2_PLATFORM_loongarch64-efi = efi +GRUB2_BUILTIN_CONFIG_loongarch64-efi = $(GRUB2_BUILTIN_CONFIG_EFI) +GRUB2_BUILTIN_MODULES_loongarch64-efi = $(GRUB2_BUILTIN_MODULES_EFI) +GRUB2_TUPLES-$(BR2_TARGET_GRUB2_LOONGARCH64_EFI) += loongarch64-efi + # Grub2 is kind of special: it considers CC, LD and so on to be the # tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS, # TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself. diff --git a/boot/grub2/readme.txt b/boot/grub2/readme.txt index 90866e83a9..3b7df3a47d 100644 --- a/boot/grub2/readme.txt +++ b/boot/grub2/readme.txt @@ -10,7 +10,7 @@ Notes on using Grub2 for BIOS-based platforms is enough free space *before* the first partition to store Grub2. Leaving 1 MB of free space is safe. 3. Setup loop device and loop partitions - loop_dev=$(sudo losetup -f disk.img) + loop_dev=$(sudo losetup -f --show disk.img) sudo partx -a "$loop_dev" 4. Prepare the root partition sudo mkfs.ext3 -L root "${loop_dev}p1" @@ -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 ======================================================= @@ -65,7 +65,7 @@ Notes on using Grub2 for x86/x86_64 EFI-based platforms - Create a second partition, type 8300, for the root filesystem. 3. Setup loop device and loop partitions - loop_dev=$(sudo losetup -f disk.img) + loop_dev=$(sudo losetup -f --show disk.img) sudo partx -a "$loop_dev" 4. Prepare the boot partition sudo mkfs.vfat -n boot "${loop_dev}p1" @@ -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 -hda disk.img +2. qemu-system-{i386,x86_64} -bios -hda disk.img Notes on using Grub2 for ARM u-boot-based platforms =================================================== diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index 8f9334b610..00819c5ad6 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_MXS_BOOTLETS +menuconfig BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index de2f0aae20..9c6047df5e 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_OPENSBI +menuconfig BR2_TARGET_OPENSBI bool "opensbi" depends on BR2_riscv help @@ -10,7 +10,7 @@ config BR2_TARGET_OPENSBI System-on-Chip vendors to fit a particular hadware configuration. - https://github.com/riscv/opensbi.git + https://github.com/riscv-software-src/opensbi if BR2_TARGET_OPENSBI choice @@ -19,7 +19,7 @@ choice Select the specific OpenSBI version you want to use config BR2_TARGET_OPENSBI_LATEST_VERSION - bool "1.3" + bool "1.7" config BR2_TARGET_OPENSBI_CUSTOM_VERSION bool "Custom version" @@ -57,7 +57,7 @@ endif config BR2_TARGET_OPENSBI_VERSION string - default "1.3" if BR2_TARGET_OPENSBI_LATEST_VERSION + default "1.7" if BR2_TARGET_OPENSBI_LATEST_VERSION default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ if BR2_TARGET_OPENSBI_CUSTOM_VERSION default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash index 980fb141dc..c82d2de236 100644 --- a/boot/opensbi/opensbi.hash +++ b/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 2c0501eb3475f463b15f5b8531996f64604ea49e0e3ed040ecbd1fc27ecd8c5c opensbi-1.3.tar.gz +sha256 2cf856a4e5e2e052948ddb54ba48232b1f698b7f52e0374fc7d17d51e8c8f7ce opensbi-1.7.tar.gz sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index dd113a0bf8..0142769a12 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -16,7 +16,7 @@ OPENSBI_SITE = $(call qstrip,$(BR2_TARGET_OPENSBI_CUSTOM_REPO_URL)) OPENSBI_SITE_METHOD = git else # Handle official OpenSBI versions -OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION)) +OPENSBI_SITE = $(call github,riscv-software-src,opensbi,v$(OPENSBI_VERSION)) endif OPENSBI_LICENSE = BSD-2-Clause diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index cc0044f00a..e737d2a0ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_OPTEE_OS +menuconfig BR2_TARGET_OPTEE_OS bool "optee_os" depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A || BR2_RISCV_64 help @@ -18,13 +18,18 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "4.3.0" + bool "4.6.0" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help Use the latest release tag from the OP-TEE OS official Git repository. +config BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + bool "Custom version" + help + This option allows to use a specific official version + config BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL bool "Custom tarball" help @@ -43,6 +48,10 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_GIT endchoice +config BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE + string "OP-TEE version" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL config BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION @@ -70,7 +79,9 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "4.3.0" if BR2_TARGET_OPTEE_OS_LATEST + default "4.6.0" if BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \ + if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT @@ -156,7 +167,7 @@ config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES config BR2_TARGET_OPTEE_OS_CORE_IMAGES string "Binary boot images" - default "tee.bin tee-*_v2.bin" + default "tee.bin tee-raw.bin tee-*_v2.bin" help Names of generated image files that are installed in the output images/ directory. diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 16b3d7430e..c86bd1e0d9 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,3 @@ -# From https://github.com/OP-TEE/optee_os/archive/4.3.0/optee-os-4.3.0.tar.gz -sha256 390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096 optee-os-4.3.0.tar.gz # Locally computed +sha256 0c947c6972bf50c483cb993af01041d4094b1e03711c7246cdde6ba2ffc351fe optee-os-4.6.0.tar.gz sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 883f166fc1..25c917e2fc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -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 diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index 5aa4ca06e8..f36abd655d 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 +sha256 46319cd228d8f2c06c744241c0f342412329a7c630436fce7f82cf6936b1d603 shim-16.1.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index f5b3d1cee6..1bd3fac103 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.8 +SHIM_VERSION = 16.1 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause diff --git a/boot/syslinux/0021-load_linux-correct-a-type.patch b/boot/syslinux/0021-load_linux-correct-a-type.patch new file mode 100644 index 0000000000..ff4e5a2d29 --- /dev/null +++ b/boot/syslinux/0021-load_linux-correct-a-type.patch @@ -0,0 +1,34 @@ +From 7f1b68d561dfe615d5cd73d2f4561ac032832802 Mon Sep 17 00:00:00 2001 +From: Scot Doyle +Date: Sat, 7 Feb 2015 13:52:05 -0500 +Subject: [PATCH] load_linux: correct a type + +Correct base's type to match its initialization from prot_mode_base and +passage to syslinux_memmap_find(). Tested with extlinux. + +Signed-off-by: Scot Doyle +Signed-off-by: Gene Cumm +Upstream: https://github.com/geneC/syslinux/commit/83aad4f69065509ba5b1c080edccfed316a4cff0 +Signed-off-by: Thomas Petazzoni +--- + com32/lib/syslinux/load_linux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c +index 06ae2a97..ac737293 100644 +--- a/com32/lib/syslinux/load_linux.c ++++ b/com32/lib/syslinux/load_linux.c +@@ -155,8 +155,8 @@ int bios_boot_linux(void *kernel_buf, size_t kernel_size, + char *cmdline) + { + struct linux_header hdr, *whdr; +- size_t real_mode_size, prot_mode_size, base; +- addr_t real_mode_base, prot_mode_base, prot_mode_max; ++ size_t real_mode_size, prot_mode_size; ++ addr_t real_mode_base, prot_mode_base, prot_mode_max, base; + addr_t irf_size; + size_t cmdline_size, cmdline_offset; + struct setup_data *sdp; +-- +2.47.1 + diff --git a/boot/syslinux/0022-com32-modules-pxechn.c-use-proper-type-in-struct-dat.patch b/boot/syslinux/0022-com32-modules-pxechn.c-use-proper-type-in-struct-dat.patch new file mode 100644 index 0000000000..65ad65eff6 --- /dev/null +++ b/boot/syslinux/0022-com32-modules-pxechn.c-use-proper-type-in-struct-dat.patch @@ -0,0 +1,46 @@ +From b9514337ecfc0efaa04a926713188d87a88bb59e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 18 Jan 2025 16:03:34 +0100 +Subject: [PATCH] com32/modules/pxechn.c: use proper type in struct data_area +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use a size_t for the size field, so that we meet the expectations of +the loadfile() function. + +Fixes a build issue with GCC >= 14: + +com32/modules/pxechn.c:985:38: error: passing argument 3 of ‘loadfile’ from incompatible pointer type [-Wincompatible-pointer-types] + 985 | if (loadfile(pxe.fn, &file.data, &file.size)) { + | ^~~~~~~~~~ + | | + | addr_t * {aka unsigned int *} + +In file included from com32/modules/pxechn.c:33: +com32/include/syslinux/loadfile.h:11:37: note: expected ‘size_t *’ {aka ‘long unsigned int *’} but argument is of type ‘addr_t *’ {aka ‘unsigned int *’} + 11 | int loadfile(const char *, void **, size_t *); + | ^~~~~~~~ + +Upstream: N/A, dead +Signed-off-by: Thomas Petazzoni +--- + com32/modules/pxechn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/com32/modules/pxechn.c b/com32/modules/pxechn.c +index e4e21e88..15f008a3 100644 +--- a/com32/modules/pxechn.c ++++ b/com32/modules/pxechn.c +@@ -130,7 +130,7 @@ struct pxelinux_opt { + struct data_area { + void *data; + addr_t base; +- addr_t size; ++ size_t size; + }; + + /* From chain.c */ +-- +2.47.1 + diff --git a/boot/syslinux/0023-com32-chain-chain.h-use-proper-type-in-struct-data_a.patch b/boot/syslinux/0023-com32-chain-chain.h-use-proper-type-in-struct-data_a.patch new file mode 100644 index 0000000000..d4b62eb234 --- /dev/null +++ b/boot/syslinux/0023-com32-chain-chain.h-use-proper-type-in-struct-data_a.patch @@ -0,0 +1,42 @@ +From 57dddf8d6d1c48aa78b9cdfb2b474aa89c3ae7c7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 18 Jan 2025 16:11:36 +0100 +Subject: [PATCH] com32/chain/chain.h: use proper type in struct data_area +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build issue with GCC >= 14: + +com32/chain/chain.c:517:44: error: passing argument 3 of ‘loadfile’ from incompatible pointer type [-Wincompatible-pointer-types] + 517 | if (loadfile(opt.file, &fdat.data, &fdat.size)) { + | ^~~~~~~~~~ + | | + | addr_t * {aka unsigned int *} +In file included from com32/chain/chain.c:32: +com32/include/syslinux/loadfile.h:11:37: note: expected ‘size_t *’ {aka ‘long unsigned int *’} but argument is of type ‘addr_t *’ {aka ‘unsigned int *’} + 11 | int loadfile(const char *, void **, size_t *); + | ^~~~~~~~ + +Upstream: N/A, dead +Signed-off-by: Thomas Petazzoni +--- + com32/chain/chain.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/com32/chain/chain.h b/com32/chain/chain.h +index fb5914b1..dcf43844 100644 +--- a/com32/chain/chain.h ++++ b/com32/chain/chain.h +@@ -21,7 +21,7 @@ + struct data_area { + void *data; + addr_t base; +- addr_t size; ++ size_t size; + }; + + #endif +-- +2.47.1 + diff --git a/boot/syslinux/0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch b/boot/syslinux/0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch new file mode 100644 index 0000000000..9f61745a61 --- /dev/null +++ b/boot/syslinux/0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch @@ -0,0 +1,48 @@ +From cbc8a8e25c3548771de5294f5a1eaef6bfe9b5da Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 18 Jan 2025 17:03:16 +0100 +Subject: [PATCH] efi/main.c: fix incorrect type of load_error_buf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +load_error_buf is used as argument of setjmp()/longjmp(), so it should +be a "jmp_buf", not a "jmp_buf *". According to the setjmp/longjmp man +page: + + int setjmp(jmp_buf env); + int sigsetjmp(sigjmp_buf env, int savesigs); + +Fixes build issue with GCC >= 14: + +efi/main.c:1329:21: error: passing argument 1 of ‘setjmp’ from incompatible pointer type [-Wincompatible-pointer-types] + 1329 | if (!setjmp(load_error_buf)) + | ^~~~~~~~~~~~~~ + | | + | struct (*)[1] +x86_64-buildroot-linux-gnu/sysroot/usr/include/efi/efisetjmp.h:7:29: note: expected ‘struct *’ but argument is of type ‘struct (*)[1]’ + 7 | extern UINTN setjmp(jmp_buf env) __attribute__((returns_twice)); + | ~~~~~~~~^~~ + +Upstream: N/A dead +Signed-off-by: Thomas Petazzoni +--- + efi/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/efi/main.c b/efi/main.c +index 7dc7bca7..045dae56 100644 +--- a/efi/main.c ++++ b/efi/main.c +@@ -30,7 +30,7 @@ uint32_t timer_irq; + __export uint8_t KbdMap[256]; + char aux_seg[256]; + +-static jmp_buf *load_error_buf; ++static jmp_buf load_error_buf; + + static inline EFI_STATUS + efi_close_protocol(EFI_HANDLE handle, EFI_GUID *guid, EFI_HANDLE agent, +-- +2.47.1 + diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in index c95dac1804..66baf921d3 100644 --- a/boot/syslinux/Config.in +++ b/boot/syslinux/Config.in @@ -1,9 +1,10 @@ -config BR2_TARGET_SYSLINUX +menuconfig BR2_TARGET_SYSLINUX bool "syslinux" depends on BR2_i386 || BR2_x86_64 # Make sure at least one of the flavors is installed select BR2_TARGET_SYSLINUX_ISOLINUX \ if !BR2_TARGET_SYSLINUX_PXELINUX && \ + !BR2_TARGET_SYSLINUX_LPXELINUX && \ !BR2_TARGET_SYSLINUX_MBR && \ !BR2_TARGET_SYSLINUX_EFI select BR2_PACKAGE_UTIL_LINUX @@ -27,11 +28,22 @@ config BR2_TARGET_SYSLINUX_ISOLINUX optical media (CDROM, DVD.) config BR2_TARGET_SYSLINUX_PXELINUX - bool "install pxelinux" + bool "install pxelinux (TFTP-only)" select BR2_TARGET_SYSLINUX_LEGACY_BIOS help Install the legacy-BIOS 'pxelinux' image, to boot off - the network using PXE. + the network using PXE and TFTP. + +config BR2_TARGET_SYSLINUX_LPXELINUX + bool "install lpxelinux (TFTP, HTTP, FTP)" + select BR2_TARGET_SYSLINUX_LEGACY_BIOS + help + Install the legacy-BIOS 'lpxelinux' image, to boot off + the network using PXE, and TFTP, HTTP, or FTP. + + Note: a TFTP server is still required to serve the + lpxelinux boot image; HTTP or FTP can only be used + by lpxelinux to retrieve the kernel (and initrd...) config BR2_TARGET_SYSLINUX_MBR bool "install mbr" diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index cc52c49aee..f938634c35 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -56,11 +56,19 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP # syslinux build system has no convenient way to pass CFLAGS, # and the internal zlib should take precedence so -I shouldn't # be used. +# gcc-15 defaults to -std=gnu23 which introduces build failures. +# We force "-std=gnu17" for gcc version supporting it. Earlier gcc +# versions will work, since they are using the older standard. +# Install in a temporary location that eases final install into +# images/ (see corresponding command, below). +# Repeat the target, otherwise syslinux will try to build everything +# Repeat LD (and CC) as it happens that some binaries are linked at +# install-time. define SYSLINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) \ ASCIIDOC_OK=-1 \ A2X_XML_OK=-1 \ - CC="$(TARGET_CC)" \ + CC="$(TARGET_CC) $(if $(BR2_TOOLCHAIN_GCC_AT_LEAST_8),-std=gnu17)" \ LD="$(TARGET_LD)" \ OBJCOPY="$(TARGET_OBJCOPY)" \ AS="$(TARGET_AS)" \ @@ -70,6 +78,10 @@ define SYSLINUX_BUILD_CMDS LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ PYTHON=$(HOST_DIR)/bin/python3 \ $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) + $(TARGET_MAKE_ENV) $(MAKE1) $(SYSLINUX_EFI_ARGS) INSTALLROOT=$(@D)/br-root.temp \ + CC="$(TARGET_CC)" \ + LD="$(TARGET_LD)" \ + -C $(@D) $(SYSLINUX_TARGET) install endef # While the actual bootloader is compiled for the target, several @@ -77,6 +89,8 @@ endef # Repeat the target, otherwise syslinux will try to build everything # Repeat LD (and CC) as it happens that some binaries are linked at # install-time. +# Don't use the temporarily-installed br-root.temp: HOST_DIR may be setup +# differently (merged usr, merged bin...) define SYSLINUX_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE1) $(SYSLINUX_EFI_ARGS) INSTALLROOT=$(HOST_DIR) \ CC="$(TARGET_CC)" \ @@ -94,20 +108,21 @@ SYSLINUX_POST_INSTALL_TARGET_HOOKS += SYSLINUX_POST_INSTALL_CLEANUP SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += bios/core/isolinux.bin SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += bios/core/pxelinux.bin +SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_LPXELINUX) += bios/core/lpxelinux.bin SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_MBR) += bios/mbr/mbr.bin SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_EFI) += $(SYSLINUX_EFI_BITS)/efi/syslinux.efi SYSLINUX_C32 = $(call qstrip,$(BR2_TARGET_SYSLINUX_C32)) -# We install the c32 modules from the host-installed tree, where they -# are all neatly installed in a single location, while they are +# We install the c32 modules from the temporarily installed tree, where +# they are all neatly installed in a single location, while they are # scattered around everywhere in the build tree. define SYSLINUX_INSTALL_IMAGES_CMDS for i in $(SYSLINUX_IMAGES-y); do \ $(INSTALL) -D -m 0755 $(@D)/$$i $(BINARIES_DIR)/syslinux/$${i##*/}; \ done for i in $(SYSLINUX_C32); do \ - $(INSTALL) -D -m 0755 $(HOST_DIR)/share/syslinux/$${i} \ + $(INSTALL) -D -m 0755 $(@D)/br-root.temp/usr/share/syslinux/$${i} \ $(BINARIES_DIR)/syslinux/$${i}; \ done endef diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash index 2398d02da2..d94590e705 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61 LICENSE.ti -sha256 ae888a0a22f8c5b8fe841236d6e40bb2f821d9a4161dab6924fd989e1467ef0e ti-linux-firmware-09.02.00.009.tar.xz +sha256 eda8af01e1c142e3ebe766877585ac4f37e4f1dc4ad5fe29ad15c120c18ccece ti-k3-boot-firmware-11.01.12.tar.gz diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk index 9332732ad4..7689071a4c 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -4,9 +4,8 @@ # ################################################################################ -TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.009 -TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot -TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz +TI_K3_BOOT_FIRMWARE_VERSION = 11.01.12 +TI_K3_BOOT_FIRMWARE_SITE = $(call github,TexasInstruments,ti-linux-firmware,$(TI_K3_BOOT_FIRMWARE_VERSION)) TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES TI_K3_BOOT_FIRMWARE_LICENSE = TI Proprietary TI_K3_BOOT_FIRMWARE_LICENSE_FILES = LICENSE.ti diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c7898ebf6..b4fb46e55b 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ -config BR2_TARGET_TI_K3_R5_LOADER +menuconfig BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman help Separate U-Boot SPL build for R5 core on TI's K3 processors. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index e426f039e0..db5c3cdaf8 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -46,6 +46,7 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ + host-gnutls \ host-openssl \ host-python3 \ host-python-jsonschema \ diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 8648d6eb7e..d40e1e95e0 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -1,4 +1,4 @@ -config BR2_TARGET_UBOOT +menuconfig BR2_TARGET_UBOOT bool "U-Boot" help Build "Das U-Boot" Boot Monitor @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2024.10" + bool "2025.10" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2024.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2025.10" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -274,7 +274,31 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE Some platforms (such as Rockchip) encapsulate the TEE inside U-Boot. This option makes sure optee-os gets built prior to U-Boot, and that the TEE variable pointing to OPTEE's - tee.elf, is passed during the Buildroot build. + core file, is passed during the Buildroot build. + +choice + prompt "U-Boot OPTEE TEE format" + default BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_ELF + depends on BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE + help + Select the TEE format. + You may select the TEE in ELF format only for OP-TEE + versions before 3.8.0. + Since this version, the TEE in binary format must be used as + it contains important meta-data. + +config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_ELF + bool "tee.elf" + help + ELF format may be used only for OP-TEE versions before + 3.8.0. + +config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_BIN + bool "tee.bin" + help + Binary format must be used for OP-TEE versions since 3.8.0. + +endchoice config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" @@ -290,6 +314,7 @@ config BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE bool "U-Boot needs firmware-imx" depends on BR2_PACKAGE_FIRMWARE_IMX depends on BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW || \ + BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 || \ BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW help Some i.MX8 platforms (such as i.MX8 M, i.MX 8M Mini, i.MX 8M @@ -315,7 +340,7 @@ config BR2_TARGET_UBOOT_USE_BINMAN help Use binman tool for generation and signing of boot images. - https://docs.u-boot.org/en/v2024.10/develop/package/binman.html + https://docs.u-boot.org/en/v2025.10/develop/package/binman.html menu "U-Boot binary format" @@ -446,6 +471,14 @@ config BR2_TARGET_UBOOT_FORMAT_SD See doc/README.mxs (or doc/README.mx28_common before 2013.07) +config BR2_TARGET_UBOOT_FORMAT_QSPI_BIN + bool "qspi.bin" + depends on BR2_TARGET_UBOOT_ZYNQMP + help + When booting from qspi flash, u-boot can generate a single + file for flashing by combining the spl/boot.bin and + u-boot.itb files into a unified binary. + config BR2_TARGET_UBOOT_FORMAT_STM32 bool "u-boot.stm32" depends on BR2_arm @@ -542,29 +575,62 @@ config BR2_TARGET_UBOOT_INITIAL_ENV config BR2_TARGET_UBOOT_ZYNQMP bool "Boot on the Xilinx ZynqMP SoCs" - depends on BR2_aarch64 + depends on BR2_TARGET_XILINX_FIRMWARE_ARCH_SUPPORTS + depends on BR2_cortex_a53 help Enable options specific to the Xilinx ZynqMP family of SoCs. if BR2_TARGET_UBOOT_ZYNQMP -config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT - bool "xilinx-prebuilt pmufw.elf" +choice + prompt "PMUFW origin" + default BR2_TARGET_UBOOT_ZYNQMP_PMUFW_CUSTOM depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + help + Choose between the following options: + 1) Build from source via xilinx-embeddedsw + 2) Official prebuilt via xilinx-prebuilt + 3) Prebuilt from custom location + + U-Boot build process will generate a boot.bin (to be loaded + by the ZynqMP boot ROM) containing both the U-Boot SPL and + the PMU firmware in the Xilinx-specific boot format. + +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW + bool "Build from source via xilinx-embeddedsw" + depends on BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW + help + Use xilinx-embeddedsw boot package for building + zynqmp pmufw.elf from + https://github.com/Xilinx/embeddedsw repo. + +comment "To build from source, xilinx-embeddedsw needs to be enabled with zynqmp_pmufw option." + depends on !BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW + +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + bool "Prebuilt via xilinx-prebuilt" depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA help Use xilinx-prebuilt boot package for downloading prebuilt zynqmp pmufw.elf from https://github.com/Xilinx/soc-prebuilt-firmware repo. - U-Boot build process will generate a boot.bin (to be loaded by - by the ZynqMP boot ROM) containing both the U-Boot SPL and the - PMU firmware in the Xilinx-specific boot format. +comment "To use official prebuilt, xilinx-prebuilt needs to be enabled with zynqmp or kria option." + depends on !BR2_TARGET_XILINX_PREBUILT_KRIA + depends on !BR2_TARGET_XILINX_PREBUILT_ZYNQMP + +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_CUSTOM + bool "Prebuilt from custom location" + help + Location of a PMU firmware binary defined by: + BR2_TARGET_UBOOT_ZYNQMP_PMUFW + +endchoice # PMUFW origin config BR2_TARGET_UBOOT_ZYNQMP_PMUFW string "Custom PMU firmware location" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG - depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + depends on BR2_TARGET_UBOOT_ZYNQMP_PMUFW_CUSTOM help Location of a PMU firmware binary. @@ -636,6 +702,41 @@ config BR2_TARGET_UBOOT_ZYNQMP_PSU_INIT_FILE endif +config BR2_TARGET_UBOOT_ZYNQ + bool "Boot on the Xilinx Zynq SoCs" + depends on BR2_arm + depends on BR2_cortex_a9 + help + Enable options specific to the Xilinx Zynq family of SoCs. + +config BR2_TARGET_UBOOT_ZYNQ_PS7_INIT_FILE + string "Custom ps7_init_gpl file" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on BR2_TARGET_UBOOT_ZYNQ + help + On Zynq the booloader is responsible for some basic + initializations, such as enabling peripherals and + configuring pinmuxes. The ps7_init_gpl.c file (and, + optionally, ps7_init_gpl.h) contains the code for such + initializations. + + Although U-Boot contains ps7_init_gpl.c files for some + boards, each of them describes only one specific + configuration. Users of a different board, or needing a + different configuration, can generate custom files using + the Xilinx Vivado development tools. + + Set this variable to the path to your ps7_init_gpl.c file + (e.g. "board/myboard/ps7_init_gpl.c"). ps7_init_gpl.h, if + needed, should be in the same directory. U-Boot will build + and link the user-provided file instead of the built-in. + + Leave empty to use the files provided by U-Boot. + + This feature requires commit + 6da4f67ad09cd8b311d77b2b04e557b7ef65b56c from upstream + U-Boot, available from versions after 2018.07. + config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC bool "CRC image for Altera SoC FPGA (mkpimage)" depends on BR2_arm diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index af025a583e..7b71e2d948 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d8faef648f..7bd0937df2 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -103,8 +103,14 @@ endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_ITB),y) UBOOT_BINS += u-boot.itb +ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) UBOOT_MAKE_TARGET += u-boot.itb endif +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_QSPI_BIN),y) +UBOOT_BINS += qspi.bin +endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y) UBOOT_BINS += u-boot.imx @@ -196,7 +202,11 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) UBOOT_DEPENDENCIES += optee-os +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_ELF),y) UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf +else ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_BIN),y) +UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.bin +endif endif # TI K3 devices needs at least ti-sysfw (System Firmware) provided @@ -297,7 +307,7 @@ endif # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE - if [ -f $(@D)/COPYING ]; then \ + if [ -f $(@D)/COPYING ] && [ ! -f $(@D)/Licenses/gpl-2.0.txt ]; then \ $(INSTALL) -m 0644 -D $(@D)/COPYING $(@D)/Licenses/gpl-2.0.txt; \ fi endef @@ -449,7 +459,10 @@ endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) -ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT),y) +ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW),y) +UBOOT_DEPENDENCIES += xilinx-embeddedsw +UBOOT_ZYNQMP_PMUFW_PATH = $(BINARIES_DIR)/pmufw.elf +else ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT),y) UBOOT_DEPENDENCIES += xilinx-prebuilt UBOOT_ZYNQMP_PMUFW_PATH = $(BINARIES_DIR)/pmufw.elf else @@ -507,6 +520,17 @@ endif endif # BR2_TARGET_UBOOT_ZYNQMP +ifeq ($(BR2_TARGET_UBOOT_ZYNQ),y) +UBOOT_ZYNQ_PS7_INIT = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQ_PS7_INIT_FILE)) +UBOOT_ZYNQ_PS7_INIT_PATH = $(shell readlink -f $(UBOOT_ZYNQ_PS7_INIT)) + +ifneq ($(UBOOT_ZYNQ_PS7_INIT),) +define UBOOT_ZYNQ_KCONFIG_PS7_INIT + $(call KCONFIG_SET_OPT,CONFIG_XILINX_PS_INIT_FILE,"$(UBOOT_ZYNQ_PS7_INIT_PATH)") +endef +endif +endif # BR2_TARGET_UBOOT_ZYNQ + define UBOOT_INSTALL_OMAP_IFT_IMAGE cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/ endef @@ -549,6 +573,7 @@ define UBOOT_KCONFIG_FIXUP_CMDS $(UBOOT_ZYNQMP_KCONFIG_PMUFW) $(UBOOT_ZYNQMP_KCONFIG_PM_CFG) $(UBOOT_ZYNQMP_KCONFIG_PSU_INIT) + $(UBOOT_ZYNQ_KCONFIG_PS7_INIT) $(UBOOT_KCONFIG_DEFAULT_ENV_FILE) endef diff --git a/boot/xilinx-embeddedsw/Config.in b/boot/xilinx-embeddedsw/Config.in new file mode 100644 index 0000000000..3826f2e18e --- /dev/null +++ b/boot/xilinx-embeddedsw/Config.in @@ -0,0 +1,71 @@ +comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-buildroot-elf" + depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf" + depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + +menuconfig BR2_TARGET_XILINX_EMBEDDEDSW + bool "xilinx-embeddedsw" + depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + help + Build boot firmware applications from source for Xilinx + boards. Users can mix and match applications to be built + by xilinx-embeddedsw and applications to be copied by + xilinx-prebuilt. If a xilinx-embeddedsw application is + selected, it will be built and installed from the Xilinx + embeddedsw repo, and it will not be copied from the + xilinx-prebuilt repo. + + Applications can be found on the Xilinx embeddedsw repo: + https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps + +if BR2_TARGET_XILINX_EMBEDDEDSW + +config BR2_TARGET_XILINX_EMBEDDEDSW_VERSION + string "xilinx-embeddedsw version" + default "xilinx_v2025.1" + help + Release version of Xilinx/embeddedsw. + Must be xilinx_v2023.1 or newer. + +config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM + bool "versal plm" + depends on BR2_cortex_a72 + help + Build versal plm application from Xilinx/embeddedsw repo. + If selected, the xilinx-prebuilt package will not install + the plm.elf since it will come from the xilinx-embeddedsw + package. + + https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/versal_plm + +config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW + bool "versal psmfw" + depends on BR2_cortex_a72 + help + Build versal psmfw application from Xilinx/embeddedsw repo. + If selected, the xilinx-prebuilt package will not install + the psmfw.elf since it will come from the xilinx-embeddedsw + package. + + https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/versal_psmfw + +config BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW + bool "zynqmp pmufw" + depends on BR2_cortex_a53 + help + Build zynqmp pmufw application from Xilinx/embeddedsw repo. + If selected, the xilinx-prebuilt package will not install + the pmufw.elf since it will come from the xilinx-embeddedsw + package. + + https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/zynqmp_pmufw + +config BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS + string "xilinx-embeddedsw optional zynqmp_pmufw user cflags" + depends on BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW + help + Add optional cflags when building xilinx zynqmp_pmufw. + + Example cflag options can be found here: + https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/src/xpfw_config.h + +endif # BR2_TARGET_XILINX_EMBEDDEDSW diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash b/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash new file mode 100644 index 0000000000..0a42bab314 --- /dev/null +++ b/boot/xilinx-embeddedsw/xilinx-embeddedsw.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 867b7c7652f754d1a3d6edfe76e53223670e2b4c7e4144d4db1604403d68f616 xilinx-embeddedsw-xilinx_v2025.1.tar.gz + +# Locally calculated +sha256 fbee87edd32cf203fdd7925f0bab15c98e2dc1e0d61e70867f1190dc4a605b12 license.txt diff --git a/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk new file mode 100644 index 0000000000..abcfee255d --- /dev/null +++ b/boot/xilinx-embeddedsw/xilinx-embeddedsw.mk @@ -0,0 +1,91 @@ +################################################################################ +# +# xilinx-embeddedsw +# +################################################################################ + +XILINX_EMBEDDEDSW_VERSION = $(call qstrip,$(BR2_TARGET_XILINX_EMBEDDEDSW_VERSION)) +XILINX_EMBEDDEDSW_SITE = $(call github,Xilinx,embeddedsw,$(XILINX_EMBEDDEDSW_VERSION)) +XILINX_EMBEDDEDSW_LICENSE = MIT +XILINX_EMBEDDEDSW_LICENSE_FILES = license.txt +XILINX_EMBEDDEDSW_INSTALL_TARGET = NO +XILINX_EMBEDDEDSW_INSTALL_IMAGES = YES +XILINX_EMBEDDEDSW_DEPENDENCIES = toolchain-bare-metal-buildroot + +XILINX_EMBEDDEDSW_MICROBLAZE_CC = $(call qstrip, \ + $(if $(wildcard $(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc), \ + $(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc, \ + $(HOST_DIR)/bin/microblazeel-buildroot-elf-gcc)) +XILINX_EMBEDDEDSW_MICROBLAZE_AR = $(XILINX_EMBEDDEDSW_MICROBLAZE_CC)-ar + +ifeq ($(basename $(notdir $(XILINX_EMBEDDEDSW_MICROBLAZE_CC))),microblazeel-xilinx-elf-gcc) +$(warning microblazeel-xilinx-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is not supported anymore!) +$(error Replace microblazeel-xilinx-elf with microblazeel-buildroot-elf in BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH) +endif + +# ZYNQMP_PMUFW application allows users to add cflags +XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS = \ + $(call qstrip,$(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS)) +XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_CFLAGS = \ + "-Os -flto -ffat-lto-objects $(XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS)" + +XILINX_EMBEDDEDSW_CFLAGS = "-Os -flto -ffat-lto-objects" + +ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y) +define XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM + $(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS) +endef + +define XILINX_EMBEDDEDSW_INSTALL_VERSAL_PLM + $(INSTALL) -D -m 0755 $(@D)/lib/sw_apps/versal_plm/src/versal/plm.elf \ + $(BINARIES_DIR)/plm.elf +endef +endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM + +ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW),y) +define XILINX_EMBEDDEDSW_BUILD_VERSAL_PSMFW + $(MAKE) -C $(@D)/lib/sw_apps/versal_psmfw/src/versal \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS) +endef + +define XILINX_EMBEDDEDSW_INSTALL_VERSAL_PSMFW + $(INSTALL) -D -m 0755 $(@D)/lib/sw_apps/versal_psmfw/src/versal/psmfw.elf \ + $(BINARIES_DIR)/psmfw.elf +endef +endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW + +ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW),y) +define XILINX_EMBEDDEDSW_BUILD_ZYNQMP_PMUFW + $(MAKE) -C $(@D)/lib/sw_apps/zynqmp_pmufw/src \ + COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \ + CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \ + CFLAGS=$(XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_CFLAGS) +endef + +define XILINX_EMBEDDEDSW_INSTALL_ZYNQMP_PMUFW + $(INSTALL) -D -m 0755 $(@D)/lib/sw_apps/zynqmp_pmufw/src/executable.elf \ + $(BINARIES_DIR)/pmufw.elf +endef +endif # BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW + +define XILINX_EMBEDDEDSW_BUILD_CMDS + $(XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM) + $(XILINX_EMBEDDEDSW_BUILD_VERSAL_PSMFW) + $(XILINX_EMBEDDEDSW_BUILD_ZYNQMP_PMUFW) +endef + +define XILINX_EMBEDDEDSW_INSTALL_IMAGES_CMDS + $(XILINX_EMBEDDEDSW_INSTALL_VERSAL_PLM) + $(XILINX_EMBEDDEDSW_INSTALL_VERSAL_PSMFW) + $(XILINX_EMBEDDEDSW_INSTALL_ZYNQMP_PMUFW) +endef + +$(eval $(generic-package)) diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in index 94ef3dd111..b218458ba5 100644 --- a/boot/xilinx-prebuilt/Config.in +++ b/boot/xilinx-prebuilt/Config.in @@ -1,16 +1,23 @@ -config BR2_TARGET_XILINX_PREBUILT +menuconfig BR2_TARGET_XILINX_PREBUILT bool "xilinx-prebuilt" - depends on BR2_aarch64 help Pre-built firmware files for Xilinx boards. + The pre-built firmware applications will only be installed + if they are not being built by the xilinx-embeddedsw + package. + + Users can mix and match applications to build with + xilinx-embeddedsw and applications to simply install with + xilinx-prebuilt. + https://github.com/Xilinx/soc-prebuilt-firmware if BR2_TARGET_XILINX_PREBUILT config BR2_TARGET_XILINX_PREBUILT_VERSION string "prebuilt version" - default "xilinx_v2024.1" + default "xilinx_v2025.1_update1" help Release version of Xilinx firmware. Must be xilinx_v2023.1 or newer. @@ -18,16 +25,20 @@ config BR2_TARGET_XILINX_PREBUILT_VERSION choice bool "family variant" default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_PACKAGE_VERSAL_FIRMWARE # legacy + default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_cortex_a72 default BR2_TARGET_XILINX_PREBUILT_ZYNQMP config BR2_TARGET_XILINX_PREBUILT_ZYNQMP bool "zynqmp" + depends on BR2_cortex_a53 config BR2_TARGET_XILINX_PREBUILT_KRIA bool "kria" + depends on BR2_cortex_a53 config BR2_TARGET_XILINX_PREBUILT_VERSAL bool "versal" + depends on BR2_cortex_a72 endchoice @@ -55,6 +66,15 @@ config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA +config BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI + bool "install versal pld.pdi" + depends on BR2_TARGET_XILINX_PREBUILT_VERSAL + help + When using the Versal Segmented Configuration, there is a + pld.pdi file containing the FPGA bitstream which can be + loaded at run-time. By enabling this option, the pld.pdi + will be installed to the target /lib/firmware/xilinx dir. + config BR2_TARGET_XILINX_PREBUILT_FAMILY string default "zynqmp" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash index c955cd79f5..6879b88d83 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.hash +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f xilinx-prebuilt-xilinx_v2024.1.tar.gz +sha256 48fd698a16f79b9a828c35ca5b2b50fe832149d1a2938c94c0bb6a2e249b0bed xilinx-prebuilt-xilinx_v2025.1_update1.tar.gz + +# Locally calculated +sha256 7b2074b607264a07347e1a7ef0323229585942793469f34b2cf9628f7623e05f LICENSE diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index 9f36ee7285..95b656cdde 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -19,7 +19,6 @@ XILINX_PREBUILT_LICENSE = MIT XILINX_PREBUILT_LICENSE_FILES = LICENSE endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA -XILINX_PREBUILT_INSTALL_TARGET = NO XILINX_PREBUILT_INSTALL_IMAGES = YES XILINX_PREBUILT_FAMILY = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_FAMILY)) @@ -28,41 +27,104 @@ XILINX_PREBUILT_BOARD = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_BOARD)) XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAMILY) ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) -# We need the *.pdi glob, because the file has different names for the -# different boards, but there is only one, and it has to be named -# vpl_gen_fixed.pdi when installed. ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y) -XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf +# Supports either plm.elf or plmfw.elf filenames +XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm*.elf # Unlike the psmfw.elf file for Xilinx development boards, # AMD Vivado Design Suite currently generates a file named psm_fw.elf. # Future versions of AMD Vivado will generate a file named psmfw.elf, # so to support current and future AMD Vivado versions, the filename # psm*fw.elf is used. XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf -XILINX_PREBUILT_PDI = $(@D)/*.pdi +# We need the *.pdi glob, because the file has different names for the +# different boards, and it has to be named boot.pdi when installed. +# If Segmented Configuration is used, there will be two pdi files and we need +# the file that has "_boot.pdi" in the filename. +define XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI + $(INSTALL) -D -m 0644 \ + $(if $(wildcard $(@D)/*_boot.pdi), \ + $(@D)/*_boot.pdi, \ + $(@D)/*.pdi \ + ) \ + $(BINARIES_DIR)/boot.pdi +endef + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI),y) +# Install pld.pdi in target file system for run-time loading when using +# Versal Segmented Configuration. +define XILINX_PREBUILT_INSTALL_VERSAL_XSA_PLD_PDI + $(if $(wildcard $(@D)/*_pld.pdi), + mkdir -p $(TARGET_DIR)/lib/firmware/xilinx && \ + $(INSTALL) -D -m 0644 $(@D)/*_pld.pdi \ + $(TARGET_DIR)/lib/firmware/xilinx + ) +endef +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA -XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf +# Supports either plm.elf or plmfw.elf filenames +XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm*.elf XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf -XILINX_PREBUILT_PDI = $(XILINX_PREBUILT_BOARD_DIR)/*.pdi +# We need the *.pdi glob, because the file has different names for the +# different boards, and it has to be named boot.pdi when installed. +# If Segmented Configuration is used, there will be two pdi files and we need +# the file that has "_boot.pdi" in the filename. +define XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI + $(INSTALL) -D -m 0644 \ + $(if $(wildcard $(XILINX_PREBUILT_BOARD_DIR)/*_boot.pdi), \ + $(XILINX_PREBUILT_BOARD_DIR)/*_boot.pdi, \ + $(XILINX_PREBUILT_BOARD_DIR)/*.pdi \ + ) \ + $(BINARIES_DIR)/boot.pdi +endef + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI),y) +# Install pld.pdi in target file system for run-time loading when using +# Versal Segmented Configuration. +define XILINX_PREBUILT_INSTALL_VERSAL_PLD_PDI + $(if $(wildcard $(XILINX_PREBUILT_BOARD_DIR)/*_pld.pdi), + mkdir -p $(TARGET_DIR)/lib/firmware/xilinx && \ + $(INSTALL) -D -m 0644 $(XILINX_PREBUILT_BOARD_DIR)/*_pld.pdi \ + $(TARGET_DIR)/lib/firmware/xilinx + ) +endef +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA -define XILINX_PREBUILT_INSTALL +ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y) +define XILINX_PREBUILT_INSTALL_VERSAL_PLM $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PLM) \ $(BINARIES_DIR)/plm.elf +endef +endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM + +ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW),y) +define XILINX_PREBUILT_INSTALL_VERSAL_PSMFW $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PSMFW) \ $(BINARIES_DIR)/psmfw.elf - $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PDI) \ - $(BINARIES_DIR)/vpl_gen_fixed.pdi endef -else # BR2_TARGET_XILINX_PREBUILT_VERSAL -define XILINX_PREBUILT_INSTALL +endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW +endif # BR2_TARGET_XILINX_PREBUILT_VERSAL + +ifeq ($(BR2_TARGET_XILINX_PREBUILT_KRIA)$(BR2_TARGET_XILINX_PREBUILT_ZYNQMP),y) +ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW),y) +define XILINX_PREBUILT_INSTALL_ZYNQMP_PMUFW $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/pmufw.elf \ $(BINARIES_DIR)/pmufw.elf endef -endif # BR2_TARGET_XILINX_PREBUILT_VERSAL +endif # !BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW +endif # BR2_TARGET_XILINX_PREBUILT_KRIA | BR2_TARGET_XILINX_PREBUILT_ZYNQMP define XILINX_PREBUILT_INSTALL_IMAGES_CMDS - $(XILINX_PREBUILT_INSTALL) + $(XILINX_PREBUILT_INSTALL_VERSAL_PLM) + $(XILINX_PREBUILT_INSTALL_VERSAL_PSMFW) + $(XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI) + $(XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI) + $(XILINX_PREBUILT_INSTALL_ZYNQMP_PMUFW) +endef + +define XILINX_PREBUILT_INSTALL_TARGET_CMDS + $(XILINX_PREBUILT_INSTALL_VERSAL_PLD_PDI) + $(XILINX_PREBUILT_INSTALL_VERSAL_XSA_PLD_PDI) endef $(eval $(generic-package)) diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 9f284ff74b..3aa649cf9c 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y BR2_GLOBAL_PATCH_DIR="board/aarch64-efi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/ge BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index b102dde0ba..9e6d35a859 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -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.41" 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 diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index da54eaf620..8e6d9774da 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -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.41" 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 diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index 7b5a6f73c6..80b780b6e0 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -1,7 +1,9 @@ BR2_riscv=y BR2_RISCV_ISA_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_OVERLAY="board/andes/ae350/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" @@ -9,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,v6.0.y_ae350-ax45mp)/linux-v6.0.y_ae350-ax45mp.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,v6.0.y-andes)/linux-v6.0.y-andes.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ae350_ax45mp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="andes/ae350_ax45mp" @@ -17,18 +19,19 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,riscv,opensbi,22f38ee6c658a660083aa45c4ec6c72f66a17260)/opensbi-22f38ee6c658a660083aa45c4ec6c72f66a17260.tar.gz" -BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" +BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,u-boot,u-boot,a5dfa3b8a0f7ad555495bad1386613d2de4ba619)/u-boot-a5dfa3b8a0f7ad555495bad1386613d2de4ba619.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index d4e7ca0dd4..61e2f359ce 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,14 +1,17 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_15=y BR2_GLOBAL_PATCH_DIR="board/arm/foundation-v8/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" +BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.15.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/aspeed_ast2500evb_defconfig b/configs/aspeed_ast2500evb_defconfig index 2312242e64..2ea5ed774e 100644 --- a/configs/aspeed_ast2500evb_defconfig +++ b/configs/aspeed_ast2500evb_defconfig @@ -1,24 +1,29 @@ BR2_arm=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y -BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" -BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" +BR2_arm1176jzf_s=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/aspeed/ast2500-evb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ast2500-evb" +BR2_TARGET_GENERIC_ISSUE="Aspeed AST2500 EVB" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.16.7" BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/linux.fragment" BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2500-evb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed/aspeed-ast2500-evb" BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="evb-ast2500" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/aspeed_ast2600evb_defconfig b/configs/aspeed_ast2600evb_defconfig index 104f685200..056c6aedc1 100644 --- a/configs/aspeed_ast2600evb_defconfig +++ b/configs/aspeed_ast2600evb_defconfig @@ -1,16 +1,20 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y -BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" -BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/aspeed/ast2600-evb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ast2600-evb" +BR2_TARGET_GENERIC_ISSUE="Aspeed AST2600 EVB" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.16.7" BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2600-evb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed/aspeed-ast2600-evb" BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y @@ -18,7 +22,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/openbmc/u-boot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="f2b82fa4ba17ed8091fe76c284220006645a293b" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="66672e5af36fe294df56f8e7942069e3909f3790" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="evb-ast2600" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=ast2600a1-evb" diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index cad32e90b1..86bf6bce9a 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a8=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.6.32-ti-arm32-r7)/linux-6.6.32-ti-arm32-r7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.12.34-ti-arm32-r12)/linux-6.12.34-ti-arm32-r12.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-bonegreen ti/omap/am335x-evmsk ti/omap/am335x-boneblue ti/omap/am335x-boneblack-wireless ti/omap/am335x-bonegreen-wireless" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig index 38db184817..ccabb8c6ba 100644 --- a/configs/beagleboneai_defconfig +++ b/configs/beagleboneai_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleboneai/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -9,19 +11,21 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beagleboneai/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am5729-beagleboneai" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/beaglev_fire_defconfig b/configs/beaglev_fire_defconfig index 1d26a78f07..bfaa8208e9 100644 --- a/configs/beaglev_fire_defconfig +++ b/configs/beaglev_fire_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,li BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/beagley_ai_defconfig b/configs/beagley_ai_defconfig new file mode 100644 index 0000000000..67516d8681 --- /dev/null +++ b/configs/beagley_ai_defconfig @@ -0,0 +1,49 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagley-ai/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagley-ai/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beagley-ai/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.15.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am67a-beagley-ai" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2025.07" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am67a_beagley_ai_r5" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am67a_beagley_ai_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 491a834477..47d0b55e90 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/kd233/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 4a66e1ac33..bb4863cb1d 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -18,6 +18,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/coolpi_4b_defconfig b/configs/coolpi_4b_defconfig new file mode 100644 index 0000000000..c9b5a86758 --- /dev/null +++ b/configs/coolpi_4b_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_14=y +BR2_GLOBAL_PATCH_DIR="board/coolpi/coolpi-4b/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="coolpi" +BR2_TARGET_GENERIC_ISSUE="Welcome to the CoolPi 4B" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/coolpi/coolpi-4b/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.14.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588s-coolpi-4b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.48.elf" +BR2_PACKAGE_LIBDRM=y +BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y +BR2_PACKAGE_OPENSSH=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="coolpi-4b-rk3588s" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/cubieboard1_defconfig b/configs/cubieboard1_defconfig index c3dede47b8..7948ab3b19 100644 --- a/configs/cubieboard1_defconfig +++ b/configs/cubieboard1_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard1/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard1/rootfs_overlay" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.52" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-cubieboard" @@ -18,11 +18,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 14d080d2d4..43ef33e329 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,32 +1,30 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard2/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.52" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-cubieboard2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" diff --git a/configs/engicam_px30_core_defconfig b/configs/engicam_px30_core_defconfig new file mode 100644 index 0000000000..be5c56e19f --- /dev/null +++ b/configs/engicam_px30_core_defconfig @@ -0,0 +1,45 @@ +BR2_aarch64=y +BR2_cortex_a35=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_GLOBAL_PATCH_DIR="board/engicam/px30core/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/engicam/px30core/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/engicam/px30core/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.22" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/px30-engicam-px30-core-ctouch2-of10" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="150M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O 64bit" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.12.1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="px30" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="px30-core-ctouch2-of10-px30" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_USE_BINMAN=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 02970a8c6d..ad2f41d704 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -3,14 +3,14 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabreauto" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index daedb68e96..c4064f34ca 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -3,14 +3,14 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabresd" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 9c95576758..ce51ad30b3 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -3,14 +3,14 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 54d0a6c3a8..ef308e7053 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -3,14 +3,14 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 1389629b85..8f3d8e9405 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -3,14 +3,14 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index e29a9898fc..3d9e0869ac 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6ullevk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -8,7 +8,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6ullevk/linux_sdma.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index a9df6671ce..0487984a97 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx8dxlevk_defconfig b/configs/freescale_imx8dxlevk_defconfig index 1ee1413eb0..5ec0860a52 100644 --- a/configs/freescale_imx8dxlevk_defconfig +++ b/configs/freescale_imx8dxlevk_defconfig @@ -1,7 +1,7 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8dxlevk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8dxl-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8dxl-evk" @@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8dxl" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8dxl_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index b5b52c1f2d..f37c9ca935 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mmevk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index fc601dd5fb..057f2eff87 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mnevk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index cb9f896a7a..9a5759ca04 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mpevk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 4d8a3f1ea2..7a7d8f7e86 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mqevk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -21,13 +21,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 6fb3a54df1..6740d3915f 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -1,13 +1,13 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qmmek/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 3ff476e992..ef5bef7dc6 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -1,7 +1,7 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qxpmek/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx91evk_defconfig b/configs/freescale_imx91evk_defconfig new file mode 100644 index 0000000000..479ff6a2e0 --- /dev/null +++ b/configs/freescale_imx91evk_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx91evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx91-11x11-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx91" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx91_11x11_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/freescale_imx91frdm_defconfig b/configs/freescale_imx91frdm_defconfig new file mode 100644 index 0000000000..8a233afb50 --- /dev/null +++ b/configs/freescale_imx91frdm_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx91frdm/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,jolivain,linux-imx,lf-6.6.36-2.1.0-imx91frdm)/linux-imx-lf-6.6.36-2.1.0-imx91frdm.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx91-11x11-frdm" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.36-2.1.0)/imx-atf-lf-6.6.36-2.1.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx91" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,jolivain,uboot-imx,lf-6.6.36-2.1.0-imx91frdm)/uboot-imx-lf-6.6.36-2.1.0-imx91frdm.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx91_11x11_frdm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig index b244ba9684..0a39859342 100644 --- a/configs/freescale_imx93evk_defconfig +++ b/configs/freescale_imx93evk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_cortex_a55=y BR2_ARM_FPU_VFPV4D16=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx93evk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.12.3-1.0.0)/linux-imx-lf-6.12.3-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-11x11-evk" @@ -22,13 +22,20 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.12.3-1.0.0)/imx-atf-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y +BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-optee-os,lf-6.12.3-1.0.0)/imx-optee-os-lf-6.12.3-1.0.0.tar.gz" +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y +BR2_TARGET_OPTEE_OS_PLATFORM="imx" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="mx93evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.12.3-1.0.0)/uboot-imx-lf-6.12.3-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx93_11x11_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/freescale_imx93frdm_defconfig b/configs/freescale_imx93frdm_defconfig new file mode 100644 index 0000000000..8e16762d8f --- /dev/null +++ b/configs/freescale_imx93frdm_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx93frdm/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,jolivain,linux-imx,lf-6.6.36-2.1.0-imx93frdm)/linux-imx-lf-6.6.36-2.1.0-imx93frdm.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-11x11-frdm" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.36-2.1.0)/imx-atf-lf-6.6.36-2.1.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,jolivain,uboot-imx,lf-6.6.36-2.1.0-imx93frdm)/uboot-imx-lf-6.6.36-2.1.0-imx93frdm.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx93_11x11_frdm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/freescale_p1025twr_defconfig b/configs/freescale_p1025twr_defconfig index 72374ae7a1..568f2060b1 100644 --- a/configs/freescale_p1025twr_defconfig +++ b/configs/freescale_p1025twr_defconfig @@ -1,10 +1,10 @@ BR2_powerpc=y BR2_powerpc_8548=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.27" BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/p1025twr" diff --git a/configs/freescale_t1040d4rdb_defconfig b/configs/freescale_t1040d4rdb_defconfig index ad231e7f1e..851e011983 100644 --- a/configs/freescale_t1040d4rdb_defconfig +++ b/configs/freescale_t1040d4rdb_defconfig @@ -1,10 +1,10 @@ BR2_powerpc64=y BR2_powerpc_e5500=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.27" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t1040d4rdb" diff --git a/configs/freescale_t2080_qds_rdb_defconfig b/configs/freescale_t2080_qds_rdb_defconfig index 0004c87110..a598473562 100644 --- a/configs/freescale_t2080_qds_rdb_defconfig +++ b/configs/freescale_t2080_qds_rdb_defconfig @@ -1,10 +1,10 @@ BR2_powerpc64=y BR2_powerpc_e6500=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.27" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t2080qds fsl/t2080rdb" diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index c190de35f8..547d9d5f59 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" @@ -19,18 +19,20 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/friendlyarm_nanopi_r3s_defconfig b/configs/friendlyarm_nanopi_r3s_defconfig new file mode 100644 index 0000000000..beeab11c5e --- /dev/null +++ b/configs/friendlyarm_nanopi_r3s_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-r3s/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="nanopi r3s" +BR2_TARGET_GENERIC_ISSUE="Welcome to the nanopi r3s board" +BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-r3s/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r3s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.14.6" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r3s/kernel.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3566-nanopi-r3s" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3566_ddr_1056MHz_v1.23.bin" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="32M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3568" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="bl31/bl31.elf" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r3s-rk3566" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/globalscale_espressobin_defconfig b/configs/globalscale_espressobin_defconfig index 562e646b70..5b4f6dcf55 100644 --- a/configs/globalscale_espressobin_defconfig +++ b/configs/globalscale_espressobin_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Marvell ESPRESSObin" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/globalscale/espressobin/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/globalscale/espressobin/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index a5a8f7a65f..e91c29607d 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -1,23 +1,26 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/grinn/chiliboard/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.6" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am335x-chiliboard" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 3ae4a2a0b5..480a5a8c23 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,23 +1,26 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/grinn/liteboard/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.6" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ul-liteboard" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index cb217a5af1..e83af773f7 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -5,17 +5,19 @@ BR2_RISCV_ISA_RVA=y BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/sifive/hifive-unleashed/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/hifive-unleashed/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage_sdcard.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/common/genimage_sdcard.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.190" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.20" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/common/linux.config.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unleashed-a00" BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -29,11 +31,12 @@ BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" diff --git a/configs/hifive_unmatched_defconfig b/configs/hifive_unmatched_defconfig new file mode 100644 index 0000000000..0b63ce15ff --- /dev/null +++ b/configs/hifive_unmatched_defconfig @@ -0,0 +1,47 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/sifive/hifive-unmatched/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/common/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.20" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/common/linux.config.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unmatched-a00" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unmatched" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sifive/hifive-unmatched/boot.cmd" diff --git a/configs/imx28evk_defconfig b/configs/imx28evk_defconfig new file mode 100644 index 0000000000..d34f413440 --- /dev/null +++ b/configs/imx28evk_defconfig @@ -0,0 +1,22 @@ +BR2_arm=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx28evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26" +BR2_LINUX_KERNEL_DEFCONFIG="mxs" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx28-evk" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx28evk" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_FORMAT_SD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx6ulz_bsh_smm_m2_defconfig b/configs/imx6ulz_bsh_smm_m2_defconfig index 29177c4756..9ced7c51ec 100644 --- a/configs/imx6ulz_bsh_smm_m2_defconfig +++ b/configs/imx6ulz_bsh_smm_m2_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/bsh/imx6ulz-bsh-smm-m2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -9,11 +9,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx6ulz-bsh-smm-m2/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.68" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bsh/imx6ulz-bsh-smm-m2/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ulz-bsh-smm-m2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ulz-bsh-smm-m2" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y @@ -28,10 +28,12 @@ BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ulz_smm_m2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.imx" @@ -40,3 +42,4 @@ BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UUU=y diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig index 541a689ddc..6520a41cf9 100644 --- a/configs/imx7d-sdb_defconfig +++ b/configs/imx7d-sdb_defconfig @@ -2,12 +2,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/imx7d-sdb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_OVERLAY="board/freescale/imx7dsdb/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" @@ -18,7 +20,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/imx8mm-evk_defconfig b/configs/imx8mm-evk_defconfig new file mode 100644 index 0000000000..00fe2fa761 --- /dev/null +++ b/configs/imx8mm-evk_defconfig @@ -0,0 +1,48 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mm-evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/imx8mm-evk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_LPDDR4=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/imx8mn-ddr4-evk_defconfig b/configs/imx8mn-ddr4-evk_defconfig new file mode 100644 index 0000000000..66c95315f0 --- /dev/null +++ b/configs/imx8mn-ddr4-evk_defconfig @@ -0,0 +1,48 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mn-evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/imx8mn-evk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_DDR4=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 2b358cf57b..ee8fb9bea3 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -21,19 +21,20 @@ BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBIFS_RT_NONE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/imx8mn_bsh_smm_s2_pro_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig index e903cbf314..1abe3a531a 100644 --- a/configs/imx8mn_bsh_smm_s2_pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/bsh/common/imx8mn-bsh-smm-s2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -23,18 +23,19 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60000" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/imx8mp-evk_defconfig b/configs/imx8mp-evk_defconfig new file mode 100644 index 0000000000..2cb7ecbbde --- /dev/null +++ b/configs/imx8mp-evk_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mp-evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/imx8mp-evk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/imx93-evk_defconfig b/configs/imx93-evk_defconfig new file mode 100644 index 0000000000..f3af2b5183 --- /dev/null +++ b/configs/imx93-evk_defconfig @@ -0,0 +1,50 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx93-evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/imx93-evk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.16" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-11x11-evk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX_LPDDR4=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx93_11x11_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index 8a515a9260..7a70c42afa 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -1,23 +1,29 @@ BR2_arm=y BR2_cortex_m7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imxrt1050evk/patches" +BR2_ROOTFS_OVERLAY="board/freescale/imxrt1050evk/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imxrt1050evk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43" BR2_LINUX_KERNEL_DEFCONFIG="imxrt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imxrt1050-evk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="16M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imxrt1050-evk" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imxrt1050evk/uboot.fragment" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/iot-gate-imx8_ebbr_defconfig b/configs/iot-gate-imx8_ebbr_defconfig new file mode 100644 index 0000000000..ff646e8adc --- /dev/null +++ b/configs/iot-gate-imx8_ebbr_defconfig @@ -0,0 +1,62 @@ +BR2_aarch64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/compulab/iot-gate-imx8-ebbr/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/compulab/iot-gate-imx8-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/compulab/iot-gate-imx8-ebbr/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.16.8" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_OPTEE_CLIENT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.13" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="bl2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_BASE=0x7e000000 IMX_BOOT_UART_BASE=0x30880000 NEED_BL2=yes BL2_CFLAGS=-DIMX_FIP_MMAP" +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot efi_gop efifwsetup efinet efitextmode ext2 fat help linux lsefi lsefimmap lsefisystab normal part_gpt part_msdos reboot squash4" +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE="4.7.0" +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y +BR2_TARGET_OPTEE_OS_PLATFORM="imx" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="mx8mm_cl_iot_gate" +BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_TEE_CORE_LOG_LEVEL=2 CFG_TEE_TA_LOG_LEVEL=2 CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT=y CFG_DT_ADDR=0x52000000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm-cl-iot-gate-optee" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/compulab/iot-gate-imx8-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_USE_BINMAN=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="cmd_binman=:" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 69663e0c3e..a9fe21991f 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/linksprite/pcduino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="pcduino" BR2_TARGET_GENERIC_ISSUE="pcDuino buildroot is ready" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -10,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -29,11 +31,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/loongarch64_efi_defconfig b/configs/loongarch64_efi_defconfig new file mode 100644 index 0000000000..c98699330d --- /dev/null +++ b/configs/loongarch64_efi_defconfig @@ -0,0 +1,22 @@ +BR2_loongarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/loongarch64-efi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/loongarch64-efi/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/loongarch64-efi/genimage-efi.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.32" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_LOONGARCH64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index 0d1843bf5f..ccb886dbe9 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/freescale/ls1028ardb/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="ls1028a" @@ -12,12 +12,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -25,7 +26,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -35,9 +36,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_QORIQ_RCW=y BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1028ardb/R_SQPP_0x85bb/rcw_1300_sdboot.bin" diff --git a/configs/ls1043a-rdb_defconfig b/configs/ls1043a-rdb_defconfig new file mode 100644 index 0000000000..57c9dbf5b1 --- /dev/null +++ b/configs/ls1043a-rdb_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1043a-rdb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ls1043ardb" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/freescale/ls1043a-rdb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1043a-rdb/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1043a-rdb freescale/fsl-ls1043a-rdb-sdk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_QORIQ_FM_UCODE=y +BR2_PACKAGE_QORIQ_FM_UCODE_PLATFORM="ls1043" +BR2_PACKAGE_FMC=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1043ardb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1043ardb_tfa" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_QORIQ_RCW=y +BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1043ardb/RR_FQPP_1455/rcw_1600_sdboot.bin" diff --git a/configs/ls1046a-frwy_defconfig b/configs/ls1046a-frwy_defconfig index 2cf0f9c8bc..f12b27b817 100644 --- a/configs/ls1046a-frwy_defconfig +++ b/configs/ls1046a-frwy_defconfig @@ -1,6 +1,7 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/freescale/ls1046a-frwy/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="ls1046afrwy" @@ -12,20 +13,22 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1046a-frwy freescale/fsl-ls1046a-frwy-sdk" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_QORIQ_FM_UCODE=y +BR2_PACKAGE_FMC=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y @@ -35,9 +38,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_QORIQ_RCW=y BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1046afrwy/NN_NNQNNPNP_3040_0506/rcw_1600_sdboot.bin" diff --git a/configs/ls1046a-rdb_defconfig b/configs/ls1046a-rdb_defconfig new file mode 100644 index 0000000000..21c63e43b4 --- /dev/null +++ b/configs/ls1046a-rdb_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1046a-rdb/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="ls1046ardb" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/freescale/ls1046a-rdb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-rdb/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1046a-rdb freescale/fsl-ls1046a-rdb-sdk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_QORIQ_FM_UCODE=y +BR2_PACKAGE_FMC=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046ardb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046ardb_tfa" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_QORIQ_RCW=y +BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_sdboot.rcw" diff --git a/configs/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig index d0e0d8a364..219f02839c 100644 --- a/configs/mender_x86_64_efi_defconfig +++ b/configs/mender_x86_64_efi_defconfig @@ -1,5 +1,5 @@ BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_INIT_SYSV=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/mender/x86_64/post-image-efi.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="--data-part-size=32M --device-type=buildroot-x86_64 --artifact-name=1.0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.49" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.28" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mender/x86_64/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nvidia_bf3_defconfig b/configs/nvidia_bf3_defconfig index 3f958c0062..42bcb1299d 100644 --- a/configs/nvidia_bf3_defconfig +++ b/configs/nvidia_bf3_defconfig @@ -1,12 +1,16 @@ BR2_aarch64=y +BR2_cortex_a78=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y BR2_GLOBAL_PATCH_DIR="board/nvidia/bf3/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_OVERLAY="board/nvidia/bf3/rootfs_overlay" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/nvidia/bf3/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LIBMNL=y +BR2_PACKAGE_IPROUTE2=y BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/octavo_osd32mp1_brk_defconfig b/configs/octavo_osd32mp1_brk_defconfig index 92848f62b5..2a6d794722 100644 --- a/configs/octavo_osd32mp1_brk_defconfig +++ b/configs/octavo_osd32mp1_brk_defconfig @@ -1,7 +1,10 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-brk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/octavo/osd32mp1-brk/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/octavo/osd32mp1-brk/genimage.cfg" diff --git a/configs/octavo_osd32mp1_red_defconfig b/configs/octavo_osd32mp1_red_defconfig index 4372b4f8ae..3646e2d04f 100644 --- a/configs/octavo_osd32mp1_red_defconfig +++ b/configs/octavo_osd32mp1_red_defconfig @@ -1,7 +1,10 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-red/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/octavo/osd32mp1-red/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/octavo/osd32mp1-red/genimage.cfg" diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index efa2b6a249..ff6eca176b 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -12,7 +14,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -26,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index f376c6cd3c..7d95bd4d48 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -12,7 +14,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -26,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index b1f9b7645a..29381ec206 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/olimex/stmp1_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" @@ -12,7 +14,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/OLIMEX/linux-olimex.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fc74113e14d76aea9482264ff42e07397b94553d" +# branch release-20231222-v5.10.180 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e9b70672e21c96c02d9a731a9379baa897ea2ac7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/stmp1_olinuxino/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -25,7 +28,8 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/OLIMEX/u-boot-olinuxino.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="efadf793a0a5924e2c96362dc1df3e56622ebb97" +# branch release-20250305, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="23d8f769a94ae230b7a68fa812cc3c4dc0cbf1c9" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/olpc_xo175_defconfig b/configs/olpc_xo175_defconfig index bb7aa047f6..f4ef283e00 100644 --- a/configs/olpc_xo175_defconfig +++ b/configs/olpc_xo175_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_pj4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_13=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/olpc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olpc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.13.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1.75/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config" diff --git a/configs/orangepi_5_plus_defconfig b/configs/orangepi_5_plus_defconfig new file mode 100644 index 0000000000..53a633f639 --- /dev/null +++ b/configs/orangepi_5_plus_defconfig @@ -0,0 +1,55 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-5-plus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="orangepi5plus" +BR2_TARGET_GENERIC_ISSUE="Welcome to the OrangePi 5 Plus board" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-5-plus/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-5-plus/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-5-plus/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-orangepi-5-plus" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3588" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="bl31/bl31.elf" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi-5-plus-rk3588" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-5-plus/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_DTC=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 167527235e..aef7eb6c77 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,7 +1,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-one/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" @@ -10,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-one" @@ -22,11 +24,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 1eb54cb43e..878c7294de 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -1,7 +1,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-pc-plus/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -11,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -32,11 +34,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/orangepi_zero2w_defconfig b/configs/orangepi_zero2w_defconfig index 9da9c94754..c2030b05c2 100644 --- a/configs/orangepi_zero2w_defconfig +++ b/configs/orangepi_zero2w_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero2w/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero2W" @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero2w" @@ -23,16 +23,17 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="256M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero2w" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/configs/orangepi_zero3_defconfig b/configs/orangepi_zero3_defconfig index b42cd370f6..c6aa9c991a 100644 --- a/configs/orangepi_zero3_defconfig +++ b/configs/orangepi_zero3_defconfig @@ -1,6 +1,8 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero3/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero3" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -9,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.6" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" @@ -18,20 +20,21 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_SIZE="130M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero3" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index b48c28102e..6372564e72 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -12,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,11 +35,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 84227cb392..2b7ad2064d 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -1,6 +1,8 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" @@ -9,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -26,19 +28,20 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index 3617d3a85f..3b3e4cc561 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -1,5 +1,7 @@ BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/pc/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" @@ -7,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 45d895889b..a126eb8338 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -1,12 +1,14 @@ BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/pc/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pine64_star64_defconfig b/configs/pine64_star64_defconfig index 33c5826a4a..a0356447d5 100644 --- a/configs/pine64_star64_defconfig +++ b/configs/pine64_star64_defconfig @@ -1,13 +1,14 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_GLOBAL_PATCH_DIR="board/pine64/star64/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,Star64_linux,1456c984f15e21e28fb8a9ce96d0ca10e61a71c4)/linux-1456c984f15e21e28fb8a9ce96d0ca10e61a71c4.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="pine64_star64" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-pine64-star64" BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -17,15 +18,18 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="100M" BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_PLAT="generic" -BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,u-boot,172b47f62039605d6806fa96bd403c21cda28996)/u-boot-172b47f62039605d6806fa96bd403c21cda28996.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_star64" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/polyhex_debix_model_a_defconfig b/configs/polyhex_debix_model_a_defconfig new file mode 100644 index 0000000000..6f8ec49410 --- /dev/null +++ b/configs/polyhex_debix_model_a_defconfig @@ -0,0 +1,46 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/polyhex/debix-model-a/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/polyhex/debix-model-a/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.14" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-debix-model-a" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_debix_model_a" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index cb6a06653c..4dc2d1e396 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -1,14 +1,15 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y BR2_PACKAGE_OPTEE_CLIENT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 6df2b2e273..84ae76ca0b 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y -BR2_neoverse_n1=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_neoverse_n2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -9,16 +9,17 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_EDK2=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 6c206cea93..6695f2b2d8 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index 2cc222e2a4..dfd3f47578 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -1,16 +1,17 @@ BR2_arm=y BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y BR2_PACKAGE_OPTEE_CLIENT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index e22ef33c06..b00b309b05 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -1,5 +1,5 @@ BR2_arm=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 84be67045f..9698b1c6c5 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -2,7 +2,7 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 1c2da47282..5dca55fdce 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_VFPV3D16=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" BR2_PACKAGE_OPENSSL=y diff --git a/configs/qemu_loongarch64_virt_efi_defconfig b/configs/qemu_loongarch64_virt_efi_defconfig new file mode 100644 index 0000000000..4a4cd93b52 --- /dev/null +++ b/configs/qemu_loongarch64_virt_efi_defconfig @@ -0,0 +1,25 @@ +BR2_loongarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/loongarch64-virt-efi/post-image.sh board/qemu/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/loongarch64-virt-efi/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_EDK2=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_LOONGARCH64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index feb96bb533..1850f67087 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -1,6 +1,6 @@ BR2_m68k=y BR2_m68k_cf5208=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 689da54892..6e84e1e791 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -1,5 +1,5 @@ BR2_m68k=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 572f7c125f..5444380f25 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -1,5 +1,5 @@ BR2_microblazebe=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 03c80919dc..e5bd065019 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -1,5 +1,5 @@ BR2_microblazeel=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index ceb5f91b20..d5051f7c39 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -1,6 +1,6 @@ BR2_mips=y BR2_mips_32r2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index e5ce0c660b..ce03bc21bd 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -1,6 +1,6 @@ BR2_mipsel=y BR2_mips_32r2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index d8f3455b27..6d026e2a50 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -1,6 +1,6 @@ BR2_mips=y BR2_mips_32r6=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 89231a2c4f..5ea91f281e 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -1,6 +1,6 @@ BR2_mipsel=y BR2_mips_32r6=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index de0ba6d959..f33cff7963 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -1,6 +1,6 @@ BR2_mips64=y BR2_MIPS_NABI64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index e8d4b4093d..c535228b53 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -1,6 +1,6 @@ BR2_mips64el=y BR2_MIPS_NABI64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 06530044e1..f514bacd83 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -1,7 +1,7 @@ BR2_mips64=y BR2_mips_64r6=y BR2_MIPS_NABI64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index d2e0bb7157..83d9f109f9 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -1,7 +1,7 @@ BR2_mips64el=y BR2_mips_64r6=y BR2_MIPS_NABI64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 02c3882ed6..b97774d39c 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -1,5 +1,5 @@ BR2_or1k=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index dd778e7868..88e3d99f90 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -1,6 +1,6 @@ BR2_powerpc64=y BR2_powerpc_e5500=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index d006bee7a4..e89f4e2b3e 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -1,6 +1,6 @@ BR2_powerpc64=y BR2_powerpc_power7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index d20a21618a..a999a767dc 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -1,5 +1,5 @@ BR2_powerpc64le=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 5cbacd3f17..2c633f198d 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -1,5 +1,5 @@ BR2_powerpc64le=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index bb7dca6930..a71e368cc9 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -1,6 +1,6 @@ BR2_powerpc=y BR2_powerpc_440fp=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index eccf86f6a3..632d6400e1 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -1,6 +1,6 @@ BR2_powerpc=y BR2_powerpc_e500mc=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index f35c8557b1..0d2a1798ec 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -1,6 +1,6 @@ BR2_powerpc=y BR2_powerpc_750=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 13d9aba0b0..ecaa8d7ccc 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -1,6 +1,6 @@ BR2_powerpc=y BR2_powerpc_7400=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 8da2a0472c..d2a35bd70e 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -1,6 +1,6 @@ BR2_powerpc=y BR2_powerpc_8548=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_nommu_virt_defconfig b/configs/qemu_riscv32_nommu_virt_defconfig index 49580716bb..5fa9a174bf 100644 --- a/configs/qemu_riscv32_nommu_virt_defconfig +++ b/configs/qemu_riscv32_nommu_virt_defconfig @@ -1,7 +1,7 @@ BR2_riscv=y BR2_RISCV_32=y # BR2_RISCV_USE_MMU is not set -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux-nommu.config" BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 6064dd66c3..4369d644cd 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -1,6 +1,6 @@ BR2_riscv=y BR2_RISCV_32=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -8,12 +8,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" BR2_TARGET_OPENSBI_PLAT="generic" BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index bb3fb2c5cb..6c3d2608cc 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -1,6 +1,6 @@ BR2_riscv=y # BR2_RISCV_USE_MMU is not set -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv64-virt/linux-nommu.config" BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 575e367af8..f436dac143 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" BR2_TARGET_OPENSBI_PLAT="generic" BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig index 66a05d59e5..b9d622df05 100644 --- a/configs/qemu_riscv64_virt_efi_defconfig +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-e BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 975633e3ab..cc85d87d35 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -1,5 +1,5 @@ BR2_s390x=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 4b06017aec..7f22dab3c4 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -1,5 +1,5 @@ BR2_sh=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" @@ -8,11 +8,11 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y -BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 9a80bb1065..a1fc4a89e6 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -1,6 +1,6 @@ BR2_sh=y BR2_sh4eb=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" @@ -8,11 +8,11 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y -BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index d409a9ff47..a147b129e7 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -1,5 +1,5 @@ BR2_sparc64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 63ca7330b9..2f05c0947f 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -1,5 +1,5 @@ BR2_sparc=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 8022e43a20..39d7793a04 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -1,5 +1,5 @@ BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_64_efi_defconfig b/configs/qemu_x86_64_efi_defconfig new file mode 100644 index 0000000000..e487b68687 --- /dev/null +++ b/configs/qemu_x86_64_efi_defconfig @@ -0,0 +1,25 @@ +BR2_x86_64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/qemu/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64-efi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/x86_64-efi/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64-efi/linux.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_EDK2=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index e4ff52a3d5..f8cb83a4b0 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -1,5 +1,5 @@ BR2_x86_pentiumpro=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index dca2e600d5..92c0795698 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -1,7 +1,7 @@ BR2_xtensa=y BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 52e28cb9c5..bb5a7600dd 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -2,7 +2,7 @@ BR2_xtensa=y BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" # BR2_XTENSA_USE_MMU is not set -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index dc4f1ea86c..1be48c32dc 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero" diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 2c1e42543f..c7803c5af6 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_64_defconfig b/configs/raspberrypi2_64_defconfig new file mode 100644 index 0000000000..57f98c7396 --- /dev/null +++ b/configs/raspberrypi2_64_defconfig @@ -0,0 +1,34 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2-64/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-2-b" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi2-64/config_2_64bit.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index ce19a7fd5d..60eb62b473 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -10,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b" diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 9e301d8d96..59b8b3fc6f 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -1,7 +1,8 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -9,8 +10,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 38c680d541..3f7fdeb3ab 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -10,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index da3f657734..8cbb8b0d41 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -11,7 +12,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 66ed5f0045..c0a33c3eb5 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -1,8 +1,9 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -10,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 89cfd58a90..75078a3c2c 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -10,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 8cbd533eee..6928e2ba0f 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -1,7 +1,8 @@ BR2_aarch64=y BR2_cortex_a76=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -9,11 +10,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b broadcom/bcm2712-rpi-500" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_XZ=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 694b7925af..00525e050e 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm" diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 44c625a4d4..648740c273 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -1,8 +1,9 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -10,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index d52eae82a4..e5bbff76c1 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -10,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" diff --git a/configs/raspberrypicm5io_defconfig b/configs/raspberrypicm5io_defconfig new file mode 100644 index 0000000000..122a25ed92 --- /dev/null +++ b/configs/raspberrypicm5io_defconfig @@ -0,0 +1,35 @@ +BR2_aarch64=y +BR2_cortex_a76=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm5io/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm5io/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-cm5-cm5io broadcom/bcm2712-rpi-cm5l-cm5io" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm5io/config_cm5io.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypicm5io/cmdline.txt" +BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y diff --git a/configs/raspberrypizero2w_64_defconfig b/configs/raspberrypizero2w_64_defconfig new file mode 100644 index 0000000000..7a00fa14ac --- /dev/null +++ b/configs/raspberrypizero2w_64_defconfig @@ -0,0 +1,32 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w-64/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypizero2w-64/config_zero2w_64bit.txt" +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 796fcf9ab3..36e66676fa 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -1,15 +1,16 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w" diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig index 1323752683..145e155fac 100644 --- a/configs/roc_pc_rk3399_defconfig +++ b/configs/roc_pc_rk3399_defconfig @@ -1,6 +1,8 @@ BR2_aarch64=y BR2_cortex_a72_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/firefly/roc-rk3399-pc/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh" @@ -8,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/firefly/roc-rk3399-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.61" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.56" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc" @@ -21,14 +23,14 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O 64bit" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/rock4se_defconfig b/configs/rock4se_defconfig new file mode 100644 index 0000000000..29437b9be3 --- /dev/null +++ b/configs/rock4se_defconfig @@ -0,0 +1,45 @@ +BR2_aarch64=y +BR2_cortex_a72_a53=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/radxa/rock4se/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="rock-4se" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Radxa ROCK 4SE" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock4se/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock4se/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.28" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rock-4se" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-4se-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 38b5aad206..bef12adaa4 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a76_a55=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="rock5b" @@ -12,27 +12,34 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.4" 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 BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_PACKAGE_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3588" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="bl31/bl31.elf" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/rockpro64_ebbr_defconfig b/configs/rockpro64_ebbr_defconfig new file mode 100644 index 0000000000..4d94d61d1f --- /dev/null +++ b/configs/rockpro64_ebbr_defconfig @@ -0,0 +1,62 @@ +BR2_aarch64=y +BR2_cortex_a72_a53=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/pine64/rockpro64-ebbr/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64-ebbr/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pine64/rockpro64-ebbr/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rockpro64-ebbr/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64-ebbr/linux.fragment" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_OPTEE_CLIENT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop lsefisystab lsefimmap lsefi efifwsetup efitextmode efinet" +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE="4.5.0" +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y +BR2_TARGET_OPTEE_OS_PLATFORM="rockchip-rk3399" +BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_TEE_CORE_LOG_LEVEL=2 CFG_DT=y CFG_DTB_MAX_SIZE=0x100000" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE=y +BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_BIN=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb u-boot-rockchip-spi.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/shredos_defconfig b/configs/shredos_defconfig index 7c8e311527..bfe1da2ca8 100644 --- a/configs/shredos_defconfig +++ b/configs/shredos_defconfig @@ -21,7 +21,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -33,6 +32,7 @@ BR2_PACKAGE_UNZIP=y BR2_PACKAGE_XZ=y BR2_PACKAGE_ZIP=y BR2_PACKAGE_HEXEDIT=y +BR2_PACKAGE_STRACE=y BR2_PACKAGE_BINUTILS=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_GREP=y @@ -45,10 +45,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -69,7 +65,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -113,18 +108,18 @@ BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_LIBJPEG=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBCAP_NG=y BR2_PACKAGE_LIBSECCOMP=y BR2_PACKAGE_NWIPE=y -BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION=y -BR2_PACKAGE_NWIPE_GIT_REVISION="f8f64ba7e73e76851ef0c98e99e08139716a8d82" BR2_PACKAGE_LIBFRIBIDI=y BR2_PACKAGE_NCURSES_WCHAR=y +BR2_PACKAGE_NCURSES_TARGET_PROGS=y +BR2_PACKAGE_POPT=y BR2_PACKAGE_UTF8PROC=y BR2_PACKAGE_HEIRLOOM_MAILX=y BR2_PACKAGE_COLLECTD=y @@ -149,6 +144,8 @@ BR2_PACKAGE_SELINUX_PYTHON=y BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW=y BR2_PACKAGE_PARALLEL=y BR2_PACKAGE_TMUX=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_PACKAGE_OPENSEACHEST=y BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_RUNC=y @@ -162,19 +159,13 @@ BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT=y BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y BR2_PACKAGE_UTIL_LINUX_RFKILL=y BR2_PACKAGE_UTIL_LINUX_RUNUSER=y +BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y BR2_PACKAGE_UTIL_LINUX_SETTERM=y BR2_PACKAGE_UTIL_LINUX_SU=y BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_TARGET_ROOTFS_CPIO_LZMA=y BR2_TARGET_ROOTFS_INITRAMFS=y BR2_TARGET_ROOTFS_ISO9660=y -BR2_TARGET_ROOTFS_ISO9660_BOTH=y -BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME="SHREDOS" -BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MENU="board/shredos/iso/isolinux.cfg" -BR2_TARGET_ROOTFS_ISO9660_GRUB2_BOOT_MENU="board/shredos/iso/grub.cfg" -BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_BOOT_MENU="board/shredos/iso/efigrub.cfg" -BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE="/boot/shredos.id" -BR2_TARGET_ROOTFS_ISO9660_HYBRID=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_GRUB2=y BR2_TARGET_GRUB2_I386_PC=y @@ -187,6 +178,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_i586_defconfig b/configs/shredos_i586_defconfig index 240591da29..0af8973615 100644 --- a/configs/shredos_i586_defconfig +++ b/configs/shredos_i586_defconfig @@ -19,7 +19,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -43,10 +42,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -67,7 +62,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -110,7 +104,6 @@ BR2_PACKAGE_PYTHON_SCAPY=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -182,6 +175,6 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y +BR2_PACKAGE_STRACE=y diff --git a/configs/shredos_img_defconfig b/configs/shredos_img_defconfig index f175c3149d..e185e36975 100644 --- a/configs/shredos_img_defconfig +++ b/configs/shredos_img_defconfig @@ -21,7 +21,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -33,6 +32,7 @@ BR2_PACKAGE_UNZIP=y BR2_PACKAGE_XZ=y BR2_PACKAGE_ZIP=y BR2_PACKAGE_HEXEDIT=y +BR2_PACKAGE_STRACE=y BR2_PACKAGE_BINUTILS=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_GREP=y @@ -45,10 +45,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -69,7 +65,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -113,7 +108,6 @@ BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_LIBJPEG=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -121,6 +115,8 @@ BR2_PACKAGE_KERNEL_CMDLINE_EXTRACTOR=y BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBSECCOMP=y BR2_PACKAGE_NWIPE=y +BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION=y +BR2_PACKAGE_NWIPE_GIT_REVISION="26ece7a0525370f6ba39cddc5e73000b3cd867d6" BR2_PACKAGE_LIBFRIBIDI=y BR2_PACKAGE_NCURSES_WCHAR=y BR2_PACKAGE_UTF8PROC=y @@ -176,6 +172,5 @@ BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg" BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_img_i586_defconfig b/configs/shredos_img_i586_defconfig index 079281d7cc..f82c822aaa 100644 --- a/configs/shredos_img_i586_defconfig +++ b/configs/shredos_img_i586_defconfig @@ -19,7 +19,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -43,10 +42,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -67,7 +62,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -110,7 +104,6 @@ BR2_PACKAGE_PYTHON_SCAPY=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -173,6 +166,5 @@ BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="board/shredos/embed/grub.cfg" BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_iso_defconfig b/configs/shredos_iso_defconfig index db9f0a26a1..7494dd449c 100644 --- a/configs/shredos_iso_defconfig +++ b/configs/shredos_iso_defconfig @@ -21,7 +21,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -45,10 +44,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -69,7 +64,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -113,7 +107,6 @@ BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_LIBJPEG=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -182,6 +175,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_iso_extra_defconfig b/configs/shredos_iso_extra_defconfig index 34c1412242..586215a451 100644 --- a/configs/shredos_iso_extra_defconfig +++ b/configs/shredos_iso_extra_defconfig @@ -22,7 +22,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -46,10 +45,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -70,7 +65,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -114,7 +108,6 @@ BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_LIBJPEG=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -184,6 +177,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_iso_extra_i586_defconfig b/configs/shredos_iso_extra_i586_defconfig index 38eb6616d1..4f26e6e41a 100644 --- a/configs/shredos_iso_extra_i586_defconfig +++ b/configs/shredos_iso_extra_i586_defconfig @@ -20,7 +20,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -44,10 +43,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -68,7 +63,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -111,7 +105,6 @@ BR2_PACKAGE_PYTHON_SCAPY=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -181,6 +174,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_iso_i586_defconfig b/configs/shredos_iso_i586_defconfig index f25b247307..2d925764ae 100644 --- a/configs/shredos_iso_i586_defconfig +++ b/configs/shredos_iso_i586_defconfig @@ -19,7 +19,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -43,10 +42,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -67,7 +62,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -110,7 +104,6 @@ BR2_PACKAGE_PYTHON_SCAPY=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -179,6 +172,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_iso_legacy_defconfig b/configs/shredos_iso_legacy_defconfig index 676ad43f59..2b3ef75a58 100644 --- a/configs/shredos_iso_legacy_defconfig +++ b/configs/shredos_iso_legacy_defconfig @@ -21,7 +21,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -45,10 +44,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -69,7 +64,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -113,7 +107,6 @@ BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_LIBJPEG=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -181,6 +174,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/shredos_iso_legacy_i586_defconfig b/configs/shredos_iso_legacy_i586_defconfig index 78976354dd..9fa54fdd34 100644 --- a/configs/shredos_iso_legacy_i586_defconfig +++ b/configs/shredos_iso_legacy_i586_defconfig @@ -19,7 +19,6 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/shredos/kernel-6.6.22-defconfig.config" BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y BR2_PACKAGE_LINUX_TOOLS_PERF=y -BR2_PACKAGE_LINUX_TOOLS_SELFTESTS=y # BR2_PACKAGE_BUSYBOX_SELINUX is not set BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y @@ -43,10 +42,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_EXFATPROGS=y BR2_PACKAGE_ASCII_INVADERS=y -BR2_PACKAGE_DIRECTFB=y -BR2_PACKAGE_DIRECTFB_ATI128=y -BR2_PACKAGE_DIRECTFB_MATROX=y -BR2_PACKAGE_DIRECTFB_I830=y BR2_PACKAGE_FBDUMP=y BR2_PACKAGE_FBGRAB=y BR2_PACKAGE_FBSET=y @@ -67,7 +62,6 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL=y -BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y @@ -110,7 +104,6 @@ BR2_PACKAGE_PYTHON_SCAPY=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LIBGCRYPT=y BR2_PACKAGE_STB=y -BR2_PACKAGE_LIBHID=y BR2_PACKAGE_JSON_GLIB=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBUPNP=y @@ -178,6 +171,5 @@ BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_HOST_PYTHON3_SSL=y diff --git a/configs/sipeed_licheepi_4a_defconfig b/configs/sipeed_licheepi_4a_defconfig new file mode 100644 index 0000000000..c7867ed05d --- /dev/null +++ b/configs/sipeed_licheepi_4a_defconfig @@ -0,0 +1,42 @@ +BR2_riscv=y +BR2_RISCV_ISA_RVC=y +BR2_RISCV_ISA_RVV=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/sipeed/licheepi_4a/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="licheepi4a" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi 4A" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/sipeed/licheepi_4a/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/th1520-lichee-pi-4a" +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88=y +BR2_PACKAGE_SIPEED_LPI4ABIN=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/revyos/thead-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="61d7484c752a5e4c464d5dc18e21d9ac67fbbefa" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="light_lpi4a" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/revyos/thead-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b5ee6e549a7b5ff382a14021a5d6a3c94017bddd" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/sipeed_licheepi_zero_defconfig b/configs/sipeed_licheepi_zero_defconfig index e92c1d854e..0c60a5c763 100644 --- a/configs/sipeed_licheepi_zero_defconfig +++ b/configs/sipeed_licheepi_zero_defconfig @@ -1,7 +1,11 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/sipeed/licheepi_zero/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -10,10 +14,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/licheepi_zero/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-v3s-licheepi-zero allwinner/sun8i-v3s-licheepi-zero-dock" BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_WPA_SUPPLICANT=y @@ -23,11 +27,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="LicheePi_Zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 00c6a993d8..c3fc9192c6 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-bit/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 5127bfeae6..4ae824a26b 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index d97e185311..73372056a3 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-dock/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index a755872cfd..66317d968c 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index a4d976353f..bb64dccdf4 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maix-go/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index 6067fea785..a3076c3e12 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index 37c6eb4582..27bf958c76 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/maixduino/linux-cpio.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 0a460f15d3..1b6db4f8a4 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" BR2_LINUX_KERNEL_DEFCONFIG="nommu_k210_sdcard" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/linux-sdcard.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="loader.bin" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/spike_riscv32_defconfig b/configs/spike_riscv32_defconfig index 6ea12dc1fb..a73f335f34 100644 --- a/configs/spike_riscv32_defconfig +++ b/configs/spike_riscv32_defconfig @@ -11,7 +11,7 @@ BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index 913830e38e..7b698737e2 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 33f725e185..c22b6e1135 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -8,7 +8,7 @@ BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.112" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.155" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 84b22d596c..704e8ecc16 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.186" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config board/stmicroelectronics/stm32f469-disco/linux-sd.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 7c79b10e1f..5d6c5ba752 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -8,7 +8,7 @@ BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.186" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/stm32f746_disco_sd_defconfig b/configs/stm32f746_disco_sd_defconfig index a3de240070..cd2123b992 100644 --- a/configs/stm32f746_disco_sd_defconfig +++ b/configs/stm32f746_disco_sd_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f746-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.194" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32f746-disco/linux.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f746-disco" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index ef97714e4d..54ee93aa19 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f769-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.194" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0xc0000000.config board/stmicroelectronics/stm32f769-disco/linux-sd.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f769-disco" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp135f_dk_defconfig b/configs/stm32mp135f_dk_defconfig new file mode 100644 index 0000000000..94c6dad1f0 --- /dev/null +++ b/configs/stm32mp135f_dk_defconfig @@ -0,0 +1,54 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp135f-dk/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.53" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp135f-dk/linux.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp135f-dk" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_OPTEE_CLIENT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 DTB_FILE_NAME=stm32mp135f-dk.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION=y +BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE="4.3.0" +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y +BR2_TARGET_OPTEE_OS_PLATFORM="stm32mp1" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="135F_DK" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp13" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin u-boot.dtb" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=st/stm32mp135f-dk" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index c1ecbd22c1..52338bba0b 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -1,13 +1,15 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.53" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -18,8 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -31,13 +32,14 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=st/stm32mp157a-dk1" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index c35d75853f..34fdec8558 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -1,13 +1,15 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.53" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -18,8 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -31,13 +32,14 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=st/stm32mp157c-dk2" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/ti_am62ax_sk_defconfig b/configs/ti_am62ax_sk_defconfig index 1144577942..0b3ebe6242 100644 --- a/configs/ti_am62ax_sk_defconfig +++ b/configs/ti_am62ax_sk_defconfig @@ -10,6 +10,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/ti/am62ax-sk/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am62a7-sk" BR2_TARGET_ROOTFS_EXT2=y @@ -22,7 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62ax" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" diff --git a/configs/ti_am62px_sk_defconfig b/configs/ti_am62px_sk_defconfig index 4937fb704c..e53b41ed5e 100644 --- a/configs/ti_am62px_sk_defconfig +++ b/configs/ti_am62px_sk_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62px" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 0c37fdc167..4349c966ac 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.53" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" @@ -18,8 +18,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -27,12 +26,12 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 697b6c5169..33d06ef963 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,6 +1,10 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" @@ -8,23 +12,24 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -34,8 +39,10 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSAL=y BR2_PACKAGE_HOST_BOOTGEN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/versal_vek280_defconfig b/configs/versal_vek280_defconfig index fcf440ed89..07ab2f18af 100644 --- a/configs/versal_vek280_defconfig +++ b/configs/versal_vek280_defconfig @@ -1,30 +1,35 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vek280-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -34,9 +39,10 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vek280-revB" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" -BR2_TARGET_XILINX_PREBUILT_VERSAL=y BR2_TARGET_XILINX_PREBUILT_BOARD="vek280" BR2_PACKAGE_HOST_BOOTGEN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig index 9fc694a898..970823e571 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -1,6 +1,10 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" @@ -8,23 +12,24 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -34,8 +39,10 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSAL=y BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" BR2_PACKAGE_HOST_BOOTGEN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index fb0bc94d15..8223e6faa1 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/visionfive2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" @@ -7,7 +7,7 @@ BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/visionfive2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.24" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/visionfive2/linux_defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -19,18 +19,19 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 9b0e01d38a..5fec15d4ba 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.24" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7s-warp" @@ -23,8 +23,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index a00992c8b6..b7bf70efcd 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -2,26 +2,29 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-microzed" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index a90dfd6c26..f968ae1a08 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -2,26 +2,29 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zc702" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 1c662cd566..fe40dc99aa 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,26 +2,29 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zc706" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 392576a062..53653036ba 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,26 +2,29 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zed" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index 8cbc172a41..71b2547e69 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -1,46 +1,53 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/kd240/patches board/xilinx/patches" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kd240/kd240.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kd240/pm_cfg_obj.c" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k24-revA" -BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_KRIA=y -BR2_TARGET_XILINX_PREBUILT_BOARD="kd240" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS="-DK24_SOM" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index d5a292b143..e0c002ea7a 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -1,45 +1,53 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" -BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_KRIA=y +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS="-DK26_SOM" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 06efa86e14..d80c47b4bc 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,46 +1,53 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" -BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_KRIA=y -BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS="-DK26_SOM" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index c7a25eefb1..a1ac800098 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,5 +1,9 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" @@ -7,37 +11,41 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" -BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index bcd6b16488..bd8e8b0629 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -1,5 +1,9 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" @@ -7,38 +11,41 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" -BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3a13834c96..a964f28a9e 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,5 +1,9 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" @@ -7,38 +11,41 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" -BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 89fc700452..6827b9975e 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -270,7 +270,9 @@ not and can not work as people would expect it should: server-side checking for user logins and passwords, or to use a proxy. All download methods valid for +LIBFOO_SITE_METHOD+ are supported; valid options depend on the download method (consult the man page - for the respective download utilities). + for the respective download utilities). For git, +FOO_DL_OPTS+ will + only be passed to `git fetch` and no other git command (esp. not to + `git lfs fetch` or `git submodule update`). * +LIBFOO_EXTRA_DOWNLOADS+ is a space-separated list of additional files that Buildroot should download. If an entry contains +://+ @@ -335,6 +337,13 @@ not and can not work as people would expect it should: for +local+ packages, no patches are applied. If you need to still patch the source code, use +LIBFOO_POST_RSYNC_HOOKS+, see xref:hooks-rsync[]. + ** +smb+ for retrieving source code from a SMB share. Used by + default when +LIBFOO_SITE+ begins with +smb://+. It uses +curl+ + as download backend. Syntax expected: + +LIBFOO_SITE=smb:////+. This method might + require to define -u option in +LIBFOO_DL_OPTS+. For more + information, please refer to the + https://curl.se/docs/tutorial.html[curl documentation]. * +LIBFOO_GIT_SUBMODULES+ can be set to +YES+ to create an archive with the git submodules in the repository. This is only available @@ -631,6 +640,12 @@ different steps of the build process. This is seldom used, as package usually have no strict requirements on the kernel options. +* +LIBFOO_BUSYBOX_CONFIG_FIXUPS+ lists the Busybox configuration + options that are needed to use this package especially in some scripts, + or at contrario the useless options. This shall be a set of + calls to one of the kconfig tweaking option: `KCONFIG_ENABLE_OPT`, + `KCONFIG_DISABLE_OPT`, or `KCONFIG_SET_OPT`. + The preferred way to define these variables is: ---- diff --git a/docs/manual/adding-packages-golang.adoc b/docs/manual/adding-packages-golang.adoc index aa25426591..21b6a122a9 100644 --- a/docs/manual/adding-packages-golang.adoc +++ b/docs/manual/adding-packages-golang.adoc @@ -84,28 +84,30 @@ therefore only use a few of them, or none. infrastructure will automatically generate a minimal +go.mod+ file in the package source tree if it doesn't exist. -* +FOO_LDFLAGS+ and +FOO_TAGS+ can be used to pass respectively the - +LDFLAGS+ or the +TAGS+ to the +go+ build command. +* +FOO_LDFLAGS+, +FOO_EXTLDFLAGS+, and +FOO_TAGS+ can be used to pass + respectively the go +LDFLAGS+ (via the `-ldflags` command line flag), + the external linker flags +EXTLDFLAGS+ (via the `-extldflags` + command line flag), or the +TAGS+ to the +go+ build command. * +FOO_BUILD_TARGETS+ can be used to pass the list of targets that should be built. If +FOO_BUILD_TARGETS+ is not specified, it defaults to +.+. We then have two cases: ** +FOO_BUILD_TARGETS+ is +.+. In this case, we assume only one binary - will be produced, and that by default we name it after the package - name. If that is not appropriate, the name of the produced binary - can be overridden using +FOO_BIN_NAME+. + will be built and installed, and by default we name it after the + package name; if that is not appropriate, the name of the binary can + be overridden using +FOO_BIN_NAME+. -** +FOO_BUILD_TARGETS+ is not +.+. In this case, we iterate over the - values to build each target, and for each produced a binary that is - the non-directory component of the target. For example if - +FOO_BUILD_TARGETS = cmd/docker cmd/dockerd+ the binaries produced - are +docker+ and +dockerd+. - -* +FOO_INSTALL_BINS+ can be used to pass the list of binaries that - should be installed in +/usr/bin+ on the target. If - +FOO_INSTALL_BINS+ is not specified, it defaults to the lower-case - name of package. +** +FOO_BUILD_TARGETS+ is not +.+. In this case, it is interpreted as a + space-separated list, and we iterate over the targets to build and + install a binary named after the non-directory component of the + target. For example if +FOO_BUILD_TARGETS = cmd/docker cmd/dockerd+, + the binaries built and installed are +docker+ and +dockerd+. If + +FOO_BUILD_TARGETS+ contains only one target, then it is possible to + override the built and installed binary by setting +FOO_BIN_NAME+, + as above; if +FOO_BUILD_TARGETS+ contains two or more targets, then + it is not possible to override the names of the installed binaries + (use a post-install hook for that). With the Go infrastructure, all the steps required to build and install the packages are already defined, and they generally work well diff --git a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc index 9fd3b566a5..22ffc5496f 100644 --- a/docs/manual/adding-packages-linux-kernel-spec-infra.adoc +++ b/docs/manual/adding-packages-linux-kernel-spec-infra.adoc @@ -99,8 +99,7 @@ tree. The Buildroot's Linux kernel extensions infrastructure provides a simple solution to automatically do this, just after the kernel sources are extracted and before the kernel patches are applied. Examples of extensions packaged using this mechanism are the -real-time extensions Xenomai and RTAI, as well as the set of -out-of-tree LCD screens drivers +fbtft+. +real-time extensions Xenomai and RTAI. Let's look at an example on how to add a new Linux extension +foo+. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index b42c06e54c..d6bae299a0 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -128,10 +128,9 @@ therefore only use a few of them, or none. and +HOST_PKG_PYTHON_PEP517_ENV+ (for flit/pep517 host packages). * +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to - the Python +setup.py+ script during the build step, this generally - only makes sense to use for setuptools based packages as flit/pep517 - based packages do not pass these options to a +setup.py+ script but - instead pass them to +support/scripts/pyinstaller.py+. + the Python +python -m build+ call. To pass additional options to the + build backend use the +--config-setting=+ (+-C+) flag of the +build+ + module. * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+, +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass diff --git a/docs/manual/adding-packages-tips.adoc b/docs/manual/adding-packages-tips.adoc index 85400c0f31..57ca11ab5d 100644 --- a/docs/manual/adding-packages-tips.adoc +++ b/docs/manual/adding-packages-tips.adoc @@ -85,7 +85,7 @@ under various conditions: does it build for all architectures? Does it build with the different C libraries? Does it need threads, NPTL? And so on... -Buildroot runs http://autobuild.buildroot.org/[autobuilders] which +Buildroot runs https://autobuild.buildroot.org/[autobuilders] which continuously test random configurations. However, these only build the `master` branch of the git tree, and your new fancy package is not yet there. @@ -253,3 +253,78 @@ FOO_SOURCE = foo-$(FOO_VERSION).tar.bz2 If there is a specific tarball uploaded by the upstream developers in +https://gitlab.com//releases/+, do not use this macro, but rather use directly the link to the tarball. + +[[accessing-private-repos]] +==== Accessing a private repository for a package + +If you want to create a package in a br2-external tree and its source +is in a private repository (e.g. on gitlab, github, bitbucket, ...), +you have to write it in a way that it is buildable both by developers +and in CI. This poses a challenge, because you need to authenticate in +order to access it. + +There are several ways you can approach this. The following two are the +most practical ones. + +===== Using SSH and +insteadOf+ + +Configure your private packages to use SSH. + +---- +FOO_SITE = git@githosting.com://.git +---- + +Developers already have an ssh key installed so they can access it +this way. The only limitation is that if they build in docker, they +have to make sure the ssh key is accessible from within the container. +Either mount the SSH directory into the container by passing the +options +-v ~/.ssh:/.ssh+, or load the private key into +ssh-agent and pass +--mount type=bind,source=$SSH_AUTH_SOCK,target=/ssh-agent +--env SSH_AUTH_SOCK=/ssh-agent+ + +CI builders typically will not have an SSH key that allows +access to other repositories. For those, you'll need to generate an +access token. Then you configure git to replace the SSH access with HTTPS +access. As a preparation step in CI, run the following command. + +---- +git config --global url."https://:x-oauth-basic@githosting.com//".insteadOf "git@githosting.com://" +---- + +The way to use a token for basic authentication differs between different +git hosting providers, and sometimes between different types of tokens. +Consult your provider's documentation to find out how to access git over +HTTPS with a token. + +===== Use HTTPS and +.netrc+ + +If, for any reason, developers don't have an SSH key already, then it may +be simpler to use HTTPS authentication. For this, every developer will +have to generate a token that has (read) access to all relevant repositories. +Some git hosting providers have a command-line utility that can generate +such a token, otherwise you'll need to generate it in the web interface. The +token has a limited lifetime so you'll need to regularly refresh it. + +To make sure the token is used in the Buildroot build, add it to +~/.netrc+ + +---- +machine githosting.com + login + password +---- + +The ++ and ++ to use are again different for different +git hosting providers. + +In CI, generate the +.netrc+ file as a preparation step. + +Configure your private packages to use HTTPS. + +---- +FOO_SITE = https://githosting.com//.git +---- + +Both wget (https) and git will use +.netrc+ to get login information. This +approach is potentially somewhat less secure because +.netrc+ cannot be +password-protected. The advantage is that users and CI use the exact same +way of providing credentials. diff --git a/docs/manual/common-usage.adoc b/docs/manual/common-usage.adoc index 43caa3a9bc..7437a7c3c0 100644 --- a/docs/manual/common-usage.adoc +++ b/docs/manual/common-usage.adoc @@ -180,6 +180,34 @@ a newer upstream version for those packages. make pkg-stats ---- +=== Generating CycloneDX SBOM + +Based on the output of +show-info+ Buildroot can generate a SBOM in +the CycloneDX format. While it doesn't offer any additional +information, CycloneDX is a format specification that can be consumed +by other projects. + +---- +make show-info | utils/generate-cyclonedx +---- + +For more information check the help of the +generate-cyclonedx+ script, the +script call can be tailored to your project. + +---- +utils/generate-cyclonedx --help +---- + +Similarly to +pkg-stats+, CycloneDX SBOM's can be enriched with vulnerability +analysis from the NVD database. + +---- +make show | utils/generate-cyclonedx > sbom.cdx.json +cat sbom.cdx.json | support/scripts/cve-check --nvd-path dl/buildroot-nvd/ +---- + +For more information about CycloneDX see https://cyclonedx.org/[]. + === Graphing the dependencies between packages [[graph-depends]] diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index ffaff6f857..c17f1619b4 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -40,8 +40,8 @@ with a random selection of packages. With the large commit activity on Buildroot, these autobuilders are a great help in detecting problems very early after commit. -All build results are available at http://autobuild.buildroot.org[], -statistics are at http://autobuild.buildroot.org/stats.php[]. Every day, +All build results are available at https://autobuild.buildroot.org[], +statistics are at https://autobuild.buildroot.org/stats.php[]. Every day, an overview of all failed packages is sent to the mailing list. Detecting problems is great, but obviously these problems have to be @@ -58,7 +58,7 @@ basically two things that can be done: these steps: . Check if you can reproduce the problem by building with the same configuration. You can do this manually, or use the - http://git.buildroot.org/buildroot-test/tree/utils/br-reproduce-build[br-reproduce-build] + https://gitlab.com/buildroot.org/buildroot-test/-/blob/master/utils/br-reproduce-build[br-reproduce-build] script that will automatically clone a Buildroot git repository, checkout the correct revision, download and set the right configuration, and start the build. @@ -73,7 +73,7 @@ basically two things that can be done: In the commit message of a patch fixing an autobuild failure, add a reference to the build result directory, as follows: ---- -Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 +Fixes: https://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 ---- === Reviewing and testing patches @@ -321,9 +321,12 @@ Now check the coding style for the changes you committed: $ utils/docker-run make check-package ---- -Now, you are ready to generate then submit your patch set. +This command (unlike calling +utils/check-package+ directly) will also warn +about any stale entries in the +.checkpackageignore+ file that your patches +might have resolved. If this is the case, make sure to remove those lines +from +.checkpackageignore+ as well. -To generate it, run: +Now, you are ready to generate then submit your patch set. To generate it, run: ---- $ git format-patch -M -n -s -o outgoing origin/master diff --git a/docs/manual/customize-directory-structure.adoc b/docs/manual/customize-directory-structure.adoc index e0eecb5641..b4b5d50e1a 100644 --- a/docs/manual/customize-directory-structure.adoc +++ b/docs/manual/customize-directory-structure.adoc @@ -49,6 +49,7 @@ to you. | +-- package2.mk | +-- Config.in (if using a br2-external tree) ++-- Makefile (if using a custom top makefile) +-- external.mk (if using a br2-external tree) +-- external.desc (if using a br2-external tree) ---- @@ -109,3 +110,44 @@ BR2_GLOBAL_PATCH_DIR="board//common/patches board//fooboard/pa then first the patches from the 'common' layer would be applied, followed by the patches from the 'fooboard' layer. + +==== Custom top Makefile + +You normally launch Buildroot from the buildroot source directory, pointing ++BR2_EXTERNAL+ and +O+ to the right places for the build you want to make. +You can simplify this by adding a Makefile to your br2-external that sets +these variables and calls into buildroot. + +You can add additional, custom rules to this Makefile for various tasks you +need to perform, e.g. integrate multiple configurations into a single image, +upload to a release server or to a test device, include multiple +br2-external configurations, etc. + +A basic Makefile looks like this. It assumes the buildroot source is available +(e.g. as a git submodule) in the +buildroot+ subdirectory. It makes sure that +the download directory is shared between different builds, and it organizes +the output directories in a structure under +outputs/+. + +---- +# SPDX-License-Identifier: GPL-2.0 + +# Avoid surprises by disabling default rules +MAKEFLAGS += --no-builtin-rules +.SUFFIXES: + +THIS_EXTERNAL_PATH := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) + +# Put downloads in this directory instead of in the Buildroot directory +ifeq ($(BR2_DL_DIR),) +BR2_DL_DIR = $(THIS_EXTERNAL_PATH)/dl +endif + +OUTPUT_BASEDIR = $(THIS_EXTERNAL_PATH)/output +OUTPUT_DIR = $(OUTPUT_BASEDIR)/$(patsubst %_defconfig,%,$@) + +MAKE_BUILDROOT = $(MAKE) -C $(THIS_EXTERNAL_PATH)/buildroot BR2_EXTERNAL=$(THIS_EXTERNAL_PATH) + +%: $(THIS_EXTERNAL_PATH)/configs/% + $(MAKE_BUILDROOT) O=$(OUTPUT_DIR) $@ + sed -i /^BR2_DL_DIR=.*/s%%BR2_DL_DIR=$(BR2_DL_DIR)% $(OUTPUT_DIR)/.config +---- diff --git a/docs/manual/customize-rootfs.adoc b/docs/manual/customize-rootfs.adoc index d334093748..4d03d04617 100644 --- a/docs/manual/customize-rootfs.adoc +++ b/docs/manual/customize-rootfs.adoc @@ -28,6 +28,11 @@ When +BR2_ROOTFS_MERGED_USR+ is enabled, then the overlay must not such a situation, should the overlay have any programs or libraries, they should be placed in '/usr/bin', '/usr/sbin' and '/usr/lib'. + +Additionally, when +BR2_ROOTFS_MERGED_BIN+ is enabled, then the overlay + must not contain the '/usr/sbin' directory, as Buildroot will create + it as a symbolic link to '/usr/bin'. In such a situation, should the + overlay have any programs, they should be placed in '/usr/bin'. ++ As shown in xref:customize-dir-structure[], the recommended path for this overlay is +board///rootfs-overlay+. diff --git a/docs/manual/getting.adoc b/docs/manual/getting.adoc index 51c97d5793..b3a451f67d 100644 --- a/docs/manual/getting.adoc +++ b/docs/manual/getting.adoc @@ -8,7 +8,7 @@ Buildroot releases are made every 3 months, in February, May, August and November. Release numbers are in the format YYYY.MM, so for example 2013.02, 2014.08. -Release tarballs are available at http://buildroot.org/downloads/[]. +Release tarballs are available at https://buildroot.org/downloads/[]. For your convenience, a https://www.vagrantup.com/[Vagrantfile] is available in `support/misc/Vagrantfile` in the Buildroot source tree @@ -32,5 +32,5 @@ vagrant up If you want to follow development, you can use the daily snapshots or make a clone of the Git repository. Refer to the -http://buildroot.org/download[Download page] of the Buildroot website +https://buildroot.org/download.html[Download page] of the Buildroot website for more details. diff --git a/docs/manual/manual.adoc b/docs/manual/manual.adoc index cfcc3e52a9..0682736136 100644 --- a/docs/manual/manual.adoc +++ b/docs/manual/manual.adoc @@ -9,7 +9,7 @@ Buildroot {sys:echo $BR2_VERSION} manual generated on {localdate} The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] +https://gitlab.com/buildroot.org/buildroot/-/blob/master/COPYING[COPYING] file in the Buildroot sources for the full text of this license. Copyright (C) The Buildroot developers diff --git a/docs/manual/manual.html b/docs/manual/manual.html index e6ebba0462..ddd3b3ce3f 100644 --- a/docs/manual/manual.html +++ b/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches and hashes
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Integration topics
10.1. Configurable packages
10.2. Systemd
10.3. Using SELinux in Buildroot
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
11.9. How does Buildroot support Y2038?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The genimage.cfg file
16.4. The documentation
16.5. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. The SNNfoo start script
18.6. Infrastructure for packages with specific build systems
18.7. Infrastructure for autotools-based packages
18.8. Infrastructure for CMake-based packages
18.9. Infrastructure for Python packages
18.10. Infrastructure for LuaRocks-based packages
18.11. Infrastructure for Perl/CPAN packages
18.12. Infrastructure for virtual packages
18.13. Infrastructure for packages using kconfig for configuration files
18.14. Infrastructure for rebar-based packages
18.15. Infrastructure for Waf-based packages
18.16. Infrastructure for Meson-based packages
18.17. Infrastructure for Cargo-based packages
18.18. Infrastructure for Go packages
18.19. Infrastructure for QMake-based packages
18.20. Infrastructure for packages building kernel modules
18.21. Infrastructure for asciidoc documents
18.22. Infrastructure specific to the Linux kernel package
18.23. Hooks available in the various build steps
18.24. Gettext integration and interaction with packages
18.25. Tips and tricks
18.26. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Additional patch documentation
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the runtime tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
26.1. Caveat with automatic UIDs and GIDs
27. Migrating from older Buildroot versions
27.1. General approach
27.2. Migrating to 2016.11
27.3. Migrating to 2017.08
27.4. Migrating to 2023.11
27.5. Migrating to 2024.05

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2024.11 manual generated on 2024-12-08 -10:19:50 UTC from git revision 8f9ce0c913

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Details about packages
8.9. Generating CycloneDX SBOM
8.10. Graphing the dependencies between packages
8.11. Graphing the build duration
8.12. Graphing the filesystem size contribution of packages
8.13. Top-level parallel build
8.14. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches and hashes
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Integration topics
10.1. Configurable packages
10.2. Systemd
10.3. Using SELinux in Buildroot
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
11.9. How does Buildroot support Y2038?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The genimage.cfg file
16.4. The documentation
16.5. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. The SNNfoo start script
18.6. Infrastructure for packages with specific build systems
18.7. Infrastructure for autotools-based packages
18.8. Infrastructure for CMake-based packages
18.9. Infrastructure for Python packages
18.10. Infrastructure for LuaRocks-based packages
18.11. Infrastructure for Perl/CPAN packages
18.12. Infrastructure for virtual packages
18.13. Infrastructure for packages using kconfig for configuration files
18.14. Infrastructure for rebar-based packages
18.15. Infrastructure for Waf-based packages
18.16. Infrastructure for Meson-based packages
18.17. Infrastructure for Cargo-based packages
18.18. Infrastructure for Go packages
18.19. Infrastructure for QMake-based packages
18.20. Infrastructure for packages building kernel modules
18.21. Infrastructure for asciidoc documents
18.22. Infrastructure specific to the Linux kernel package
18.23. Hooks available in the various build steps
18.24. Gettext integration and interaction with packages
18.25. Tips and tricks
18.26. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Additional patch documentation
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the runtime tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
26.1. Caveat with automatic UIDs and GIDs
27. Migrating from older Buildroot versions
27.1. General approach
27.2. Migrating to 2016.11
27.3. Migrating to 2017.08
27.4. Migrating to 2023.11
27.5. Migrating to 2024.05
27.6. Migrating to 2025.02
27.7. Migrating to 2025.05
27.8. Migrating to 2025.08
27.9. Migrating to 2025.11

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2025.11 manual generated on 2025-12-11 +22:45:13 UTC from git revision 08d71521d3

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING +COPYING file in the Buildroot sources for the full text of this license.

Copyright © The Buildroot developers <buildroot@buildroot.org>

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC processors, MIPS processors, ARM processors, etc.

Buildroot supports numerous processors and their variants; it also comes with default configurations for several boards available off-the-shelf. Besides this, a number of third-party projects are based on, -or develop their BSP [1] or -SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the +or develop their BSP [1] or +SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the compilation, certain standard Linux utilities are expected to be already installed on the host system. Below you will find an overview of the mandatory and optional packages (note that package names may vary @@ -63,6 +63,8 @@ Build tools: bc

  • findutils +
  • +awk

  • Source fetching tools:

    • @@ -136,7 +138,7 @@ Package statistics tools (pkg-stats): python-aiohttp

    • Chapter 3. Getting Buildroot

    Buildroot releases are made every 3 months, in February, May, August and November. Release numbers are in the format YYYY.MM, so for example -2013.02, 2014.08.

    Release tarballs are available at http://buildroot.org/downloads/.

    For your convenience, a Vagrantfile is +2013.02, 2014.08.

    Release tarballs are available at https://buildroot.org/downloads/.

    For your convenience, a Vagrantfile is available in support/misc/Vagrantfile in the Buildroot source tree to quickly set up a virtual machine with the needed dependencies to get started.

    If you want to setup an isolated buildroot environment on Linux or Mac @@ -144,7 +146,7 @@ Os X, paste this line onto your terminal:

    curl -O https:/
 "https://buildroot.org/downloads/Vagrantfile","Vagrantfile");
 vagrant up

    If you want to follow development, you can use the daily snapshots or make a clone of the Git repository. Refer to the -Download page of the Buildroot website +Download page of the Buildroot website for more details.

    Chapter 4. Buildroot quick start

    Important: you can and should build everything as a normal user. There is no need to be root to configure and use Buildroot. By running all commands as a regular user, you protect your system against packages @@ -163,7 +165,7 @@ for details on some specific configuration aspects.

    Once everything is con read by the top-level Makefile.

    To start the build process, simply run:

     $ make

    By default, Buildroot does not support top-level parallel build, so running make -jN is not necessary. There is however experimental support for top-level parallel build, see -Section 8.12, “Top-level parallel build”.

    The make command will generally perform the following steps:

    • +Section 8.13, “Top-level parallel build”.

      The make command will generally perform the following steps:

      • download source files (as required);
      • configure, build and install the cross-compilation toolchain, or @@ -226,10 +228,10 @@ Mailing List

        Buildroot has a mailing list for discussion and development. It is the main method of interaction for Buildroot users and developers.

        Only subscribers to the Buildroot mailing list are allowed to post to this list. You can subscribe via the -mailing list info +mailing list info page.

        Mails that are sent to the mailing list are also available in the mailing list archives, available through -Mailman or at +Mailman or at lore.kernel.org.

        IRC

        The Buildroot IRC channel #buildroot is @@ -285,7 +287,7 @@ processor. Under most Linux systems, the compilation toolchain uses the GNU libc (glibc) as the C standard library. This compilation toolchain is called the "host compilation toolchain". The machine on which it is running, and on which you’re working, is called the "host -system" [3].

        The compilation toolchain is provided by your distribution, and +system" [3].

        The compilation toolchain is provided by your distribution, and Buildroot has nothing to do with it (other than using it to build a cross-compilation toolchain and other tools that are run on the development host).

        As said above, the compilation toolchain that comes with your system @@ -589,7 +591,7 @@ The third solution is systemd. http://www.freedesktop.org/wiki/Software/systemd.

      The solution recommended by Buildroot developers is to use the BusyBox init as it is sufficient for most embedded -systems. systemd can be used for more complex situations.


    [3] This terminology differs from what is used by GNU +systems. systemd can be used for more complex situations.


    [3] This terminology differs from what is used by GNU configure, where the host is the machine on which the application will run (which is usually the same as target)

    Chapter 7. Configuration of other components

    Before attempting to modify any of the components below, make sure you have already configured Buildroot itself, and have enabled the @@ -658,7 +660,7 @@ A few tools are required to build the documentation (see: Section 2.2, “Optional packages”).

    Resetting Buildroot for a new target: To delete all build products as well as the configuration:

     $ make distclean

    Notes. If ccache is enabled, running make clean or distclean does not empty the compiler cache used by Buildroot. To delete it, refer -to Section 8.13.3, “Using ccache in Buildroot”.

    Dumping the internal make variables: One can dump the variables known to make, along with their values:

     $ make -s printvars VARS='VARIABLE1 VARIABLE2'
+to Section 8.14.3, “Using ccache in Buildroot”.
    Dumping the internal make variables: One can dump the variables known to make, along with their values:
     $ make -s printvars VARS='VARIABLE1 VARIABLE2'
  VARIABLE1=value_of_variable
  VARIABLE2=value_of_variable
    It is possible to tweak the output using some variables:
    • 
 VARS will limit the listing to variables which names match the
@@ -784,7 +786,7 @@ stored in the package build directory,
 .stamp_<step-name>. The commands detailed above simply manipulate
 these stamp files to force Buildroot to restart a specific set of
 steps of a package build process.
      Further details about package special make targets are explained in
-Section 8.13.5, “Package-specific make targets”.
    8.4. Offline builds
    If you intend to do an offline build and just want to download
+Section 8.14.5, “Package-specific make targets”.
    8.4. Offline builds
    If you intend to do an offline build and just want to download
 all sources that you previously selected in the configurator
 (menuconfig, nconfig, xconfig or gconfig), then issue:
     $ make source
    You can now disconnect or copy the content of your dl
 directory to the build-host.
    8.5. Building out-of-tree
    As default, everything built by Buildroot is stored in the directory
@@ -831,7 +833,7 @@ to make or set in the environment:
    .config file. See
-  Section 8.13.4, “Location of downloaded packages” for more details on how you can set the download
+  Section 8.14.4, “Location of downloaded packages” for more details on how you can set the download
   directory.
 
  • 
 BR2_GRAPH_ALT, if set and non-empty, to use an alternate color-scheme in
@@ -841,13 +843,13 @@ to make or set in the environment:
    png.
 
  • 
 BR2_GRAPH_DEPS_OPTS to pass extra options to the dependency graph; see
-  Section 8.9, “Graphing the dependencies between packages” for the accepted options
+  Section 8.10, “Graphing the dependencies between packages” for the accepted options
 
  • 
 BR2_GRAPH_DOT_OPTS is passed verbatim as options to the dot utility to
   draw the dependency graph.
 
  • 
 BR2_GRAPH_SIZE_OPTS to pass extra options to the size graph; see
-  Section 8.11, “Graphing the filesystem size contribution of packages” for the acepted options
+  Section 8.12, “Graphing the filesystem size contribution of packages” for the acepted options
 
    • An example that uses config files located in the toplevel directory and
 in your $HOME:
     $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
    If you want to use a compiler other than the default gcc
 or g++ for building helper-binaries on your host, then do
     $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
    8.7. Dealing efficiently with filesystem images
    Filesystem images can get pretty big, depending on the filesystem you choose,
@@ -884,7 +886,13 @@ by using the show-info make target:
    pkg-stats make target. Amongst other things, these
 details include whether known CVEs (security vulnerabilities) affect
 the packages in your current configuration. It also shows if there is
-a newer upstream version for those packages.
    make pkg-stats
    8.9. Graphing the dependencies between packages
    One of Buildroot’s jobs is to know the dependencies between packages,
+a newer upstream version for those packages.
    make pkg-stats
    8.9. Generating CycloneDX SBOM
    Based on the output of show-info Buildroot can generate a SBOM in
+the CycloneDX format. While it doesn’t offer any additional
+information, CycloneDX is a format specification that can be consumed
+by other projects.
    make show-info | utils/generate-cyclonedx
    For more information check the help of the generate-cyclonedx script, the
+script call can be tailored to your project.
    utils/generate-cyclonedx --help
    Similarly to pkg-stats, CycloneDX SBOM’s can be enriched with vulnerability
+analysis from the NVD database.
    make show | utils/generate-cyclonedx > sbom.cdx.json
+cat sbom.cdx.json | support/scripts/cve-check --nvd-path dl/buildroot-nvd/
    For more information about CycloneDX see https://cyclonedx.org/.
    8.10. Graphing the dependencies between packages
    One of Buildroot’s jobs is to know the dependencies between packages,
 and make sure they are built in the right order. These dependencies
 can sometimes be quite complicated, and for a given system, it is
 often not easy to understand why such or such package was brought into
@@ -923,7 +931,7 @@ supported.
    BR2_GRAPH_OUT=svg make graph-depends
    T
 --colors R,T,H, the comma-separated list of colors to draw the
   root package (R), the target packages (T) and the host packages
   (H). Defaults to: lightblue,grey,gainsboro
-
    BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends

    8.10. Graphing the build duration

    When the build of a system takes a long time, it is sometimes useful +

    BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends

    8.11. Graphing the build duration

    When the build of a system takes a long time, it is sometimes useful to be able to understand which packages are the longest to build, to see if anything can be done to speed up the build. In order to help such build time analysis, Buildroot collects the build time of each @@ -947,7 +955,7 @@ most distributions), and also the argparse module i Python version older than 2.7 (python-argparse on most distributions).

    By default, the output format for the graph is PDF, but a different format can be selected using the BR2_GRAPH_OUT environment variable. The -only other format supported is PNG:

    BR2_GRAPH_OUT=png make graph-build

    8.11. Graphing the filesystem size contribution of packages

    When your target system grows, it is sometimes useful to understand +only other format supported is PNG:

    BR2_GRAPH_OUT=png make graph-build

    8.12. Graphing the filesystem size contribution of packages

    When your target system grows, it is sometimes useful to understand how much each Buildroot package is contributing to the overall root filesystem size. To help with such an analysis, Buildroot collects data about files installed by each package and using this data, @@ -966,7 +974,7 @@ the different packages.

    To generate these data after a build, run:

    python-matplotlib on most distributions), and also the
 argparse module if you’re using a Python version older than 2.7
 (python-argparse on most distributions).
    Just like for the duration graph, a BR2_GRAPH_OUT environment variable
-is supported to adjust the output file format. See Section 8.9, “Graphing the dependencies between packages”
+is supported to adjust the output file format. See Section 8.10, “Graphing the dependencies between packages”
 for details about this environment variable.
    Additionally, one may set the environment variable BR2_GRAPH_SIZE_OPTS
 to further control the generated graph. Accepted options are:
    • 
 --size-limit X, -l X, will group all packages which individual
@@ -986,7 +994,7 @@ graph-size.
      To compare the root filesystem size of two different Bu
 for example after adjusting the configuration or when switching to another
 Buildroot release, use the size-stats-compare script. It takes two
 file-size-stats.csv files (produced by make graph-size) as input.
-Refer to the help text of this script for more details:
      utils/size-stats-compare -h
    8.12. Top-level parallel build
    Note. This section deals with a very experimental feature, which is known to
+Refer to the help text of this script for more details:
    utils/size-stats-compare -h
    8.13. Top-level parallel build
    Note. This section deals with a very experimental feature, which is known to
 break even in some non-unusual situations. Use at your own risk.
    Buildroot has always been capable of using parallel build on a per
 package basis: each package is built by Buildroot using make -jN (or
 the equivalent invocation for non-make-based build systems). The level
@@ -1019,7 +1027,7 @@ At the end of the build, the global target

    8.13. Advanced usage

    8.13.1. Using the generated toolchain outside Buildroot

    You may want to compile, for your target, your own programs or other +

    8.14. Advanced usage

    8.14.1. Using the generated toolchain outside Buildroot

    You may want to compile, for your target, your own programs or other software that are not packaged in Buildroot. In order to do this you can use the toolchain that was generated by Buildroot.

    The toolchain generated by Buildroot is located by default in output/host/. The simplest way to use it is to add @@ -1049,7 +1057,7 @@ Buildroot SDK: the PATH will contain the SDK binari cross-compile autotools projects. It also provides some useful commands. Note however that once this script is sourced, the environment is setup only for cross-compilation, and no longer for -native compilation.

    8.13.2. Using gdb in Buildroot

    Buildroot allows to do cross-debugging, where the debugger runs on the +native compilation.

    8.14.2. Using gdb in Buildroot

    Buildroot allows to do cross-debugging, where the debugger runs on the build machine and communicates with gdbserver on the target to control the execution of the program.

    To achieve this:

    • If you are using an internal toolchain (built by Buildroot), you @@ -1070,7 +1078,7 @@ command line:

      <buildroot>/output/host/bin/<tuple
 with debugging symbols. Typically you start this command from the
 directory where foo is built (and not from output/target/ as the
 binaries in that directory are stripped).
      The <buildroot>/output/staging/usr/share/buildroot/gdbinit file will tell the
-cross gdb where to find the libraries of the target.
      Finally, to connect to the target from the cross gdb:
      (gdb) target remote <target ip address>:2345

    8.13.3. Using ccache in Buildroot

    ccache is a compiler cache. It stores the +cross gdb where to find the libraries of the target.

    Finally, to connect to the target from the cross gdb:

    (gdb) target remote <target ip address>:2345

    8.14.3. Using ccache in Buildroot

    ccache is a compiler cache. It stores the object files resulting from each compilation process, and is able to skip future compilation of the same source file (with same compiler and same arguments) by using the pre-existing object files. When doing @@ -1108,7 +1116,7 @@ more details about this rewriting of absolute paths.

    When BR2_USE_CCACHE environment variable: when set to 1, usage of ccache is enabled (default during the Buildroot build), when unset or set to a value different from 1, -usage of ccache is disabled.

    8.13.4. Location of downloaded packages

    The various tarballs that are downloaded by Buildroot are all stored +usage of ccache is disabled.

    8.14.4. Location of downloaded packages

    The various tarballs that are downloaded by Buildroot are all stored in BR2_DL_DIR, which by default is the dl directory. If you want to keep a complete version of Buildroot which is known to be working with the associated tarballs, you can make a copy of this directory. @@ -1119,7 +1127,7 @@ shared download location. This can be achieved by pointing the set, then the value of BR2_DL_DIR in the Buildroot configuration is overridden. The following line should be added to <~/.bashrc>.

     export BR2_DL_DIR=<shared download location>

    The download location can also be set in the .config file, with the BR2_DL_DIR option. Unlike most options in the .config file, this value -is overridden by the BR2_DL_DIR environment variable.

    8.13.5. Package-specific make targets

    Running make <package> builds and installs that particular package +is overridden by the BR2_DL_DIR environment variable.

    8.14.5. Package-specific make targets

    Running make <package> builds and installs that particular package and its dependencies.

    For packages relying on the Buildroot infrastructure, there are numerous special make targets that can be called independently like this:

    make <package>-<target>

    The package build targets are (in the order they are executed):

    command/target Description

    source

    Fetch the source (download the tarball, clone @@ -1145,7 +1153,7 @@ graphs.

    OVERRIDE_SRCDIR feature or when you modified a file directly in the build directory

    reconfigure

    Re-run the configure commands, then rebuild - this only makes sense when using the OVERRIDE_SRCDIR feature or when you modified a -file directly in the build directory

    8.13.6. Using Buildroot during development

    The normal operation of Buildroot is to download a tarball, extract +file directly in the build directory

    8.14.6. Using Buildroot during development

    The normal operation of Buildroot is to download a tarball, extract it, configure, compile and install the software component found inside this tarball. The source code is extracted in output/build/<package>-<version>, which is a temporary directory: @@ -1291,6 +1299,7 @@ to you.

    +-- board/
 |           +-- package2.mk
 |
 +-- Config.in (if using a br2-external tree)
++-- Makefile (if using a custom top makefile)
 +-- external.mk (if using a br2-external tree)
 +-- external.desc (if using a br2-external tree)

    Details on the files shown above are given further in this chapter.

    Note: if you choose to place this structure outside of the Buildroot tree but in a br2-external tree, the <company> and possibly <boardname> @@ -1325,7 +1334,36 @@ layers common and +-- patches/ +-- ...

    For example, if the user has the BR2_GLOBAL_PATCH_DIR configuration option set as:

    BR2_GLOBAL_PATCH_DIR="board/<company>/common/patches board/<company>/fooboard/patches"

    then first the patches from the common layer would be applied, -followed by the patches from the fooboard layer.

    9.2. Keeping customizations outside of Buildroot

    As already briefly mentioned in Section 9.1, “Recommended directory structure”, you can +followed by the patches from the fooboard layer.

    9.1.2. Custom top Makefile

    You normally launch Buildroot from the buildroot source directory, pointing +BR2_EXTERNAL and O to the right places for the build you want to make. +You can simplify this by adding a Makefile to your br2-external that sets +these variables and calls into buildroot.

    You can add additional, custom rules to this Makefile for various tasks you +need to perform, e.g. integrate multiple configurations into a single image, +upload to a release server or to a test device, include multiple +br2-external configurations, etc.

    A basic Makefile looks like this. It assumes the buildroot source is available +(e.g. as a git submodule) in the buildroot subdirectory. It makes sure that +the download directory is shared between different builds, and it organizes +the output directories in a structure under outputs/.

    # SPDX-License-Identifier: GPL-2.0
+
+# Avoid surprises by disabling default rules
+MAKEFLAGS += --no-builtin-rules
+.SUFFIXES:
+
+THIS_EXTERNAL_PATH := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+# Put downloads in this directory instead of in the Buildroot directory
+ifeq ($(BR2_DL_DIR),)
+BR2_DL_DIR = $(THIS_EXTERNAL_PATH)/dl
+endif
+
+OUTPUT_BASEDIR = $(THIS_EXTERNAL_PATH)/output
+OUTPUT_DIR = $(OUTPUT_BASEDIR)/$(patsubst %_defconfig,%,$@)
+
+MAKE_BUILDROOT = $(MAKE) -C $(THIS_EXTERNAL_PATH)/buildroot BR2_EXTERNAL=$(THIS_EXTERNAL_PATH)
+
+%: $(THIS_EXTERNAL_PATH)/configs/%
+        $(MAKE_BUILDROOT) O=$(OUTPUT_DIR) $@
+        sed -i /^BR2_DL_DIR=.*/s%%BR2_DL_DIR=$(BR2_DL_DIR)% $(OUTPUT_DIR)/.config

    9.2. Keeping customizations outside of Buildroot

    As already briefly mentioned in Section 9.1, “Recommended directory structure”, you can place project-specific customizations in two locations:

    • directly within the Buildroot tree, typically maintaining them using branches in a version control system so that upgrading to a newer @@ -1686,7 +1724,10 @@ Root filesystem overlays (BR2_ROOTFS_OVERLAY) contain the /bin, /lib or /sbin directories, as Buildroot will create them as symbolic links to the relevant folders in /usr. In such a situation, should the overlay have any programs or libraries, - they should be placed in /usr/bin, /usr/sbin and /usr/lib.

      As shown in Section 9.1, “Recommended directory structure”, the recommended path for + they should be placed in /usr/bin, /usr/sbin and /usr/lib.

      Additionally, when BR2_ROOTFS_MERGED_BIN is enabled, then the overlay + must not contain the /usr/sbin directory, as Buildroot will create + it as a symbolic link to /usr/bin. In such a situation, should the + overlay have any programs, they should be placed in /usr/bin.

      As shown in Section 9.1, “Recommended directory structure”, the recommended path for this overlay is board/<company>/<boardname>/rootfs-overlay.

      Post-build scripts (BR2_ROOTFS_POST_BUILD_SCRIPT)

      Post-build scripts are shell scripts called after Buildroot builds @@ -2236,7 +2277,7 @@ Use a pre-built external toolchain instead of the default Buildroot switch back to an internal toolchain (that may provide a higher level of customization) once the rest of your system is working;

    • -Use the ccache compiler cache (see: Section 8.13.3, “Using ccache in Buildroot”); +Use the ccache compiler cache (see: Section 8.14.3, “Using ccache in Buildroot”);
    • Learn about rebuilding only the few packages you actually care about (see Section 8.3, “Understanding how to rebuild packages”), but beware that sometimes full @@ -2255,7 +2296,7 @@ Buy new hardware. SSDs and lots of RAM are key to speeding up the builds.
    • Experiment with top-level parallel build, see - Section 8.12, “Top-level parallel build”. + Section 8.13, “Top-level parallel build”.

    11.9. How does Buildroot support Y2038?

    There are multiple situations to consider:

    • On 64-bit architectures, there is no problem, as time_t has always been 64-bit. @@ -3248,7 +3289,7 @@ flags. The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s) of the shell script(s) needing fixing. All these names are relative to $(STAGING_DIR)/usr/bin and if needed multiple names can be given.

      In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed -from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

      Example 18.1. Config script: divine package

      Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

      So its fixup would be:

      DIVINE_CONFIG_SCRIPTS = divine-config

      Example 18.2. Config script: imagemagick package:

      Package imagemagick installs the following scripts: +from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

      Example 18.1. Config script: divine package

      Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

      So its fixup would be:

      DIVINE_CONFIG_SCRIPTS = divine-config

      Example 18.2. Config script: imagemagick package:

      Package imagemagick installs the following scripts: $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config

      So it’s fixup would be:

      IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config

      On line 14, we specify the list of dependencies this package relies @@ -3369,7 +3410,9 @@ because two builds can never be perfectly simultaneous, and because server-side checking for user logins and passwords, or to use a proxy. All download methods valid for LIBFOO_SITE_METHOD are supported; valid options depend on the download method (consult the man page - for the respective download utilities). + for the respective download utilities). For git, FOO_DL_OPTS will + only be passed to git fetch and no other git command (esp. not to + git lfs fetch or git submodule update).

    • LIBFOO_EXTRA_DOWNLOADS is a space-separated list of additional files that Buildroot should download. If an entry contains :// @@ -3444,6 +3487,14 @@ because two builds can never be perfectly simultaneous, and because for local packages, no patches are applied. If you need to still patch the source code, use LIBFOO_POST_RSYNC_HOOKS, see Section 18.23.1, “Using the POST_RSYNC hook”. +
    • +smb for retrieving source code from a SMB share. Used by + default when LIBFOO_SITE begins with smb://. It uses curl + as download backend. Syntax expected: + LIBFOO_SITE=smb://<server>/<share>/<path>. This method might + require to define -u option in LIBFOO_DL_OPTS. For more + information, please refer to the + curl documentation.
  • LIBFOO_GIT_SUBMODULES can be set to YES to create an archive with the git submodules in the repository. This is only available @@ -3724,6 +3775,12 @@ different steps of the build process.

      KCONFIG_DISABLE_OPT, or KCONFIG_SET_OPT. This is seldom used, as package usually have no strict requirements on the kernel options. +
    • +LIBFOO_BUSYBOX_CONFIG_FIXUPS lists the Busybox configuration + options that are needed to use this package especially in some scripts, + or at contrario the useless options. This shall be a set of + calls to one of the kconfig tweaking option: KCONFIG_ENABLE_OPT, + KCONFIG_DISABLE_OPT, or KCONFIG_SET_OPT.

    The preferred way to define these variables is:

    define LIBFOO_CONFIGURE_CMDS
         action 1
         action 2
@@ -3752,7 +3809,7 @@ Of course the $(HOST_DIR), $(
   the current package host, staging and target directories. In
   both cases, it doesn’t make any difference from the package point of
   view: it should simply use HOST_DIR, STAGING_DIR and
-  TARGET_DIR. See Section 8.12, “Top-level parallel build” for more details
+  TARGET_DIR. See Section 8.13, “Top-level parallel build” for more details
   about per-package directory support.

    • Finally, you can also use hooks. See Section 18.23, “Hooks available in the various build steps” for more information.

    18.7. Infrastructure for autotools-based packages

    18.7.1. autotools-package tutorial

    First, let’s see how to write a .mk file for an autotools-based package, with an example :

    01: ################################################################################
@@ -4085,10 +4142,9 @@ therefore only use a few of them, or none.
      HOST_PKG_PYTHON_PEP517_ENV (for flit/pep517 host packages).
 
    • 
 PYTHON_FOO_BUILD_OPTS, to specify additional options to pass to
-  the Python setup.py script during the build step, this generally
-  only makes sense to use for setuptools based packages as flit/pep517
-  based packages do not pass these options to a setup.py script but
-  instead pass them to support/scripts/pyinstaller.py.
+  the Python python -m build call. To pass additional options to the
+  build backend use the --config-setting= (-C) flag of the build
+  module.
 
    • 
 PYTHON_FOO_INSTALL_TARGET_OPTS, PYTHON_FOO_INSTALL_STAGING_OPTS,
   HOST_PYTHON_FOO_INSTALL_OPTS to specify additional options to pass
@@ -4741,29 +4797,31 @@ The package must specify its Go module name in the FOO_GOM
   infrastructure will automatically generate a minimal go.mod file
   in the package source tree if it doesn’t exist.
 
    • 
-FOO_LDFLAGS and FOO_TAGS can be used to pass respectively the
-  LDFLAGS or the TAGS to the go build command.
+FOO_LDFLAGS, FOO_EXTLDFLAGS, and FOO_TAGS can be used to pass
+  respectively the go LDFLAGS (via the -ldflags command line flag),
+  the external linker flags EXTLDFLAGS (via the -extldflags
+  command line flag), or the TAGS to the go build command.
 
    • 
 FOO_BUILD_TARGETS can be used to pass the list of targets that
   should be built. If FOO_BUILD_TARGETS is not specified, it
   defaults to .. We then have two cases:
 
      • 
 FOO_BUILD_TARGETS is .. In this case, we assume only one binary
-   will be produced, and that by default we name it after the package
-   name. If that is not appropriate, the name of the produced binary
-   can be overridden using FOO_BIN_NAME.
+   will be built and installed, and by default we name it after the
+   package name; if that is not appropriate, the name of the binary can
+   be overridden using FOO_BIN_NAME.
 
      • 
-FOO_BUILD_TARGETS is not .. In this case, we iterate over the
-   values to build each target, and for each produced a binary that is
-   the non-directory component of the target. For example if
-   FOO_BUILD_TARGETS = cmd/docker cmd/dockerd the binaries produced
-   are docker and dockerd.
-
    • 
-FOO_INSTALL_BINS can be used to pass the list of binaries that
-  should be installed in /usr/bin on the target. If
-  FOO_INSTALL_BINS is not specified, it defaults to the lower-case
-  name of package.
-
    With the Go infrastructure, all the steps required to build and
+FOO_BUILD_TARGETS is not .. In this case, it is interpreted as a
+   space-separated list, and we iterate over the targets to build and
+   install a binary named after the non-directory component of the
+   target. For example if FOO_BUILD_TARGETS = cmd/docker cmd/dockerd,
+   the binaries built and installed are docker and dockerd. If
+   FOO_BUILD_TARGETS contains only one target, then it is possible to
+   override the built and installed binary by setting FOO_BIN_NAME,
+   as above; if FOO_BUILD_TARGETS contains two or more targets, then
+   it is not possible to override the names of the installed binaries
+   (use a post-install hook for that).
+

    With the Go infrastructure, all the steps required to build and install the packages are already defined, and they generally work well for most Go-based packages. However, when required, it is still possible to customize what is done in any particular step:

    • @@ -5086,8 +5144,7 @@ tree. The Buildroot’s Linux kernel extensions infrastructure provides a simple solution to automatically do this, just after the kernel sources are extracted and before the kernel patches are applied. Examples of extensions packaged using this mechanism are the -real-time extensions Xenomai and RTAI, as well as the set of -out-of-tree LCD screens drivers fbtft.

      Let’s look at an example on how to add a new Linux extension foo.

      First, create the package foo that provides the extension: this +real-time extensions Xenomai and RTAI.

      Let’s look at an example on how to add a new Linux extension foo.

      First, create the package foo that provides the extension: this package is a standard package; see the previous chapters on how to create such a package. This package is in charge of downloading the sources archive, checking the hash, defining the licence information @@ -5275,7 +5332,7 @@ unfixed, warnings.

      If you have Docker or Podman you can run $ ./utils/docker-run ./utils/check-package

    18.25.3. How to test your package

    Once you have added your new package, it is important that you test it under various conditions: does it build for all architectures? Does it build with the different C libraries? Does it need threads, NPTL? And -so on…

    Buildroot runs autobuilders which +so on…

    Buildroot runs autobuilders which continuously test random configurations. However, these only build the master branch of the git tree, and your new fancy package is not yet there.

    Buildroot provides a script in utils/test-pkg that uses the same base @@ -5379,7 +5436,35 @@ FOO_VERSION = 1.0 FOO_SITE = $(call gitlab,<user>,<package>,v$(FOO_VERSION)) FOO_SOURCE = foo-$(FOO_VERSION).tar.bz2

    If there is a specific tarball uploaded by the upstream developers in https://gitlab.com/<project>/releases/, do not use this macro, but -rather use directly the link to the tarball.

    18.26. Conclusion

    As you can see, adding a software package to Buildroot is simply a +rather use directly the link to the tarball.

    18.25.6. Accessing a private repository for a package

    If you want to create a package in a br2-external tree and its source +is in a private repository (e.g. on gitlab, github, bitbucket, …), +you have to write it in a way that it is buildable both by developers +and in CI. This poses a challenge, because you need to authenticate in +order to access it.

    There are several ways you can approach this. The following two are the +most practical ones.

    Using SSH and insteadOf

    Configure your private packages to use SSH.

    FOO_SITE = git@githosting.com:/<group>/<package>.git

    Developers already have an ssh key installed so they can access it +this way. The only limitation is that if they build in docker, they +have to make sure the ssh key is accessible from within the container. +Either mount the SSH directory into the container by passing the +options -v ~/.ssh:<homedir>/.ssh, or load the private key into +ssh-agent and pass --mount type=bind,source=$SSH_AUTH_SOCK,target=/ssh-agent +--env SSH_AUTH_SOCK=/ssh-agent

    CI builders typically will not have an SSH key that allows +access to other repositories. For those, you’ll need to generate an +access token. Then you configure git to replace the SSH access with HTTPS +access. As a preparation step in CI, run the following command.

    git config --global url."https://<token>:x-oauth-basic@githosting.com/<group>/".insteadOf "git@githosting.com:/<group>/"

    The way to use a token for basic authentication differs between different +git hosting providers, and sometimes between different types of tokens. +Consult your provider’s documentation to find out how to access git over +HTTPS with a token.

    Use HTTPS and .netrc

    If, for any reason, developers don’t have an SSH key already, then it may +be simpler to use HTTPS authentication. For this, every developer will +have to generate a token that has (read) access to all relevant repositories. +Some git hosting providers have a command-line utility that can generate +such a token, otherwise you’ll need to generate it in the web interface. The +token has a limited lifetime so you’ll need to regularly refresh it.

    To make sure the token is used in the Buildroot build, add it to ~/.netrc

    machine githosting.com
+    login <username>
+    password <token>

    The <username> and <password> to use are again different for different +git hosting providers.

    In CI, generate the .netrc file as a preparation step.

    Configure your private packages to use HTTPS.

    FOO_SITE = https://githosting.com/<group>/<package>.git

    Both wget (https) and git will use .netrc to get login information. This +approach is potentially somewhat less secure because .netrc cannot be +password-protected. The advantage is that users and CI use the exact same +way of providing credentials.

    18.26. Conclusion

    As you can see, adding a software package to Buildroot is simply a matter of writing a Makefile using an existing example and modifying it according to the compilation process required by the package.

    If you package software that might be useful for other people, don’t forget to send a patch to the Buildroot mailing list (see @@ -5545,8 +5630,8 @@ run Buildroot builds based on random configurations. This is done for all architectures supported by Buildroot, with various toolchains, and with a random selection of packages. With the large commit activity on Buildroot, these autobuilders are a great help in detecting problems -very early after commit.

    All build results are available at http://autobuild.buildroot.org, -statistics are at http://autobuild.buildroot.org/stats.php. Every day, +very early after commit.

    All build results are available at https://autobuild.buildroot.org, +statistics are at https://autobuild.buildroot.org/stats.php. Every day, an overview of all failed packages is sent to the mailing list.

    Detecting problems is great, but obviously these problems have to be fixed as well. Your contribution is very welcome here! There are basically two things that can be done:

    • @@ -5561,7 +5646,7 @@ Fixing a problem. When fixing autobuild failures, you should follow

      1. Check if you can reproduce the problem by building with the same configuration. You can do this manually, or use the - br-reproduce-build + br-reproduce-build script that will automatically clone a Buildroot git repository, checkout the correct revision, download and set the right configuration, and start the build. @@ -5578,7 +5663,7 @@ Send the fix to the Buildroot mailing list (see can be removed. In the commit message of a patch fixing an autobuild failure, add a reference to the build result directory, as follows: -
    Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069

    22.3. Reviewing and testing patches

    With the amount of patches sent to the mailing list each day, the +

    Fixes: https://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069

    22.3. Reviewing and testing patches

    With the amount of patches sent to the mailing list each day, the maintainer has a very hard job to judge which patches are ready to apply and which ones aren’t. Contributors can greatly help here by reviewing and testing these patches.

    In the review process, do not hesitate to respond to patch submissions @@ -5741,7 +5826,10 @@ mistakes on files you created or modified, called check-pa Section 18.25.2, “How to check the coding style” for more information).

    22.5.2. Preparing a patch series

    Starting from the changes committed in your local git view, rebase your development branch on top of the upstream tree before generating a patch set. To do so, run:

    $ git fetch --all --tags
-$ git rebase origin/master

    Now check the coding style for the changes you committed:

    $ utils/docker-run make check-package

    Now, you are ready to generate then submit your patch set.

    To generate it, run:

    $ git format-patch -M -n -s -o outgoing origin/master

    This will generate patch files in the outgoing subdirectory, +$ git rebase origin/master

    Now check the coding style for the changes you committed:

    $ utils/docker-run make check-package

    This command (unlike calling utils/check-package directly) will also warn +about any stale entries in the .checkpackageignore file that your patches +might have resolved. If this is the case, make sure to remove those lines +from .checkpackageignore as well.

    Now, you are ready to generate then submit your patch set. To generate it, run:

    $ git format-patch -M -n -s -o outgoing origin/master

    This will generate patch files in the outgoing subdirectory, automatically adding the Signed-off-by line.

    Once patch files are generated, you can review/edit the commit message before submitting them, using your favorite text editor.

    Buildroot provides a handy tool to know to whom your patches should be sent, called get-developers (see Chapter 23, DEVELOPERS file and get-developers for more @@ -5769,7 +5857,7 @@ large number of commits in the series;

  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. @@ -5981,7 +6069,7 @@ To trigger one or several test case jobs, push a branch that ends (tests.init.test_busybox.TestInitSystemBusyboxRo) or with the name of a category of tests (tests.init.test_busybox): 
    •  $ git push gitlab HEAD:<name>-<test case name>

    Example to run one test:

     $ git push gitlab HEAD:foo-tests.init.test_busybox.TestInitSystemBusyboxRo

    Examples to run several tests part of the same group:

     $ git push gitlab HEAD:foo-tests.init.test_busybox
- $ git push gitlab HEAD:foo-tests.init

    [4] RFC: (Request for comments) change proposal

    Chapter 23. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that + $ git push gitlab HEAD:foo-tests.init


    [4] RFC: (Request for comments) change proposal

    Chapter 23. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks to this file, the get-developers tool allows to:

    • Calculate the list of developers to whom patches should be sent, by @@ -6311,4 +6399,25 @@ sed -r -i -e 's/(\.tar\.gz)$/-cargo2\1/' $( |sed -r -e 's/\.mk$/.hash/' \ |sort -u )

      Note that the hash will have changed, so that needs to be updated -(manually) as well.

    \ No newline at end of file +(manually) as well.

    27.6. Migrating to 2025.02

    Mender now requires a special bootstrap artifact to be placed in +/var/lib/mender. This replaces the artifact_info file. Just like a +normal artifact, the bootstrap artifact is generated with +host-mender-artifact. See board/mender/x86_64/post-image-efi.sh for an +example of how to generate the bootstrap.mender file. See +the +release notes, under features, for more information.

    27.7. Migrating to 2025.05

    In 2025.05, for SYS-V-like systems (busybox, sysvinit, openrc), the +/etc/resolv.conf symlink was changed to point to /run/resolv.conf, +rather than the legacy location in /tmp. Users of a custom fstab +will need to ensure that /run is writable before resolv.conf is +created (usually by a DHCP client), either with an entry for /run, +or with a startup script.

    Note that systems using systemd are not impacted: systemd always ensures +that /run is writable. Systems further using systemd-resolved already +had a /etc/resolv.conf that pointed into /run anyway.

    Due to the update of Rust to a version greater than 1.84.0 making the +Cargo.lock file mandatory and the change from .cargo/config to +.cargo/config.toml, tarballs generated by Cargo-fetched packages +have changed. Therefore the suffix of such tarballs has been changed +from -cargo2 to -cargo4.

    27.8. Migrating to 2025.08

    In 2025.08, starting with systemd version 257, systemd-networkd requires kernel +5.4 or later. If you are still using a kernel older than 5.4, please update +your kernel or use an alternative network manager.

    27.9. Migrating to 2025.11

    In 2025.11, the FOO_INSTALL_BINS variable for golang packages is no longer +supported; the list of binaries to install is automatically derived from +the FOO_BUILD_TARGETS variable.

    \ No newline at end of file diff --git a/docs/manual/manual.pdf b/docs/manual/manual.pdf index 9a37143819..c7f4fa9eea 100644 Binary files a/docs/manual/manual.pdf and b/docs/manual/manual.pdf differ diff --git a/docs/manual/manual.text b/docs/manual/manual.text index 81b93b5e01..d9d6e7a129 100644 --- a/docs/manual/manual.text +++ b/docs/manual/manual.text @@ -32,11 +32,12 @@ II. User guide 8.6. Environment variables 8.7. Dealing efficiently with filesystem images 8.8. Details about packages - 8.9. Graphing the dependencies between packages - 8.10. Graphing the build duration - 8.11. Graphing the filesystem size contribution of packages - 8.12. Top-level parallel build - 8.13. Advanced usage + 8.9. Generating CycloneDX SBOM + 8.10. Graphing the dependencies between packages + 8.11. Graphing the build duration + 8.12. Graphing the filesystem size contribution of packages + 8.13. Top-level parallel build + 8.14. Advanced usage 9. Project-specific customization 9.1. Recommended directory structure 9.2. Keeping customizations outside of Buildroot @@ -138,6 +139,10 @@ IV. Appendix 27.3. Migrating to 2017.08 27.4. Migrating to 2023.11 27.5. Migrating to 2024.05 + 27.6. Migrating to 2025.02 + 27.7. Migrating to 2025.05 + 27.8. Migrating to 2025.08 + 27.9. Migrating to 2025.11 List of Examples @@ -149,14 +154,14 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2024.11 manual generated on 2024-12-08 10:19:53 UTC from -git revision 8f9ce0c913 +Buildroot 2025.11 manual generated on 2025-12-11 22:45:13 UTC from +git revision 08d71521d3 The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to -the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= -8f9ce0c913bc00127126456df89379daf9c1e03a] file in the Buildroot -sources for the full text of this license. +the COPYING [https://gitlab.com/buildroot.org/buildroot/-/blob/master +/COPYING] file in the Buildroot sources for the full text of this +license. Copyright © The Buildroot developers <> @@ -236,6 +241,7 @@ vary between distributions). + file (must be in /usr/bin/file) + bc + findutils + + awk * Source fetching tools: + wget @@ -304,7 +310,7 @@ Buildroot releases are made every 3 months, in February, May, August and November. Release numbers are in the format YYYY.MM, so for example 2013.02, 2014.08. -Release tarballs are available at http://buildroot.org/downloads/. +Release tarballs are available at https://buildroot.org/downloads/. For your convenience, a Vagrantfile [https://www.vagrantup.com/] is available in support/misc/Vagrantfile in the Buildroot source tree to @@ -323,8 +329,9 @@ If you are on Windows, paste this into your powershell: vagrant up If you want to follow development, you can use the daily snapshots or -make a clone of the Git repository. Refer to the Download page [http: -//buildroot.org/download] of the Buildroot website for more details. +make a clone of the Git repository. Refer to the Download page +[https://buildroot.org/download.html] of the Buildroot website for +more details. Chapter 4. Buildroot quick start @@ -378,7 +385,7 @@ To start the build process, simply run: By default, Buildroot does not support top-level parallel build, so running make -jN is not necessary. There is however experimental -support for top-level parallel build, see Section 8.12, “Top-level +support for top-level parallel build, see Section 8.13, “Top-level parallel build”. The make command will generally perform the following steps: @@ -454,10 +461,10 @@ Mailing List Only subscribers to the Buildroot mailing list are allowed to post to this list. You can subscribe via the mailing list info - page [http://lists.buildroot.org/mailman/listinfo/buildroot]. + page [https://lists.buildroot.org/mailman/listinfo/buildroot]. Mails that are sent to the mailing list are also available in the - mailing list archives, available through Mailman [http:// + mailing list archives, available through Mailman [https:// lists.buildroot.org/pipermail/buildroot] or at lore.kernel.org [https://lore.kernel.org/buildroot/]. @@ -524,11 +531,12 @@ Table of Contents 8.6. Environment variables 8.7. Dealing efficiently with filesystem images 8.8. Details about packages - 8.9. Graphing the dependencies between packages - 8.10. Graphing the build duration - 8.11. Graphing the filesystem size contribution of packages - 8.12. Top-level parallel build - 8.13. Advanced usage + 8.9. Generating CycloneDX SBOM + 8.10. Graphing the dependencies between packages + 8.11. Graphing the build duration + 8.12. Graphing the filesystem size contribution of packages + 8.13. Top-level parallel build + 8.14. Advanced usage 9. Project-specific customization 9.1. Recommended directory structure 9.2. Keeping customizations outside of Buildroot @@ -1083,7 +1091,7 @@ well as the configuration: Notes. If ccache is enabled, running make clean or distclean does not empty the compiler cache used by Buildroot. To delete it, refer to -Section 8.13.3, “Using ccache in Buildroot”. +Section 8.14.3, “Using ccache in Buildroot”. Dumping the internal make variables: One can dump the variables known to make, along with their values: @@ -1256,7 +1264,7 @@ above simply manipulate these stamp files to force Buildroot to restart a specific set of steps of a package build process. Further details about package special make targets are explained in -Section 8.13.5, “Package-specific make targets”. +Section 8.14.5, “Package-specific make targets”. 8.4. Offline builds @@ -1326,7 +1334,7 @@ passed to make or set in the environment: * BR2_DL_DIR to override the directory in which Buildroot stores/ retrieves downloaded files. Note that the Buildroot download directory can also be set from the configuration interface, so - through the Buildroot .config file. See Section 8.13.4, “Location + through the Buildroot .config file. See Section 8.14.4, “Location of downloaded packages” for more details on how you can set the download directory. * BR2_GRAPH_ALT, if set and non-empty, to use an alternate @@ -1334,12 +1342,12 @@ passed to make or set in the environment: * BR2_GRAPH_OUT to set the filetype of generated graphs, either pdf (the default), or png. * BR2_GRAPH_DEPS_OPTS to pass extra options to the dependency - graph; see Section 8.9, “Graphing the dependencies between + graph; see Section 8.10, “Graphing the dependencies between packages” for the accepted options * BR2_GRAPH_DOT_OPTS is passed verbatim as options to the dot utility to draw the dependency graph. * BR2_GRAPH_SIZE_OPTS to pass extra options to the size graph; see - Section 8.11, “Graphing the filesystem size contribution of + Section 8.12, “Graphing the filesystem size contribution of packages” for the acepted options An example that uses config files located in the toplevel directory @@ -1409,7 +1417,29 @@ a newer upstream version for those packages. make pkg-stats -8.9. Graphing the dependencies between packages +8.9. Generating CycloneDX SBOM + +Based on the output of show-info Buildroot can generate a SBOM in the +CycloneDX format. While it doesn’t offer any additional information, +CycloneDX is a format specification that can be consumed by other +projects. + +make show-info | utils/generate-cyclonedx + +For more information check the help of the generate-cyclonedx script, +the script call can be tailored to your project. + +utils/generate-cyclonedx --help + +Similarly to pkg-stats, CycloneDX SBOM’s can be enriched with +vulnerability analysis from the NVD database. + +make show | utils/generate-cyclonedx > sbom.cdx.json +cat sbom.cdx.json | support/scripts/cve-check --nvd-path dl/buildroot-nvd/ + +For more information about CycloneDX see https://cyclonedx.org/. + +8.10. Graphing the dependencies between packages One of Buildroot’s jobs is to know the dependencies between packages, and make sure they are built in the right order. These dependencies @@ -1471,7 +1501,7 @@ are: BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends -8.10. Graphing the build duration +8.11. Graphing the build duration When the build of a system takes a long time, it is sometimes useful to be able to understand which packages are the longest to build, to @@ -1506,7 +1536,7 @@ The only other format supported is PNG: BR2_GRAPH_OUT=png make graph-build -8.11. Graphing the filesystem size contribution of packages +8.12. Graphing the filesystem size contribution of packages When your target system grows, it is sometimes useful to understand how much each Buildroot package is contributing to the overall root @@ -1536,8 +1566,8 @@ argparse module if you’re using a Python version older than 2.7 Just like for the duration graph, a BR2_GRAPH_OUT environment variable is supported to adjust the output file format. See -Section 8.9, “Graphing the dependencies between packages” for details -about this environment variable. +Section 8.10, “Graphing the dependencies between packages” for +details about this environment variable. Additionally, one may set the environment variable BR2_GRAPH_SIZE_OPTS to further control the generated graph. Accepted @@ -1566,7 +1596,7 @@ details: utils/size-stats-compare -h -8.12. Top-level parallel build +8.13. Top-level parallel build Note. This section deals with a very experimental feature, which is known to break even in some non-unusual situations. Use at your own @@ -1611,9 +1641,9 @@ effects: will be empty and it’s only at the very end of the build that they will be populated. -8.13. Advanced usage +8.14. Advanced usage -8.13.1. Using the generated toolchain outside Buildroot +8.14.1. Using the generated toolchain outside Buildroot You may want to compile, for your target, your own programs or other software that are not packaged in Buildroot. In order to do this you @@ -1658,7 +1688,7 @@ provides some useful commands. Note however that once this script is sourced, the environment is setup only for cross-compilation, and no longer for native compilation. -8.13.2. Using gdb in Buildroot +8.14.2. Using gdb in Buildroot Buildroot allows to do cross-debugging, where the debugger runs on the build machine and communicates with gdbserver on the target to @@ -1703,7 +1733,7 @@ Finally, to connect to the target from the cross gdb: (gdb) target remote :2345 -8.13.3. Using ccache in Buildroot +8.14.3. Using ccache in Buildroot ccache [http://ccache.samba.org] is a compiler cache. It stores the object files resulting from each compilation process, and is able to @@ -1766,7 +1796,7 @@ variable: when set to 1, usage of ccache is enabled (default during the Buildroot build), when unset or set to a value different from 1, usage of ccache is disabled. -8.13.4. Location of downloaded packages +8.14.4. Location of downloaded packages The various tarballs that are downloaded by Buildroot are all stored in BR2_DL_DIR, which by default is the dl directory. If you want to @@ -1787,7 +1817,7 @@ The download location can also be set in the .config file, with the BR2_DL_DIR option. Unlike most options in the .config file, this value is overridden by the BR2_DL_DIR environment variable. -8.13.5. Package-specific make targets +8.14.5. Package-specific make targets Running make builds and installs that particular package and its dependencies. @@ -1890,7 +1920,7 @@ Additionally, there are some other useful make targets: | |the build directory | +------------------------------------------------------------+ -8.13.6. Using Buildroot during development +8.14.6. Using Buildroot during development The normal operation of Buildroot is to download a tarball, extract it, configure, compile and install the software component found @@ -2084,6 +2114,7 @@ choice is up to you. | +-- package2.mk | +-- Config.in (if using a br2-external tree) ++-- Makefile (if using a custom top makefile) +-- external.mk (if using a br2-external tree) +-- external.desc (if using a br2-external tree) @@ -2140,6 +2171,46 @@ BR2_GLOBAL_PATCH_DIR="board//common/patches board//fooboard/pa then first the patches from the common layer would be applied, followed by the patches from the fooboard layer. +9.1.2. Custom top Makefile + +You normally launch Buildroot from the buildroot source directory, +pointing BR2_EXTERNAL and O to the right places for the build you +want to make. You can simplify this by adding a Makefile to your +br2-external that sets these variables and calls into buildroot. + +You can add additional, custom rules to this Makefile for various +tasks you need to perform, e.g. integrate multiple configurations +into a single image, upload to a release server or to a test device, +include multiple br2-external configurations, etc. + +A basic Makefile looks like this. It assumes the buildroot source is +available (e.g. as a git submodule) in the buildroot subdirectory. It +makes sure that the download directory is shared between different +builds, and it organizes the output directories in a structure under +outputs/. + +# SPDX-License-Identifier: GPL-2.0 + +# Avoid surprises by disabling default rules +MAKEFLAGS += --no-builtin-rules +.SUFFIXES: + +THIS_EXTERNAL_PATH := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) + +# Put downloads in this directory instead of in the Buildroot directory +ifeq ($(BR2_DL_DIR),) +BR2_DL_DIR = $(THIS_EXTERNAL_PATH)/dl +endif + +OUTPUT_BASEDIR = $(THIS_EXTERNAL_PATH)/output +OUTPUT_DIR = $(OUTPUT_BASEDIR)/$(patsubst %_defconfig,%,$@) + +MAKE_BUILDROOT = $(MAKE) -C $(THIS_EXTERNAL_PATH)/buildroot BR2_EXTERNAL=$(THIS_EXTERNAL_PATH) + +%: $(THIS_EXTERNAL_PATH)/configs/% + $(MAKE_BUILDROOT) O=$(OUTPUT_DIR) $@ + sed -i /^BR2_DL_DIR=.*/s%%BR2_DL_DIR=$(BR2_DL_DIR)% $(OUTPUT_DIR)/.config + 9.2. Keeping customizations outside of Buildroot As already briefly mentioned in Section 9.1, “Recommended directory @@ -2650,6 +2721,12 @@ Root filesystem overlays (BR2_ROOTFS_OVERLAY) libraries, they should be placed in /usr/bin, /usr/sbin and /usr/ lib. + Additionally, when BR2_ROOTFS_MERGED_BIN is enabled, then the + overlay must not contain the /usr/sbin directory, as Buildroot + will create it as a symbolic link to /usr/bin. In such a + situation, should the overlay have any programs, they should be + placed in /usr/bin. + As shown in Section 9.1, “Recommended directory structure”, the recommended path for this overlay is board/// rootfs-overlay. @@ -3400,7 +3477,7 @@ help reduce the build time: not prevent you to switch back to an internal toolchain (that may provide a higher level of customization) once the rest of your system is working; - * Use the ccache compiler cache (see: Section 8.13.3, “Using ccache + * Use the ccache compiler cache (see: Section 8.14.3, “Using ccache in Buildroot”); * Learn about rebuilding only the few packages you actually care about (see Section 8.3, “Understanding how to rebuild packages”), @@ -3416,7 +3493,7 @@ help reduce the build time: a bit. * Buy new hardware. SSDs and lots of RAM are key to speeding up the builds. - * Experiment with top-level parallel build, see Section 8.12, + * Experiment with top-level parallel build, see Section 8.13, “Top-level parallel build”. 11.9. How does Buildroot support Y2038? @@ -4970,7 +5047,9 @@ information is (assuming the package name is libfoo) : server-side checking for user logins and passwords, or to use a proxy. All download methods valid for LIBFOO_SITE_METHOD are supported; valid options depend on the download method (consult - the man page for the respective download utilities). + the man page for the respective download utilities). For git, + FOO_DL_OPTS will only be passed to git fetch and no other git + command (esp. not to git lfs fetch or git submodule update). * LIBFOO_EXTRA_DOWNLOADS is a space-separated list of additional files that Buildroot should download. If an entry contains :// then Buildroot will assume it is a complete URL and will download @@ -5033,6 +5112,13 @@ information is (assuming the package name is libfoo) : that for local packages, no patches are applied. If you need to still patch the source code, use LIBFOO_POST_RSYNC_HOOKS, see Section 18.23.1, “Using the POST_RSYNC hook”. + + smb for retrieving source code from a SMB share. Used by + default when LIBFOO_SITE begins with smb://. It uses curl as + download backend. Syntax expected: LIBFOO_SITE=smb:// + //. This method might require to define -u + option in LIBFOO_DL_OPTS. For more information, please refer + to the curl documentation [https://curl.se/docs/ + tutorial.html]. * LIBFOO_GIT_SUBMODULES can be set to YES to create an archive with the git submodules in the repository. This is only available for packages downloaded with git (i.e. when LIBFOO_SITE_METHOD=git). @@ -5299,6 +5385,11 @@ different steps of the build process. KCONFIG_ENABLE_OPT, KCONFIG_DISABLE_OPT, or KCONFIG_SET_OPT. This is seldom used, as package usually have no strict requirements on the kernel options. + * LIBFOO_BUSYBOX_CONFIG_FIXUPS lists the Busybox configuration + options that are needed to use this package especially in some + scripts, or at contrario the useless options. This shall be a set + of calls to one of the kconfig tweaking option: + KCONFIG_ENABLE_OPT, KCONFIG_DISABLE_OPT, or KCONFIG_SET_OPT. The preferred way to define these variables is: @@ -5328,7 +5419,7 @@ In the action definitions, you can use the following variables: to the current package host, staging and target directories. In both cases, it doesn’t make any difference from the package point of view: it should simply use HOST_DIR, STAGING_DIR and - TARGET_DIR. See Section 8.12, “Top-level parallel build” for more + TARGET_DIR. See Section 8.13, “Top-level parallel build” for more details about per-package directory support. Finally, you can also use hooks. See Section 18.23, “Hooks available @@ -5742,10 +5833,9 @@ therefore only use a few of them, or none. packages) and HOST_PKG_PYTHON_PEP517_ENV (for flit/pep517 host packages). * PYTHON_FOO_BUILD_OPTS, to specify additional options to pass to - the Python setup.py script during the build step, this generally - only makes sense to use for setuptools based packages as flit/ - pep517 based packages do not pass these options to a setup.py - script but instead pass them to support/scripts/pyinstaller.py. + the Python python -m build call. To pass additional options to + the build backend use the --config-setting= (-C) flag of the + build module. * PYTHON_FOO_INSTALL_TARGET_OPTS, PYTHON_FOO_INSTALL_STAGING_OPTS, HOST_PYTHON_FOO_INSTALL_OPTS to specify additional options to pass to the Python setup.py script (for setuptools packages) or @@ -6732,25 +6822,29 @@ therefore only use a few of them, or none. $(call github,bar,foo,$(FOO_VERSION)). The Go package infrastructure will automatically generate a minimal go.mod file in the package source tree if it doesn’t exist. - * FOO_LDFLAGS and FOO_TAGS can be used to pass respectively the - LDFLAGS or the TAGS to the go build command. + * FOO_LDFLAGS, FOO_EXTLDFLAGS, and FOO_TAGS can be used to pass + respectively the go LDFLAGS (via the -ldflags command line flag), + the external linker flags EXTLDFLAGS (via the -extldflags command + line flag), or the TAGS to the go build command. * FOO_BUILD_TARGETS can be used to pass the list of targets that should be built. If FOO_BUILD_TARGETS is not specified, it defaults to .. We then have two cases: + FOO_BUILD_TARGETS is .. In this case, we assume only one - binary will be produced, and that by default we name it after - the package name. If that is not appropriate, the name of the - produced binary can be overridden using FOO_BIN_NAME. - + FOO_BUILD_TARGETS is not .. In this case, we iterate over the - values to build each target, and for each produced a binary - that is the non-directory component of the target. For - example if FOO_BUILD_TARGETS = cmd/docker cmd/dockerd the - binaries produced are docker and dockerd. - * FOO_INSTALL_BINS can be used to pass the list of binaries that - should be installed in /usr/bin on the target. If - FOO_INSTALL_BINS is not specified, it defaults to the lower-case - name of package. + binary will be built and installed, and by default we name it + after the package name; if that is not appropriate, the name + of the binary can be overridden using FOO_BIN_NAME. + + FOO_BUILD_TARGETS is not .. In this case, it is interpreted + as a space-separated list, and we iterate over the targets to + build and install a binary named after the non-directory + component of the target. For example if FOO_BUILD_TARGETS = + cmd/docker cmd/dockerd, the binaries built and installed are + docker and dockerd. If FOO_BUILD_TARGETS contains only one + target, then it is possible to override the built and + installed binary by setting FOO_BIN_NAME, as above; if + FOO_BUILD_TARGETS contains two or more targets, then it is + not possible to override the names of the installed binaries + (use a post-install hook for that). With the Go infrastructure, all the steps required to build and install the packages are already defined, and they generally work @@ -7204,8 +7298,7 @@ The Buildroot’s Linux kernel extensions infrastructure provides a simple solution to automatically do this, just after the kernel sources are extracted and before the kernel patches are applied. Examples of extensions packaged using this mechanism are the -real-time extensions Xenomai and RTAI, as well as the set of -out-of-tree LCD screens drivers fbtft. +real-time extensions Xenomai and RTAI. Let’s look at an example on how to add a new Linux extension foo. @@ -7452,7 +7545,7 @@ it under various conditions: does it build for all architectures? Does it build with the different C libraries? Does it need threads, NPTL? And so on… -Buildroot runs autobuilders [http://autobuild.buildroot.org/] which +Buildroot runs autobuilders [https://autobuild.buildroot.org/] which continuously test random configurations. However, these only build the master branch of the git tree, and your new fancy package is not yet there. @@ -7607,6 +7700,74 @@ If there is a specific tarball uploaded by the upstream developers in https://gitlab.com//releases/, do not use this macro, but rather use directly the link to the tarball. +18.25.6. Accessing a private repository for a package + +If you want to create a package in a br2-external tree and its source +is in a private repository (e.g. on gitlab, github, bitbucket, …), +you have to write it in a way that it is buildable both by developers +and in CI. This poses a challenge, because you need to authenticate +in order to access it. + +There are several ways you can approach this. The following two are +the most practical ones. + +18.25.6.1. Using SSH and insteadOf + +Configure your private packages to use SSH. + +FOO_SITE = git@githosting.com://.git + +Developers already have an ssh key installed so they can access it +this way. The only limitation is that if they build in docker, they +have to make sure the ssh key is accessible from within the +container. Either mount the SSH directory into the container by +passing the options -v ~/.ssh:/.ssh, or load the private key +into ssh-agent and pass --mount type=bind,source= +$SSH_AUTH_SOCK,target=/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent + +CI builders typically will not have an SSH key that allows access to +other repositories. For those, you’ll need to generate an access +token. Then you configure git to replace the SSH access with HTTPS +access. As a preparation step in CI, run the following command. + +git config --global url."https://:x-oauth-basic@githosting.com//".insteadOf "git@githosting.com://" + +The way to use a token for basic authentication differs between +different git hosting providers, and sometimes between different +types of tokens. Consult your provider’s documentation to find out +how to access git over HTTPS with a token. + +18.25.6.2. Use HTTPS and .netrc + +If, for any reason, developers don’t have an SSH key already, then it +may be simpler to use HTTPS authentication. For this, every developer +will have to generate a token that has (read) access to all relevant +repositories. Some git hosting providers have a command-line utility +that can generate such a token, otherwise you’ll need to generate it +in the web interface. The token has a limited lifetime so you’ll need +to regularly refresh it. + +To make sure the token is used in the Buildroot build, add it to ~ +/.netrc + +machine githosting.com + login + password + +The and to use are again different for +different git hosting providers. + +In CI, generate the .netrc file as a preparation step. + +Configure your private packages to use HTTPS. + +FOO_SITE = https://githosting.com//.git + +Both wget (https) and git will use .netrc to get login information. +This approach is potentially somewhat less secure because .netrc +cannot be password-protected. The advantage is that users and CI use +the exact same way of providing credentials. + 18.26. Conclusion As you can see, adding a software package to Buildroot is simply a @@ -7869,8 +8030,8 @@ various toolchains, and with a random selection of packages. With the large commit activity on Buildroot, these autobuilders are a great help in detecting problems very early after commit. -All build results are available at http://autobuild.buildroot.org, -statistics are at http://autobuild.buildroot.org/stats.php. Every +All build results are available at https://autobuild.buildroot.org, +statistics are at https://autobuild.buildroot.org/stats.php. Every day, an overview of all failed packages is sent to the mailing list. Detecting problems is great, but obviously these problems have to be @@ -7888,11 +8049,11 @@ basically two things that can be done: 1. Check if you can reproduce the problem by building with the same configuration. You can do this manually, or use the - br-reproduce-build [http://git.buildroot.org/buildroot-test/ - tree/utils/br-reproduce-build] script that will automatically - clone a Buildroot git repository, checkout the correct - revision, download and set the right configuration, and start - the build. + br-reproduce-build [https://gitlab.com/buildroot.org/ + buildroot-test/-/blob/master/utils/br-reproduce-build] script + that will automatically clone a Buildroot git repository, + checkout the correct revision, download and set the right + configuration, and start the build. 2. Analyze the problem and create a fix. 3. Verify that the problem is really fixed by starting from a clean Buildroot tree and only applying your fix. @@ -7904,7 +8065,7 @@ basically two things that can be done: patch fixing an autobuild failure, add a reference to the build result directory, as follows: -Fixes: http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 +Fixes: https://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069 22.3. Reviewing and testing patches @@ -8146,9 +8307,13 @@ Now check the coding style for the changes you committed: $ utils/docker-run make check-package -Now, you are ready to generate then submit your patch set. +This command (unlike calling utils/check-package directly) will also +warn about any stale entries in the .checkpackageignore file that +your patches might have resolved. If this is the case, make sure to +remove those lines from .checkpackageignore as well. -To generate it, run: +Now, you are ready to generate then submit your patch set. To +generate it, run: $ git format-patch -M -n -s -o outgoing origin/master @@ -8628,6 +8793,10 @@ Table of Contents 27.3. Migrating to 2017.08 27.4. Migrating to 2023.11 27.5. Migrating to 2024.05 + 27.6. Migrating to 2025.02 + 27.7. Migrating to 2025.05 + 27.8. Migrating to 2025.08 + 27.9. Migrating to 2025.11 Chapter 25. Makedev syntax documentation @@ -8996,3 +9165,46 @@ sed -r -i -e 's/(\.tar\.gz)$/-cargo2\1/' $( Note that the hash will have changed, so that needs to be updated (manually) as well. +27.6. Migrating to 2025.02 + +Mender now requires a special bootstrap artifact to be placed in /var +/lib/mender. This replaces the artifact_info file. Just like a normal +artifact, the bootstrap artifact is generated with +host-mender-artifact. See board/mender/x86_64/post-image-efi.sh for +an example of how to generate the bootstrap.mender file. See the +release notes [https://docs.mender.io/release-information/ +release-notes-changelog/mender-client#mender-3-5-0-1], under +features, for more information. + +27.7. Migrating to 2025.05 + +In 2025.05, for SYS-V-like systems (busybox, sysvinit, openrc), the / +etc/resolv.conf symlink was changed to point to /run/resolv.conf, +rather than the legacy location in /tmp. Users of a custom fstab will +need to ensure that /run is writable before resolv.conf is created +(usually by a DHCP client), either with an entry for /run, or with a +startup script. + +Note that systems using systemd are not impacted: systemd always +ensures that /run is writable. Systems further using systemd-resolved +already had a /etc/resolv.conf that pointed into /run anyway. + +Due to the update of Rust to a version greater than 1.84.0 making the +Cargo.lock file mandatory and the change from .cargo/config to .cargo +/config.toml, tarballs generated by Cargo-fetched packages have +changed. Therefore the suffix of such tarballs has been changed from +-cargo2 to -cargo4. + +27.8. Migrating to 2025.08 + +In 2025.08, starting with systemd version 257, systemd-networkd +requires kernel 5.4 or later. If you are still using a kernel older +than 5.4, please update your kernel or use an alternative network +manager. + +27.9. Migrating to 2025.11 + +In 2025.11, the FOO_INSTALL_BINS variable for golang packages is no +longer supported; the list of binaries to install is automatically +derived from the FOO_BUILD_TARGETS variable. + diff --git a/docs/manual/migrating.adoc b/docs/manual/migrating.adoc index 69bf0dc221..9ded46bfa2 100644 --- a/docs/manual/migrating.adoc +++ b/docs/manual/migrating.adoc @@ -184,3 +184,47 @@ sed -r -i -e 's/(\.tar\.gz)$/-cargo2\1/' $( Note that the hash _will_ have changed, so that needs to be updated (manually) as well. + +[[migrating-mender]] +=== Migrating to 2025.02 + +Mender now requires a special bootstrap artifact to be placed in ++/var/lib/mender+. This replaces the +artifact_info+ file. Just like a +normal artifact, the bootstrap artifact is generated with +host-mender-artifact. See +board/mender/x86_64/post-image-efi.sh+ for an +example of how to generate the bootstrap.mender file. See +https://docs.mender.io/release-information/release-notes-changelog/mender-client#mender-3-5-0-1[the +release notes], under features, for more information. + +[[migrating-resolv.conf]] +=== Migrating to 2025.05 + +In 2025.05, for SYS-V-like systems (busybox, sysvinit, openrc), the +`/etc/resolv.conf` symlink was changed to point to `/run/resolv.conf`, +rather than the legacy location in `/tmp`. Users of a custom `fstab` +will need to ensure that `/run` is writable before resolv.conf is +created (usually by a DHCP client), either with an entry for `/run`, +or with a startup script. + +Note that systems using systemd are not impacted: systemd always ensures +that `/run` is writable. Systems further using systemd-resolved already +had a `/etc/resolv.conf` that pointed into `/run` anyway. + +Due to the update of Rust to a version greater than 1.84.0 making the +Cargo.lock file mandatory and the change from +.cargo/config+ to ++.cargo/config.toml+, tarballs generated by Cargo-fetched packages +have changed. Therefore the suffix of such tarballs has been changed +from +-cargo2+ to +-cargo4+. + +[[migrating-systemd]] +=== Migrating to 2025.08 + +In 2025.08, starting with systemd version 257, systemd-networkd requires kernel +5.4 or later. If you are still using a kernel older than 5.4, please update +your kernel or use an alternative network manager. + +[[migrating-golang-packages]] +=== Migrating to 2025.11 +In 2025.11, the +FOO_INSTALL_BINS+ variable for golang packages is no longer +supported; the list of binaries to install is automatically derived from +the +FOO_BUILD_TARGETS+ variable. diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index 5d3aa297a9..1bfcff1a4a 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -38,6 +38,7 @@ between distributions). ** +file+ (must be in +/usr/bin/file+) ** +bc+ ** +findutils+ +** +awk+ * Source fetching tools: ** +wget+ diff --git a/docs/manual/resources.adoc b/docs/manual/resources.adoc index 4ef709c317..a1b8b366e1 100644 --- a/docs/manual/resources.adoc +++ b/docs/manual/resources.adoc @@ -17,12 +17,12 @@ main method of interaction for Buildroot users and developers. + Only subscribers to the Buildroot mailing list are allowed to post to this list. You can subscribe via the -http://lists.buildroot.org/mailman/listinfo/buildroot[mailing list info +https://lists.buildroot.org/mailman/listinfo/buildroot[mailing list info page]. + Mails that are sent to the mailing list are also available in the mailing list archives, available through -http://lists.buildroot.org/pipermail/buildroot[Mailman] or at +https://lists.buildroot.org/pipermail/buildroot[Mailman] or at https://lore.kernel.org/buildroot/[lore.kernel.org]. IRC:: diff --git a/docs/website/css/main.css b/docs/website/css/main.css index 5255531b30..81bcd2c4b6 100644 --- a/docs/website/css/main.css +++ b/docs/website/css/main.css @@ -168,6 +168,12 @@ i { text-justify: inter-word; } +.panel-lts-sponsor { + min-height: 200px; + text-align: justify; + text-justify: inter-word; +} + @media (min-width: 768px) and (max-width: 991px) { .navbar-collapse.collapse { display: none !important; diff --git a/docs/website/download.html b/docs/website/download.html index 3dd4351e1e..d1d92c8e6b 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -7,109 +7,96 @@
    Download
    - -

    Latest long term support release: 2024.02.8

    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -

    buildroot-2024.02.8.tar.gz

    -

    PGP signature

    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - -

    buildroot-2024.02.8.tar.xz

    -

    PGP signature

    -
    -
    - -

    Latest stable release: 2024.11

    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -

    buildroot-2024.11.tar.gz

    -

    PGP signature

    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - -

    buildroot-2024.11.tar.xz

    -

    PGP signature

    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    SeriesEnd of LifeLatest releaseLatest release dateDownloads +
    Stable2025.11.xMarch 2026 + 2025.11
    + + Changelog + +     		2025-12-11 + + + .tar.gz +
    + [PGP sig] +     		+ + + .tar.xz +
    + [PGP sig] +
    Long-term support2025.02.xMarch 2028 + 2025.02.9
    + + Changelog + +     		2025-11-20 + + + .tar.gz +
    + [PGP sig] +     		+ + + .tar.xz +
    + [PGP sig] +
    + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
    diff --git a/docs/website/images/benetti-engineering-logo.png b/docs/website/images/benetti-engineering-logo.png new file mode 100644 index 0000000000..0328caf962 Binary files /dev/null and b/docs/website/images/benetti-engineering-logo.png differ diff --git a/docs/website/images/evs-logo.png b/docs/website/images/evs-logo.png new file mode 100644 index 0000000000..bcaabe8cb5 Binary files /dev/null and b/docs/website/images/evs-logo.png differ diff --git a/docs/website/images/openhomefoundation-logo.png b/docs/website/images/openhomefoundation-logo.png new file mode 100644 index 0000000000..1b359f2cec Binary files /dev/null and b/docs/website/images/openhomefoundation-logo.png differ diff --git a/docs/website/images/sense-logo.png b/docs/website/images/sense-logo.png new file mode 100644 index 0000000000..d4cab95b82 Binary files /dev/null and b/docs/website/images/sense-logo.png differ diff --git a/docs/website/news.html b/docs/website/news.html index c646f1c37a..d8d83e92a8 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,745 @@

    News

      +
    • +
      +
      +
      +

      2025.11 released

      +

      11 December 2025

      +
      +
      +

      The stable 2025.11 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2025.11 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.9 released

      +

      11 December 2025

      +
      +
      +

      The 2025.02.9 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02.8 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.9 release.

      +
      +
      +
      • +
    • +
      +
      +
      +

      2025.08.3 released

      +

      11 December 2025

      +
      +
      +

      The 2025.08.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.08.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.08.3 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.11-rc2 released

      +

      30 November 2025

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.11-rc2 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.08.2 released

      +

      20 November 2025

      +
      +
      +

      The 2025.08.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.08.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.08.2 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.8 released

      +

      20 November 2025

      +
      +
      +

      The 2025.02.8 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02.7 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.8 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.11-rc1 released

      +

      20 November 2025

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.11-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.7 released

      +

      11 October 2025

      +
      +
      +

      The 2025.02.7 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02.6 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.7 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.05.3 released

      +

      11 October 2025

      +
      +
      +

      The 2025.05.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.05.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.05.3 release. + This is the last release of the 2025.05 stable series.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.08.1 released

      +

      11 October 2025

      +
      +
      +

      The 2025.08.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.08 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.08.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.05.2 released

      +

      9 September 2025

      +
      +
      +

      The 2025.05.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.05.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.05.2 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.6 released

      +

      9 September 2025

      +
      +
      +

      The 2025.02.6 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02.5 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.6 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.08 released

      +

      9 September 2025

      +
      +
      +

      The stable 2025.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.08 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.08-rc3 released

      +

      28 August 2025

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.08-rc3 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.08-rc2 released

      +

      21 August 2025

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.08-rc2 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.05.1 released

      +

      11 August 2025

      +
      +
      +

      The 2025.05.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.05 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.05.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.5 released

      +

      11 August 2025

      +
      +
      +

      The 2025.02.5 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02.4 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.5 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.08-rc1 released

      +

      11 August 2025

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.08-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.4 released

      +

      23 June 2025

      +
      +
      +

      The 2025.02.4 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.03 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.4 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.05 released

      +

      9 June 2025

      +
      +
      +

      The stable 2025.05 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.05 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.05-rc2 released

      +

      28 May 2025

      +
      +
      +

      Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.05-rc2 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.05-rc1 released

      +

      19 May 2025

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.05-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.3 released

      +

      19 May 2025

      +
      +
      +

      The 2025.02.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02 release. It + replaces the 2025.02.2 release which was made the day before but + which was unfortunately broken. See the + CHANGES + file for more details, read the announcement for + 2025.02.2 + and + 2025.02.3 + and go to the downloads page to pick up the + 2025.02.3 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02.01 released

      +

      22 April 2025

      +
      +
      +

      The 2025.02.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2025.02 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.02.13 released, 2024.02.x series EOL

      +

      22 April 2025

      +
      +
      +

      The 2024.02.13 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.02.12 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.02.13 release.

      + +

      Notice that the 2024.02.x series is now end of life. Please migrate to + the 2025.02.x series instead.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.11.4 released, 2024.11.x series EOL

      +

      22 April 2025

      +
      +
      +

      The 2024.11.4 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.11.3 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.11.4 release.

      + +

      Notice that the 2024.11.x series is now end of life. Please migrate to + the 2025.02.x series instead.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.02.12 released

      +

      24 March 2025

      +
      +
      +

      The 2024.02.12 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.02.11 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.02.12 release.

      + +

      Notice that the 2024.02.x series will soon be end of life. Please migrate to + the 2025.02.x series instead.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.11.3 released

      +

      24 March 2025

      +
      +
      +

      The 2024.11.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.11.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.11.3 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02 released

      +

      17 March 2025

      +
      +
      +

      The stable 2025.02 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2025.02 release.

      + +

      Notice that this is a long term support release which will be + supported with security and other important fixes until (at least) March 2026.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02-rc2 released

      +

      13 March 2025

      +
      +
      +

      Another 2 weeks, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.02-rc2 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2025.02-rc1 released

      +

      28 February 2025

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2025.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.11.2 released

      +

      21 February 2025

      +
      +
      +

      The 2024.11.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.11.1 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.11.2 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.02.11 released

      +

      21 Febrary 2025

      +
      +
      +

      The 2024.02.11 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.02.10 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.02.11 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.11.1 released

      +

      9 January 2025

      +
      +
      +

      The 2024.11.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.11 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.11.1 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.02.10 released

      +

      9 January 2025

      +
      +
      +

      The 2024.02.10 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.02.9 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.02.10 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.02.9 released

      +

      8 December 2024

      +
      +
      +

      The 2024.02.9 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.02.8 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.02.9 release.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2024.08.3 released, 2024.08.x series EOL

      +

      8 December 2024

      +
      +
      +

      The 2024.08.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2024.08.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2024.08.3 release.

      + +

      Notice that the 2024.08.x series is now end of life. Please migrate to + the 2024.11.x series instead.

      +
      +
      +
      • +
    • @@ -20,7 +759,8 @@

      The stable 2024.11 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement. and go to the downloads page to pick up the 2024.11 release.

      @@ -43,7 +783,7 @@ 2024.11-rc3 release, and report any problems found to the mailing list or - bug tracker.

      + bug tracker.

    @@ -64,7 +804,7 @@ 2024.11-rc2 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -284,7 +1024,7 @@ 2024.08-rc2 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -461,7 +1201,7 @@ 2024.05-rc2 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -482,7 +1222,7 @@ 2024.05-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -607,7 +1347,7 @@ 2024.02-rc2 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -666,7 +1406,7 @@ 2024.02-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -806,7 +1546,7 @@ 2023.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -865,7 +1605,7 @@ 2023.11-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1041,7 +1781,7 @@ 2023.08-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1062,7 +1802,7 @@ 2023.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1083,7 +1823,7 @@ 2023.08-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1180,7 +1920,7 @@ 2023.05-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1201,7 +1941,7 @@ 2023.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1222,7 +1962,7 @@ 2023.05-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1347,7 +2087,7 @@ 2023.02-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1406,7 +2146,7 @@ 2023.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1427,7 +2167,7 @@ 2023.02-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1543,7 +2283,7 @@ 2022.11-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1602,7 +2342,7 @@ 2022.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1623,7 +2363,7 @@ 2022.11-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1723,7 +2463,7 @@ 2022.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1782,7 +2522,7 @@ 2022.08-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1879,7 +2619,7 @@ 2022.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -1919,7 +2659,7 @@ 2022.05-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2044,7 +2784,7 @@ 2022.02-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2103,7 +2843,7 @@ 2022.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2124,7 +2864,7 @@ 2022.02-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2243,7 +2983,7 @@ 2021.11-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2264,7 +3004,7 @@ 2021.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2323,7 +3063,7 @@ 2021.11-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2461,7 +3201,7 @@ 2021.08-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2482,7 +3222,7 @@ 2021.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2541,7 +3281,7 @@ 2021.08-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2600,7 +3340,7 @@ 2021.05-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2621,7 +3361,7 @@ 2021.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2661,7 +3401,7 @@ 2021.05-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2767,7 +3507,7 @@ 2021.02-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2826,7 +3566,7 @@ 2021.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2847,7 +3587,7 @@ 2021.02-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -2985,7 +3725,7 @@ 2020.11-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3044,7 +3784,7 @@ 2020.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3065,7 +3805,7 @@ 2020.11-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3222,7 +3962,7 @@ 2020.08-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3243,7 +3983,7 @@ 2020.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3361,7 +4101,7 @@ 2020.05-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3382,7 +4122,7 @@ 2020.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3422,7 +4162,7 @@ 2020.05-rc1 release, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3566,7 +4306,7 @@ 2020.02-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3587,7 +4327,7 @@ 2020.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3610,7 +4350,7 @@ 2020.02-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3729,7 +4469,7 @@ 2019.11-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3750,7 +4490,7 @@ 2019.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3811,7 +4551,7 @@ 2019.11-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3949,7 +4689,7 @@ 2019.08-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3970,7 +4710,7 @@ 2019.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -3993,7 +4733,7 @@ 2019.08-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4090,7 +4830,7 @@ 2019.05-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4111,7 +4851,7 @@ 2019.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4135,7 +4875,7 @@ 2019.05-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4261,7 +5001,7 @@ 2019.02-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4321,7 +5061,7 @@ 2019.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4345,7 +5085,7 @@ 2019.02-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4483,7 +5223,7 @@ 2018.11-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4543,7 +5283,7 @@ 2018.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4567,7 +5307,7 @@ 2018.11-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4703,7 +5443,7 @@ 2018.08-rc3 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4763,7 +5503,7 @@ 2018.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4787,7 +5527,7 @@ 2018.08-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4885,7 +5625,7 @@ the 2018.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -4907,7 +5647,7 @@ 2018.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -4931,7 +5671,7 @@ 2018.05-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5034,7 +5774,7 @@ the 2018.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -5056,7 +5796,7 @@ 2018.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5080,7 +5820,7 @@ 2018.02-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5235,7 +5975,7 @@ 2017.11-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5258,7 +5998,7 @@ 2017.11-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5358,7 +6098,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5383,7 +6123,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5407,7 +6147,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5543,7 +6283,7 @@ the 2017.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -5565,7 +6305,7 @@ 2017.05-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5589,7 +6329,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5692,7 +6432,7 @@ the 2017.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -5714,7 +6454,7 @@ 2017.02-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5739,7 +6479,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5818,7 +6558,7 @@ the 2016.11-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -5842,7 +6582,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5867,7 +6607,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -5929,7 +6669,7 @@ the 2016.08-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -5951,7 +6691,7 @@ 2016.08-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -5976,7 +6716,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6017,7 +6757,7 @@ the 2016.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6039,7 +6779,7 @@ 2016.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6064,7 +6804,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6105,7 +6845,7 @@ the 2016.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6127,7 +6867,7 @@ 2016.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6152,7 +6892,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6212,7 +6952,7 @@ the 2015.11-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6234,7 +6974,7 @@ the 2015.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6259,7 +6999,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6321,7 +7061,7 @@ 2015.08-rc2 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6343,7 +7083,7 @@ 2015.08-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6384,7 +7124,7 @@ the 2015.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6406,7 +7146,7 @@ 2015.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6428,7 +7168,7 @@ 2015.05-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6470,7 +7210,7 @@ 2015.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6492,7 +7232,7 @@ 2015.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6516,7 +7256,7 @@ release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6557,7 +7297,7 @@ 2014.11-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6579,7 +7319,7 @@ 2014.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6627,7 +7367,7 @@ 2014.11-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6668,7 +7408,7 @@ 2014.08-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6690,7 +7430,7 @@ 2014.08-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6713,7 +7453,7 @@ 2014.08-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6754,7 +7494,7 @@ 2014.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6777,7 +7517,7 @@ 2014.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6800,7 +7540,7 @@ 2014.05-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6840,7 +7580,7 @@ 2014.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6862,7 +7602,7 @@ 2014.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -6885,7 +7625,7 @@ 2014.02-rc1 release candidate, and report any problems found to the mailing list or - bug tracker.

    + bug tracker.

    @@ -6988,7 +7728,7 @@ 2013.11-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7010,7 +7750,7 @@ 2013.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7067,7 +7807,7 @@ 2013.11-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7171,7 +7911,7 @@ 2013.08-rc3 release candidate, and report any problems found to the mailing list or bug tracker.

    + href="https://gitlab.com/buildroot.org/buildroot/-/issues">bug tracker.

    @@ -7193,7 +7933,7 @@ 2013.08-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7215,7 +7955,7 @@ 2013.08-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7256,7 +7996,7 @@ 2013.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7278,7 +8018,7 @@ 2013.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7301,7 +8041,7 @@ 2013.05-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7341,7 +8081,7 @@ 2013.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7363,7 +8103,7 @@ 2013.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7386,7 +8126,7 @@ 2013.02-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7492,7 +8232,7 @@ 2012.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7515,7 +8255,7 @@ 2012.11-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7580,7 +8320,7 @@ 2012.08-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7602,7 +8342,7 @@ 2012.08-rc2 release candidate, and report any problems found to the mailing list or bug tracker.

    + href="https://gitlab.com/buildroot.org/buildroot/-/issues">bug tracker.

    @@ -7624,7 +8364,7 @@ 2012.08-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7689,7 +8429,7 @@ 2012.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7711,7 +8451,7 @@ 2012.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7734,7 +8474,7 @@ 2012.05-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7798,7 +8538,7 @@ 2012.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7820,7 +8560,7 @@ 2012.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7843,7 +8583,7 @@ 2012.02-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7902,7 +8642,7 @@ 2011.11-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7924,7 +8664,7 @@ 2011.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7947,7 +8687,7 @@ 2011.11-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -7986,7 +8726,7 @@ 2011.08-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8009,7 +8749,7 @@ 2011.08-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8047,7 +8787,7 @@ 2011.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8070,7 +8810,7 @@ 2011.05-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8110,7 +8850,7 @@ 2011.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8133,7 +8873,7 @@ 2011.02-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8173,7 +8913,7 @@ 2010.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8196,7 +8936,7 @@ 2010.11-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8259,7 +8999,7 @@ 2010.08-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    This is very much expected to be the final release candidate, so give it a good test and expect a final 2010.08 release @@ -8285,7 +9025,7 @@ 2010.08-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8325,7 +9065,7 @@ 2010.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8345,7 +9085,7 @@ 2010.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8367,7 +9107,7 @@ 2010.05-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8424,7 +9164,7 @@ 2010.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8446,7 +9186,7 @@ 2010.02-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8486,7 +9226,7 @@ 2009.11-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8508,7 +9248,7 @@ 2009.11-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8580,7 +9320,7 @@ 2009.08-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8601,7 +9341,7 @@ 2009.08-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8623,7 +9363,7 @@ 2009.08-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8665,7 +9405,7 @@ 2009.05-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8688,7 +9428,7 @@ 2009.05-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8730,7 +9470,7 @@ 2009.05-rc1 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8810,7 +9550,7 @@ 2009.02-rc4 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8832,7 +9572,7 @@ 2009.02-rc3 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8852,7 +9592,7 @@ 2009.02-rc2 release candidate, and report any problems found to the mailing list - or bug tracker.

    + or bug tracker.

    @@ -8875,7 +9615,7 @@ 2009.02-rc1 release candidate, and report any problems found to the mailing list - or bug tracker. The + or bug tracker. The plan is to release 2009.02 in time for FOSDEM.

    @@ -8917,7 +9657,7 @@

    If you find a bug in buildroot, or wish to submit a patch to fix a problem or add a shiny new feature, please use - the Bug and Patch + the Bug and Patch Tracking System to post the details, to make certain your work is not lost

    diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index e90393be40..ba11b4b081 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,11 +9,62 @@

    The maintenance of the Long Term Support branch of Buildroot is possible thanks to the sponsors of the - Buildroot LTS Sponsoring + Buildroot LTS Sponsorship Program.

    -

    When the Buildroot LTS Sponsoring program will be operational - later in 2024, those sponsors will be mentioned here.

    -
    + +
    +

    Gold Sponsors

    + +
    +
    +
    +
    + + + +
    +
    + EVS Broadcast Equipment +
    +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    + Open Home + Foundation +
    +
    +
    +
    + +
    +
    +

    Bronze Sponsors

    + +
    +
    +
    +
    + + + +
    +
    + Sense Labs +
    +
    +
    +
    + +
    @@ -56,8 +107,25 @@
    - +
    +
    +
    +
    + + + +
    +
    + Open Home + Foundation financially sponsored + the Buildroot + Association in 2024.
    +
    +
    +
    + +
    diff --git a/docs/website/support.html b/docs/website/support.html index 21c6e0a34e..81f7e863e0 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -139,6 +139,9 @@ + + +
    diff --git a/fs/Config.in b/fs/Config.in index eee5e26bb2..42b0e608ac 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -1,6 +1,5 @@ menu "Filesystem images" -source "fs/axfs/Config.in" source "fs/btrfs/Config.in" source "fs/cloop/Config.in" source "fs/cpio/Config.in" @@ -12,7 +11,6 @@ source "fs/initramfs/Config.in" source "fs/iso9660/Config.in" source "fs/jffs2/Config.in" source "fs/oci/Config.in" -source "fs/romfs/Config.in" source "fs/squashfs/Config.in" source "fs/tar/Config.in" source "fs/ubi/Config.in" diff --git a/fs/erofs/Config.in b/fs/erofs/Config.in index e112572688..93c069f2c0 100644 --- a/fs/erofs/Config.in +++ b/fs/erofs/Config.in @@ -6,10 +6,120 @@ config BR2_TARGET_ROOTFS_EROFS if BR2_TARGET_ROOTFS_EROFS -config BR2_TARGET_ROOTFS_EROFS_LZ4HC - bool "lz4hc compression" +choice + prompt "Compression algorithm" + default BR2_TARGET_ROOTFS_EROFS_LZ4HC help - Use lz4 high-compression to compress data in the filesystem. + Select the EROFS compression algorithm to use. + + LZ4HC (LZ4 High Compression) is the default algorithm and + provides a good balance between compression ratio and speed, + with increasing levels the compression ratio increases at the + penalty of higher compression times, without significant + decompression penalty. + + LZMA provides the best compression ratio but is significantly + slower both in compression and decompression, and higher + compression levels can have noticeable memory requirements. + + Custom compression allows for advanced configuration of the + compression algorithms, and adds the possibility of + finegrained per-file compression using compression hints. + +config BR2_TARGET_ROOTFS_EROFS_NONE + bool "no compression" + +config BR2_TARGET_ROOTFS_EROFS_LZ4HC + bool "lz4hc" + +config BR2_TARGET_ROOTFS_EROFS_LZMA + bool "lzma" + +config BR2_TARGET_ROOTFS_EROFS_CUSTOM_COMPRESSION + bool "custom" + +endchoice + +if BR2_TARGET_ROOTFS_EROFS_LZ4HC + +config BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL + int "lz4hc compression level" + default 9 + range 1 12 + help + Specify the compression level for LZ4HC compression. + +endif # BR2_TARGET_ROOTFS_EROFS_LZ4HC + +if BR2_TARGET_ROOTFS_EROFS_LZMA + +config BR2_TARGET_ROOTFS_EROFS_LZMA_LEVEL + int "lzma compression level" + default 6 + range 0 109 + help + Specify the compression level for LZMA compression. + + Values from 0 to 9 are used for the standard compression, + values from 100 to 109 are used for the extreme compression. + +endif # BR2_TARGET_ROOTFS_EROFS_LZMA + +if BR2_TARGET_ROOTFS_EROFS_CUSTOM_COMPRESSION + +config BR2_TARGET_ROOTFS_EROFS_COMPRESSION_ALGORITHMS + string "compression algorithms" + default "lz4hc,12" + help + Specify arbitrary compression option, useful in combination + with compression hints. Individual algorithms are separated + by colon with optional level, e.g. "lz4hc,12:lzma". + See erofs-utils documentaion for detailed information. + +config BR2_TARGET_ROOTFS_EROFS_COMPRESSION_HINTS + string "path to compression hints file" + default "" + help + Path to file containing compression hints. Each line in the + file is defined by tokens separated by spaces in the + following form. Optionally, instead of the given primary + algorithm, algorithms can be specified with zero-based + algorithm-index explicitly: + + [algorithm-index] + + match-patterns are extended regular expressions, matched + against absolute paths within the output filesystem, with no + leading /. + +endif # BR2_TARGET_ROOTFS_EROFS_LZMA + +config BR2_TARGET_ROOTFS_EROFS_DEDUPE + bool "enable data deduplication" + depends on !BR2_TARGET_ROOTFS_EROFS_NONE + help + Enable global compressed data deduplication to reduce FS image + size. Introduced in Linux 6.1. + +config BR2_TARGET_ROOTFS_EROFS_FRAGMENTS + bool "enable fragments packing" + help + Pack the tail part (pcluster) of compressed files, or entire + files, into a special inode for smaller image size. + Introduced in Linux 6.1. + +config BR2_TARGET_ROOTFS_EROFS_ALL_FRAGMENTS + bool "enable all-fragments packing" + help + Forcely record the whole files into a special inode for better + compression. Introduced in Linux 6.1. + +config BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING + bool "enable ztailpacking" + help + Pack the tail part (pcluster) of compressed files into its + metadata to save more space and the tail part I/O. Introduced + in Linux 5.17. config BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE int "pcluster size" diff --git a/fs/erofs/erofs.mk b/fs/erofs/erofs.mk index e43d74927b..881ecea053 100644 --- a/fs/erofs/erofs.mk +++ b/fs/erofs/erofs.mk @@ -7,7 +7,14 @@ ROOTFS_EROFS_DEPENDENCIES = host-erofs-utils ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) -ROOTFS_EROFS_ARGS += -zlz4hc +ROOTFS_EROFS_ARGS += -zlz4hc,$(BR2_TARGET_ROOTFS_EROFS_LZ4HC_LEVEL) +else ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZMA),y) +ROOTFS_EROFS_ARGS += -zlzma,$(BR2_TARGET_ROOTFS_EROFS_LZMA_LEVEL) +else ifeq ($(BR2_TARGET_ROOTFS_EROFS_CUSTOM_COMPRESSION),y) +ROOTFS_EROFS_ARGS += -z$(call qstrip,$(BR2_TARGET_ROOTFS_EROFS_COMPRESSION_ALGORITHMS)) +ifneq ($(call qstrip,$(BR2_TARGET_ROOTFS_EROFS_COMPRESSION_HINTS)),) +ROOTFS_EROFS_ARGS += --compress-hints $(call qstrip,$(BR2_TARGET_ROOTFS_EROFS_COMPRESSION_HINTS)) +endif endif ifeq ($(BR2_REPRODUCIBLE),y) @@ -20,6 +27,22 @@ ifneq ($(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE),0) ROOTFS_EROFS_ARGS += -C$(strip $(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE)) endif +ifeq ($(BR2_TARGET_ROOTFS_EROFS_DEDUPE),y) +ROOTFS_EROFS_ARGS += -Ededupe +endif + +ifeq ($(BR2_TARGET_ROOTFS_EROFS_FRAGMENTS),y) +ROOTFS_EROFS_ARGS += -Efragments +endif + +ifeq ($(BR2_TARGET_ROOTFS_EROFS_ALL_FRAGMENTS),y) +ROOTFS_EROFS_ARGS += -Eall-fragments +endif + +ifeq ($(BR2_TARGET_ROOTFS_EROFS_ZTAILPACKING),y) +ROOTFS_EROFS_ARGS += -Eztailpacking +endif + define ROOTFS_EROFS_CMD $(HOST_DIR)/bin/mkfs.erofs $(ROOTFS_EROFS_ARGS) $@ $(TARGET_DIR) endef diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 4451d0797f..c50f22626a 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -13,10 +13,6 @@ choice bool "ext2/3/4 variant" default BR2_TARGET_ROOTFS_EXT2_2r1 -config BR2_TARGET_ROOTFS_EXT2_2r0 - bool "ext2 (rev0)" - select BR2_TARGET_ROOTFS_EXT2_2 - config BR2_TARGET_ROOTFS_EXT2_2r1 bool "ext2 (rev1)" select BR2_TARGET_ROOTFS_EXT2_2 @@ -35,12 +31,6 @@ config BR2_TARGET_ROOTFS_EXT2_GEN default 3 if BR2_TARGET_ROOTFS_EXT2_3 default 4 if BR2_TARGET_ROOTFS_EXT2_4 -# All ext generations are revision 1, except ext2r0, which is revision 0 -config BR2_TARGET_ROOTFS_EXT2_REV - int - default 0 if BR2_TARGET_ROOTFS_EXT2_2r0 - default 1 if !BR2_TARGET_ROOTFS_EXT2_2r0 - config BR2_TARGET_ROOTFS_EXT2_LABEL string "filesystem label" default "rootfs" diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index e69e79cd2e..89e0e7b9b3 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -18,7 +18,6 @@ ROOTFS_EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) ROOTFS_EXT2_OPTS = \ -d $(TARGET_DIR) \ - -r $(BR2_TARGET_ROOTFS_EXT2_REV) \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ -L "$(ROOTFS_EXT2_LABEL)" \ diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index 21322a2246..cb2f5ec969 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -69,6 +69,8 @@ choice Select the squashfs compression algorithm to use when generating the filesystem. + Select "none" to disable compression. + config BR2_TARGET_ROOTFS_SQUASHFS4_GZIP bool "gzip" @@ -87,11 +89,15 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_XZ config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD bool "zstd" +config BR2_TARGET_ROOTFS_SQUASHFS4_NONE + bool "none" + endchoice config BR2_TARGET_ROOTFS_SQUASHFS_EXTREME_COMP bool "extreme compression when available" default y if BR2_TARGET_ROOTFS_SQUASHFS4_LZ4 # legacy + depends on !BR2_TARGET_ROOTFS_SQUASHFS4_NONE help Use options to increase compression ration as much as possible, like using architecture-specific options, at @@ -108,7 +114,7 @@ config BR2_TARGET_ROOTFS_SQUASHFS_COMP_OPTS default "-Xcompression-level 9" if BR2_TARGET_ROOTFS_SQUASHFS4_GZIP default "-Xcompression-level 9" if BR2_TARGET_ROOTFS_SQUASHFS4_LZO default "-Xhc" if BR2_TARGET_ROOTFS_SQUASHFS4_LZ4 - default "-Xbcj arm,armthumb" if BR2_TARGET_ROOTFS_SQUASHFS4_XZ && (BR2_arm || BR_aarch64) + default "-Xbcj arm,armthumb" if BR2_TARGET_ROOTFS_SQUASHFS4_XZ && (BR2_arm || BR2_aarch64) default "-Xbcj powerpc" if BR2_TARGET_ROOTFS_SQUASHFS4_XZ && (BR2_powerpc || BR2_powerpc64) default "-Xbcj sparc" if BR2_TARGET_ROOTFS_SQUASHFS4_XZ && (BR2_sparc || BR2_sparc64) default "-Xbcj x86" if BR2_TARGET_ROOTFS_SQUASHFS4_XZ && (BR2_i386 || BR2_x86_64) diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index cf083663c1..3b9d0efbbe 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -26,6 +26,8 @@ else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y) ROOTFS_SQUASHFS_ARGS += -comp xz else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD),y) ROOTFS_SQUASHFS_ARGS += -comp zstd +else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_NONE),y) +ROOTFS_SQUASHFS_ARGS += -no-compression else ROOTFS_SQUASHFS_ARGS += -comp gzip endif diff --git a/linux/Config.ext.in b/linux/Config.ext.in index 3cbf42d344..3b72d3cf60 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -55,99 +55,6 @@ config BR2_LINUX_KERNEL_EXT_RTAI help RTAI Kernel part. -#------------------------------------------------------------------------------- -# ev3dev Linux drivers -config BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS - bool "ev3dev Linux drivers" - select BR2_PACKAGE_EV3DEV_LINUX_DRIVERS - help - Linux drivers for LEGO MINDSTORMS EV3 from the ev3dev project. - - https://github.com/ev3dev/lego-linux-drivers - -#------------------------------------------------------------------------------- -# fbtft -config BR2_LINUX_KERNEL_EXT_FBTFT - bool "FB TFT drivers" - select BR2_PACKAGE_FBTFT - help - Linux Framebuffer drivers for small TFT LCD display modules, - e.g. Adafruit PiTFT displays for Raspberry Pi (this extra - package is only needed for linux kernels until v3.19, since - v4.0 the drivers are included in the staging area). - - To enable fbtft, e.g. for Adafruit 2.8 PiTFT, enable the - following kernel configurations: - - CONFIG_SPI - - CONFIG_GPIOLIB - - CONFIG_FB - - CONFIG_FB_TFT - - CONFIG_FB_TFT_ILI9341 - - https://github.com/notro/fbtft - -# aufs-standalone -config BR2_LINUX_KERNEL_EXT_AUFS - bool "Aufs Filesystem Module patch" - select BR2_PACKAGE_AUFS - help - Aufs is split in two parts: a kernel part and a userspace - part. Enabling this option automatically selects the aufs - standalone (module) package and patches the Linux kernel - built by Buildroot with the aufs kernel part (ie fs/aufs). - - It is important to use the correct branch of aufs-standalone. - -if BR2_LINUX_KERNEL_EXT_AUFS - -choice - bool "aufs-standalone series" - help - Select the major series of this version. This must match the - major version of your kernel (e.g. for kernels 3.x, select - aufs3.x; for kernels 4.x, select aufs4.x; for kernels 5.x, - select aufs5.x ). - - Note: neither aufs1.x nor aufs2.x (both for kernels older than - 3.x) are supported. - -config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_3 - bool "aufs3.x" - -config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_4 - bool "aufs4.x" - -config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_5 - bool "aufs5.x" - -endchoice - -config BR2_LINUX_KERNEL_EXT_AUFS_SERIES - int - default 3 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_3 - default 4 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_4 - default 5 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_5 - -config BR2_LINUX_KERNEL_EXT_AUFS_VERSION - string "aufs-standalone version" - default "" - help - The version you choose must match that of your kernel. - Usually, the sha1 of the cset you want to use; avoid using a - branch name as this yields non-reproducible builds. - - See the following resources to see what versions are - available: - - For aufs3.x: - https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/ - For aufs4.x: - https://github.com/sfjro/aufs4-standalone/branches/all - For aufs5.x: - https://github.com/sfjro/aufs5-standalone/branches/all - -endif # aufs - # kernel extensions from br2-external trees, if any source "$BR2_BASE_DIR/.br2-external.in.linux" diff --git a/linux/Config.in b/linux/Config.in index 63078d686e..10024bef38 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,11 +28,16 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.11)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.18)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 if BR2_KERNEL_HEADERS_AS_KERNEL + # mips always generates an ITB image + select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" + # Support was introduced in Linux 5.19 + depends on !BR2_loongarch64 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help CIP launched in the spring of 2016 to address the needs of @@ -53,6 +58,8 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)" + # Support was introduced in Linux 5.19 + depends on !BR2_loongarch64 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL help Same as the CIP version, but this is the PREEMPT_RT realtime @@ -134,7 +141,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.11.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.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 \ @@ -168,6 +175,13 @@ config BR2_LINUX_KERNEL_USE_DEFCONFIG config BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG bool "Use the architecture default configuration" + # We know that the default configuration on some architectures + # requires host-openssl, so select it for the latest kernel + # version. This is mainly needed to fix autobuilder testing. + select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL if \ + BR2_LINUX_KERNEL_LATEST_VERSION && \ + (BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || \ + BR2_or1k || BR2_riscv || BR2_sparc || BR2_x86_64) help This option will use the default configuration for the selected architecture. I.e, it is equivalent to running @@ -285,6 +299,10 @@ config BR2_LINUX_KERNEL_VMLINUX_BIN bool "vmlinux.bin" depends on BR2_mips || BR2_mipsel || BR2_sh +config BR2_LINUX_KERNEL_VMLINUX_EFI + bool "vmlinux.efi" + depends on BR2_loongarch64 + config BR2_LINUX_KERNEL_VMLINUX bool "vmlinux" @@ -296,6 +314,10 @@ config BR2_LINUX_KERNEL_VMLINUZ_BIN bool "vmlinuz.bin" depends on BR2_mips || BR2_mipsel +config BR2_LINUX_KERNEL_VMLINUZ_EFI + bool "vmlinuz.efi" + depends on BR2_loongarch64 + config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM bool "custom target" help @@ -417,14 +439,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//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 diff --git a/linux/linux.hash b/linux/linux.hash index 6002478854..d82ccf83c3 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,18 +1,17 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz -sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz -sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz +sha256 9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b linux-6.18.tar.xz +sha256 934b18af0125f114907bad482d7c5a97d58038970b9dce6162318e920caf257e linux-6.17.11.tar.xz +sha256 1a69745105528676f12f29dc2494945d96cb23666dcc5223794abc22415f1735 linux-6.12.61.tar.xz +sha256 3da09b980bb404cc28793479bb2d6c636522679215ffa65a04c893575253e5e8 linux-6.6.119.tar.xz +sha256 1f207ebe93980829ecc0a18b694816f22b715e9893767731651969a168342b9e linux-6.1.159.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8 linux-5.15.173.tar.xz -sha256 cd1850ef3b771886df4e0b4c4eb07033864abab2bb553a20fd9e3cdc23584b47 linux-5.10.230.tar.xz -sha256 180754f3df0e8d7f206625255b3f5a6e1f441feec83336df42613ca8f6b1887c linux-5.4.286.tar.xz -# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 607bed7de5cda31a443df4c8a78dbe5e8a9ad31afde2a4d28fe99ab4730e8de1 linux-4.19.325.tar.xz +sha256 fd218df8e2107a4443b6c29fef7f95aad167031e0fbdbc7a858ae8471360668a linux-5.15.197.tar.xz +sha256 70c8b87ba1fcd8bfa663661934dc9bda92d0b5f3c0fc3197bb56399f69d9fe0c linux-5.10.247.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 +sha256 8780e78a1a737e127f25a65f6d95269bffd36158dc261114de7859b490bfc5aa LICENSES/preferred/GPL-2.0 sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/linux/linux.mk b/linux/linux.mk index 1d3d8fffa6..0520394931 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -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//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)) @@ -243,12 +262,16 @@ else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y) LINUX_IMAGE_NAME = linux.bin else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y) LINUX_IMAGE_NAME = vmlinux.bin +else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_EFI),y) +LINUX_IMAGE_NAME = vmlinux.efi else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y) LINUX_IMAGE_NAME = vmlinux else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y) LINUX_IMAGE_NAME = vmlinuz else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ_BIN),y) LINUX_IMAGE_NAME = vmlinuz.bin +else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ_EFI),y) +LINUX_IMAGE_NAME = vmlinuz.efi endif # The if-else blocks above are all the image types we know of, and all # come from a Kconfig choice, so we know we have LINUX_IMAGE_NAME set @@ -343,6 +366,12 @@ LINUX_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig else ifeq ($(BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG),y) ifeq ($(BR2_powerpc64le),y) LINUX_KCONFIG_DEFCONFIG = ppc64le_defconfig +else ifeq ($(BR2_powerpc64),y) +LINUX_KCONFIG_DEFCONFIG = ppc64_defconfig +else ifeq ($(BR2_powerpc),y) +LINUX_KCONFIG_DEFCONFIG = ppc_defconfig +else ifeq ($(BR2_arc750d)$(BR2_arc770d),y) +LINUX_KCONFIG_DEFCONFIG = axs101_defconfig else LINUX_KCONFIG_DEFCONFIG = defconfig endif @@ -512,12 +541,13 @@ endif # the same $(BR2_MAKE) invocation has shown to cause parallel build # issues. # The call to disable gcc-plugins is a stop-gap measure: -# http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html +# https://lore.kernel.org/buildroot/20200512095550.GW12536@scaer define LINUX_BUILD_CMDS $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) $(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) diff --git a/package/18xx-ti-utils/18xx-ti-utils.hash b/package/18xx-ti-utils/18xx-ti-utils.hash index 7ecca54b9b..116d05e8e9 100644 --- a/package/18xx-ti-utils/18xx-ti-utils.hash +++ b/package/18xx-ti-utils/18xx-ti-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ce0185ba8a9bf456cc94a798bf66903775065e337e53ff812f18a6d88f5bac13 18xx-ti-utils-R8.8.tar.xz +sha256 33be3c90719bf36d5da76c6faaefb07bf3697635f81b86e28b92307d7825483e 18xx-ti-utils-R8.8-git4.tar.gz sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING diff --git a/package/18xx-ti-utils/18xx-ti-utils.mk b/package/18xx-ti-utils/18xx-ti-utils.mk index 5d45191cde..3e6f715730 100644 --- a/package/18xx-ti-utils/18xx-ti-utils.mk +++ b/package/18xx-ti-utils/18xx-ti-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -18XX_TI_UTILS_VERSION = 8.8 -18XX_TI_UTILS_SITE = https://git.ti.com/cgit/wilink8-wlan/18xx-ti-utils/snapshot -18XX_TI_UTILS_SOURCE = 18xx-ti-utils-R$(18XX_TI_UTILS_VERSION).tar.xz +18XX_TI_UTILS_VERSION = R8.8 +18XX_TI_UTILS_SITE = https://git.ti.com/cgit/wilink8-wlan/18xx-ti-utils +18XX_TI_UTILS_SITE_METHOD = git 18XX_TI_UTILS_DEPENDENCIES = libnl 18XX_TI_UTILS_LICENSE = BSD-3-Clause 18XX_TI_UTILS_LICENSE_FILES = COPYING diff --git a/package/4th/0001-avoid-regen-during-install.patch b/package/4th/0001-avoid-regen-during-install.patch index 436cff1fd6..ea9cdffe7f 100644 --- a/package/4th/0001-avoid-regen-during-install.patch +++ b/package/4th/0001-avoid-regen-during-install.patch @@ -4,7 +4,7 @@ Signed-off-by: Francois Perrad --- a/sources/Makefile +++ b/sources/Makefile -@@ -120,7 +120,7 @@ +@@ -122,7 +122,7 @@ ln -sf $(SHARED_LIB) $(LIBRARIES)/lib4th.so endif diff --git a/package/4th/4th.hash b/package/4th/4th.hash index 8a31263479..50b81170bf 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f96ea74cdb2aadfdc3bebf8d6d2cf7b8976b5d56c1237387479bffaecede9fe3 4th-3.64.1-unix.tar.gz +sha256 b9f422b910cf99c63315241fd7a72e652ace11b1f78adabbc99628f3bccfb358 4th-3.64.2-unix.tar.gz sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/package/4th/4th.mk b/package/4th/4th.mk index 276423b255..0153f2dd91 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,9 +4,9 @@ # ################################################################################ -4TH_VERSION = 3.64.1 +4TH_VERSION = 3.64.2 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz -4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) +4TH_SITE = https://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ # The COPYING file only contains the text of the LGPL-3.0, but the # source code really contains parts under GPL-3.0+. diff --git a/package/4th/Config.in b/package/4th/Config.in index 4554664ab4..0463a4a087 100644 --- a/package/4th/Config.in +++ b/package/4th/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_4TH C-embeddable bytecode, standalone executables, but also works fine as a scripting language - http://thebeez.home.xs4all.nl/4tH/ + https://thebeez.home.xs4all.nl/4tH/ diff --git a/package/Config.in b/package/Config.in index 1370af5f1b..b079f74c0f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -31,7 +31,6 @@ menu "Audio and video applications" source "package/kodi/Config.in" source "package/lame/Config.in" source "package/madplay/Config.in" - source "package/mimic/Config.in" source "package/minimodem/Config.in" source "package/miraclecast/Config.in" source "package/mjpegtools/Config.in" @@ -117,7 +116,6 @@ menu "Debugging, profiling and benchmark" source "package/kmemd/Config.in" source "package/kvm-unit-tests/Config.in" source "package/kyua/Config.in" - source "package/latencytop/Config.in" source "package/libbpf/Config.in" source "package/libtraceevent/Config.in" source "package/libtracefs/Config.in" @@ -145,8 +143,6 @@ menu "Debugging, profiling and benchmark" source "package/ptm2human/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" - source "package/ramsmp/Config.in" - source "package/ramspeed/Config.in" source "package/rt-tests/Config.in" source "package/rwmem/Config.in" source "package/sentry-native/Config.in" @@ -212,10 +208,9 @@ endmenu menu "Filesystem and flash utilities" source "package/abootimg/Config.in" - source "package/aufs/Config.in" - source "package/aufs-util/Config.in" source "package/autofs/Config.in" source "package/bmap-tools/Config.in" + source "package/bmap-writer/Config.in" source "package/btrfs-progs/Config.in" source "package/cifs-utils/Config.in" source "package/cpio/Config.in" @@ -239,7 +234,6 @@ menu "Filesystem and flash utilities" source "package/fwup/Config.in" source "package/genext2fs/Config.in" source "package/genpart/Config.in" - source "package/genromfs/Config.in" source "package/gocryptfs/Config.in" source "package/imx-usb-loader/Config.in" source "package/mmc-utils/Config.in" @@ -253,6 +247,7 @@ menu "Filesystem and flash utilities" source "package/sshfs/Config.in" source "package/sunxi-tools/Config.in" source "package/udftools/Config.in" + source "package/ufs-utils/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" source "package/zerofree/Config.in" @@ -263,7 +258,6 @@ menu "Fonts, cursors, icons, sounds and themes" comment "Cursors" source "package/comix-cursors/Config.in" - source "package/obsidian-cursors/Config.in" comment "Fonts" source "package/bitstream-vera/Config.in" @@ -283,9 +277,6 @@ comment "Sounds" source "package/sound-theme-borealis/Config.in" source "package/sound-theme-freedesktop/Config.in" -comment "Themes" - source "package/gtk2-engines/Config.in" - endmenu menu "Games" @@ -317,7 +308,6 @@ menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" - source "package/dmenu-wayland/Config.in" source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" @@ -336,17 +326,17 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/spirv-llvm-translator/Config.in" source "package/spirv-tools/Config.in" source "package/stellarium/Config.in" source "package/sway/Config.in" source "package/swaybg/Config.in" source "package/tesseract-ocr/Config.in" source "package/tinifier/Config.in" + source "package/wmenu/Config.in" comment "Graphic libraries" source "package/cegui/Config.in" - source "package/directfb/Config.in" - source "package/directfb-examples/Config.in" source "package/efl/Config.in" source "package/fb-test-app/Config.in" source "package/fbdump/Config.in" @@ -358,8 +348,6 @@ comment "Graphic libraries" source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" source "package/libglvnd/Config.in" - source "package/linux-fusion/Config.in" - source "package/lite/Config.in" source "package/mesa3d/Config.in" source "package/mesa3d-headers/Config.in" source "package/ocrad/Config.in" @@ -382,6 +370,7 @@ comment "Graphic libraries" source "package/tk/Config.in" source "package/vulkan-headers/Config.in" source "package/vulkan-loader/Config.in" + source "package/vulkan-sdk/Config.in" source "package/vulkan-tools/Config.in" comment "Other GUIs" @@ -410,8 +399,6 @@ comment "X applications" source "package/dillo/Config.in" source "package/docker/Config.in" source "package/feh/Config.in" - source "package/gtkperf/Config.in" - source "package/leafpad/Config.in" source "package/mupdf/Config.in" source "package/nodm/Config.in" source "package/pcmanfm/Config.in" @@ -430,7 +417,6 @@ comment "X applications" comment "X libraries and helper libraries" depends on BR2_PACKAGE_XORG7 - source "package/libsexy/Config.in" source "package/x11r7/xkeyboard-config/Config.in" comment "X window managers" @@ -440,7 +426,6 @@ comment "X window managers" source "package/evilwm/Config.in" source "package/fluxbox/Config.in" source "package/matchbox/Config.in" - source "package/metacity/Config.in" source "package/openbox/Config.in" source "package/ratpoison/Config.in" endmenu @@ -453,9 +438,15 @@ menu "Firmware" source "package/brcmfmac_sdio-firmware-rpi/Config.in" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" + source "package/nxp-bt-wifi-firmware/Config.in" source "package/odroidc2-firmware/Config.in" + source "package/panel-mipi-dbi-firmware/Config.in" source "package/qcom-db410c-firmware/Config.in" + source "package/qoriq-ddr-phy-binary/Config.in" + source "package/qoriq-firmware-inphi/Config.in" source "package/qoriq-fm-ucode/Config.in" + source "package/qoriq-mc-binary/Config.in" + source "package/qoriq-mc-utils/Config.in" source "package/rcw-smarc-sal28/Config.in" source "package/rpi-firmware/Config.in" source "package/sunxi-boards/Config.in" @@ -463,6 +454,7 @@ menu "Firmware" source "package/ux500-firmware/Config.in" source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" + source "package/xilinx-fpgautil/Config.in" source "package/zd1211-firmware/Config.in" endmenu source "package/18xx-ti-utils/Config.in" @@ -504,18 +496,14 @@ endmenu source "package/dtbocfg/Config.in" source "package/dtv-scan-tables/Config.in" source "package/dump1090/Config.in" - source "package/dvbsnoop/Config.in" source "package/edid-decode/Config.in" source "package/edk2-non-osi/Config.in" source "package/edk2-platforms/Config.in" source "package/esp-hosted/Config.in" source "package/espflash/Config.in" source "package/eudev/Config.in" - source "package/ev3dev-linux-drivers/Config.in" source "package/evemu/Config.in" source "package/evtest/Config.in" - source "package/fbtft/Config.in" - source "package/fconfig/Config.in" source "package/flashrom/Config.in" source "package/fmtools/Config.in" source "package/freeipmi/Config.in" @@ -577,8 +565,8 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvidia-persistenced/Config.in" source "package/nvme/Config.in" + source "package/nxp-mwifiex/Config.in" source "package/ofono/Config.in" - source "package/ola/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" source "package/openipmi/Config.in" @@ -617,12 +605,14 @@ endmenu source "package/rtl8821au/Config.in" source "package/rtl8821cu/Config.in" source "package/rtl8822cs/Config.in" + source "package/sane-airscan/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" source "package/setserial/Config.in" source "package/sg3_utils/Config.in" source "package/sigrok-cli/Config.in" + source "package/sipeed-lpi4abin/Config.in" source "package/sispmctl/Config.in" source "package/smartmontools/Config.in" source "package/smstools3/Config.in" @@ -657,9 +647,9 @@ endmenu source "package/usb_modeswitch/Config.in" source "package/usb_modeswitch_data/Config.in" source "package/usbguard/Config.in" + source "package/usbip/Config.in" source "package/usbmount/Config.in" source "package/usbutils/Config.in" - source "package/w_scan/Config.in" source "package/wf111/Config.in" source "package/wilc-driver/Config.in" source "package/wipe/Config.in" @@ -759,6 +749,7 @@ menu "Lua libraries/modules" source "package/lua-livr/Config.in" source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" + source "package/lua-lrexlib-pcre2/Config.in" source "package/lua-lsdbus/Config.in" source "package/lua-lunitx/Config.in" source "package/lua-lunix/Config.in" @@ -966,6 +957,7 @@ if BR2_STATIC_LIBS comment "External PHP extensions need a toolchain w/ dynamic library" endif endif + source "package/pocketpy/Config.in" source "package/python3/Config.in" if BR2_PACKAGE_PYTHON3 menu "External python modules" @@ -987,6 +979,7 @@ menu "External python modules" source "package/python-aiohttp-security/Config.in" source "package/python-aiohttp-session/Config.in" source "package/python-aiohttp-sse/Config.in" + source "package/python-aiohttp-sse-client/Config.in" source "package/python-aiojobs/Config.in" source "package/python-aiologstash/Config.in" source "package/python-aiomonitor/Config.in" @@ -999,11 +992,13 @@ menu "External python modules" source "package/python-aiozipkin/Config.in" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" + source "package/python-aniso8601/Config.in" source "package/python-annotated-types/Config.in" source "package/python-ansicolors/Config.in" source "package/python-anyio/Config.in" source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" + source "package/python-apscheduler/Config.in" source "package/python-argcomplete/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" @@ -1015,6 +1010,7 @@ menu "External python modules" source "package/python-async-generator/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" + source "package/python-asyncclick/Config.in" source "package/python-asyncssh/Config.in" source "package/python-attrs/Config.in" source "package/python-augeas/Config.in" @@ -1039,6 +1035,7 @@ menu "External python modules" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" source "package/python-cached-property/Config.in" + source "package/python-cachelib/Config.in" source "package/python-cachetools/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" @@ -1047,6 +1044,7 @@ menu "External python modules" source "package/python-cchardet/Config.in" source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" + source "package/python-changelog-chug/Config.in" source "package/python-channels/Config.in" source "package/python-channels-redis/Config.in" source "package/python-characteristic/Config.in" @@ -1066,6 +1064,7 @@ menu "External python modules" source "package/python-contourpy/Config.in" source "package/python-couchdb/Config.in" source "package/python-crayons/Config.in" + source "package/python-crc/Config.in" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" source "package/python-crontab/Config.in" @@ -1103,6 +1102,7 @@ menu "External python modules" source "package/python-dtschema/Config.in" source "package/python-ecdsa/Config.in" source "package/python-email-validator/Config.in" + source "package/python-emailproxy/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" source "package/python-esptool/Config.in" @@ -1116,10 +1116,12 @@ menu "External python modules" source "package/python-fire/Config.in" source "package/python-flask/Config.in" source "package/python-flask-babel/Config.in" + source "package/python-flask-caching/Config.in" source "package/python-flask-cors/Config.in" source "package/python-flask-expects-json/Config.in" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" + source "package/python-flask-restx/Config.in" source "package/python-flask-smorest/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flask-wtf/Config.in" @@ -1204,10 +1206,10 @@ menu "External python modules" source "package/python-libusb1/Config.in" source "package/python-lmdb/Config.in" source "package/python-lockfile/Config.in" + source "package/python-log-rate-limit/Config.in" source "package/python-logbook/Config.in" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" - source "package/python-m2crypto/Config.in" source "package/python-magic-wormhole/Config.in" source "package/python-magic-wormhole-mailbox-server/Config.in" source "package/python-magic-wormhole-transit-relay/Config.in" @@ -1239,6 +1241,7 @@ menu "External python modules" source "package/python-mwclient/Config.in" source "package/python-mwscrape/Config.in" source "package/python-mwscrape2slob/Config.in" + source "package/python-mypy/Config.in" source "package/python-mypy-extensions/Config.in" source "package/python-nested-dict/Config.in" source "package/python-netaddr/Config.in" @@ -1255,6 +1258,7 @@ menu "External python modules" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" + source "package/python-patch-ng/Config.in" source "package/python-path/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathspec/Config.in" @@ -1324,6 +1328,7 @@ menu "External python modules" source "package/python-pyphen/Config.in" source "package/python-pypika-tortoise/Config.in" source "package/python-pypng/Config.in" + source "package/python-pyproj/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyqt5-sip/Config.in" @@ -1377,7 +1382,9 @@ menu "External python modules" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" source "package/python-scipy/Config.in" + source "package/python-scp/Config.in" source "package/python-sdbus/Config.in" + source "package/python-sdbus-modemmanager/Config.in" source "package/python-sdbus-networkmanager/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" @@ -1393,6 +1400,7 @@ menu "External python modules" source "package/python-setuptools/Config.in" source "package/python-sh/Config.in" source "package/python-shutilwhich/Config.in" + source "package/python-simple-pid/Config.in" source "package/python-simple-websocket/Config.in" source "package/python-simpleaudio/Config.in" source "package/python-simplegeneric/Config.in" @@ -1404,6 +1412,7 @@ menu "External python modules" source "package/python-slob/Config.in" source "package/python-smbprotocol/Config.in" source "package/python-smbus-cffi/Config.in" + source "package/python-smbus2/Config.in" source "package/python-smmap2/Config.in" source "package/python-snappy/Config.in" source "package/python-sniffio/Config.in" @@ -1422,6 +1431,7 @@ menu "External python modules" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tcolorpy/Config.in" + source "package/python-telnetlib3/Config.in" source "package/python-tempora/Config.in" source "package/python-termcolor/Config.in" source "package/python-terminaltables/Config.in" @@ -1454,6 +1464,8 @@ menu "External python modules" source "package/python-types-python-dateutil/Config.in" source "package/python-typing-extensions/Config.in" source "package/python-typing-inspect/Config.in" + source "package/python-typing-inspection/Config.in" + source "package/python-tzlocal/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" source "package/python-uhid/Config.in" @@ -1467,6 +1479,7 @@ menu "External python modules" source "package/python-validators/Config.in" source "package/python-versiontools/Config.in" source "package/python-visitor/Config.in" + source "package/python-waitress/Config.in" source "package/python-watchdog/Config.in" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" @@ -1478,6 +1491,7 @@ menu "External python modules" source "package/python-websocket-client/Config.in" source "package/python-websockets/Config.in" source "package/python-werkzeug/Config.in" + source "package/python-whitenoise/Config.in" source "package/python-whoosh/Config.in" source "package/python-wrapt/Config.in" source "package/python-ws4py/Config.in" @@ -1509,7 +1523,6 @@ endif source "package/tcl/Config.in" if BR2_PACKAGE_TCL menu "Tcl libraries/modules" - source "package/expect/Config.in" source "package/tcllib/Config.in" endmenu endif @@ -1536,7 +1549,6 @@ menu "Audio/Sound" source "package/libcodec2/Config.in" source "package/libcue/Config.in" source "package/libcuefile/Config.in" - source "package/libebur128/Config.in" source "package/libg7221/Config.in" source "package/libgsm/Config.in" source "package/libid3tag/Config.in" @@ -1562,6 +1574,7 @@ menu "Audio/Sound" source "package/opus/Config.in" source "package/opusfile/Config.in" source "package/portaudio/Config.in" + source "package/rnnoise/Config.in" source "package/sbc/Config.in" source "package/spandsp/Config.in" source "package/speex/Config.in" @@ -1611,7 +1624,6 @@ menu "Crypto" source "package/libmd/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" - source "package/libolm/Config.in" source "package/libp11/Config.in" source "package/libscrypt/Config.in" source "package/libsecret/Config.in" @@ -1627,6 +1639,7 @@ menu "Crypto" source "package/nettle/Config.in" source "package/oath-toolkit/Config.in" source "package/openssl/Config.in" + source "package/parsec/Config.in" source "package/parsec-tool/Config.in" source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" @@ -1658,7 +1671,6 @@ menu "Database" source "package/libpqxx/Config.in" source "package/lmdb/Config.in" source "package/mariadb/Config.in" - source "package/mongodb/Config.in" source "package/postgresql/Config.in" if BR2_PACKAGE_POSTGRESQL source "package/osm2pgsql/Config.in" @@ -1707,7 +1719,6 @@ menu "Graphics" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" source "package/gdk-pixbuf-xlib/Config.in" - source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" source "package/graphene/Config.in" @@ -1729,7 +1740,6 @@ menu "Graphics" source "package/lcms2/Config.in" source "package/lensfun/Config.in" source "package/leptonica/Config.in" - source "package/lesstif/Config.in" source "package/libart/Config.in" source "package/libavif/Config.in" source "package/libdecor/Config.in" @@ -1744,12 +1754,10 @@ menu "Graphics" source "package/libfreeimage/Config.in" source "package/libgdiplus/Config.in" source "package/libgeotiff/Config.in" - source "package/libglade/Config.in" source "package/libglew/Config.in" source "package/libglfw/Config.in" source "package/libglu/Config.in" source "package/libgta/Config.in" - source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" source "package/libgtk4/Config.in" source "package/libjxl/Config.in" @@ -1761,7 +1769,6 @@ menu "Graphics" source "package/librsvg/Config.in" source "package/libsvg/Config.in" source "package/libsvg-cairo/Config.in" - source "package/libsvgtiny/Config.in" source "package/libva/Config.in" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" @@ -1770,6 +1777,8 @@ menu "Graphics" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencl-clhpp/Config.in" + source "package/opencl-headers/Config.in" + source "package/opencl-icd-loader/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opencv4-contrib/Config.in" @@ -1804,6 +1813,7 @@ menu "Hardware handling" source "package/bcm2835/Config.in" source "package/c-periphery/Config.in" source "package/ccid/Config.in" + source "package/cpuinfo/Config.in" source "package/dtc/Config.in" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" @@ -1823,7 +1833,6 @@ menu "Hardware handling" source "package/libgpiod/Config.in" source "package/libgpiod2/Config.in" source "package/libgudev/Config.in" - source "package/libhid/Config.in" source "package/libiio/Config.in" source "package/libinput/Config.in" source "package/libiqrf/Config.in" @@ -1860,18 +1869,13 @@ menu "Hardware handling" source "package/pcsc-lite/Config.in" source "package/pico-sdk/Config.in" source "package/rpi-rgb-led-matrix/Config.in" + source "package/soapy-sdr/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" source "package/urg/Config.in" endmenu menu "Javascript" - source "package/angularjs/Config.in" -if BR2_PACKAGE_ANGULARJS -menu "External AngularJS plugins" - source "package/angular-websocket/Config.in" -endmenu -endif source "package/bootstrap/Config.in" source "package/chartjs/Config.in" source "package/datatables/Config.in" @@ -1918,10 +1922,8 @@ menu "JSON/XML" source "package/json-for-modern-cpp/Config.in" source "package/json-glib/Config.in" source "package/jsoncpp/Config.in" - source "package/libbson/Config.in" source "package/libfastjson/Config.in" source "package/libjson/Config.in" - source "package/libjwt/Config.in" source "package/libroxml/Config.in" source "package/libucl/Config.in" source "package/libxml2/Config.in" @@ -1995,7 +1997,6 @@ menu "Multimedia" source "package/libvpx/Config.in" source "package/libyuv/Config.in" source "package/live555/Config.in" - source "package/mediastreamer/Config.in" source "package/x264/Config.in" source "package/x265/Config.in" endmenu @@ -2005,7 +2006,6 @@ menu "Networking" source "package/azmq/Config.in" source "package/azure-iot-sdk-c/Config.in" source "package/batman-adv/Config.in" - source "package/belle-sip/Config.in" source "package/bluez5_utils-headers/Config.in" source "package/c-ares/Config.in" source "package/cni-plugins/Config.in" @@ -2074,7 +2074,6 @@ menu "Networking" source "package/libnids/Config.in" source "package/libnl/Config.in" source "package/libnpupnp/Config.in" - source "package/liboauth/Config.in" source "package/liboping/Config.in" source "package/libosip2/Config.in" source "package/libpagekite/Config.in" @@ -2103,7 +2102,6 @@ menu "Networking" source "package/libutp/Config.in" source "package/libuwsc/Config.in" source "package/libvncserver/Config.in" - source "package/libwebsock/Config.in" source "package/libwebsockets/Config.in" source "package/libyang/Config.in" source "package/libzenoh-c/Config.in" @@ -2128,7 +2126,6 @@ menu "Networking" source "package/openmpi/Config.in" source "package/openpgm/Config.in" source "package/openzwave/Config.in" - source "package/ortp/Config.in" source "package/paho-mqtt-c/Config.in" source "package/paho-mqtt-cpp/Config.in" source "package/pistache/Config.in" @@ -2163,9 +2160,7 @@ menu "Other" source "package/atf/Config.in" source "package/avro-c/Config.in" source "package/basu/Config.in" - source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" - source "package/belr/Config.in" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" @@ -2186,13 +2181,17 @@ menu "Other" source "package/elfutils/Config.in" source "package/ell/Config.in" source "package/falcosecurity-libs/Config.in" + source "package/farmhash/Config.in" + source "package/fft2d/Config.in" source "package/fftw/Config.in" source "package/flann/Config.in" source "package/flatbuffers/Config.in" source "package/flatcc/Config.in" + source "package/fp16/Config.in" source "package/fxdiv/Config.in" source "package/gconf/Config.in" source "package/gdal/Config.in" + source "package/gemmlowp/Config.in" source "package/gflags/Config.in" source "package/gli/Config.in" source "package/glibmm/Config.in" @@ -2208,7 +2207,6 @@ menu "Other" source "package/kernel_cmdline_extractor/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" - source "package/libargtable2/Config.in" source "package/libatomic_ops/Config.in" source "package/libavl/Config.in" source "package/libb64/Config.in" @@ -2278,10 +2276,12 @@ menu "Other" if BR2_PACKAGE_LINUX_PAM comment "linux-pam plugins" source "package/libpam-nfc/Config.in" + source "package/libpam-pkcs11/Config.in" source "package/libpam-radius-auth/Config.in" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/llama-cpp/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" @@ -2290,6 +2290,7 @@ endif source "package/mpfr/Config.in" source "package/mpir/Config.in" source "package/msgpack/Config.in" + source "package/msgpack-c/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" source "package/neon-2-sse/Config.in" @@ -2301,15 +2302,19 @@ endif source "package/protobuf/Config.in" source "package/protobuf-c/Config.in" source "package/protozero/Config.in" + source "package/psimd/Config.in" + source "package/pthreadpool/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" source "package/reproc/Config.in" source "package/riemann-c-client/Config.in" + source "package/ruy/Config.in" source "package/shapelib/Config.in" source "package/skalibs/Config.in" source "package/sphinxbase/Config.in" source "package/startup-notification/Config.in" source "package/tbb/Config.in" + source "package/tensorflow-lite/Config.in" source "package/tinycbor/Config.in" source "package/tl-expected/Config.in" source "package/tllist/Config.in" @@ -2318,6 +2323,7 @@ endif source "package/uvw/Config.in" source "package/volk/Config.in" source "package/xapian/Config.in" + source "package/xnnpack/Config.in" endmenu menu "Security" @@ -2340,6 +2346,7 @@ menu "Text and terminal handling" source "package/icu/Config.in" source "package/inih/Config.in" source "package/libcli/Config.in" + source "package/libecoli/Config.in" source "package/libedit/Config.in" source "package/libenca/Config.in" source "package/libestr/Config.in" @@ -2360,6 +2367,7 @@ menu "Text and terminal handling" source "package/tclap/Config.in" source "package/termcolor/Config.in" source "package/utf8proc/Config.in" + source "package/utfcpp/Config.in" endmenu endmenu @@ -2372,7 +2380,6 @@ menu "Mail" source "package/libesmtp/Config.in" source "package/msmtp/Config.in" source "package/mutt/Config.in" - source "package/sylpheed/Config.in" endmenu menu "Miscellaneous" @@ -2400,6 +2407,7 @@ menu "Miscellaneous" source "package/qpdf/Config.in" source "package/rtl_433/Config.in" source "package/shared-mime-info/Config.in" + source "package/snooze/Config.in" source "package/sunwait/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" @@ -2409,6 +2417,7 @@ menu "Miscellaneous" endmenu menu "Networking applications" + source "package/aardvark-dns/Config.in" source "package/aircrack-ng/Config.in" source "package/alfred/Config.in" source "package/aoetools/Config.in" @@ -2445,6 +2454,7 @@ endif source "package/can-utils/Config.in" source "package/cannelloni/Config.in" source "package/casync/Config.in" + source "package/casync-nano/Config.in" source "package/cfm/Config.in" source "package/chrony/Config.in" source "package/civetweb/Config.in" @@ -2487,11 +2497,11 @@ endif source "package/gesftpserver/Config.in" source "package/gloox/Config.in" source "package/glorytun/Config.in" + source "package/grout/Config.in" source "package/gupnp-tools/Config.in" source "package/gutenprint/Config.in" source "package/hans/Config.in" source "package/haproxy/Config.in" - source "package/hiawatha/Config.in" source "package/hostapd/Config.in" source "package/hplip/Config.in" source "package/htpdate/Config.in" @@ -2533,10 +2543,10 @@ endif source "package/lighttpd/Config.in" source "package/linknx/Config.in" source "package/links/Config.in" - source "package/linphone/Config.in" source "package/linux-zigbee/Config.in" source "package/linuxptp/Config.in" source "package/lldpd/Config.in" + source "package/lpac/Config.in" source "package/lrzsz/Config.in" source "package/lynx/Config.in" source "package/macchanger/Config.in" @@ -2547,7 +2557,6 @@ endif source "package/minissdpd/Config.in" source "package/mjpg-streamer/Config.in" source "package/modem-manager/Config.in" - source "package/mongrel2/Config.in" source "package/mosh/Config.in" source "package/mosquitto/Config.in" source "package/mrouted/Config.in" @@ -2559,13 +2568,13 @@ endif source "package/ndisc6/Config.in" source "package/net-tools/Config.in" source "package/netatalk/Config.in" + source "package/netavark/Config.in" source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" source "package/nethogs/Config.in" source "package/netplug/Config.in" source "package/netsnmp/Config.in" - source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/network-manager-openvpn/Config.in" source "package/networkd-dispatcher/Config.in" @@ -2603,6 +2612,7 @@ endif source "package/openvpn/Config.in" source "package/p910nd/Config.in" source "package/parprouted/Config.in" + source "package/passt/Config.in" source "package/phidgetwebservice/Config.in" source "package/phytool/Config.in" source "package/pimd/Config.in" @@ -2618,7 +2628,6 @@ endif source "package/ptpd2/Config.in" source "package/pure-ftpd/Config.in" source "package/putty/Config.in" - source "package/quagga/Config.in" source "package/radvd/Config.in" source "package/reaver/Config.in" source "package/redir/Config.in" @@ -2662,7 +2671,6 @@ endif source "package/tcping/Config.in" source "package/tcpreplay/Config.in" source "package/tftpd/Config.in" - source "package/thttpd/Config.in" source "package/tinc/Config.in" source "package/tinyproxy/Config.in" source "package/tinyssh/Config.in" @@ -2735,6 +2743,7 @@ menu "Security" source "package/apparmor/Config.in" source "package/checkpolicy/Config.in" source "package/ima-evm-utils/Config.in" + source "package/lynis/Config.in" source "package/optee-client/Config.in" source "package/optee-examples/Config.in" source "package/optee-test/Config.in" @@ -2772,7 +2781,7 @@ comment "Utilities" source "package/inotify-tools/Config.in" source "package/lockfile-progs/Config.in" source "package/logrotate/Config.in" - source "package/logsurfer/Config.in" + source "package/lowdown/Config.in" source "package/minisign/Config.in" source "package/neofetch/Config.in" source "package/parallel/Config.in" @@ -2791,7 +2800,9 @@ comment "Utilities" source "package/tini/Config.in" source "package/tmux/Config.in" source "package/ttyd/Config.in" + source "package/uuu/Config.in" source "package/which/Config.in" + source "package/wlr-randr/Config.in" source "package/wtfutil/Config.in" source "package/xmlstarlet/Config.in" source "package/xxhash/Config.in" @@ -2801,6 +2812,7 @@ endmenu menu "System tools" source "package/acl/Config.in" + source "package/amazon-ecr-credential-helper/Config.in" source "package/android-tools/Config.in" source "package/atop/Config.in" source "package/attr/Config.in" @@ -2808,9 +2820,11 @@ menu "System tools" source "package/balena-engine/Config.in" source "package/bubblewrap/Config.in" source "package/cgroupfs-mount/Config.in" + source "package/cgroupfs-v2-mount/Config.in" source "package/circus/Config.in" source "package/conmon/Config.in" source "package/containerd/Config.in" + source "package/containers-image-config/Config.in" source "package/coreutils/Config.in" source "package/cpulimit/Config.in" source "package/cpuload/Config.in" @@ -2821,9 +2835,12 @@ menu "System tools" source "package/dcron/Config.in" source "package/ddrescue/Config.in" source "package/debianutils/Config.in" + source "package/distribution-registry/Config.in" source "package/docker-cli/Config.in" source "package/docker-cli-buildx/Config.in" source "package/docker-compose/Config.in" + source "package/docker-credential-acr-env/Config.in" + source "package/docker-credential-gcr/Config.in" source "package/docker-engine/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" @@ -2835,6 +2852,7 @@ menu "System tools" source "package/getent/Config.in" source "package/gkrellm/Config.in" source "package/htop/Config.in" + source "package/hwclock-initscript/Config.in" source "package/ibm-sw-tpm2/Config.in" source "package/initscripts/Config.in" source "package/iotop/Config.in" @@ -2852,6 +2870,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-connect/Config.in" source "package/mender-grubenv/Config.in" + source "package/mender-update-modules/Config.in" source "package/mfoc/Config.in" source "package/moby-buildkit/Config.in" source "package/mokutil/Config.in" @@ -2867,10 +2886,10 @@ menu "System tools" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" source "package/petitboot/Config.in" + source "package/podman/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" - source "package/procrank_linux/Config.in" source "package/procs/Config.in" source "package/psmisc/Config.in" source "package/pwgen/Config.in" @@ -2893,6 +2912,7 @@ menu "System tools" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" source "package/shadow/Config.in" + source "package/skopeo/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" @@ -2921,6 +2941,8 @@ endmenu menu "Text editors and viewers" source "package/bat/Config.in" + source "package/broot/Config.in" + source "package/bvi/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in" @@ -2928,6 +2950,7 @@ menu "Text editors and viewers" source "package/mg/Config.in" source "package/most/Config.in" source "package/nano/Config.in" + source "package/nnn/Config.in" source "package/uemacs/Config.in" source "package/vim/Config.in" endmenu diff --git a/package/Config.in.host b/package/Config.in.host index 191833d94d..f76d0ce36a 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -6,11 +6,14 @@ menu "Host utilities" source "package/amlogic-boot-fip/Config.in.host" source "package/andes-spi-burn/Config.in.host" source "package/android-tools/Config.in.host" + source "package/arm-gnu-toolchain/Config.in.host" source "package/asn1c/Config.in.host" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/Config.in.host" + source "package/bmap-writer/Config.in.host" source "package/bootgen/Config.in.host" source "package/btrfs-progs/Config.in.host" + source "package/casync-nano/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" @@ -46,6 +49,7 @@ menu "Host utilities" source "package/gnupg/Config.in.host" source "package/gnupg2/Config.in.host" source "package/go/Config.in.host" + source "package/gobject-introspection/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" @@ -108,8 +112,8 @@ menu "Host utilities" source "package/sentry-cli/Config.in.host" source "package/skopeo/Config.in.host" source "package/sloci-image/Config.in.host" + source "package/snagboot/Config.in.host" source "package/squashfs/Config.in.host" - source "package/starfive-spltool/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" source "package/swtpm/Config.in.host" diff --git a/package/Makefile.in b/package/Makefile.in index 829636900b..5ebb5f9ba8 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -83,6 +83,14 @@ ABI := $(ABI)hf endif endif +# LoongArch Float ABI suffixes +ifeq ($(BR2_LOONGARCH_ABI_LP64F),y) +ABI = f32 +endif +ifeq ($(BR2_LOONGARCH_ABI_LP64S),y) +ABI = sf +endif + # For FSL PowerPC there's SPE ifeq ($(BR2_POWERPC_CPU_HAS_SPE),y) ABI = spe diff --git a/package/aardvark-dns/Config.in b/package/aardvark-dns/Config.in new file mode 100644 index 0000000000..83ef5a16f9 --- /dev/null +++ b/package/aardvark-dns/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_AARDVARK_DNS + bool "aardvark-dns" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Authoritative dns server for A/AAAA container records. + Forwards other request to host's /etc/resolv.conf + + https://github.com/containers/aardvark-dns/ diff --git a/package/aardvark-dns/aardvark-dns.hash b/package/aardvark-dns/aardvark-dns.hash new file mode 100644 index 0000000000..134dd34a1b --- /dev/null +++ b/package/aardvark-dns/aardvark-dns.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 aeb5fc77455b01916b28f7c306834446f3f6e184c02d38b177c578bb4f01939e aardvark-dns-v1.17.0-git4-cargo4.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/aardvark-dns/aardvark-dns.mk b/package/aardvark-dns/aardvark-dns.mk new file mode 100644 index 0000000000..09a3a421f2 --- /dev/null +++ b/package/aardvark-dns/aardvark-dns.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# aardvark-dns +# +################################################################################ + +# When updating the version here, also update netavark in lockstep +AARDVARK_DNS_VERSION = v1.17.0 +AARDVARK_DNS_SITE = https://github.com/containers/aardvark-dns +AARDVARK_DNS_SITE_METHOD = git + +AARDVARK_DNS_LICENSE = Apache-2.0 +AARDVARK_DNS_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index c3e7fda340..e88107e9c7 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 57988fb55541e694dfa3323bd19db74b65d37e942bebef559ed51e8cd9348b43 acpica-unix-20240927.tar.gz -sha256 b28f54dc421531bbe269afd8c28bf6fdfd6affbe50c2831464f777ec1766d4a5 source/include/acpi.h +sha256 eaca4c0248db872a055ab38b0deab4f5f577d1a0cada0fcbc0d80955e2a98e33 acpica-unix-20250807.tar.gz +sha256 dbfa87ff77586ffd8da1185981a9695e80db09b114b3b00c194a9bcc2292a95e source/include/acpi.h diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index a2abcf7558..e236a81ed0 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACPICA_VERSION = 20240927 +ACPICA_VERSION = 20250807 ACPICA_SOURCE = acpica-unix-$(ACPICA_VERSION).tar.gz -ACPICA_SITE = https://github.com/user-attachments/files/17171019 +ACPICA_SITE = https://github.com/user-attachments/files/21674610 ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 ACPICA_LICENSE_FILES = source/include/acpi.h ACPICA_DEPENDENCIES = host-bison host-flex diff --git a/package/acsccid/acsccid.hash b/package/acsccid/acsccid.hash index e5fe669ceb..25f894c577 100644 --- a/package/acsccid/acsccid.hash +++ b/package/acsccid/acsccid.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.11/ -sha1 75d3d17fb9d9ee7d0b291b460e2c6eb3c71654c5 acsccid-1.1.11.tar.bz2 -md5 0bbbce89a934861b7c5b003da962f1d9 acsccid-1.1.11.tar.bz2 +# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.12/ +sha1 6d9aa64b195e1b4d72a9b032f8ee70ad0798802d acsccid-1.1.12.tar.bz2 +md5 34bf40daedd3428c07f9937d4ec43129 acsccid-1.1.12.tar.bz2 # Locally computed -sha256 2fcda6ed1f5d2f07e202b51f9a600a61c83e1a73a96f51ed0f9e4f781c9c1282 acsccid-1.1.11.tar.bz2 +sha256 28f6075a5494a568ce2fd8666c489f6f4a51599b44fbc9390e1ddb48d3ccc5bd acsccid-1.1.12.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/acsccid/acsccid.mk b/package/acsccid/acsccid.mk index 93cca8e09d..3be1379552 100644 --- a/package/acsccid/acsccid.mk +++ b/package/acsccid/acsccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACSCCID_VERSION = 1.1.11 +ACSCCID_VERSION = 1.1.12 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid ACSCCID_LICENSE = LGPL-2.1+ diff --git a/package/adwaita-icon-theme/Config.in b/package/adwaita-icon-theme/Config.in index 71b839d996..0eb856ad9e 100644 --- a/package/adwaita-icon-theme/Config.in +++ b/package/adwaita-icon-theme/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_ADWAITA_ICON_THEME bool "adwaita icon theme" - depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3 + depends on BR2_PACKAGE_LIBGTK3 # host-libgtk3 -> host-librsvg -> host-pango -> host-harfbuzz depends on BR2_HOST_GCC_AT_LEAST_4_9 help diff --git a/package/aespipe/aespipe.hash b/package/aespipe/aespipe.hash index cb60e7dc1e..f9a45b6e0c 100644 --- a/package/aespipe/aespipe.hash +++ b/package/aespipe/aespipe.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/loop-aes/files/aespipe/v2.4g/ -sha1 f1148f4aa82979755b13130b74643b449de55f6e aespipe-v2.4h.tar.bz2 -md5 6c4552f10771eda471c964b34b1fae4a aespipe-v2.4h.tar.bz2 +# From https://sourceforge.net/projects/loop-aes/files/aespipe/v2.4j/ +sha1 ba4d7cbaa0adbe924fa8d006d7f4e69c63f567a2 aespipe-v2.4j.tar.bz2 +md5 d0feebaa55a4a3aa5815492b8f096b09 aespipe-v2.4j.tar.bz2 # Locally computed: -sha256 eab311fc26ea43289bc3adf660d6270492494960725d2026ec4917294a1aba49 aespipe-v2.4h.tar.bz2 +sha256 448fe1e58612c184951645ddd926fc5bdb64fc4f2f828c766c82aa1127e9a3e2 aespipe-v2.4j.tar.bz2 diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk index 054849a147..d23acbfc0a 100644 --- a/package/aespipe/aespipe.mk +++ b/package/aespipe/aespipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -AESPIPE_VERSION = 2.4h +AESPIPE_VERSION = 2.4j AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 7c94f4b1b0..6bde308027 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3287218cf6eaa3744b3788afd1e7d72e7a9508d45741243178404f6b47edd86f agent++-4.6.1.tar.gz +sha256 10542169c3cea8cb547a0b7a678d631eda6d0b4b0381dc84df4cf5d26905db13 agent++-4.7.2.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 3756d0ca28..fdd3d60859 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.6.1 +AGENTPP_VERSION = 4.7.2 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 6df03afe0e..304f947f83 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -65,6 +65,7 @@ config BR2_PACKAGE_ALSA_LIB_HWDEP config BR2_PACKAGE_ALSA_LIB_SEQ bool "seq" default y + select BR2_PACKAGE_ALSA_LIB_RAWMIDI config BR2_PACKAGE_ALSA_LIB_UCM bool "ucm" @@ -72,11 +73,6 @@ config BR2_PACKAGE_ALSA_LIB_UCM depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ALSA_LIB_MIXER -config BR2_PACKAGE_ALSA_LIB_ALISP - bool "alisp" - default y - depends on BR2_USE_MMU - config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS bool "old-symbols" default y diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 9c993c05ae..26d54b6e1b 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4868cd908627279da5a634f468701625be8cc251d84262c7e5b6a218391ad0d2 alsa-lib-1.2.12.tar.bz2 +sha256 be9c88a0b3604367dd74167a2b754a35e142f670292ae47a2fdef27a2ee97a32 alsa-lib-1.2.14.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 1dc25ea4a8..34c1688e98 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.12 +ALSA_LIB_VERSION = 1.2.14 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) @@ -52,9 +52,6 @@ endif ifneq ($(BR2_PACKAGE_ALSA_LIB_UCM),y) ALSA_LIB_CONF_OPTS += --disable-ucm endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y) -ALSA_LIB_CONF_OPTS += --disable-alisp -endif ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y) ALSA_LIB_CONF_OPTS += --disable-old-symbols endif diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index bff223f942..fd03588294 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98bc6677d0c0074006679051822324a0ab0879aea558a8f68b511780d30cd924 alsa-utils-1.2.12.tar.bz2 +sha256 0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741 alsa-utils-1.2.14.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index e77e36fc55..64da2201bf 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,13 +4,11 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.12 +ALSA_UTILS_VERSION = 1.2.14 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 ALSA_UTILS_LICENSE_FILES = COPYING -# 0011-configure.ac-fix-UMP-support-detection.patch -ALSA_UTILS_AUTORECONF = YES ALSA_UTILS_INSTALL_STAGING = YES ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \ $(if $(BR2_PACKAGE_NCURSES),ncurses) \ diff --git a/package/alure/Config.in b/package/alure/Config.in index e0064accba..c831bba913 100644 --- a/package/alure/Config.in +++ b/package/alure/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_ALURE bool "alure" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # openal depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_USE_WCHAR # use wchar_t - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_OPENAL help Alure is a C++ 3D audio API. It uses OpenAL for audio @@ -50,12 +49,8 @@ config BR2_PACKAGE_ALURE_VORBIS_DECODER endif -comment "alure needs a toolchain w/ C++, gcc >= 4.9, NPTL, wchar" +comment "alure needs a toolchain w/ C++, gcc >= 9, NPTL, wchar" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR - -comment "alure needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/amazon-ecr-credential-helper/Config.in b/package/amazon-ecr-credential-helper/Config.in new file mode 100644 index 0000000000..93bfb51e4a --- /dev/null +++ b/package/amazon-ecr-credential-helper/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_AMAZON_ECR_CREDENTIAL_HELPER + bool "amazon-ecr-credential-helper" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + The Amazon ECR Docker Credential Helper is a credential + helper for the Docker daemon that makes it easier to use + Amazon Elastic Container Registry. + + https://github.com/awslabs/amazon-ecr-credential-helper diff --git a/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash new file mode 100644 index 0000000000..250ba6d4ff --- /dev/null +++ b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash @@ -0,0 +1,3 @@ +# Localy computed +sha256 4114241888385d3794ca639f40bb7805f31eb295559950dd940aeeb6b74792f8 amazon-ecr-credential-helper-v0.10.1-git4-go2.tar.gz +sha256 ce65129252f145d6dd627bc354ccc28ba07c6cd27a8d278b7dcfde3ed6976a5a LICENSE diff --git a/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk new file mode 100644 index 0000000000..5ac416912c --- /dev/null +++ b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# amazon-ecr-credential-helper +# +################################################################################ + +AMAZON_ECR_CREDENTIAL_HELPER_VERSION = v0.10.1 +AMAZON_ECR_CREDENTIAL_HELPER_SITE = https://github.com/awslabs/amazon-ecr-credential-helper +AMAZON_ECR_CREDENTIAL_HELPER_SITE_METHOD = git + +AMAZON_ECR_CREDENTIAL_HELPER_LICENSE = Apache-2.0 +AMAZON_ECR_CREDENTIAL_HELPER_LICENSE_FILES = LICENSE + +AMAZON_ECR_CREDENTIAL_HELPER_SUBDIR = ecr-login + +AMAZON_ECR_CREDENTIAL_HELPER_GOMOD = ./cli +AMAZON_ECR_CREDENTIAL_HELPER_BUILD_TARGETS = docker-credential-ecr-login + +$(eval $(golang-package)) diff --git a/package/android-tools/0017-extras-ext4_utils-contents.c-allocate_inode-doesn-t-.patch b/package/android-tools/0017-extras-ext4_utils-contents.c-allocate_inode-doesn-t-.patch new file mode 100644 index 0000000000..a9baf4dc29 --- /dev/null +++ b/package/android-tools/0017-extras-ext4_utils-contents.c-allocate_inode-doesn-t-.patch @@ -0,0 +1,57 @@ +From b822c8e2f380ba6158601e621a12927a4264ff67 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 16 May 2025 15:32:00 +0200 +Subject: [PATCH] extras/ext4_utils/contents.c: allocate_inode() doesn't take + any argument +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + +/home/thomas/projets/buildroot/output/build/host-android-tools-4.2.2+git20130218/extras/ext4_utils/contents.c: In function ‘make_directory’: +/home/thomas/projets/buildroot/output/build/host-android-tools-4.2.2+git20130218/extras/ext4_utils/contents.c:102:29: error: too many arguments to function ‘allocate_inode’; expected 0, have 1 + 102 | inode_num = allocate_inode(info); + +and similar build failures that occur with GCC 15.x. + +Upstream: N/A, we're too far from upstream +Signed-off-by: Thomas Petazzoni +--- + extras/ext4_utils/contents.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/extras/ext4_utils/contents.c b/extras/ext4_utils/contents.c +index 6300680..b0336a4 100644 +--- a/extras/ext4_utils/contents.c ++++ b/extras/ext4_utils/contents.c +@@ -99,7 +99,7 @@ u32 make_directory(u32 dir_inode_num, u32 entries, struct dentry *dentries, + len = blocks * info.block_size; + + if (dir_inode_num) { +- inode_num = allocate_inode(info); ++ inode_num = allocate_inode(); + } else { + dir_inode_num = EXT4_ROOT_INO; + inode_num = EXT4_ROOT_INO; +@@ -167,7 +167,7 @@ u32 make_file(const char *filename, u64 len) + struct ext4_inode *inode; + u32 inode_num; + +- inode_num = allocate_inode(info); ++ inode_num = allocate_inode(); + if (inode_num == EXT4_ALLOCATE_FAILED) { + error("failed to allocate inode\n"); + return EXT4_ALLOCATE_FAILED; +@@ -196,7 +196,7 @@ u32 make_link(const char *filename, const char *link) + u32 inode_num; + u32 len = strlen(link); + +- inode_num = allocate_inode(info); ++ inode_num = allocate_inode(); + if (inode_num == EXT4_ALLOCATE_FAILED) { + error("failed to allocate inode\n"); + return EXT4_ALLOCATE_FAILED; +-- +2.49.0 + diff --git a/package/angular-websocket/Config.in b/package/angular-websocket/Config.in deleted file mode 100644 index 0981bd0d52..0000000000 --- a/package/angular-websocket/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ANGULAR_WEBSOCKET - bool "angular-websocket" - help - An AngularJS WebSocket service for connecting client - applications to servers. - - https://github.com/AngularClass/angular-websocket diff --git a/package/angular-websocket/angular-websocket.hash b/package/angular-websocket/angular-websocket.hash deleted file mode 100644 index 3aa5b5e7e1..0000000000 --- a/package/angular-websocket/angular-websocket.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-2.0.0.tar.gz -sha256 3013a57f2c8df37775804b8be5b107665a2ca209607bb92c618bcc084feb00a7 LICENSE diff --git a/package/angular-websocket/angular-websocket.mk b/package/angular-websocket/angular-websocket.mk deleted file mode 100644 index d45bfdf910..0000000000 --- a/package/angular-websocket/angular-websocket.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# angular-websocket -# -################################################################################ - -ANGULAR_WEBSOCKET_VERSION = 2.0.0 -ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,v$(ANGULAR_WEBSOCKET_VERSION)) -ANGULAR_WEBSOCKET_LICENSE = MIT -ANGULAR_WEBSOCKET_LICENSE_FILES = LICENSE - -# install .min.js as .js -define ANGULAR_WEBSOCKET_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/angular-websocket.min.js \ - $(TARGET_DIR)/var/www/angular-websocket.js -endef - -$(eval $(generic-package)) diff --git a/package/angularjs/Config.in b/package/angularjs/Config.in deleted file mode 100644 index f0d2015a70..0000000000 --- a/package/angularjs/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_ANGULARJS - bool "angularjs" - help - AngularJS web application framework. - - http://angularjs.org diff --git a/package/angularjs/angularjs.hash b/package/angularjs/angularjs.hash deleted file mode 100644 index 5468174e4d..0000000000 --- a/package/angularjs/angularjs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 471b57064031da8c5fd3b1ba3f52dd1e0d2740a97ed34da2e8ab2a4cc2718280 angular-1.8.2.zip -sha256 237656fae6e39d02cd71cbcfbf91b7964eba5796aafca1bfcfff3b054ce3fed6 angular.js diff --git a/package/angularjs/angularjs.mk b/package/angularjs/angularjs.mk deleted file mode 100644 index d393c82c19..0000000000 --- a/package/angularjs/angularjs.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# angularjs -# -################################################################################ - -ANGULARJS_VERSION = 1.8.2 -ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip -ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) -ANGULARJS_LICENSE = MIT -# There's no separate license file in the archive, so use angular.js instead. -ANGULARJS_LICENSE_FILES = angular.js -ANGULARJS_CPE_ID_VENDOR = angularjs -ANGULARJS_CPE_ID_PRODUCT = angular.js - -define ANGULARJS_EXTRACT_CMDS - unzip $(ANGULARJS_DL_DIR)/$(ANGULARJS_SOURCE) -d $(@D) - mv $(@D)/angular-$(ANGULARJS_VERSION)/* $(@D) - rmdir $(@D)/angular-$(ANGULARJS_VERSION) -endef - -# install .min.js as .js -define ANGULARJS_INSTALL_TARGET_CMDS - $(foreach f,$(notdir $(wildcard $(@D)/*.min.js)), - $(INSTALL) -m 0644 -D $(@D)/$(f) \ - $(TARGET_DIR)/var/www/$(f:.min.js=.js)$(sep)) -endef - -$(eval $(generic-package)) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index b281b4beab..53fb05a5c8 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.62.tar.bz2.{sha256,sha512} -sha256 674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec httpd-2.4.62.tar.bz2 -sha512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 httpd-2.4.62.tar.bz2 +# From https://archive.apache.org/dist/httpd/httpd-2.4.66.tar.bz2.{sha256,sha512} +sha256 94d7ff2b42acbb828e870ba29e4cbad48e558a79c623ad3596e4116efcfea25a httpd-2.4.66.tar.bz2 +sha512 49031a3465d956ee3b755e65810b6c35561ddd5fac2c624a273b733c238e115b914cd7b246837e5a3090ccfded6e0b8b3059bfd1f8ce4419081c805a38d05a4b httpd-2.4.66.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 0a0a0b3de4..06f964b083 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,9 +4,9 @@ # ################################################################################ -APACHE_VERSION = 2.4.62 +APACHE_VERSION = 2.4.66 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 -APACHE_SITE = https://dlcdn.apache.org/httpd +APACHE_SITE = https://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 APACHE_LICENSE_FILES = LICENSE APACHE_CPE_ID_VENDOR = apache @@ -104,6 +104,7 @@ define APACHE_FIX_STAGING_APACHE_CONFIG $(SED) 's%"/usr/bin"%"$(STAGING_DIR)/usr/bin"%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk + $(SED) 's%^sbindir =.*%sbindir = $(STAGING_DIR)/usr/bin%' $(STAGING_DIR)/usr/build/config_vars.mk endef APACHE_POST_INSTALL_STAGING_HOOKS += APACHE_FIX_STAGING_APACHE_CONFIG diff --git a/package/apitrace/apitrace.hash b/package/apitrace/apitrace.hash index 7ccf6cfbe1..262968e0f0 100644 --- a/package/apitrace/apitrace.hash +++ b/package/apitrace/apitrace.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e57d37af39369d7ce78666acb8afb1a49ec758f683a21077ec39eb0befae4ad apitrace-10.0.tar.gz +sha256 68d0e0600e36adc49b2d8abd8eb9a91971463049509f5405b9e75e18a84afd98 apitrace-13.0-git4.tar.gz sha256 7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260 LICENSE diff --git a/package/apitrace/apitrace.mk b/package/apitrace/apitrace.mk index c47562233b..bb9c0aa6fd 100644 --- a/package/apitrace/apitrace.mk +++ b/package/apitrace/apitrace.mk @@ -4,10 +4,15 @@ # ################################################################################ -APITRACE_VERSION = 10.0 -APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION)) +APITRACE_VERSION = 13.0 +APITRACE_SITE = https://github.com/apitrace/apitrace.git +APITRACE_SITE_METHOD = git +APITRACE_GIT_SUBMODULES = YES APITRACE_LICENSE = MIT APITRACE_LICENSE_FILES = LICENSE +APITRACE_CONF_OPTS = \ + -DBUILD_TESTING=OFF \ + -DENABLE_TESTS=OFF APITRACE_DEPENDENCIES = host-python3 libpng diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 190045cd65..ef7dd81aaf 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ -# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.7 -sha256 64494bd99fa6547a9cbdb4fc6bc732451a02dd19e6eb70eab977b239632151eb apparmor-v3.1.7.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/releases/v4.1.1 +sha256 f125aae32964e4e84443fec005f37f37abd5164f30620239c42864655a1b0281 apparmor-v4.1.1.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 61e62c7515..febd1d5eb0 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -5,11 +5,11 @@ ################################################################################ # When updating the version here, please also update the libapparmor package -APPARMOR_VERSION_MAJOR = 3.1 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).7 -APPARMOR_SOURCE = apparmor-v$(LIBAPPARMOR_VERSION).tar.gz -APPARMOR_SITE = https://gitlab.com/apparmor/apparmor/-/archive/v$(LIBAPPARMOR_VERSION) -APPARMOR_DL_SUBDIR = libapparmor +APPARMOR_VERSION_MAJOR = 4.1 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).1 +APPARMOR_SOURCE = apparmor-v$(APPARMOR_VERSION).tar.gz +APPARMOR_SITE = https://gitlab.com/apparmor/apparmor/-/archive/v$(APPARMOR_VERSION) +APPARMOR_DL_SUBDIR = apparmor APPARMOR_LICENSE = GPL-2.0 APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL APPARMOR_CPE_ID_VENDOR = canonical diff --git a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch index ad250d4427..9d8fad1362 100644 --- a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch +++ b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch @@ -1,4 +1,4 @@ -From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001 +From a8fd928dfab693278205e73286e3a6b622624aeb Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Tue, 31 Dec 2019 21:26:02 +0000 Subject: [PATCH] Revert: Add the ability to cross compile APR. @@ -7,16 +7,18 @@ git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f7 [Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] Signed-off-by: Peter Seiderer +[Dario: adapt to 1.7.5] +Signed-off-by: Dario Binacchi --- CHANGES | 2 -- apr-config.in | 22 ---------------------- 2 files changed, 24 deletions(-) diff --git a/CHANGES b/CHANGES -index 71b2f0e..e751c90 100644 +index 793b0b6a46a4..4705b8476ff3 100644 --- a/CHANGES +++ b/CHANGES -@@ -56,8 +56,6 @@ Changes for APR 1.7.1 +@@ -119,8 +119,6 @@ Changes for APR 1.7.5 *) Don't try to use PROC_PTHREAD by default when cross compiling. [Yann Ylavic] @@ -26,25 +28,25 @@ index 71b2f0e..e751c90 100644 be executed at build time, use AX_PROG_CC_FOR_BUILD to build native tools/gen_test_char diff --git a/apr-config.in b/apr-config.in -index 4873fc0..84b4073 100644 +index 1203d9a0d38e..bcd4a0c10399 100644 --- a/apr-config.in +++ b/apr-config.in -@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@" - # NOTE: the following line is modified during 'make install': alter with care! - location=@APR_CONFIG_LOCATION@ +@@ -61,14 +61,6 @@ if test "$cross_compiling" != "no"; then + # Remove trailing '/' + normalized_bindir=${normalized_bindir%/} + +- # absolute path, but not installed path - we're cross compiling +- case "$normalized_command" in +- "${normalized_bindir}/"*) ;; +- "/"*) location=crosscompile; +- APR_TARGET_DIR=${normalized_command%${normalized_bindir}/apr-${APR_MAJOR_VERSION}-config}; +- ;; +- *) ;; +- esac + fi --# absolute path, but not installed path - we're cross compiling --case "$0" in -- "${bindir}/"*) ;; -- "/"*) location=crosscompile; -- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;; -- *) ;; --esac -- show_usage() - { - cat << EOF -@@ -101,8 +93,6 @@ fi +@@ -116,8 +108,6 @@ fi if test "$location" = "installed"; then LA_FILE="$libdir/lib${APR_LIBNAME}.la" @@ -53,7 +55,7 @@ index 4873fc0..84b4073 100644 else LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" fi -@@ -132,8 +122,6 @@ while test $# -gt 0; do +@@ -147,8 +137,6 @@ while test $# -gt 0; do --includedir) if test "$location" = "installed"; then flags="$includedir" @@ -62,7 +64,7 @@ index 4873fc0..84b4073 100644 elif test "$location" = "source"; then flags="$APR_SOURCE_DIR/include" else -@@ -166,8 +154,6 @@ while test $# -gt 0; do +@@ -181,8 +169,6 @@ while test $# -gt 0; do --includes) if test "$location" = "installed"; then flags="$flags -I$includedir $EXTRA_INCLUDES" @@ -71,7 +73,7 @@ index 4873fc0..84b4073 100644 elif test "$location" = "source"; then flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" else -@@ -182,8 +168,6 @@ while test $# -gt 0; do +@@ -197,8 +183,6 @@ while test $# -gt 0; do --installbuilddir) if test "$location" = "installed"; then echo "${installbuilddir}" @@ -80,7 +82,7 @@ index 4873fc0..84b4073 100644 elif test "$location" = "source"; then echo "$APR_SOURCE_DIR/build" else -@@ -200,8 +184,6 @@ while test $# -gt 0; do +@@ -215,8 +199,6 @@ while test $# -gt 0; do if test "$location" = "installed"; then ### avoid using -L if libdir is a "standard" location like /usr/lib flags="$flags -L$libdir -l${APR_LIBNAME}" @@ -89,7 +91,7 @@ index 4873fc0..84b4073 100644 else ### this surely can't work since the library is in .libs? flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" -@@ -219,8 +201,6 @@ while test $# -gt 0; do +@@ -234,8 +216,6 @@ while test $# -gt 0; do # Since the user is specifying they are linking with libtool, we # *know* that -R will be recognized by libtool. flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" @@ -98,7 +100,7 @@ index 4873fc0..84b4073 100644 else flags="$flags $LA_FILE" fi -@@ -245,8 +225,6 @@ while test $# -gt 0; do +@@ -260,8 +240,6 @@ while test $# -gt 0; do --apr-libtool) if test "$location" = "installed"; then echo "${installbuilddir}/libtool" @@ -108,5 +110,5 @@ index 4873fc0..84b4073 100644 echo "$APR_BUILD_DIR/libtool" fi -- -2.39.2 +2.43.0 diff --git a/package/apr/apr.hash b/package/apr/apr.hash index 96f43d3710..1d4ba31ab2 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 -sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.6.tar.bz2.sha256 +sha256 49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32 apr-1.7.6.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/package/apr/apr.mk b/package/apr/apr.mk index d4526a4172..1c7553a501 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.2 +APR_VERSION = 1.7.6 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 diff --git a/package/arm-gnu-toolchain/Config.in.host b/package/arm-gnu-toolchain/Config.in.host new file mode 100644 index 0000000000..de8ff8c005 --- /dev/null +++ b/package/arm-gnu-toolchain/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS + bool + default y if BR2_HOSTARCH = "aarch64" + default y if BR2_HOSTARCH = "x86_64" diff --git a/package/armadillo/Config.in b/package/armadillo/Config.in index 7aed4fd02f..7a93343d41 100644 --- a/package/armadillo/Config.in +++ b/package/armadillo/Config.in @@ -2,16 +2,18 @@ comment "armadillo needs a toolchain w/ C++" depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP -comment "armadillo needs a toolchain w/ fortran, C++" +comment "armadillo needs a toolchain w/ fortran, C++, gcc >= 4.9" depends on !BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # otherwise, see comment above depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_FORTRAN || !BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_ARMADILLO bool "armadillo" depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS || \ (BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN) depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help Armadillo: An Open Source C++ Linear Algebra Library for Fast Prototyping and Computationally Intensive Experiments. diff --git a/package/armadillo/armadillo.hash b/package/armadillo/armadillo.hash index 9b19b8c8c4..0a71218a30 100644 --- a/package/armadillo/armadillo.hash +++ b/package/armadillo/armadillo.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 armadillo-9.900.2.tar.xz.RETIRED +sha256 a5b8109da3c169802f51a14d3bd1246395c24bbca55601760b0c96a3c0b2f8fa armadillo-15.2.1.tar.xz # License files, locally calculated sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk index 81684a44f7..ee218dda34 100644 --- a/package/armadillo/armadillo.mk +++ b/package/armadillo/armadillo.mk @@ -4,14 +4,14 @@ # ################################################################################ -ARMADILLO_VERSION = 9.900.2 -ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz.RETIRED -ARMADILLO_SITE = https://sourceforge.net/projects/arma/files/retired +ARMADILLO_VERSION = 15.2.1 +ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz +ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma ARMADILLO_INSTALL_STAGING = YES ARMADILLO_LICENSE = Apache-2.0 ARMADILLO_LICENSE_FILES = LICENSE.txt -ARMADILLO_CONF_OPTS = -DDETECT_HDF5=false +ARMADILLO_CONF_OPTS = -DDETECT_HDF5=false -DBUILD_SMOKE_TEST=false # blas support may be provided by lapack (libblas.a) or openblas (libopenblas.a) ARMADILLO_CONF_OPTS += -DBLAS_FOUND=ON @@ -30,8 +30,8 @@ ARMADILLO_CONF_OPTS += -DLAPACK_FOUND=ON ARMADILLO_DEPENDENCIES += lapack endif -define ARMADILLO_EXTRACT_CMDS - $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) $($(PKG)_DL_DIR)/$(ARMADILLO_SOURCE) -endef +ifeq ($(BR2_STATIC_LIBS),y) +ARMADILLO_CONF_OPTS += -DSTATIC_LIB=ON +endif $(eval $(cmake-package)) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 79415706f9..93c081351e 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1 assimp-5.3.1.tar.gz +sha256 d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751 assimp-6.0.2.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 2765cc7171..dd61b69ca2 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.3.1 +ASSIMP_VERSION = 6.0.2 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index 71c741acfd..3db6e5375a 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -10,10 +10,11 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBILBC - select BR2_PACKAGE_LIBJWT select BR2_PACKAGE_LIBPJSIP select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_OPENSSL # bundled libjwt + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # bundled libjwt select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 61686d9fe4..26175667c3 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,9 @@ # Locally computed -sha256 a8162085b7d16f10d5cd16fc2e2cb8399dbe42bd1c321b14eec229fc0ed12570 asterisk-20.10.0.tar.gz +sha256 8a94650b6f348af1f1c9cce7ed3585d280f3a31b0d3820084a42b03712df95d5 asterisk-22.5.2.tar.gz + +# Locally computed +sha256 58bb83cec4d431f48d006e455d821668450f8cf6b6c95f090def47062fa3a60c pjproject-2.15.1.tar.bz2 +sha256 6775095bcd417d375faddc1f17cdd7706ad8aa9b9b02404990c4b0ee218ee379 libjwt-1.15.3.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index e27aa2f760..9a071fb8e0 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,15 +4,22 @@ # ################################################################################ -ASTERISK_VERSION = 20.10.0 +ASTERISK_VERSION = 22.5.2 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) +# compilation with the external pjsip produces a non-working asterisk, which +# segfaults. The reason behind this is unclear. +# https://github.com/asterisk/asterisk/issues/671 +ASTERISK_PJSIP_URL = https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/ +ASTERISK_LIBJWT_URL = https://raw.githubusercontent.com/asterisk/third-party/master/libjwt/1.15.3/ ASTERISK_SOUNDS_BASE_URL = http://downloads.asterisk.org/pub/telephony/sounds/releases ASTERISK_EXTRA_DOWNLOADS = \ $(ASTERISK_SOUNDS_BASE_URL)/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \ - $(ASTERISK_SOUNDS_BASE_URL)/asterisk-moh-opsound-wav-2.03.tar.gz + $(ASTERISK_SOUNDS_BASE_URL)/asterisk-moh-opsound-wav-2.03.tar.gz \ + $(ASTERISK_PJSIP_URL)/pjproject-2.15.1.tar.bz2 \ + $(ASTERISK_LIBJWT_URL)/libjwt-1.15.3.tar.gz ASTERISK_LICENSE = GPL-2.0, BSD-3-Clause (SHA1, resample), BSD-4-Clause (db1-ast) ASTERISK_LICENSE_FILES = \ @@ -21,8 +28,7 @@ ASTERISK_LICENSE_FILES = \ codecs/speex/speex_resampler.h \ utils/db1-ast/include/db.h -ASTERISK_CPE_ID_VENDOR = asterisk -ASTERISK_CPE_ID_PRODUCT = open_source +ASTERISK_CPE_ID_VENDOR = sangoma ASTERISK_SELINUX_MODULES = asterisk # For patches 0002 and 0003 @@ -35,7 +41,6 @@ ASTERISK_DEPENDENCIES = \ jansson \ libcurl \ libedit \ - libjwt \ libpjsip \ libxml2 \ sqlite \ @@ -76,7 +81,6 @@ ASTERISK_CONF_OPTS = \ --without-neon29 \ --without-newt \ --without-openr2 \ - --without-osptk \ --without-postgres \ --without-popt \ --without-resample \ @@ -91,13 +95,12 @@ ASTERISK_CONF_OPTS = \ --with-jansson \ --with-libcurl \ --with-ilbc \ - --with-libjwt="$(STAGING_DIR)/usr" \ + --with-libjwt-bundled \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ - --without-pjproject-bundled \ - --with-pjproject="$(STAGING_DIR)/usr" \ + --with-pjproject-bundled \ --with-sqlite3="$(STAGING_DIR)/usr" \ - --with-sounds-cache=$(ASTERISK_DL_DIR) + --with-download-cache=$(ASTERISK_DL_DIR) # avcodec are from ffmpeg. There is virtually zero chance this could # even work; asterisk is looking for ffmpeg/avcodec.h which has not @@ -135,13 +138,6 @@ else ASTERISK_CONF_OPTS += --without-gsm endif -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -ASTERISK_DEPENDENCIES += alsa-lib -ASTERISK_CONF_OPTS += --with-asound -else -ASTERISK_CONF_OPTS += --without-asound -endif - ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) ASTERISK_DEPENDENCIES += bluez5_utils ASTERISK_CONF_OPTS += --with-bluetooth @@ -290,10 +286,6 @@ ASTERISK_MAKE_OPTS += OPTIMIZE="" ASTERISK_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),y) -ASTERISK_CFLAGS += -O0 -endif - ASTERISK_CONF_OPTS += CFLAGS="$(ASTERISK_CFLAGS)" # We want to install sample configuration files, too. @@ -303,6 +295,15 @@ ASTERISK_INSTALL_TARGET_OPTS = \ LDCONFIG=true \ install samples +define ASTERISK_USERS + asterisk -1 asterisk -1 * /usr/lib/asterisk - - asterisk user +endef + +define ASTERISK_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/asterisk/asterisk.service \ + $(TARGET_DIR)/usr/lib/systemd/system/asterisk.service +endef + $(eval $(autotools-package)) #------------------------------------------------------------------------------- diff --git a/package/asterisk/asterisk.service b/package/asterisk/asterisk.service new file mode 100644 index 0000000000..802789defb --- /dev/null +++ b/package/asterisk/asterisk.service @@ -0,0 +1,23 @@ +# based on included asterisk.service, but changed +# Type to simple, comments removed +[Unit] +Description=Asterisk PBX and telephony daemon. +After=network.target + +[Service] +Type=simple +Environment=HOME=/usr/lib/asterisk +WorkingDirectory=/usr/lib/asterisk +User=asterisk +Group=asterisk +ExecStart=/usr/sbin/asterisk -mqf -C /etc/asterisk/asterisk.conf +ExecReload=/usr/sbin/asterisk -rx 'core reload' +RuntimeDirectory=asterisk +LimitCORE=infinity +Restart=always +RestartSec=4 +StandardOutput=null +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 4257ba03a7..780456dcaf 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.50/at-spi2-core-2.50.0.sha256sum -sha256 e9f5a8c8235c9dd963b2171de9120301129c677dde933955e1df618b949c4adc at-spi2-core-2.50.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.58/at-spi2-core-2.58.1.sha256sum +sha256 7f374a6a38cd70ff4b32c9d3a0310bfa804d946fed4c9e69a7d49facdcb95e9c at-spi2-core-2.58.1.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index 828280de1a..f6d2b5264f 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,8 +4,8 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.50 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_VERSION_MAJOR = 2.58 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ diff --git a/package/atf/atf.hash b/package/atf/atf.hash index 5b4bbeb8e2..6cd2323ab0 100644 --- a/package/atf/atf.hash +++ b/package/atf/atf.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505 atf-0.21.tar.gz +sha256 a64e2427d021297f25b3f2e1798f8ec4dc3061ffb01a1cd3f66cc4cee486b10f atf-0.23.tar.gz sha256 2a15172ddf6386297734c9800c899e6e8dc16c5a03931dcf95a9ab321a24cfe4 COPYING diff --git a/package/atf/atf.mk b/package/atf/atf.mk index 9630cf1a33..27c25c8b27 100644 --- a/package/atf/atf.mk +++ b/package/atf/atf.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATF_VERSION = 0.21 +ATF_VERSION = 0.23 ATF_SITE = https://github.com/jmmv/atf/releases/download/atf-$(ATF_VERSION) ATF_INSTALL_STAGING = YES ATF_LICENSE = BSD-2-Clause, BSD-3-Clause diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index 571d7e69ad..cdae340266 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_ATKMM depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + depends on !BR2_STATIC_LIBS # at-spi2-core select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC @@ -14,7 +15,8 @@ config BR2_PACKAGE_ATKMM http://www.gtkmm.org/ -comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 7, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index 08cf86b3df..4c14da7a35 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.2.sha256sum -sha256 6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079 atkmm-2.36.2.tar.xz +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.3.sha256sum +sha256 6ec264eaa0c4de0adb7202c600170bde9a7fbe4d466bfbe940eaf7faaa6c5974 atkmm-2.36.3.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index ec63d8ecbc..a5e0303b73 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -5,7 +5,7 @@ ################################################################################ ATKMM_VERSION_MAJOR = 2.36 -ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2 +ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).3 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in index e88073b87a..8dc70210fa 100644 --- a/package/atkmm2_28/Config.in +++ b/package/atkmm2_28/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_ATKMM2_28 depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + depends on !BR2_STATIC_LIBS # at-spi2-core select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM2_66 select BR2_PACKAGE_LIBSIGC2 @@ -17,7 +18,8 @@ config BR2_PACKAGE_ATKMM2_28 http://www.gtkmm.org/ -comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/atkmm2_28/atkmm2_28.hash b/package/atkmm2_28/atkmm2_28.hash index 776c9851b8..b7c106d2d0 100644 --- a/package/atkmm2_28/atkmm2_28.hash +++ b/package/atkmm2_28/atkmm2_28.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.3.sha256sum -sha256 7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969 atkmm-2.28.3.tar.xz +# From https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.4.sha256sum +sha256 0a142a8128f83c001efb8014ee463e9a766054ef84686af953135e04d28fdab3 atkmm-2.28.4.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm2_28/atkmm2_28.mk b/package/atkmm2_28/atkmm2_28.mk index b56da61ec0..47924e64b6 100644 --- a/package/atkmm2_28/atkmm2_28.mk +++ b/package/atkmm2_28/atkmm2_28.mk @@ -5,7 +5,7 @@ ################################################################################ ATKMM2_28_VERSION_MAJOR = 2.28 -ATKMM2_28_VERSION = $(ATKMM2_28_VERSION_MAJOR).3 +ATKMM2_28_VERSION = $(ATKMM2_28_VERSION_MAJOR).4 ATKMM2_28_SOURCE = atkmm-$(ATKMM2_28_VERSION).tar.xz ATKMM2_28_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM2_28_VERSION_MAJOR) ATKMM2_28_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 8774fb577d..7b4bd2e942 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20 atop-2.11.0.tar.gz +sha256 4fdbe67c5dfaf89405639e18599f4eae77978073ffa54f3c78c368ab54bd12f6 atop-2.12.1.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index f7dfed5e8d..346bd0ff57 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.11.0 +ATOP_VERSION = 2.12.1 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING diff --git a/package/aubio/0002-source_avcodec-fix-build-with-ffmpeg-8.0.patch b/package/aubio/0002-source_avcodec-fix-build-with-ffmpeg-8.0.patch new file mode 100644 index 0000000000..db5003e76b --- /dev/null +++ b/package/aubio/0002-source_avcodec-fix-build-with-ffmpeg-8.0.patch @@ -0,0 +1,37 @@ +From d79fa30d780eca95548352ce01cf9104f46aeec4 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 5 Oct 2025 11:37:52 +0200 +Subject: [PATCH] [source_avcodec] fix build with ffmpeg 8.0 + +AV_INPUT_BUFFER_MIN_SIZE was removed with upstream commit +https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=1d66a122df9fd5d8400b05c74462d0082990fc01 + +A similar fix is used by Arch Linux: +https://gitlab.archlinux.org/archlinux/packaging/packages/aubio/-/commit/bdf858e4291aa170a23c470ac1caf2c827bfd01d + +Upstream: https://github.com/aubio/aubio/pull/427 + +Signed-off-by: Bernd Kuhls +--- + src/io/source_avcodec.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index 71ea8b5f..1fb14bf5 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -67,7 +67,11 @@ + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) + #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE + #else ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 40, 100) + #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++#else ++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE 16384 ++#endif + #endif + + #if LIBAVCODEC_VERSION_MAJOR >= 59 +-- +2.47.3 + diff --git a/package/audit/Config.in b/package/audit/Config.in index 6e5761533f..e9bdf346da 100644 --- a/package/audit/Config.in +++ b/package/audit/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_AUDIT Note: The z/OS remote plugin is disabled in this package - http://people.redhat.com/sgrubb/audit/ + https://people.redhat.com/sgrubb/audit/ comment "audit needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/audit/S02auditd b/package/audit/S02auditd index dd3dc22d6d..a660ca921a 100644 --- a/package/audit/S02auditd +++ b/package/audit/S02auditd @@ -8,52 +8,74 @@ # will be sent to syslog. # -NAME=auditd -DAEMON=/usr/sbin/${NAME} -CONFIG=/etc/audit/auditd.conf -PIDFILE=/var/run/${NAME}.pid +DAEMON="auditd" +PIDFILE="/var/run/${DAEMON}.pid" start(){ - printf "Starting ${NAME}: " + printf "Starting %s: " "${DAEMON}" # Create dir to store log files in if one doesn't exist. Create # the directory with SELinux permissions if possible - command -v selabel_lookup >/dev/null 2>&1 - if [ $? = 0 ]; then - mkdir -p /var/log/audit -Z `selabel_lookup -b file -k /var/log/audit | cut -d ' ' -f 3` + if command -v selabel_lookup >/dev/null 2>&1; then + audit_log_selable="$(selabel_lookup -b file -k /var/log/audit | cut -d ' ' -f 3)" + mkdir -p --context="${audit_log_selable}" /var/log/audit else mkdir -p /var/log/audit fi - # Run audit daemon executable - start-stop-daemon -S -q -p ${PIDFILE} --exec ${DAEMON} - - if [ $? = 0 ]; then + start-stop-daemon --start --pidfile "${PIDFILE}" \ + --exec "/usr/sbin/${DAEMON}" + status=$? + if [ "${status}" -eq 0 ]; then # Load the default rules - test -f /etc/audit/rules.d/audit.rules && /usr/sbin/auditctl -R /etc/audit/rules.d/audit.rules >/dev/null + test -f /etc/audit/audit.rules && /usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null echo "OK" else echo "FAIL" fi + return "${status}" } stop(){ - printf "Stopping ${NAME}: " - - start-stop-daemon -K -q -p ${PIDFILE} - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf "Stopping %s: " "${DAEMON}" + start-stop-daemon --stop --pidfile "${PIDFILE}" --exec "/usr/sbin/${DAEMON}" + status=$? + if [ "${status}" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + return "${status}" + fi + while start-stop-daemon --stop --test --quiet --pidfile "${PIDFILE}" \ + --exec "/sbin/${DAEMON}"; do + sleep 0.1 + done + rm -f "${PIDFILE}" + return "${status}" } reload(){ - printf "Reloading ${NAME} configuration: " - start-stop-daemon --stop -s 1 -p ${PIDFILE} 1>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf "Reloading %s configuration: " "${DAEMON}" + start-stop-daemon --stop --signal HUP --pidfile "${PIDFILE}" 1>/dev/null + status=$? + if [ "${status}" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "${status}" } rotate(){ - printf "Rotating ${NAME} logs: " - start-stop-daemon --stop -s 10 -p ${PIDFILE} 1>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf "Rotating %s logs: " "${DAEMON}" + start-stop-daemon --stop --signal SIGUSR1 --pidfile "${PIDFILE}" 1>/dev/null + status=$? + if [ "${status}" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "${status}" } case "$1" in diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 5743b3a13a..557ccd1f80 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 c0b1792d1f0a88c6f1828710509cbb987059fc68712c97669ca90eae103d287d audit-3.1.2.tar.gz +sha256 660213bac2baebabfc32be4d84a4aeb94effbd3e076b1014b78678b4502cf6ba audit-3.1.5.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index c703acc559..499cf1cee9 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,8 +4,8 @@ # ################################################################################ -AUDIT_VERSION = 3.1.2 -AUDIT_SITE = http://people.redhat.com/sgrubb/audit +AUDIT_VERSION = 3.1.5 +AUDIT_SITE = https://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB AUDIT_CPE_ID_VENDOR = linux_audit_project diff --git a/package/aufs-util/0001-remove-user-settings.patch b/package/aufs-util/0001-remove-user-settings.patch deleted file mode 100644 index 7eebc95dd4..0000000000 --- a/package/aufs-util/0001-remove-user-settings.patch +++ /dev/null @@ -1,16 +0,0 @@ -install: drop setting ownership - -Signed-off-by: "Yann E. MORIN" - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -21,7 +21,7 @@ - override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\" - override CFLAGS += -O -Wall - INSTALL ?= install --Install = ${INSTALL} -o root -g root -p -+Install = ${INSTALL} -p - ManDir = /usr/share/man - - # diff --git a/package/aufs-util/0002-no-check-ver.patch b/package/aufs-util/0002-no-check-ver.patch deleted file mode 100644 index 5fe692072f..0000000000 --- a/package/aufs-util/0002-no-check-ver.patch +++ /dev/null @@ -1,24 +0,0 @@ -Makefile: do not check version - -The aufs-util package tries to ensure that its version is compatible -with the one in the running kernel. However, this test is flawed: the -version string in the aufs4x branch for aufs-util is aufs3.x, so it does -not match the version in the kernel when it is aufs4.x. - -Disengage this check, ion the assumption the user knows what he is -doing. - -Signed-off-by: "Yann E. MORIN" - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -62,7 +62,7 @@ - $(foreach v, CPPFLAGS CFLAGS INSTALL Install ManDir LibUtilHdr, \ - $(eval MAKE += ${v}="$${${v}}")) - --all: ver_test ${Man} ${Bin} ${Etc} -+all: ${Man} ${Bin} ${Etc} - ${MAKE} -C libau $@ - ln -sf ./libau/libau*.so . - $(call MakeFHSM, $@) diff --git a/package/aufs-util/0003-no-strip-lib.patch b/package/aufs-util/0003-no-strip-lib.patch deleted file mode 100644 index 15830503b5..0000000000 --- a/package/aufs-util/0003-no-strip-lib.patch +++ /dev/null @@ -1,18 +0,0 @@ -install: do not strip libs when installing - -We want unstripped binaries in staging; stripping is done by Buildroot -as a whole in target-finalize if needed, anyway. - -Signed-off-by: "Yann E. MORIN" - -diff --git a/libau/Makefile b/libau/Makefile ---- a/libau/Makefile -+++ b/libau/Makefile -@@ -37,7 +37,6 @@ - ln -sf $< $@ - ${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor} - ln -sf $< $@ --${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s - ${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread - ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} - ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \ diff --git a/package/aufs-util/Config.in b/package/aufs-util/Config.in deleted file mode 100644 index a426343fd3..0000000000 --- a/package/aufs-util/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -comment "aufs-util needs a linux kernel and a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_AUFS_UTIL - bool "aufs-util" - depends on BR2_USE_MMU - depends on BR2_LINUX_KERNEL - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Aufs command line utilities. - - Needs a kernel with aufs support. A kernel - extension package is available. - - http://sourceforge.net/p/aufs/aufs-util/ - -if BR2_PACKAGE_AUFS_UTIL - -config BR2_PACKAGE_AUFS_UTIL_VERSION - string "aufs-util version" - default "" - help - The version you choose must match that of the aufs support - in your kernel. Usually, this is aufs3.x for 3.x kernels and - aufs4.x for 4.x kernels. - - Usually, the sha1 of the cset you want to use; avoid using a - branch name as this yields non-reproducible builds. - - See the following resources to see what versions are - available: - - https://sourceforge.net/p/aufs/aufs-util/ci/master/tree/ - -endif diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk deleted file mode 100644 index 32f3bca151..0000000000 --- a/package/aufs-util/aufs-util.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# aufs-util -# -################################################################################ - -# linux-headers -AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION)) -AUFS_UTIL_SITE = https://git.code.sf.net/p/aufs/aufs-util -AUFS_UTIL_SITE_METHOD = git -AUFS_UTIL_LICENSE = GPL-2.0 -AUFS_UTIL_LICENSE_FILES = COPYING - -AUFS_UTIL_DEPENDENCIES = linux - -# Building aufs-util requires access to the kernel headers of aufs, -# which are only available in the kernel build directory, which is why -# we add -I$(LINUX_DIR)/include/uapi. These headers have not been -# prepared for usage by userspace, so to workaround this we have to -# defined the "__user" macro as empty. -AUFS_UTIL_HOST_CPPFLAGS = \ - $(HOST_CPPFLAGS) \ - -I$(LINUX_DIR)/include/uapi \ - -D__user= - -AUFS_UTIL_CPPFLAGS = \ - $(TARGET_CPPFLAGS) \ - -I$(LINUX_DIR)/include/uapi \ - -D__user= - -# rdu64 is supposed to provide the LFS variant of readdir(), -# readdir64(). However, because Buildroot is always LFS-enabled, -# readdir() is always the LFS variant. Drop rdu64 from the build, as -# it causes build failures due to multiple implementations of -# readdir64(). -define AUFS_UTIL_REMOVE_RDU64 - $(SED) 's% rdu64.o%%' $(@D)/libau/Makefile -endef - -AUFS_UTIL_POST_PATCH_HOOKS += AUFS_UTIL_REMOVE_RDU64 - -# First, we build the host tools, needed to build the target tools. -define AUFS_UTIL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \ - HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \ - INSTALL="$(INSTALL)" c2sh c2tmac - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - CPPFLAGS="$(AUFS_UTIL_CPPFLAGS)" \ - INSTALL="$(INSTALL)" all -endef - -define AUFS_UTIL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package/aufs/Config.in b/package/aufs/Config.in deleted file mode 100644 index cc5ff365fe..0000000000 --- a/package/aufs/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -# Automatically selected by the corresponding linux extension -config BR2_PACKAGE_AUFS - bool - -if BR2_PACKAGE_AUFS - -# Both come from the selection of the linux extension. -config BR2_PACKAGE_AUFS_SERIES - int - default BR2_LINUX_KERNEL_EXT_AUFS_SERIES - -config BR2_PACKAGE_AUFS_VERSION - string - default BR2_LINUX_KERNEL_EXT_AUFS_VERSION - -endif diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk deleted file mode 100644 index d00e7a1a21..0000000000 --- a/package/aufs/aufs.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# aufs -# -################################################################################ - -AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION)) -AUFS_LICENSE = GPL-2.0 -AUFS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_AUFS_SERIES),3) -AUFS_SITE = https://git.code.sf.net/p/aufs/aufs3-standalone -AUFS_SITE_METHOD = git -else ifeq ($(BR2_PACKAGE_AUFS_SERIES),4) -AUFS_SITE = $(call github,sfjro,aufs4-standalone,$(AUFS_VERSION)) -else ifeq ($(BR2_PACKAGE_AUFS_SERIES),5) -AUFS_SITE = $(call github,sfjro,aufs5-standalone,$(AUFS_VERSION)) -endif - -ifeq ($(BR_BUILDING):$(BR2_PACKAGE_AUFS):$(AUFS_VERSION),y:y:) -$(error No aufs version specified) -endif - -$(eval $(generic-package)) diff --git a/package/augeas/0001-CVE-2025-2588-return-_REG_ENOSYS-if-no-specific-error-was-set-yet-parse_regexp-failed.patch b/package/augeas/0001-CVE-2025-2588-return-_REG_ENOSYS-if-no-specific-error-was-set-yet-parse_regexp-failed.patch new file mode 100644 index 0000000000..0716211387 --- /dev/null +++ b/package/augeas/0001-CVE-2025-2588-return-_REG_ENOSYS-if-no-specific-error-was-set-yet-parse_regexp-failed.patch @@ -0,0 +1,77 @@ +From af2aa88ab37fc48167d8c5e43b1770a4ba2ff403 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy +Date: Sun, 30 Mar 2025 12:27:04 +0300 +Subject: [PATCH] CVE-2025-2588: return _REG_ENOSYS if no specific error was + set yet parse_regexp failed (#854) + +parse_regexp() supposed to set an error on the parser state in case of a +failure. If no specific error was set, return _REG_ENOSYS to indicate a +generic failure. + +Fixes: https://github.com/hercules-team/augeas/issues/671 +Fixes: https://github.com/hercules-team/augeas/issues/778 +Fixes: https://github.com/hercules-team/augeas/issues/852 + +Signed-off-by: Alexander Bokovoy + +Upstream: https://github.com/hercules-team/augeas/commit/af2aa88ab37fc48167d8c5e43b1770a4ba2ff403 +CVE: CVE-2025-2588 +Signed-off-by: Thomas Perale + +--- + src/fa.c | 2 ++ + src/fa.h | 3 ++- + tests/fatest.c | 6 ++++++ + 3 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/fa.c b/src/fa.c +index 66ac70784..4de5675b9 100644 +--- a/src/fa.c ++++ b/src/fa.c +@@ -3550,6 +3550,8 @@ static struct re *parse_regexp(struct re_parse *parse) { + return re; + + error: ++ if (re == NULL && parse->error == REG_NOERROR) ++ parse->error = _REG_ENOSYS; + re_unref(re); + return NULL; + } +diff --git a/src/fa.h b/src/fa.h +index 1fd754ad0..89c9b17e9 100644 +--- a/src/fa.h ++++ b/src/fa.h +@@ -81,7 +81,8 @@ extern int fa_minimization_algorithm; + * + * On success, FA points to the newly allocated automaton constructed for + * RE, and the function returns REG_NOERROR. Otherwise, FA is NULL, and the +- * return value indicates the error. ++ * return value indicates the error. Special value _REG_ENOSYS indicates ++ * fa_compile() couldn't identify the syntax issue with regexp. + * + * The FA is case sensitive. Call FA_NOCASE to switch it to + * case-insensitive. +diff --git a/tests/fatest.c b/tests/fatest.c +index 0c9ca7696..6717af8f4 100644 +--- a/tests/fatest.c ++++ b/tests/fatest.c +@@ -589,6 +589,7 @@ static void testExpandNoCase(CuTest *tc) { + const char *p1 = "aB"; + const char *p2 = "[a-cUV]"; + const char *p3 = "[^a-z]"; ++ const char *wrong_regexp = "{&.{"; + char *s; + size_t len; + int r; +@@ -607,6 +608,11 @@ static void testExpandNoCase(CuTest *tc) { + CuAssertIntEquals(tc, 0, r); + CuAssertStrEquals(tc, "[^A-Za-z]", s); + free(s); ++ ++ /* Test that fa_expand_nocase does return _REG_ENOSYS */ ++ r = fa_expand_nocase(wrong_regexp, strlen(wrong_regexp), &s, &len); ++ CuAssertIntEquals(tc, _REG_ENOSYS, r); ++ free(s); + } + + static void testNoCaseComplement(CuTest *tc) { diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk index ac4bc7d0be..e47c485147 100644 --- a/package/augeas/augeas.mk +++ b/package/augeas/augeas.mk @@ -14,6 +14,9 @@ AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2 AUGEAS_CONF_OPTS = --disable-gnulib-tests +# 0001-CVE-2025-2588-return-_REG_ENOSYS-if-no-specific-error-was-set-yet-parse_regexp-failed.patch +AUGEAS_IGNORE_CVES += CVE-2025-2588 + # Remove the test lenses which occupy about 1.4 MB on the target define AUGEAS_REMOVE_TEST_LENSES rm -rf $(TARGET_DIR)/usr/share/augeas/lenses/dist/tests diff --git a/package/autoconf/0001-dont-add-dirty-to-version.patch b/package/autoconf/0001-dont-add-dirty-to-version.patch index 8df2276865..a1a50d2838 100644 --- a/package/autoconf/0001-dont-add-dirty-to-version.patch +++ b/package/autoconf/0001-dont-add-dirty-to-version.patch @@ -1,7 +1,7 @@ autoconf: don't append -dirty to version Don't append -dirty to autoconf version number if the buildroot git tree -has uncommited changes. +has uncommitted changes. This script is meant for the autoconf developers, but it also activates if you build autoconf in a subdirectory of a git tree (E.G. like how it's diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 1992669a92..1efc05c025 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -27,12 +27,10 @@ AVAHI_CONF_ENV = \ # explicitly disable support for them, in order to avoid the following # circular dependencies: # -# avahi -> libglade -> libgtk2 -> cups -> avahi # avahi -> libgtk3 -> cups -> avahi # -# Since Gtk2 and Gtk3 in Avahi are only used for some example/demo -# programs, we decided to disable their support to solve the circular -# dependency. +# Since Gtk3 in Avahi is only used for some example/demo programs, +# we decided to disable their support to solve the circular dependency. AVAHI_CONF_OPTS = \ --disable-qt3 \ --disable-qt4 \ diff --git a/package/avrdude/0001-CMakeLists.txt-allow-disabling-Python-support.patch b/package/avrdude/0001-CMakeLists.txt-allow-disabling-Python-support.patch new file mode 100644 index 0000000000..fc6210c099 --- /dev/null +++ b/package/avrdude/0001-CMakeLists.txt-allow-disabling-Python-support.patch @@ -0,0 +1,59 @@ +From 41ee27cf1d31bbc62425aab286b7e524acc64bff Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 29 Aug 2025 22:21:50 +0200 +Subject: [PATCH] CMakeLists.txt: allow disabling Python support + +In some cases, even if Swig is found and Python3 is found, it may not +be desirable to build Python support in avrdude, so this commit adds +an ENABLE_PYTHON_SUPPORT option to be able to explicitly disable using +Python support (unfortunately CMake doesn't allow passing arguments +that would prevent it from finding Swig/Python 3 if available). + +To preserve existing behavior, this option defaults to enabled (ON). + +Upstream: https://github.com/avrdudes/avrdude/pull/2051 +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f3fce92..94263bab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,7 @@ option(USE_EXTERNAL_LIBS "Use external libraries from AVRDUDE GitHub repositorie + option(USE_LIBUSBWIN32 "Prefer libusb-win32 over libusb" OFF) + option(DEBUG_CMAKE "Enable debugging output for this CMake project" OFF) + option(BUILD_SHARED_LIBS "Build shared libraries" OFF) ++option(ENABLE_PYTHON_SUPPORT "Enable Python support" ON) + + if(WIN32) + # Prefer static libraries over DLLs on Windows +@@ -281,14 +282,16 @@ if(HAVE_LINUXGPIO) + endif() + + # ------------------------------------- +-# Find SWIG +-find_package(SWIG 4.0 COMPONENTS python) +-if(SWIG_FOUND) +- find_package(Python3 COMPONENTS Interpreter Development) +- if(PYTHON3_FOUND) +- set(HAVE_SWIG 1) +- else() +- message(STATUS "Found SWIG but no Python3 header/library; cannot use SWIG") ++# Find SWIG/Python3 if needed ++if(ENABLE_PYTHON_SUPPORT) ++ find_package(SWIG 4.0 COMPONENTS python) ++ if(SWIG_FOUND) ++ find_package(Python3 COMPONENTS Interpreter Development) ++ if(PYTHON3_FOUND) ++ set(HAVE_SWIG 1) ++ else() ++ message(STATUS "Found SWIG but no Python3 header/library; cannot use SWIG") ++ endif() + endif() + endif() + +-- +2.50.1 + diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash index cb34e6b6f9..995dad3782 100644 --- a/package/avrdude/avrdude.hash +++ b/package/avrdude/avrdude.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 beb4e0b0a07f8d47e550329ab93c345d5252350de6f833afde51b4d8bd934674 avrdude-7.2.tar.gz -sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 COPYING +sha256 2d3016edd5281ea09627c20b865e605d4f5354fe98f269ce20522a5b910ab399 avrdude-8.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 89637d4ca6..8f451a7fdb 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -4,12 +4,12 @@ # ################################################################################ -AVRDUDE_VERSION = 7.2 +AVRDUDE_VERSION = 8.1 AVRDUDE_SITE = $(call github,avrdudes,avrdude,v$(AVRDUDE_VERSION)) AVRDUDE_LICENSE = GPL-2.0+ AVRDUDE_LICENSE_FILES = COPYING -AVRDUDE_CONF_OPTS = -DHAVE_LINUXGPIO=ON +AVRDUDE_CONF_OPTS = -DHAVE_LINUXGPIO=ON -DENABLE_PYTHON_SUPPORT=NO AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison @@ -29,12 +29,4 @@ ifeq ($(BR2_PACKAGE_HIDAPI),y) AVRDUDE_DEPENDENCIES += hidapi endif -# if /etc/avrdude.conf exists, the installation process creates a -# backup file, which we do not want in the context of Buildroot. -define AVRDUDE_REMOVE_BACKUP_FILE - $(RM) -f $(TARGET_DIR)/etc/avrdude.conf.bak -endef - -AVRDUDE_POST_INSTALL_TARGET_HOOKS += AVRDUDE_REMOVE_BACKUP_FILE - $(eval $(cmake-package)) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index fdc1acc624..d1170f7e4c 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 73bf42846089152d298d4a3810df274820aa84013943676eb71a7d4131a4a769 azure-iot-sdk-c-LTS_08_2023-git4.tar.gz +sha256 28d4d79239fb278932cc1cb7118733e2c923a1ac95e91d541a1259e9c8a5beb9 azure-iot-sdk-c-LTS_03_2025-git4.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 4d0ecb077f..ecbd49b4ba 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_08_2023 +AZURE_IOT_SDK_C_VERSION = LTS_03_2025 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES diff --git a/package/b43-firmware/b43-firmware.mk b/package/b43-firmware/b43-firmware.mk index 8e9e877692..d4ab8c9b24 100644 --- a/package/b43-firmware/b43-firmware.mk +++ b/package/b43-firmware/b43-firmware.mk @@ -4,14 +4,14 @@ # ################################################################################ +B43_FIRMWARE_SITE = http://mirror2.openwrt.org/sources + ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2),y) B43_FIRMWARE_VERSION = 5.100.138 -B43_FIRMWARE_SITE = http://www.lwfinger.com/b43-firmware B43_FIRMWARE_SOURCE = broadcom-wl-$(B43_FIRMWARE_VERSION).tar.bz2 B43_FIRMWARE_DRIVER_FILE = linux/wl_apsta.o else ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2),y) B43_FIRMWARE_VERSION = 5.10.56.27.3 -B43_FIRMWARE_SITE = http://mirror2.openwrt.org/sources B43_FIRMWARE_SOURCE = broadcom-wl-$(B43_FIRMWARE_VERSION)_mipsel.tar.bz2 B43_FIRMWARE_DRIVER_FILE = driver/wl_apsta/wl_prebuilt.o endif diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in index e2a6f1acb1..b0485ef957 100644 --- a/package/bandwidthd/Config.in +++ b/package/bandwidthd/Config.in @@ -34,8 +34,11 @@ if BR2_PACKAGE_BANDWIDTHD config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL bool "enable postgresql log target support" - depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # postgresql depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help diff --git a/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch b/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch index d330de5cd4..378ff0dfd3 100644 --- a/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch +++ b/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch @@ -22,7 +22,7 @@ diff --git a/parse.y b/parse.y index 1d12e639..8f1355c6 100644 --- a/parse.y +++ b/parse.y -@@ -2625,6 +2625,7 @@ next_alias_char: +@@ -2640,6 +2640,7 @@ next_alias_char: parser_state |= PST_ENDALIAS; /* We need to do this to make sure last_shell_getc_is_singlebyte returns true, since we are returning a single-byte space. */ @@ -30,7 +30,7 @@ index 1d12e639..8f1355c6 100644 if (shell_input_line_index == shell_input_line_len && last_shell_getc_is_singlebyte == 0) { #if 0 -@@ -2638,6 +2639,7 @@ next_alias_char: +@@ -2653,6 +2654,7 @@ next_alias_char: shell_input_line_property[shell_input_line_index - 1] = 1; #endif } @@ -42,7 +42,7 @@ diff --git a/y.tab.c b/y.tab.c index 50c5845b..799f730f 100644 --- a/y.tab.c +++ b/y.tab.c -@@ -4936,6 +4936,7 @@ next_alias_char: +@@ -4955,6 +4955,7 @@ next_alias_char: parser_state |= PST_ENDALIAS; /* We need to do this to make sure last_shell_getc_is_singlebyte returns true, since we are returning a single-byte space. */ @@ -50,7 +50,7 @@ index 50c5845b..799f730f 100644 if (shell_input_line_index == shell_input_line_len && last_shell_getc_is_singlebyte == 0) { #if 0 -@@ -4949,6 +4950,7 @@ next_alias_char: +@@ -4968,6 +4969,7 @@ next_alias_char: shell_input_line_property[shell_input_line_index - 1] = 1; #endif } diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch deleted file mode 100644 index c412dcfce2..0000000000 --- a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 754e0d1edc1c01b18f4890de7c58f7610e589d76 Mon Sep 17 00:00:00 2001 -From: Vincent Fazio -Date: Tue, 7 Feb 2023 03:55:28 -0600 -Subject: [PATCH] configure: invert condition for strtoimax builtin - -Previously, bash would attempt to build a replacement for strtoimax if -it found that the C library had the function already declared. - -This caused build errors when linking against static libraries that did -not define the function as a weak alias but, in reality, was a logic -error since bash should only provide it's own implementation if one is -not provided by the C library. - -Now, fix this by inverting the logic. - -Upstream: - https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=43e861c2cd840946a81dfd0386966eb4f3a17ce9 - -Signed-off-by: Vincent Fazio -[yann.morin.1998@free.fr: patch configure after the m file] -Signed-off-by: Yann E. MORIN ---- - configure | 6 +++++- - m4/strtoimax.m4 | 5 ++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 -index 30985723..fa43ac7b 100644 ---- a/m4/strtoimax.m4 -+++ b/m4/strtoimax.m4 -@@ -29,7 +29,10 @@ AC_CACHE_VAL(bash_cv_func_strtoimax, - fi - ]) - AC_MSG_RESULT($bash_cv_func_strtoimax) --if test $bash_cv_func_strtoimax = yes; then -+if test "$ac_cv_have_decl_strtoimax" = "yes" ; then -+AC_DEFINE([HAVE_DECL_STRTOIMAX], [1]) -+fi -+if test $bash_cv_func_strtoimax = no; then - AC_LIBOBJ(strtoimax) - fi - ]) -diff --git a/configure b/configure -index 47313753..6039cee7 100755 ---- a/configure -+++ b/configure -@@ -20443,7 +20443,11 @@ fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bash_cv_func_strtoimax" >&5 - printf "%s\n" "$bash_cv_func_strtoimax" >&6; } --if test $bash_cv_func_strtoimax = yes; then -+if test "$ac_cv_have_decl_strtoimax" = "yes" ; then -+printf "%s\n" "#define HAVE_DECL_STRTOIMAX 1" >>confdefs.h -+ -+fi -+if test $bash_cv_func_strtoimax = no; then - case " $LIBOBJS " in - *" strtoimax.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtoimax.$ac_objext" --- -2.25.1 - diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 44c1c5ed50..c2fb1d38d4 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz.sig -sha256 c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 bash-5.2.21.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.37.tar.gz.sig +sha256 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff bash-5.2.37.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9d173a5c7c..7fb43c52c0 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.2.21 +BASH_VERSION = 5.2.37 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ @@ -17,7 +17,7 @@ BASH_CONF_OPTS = \ --with-installed-readline \ --without-bash-malloc -BASH_CONF_ENV += \ +BASH_CONF_ENV = \ ac_cv_rl_prefix="$(STAGING_DIR)" \ ac_cv_rl_version="$(READLINE_VERSION)" \ bash_cv_getcwd_malloc=yes \ @@ -26,6 +26,15 @@ BASH_CONF_ENV += \ bash_cv_func_sigsetjmp=present \ bash_cv_printf_a_format=yes +# Can be dropped when bash is bumped to 5.3 or newer. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_15),y) +BASH_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17" +endif + +ifeq ($(BR2_HOST_GCC_AT_LEAST_15),y) +BASH_CONF_ENV += CFLAGS_FOR_BUILD="$(HOST_CFLAGS) -std=gnu17" +endif + # The static build needs some trickery ifeq ($(BR2_STATIC_LIBS),y) BASH_CONF_OPTS += --enable-static-link diff --git a/package/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patch b/package/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patch new file mode 100644 index 0000000000..de6a3fc70c --- /dev/null +++ b/package/bat/0001-Replace-regex-onig-by-regex-fancy-in-minimal-applica.patch @@ -0,0 +1,47 @@ +From 9b6727df25e45222b3863dbe5f5bc58237b68ab9 Mon Sep 17 00:00:00 2001 +From: El Mehdi YOUNES +Date: Tue, 2 Sep 2025 14:02:11 +0200 +Subject: [PATCH] Replace regex-onig by regex-fancy in minimal-application + +The default "application" feature enables "minimal-application", which +in turn pulls in the "regex-onig" feature of syntect. This brings in the +onig crate (version 6.4.0) and its dependency onig_sys, which fail to +build with GCC 15 due to C23 keyword conflicts. + +It is not possible to simply update the onig crate from bat itself, +since its version is pinned indirectly by syntect. To avoid this +dependency and fix the build, replace "regex-onig" with "regex-fancy" in +"minimal-application". This makes bat use the pure-Rust fancy-regex +engine instead of Oniguruma, removing the need for onig_sys and allowing +the package to build with GCC 15. + +There is an an ongoing discussion about removing Oniguruma from bat +since Oniguruma has been declared archived: + +see https://github.com/sharkdp/bat/issues/3285 + +The Upstream project for now is refusing to use fancy-regex as default. + +Upstream: not submitted + +Signed-off-by: El Mehdi YOUNES +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 80d19321..93a07a1d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -29,7 +29,7 @@ minimal-application = [ + "clap", + "etcetera", + "paging", +- "regex-onig", ++ "regex-fancy", + "wild", + ] + git = ["git2"] # Support indicating git modifications +-- +2.43.0 + diff --git a/package/bat/bat.hash b/package/bat/bat.hash index e80301ff49..532ccd98a4 100644 --- a/package/bat/bat.hash +++ b/package/bat/bat.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 45fcdd6076dc1b45698a7b6c0f4d1f5d9ae676f3ca3b155402ad24680d5b4df6 bat-0.24.0-cargo2.tar.gz +sha256 e62f9f1b14090044db860727a3c6bcb0d5b840f866ccaea4298518eeeb807a72 bat-0.26.0-cargo4.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 dccda9eb9533f5c65624a1106536c6cfde46008d58e60b3faf154e8b9fd5b46e LICENSE-MIT diff --git a/package/bat/bat.mk b/package/bat/bat.mk index b95cdb25ac..8084e6c2c3 100644 --- a/package/bat/bat.mk +++ b/package/bat/bat.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAT_VERSION = 0.24.0 +BAT_VERSION = 0.26.0 BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) BAT_LICENSE = Apache-2.0 or MIT BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/batman-adv/Config.in b/package/batman-adv/Config.in index b1fe5b3f28..774d930794 100644 --- a/package/batman-adv/Config.in +++ b/package/batman-adv/Config.in @@ -18,14 +18,6 @@ config BR2_PACKAGE_BATMAN_ADV_DEBUG help Enables B.A.T.M.A.N. debugging. -config BR2_PACKAGE_BATMAN_ADV_NC - bool "enable network coding" - help - Enables B.A.T.M.A.N. network coding. - Note: this requires promiscuous mode on ALL nodes! - - https://www.open-mesh.org/projects/batman-adv/wiki/NetworkCoding - config BR2_PACKAGE_BATMAN_ADV_BATMAN_V bool "enable B.A.T.M.A.N. V protocol" default y diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index b4e3e44ea6..947b75cb30 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ -# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz.sha1 -sha1 de2a55d8d15b350efa6e6d3e6d29b6e3a6f4c04f batman-adv-2024.2.tar.gz +# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2025.4.tar.gz.sha1 +sha1 ec1e431bda8bd6988e25a54ab18b5ff127fabded batman-adv-2025.4.tar.gz # locally computed -sha256 7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643 batman-adv-2024.2.tar.gz +sha256 62490a8f8b58c02e819216f3e963249984645d3e460156a043b73fc53e24f86d batman-adv-2025.4.tar.gz # Hash for license files sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index 9893da7e9f..2ed090031d 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2024.2 +BATMAN_ADV_VERSION = 2025.4 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT @@ -25,8 +25,7 @@ BATMAN_ADV_MODULE_MAKE_OPTS = \ CONFIG_BATMAN_ADV_DAT=y \ CONFIG_BATMAN_ADV_MCAST=y \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(BR2_PACKAGE_BATMAN_ADV_BATMAN_V),y,n) \ - CONFIG_BATMAN_ADV_DEBUG=$(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG),y,n) \ - CONFIG_BATMAN_ADV_NC=$(if $(BR2_PACKAGE_BATMAN_ADV_NC),y,n) + CONFIG_BATMAN_ADV_DEBUG=$(if $(BR2_PACKAGE_BATMAN_ADV_DEBUG),y,n) BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv diff --git a/package/bats-assert/bats-assert.hash b/package/bats-assert/bats-assert.hash index 94c3908ab3..449bd14a26 100644 --- a/package/bats-assert/bats-assert.hash +++ b/package/bats-assert/bats-assert.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 98ca3b685f8b8993e48ec057565e6e2abcc541034ed5b0e81f191505682037fd bats-assert-2.1.0.tar.gz +sha256 7ea3b60f495a3c4fbaeb933f81050749917d7dcff00ffdd821779ed211b87cc2 bats-assert-2.2.0.tar.gz # License files sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 LICENSE diff --git a/package/bats-assert/bats-assert.mk b/package/bats-assert/bats-assert.mk index c0e37e0048..dd48f2d59b 100644 --- a/package/bats-assert/bats-assert.mk +++ b/package/bats-assert/bats-assert.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_ASSERT_VERSION = 2.1.0 +BATS_ASSERT_VERSION = 2.2.0 BATS_ASSERT_SITE = $(call github,bats-core,bats-assert,v$(BATS_ASSERT_VERSION)) BATS_ASSERT_LICENSE = CC0-1.0 BATS_ASSERT_LICENSE_FILES = LICENSE diff --git a/package/bats-core/bats-core.hash b/package/bats-core/bats-core.hash index e528f0fc10..60e52e9214 100644 --- a/package/bats-core/bats-core.hash +++ b/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5c57ed9616b78f7fd8c553b9bae3c7c9870119edd727ec17dbd1185c599f79d9 bats-core-1.11.1.tar.gz +sha256 e36b020436228262731e3319ed013d84fcd7c4bd97a1b34dee33d170e9ae6bab bats-core-1.12.0.tar.gz # License files sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/package/bats-core/bats-core.mk b/package/bats-core/bats-core.mk index 5e1c9c4bbc..53d3b5405b 100644 --- a/package/bats-core/bats-core.mk +++ b/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.11.1 +BATS_CORE_VERSION = 1.12.0 BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) BATS_CORE_LICENSE = MIT BATS_CORE_LICENSE_FILES = LICENSE.md diff --git a/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch b/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch index 7649ae8c4f..c83815f9a2 100644 --- a/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch +++ b/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch @@ -1,4 +1,4 @@ -From af96fb92052c307818eefa4b687f964f1e3f542e Mon Sep 17 00:00:00 2001 +From f9a0d6d4395d5377bd1c41bebbd2190e0971beb9 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 12 Sep 2019 15:04:35 -0500 Subject: [PATCH] notice read and write errors on input and output @@ -30,28 +30,30 @@ Signed-off-by: Bernd Kuhls [Bernd: Updated to incorporate changes by Matthias Klose on 2024-03-13 that fix Debian bug https://bugs.debian.org/1065375] +[dario: update patch for 1.08.2] +Signed-off-by: Dario Binacchi --- bc/execute.c | 10 +++++++++- bc/main.c | 3 +++ bc/sbc.y | 2 ++ bc/scan.c | 2 ++ bc/scan.l | 3 +++ - bc/util.c | 15 ++++++++++++-- - dc/dc.c | 3 +++ - dc/eval.c | 55 +++++++++++++++++++++++++++++++++++++++------------- - dc/misc.c | 1 + - dc/numeric.c | 9 +++++++++ - dc/stack.c | 11 ++++++++++- - dc/string.c | 2 ++ - h/number.h | 11 +++++++---- - lib/number.c | 24 +++++++++++++++++++++++ - 14 files changed, 129 insertions(+), 22 deletions(-) + bc/util.c | 15 +++++++++++++-- + dc/dc.c | 4 ++++ + dc/eval.c | 2 ++ + dc/misc.c | 3 +++ + dc/numeric.c | 5 +++++ + dc/stack.c | 2 ++ + dc/string.c | 3 +++ + h/number.h | 10 ++++++---- + lib/number.c | 24 ++++++++++++++++++++++++ + 14 files changed, 81 insertions(+), 7 deletions(-) diff --git a/bc/execute.c b/bc/execute.c -index 256e4b7..50eac49 100644 +index e653a9d75979..3374a38e5fb6 100644 --- a/bc/execute.c +++ b/bc/execute.c -@@ -104,6 +104,7 @@ execute (void) +@@ -105,6 +105,7 @@ execute (void) } out_char ('\n'); } @@ -59,7 +61,7 @@ index 256e4b7..50eac49 100644 } #endif -@@ -224,6 +225,7 @@ execute (void) +@@ -225,6 +226,7 @@ execute (void) } } fflush (stdout); @@ -67,7 +69,7 @@ index 256e4b7..50eac49 100644 break; case 'R' : /* Return from function */ -@@ -259,6 +261,7 @@ execute (void) +@@ -260,6 +262,7 @@ execute (void) if (inst == 'W') out_char ('\n'); store_var (4); /* Special variable "last". */ fflush (stdout); @@ -75,7 +77,7 @@ index 256e4b7..50eac49 100644 pop (); break; -@@ -342,6 +345,7 @@ execute (void) +@@ -343,6 +346,7 @@ execute (void) case 'w' : /* Write a string to the output. */ while ((ch = byte(&pc)) != '"') out_schar (ch); fflush (stdout); @@ -83,7 +85,7 @@ index 256e4b7..50eac49 100644 break; case 'x' : /* Exchange Top of Stack with the one under the tos. */ -@@ -549,7 +553,10 @@ execute (void) +@@ -550,7 +554,10 @@ execute (void) { signal (SIGINT, use_quit); if (had_sigint) @@ -95,7 +97,7 @@ index 256e4b7..50eac49 100644 } } -@@ -584,6 +591,7 @@ input_char (void) +@@ -585,6 +592,7 @@ input_char (void) out_col = 0; /* Saw a new line */ } } @@ -104,10 +106,10 @@ index 256e4b7..50eac49 100644 /* Classify and preprocess the input character. */ if (isdigit(in_ch)) diff --git a/bc/main.c b/bc/main.c -index 012075c..c96207b 100644 +index b388e17b55bf..ab662dd10fc7 100644 --- a/bc/main.c +++ b/bc/main.c -@@ -353,6 +353,9 @@ use_quit (int sig) +@@ -358,6 +358,9 @@ use_quit (int sig) errno = save; #else write (1, "\n(interrupt) Exiting bc.\n", 26); @@ -118,7 +120,7 @@ index 012075c..c96207b 100644 #endif } diff --git a/bc/sbc.y b/bc/sbc.y -index 586686b..921ab1e 100644 +index 586686b4b71f..921ab1e13144 100644 --- a/bc/sbc.y +++ b/bc/sbc.y @@ -86,7 +86,9 @@ program : /* empty */ @@ -132,10 +134,10 @@ index 586686b..921ab1e 100644 } | program input_item diff --git a/bc/scan.c b/bc/scan.c -index b237f55..8dee4e9 100644 +index e208c8e7b3ba..5ac4c80fd732 100644 --- a/bc/scan.c +++ b/bc/scan.c -@@ -791,6 +791,7 @@ bcel_input (char *buf, yy_size_t *result, int max) +@@ -776,6 +776,7 @@ bcel_input (char *buf, int *result, int max) if (bcel_len != 0) history (hist, &histev, H_ENTER, bcel_line); fflush (stdout); @@ -143,7 +145,7 @@ index b237f55..8dee4e9 100644 } if (bcel_len <= max) -@@ -863,6 +864,7 @@ rl_input (char *buf, int *result, int max) +@@ -848,6 +849,7 @@ rl_input (char *buf, int *result, int max) add_history (rl_line); rl_line[rl_len-1] = '\n'; fflush (stdout); @@ -152,10 +154,10 @@ index b237f55..8dee4e9 100644 if (rl_len <= max) diff --git a/bc/scan.l b/bc/scan.l -index eb2e2dd..79186bb 100644 +index 958538d6fed0..009f8b196a5e 100644 --- a/bc/scan.l +++ b/bc/scan.l -@@ -99,6 +99,7 @@ bcel_input (char *buf, yy_size_t *result, int max) +@@ -100,6 +100,7 @@ bcel_input (char *buf, int *result, int max) if (bcel_len != 0) history (hist, &histev, H_ENTER, bcel_line); fflush (stdout); @@ -163,7 +165,7 @@ index eb2e2dd..79186bb 100644 } if (bcel_len <= max) -@@ -171,6 +172,7 @@ rl_input (char *buf, int *result, int max) +@@ -172,6 +173,7 @@ rl_input (char *buf, int *result, int max) add_history (rl_line); rl_line[rl_len-1] = '\n'; fflush (stdout); @@ -171,7 +173,7 @@ index eb2e2dd..79186bb 100644 } if (rl_len <= max) -@@ -295,6 +297,7 @@ limits return(Limits); +@@ -296,6 +298,7 @@ limits return(Limits); if (c == EOF) { fprintf (stderr,"EOF encountered in a comment.\n"); @@ -180,10 +182,10 @@ index eb2e2dd..79186bb 100644 } } diff --git a/bc/util.c b/bc/util.c -index 8eba093..cacd796 100644 +index 7abc2a0af309..ce7cc404fb0b 100644 --- a/bc/util.c +++ b/bc/util.c -@@ -247,9 +247,10 @@ init_gen (void) +@@ -248,9 +248,10 @@ init_gen (void) continue_label = 0; next_label = 1; out_count = 2; @@ -196,7 +198,7 @@ index 8eba093..cacd796 100644 init_load (); had_error = FALSE; did_gen = FALSE; -@@ -272,6 +273,7 @@ generate (const char *str) +@@ -273,6 +274,7 @@ generate (const char *str) printf ("\n"); out_count = 0; } @@ -204,7 +206,7 @@ index 8eba093..cacd796 100644 } else load_code (str); -@@ -289,6 +291,7 @@ run_code(void) +@@ -290,6 +292,7 @@ run_code(void) if (compile_only) { printf ("@r\n"); @@ -212,7 +214,7 @@ index 8eba093..cacd796 100644 out_count = 0; } else -@@ -326,6 +329,7 @@ out_char (int ch) +@@ -327,6 +330,7 @@ out_char (int ch) } putchar (ch); } @@ -220,7 +222,7 @@ index 8eba093..cacd796 100644 } /* Output routines: Write a character CH to the standard output. -@@ -355,6 +359,7 @@ out_schar (int ch) +@@ -356,6 +360,7 @@ out_schar (int ch) } putchar (ch); } @@ -228,7 +230,7 @@ index 8eba093..cacd796 100644 } -@@ -639,6 +644,7 @@ limits(void) +@@ -640,6 +645,7 @@ limits(void) #ifdef OLD_EQ_OP printf ("Old assignment operatiors are valid. (=-, =+, ...)\n"); #endif @@ -236,7 +238,7 @@ index 8eba093..cacd796 100644 } /* bc_malloc will check the return value so all other places do not -@@ -703,6 +709,7 @@ yyerror (str, va_alist) +@@ -704,6 +710,7 @@ yyerror (str, va_alist) fprintf (stderr,"%s %d: ",name,line_no); vfprintf (stderr, str, args); fprintf (stderr, "\n"); @@ -244,7 +246,7 @@ index 8eba093..cacd796 100644 had_error = TRUE; va_end (args); } -@@ -743,6 +750,7 @@ ct_warn (mesg, va_alist) +@@ -744,6 +751,7 @@ ct_warn (mesg, va_alist) fprintf (stderr,"%s %d: Error: ",name,line_no); vfprintf (stderr, mesg, args); fprintf (stderr, "\n"); @@ -252,7 +254,7 @@ index 8eba093..cacd796 100644 had_error = TRUE; } else -@@ -755,6 +763,7 @@ ct_warn (mesg, va_alist) +@@ -756,6 +764,7 @@ ct_warn (mesg, va_alist) fprintf (stderr,"%s %d: (Warning) ",name,line_no); vfprintf (stderr, mesg, args); fprintf (stderr, "\n"); @@ -260,7 +262,7 @@ index 8eba093..cacd796 100644 } va_end (args); } -@@ -789,6 +798,7 @@ rt_error (mesg, va_alist) +@@ -790,6 +799,7 @@ rt_error (mesg, va_alist) va_end (args); fprintf (stderr, "\n"); @@ -268,7 +270,7 @@ index 8eba093..cacd796 100644 runtime_error = TRUE; } -@@ -823,6 +833,7 @@ rt_warn (const char *mesg) +@@ -824,6 +834,7 @@ rt_warn (const char *mesg) va_end (args); fprintf (stderr, "\n"); @@ -277,26 +279,26 @@ index 8eba093..cacd796 100644 /* bc_exit: Make sure to reset the edit state. */ diff --git a/dc/dc.c b/dc/dc.c -index 6a2bb26..ccdb1c2 100644 +index 92a843cbdcdc..c5ea5753c91e 100644 --- a/dc/dc.c +++ b/dc/dc.c -@@ -45,6 +45,7 @@ - #include +@@ -36,6 +36,7 @@ + #endif + #include "../h/getopt.h" #include "dc.h" - #include "dc-proto.h" -+#include "number.h" ++#include "../h/number.h" - #ifndef EXIT_SUCCESS /* C89 */ - # define EXIT_SUCCESS 0 -@@ -59,6 +59,7 @@ static void - bug_report_info DC_DECLVOID() + const char *progname; /* basename of program invocation */ + unsigned int max_recursion_depth=0; +@@ -44,6 +45,7 @@ static void + bug_report_info(void) { printf("Email bug reports to: bug-dc@gnu.org .\n"); + checkferror_output(stdout); } static void -@@ -69,6 +70,7 @@ show_version DC_DECLVOID() +@@ -54,6 +56,7 @@ show_version(void) This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\ to the extent permitted by law.\n", DC_COPYRIGHT); @@ -304,243 +306,54 @@ index 6a2bb26..ccdb1c2 100644 } /* your generic usage function */ -@@ -85,6 +87,7 @@ Usage: %s [OPTION] [file ...]\n\ +@@ -71,6 +74,7 @@ Usage: %s [OPTION] [file ...]\n\ \n\ ", progname); bug_report_info(); + checkferror_output(f); } - /* returns a pointer to one past the last occurance of c in s, + /* returns a pointer to one past the last occurrence of c in s, diff --git a/dc/eval.c b/dc/eval.c -index 05a3d9e..6c54e61 100644 +index 30d0a20381d1..26e6d21256f9 100644 --- a/dc/eval.c +++ b/dc/eval.c -@@ -41,6 +41,7 @@ +@@ -33,6 +33,7 @@ + # include /* isatty */ #endif #include "dc.h" - #include "dc-proto.h" -+#include "number.h" ++#include "../h/number.h" - typedef enum {DC_FALSE, DC_TRUE} dc_boolean; - -@@ -97,12 +97,15 @@ static int input_pushback; - static int - input_fil DC_DECLVOID() - { -+ int c; - if (input_pushback != EOF){ -- int c = input_pushback; -+ c = input_pushback; - input_pushback = EOF; - return c; - } -- return getc(input_fil_fp); -+ c = getc(input_fil_fp); -+ checkferror_input(input_fil_fp); -+ return c; - } - - /* passed as an argument to dc_getnum */ -@@ -301,11 +304,13 @@ dc_func DC_DECLARG((c, peekc, negcmp)) - tmpint = dc_num2int(datum.v.number, DC_TOSS); - if (2 <= tmpint && tmpint <= DC_IBASE_MAX) - dc_ibase = tmpint; -- else -+ else { - fprintf(stderr, - "%s: input base must be a number \ - between 2 and %d (inclusive)\n", - progname, DC_IBASE_MAX); -+ checkferror_output(stderr); -+ } - } - break; - case 'k': /* set scale to value on top of stack */ -@@ -313,11 +318,12 @@ between 2 and %d (inclusive)\n", - tmpint = -1; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if ( ! (tmpint >= 0) ) -+ if ( ! (tmpint >= 0) ) { - fprintf(stderr, - "%s: scale must be a nonnegative number\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_scale = tmpint; - } - break; -@@ -341,11 +347,12 @@ between 2 and %d (inclusive)\n", - tmpint = 0; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if ( ! (tmpint > 1) ) -+ if ( ! (tmpint > 1) ) { - fprintf(stderr, - "%s: output base must be a number greater than 1\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_obase = tmpint; - } - break; -@@ -378,6 +385,7 @@ between 2 and %d (inclusive)\n", - fprintf(stderr, - "%s: square root of nonnumeric attempted\n", - progname); -+ checkferror_output(stderr); - }else if (dc_sqrt(datum.v.number, dc_scale, &tmpnum) == DC_SUCCESS){ - dc_free_num(&datum.v.number); - datum.v.number = tmpnum; -@@ -424,6 +432,7 @@ between 2 and %d (inclusive)\n", - dc_garbage("at top of stack", -1); - } - fflush(stdout); -+ checkferror_output(stdout); - break; - case 'Q': /* quit out of top-of-stack nested evals; - * pops value from stack; -@@ -440,6 +449,7 @@ between 2 and %d (inclusive)\n", - fprintf(stderr, - "%s: Q command requires a number >= 1\n", - progname); + typedef enum { + DC_OKAY, //no further intervention needed for this command +@@ -421,6 +422,7 @@ dc_nextcmd(void) + || tmpint < 2 || DC_IBASE_MAX < tmpint) { + fprintf(stderr, "%s: input base must be a number " + "between 2 and %d (inclusive)\n", progname, DC_IBASE_MAX); + checkferror_output(stderr); - } - break; - case 'R': /* pop a value off of the evaluation stack,; -@@ -483,11 +493,12 @@ between 2 and %d (inclusive)\n", - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); - if (dc_pop(&datum) == DC_SUCCESS){ -- if (tmpint < 0) -+ if (tmpint < 0) { - fprintf(stderr, - "%s: array index must be a nonnegative integer\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_array_set(peekc, tmpint, datum); - } - } -@@ -499,18 +510,21 @@ between 2 and %d (inclusive)\n", - tmpint = -1; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if (tmpint < 0) -+ if (tmpint < 0) { - fprintf(stderr, - "%s: array index must be a nonnegative integer\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_push(dc_array_get(peekc, tmpint)); - } - return DC_EATONE; - - default: /* What did that user mean? */ - fprintf(stderr, "%s: ", progname); -+ checkferror_output(stderr); - dc_show_id(stdout, c, " unimplemented\n"); -+ checkferror_output(stdout); - break; - } - return DC_OKAY; -@@ -538,6 +552,7 @@ evalstr DC_DECLARG((string)) - fprintf(stderr, - "%s: eval called with non-string argument\n", - progname); -+ checkferror_output(stderr); - return DC_OKAY; - } - interrupt_seen = 0; -@@ -635,6 +650,7 @@ evalstr DC_DECLARG((string)) - return DC_FAIL; - } - fprintf(stderr, "%s: unexpected EOS\n", progname); -+ checkferror_output(stderr); - return DC_OKAY; - } - } -@@ -692,6 +708,7 @@ dc_evalfile DC_DECLARG((fp)) - stdin_lookahead = EOF; - for (c=getc(fp); c!=EOF; c=peekc){ - peekc = getc(fp); -+ checkferror_input(stdin); - /* - * The following if() is the only place where ``stdin_lookahead'' - * might be set to other than EOF: -@@ -717,24 +734,30 @@ dc_evalfile DC_DECLARG((fp)) - signal(SIGINT, sigint_handler); - switch (dc_func(c, peekc, negcmp)){ - case DC_OKAY: -- if (stdin_lookahead != peekc && fp == stdin) -+ if (stdin_lookahead != peekc && fp == stdin) { - peekc = getc(fp); -+ checkferror_input(stdin); -+ } break; - case DC_EATONE: - peekc = getc(fp); -+ checkferror_input(fp); - break; - case DC_EVALREG: - /*commands which send us here shall guarantee that peekc!=EOF*/ - c = peekc; - peekc = getc(fp); -+ checkferror_input(fp); - stdin_lookahead = peekc; - if (dc_register_get(c, &datum) != DC_SUCCESS) - break; - dc_push(datum); - /*@fallthrough@*/ - case DC_EVALTOS: -- if (stdin_lookahead != peekc && fp == stdin) -+ if (stdin_lookahead != peekc && fp == stdin) { - peekc = getc(fp); -+ checkferror_input(stdin); -+ } - if (dc_pop(&datum) == DC_SUCCESS){ - if (datum.dc_type == DC_NUMBER){ - dc_push(datum); -@@ -744,6 +767,7 @@ dc_evalfile DC_DECLARG((fp)) - goto reset_and_exit_quit; - fprintf(stderr, "%s: Q command argument exceeded \ - string execution depth\n", progname); -+ checkferror_output(stderr); - } - }else{ - dc_garbage("at top of stack", -1); -@@ -756,8 +780,11 @@ string execution depth\n", progname); - fprintf(stderr, - "%s: Q command argument exceeded string execution depth\n", - progname); -- if (stdin_lookahead != peekc && fp == stdin) -+ checkferror_output(stderr); -+ if (stdin_lookahead != peekc && fp == stdin) { - peekc = getc(fp); -+ checkferror_input(stdin); -+ } - break; - - case DC_INT: + } + dc_discard_TOS(); diff --git a/dc/misc.c b/dc/misc.c -index cd23602..cd910b8 100644 +index e64f62aca1e9..17e337792a84 100644 --- a/dc/misc.c +++ b/dc/misc.c -@@ -47,6 +47,7 @@ - #include +@@ -31,12 +31,14 @@ + #include #include "dc.h" - #include "dc-proto.h" -+#include "number.h" + #include "../config.h" ++#include "../h/number.h" - #ifndef EXIT_FAILURE /* C89 */ - # define EXIT_FAILURE 1 -@@ -89,6 +89,7 @@ dc_show_id DC_DECLARG((fp, id, suffix)) + /* print a simple warning message */ + void + dc_warn(const char *msg) + { + fprintf(stderr, "%s: %s\n", progname, msg); ++ checkferror_output(stderr); + } + + /* print an "out of memory" diagnostic and exit program */ +@@ -71,6 +73,7 @@ dc_show_id(FILE *fp, int id, const char *suffix) fprintf(fp, "'%c' (%#o)%s", (unsigned int) id, id, suffix); else fprintf(fp, "%#o%s", (unsigned int) id, suffix); @@ -549,42 +362,10 @@ index cd23602..cd910b8 100644 diff --git a/dc/numeric.c b/dc/numeric.c -index 37759de..60cfb85 100644 +index 556c5bd6478f..887688b0d64f 100644 --- a/dc/numeric.c +++ b/dc/numeric.c -@@ -133,6 +133,7 @@ dc_div DC_DECLARG((a, b, kscale, result)) - bc_init_num(CastNumPtr(result)); - if (bc_divide(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ - fprintf(stderr, "%s: divide by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -155,6 +156,7 @@ dc_divrem DC_DECLARG((a, b, kscale, quotient, remainder)) - if (bc_divmod(CastNum(a), CastNum(b), - CastNumPtr(quotient), CastNumPtr(remainder), kscale)){ - fprintf(stderr, "%s: divide by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -173,6 +175,7 @@ dc_rem DC_DECLARG((a, b, kscale, result)) - bc_init_num(CastNumPtr(result)); - if (bc_modulo(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ - fprintf(stderr, "%s: remainder by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -225,6 +228,7 @@ dc_sqrt DC_DECLARG((value, kscale, result)) - tmp = bc_copy_num(CastNum(value)); - if (!bc_sqrt(&tmp, kscale)){ - fprintf(stderr, "%s: square root of negative number\n", progname); -+ checkferror_output(stderr); - bc_free_num(&tmp); - return DC_DOMAIN_ERROR; - } -@@ -470,6 +474,7 @@ dc_dump_num DC_DECLARG((dcvalue, discard_p)) +@@ -408,6 +408,7 @@ dc_dump_num(dc_num dcvalue) for (cur=top_of_stack; cur; cur=next) { putchar(cur->digit); @@ -592,7 +373,7 @@ index 37759de..60cfb85 100644 next = cur->link; free(cur); } -@@ -587,6 +592,8 @@ out_char (ch) +@@ -493,6 +494,8 @@ out_char (int ch) out_col = 1; } putchar(ch); @@ -601,119 +382,72 @@ index 37759de..60cfb85 100644 } } -@@ -626,6 +633,7 @@ rt_error (mesg, va_alist) - vfprintf (stderr, mesg, args); - va_end (args); - fprintf (stderr, "\n"); +@@ -516,6 +519,7 @@ rt_error(const char *mesg, ...) + vfprintf(stderr, mesg, args); + va_end(args); + fprintf(stderr, "\n"); + checkferror_output(stderr); } -@@ -659,6 +667,7 @@ rt_warn (mesg, va_alist) - vfprintf (stderr, mesg, args); - va_end (args); - fprintf (stderr, "\n"); +@@ -533,6 +537,7 @@ rt_warn(const char *mesg, ...) + vfprintf(stderr, mesg, args); + va_end(args); + fprintf(stderr, "\n"); + checkferror_output(stderr); } diff --git a/dc/stack.c b/dc/stack.c -index 49422df..174411d 100644 +index 35f8ee7cc876..36755e42a87d 100644 --- a/dc/stack.c +++ b/dc/stack.c -@@ -33,9 +33,13 @@ +@@ -28,6 +28,7 @@ + #include #include "dc.h" - #include "dc-proto.h" #include "dc-regdef.h" -+#include "number.h" ++#include "../h/number.h" /* an oft-used error message: */ --#define Empty_Stack fprintf(stderr, "%s: stack empty\n", progname) -+#define Empty_Stack do{ \ -+ fprintf(stderr, "%s: stack empty\n", progname); \ -+ checkferror_output(stderr); \ -+ }while(0) - - - /* simple linked-list implementation suffices: */ -@@ -91,6 +94,7 @@ dc_binop DC_DECLARG((op, kscale)) - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&b); -@@ -131,6 +135,7 @@ dc_binop2 DC_DECLARG((op, kscale)) - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&b); -@@ -169,6 +174,7 @@ dc_cmpop DC_DECLVOID() - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return 0; - } - (void)dc_pop(&b); -@@ -206,6 +212,7 @@ dc_triop DC_DECLARG((op, kscale)) - || dc_stack->link->value.dc_type!=DC_NUMBER - || dc_stack->link->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&c); -@@ -327,6 +334,7 @@ dc_register_get DC_DECLARG((regid, result)) - *result = dc_int2data(0); - }else if (r->value.dc_type==DC_UNINITIALIZED){ - fprintf(stderr, "%s: BUG: register ", progname); -+ checkferror_output(stderr); - dc_show_id(stderr, regid, " exists but is uninitialized?\n"); - return DC_FAIL; - }else{ -@@ -402,6 +410,7 @@ dc_register_pop DC_DECLARG((stackid, result)) + #define Empty_Stack dc_warn("stack empty") +@@ -388,6 +389,7 @@ dc_register_pop(int stackid, dc_data *result) r = dc_register[stackid]; - if (r==NULL || r->value.dc_type==DC_UNINITIALIZED){ + if (!r || r->value.dc_type==DC_UNINITIALIZED){ fprintf(stderr, "%s: stack register ", progname); + checkferror_output(stderr); dc_show_id(stderr, stackid, " is empty\n"); return DC_FAIL; } diff --git a/dc/string.c b/dc/string.c -index dee9169..389d899 100644 +index 41b578c130d2..bc8cac8248df 100644 --- a/dc/string.c +++ b/dc/string.c -@@ -45,6 +45,7 @@ - #endif +@@ -26,6 +26,7 @@ + #include + #include /* memcpy */ #include "dc.h" - #include "dc-proto.h" -+#include "number.h" ++#include "../h/number.h" /* here is the completion of the dc_string type: */ struct dc_string { -@@ -94,6 +94,7 @@ dc_out_str DC_DECLARG((value, discard_flag)) - dc_discard discard_flag DC_DECLEND +@@ -71,6 +72,7 @@ void + dc_out_str(dc_str value, dc_discard discard_flag) { fwrite(value->s_ptr, value->s_len, sizeof *value->s_ptr, stdout); -+ checkferror_output(stdout); ++ checkferror_output(stdout); if (discard_flag == DC_TOSS) dc_free_str(&value); } -@@ -169,6 +170,7 @@ dc_readstring DC_DECLARG((fp, ldelim, rdelim)) +@@ -155,6 +157,7 @@ dc_readstring(int (*input)(void), int ldelim, int rdelim, const char *augment) } *p++ = c; } -+ checkferror_input(fp); - return dc_makestring(line_buf, (size_t)(p-line_buf)); - } - ++ + if (c==EOF && p==line_buf) + return dc_makestring(NULL, 0, NULL); + return dc_makestring(line_buf, (size_t)(p-line_buf), augment); diff --git a/h/number.h b/h/number.h -index abf6332..1983ab4 100644 +index b2d9f9eae46a..f6fc880de920 100644 --- a/h/number.h +++ b/h/number.h @@ -23,10 +23,10 @@ @@ -731,19 +465,20 @@ index abf6332..1983ab4 100644 *************************************************************************/ #ifndef _NUMBER_H_ -@@ -140,4 +140,7 @@ void bc_out_num (bc_num num, int o_base, void (* out_char)(int), - int leading_zero); - +@@ -142,6 +142,8 @@ void bc_out_num (bc_num num, int o_base, void (* out_char)(int), void bc_out_long (long val, int size, int space, void (*out_char)(int)); -+ + + +void checkferror_input (FILE*); +void checkferror_output (FILE*); - #endif + + /* function prototypes for callbacks from the library which + * need to be provided by the application diff --git a/lib/number.c b/lib/number.c -index f394e92..80b33e3 100644 +index f84f4fc87336..9d4553a14b37 100644 --- a/lib/number.c +++ b/lib/number.c -@@ -1713,6 +1713,7 @@ static void +@@ -1714,6 +1714,7 @@ static void out_char (int c) { putchar(c); @@ -751,7 +486,7 @@ index f394e92..80b33e3 100644 } -@@ -1721,6 +1722,7 @@ pn (bc_num num) +@@ -1722,6 +1723,7 @@ pn (bc_num num) { bc_out_num (num, 10, out_char, 0); out_char ('\n'); @@ -759,7 +494,7 @@ index f394e92..80b33e3 100644 } -@@ -1732,6 +1734,28 @@ pv (char *name, unsigned char *num, int len) +@@ -1733,6 +1735,28 @@ pv (char *name, unsigned char *num, int len) printf ("%s=", name); for (i=0; i +Date: Mon, 14 Jul 2025 20:21:59 -0700 +Subject: [PATCH] Fix a build failure with clang21 (#5369) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The build error message: + src/cc/frontends/clang/loader.cc:400:73: error: no matching function for + call to ‘clang::TextDiagnosticPrinter::TextDiagnosticPrinter( + llvm::raw_fd_ostream&, clang::DiagnosticOptions*)’ + 400 | auto diag_client = new TextDiagnosticPrinter(llvm::errs(), &*diag_opts); + | ^ +The llvm commit + https://github.com/llvm/llvm-project/pull/139584 +caused the build failure. + +Adjust the code properly and the error is fixed. + +Upstream: https://github.com/iovisor/bcc/commit/8c5c96ad3beeed2fa827017f451a952306826974 +Signed-off-by: Julien Olivain +--- + src/cc/frontends/clang/loader.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/cc/frontends/clang/loader.cc b/src/cc/frontends/clang/loader.cc +index 07dc9d6a..6f8387aa 100644 +--- a/src/cc/frontends/clang/loader.cc ++++ b/src/cc/frontends/clang/loader.cc +@@ -396,11 +396,19 @@ int ClangLoader::do_compile( + flags_cstr_rem.end()); + + // set up the error reporting class ++#if LLVM_VERSION_MAJOR >= 21 ++ DiagnosticOptions diag_opts; ++ auto diag_client = new TextDiagnosticPrinter(llvm::errs(), diag_opts); ++ ++ IntrusiveRefCntPtr DiagID(new DiagnosticIDs()); ++ DiagnosticsEngine diags(DiagID, diag_opts, diag_client); ++#else + IntrusiveRefCntPtr diag_opts(new DiagnosticOptions()); + auto diag_client = new TextDiagnosticPrinter(llvm::errs(), &*diag_opts); + + IntrusiveRefCntPtr DiagID(new DiagnosticIDs()); + DiagnosticsEngine diags(DiagID, &*diag_opts, diag_client); ++#endif + + // set up the command line argument wrapper + +-- +2.51.1 + diff --git a/package/bcc/bcc.hash b/package/bcc/bcc.hash index 7ed164eda0..5e2c79f7b4 100644 --- a/package/bcc/bcc.hash +++ b/package/bcc/bcc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5641b1db0b9ec60a6afd67b4607c790f49e580c207638bb4ebcea2805c6f373b bcc-v0.31.0-git4.tar.gz +sha256 66c588bf5dfcd557a9f14f7e21a7b4dfdfcc4a574fd4b9897037059f046a6558 bcc-v0.35.0-git4.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE.txt diff --git a/package/bcc/bcc.mk b/package/bcc/bcc.mk index d5d72aa9c0..f113761c2f 100644 --- a/package/bcc/bcc.mk +++ b/package/bcc/bcc.mk @@ -4,7 +4,7 @@ # ################################################################################ -BCC_VERSION = v0.31.0 +BCC_VERSION = v0.35.0 BCC_SITE = https://github.com/iovisor/bcc BCC_SITE_METHOD = git BCC_GIT_SUBMODULES = YES diff --git a/package/bcg729/bcg729.hash b/package/bcg729/bcg729.hash index 2eb80a0407..75dc6a6452 100644 --- a/package/bcg729/bcg729.hash +++ b/package/bcg729/bcg729.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 68599a850535d1b182932b3f86558ac8a76d4b899a548183b062956c5fdc916d bcg729-1.1.1.tar.gz +sha256 62812779c776620f8fa005fc7c6ae14039d7b2efce66cf9af69c426393b5d062 bcg729-1.1.1-3-g8bec1e5fc072f3669e435edd137eb3da6da2eef7.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/bcg729/bcg729.mk b/package/bcg729/bcg729.mk index f89e535546..d0eeed5faa 100644 --- a/package/bcg729/bcg729.mk +++ b/package/bcg729/bcg729.mk @@ -4,7 +4,7 @@ # ################################################################################ -BCG729_VERSION = 1.1.1 +BCG729_VERSION = 1.1.1-3-g8bec1e5fc072f3669e435edd137eb3da6da2eef7 BCG729_SITE = $(call github,BelledonneCommunications,bcg729,$(BCG729_VERSION)) BCG729_LICENSE = GPL-3.0+ BCG729_LICENSE_FILES = LICENSE.txt diff --git a/package/bcm2835/bcm2835.hash b/package/bcm2835/bcm2835.hash index 802f34335b..56190986ef 100644 --- a/package/bcm2835/bcm2835.hash +++ b/package/bcm2835/bcm2835.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e67a986462618988a5a86752e36e3ebdd7c5cae66940ff7330aea243b2762525 bcm2835-1.73.tar.gz +sha256 e3ee8fd0a6b475ea71ca362fc2587fa1ac9fd03ed31c285654837731e93496fd bcm2835-1.75.tar.gz sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b COPYING diff --git a/package/bcm2835/bcm2835.mk b/package/bcm2835/bcm2835.mk index dcf21cb5f0..fa08358ac1 100644 --- a/package/bcm2835/bcm2835.mk +++ b/package/bcm2835/bcm2835.mk @@ -4,7 +4,7 @@ # ################################################################################ -BCM2835_VERSION = 1.73 +BCM2835_VERSION = 1.75 BCM2835_SITE = https://www.airspayce.com/mikem/bcm2835 BCM2835_LICENSE = GPL-3.0 BCM2835_LICENSE_FILES = COPYING diff --git a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch deleted file mode 100644 index 342042d59c..0000000000 --- a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 10 Feb 2019 17:51:05 +0100 -Subject: [PATCH] CMakeLists.txt: fix mbedtls libraries in bctoolbox.pc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -bctoolbox.pc should not contain the full libraries path, path should be -given by -L and library names by -l -So sent back the fix already suggested by Jörg Krause in -https://github.com/BelledonneCommunications/bctoolbox/pull/4 - -Signed-off-by: Jörg Krause -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://github.com/BelledonneCommunications/bctoolbox/pull/7] ---- - CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 29f3eb6..b2f26c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -101,9 +101,8 @@ else() - endif() - - if(MBEDTLS_FOUND) -- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH) -- string(REPLACE ";" " " MBEDTLS_LIBRARIES_STR "${MBEDTLS_LIBRARIES}") -- set(LIBS_PRIVATE "${LIBS_PRIVATE} ${MBEDTLS_LIBRARIES_STR}") -+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH) -+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509") - endif() - if(POLARSSL_FOUND) - get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH) diff --git a/package/bctoolbox/Config.in b/package/bctoolbox/Config.in deleted file mode 100644 index 1cf2b7e236..0000000000 --- a/package/bctoolbox/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_BCTOOLBOX - bool "bctoolbox" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Utilities library used by Belledonne Communications - softwares like belle-sip, mediastreamer2 and linphone. - - Select BR2_PACKAGE_MBEDTLS for crypto support. - - https://github.com/BelledonneCommunications/bctoolbox - -comment "bctoolbox needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "bctoolbox needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/bctoolbox/bctoolbox.hash b/package/bctoolbox/bctoolbox.hash deleted file mode 100644 index 9b1f9e821d..0000000000 --- a/package/bctoolbox/bctoolbox.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 446b60e81a79b11e8212c44e312aeb0ce46e9ecf0269a35c492ecdca3e7428c3 bctoolbox-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk deleted file mode 100644 index ac9361026f..0000000000 --- a/package/bctoolbox/bctoolbox.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# bctoolbox -# -################################################################################ - -BCTOOLBOX_VERSION = 4.4.8 -BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION)) -BCTOOLBOX_LICENSE = GPL-3.0+ -BCTOOLBOX_LICENSE_FILES = LICENSE.txt -BCTOOLBOX_INSTALL_STAGING = YES - -# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to -# shared library. -BCTOOLBOX_CONF_OPTS = \ - -DENABLE_POLARSSL=OFF \ - -DENABLE_STRICT=OFF \ - -DENABLE_TESTS_COMPONENT=OFF \ - -DENABLE_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -BCTOOLBOX_DEPENDENCIES += libiconv -BCTOOLBOX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -liconv" -endif - -ifeq ($(BR2_PACKAGE_MBEDTLS),y) -BCTOOLBOX_DEPENDENCIES += mbedtls -BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON -else -BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_LIBS),y) -BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -endif - -$(eval $(cmake-package)) diff --git a/package/bcusdk/0005-include-unistd-for-close-declaration.patch b/package/bcusdk/0005-include-unistd-for-close-declaration.patch new file mode 100644 index 0000000000..c05a68d9a3 --- /dev/null +++ b/package/bcusdk/0005-include-unistd-for-close-declaration.patch @@ -0,0 +1,70 @@ +From 7fe256a6e3b28e3ca5c163e38844c9e7c05099c1 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Tue, 12 Aug 2025 18:43:26 +0200 +Subject: [PATCH] include unistd for close declaration + +When using gcc-14 the compilation fails with the following error +message: + +``` +close.c: In function 'EIBClose': +close.c:38:3: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration] + 38 | close (con->fd); + | ^~~~~ + | pclose +openlocal.c: In function 'EIBSocketLocal': +openlocal.c:57:7: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration] + 57 | close (con->fd); + | ^~~~~ + | pclose +make[6]: *** [Makefile:611: close.lo] Error 1 +``` + +This patch include to include the declaration of close. + +Upstream: https://sourceforge.net/p/bcusdk/patches/6/ +Signed-off-by: Thomas Perale +--- + eibd/client/c/close.c | 1 + + eibd/client/c/openlocal.c | 1 + + eibd/client/c/openremote.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/eibd/client/c/close.c b/eibd/client/c/close.c +index 900fcd8..f7508bb 100644 +--- a/eibd/client/c/close.c ++++ b/eibd/client/c/close.c +@@ -24,6 +24,7 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#include + + #include "eibclient-int.h" + +diff --git a/eibd/client/c/openlocal.c b/eibd/client/c/openlocal.c +index c7fd5d7..df2e9f9 100644 +--- a/eibd/client/c/openlocal.c ++++ b/eibd/client/c/openlocal.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + #include "eibclient-int.h" + +diff --git a/eibd/client/c/openremote.c b/eibd/client/c/openremote.c +index 24d7ecd..9b2be39 100644 +--- a/eibd/client/c/openremote.c ++++ b/eibd/client/c/openremote.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "eibclient-int.h" + +-- +2.50.1 diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash index 8705c0f87b..d38b2bb1b5 100644 --- a/package/bdwgc/bdwgc.hash +++ b/package/bdwgc/bdwgc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160 gc-8.2.8.tar.gz +sha256 832cf4f7cf676b59582ed3b1bbd90a8d0e0ddbc3b11cb3b2096c5177ce39cc47 gc-8.2.10.tar.gz sha256 a9b077aeb4e9e1aaf9742119d8023ef26f52f445cdc3f60d390bf59e1647f54a README.QUICK diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index ca2fbdb1d4..0700ee7bf5 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -4,7 +4,7 @@ # ################################################################################ -BDWGC_VERSION = 8.2.8 +BDWGC_VERSION = 8.2.10 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES diff --git a/package/belle-sip/Config.in b/package/belle-sip/Config.in deleted file mode 100644 index 8e4de366e4..0000000000 --- a/package/belle-sip/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_BELLE_SIP - bool "belle-sip" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox - depends on BR2_USE_WCHAR - select BR2_PACKAGE_BCTOOLBOX - # needs crypto support in bctoolbox - select BR2_PACKAGE_MBEDTLS - help - Belle-sip is a modern library implementing SIP (RFC 3261) - transport, transaction and dialog layers. - - http://www.linphone.org/technical-corner/belle-sip - -comment "belle-sip needs a toolchain w/ threads, C++, dynamic library, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -comment "belle-sip needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/belle-sip/belle-sip.hash b/package/belle-sip/belle-sip.hash deleted file mode 100644 index 670ce0062e..0000000000 --- a/package/belle-sip/belle-sip.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 eabba615c97080572c1b9d3c76f8f9cf6a7432eedf37482672e5fa178a688f72 belle-sip-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/belle-sip/belle-sip.mk b/package/belle-sip/belle-sip.mk deleted file mode 100644 index c9bcc3f55d..0000000000 --- a/package/belle-sip/belle-sip.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# belle-sip -# -################################################################################ - -BELLE_SIP_VERSION = 4.4.8 -BELLE_SIP_SITE = \ - https://gitlab.linphone.org/BC/public/belle-sip/-/archive/$(BELLE_SIP_VERSION) -BELLE_SIP_LICENSE = GPL-3.0+ -BELLE_SIP_LICENSE_FILES = LICENSE.txt -BELLE_SIP_CPE_ID_VENDOR = linphone -BELLE_SIP_INSTALL_STAGING = YES -BELLE_SIP_DEPENDENCIES = \ - bctoolbox \ - $(if $(BR2_PACKAGE_ZLIB),zlib) -BELLE_SIP_CONF_OPTS = \ - -DENABLE_STRICT=OFF \ - -DENABLE_TESTS=OFF - -ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) -BELLE_SIP_CONF_OPTS += -DENABLE_MDNS=ON -BELLE_SIP_DEPENDENCIES += avahi -else -BELLE_SIP_CONF_OPTS += -DENABLE_MDNS=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_LIBS),y) -BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -endif - -BELLE_SIP_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y) -BELLE_SIP_CFLAGS += -O0 -endif - -BELLE_SIP_CONF_OPTS += -DCMAKE_C_FLAGS="$(BELLE_SIP_CFLAGS)" - -$(eval $(cmake-package)) diff --git a/package/belr/Config.in b/package/belr/Config.in deleted file mode 100644 index f3f742ad28..0000000000 --- a/package/belr/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_BELR - bool "belr" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # bctoolbox - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox - select BR2_PACKAGE_BCTOOLBOX - help - Belr is Belledonne Communications' language recognition - library, written in C++11. It parses text inputs formatted - according to a language defined by an ABNF grammar, such as - the protocols standardized at IETF. - - https://gitlab.linphone.org/BC/public/belr - -comment "belr needs a toolchain w/ threads, C++" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "belr needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/belr/belr.hash b/package/belr/belr.hash deleted file mode 100644 index 00c733c7df..0000000000 --- a/package/belr/belr.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 6358aa680193d972c831d677da1652c7f57d7e00649b971d4d9fbdebf4331b48 belr-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/belr/belr.mk b/package/belr/belr.mk deleted file mode 100644 index 26b949734f..0000000000 --- a/package/belr/belr.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# belr -# -################################################################################ - -BELR_VERSION = 4.4.8 -BELR_SITE = https://gitlab.linphone.org/BC/public/belr/-/archive/$(BELR_VERSION) -BELR_LICENSE = GPL-3.0+ -BELR_LICENSE_FILES = LICENSE.txt -BELR_INSTALL_STAGING = YES -BELR_DEPENDENCIES = bctoolbox -BELR_CONF_OPTS = \ - -DENABLE_STRICT=OFF \ - -DENABLE_TESTS=OFF \ - -DENABLE_TOOLS=OFF - -ifeq ($(BR2_STATIC_LIBS),y) -BELR_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else -# cannot build static and shared together -BELR_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -endif - -$(eval $(cmake-package)) diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 1c121370db..6c487400ae 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -26,6 +26,7 @@ BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \ define BERKELEYDB_CONFIGURE_CMDS (cd $(@D)/build_unix; rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ $(TARGET_CONFIGURE_ARGS) \ ../dist/configure $(QUIET) \ --target=$(GNU_TARGET_NAME) \ @@ -50,6 +51,7 @@ endef define HOST_BERKELEYDB_CONFIGURE_CMDS (cd $(@D)/build_unix; rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -std=gnu99" \ ../dist/configure $(QUIET) \ --prefix=$(HOST_DIR) \ --with-gnu-ld \ diff --git a/package/bind/bind.hash b/package/bind/bind.hash index abcbf0a938..d601e87b75 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.18.31/bind-9.18.31.tar.xz.asc -# with key 706B6C28620E76F91D11F7DF510A642A06C52CEC -sha256 51b258969275c5206ef745a5aac03dbe98f1c8031fefed378d53597e7987b1b3 bind-9.18.31.tar.xz +# Verified from https://ftp.isc.org/isc/bind9/9.18.41/bind-9.18.41.tar.xz.asc +# with key D99CCEAF879747014F038D63182E23579462EFAA +sha256 6ddc1d981511c4da0b203b0513af131e5d15e5f1c261145736fe1f35dd1fe79d bind-9.18.41.tar.xz sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 52b1e56c40..8b336ab781 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,11 +4,9 @@ # ################################################################################ -BIND_VERSION = 9.18.31 +BIND_VERSION = 9.18.41 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) -# bind does not support parallel builds. -BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT @@ -30,9 +28,7 @@ BIND_AUTORECONF = YES BIND_CONF_OPTS = \ --without-cmocka \ --without-lmdb \ - --enable-epoll \ --disable-doh \ - --disable-backtrace \ --disable-static \ --with-openssl=$(STAGING_DIR)/usr @@ -53,6 +49,13 @@ else BIND_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +BIND_CONF_OPTS += --with-jemalloc +BIND_DEPENDENCIES += jemalloc +else +BIND_CONF_OPTS += --without-jemalloc +endif + ifeq ($(BR2_PACKAGE_JSON_C),y) BIND_CONF_OPTS += --with-json-c BIND_DEPENDENCIES += json-c @@ -95,30 +98,12 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -# Used by dnssec-keymgr -ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) -BIND_DEPENDENCIES += host-python-ply -BIND_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python -else -BIND_CONF_OPTS += --with-python=no -endif - ifeq ($(BR2_PACKAGE_READLINE),y) BIND_DEPENDENCIES += readline else BIND_CONF_OPTS += --with-readline=no endif -ifeq ($(BR2_STATIC_LIBS),y) -BIND_CONF_OPTS += \ - --without-dlopen \ - --without-libtool -else -BIND_CONF_OPTS += \ - --with-dlopen \ - --with-libtool -endif - define BIND_TARGET_REMOVE_SERVER rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SERVER_SBIN)) endef diff --git a/package/binutils-bare-metal/binutils-bare-metal.hash b/package/binutils-bare-metal/binutils-bare-metal.hash deleted file mode 120000 index e0655d3af3..0000000000 --- a/package/binutils-bare-metal/binutils-bare-metal.hash +++ /dev/null @@ -1 +0,0 @@ -../binutils/binutils.hash \ No newline at end of file diff --git a/package/binutils-bare-metal/binutils-bare-metal.hash b/package/binutils-bare-metal/binutils-bare-metal.hash new file mode 100644 index 0000000000..7cf24141f7 --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.hash @@ -0,0 +1,6 @@ +# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum +sha512 c7b10a7466d9fd398d7a0b3f2a43318432668d714f2ec70069a31bdc93c86d28e0fe83792195727167743707fbae45337c0873a0786416db53bbf22860c16ce7 binutils-2.45.tar.xz + +# locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk index 97a242a6f2..f7ee96ef97 100644 --- a/package/binutils-bare-metal/binutils-bare-metal.mk +++ b/package/binutils-bare-metal/binutils-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -BINUTILS_BARE_METAL_VERSION = 2.43.1 +BINUTILS_BARE_METAL_VERSION = 2.45 BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils BINUTILS_BARE_METAL_SOURCE = binutils-$(BINUTILS_BARE_METAL_VERSION).tar.xz @@ -21,14 +21,52 @@ HOST_BINUTILS_BARE_METAL_CONF_ENV += MAKEINFO=true HOST_BINUTILS_BARE_METAL_MAKE_OPTS += MAKEINFO=true HOST_BINUTILS_BARE_METAL_INSTALL_OPTS += MAKEINFO=true install +ifeq ($(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_MULTILIB),y) +HOST_BINUTILS_BARE_METAL_MULTILIB = "--enable-multilib" +else +HOST_BINUTILS_BARE_METAL_MULTILIB = "--disable-multilib" +endif + HOST_BINUTILS_BARE_METAL_CONF_OPTS = \ - --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --prefix=$(HOST_DIR) \ + --sysconfdir=$(HOST_DIR)/etc \ + --localstatedir=$(HOST_DIR)/var \ + $(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ + $(QUIET) \ --disable-gprof \ --disable-shared \ --enable-lto \ - --enable-static \ --disable-initfini-array \ - --disable-multilib \ + $(HOST_BINUTILS_BARE_METAL_MULTILIB) \ --disable-werror +define HOST_BINUTILS_BARE_METAL_CONFIGURE_CMDS + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + mkdir -p $(@D)/build-$(arch_tuple) && \ + cd $(@D)/build-$(arch_tuple) && \ + $(HOST_CONFIGURE_OPTS) \ + $(HOST_BINUTILS_BARE_METAL_CONF_ENV) \ + CONFIG_SITE=/dev/null \ + $(@D)/configure \ + $(HOST_BINUTILS_BARE_METAL_CONF_OPTS) \ + --target=$(arch_tuple) + ) +endef + +define HOST_BINUTILS_BARE_METAL_BUILD_CMDS + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + $(HOST_MAKE_ENV) $(MAKE) \ + $(HOST_BINUTILS_BARE_METAL_MAKE_OPTS) \ + -C $(@D)/build-$(arch_tuple) + ) +endef + +define HOST_BINUTILS_BARE_METAL_INSTALL_CMDS + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + $(HOST_MAKE_ENV) $(MAKE) \ + $(HOST_BINUTILS_BARE_METAL_INSTALL_OPTS) \ + -C $(@D)/build-$(arch_tuple) + ) +endef + $(eval $(host-autotools-package)) diff --git a/package/binutils/2.42/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch b/package/binutils/2.42/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch new file mode 100644 index 0000000000..f9b870afa2 --- /dev/null +++ b/package/binutils/2.42/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch @@ -0,0 +1,90 @@ +From 8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 16 Nov 2024 05:03:52 +0000 +Subject: [PATCH] opcodes: fix -std=gnu23 compatibility wrt static_assert + +static_assert is declared in C23 so we can't reuse that identifier: +* Define our own static_assert conditionally; + +* Rename "static assert" hacks to _N as we do already in some places + to avoid a conflict. + +ChangeLog: + PR ld/32372 + + * i386-gen.c (static_assert): Define conditionally. + * mips-formats.h (MAPPED_INT): Rename identifier. + (MAPPED_REG): Rename identifier. + (OPTIONAL_MAPPED_REG): Rename identifier. + * s390-opc.c (static_assert): Define conditionally. + +Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 +Signed-off-by: Raphaël Mélotte +--- + opcodes/i386-gen.c | 2 ++ + opcodes/mips-formats.h | 6 +++--- + opcodes/s390-opc.c | 2 ++ + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c +index 053b66675c5..7ee8a30310c 100644 +--- a/opcodes/i386-gen.c ++++ b/opcodes/i386-gen.c +@@ -30,7 +30,9 @@ + + /* Build-time checks are preferrable over runtime ones. Use this construct + in preference where possible. */ ++#ifndef static_assert + #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) ++#endif + + static const char *program_name = NULL; + static int debug = 0; +diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h +index 90df7100803..c4dec6352bf 100644 +--- a/opcodes/mips-formats.h ++++ b/opcodes/mips-formats.h +@@ -49,7 +49,7 @@ + #define MAPPED_INT(SIZE, LSB, MAP, PRINT_HEX) \ + { \ + typedef char ATTRIBUTE_UNUSED \ +- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ ++ static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ + static const struct mips_mapped_int_operand op = { \ + { OP_MAPPED_INT, SIZE, LSB }, MAP, PRINT_HEX \ + }; \ +@@ -83,7 +83,7 @@ + #define MAPPED_REG(SIZE, LSB, BANK, MAP) \ + { \ + typedef char ATTRIBUTE_UNUSED \ +- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ ++ static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ + static const struct mips_reg_operand op = { \ + { OP_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ + }; \ +@@ -93,7 +93,7 @@ + #define OPTIONAL_MAPPED_REG(SIZE, LSB, BANK, MAP) \ + { \ + typedef char ATTRIBUTE_UNUSED \ +- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ ++ static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ + static const struct mips_reg_operand op = { \ + { OP_OPTIONAL_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ + }; \ +diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c +index 9d9f0973e55..49efd714157 100644 +--- a/opcodes/s390-opc.c ++++ b/opcodes/s390-opc.c +@@ -36,7 +36,9 @@ + + /* Build-time checks are preferrable over runtime ones. Use this construct + in preference where possible. */ ++#ifndef static_assert + #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) ++#endif + + #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +-- +2.34.1 + diff --git a/package/binutils/2.42/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch b/package/binutils/2.42/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch new file mode 100644 index 0000000000..2f75861434 --- /dev/null +++ b/package/binutils/2.42/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch @@ -0,0 +1,770 @@ +From 0cec0418dacd30f4215d0d778b4e5d23f6a93801 Mon Sep 17 00:00:00 2001 +From: Vladimir Mezentsev +Date: Tue, 3 Sep 2024 21:30:31 -0700 +Subject: [PATCH] Fix 32097 Warnings when building gprofng with Clang + +gprofng/ChangeLog +2024-09-03 Vladimir Mezentsev . + + PR gprofng/32097 + * common/hwcdrv.c: Fix -Wempty-body warnings. + * common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings. + * common/hwctable.c: Fix -Wdeprecated-non-prototype warnings. + * libcollector/collector.c: Likewise. + * libcollector/collector.h: Likewise. + * libcollector/collectorAPI.c: Likewise. + * libcollector/dispatcher.c: Likewise. + * libcollector/iotrace.c: Likewise. + * libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings. + * libcollector/libcol_util.h: Remove unused declarations. + * libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings. + * src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings. + * src/Dbe.cc: Fix -Wself-assign warnings. + * src/DbeSession.cc: Fix -Wunused-but-set-variable warnings. + * src/Disasm.cc: Fix -Wunused-const-variable warnings. + * src/Experiment.cc: Fix -Wunused-private-field warnings. + * src/HashMap.h: Fix -Wself-assign warnings. + * src/IOActivity.h: Fix -Wunused-private-field warnings. + * src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings. + * src/collctrl.h: Fix -Wunused-private-field warnings. + * src/collector_module.h: Fix -Wdeprecated-non-prototype warnings. + * src/gp-display-src.cc: Fix -Wunused-private-field warnings. + * src/gp-print.h: Fix -Wheader-guard warnings. + * src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings. + * src/util.cc: Fix -Wunused-but-set-variable warnings. + +Upstream: b79c457ca01df82dbe1facb708e45def4584c903 +Signed-off-by: Thomas Petazzoni +--- + gprofng/common/hwcdrv.c | 3 ++- + gprofng/common/hwcentry.h | 7 +---- + gprofng/common/hwctable.c | 13 +--------- + gprofng/libcollector/collector.c | 15 ++++------- + gprofng/libcollector/collector.h | 2 +- + gprofng/libcollector/collectorAPI.c | 15 ++++++----- + gprofng/libcollector/dispatcher.c | 19 ++++++++------ + gprofng/libcollector/iotrace.c | 12 ++++----- + gprofng/libcollector/libcol_util.c | 2 -- + gprofng/libcollector/libcol_util.h | 6 ----- + gprofng/libcollector/linetrace.c | 40 +++++++++++++++++------------ + gprofng/src/BaseMetricTreeNode.h | 1 - + gprofng/src/Dbe.cc | 12 ++++----- + gprofng/src/DbeSession.cc | 3 --- + gprofng/src/Disasm.cc | 1 - + gprofng/src/Experiment.cc | 2 -- + gprofng/src/HashMap.h | 3 +-- + gprofng/src/IOActivity.h | 1 - + gprofng/src/collctrl.cc | 14 +++++----- + gprofng/src/collector_module.h | 20 +++++++-------- + gprofng/src/gp-display-src.cc | 8 ------ + gprofng/src/gp-print.h | 2 +- + gprofng/src/util.cc | 10 +++----- + 23 files changed, 84 insertions(+), 127 deletions(-) + +diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c +index 2d549b0d6a5..fa1ad32430b 100644 +--- a/gprofng/common/hwcdrv.c ++++ b/gprofng/common/hwcdrv.c +@@ -650,6 +650,7 @@ read_sample (counter_state_t *ctr_state, int msgsz, uint64_t *rvalue, + static void + dump_perf_event_attr (struct perf_event_attr *at) + { ++#if defined(DEBUG) + TprintfT (DBG_LT2, "dump_perf_event_attr: size=%d type=%d sample_period=%lld\n" + " config=0x%llx config1=0x%llx config2=0x%llx wakeup_events=%lld __reserved_1=%lld\n", + (int) at->size, (int) at->type, (unsigned long long) at->sample_period, +@@ -665,13 +666,13 @@ dump_perf_event_attr (struct perf_event_attr *at) + DUMP_F (exclude_kernel); + DUMP_F (exclude_hv); + DUMP_F (exclude_idle); +- // DUMP_F(xmmap); + DUMP_F (comm); + DUMP_F (freq); + DUMP_F (inherit_stat); + DUMP_F (enable_on_exec); + DUMP_F (task); + DUMP_F (watermark); ++#endif + } + + static void +diff --git a/gprofng/common/hwcentry.h b/gprofng/common/hwcentry.h +index a35a363e693..7899875cf96 100644 +--- a/gprofng/common/hwcentry.h ++++ b/gprofng/common/hwcentry.h +@@ -202,17 +202,12 @@ extern "C" + extern char *hwc_get_docref (char *buf, size_t buflen); + /* Return a CPU HWC document reference, or NULL. */ + +- // TBR +- extern char *hwc_get_default_cntrs (); +- /* Return a default HW counter string; may be NULL, or zero-length */ +- /* NULL means none is defined in the table; or zero-length means string defined could not be loaded */ +- + extern char *hwc_get_default_cntrs2 (int forKernel, int style); + /* like hwc_get_default_cntrs() for style==1 */ + /* but allows other styles of formatting as well */ + /* deprecate and eventually remove hwc_get_default_cntrs() */ + +- extern char *hwc_get_orig_default_cntrs (); ++ extern char *hwc_get_orig_default_cntrs (int forKernel); + /* Get the default HW counter string as set in the table */ + /* NULL means none is defined in the table */ + +diff --git a/gprofng/common/hwctable.c b/gprofng/common/hwctable.c +index d0735132fac..fe9153190e7 100644 +--- a/gprofng/common/hwctable.c ++++ b/gprofng/common/hwctable.c +@@ -3231,7 +3231,7 @@ check_tables () + } + #endif + +-static int try_a_counter (); ++static int try_a_counter (int forKernel); + static void hwc_process_raw_ctrs (int forKernel, Hwcentry ***pstd_out, + Hwcentry ***praw_out, Hwcentry ***phidden_out, + Hwcentry**static_tables, +@@ -4321,17 +4321,6 @@ hwc_get_docref (char *buf, size_t buflen) + return buf; + } + +-//TBR: +- +-extern char* +-hwc_get_default_cntrs () +-{ +- setup_cpcx (); +- if (cpcx_default_hwcs[0] != NULL) +- return strdup (cpcx_default_hwcs[0]); // TBR deprecate this +- return NULL; +-} +- + extern char* + hwc_get_default_cntrs2 (int forKernel, int style) + { +diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c +index 39529758600..ef580dcbdd9 100644 +--- a/gprofng/libcollector/collector.c ++++ b/gprofng/libcollector/collector.c +@@ -210,15 +210,10 @@ get_collector_interface () + static void + collector_module_init (CollectorInterface *col_intf) + { +- int nmodules = 0; +- + ModuleInitFunc next_init = (ModuleInitFunc) dlsym (RTLD_DEFAULT, "__collector_module_init"); + if (next_init != NULL) +- { +- nmodules++; +- next_init (col_intf); +- } +- TprintfT (DBG_LT1, "collector_module_init: %d modules\n", nmodules); ++ next_init (col_intf); ++ TprintfT (DBG_LT1, "collector_module_init: %d modules\n", next_init ? 1 : 0); + } + + /* Routines concerned with general experiment start and stop */ +@@ -1784,7 +1779,7 @@ __collector_pause () + } + + void +-__collector_pause_m (char *reason) ++__collector_pause_m (const char *reason) + { + hrtime_t now; + char xreason[MAXPATHLEN]; +@@ -2451,8 +2446,8 @@ __collector_dlog (int tflag, int level, char *format, ...) + + static void (*__real__exit) (int status) = NULL; /* libc only: _exit */ + static void (*__real__Exit) (int status) = NULL; /* libc only: _Exit */ +-void _exit () __attribute__ ((weak, alias ("__collector_exit"))); +-void _Exit () __attribute__ ((weak, alias ("__collector_Exit"))); ++void _exit (int status) __attribute__ ((weak, alias ("__collector_exit"))); ++void _Exit (int status) __attribute__ ((weak, alias ("__collector_Exit"))); + + void + __collector_exit (int status) +diff --git a/gprofng/libcollector/collector.h b/gprofng/libcollector/collector.h +index 07a03bdd17a..eda68a0e4f5 100644 +--- a/gprofng/libcollector/collector.h ++++ b/gprofng/libcollector/collector.h +@@ -123,7 +123,7 @@ extern void __collector_terminate_expt (); + extern void __collector_terminate_hook (); + extern void __collector_sample (char *name); + extern void __collector_pause (); +-extern void __collector_pause_m (); ++extern void __collector_pause_m (const char *reason); + extern void __collector_resume (); + extern int collector_sigemt_sigaction (const struct sigaction*, + struct sigaction*); +diff --git a/gprofng/libcollector/collectorAPI.c b/gprofng/libcollector/collectorAPI.c +index 5fa6403ad49..449bbbaab65 100644 +--- a/gprofng/libcollector/collectorAPI.c ++++ b/gprofng/libcollector/collectorAPI.c +@@ -26,16 +26,17 @@ + #include "collectorAPI.h" + #include "gp-experiment.h" + +-static void *__real_collector_sample = NULL; +-static void *__real_collector_pause = NULL; +-static void *__real_collector_resume = NULL; +-static void *__real_collector_terminate_expt = NULL; +-static void *__real_collector_func_load = NULL; +-static void *__real_collector_func_unload = NULL; ++static void (*__real_collector_sample)(const char *) = NULL; ++static void (*__real_collector_pause)() = NULL; ++static void (*__real_collector_resume)() = NULL; ++static void (*__real_collector_terminate_expt)() = NULL; ++static void (*__real_collector_func_load)(const char *, const char *, ++ const char *, void *, int, int, Lineno *) = NULL; ++static void (*__real_collector_func_unload)(void *) = NULL; + + #define INIT_API if (init_API == 0) collectorAPI_initAPI() + #define NULL_PTR(x) (__real_##x == NULL) +-#define CALL_REAL(x) (*(void(*)())__real_##x) ++#define CALL_REAL(x) (__real_##x) + #define CALL_IF_REAL(x) INIT_API; if (!NULL_PTR(x)) CALL_REAL(x) + + static int init_API = 0; +diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c +index d2a4ad0b60b..867753a22ec 100644 +--- a/gprofng/libcollector/dispatcher.c ++++ b/gprofng/libcollector/dispatcher.c +@@ -909,8 +909,9 @@ sigset (int sig, sighandler_t handler) + + // map interposed symbol versions + static int +-gprofng_timer_create (int (real_func) (), clockid_t clockid, +- struct sigevent *sevp, timer_t *timerid) ++gprofng_timer_create (int (real_func) (clockid_t, struct sigevent *, timer_t *), ++ clockid_t clockid, ++ struct sigevent *sevp, timer_t *timerid) + { + // collector reserves SIGPROF + if (sevp == NULL || sevp->sigev_notify != SIGEV_SIGNAL || +@@ -1045,7 +1046,7 @@ __collector_thr_sigsetmask (int how, const sigset_t* iset, sigset_t* oset) + // map interposed symbol versions + + static int +-gprofng_pthread_sigmask (int (real_func) (), ++gprofng_pthread_sigmask (int (real_func) (int, const sigset_t *, sigset_t*), + int how, const sigset_t *iset, sigset_t* oset) + { + sigset_t lsigset; +@@ -1140,9 +1141,10 @@ collector_root (void *cargs) + // map interposed symbol versions + + static int +-gprofng_pthread_create (int (real_func) (), pthread_t *thread, +- const pthread_attr_t *attr, +- void *(*func)(void*), void *arg) ++gprofng_pthread_create (int (real_func) (pthread_t *, const pthread_attr_t *, ++ void *(*)(void *), void *), ++ pthread_t *thread, const pthread_attr_t *attr, ++ void *(*func)(void*), void *arg) + { + TprintfT (DBG_LTT, "gprofng_pthread_create @%p\n", real_func); + if (dispatch_mode != DISPATCH_ON) +@@ -1277,6 +1279,7 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, + } + + // weak symbols: +-int sigprocmask () __attribute__ ((weak, alias ("__collector_sigprocmask"))); +-int thr_sigsetmask () __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); ++int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); ++int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); + int setitimer () __attribute__ ((weak, alias ("_setitimer"))); ++ +diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c +index 18060864796..3deb441d9c7 100644 +--- a/gprofng/libcollector/iotrace.c ++++ b/gprofng/libcollector/iotrace.c +@@ -1350,7 +1350,7 @@ mkstemp (char *template) + unsigned pktSize; + if (NULL_PTR (mkstemp)) + init_io_intf (); +- if (CHCK_REENTRANCE (guard) || template == NULL) ++ if (CHCK_REENTRANCE (guard)) + return CALL_REAL (mkstemp)(template); + PUSH_REENTRANCE (guard); + hrtime_t reqt = gethrtime (); +@@ -1405,7 +1405,7 @@ mkstemps (char *template, int slen) + unsigned pktSize; + if (NULL_PTR (mkstemps)) + init_io_intf (); +- if (CHCK_REENTRANCE (guard) || template == NULL) ++ if (CHCK_REENTRANCE (guard)) + return CALL_REAL (mkstemps)(template, slen); + PUSH_REENTRANCE (guard); + hrtime_t reqt = gethrtime (); +@@ -1485,7 +1485,7 @@ close (int fildes) + + /*------------------------------------------------------------- fopen */ + static FILE* +-gprofng_fopen (FILE*(real_fopen) (), const char *filename, const char *mode) ++gprofng_fopen (FILE*(real_fopen) (const char *, const char *), const char *filename, const char *mode) + { + int *guard; + FILE *fp = NULL; +@@ -1559,7 +1559,7 @@ DCL_FOPEN (fopen) + + /*------------------------------------------------------------- fclose */ + static int +-gprofng_fclose (int(real_fclose) (), FILE *stream) ++gprofng_fclose (int(real_fclose) (FILE *), FILE *stream) + { + int *guard; + int stat; +@@ -1645,7 +1645,7 @@ fflush (FILE *stream) + + /*------------------------------------------------------------- fdopen */ + static FILE* +-gprofng_fdopen (FILE*(real_fdopen) (), int fildes, const char *mode) ++gprofng_fdopen (FILE*(real_fdopen) (int, const char *), int fildes, const char *mode) + { + int *guard; + FILE *fp = NULL; +@@ -2957,7 +2957,7 @@ DCL_FGETPOS (fgetpos) + + /*------------------------------------------------------------- fgetpos64 */ + static int +-gprofng_fgetpos64 (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos) ++gprofng_fgetpos64 (int(real_fgetpos64) (FILE *, fpos64_t *), FILE *stream, fpos64_t *pos) + { + int *guard; + int ret; +diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c +index 15ba24d2ab5..c2b82894e6b 100644 +--- a/gprofng/libcollector/libcol_util.c ++++ b/gprofng/libcollector/libcol_util.c +@@ -1013,7 +1013,6 @@ __collector_open (const char *path, int oflag, ...) + mode_t mode = 0; + + hrtime_t t_timeout = __collector_gethrtime () + 5 * ((hrtime_t) NANOSEC); +- int nretries = 0; + long long delay = 100; /* start at some small, arbitrary value */ + + /* get optional mode argument if it's expected/required */ +@@ -1058,7 +1057,6 @@ __collector_open (const char *path, int oflag, ...) + delay *= 2; + if (delay > 100000000) + delay = 100000000; /* cap at some large, arbitrary value */ +- nretries++; + } + return fd; + } +diff --git a/gprofng/libcollector/libcol_util.h b/gprofng/libcollector/libcol_util.h +index 2eeeaeed50b..1b1b928180a 100644 +--- a/gprofng/libcollector/libcol_util.h ++++ b/gprofng/libcollector/libcol_util.h +@@ -81,12 +81,6 @@ extern int __collector_mutex_trylock (collector_mutex_t *mp); + #define __collector_mutex_init(xx) \ + do { collector_mutex_t tmp=COLLECTOR_MUTEX_INITIALIZER; *(xx)=tmp; } while(0) + +-void __collector_sample (char *name); +-void __collector_terminate_expt (); +-void __collector_pause (); +-void __collector_pause_m (); +-void __collector_resume (); +- + struct DT_lineno; + + typedef enum +diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c +index 67b2d7e9030..66844bc1337 100644 +--- a/gprofng/libcollector/linetrace.c ++++ b/gprofng/libcollector/linetrace.c +@@ -1207,7 +1207,7 @@ __collector_vfork (void) + } + + /*------------------------------------------------------------- execve */ +-int execve () __attribute__ ((weak, alias ("__collector_execve"))); ++int execve (const char *, char *const [], char *const []) __attribute__ ((weak, alias ("__collector_execve"))); + + int + __collector_execve (const char* path, char *const argv[], char *const envp[]) +@@ -1237,7 +1237,7 @@ __collector_execve (const char* path, char *const argv[], char *const envp[]) + return ret; + } + +-int execvp () __attribute__ ((weak, alias ("__collector_execvp"))); ++int execvp (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execvp"))); + + int + __collector_execvp (const char* file, char *const argv[]) +@@ -1269,7 +1269,7 @@ __collector_execvp (const char* file, char *const argv[]) + return ret; + } + +-int execv () __attribute__ ((weak, alias ("__collector_execv"))); ++int execv (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execv"))); + + int + __collector_execv (const char* path, char *const argv[]) +@@ -1408,7 +1408,10 @@ __collector_execl (const char* path, const char *arg0, ...) + /*-------------------------------------------------------- posix_spawn */ + // map interposed symbol versions + static int +-gprofng_posix_spawn (int(real_posix_spawn) (), ++gprofng_posix_spawn (int(real_posix_spawn) (pid_t *, const char *, ++ const posix_spawn_file_actions_t *, ++ const posix_spawnattr_t *, ++ char *const [], char *const []), + pid_t *pidp, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, +@@ -1466,7 +1469,10 @@ DCL_POSIX_SPAWN (posix_spawn) + + /*-------------------------------------------------------- posix_spawnp */ + static int +-gprofng_posix_spawnp (int (real_posix_spawnp) (), ++gprofng_posix_spawnp (int (real_posix_spawnp) (pid_t *, const char *, ++ const posix_spawn_file_actions_t *, ++ const posix_spawnattr_t *, ++ char *const [], char *const []), + pid_t *pidp, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, +@@ -1754,8 +1760,8 @@ __collector_clone (int (*fn)(void *), void *child_stack, int flags, void *arg, + } + + /*-------------------------------------------------------------------- setuid */ +-int setuid () __attribute__ ((weak, alias ("__collector_setuid"))); +-int _setuid () __attribute__ ((weak, alias ("__collector_setuid"))); ++int setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); ++int _setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); + + int + __collector_setuid (uid_t ruid) +@@ -1770,8 +1776,8 @@ __collector_setuid (uid_t ruid) + } + + /*------------------------------------------------------------------- seteuid */ +-int seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); +-int _seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); ++int seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); ++int _seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); + + int + __collector_seteuid (uid_t euid) +@@ -1786,8 +1792,8 @@ __collector_seteuid (uid_t euid) + } + + /*------------------------------------------------------------------ setreuid */ +-int setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); +-int _setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); ++int setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); ++int _setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); + + int + __collector_setreuid (uid_t ruid, uid_t euid) +@@ -1802,8 +1808,8 @@ __collector_setreuid (uid_t ruid, uid_t euid) + } + + /*-------------------------------------------------------------------- setgid */ +-int setgid () __attribute__ ((weak, alias ("__collector_setgid"))); +-int _setgid () __attribute__ ((weak, alias ("__collector_setgid"))); ++int setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); ++int _setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); + + int + __collector_setgid (gid_t rgid) +@@ -1818,8 +1824,8 @@ __collector_setgid (gid_t rgid) + } + + /*------------------------------------------------------------------- setegid */ +-int setegid () __attribute__ ((weak, alias ("__collector_setegid"))); +-int _setegid () __attribute__ ((weak, alias ("__collector_setegid"))); ++int setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); ++int _setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); + + int + __collector_setegid (gid_t egid) +@@ -1834,8 +1840,8 @@ __collector_setegid (gid_t egid) + } + + /*------------------------------------------------------------------ setregid */ +-int setregid () __attribute__ ((weak, alias ("__collector_setregid"))); +-int _setregid () __attribute__ ((weak, alias ("__collector_setregid"))); ++int setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); ++int _setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); + + int + __collector_setregid (gid_t rgid, gid_t egid) +diff --git a/gprofng/src/BaseMetricTreeNode.h b/gprofng/src/BaseMetricTreeNode.h +index d73d244e27e..7698f9c6eaf 100644 +--- a/gprofng/src/BaseMetricTreeNode.h ++++ b/gprofng/src/BaseMetricTreeNode.h +@@ -85,7 +85,6 @@ private: + + BaseMetricTreeNode *root; // root of tree + BaseMetricTreeNode *parent; // my parent +- bool aggregation; // value is based on children's values + char *name; // bm->get_cmd() for metrics, unique string otherwise + char *uname; // user-visible text + char *unit; // see UNIT_* defines +diff --git a/gprofng/src/Dbe.cc b/gprofng/src/Dbe.cc +index 91a5aa5ef05..bcbf4694565 100644 +--- a/gprofng/src/Dbe.cc ++++ b/gprofng/src/Dbe.cc +@@ -9594,14 +9594,12 @@ dbeGetTLDataRepVals (VMode view_mode, hrtime_t start_ts, hrtime_t delta, + } + if (sampleVals != NULL) + { +- Sample* sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); +- if (!sample || !sample->get_usage ()) +- sample = sample; +- else ++ Sample *sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); ++ if (sample != NULL) + { +- PrUsage* prusage = sample->get_usage (); +- Vector *mstateVals = prusage->getMstateValues (); +- sampleVals->store (eventIdx, mstateVals); ++ PrUsage *prusage = sample->get_usage (); ++ if (prusage != NULL) ++ sampleVals->store (eventIdx, prusage->getMstateValues ()); + } + } + } +diff --git a/gprofng/src/DbeSession.cc b/gprofng/src/DbeSession.cc +index 20329091167..5d6bab75638 100644 +--- a/gprofng/src/DbeSession.cc ++++ b/gprofng/src/DbeSession.cc +@@ -1162,8 +1162,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) + closedir (exp_dir); + exp_names->sort (dir_name_cmp); + Experiment **t_exp_list = new Experiment *[exp_names->size ()]; +- int nsubexps = 0; +- + for (int j = 0, jsz = exp_names->size (); j < jsz; j++) + { + t_exp_list[j] = NULL; +@@ -1220,7 +1218,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) + dexp->open (dpath); + append (dexp); + t_exp_list[j] = dexp; +- nsubexps++; + dexp->set_clock (exp->clock); + + // DbeView add_experiment() is split into two parts +diff --git a/gprofng/src/Disasm.cc b/gprofng/src/Disasm.cc +index 1396e4fb072..d78212cee39 100644 +--- a/gprofng/src/Disasm.cc ++++ b/gprofng/src/Disasm.cc +@@ -49,7 +49,6 @@ struct DisContext + }; + + static const int MAX_DISASM_STR = 2048; +-static const int MAX_INSTR_SIZE = 8; + + Disasm::Disasm (char *fname) + { +diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc +index 02a24ebc40d..a31550aff66 100644 +--- a/gprofng/src/Experiment.cc ++++ b/gprofng/src/Experiment.cc +@@ -1935,8 +1935,6 @@ private: + } + + Experiment *exp; +- char *hostname; +- hrtime_t time, tstamp; + }; + + void +diff --git a/gprofng/src/HashMap.h b/gprofng/src/HashMap.h +index 918c0dc95f9..c5fdd345ba8 100644 +--- a/gprofng/src/HashMap.h ++++ b/gprofng/src/HashMap.h +@@ -78,9 +78,8 @@ copy_key (uint64_t a) + } + + template<> inline void +-delete_key (uint64_t a) ++delete_key (uint64_t) + { +- a = a; + } + + template<> inline int +diff --git a/gprofng/src/IOActivity.h b/gprofng/src/IOActivity.h +index cf462cf8d55..f3a22ada6b1 100644 +--- a/gprofng/src/IOActivity.h ++++ b/gprofng/src/IOActivity.h +@@ -78,7 +78,6 @@ private: + Hist_data *hist_data_file_all; + Hist_data *hist_data_vfd_all; + Hist_data *hist_data_callstack_all; +- Hist_data *hist_data_callstack; + + DbeView *dbev; + }; +diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc +index ebf888c5a20..b0ed66efcdc 100644 +--- a/gprofng/src/collctrl.cc ++++ b/gprofng/src/collctrl.cc +@@ -952,9 +952,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn) + double dval = strtod (string, &endchar); + if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */ + dval = dval * 1000.; +- else if (*endchar == 'u') /* user specified microseconds */ +- dval = dval; +- else ++ else if (*endchar != 'u') + return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string); + nclkprof_timer = (int) (dval + 0.5); + } +@@ -2901,7 +2899,7 @@ Coll_Ctrl::get (char * control) + } + if (!strncmp (control, ipc_str_javaprof, len)) + { +- if ((java_mode == 0)) ++ if (java_mode == 0) + return strdup (ipc_str_off); + return strdup (ipc_str_on); + } +@@ -2917,7 +2915,7 @@ Coll_Ctrl::get (char * control) + } + if (!strncmp (control, ipc_str_sample_sig, len)) + { +- if ((sample_sig == 0)) ++ if (sample_sig == 0) + return strdup (ipc_str_off); + char *str_signal = find_signal_name (sample_sig); + if (str_signal != NULL) +@@ -2951,15 +2949,15 @@ Coll_Ctrl::get (char * control) + } + if (!strncmp (control, ipc_str_iotrace, len)) + { +- if ((iotrace_enabled == 0)) ++ if (iotrace_enabled == 0) + return strdup (ipc_str_off); + return strdup (ipc_str_on); + } + if (!strncmp (control, ipc_str_count, len)) + { +- if ((count_enabled == 0)) ++ if (count_enabled == 0) + return strdup (ipc_str_off); +- if ((count_enabled < 0)) ++ if (count_enabled < 0) + return strdup ("on\nstatic"); + return strdup (ipc_str_on); + } +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index bb48eadb9f8..ebcdbca561f 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -40,12 +40,12 @@ struct tm; + * If you add any, please put it in the right place */ + typedef struct CollectorUtilFuncs + { +- int (*access)(); ++ int (*access)(const char *, int); + int (*atoi)(const char *nptr); + void *(*calloc)(size_t nelem, size_t elsize); + int (*clearenv)(void); + int (*close)(int); +- int (*closedir)(); ++ int (*closedir)(DIR *); + int (*execv)(const char *path, char *const argv[]); + void (*exit)(int status); + int (*fclose)(FILE *stream); +@@ -66,20 +66,20 @@ typedef struct CollectorUtilFuncs + off_t (*lseek)(int fd, off_t offset, int whence); + void *(*malloc)(size_t size); + void *(*memset)(void *s1, int c, size_t n); +- int (*mkdir)(); ++ int (*mkdir)(const char *, mode_t); + time_t (*mktime)(struct tm *timeptr); + void *(*mmap)(void *, size_t, int, int, int, off_t); +- void *(*mmap64_)(); +- int (*munmap)(); ++ void *(*mmap64_)(void *, size_t, int, int, int, off_t); ++ int (*munmap)(void *, size_t); + int (*open)(const char *, int, ...); + int (*open_bare)(const char *, int, ...); +- DIR *(*opendir)(); ++ DIR *(*opendir)(const char *); + int (*pclose)(FILE *stream); + FILE *(*popen)(const char *command, const char *mode); + int (*putenv)(char *string); +- ssize_t (*pwrite)(); +- ssize_t (*pwrite64_)(); +- ssize_t (*read)(); ++ ssize_t (*pwrite)(int, const void *, size_t, off_t); ++ ssize_t (*pwrite64_)(int, const void *, size_t, off_t); ++ ssize_t (*read)(int, void *, size_t); + int (*setenv)(const char *name, const char *value, int overwrite); + int (*sigfillset)(sigset_t *set); + int (*sigprocmask)(int how, const sigset_t *set, sigset_t *oldset); +@@ -112,7 +112,7 @@ typedef struct CollectorUtilFuncs + int (*unsetenv)(const char *name); + int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); + pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); +- ssize_t (*write)(); ++ ssize_t (*write)(int, void *, size_t); + double (*atof)(); + void *n_a; + } CollectorUtilFuncs; +diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc +index 200e6080d2e..24af375edf1 100644 +--- a/gprofng/src/gp-display-src.cc ++++ b/gprofng/src/gp-display-src.cc +@@ -75,14 +75,6 @@ private: + bool v_opt; + int multiple; + char *str_compcom; +- bool hex_visible; +- int src_visible; +- int vis_src; +- int vis_dis; +- int threshold_src; +- int threshold_dis; +- int threshold; +- int vis_bits; + }; + + static int +diff --git a/gprofng/src/gp-print.h b/gprofng/src/gp-print.h +index 1b748ea60a3..1a8ad3b6c13 100644 +--- a/gprofng/src/gp-print.h ++++ b/gprofng/src/gp-print.h +@@ -19,7 +19,7 @@ + MA 02110-1301, USA. */ + + #ifndef _GP_PRINT_H +-#define _ER_PRINT_H ++#define _GP_PRINT_H + + #include "Command.h" + #include "DbeApplication.h" +diff --git a/gprofng/src/util.cc b/gprofng/src/util.cc +index 201f7088b66..228140b61ae 100644 +--- a/gprofng/src/util.cc ++++ b/gprofng/src/util.cc +@@ -741,17 +741,13 @@ get_relative_link (const char *path_from, const char *path_to) + s2 = canonical_path (s2); + long l = dbe_sstrlen (s1); + // try to find common directories +- int common_slashes = 0; + int last_common_slash = -1; + for (int i = 0; i < l; i++) + { +- if (s1[i] != s2[i]) break; +- if (s1[i] == 0) break; ++ if (s1[i] != s2[i] || s1[i] == 0) ++ break; + if (s1[i] == '/') +- { +- common_slashes++; +- last_common_slash = i; +- } ++ last_common_slash = i; + } + // find slashes in remaining path_to + int slashes = 0; +-- +2.50.1 + diff --git a/package/binutils/2.42/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch b/package/binutils/2.42/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch new file mode 100644 index 0000000000..06ca165570 --- /dev/null +++ b/package/binutils/2.42/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch @@ -0,0 +1,619 @@ +From 2e59be3bc9dad69af4f62d26107b6ace23e9998a Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 16 Nov 2024 05:13:48 +0000 +Subject: [PATCH] gprofng: fix -std=gnu23 compatibility wrt unprototyped + functions + +C23 removes support for unprototyped functions. Fix function pointer types +accordingly. + +This does not fix all instances, there's a few left as I commented on in +PR32374 (e.g. setitimer which I have a local workaround for but it involves +a glibc implementation detail; the Linaro precommit CI tester pointed that +out too, so dropped that). + +ChangeLog: + PR gprofng/32374 + + * libcollector/collector.c (collector_sample): Fix prototype. + * libcollector/envmgmt.c (putenv): Ditto. + (_putenv): Ditto. + (__collector_putenv): Ditto. + (setenv): Ditto. + (_setenv): Ditto. + (__collector_setenv): Ditto. + (unsetenv): Ditto. + (_unsetenv): Ditto. + (__collector_unsetenv): Ditto. + * libcollector/jprofile.c (open_experiment): Ditto. + (__collector_jprofile_enable_synctrace): Ditto. + (jprof_find_asyncgetcalltrace): Ditto. + * libcollector/libcol_util.c (__collector_util_init): Ditto. + (ARCH): Ditto. + * libcollector/mmaptrace.c (collector_func_load): Ditto. + (collector_func_unload): Ditto. + * libcollector/unwind.c (__collector_ext_unwind_init): Ditto. + * src/collector_module.h: Ditto. + +Upstream: a2f774427e078f3da2c06bdea25f77a61979a695 +Signed-off-by: Thomas Petazzoni +--- + gprofng/libcollector/collector.c | 2 +- + gprofng/libcollector/dispatcher.c | 1 - + gprofng/libcollector/envmgmt.c | 24 ++++----- + gprofng/libcollector/jprofile.c | 10 ++-- + gprofng/libcollector/libcol_util.c | 84 +++++++++++++++--------------- + gprofng/libcollector/mmaptrace.c | 4 +- + gprofng/libcollector/unwind.c | 2 +- + gprofng/src/collector_module.h | 2 +- + 8 files changed, 64 insertions(+), 65 deletions(-) + +diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c +index ef580dcbdd9..899f08a5381 100644 +--- a/gprofng/libcollector/collector.c ++++ b/gprofng/libcollector/collector.c +@@ -1579,7 +1579,7 @@ __collector_resume_experiment () + } + + /* Code to support Samples and Pause/Resume */ +-void collector_sample () __attribute__ ((weak, alias ("__collector_sample"))); ++void collector_sample (char *name) __attribute__ ((weak, alias ("__collector_sample"))); + void + __collector_sample (char *name) + { +diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c +index 867753a22ec..5ee0bf895bf 100644 +--- a/gprofng/libcollector/dispatcher.c ++++ b/gprofng/libcollector/dispatcher.c +@@ -1282,4 +1282,3 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, + int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); + int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); + int setitimer () __attribute__ ((weak, alias ("_setitimer"))); +- +diff --git a/gprofng/libcollector/envmgmt.c b/gprofng/libcollector/envmgmt.c +index ebe08f82007..0ff7621070d 100644 +--- a/gprofng/libcollector/envmgmt.c ++++ b/gprofng/libcollector/envmgmt.c +@@ -692,8 +692,8 @@ __collector_env_update (char *envp[]) + + + /*------------------------------------------------------------- putenv */ +-int putenv () __attribute__ ((weak, alias ("__collector_putenv"))); +-int _putenv () __attribute__ ((weak, alias ("__collector_putenv"))); ++int putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); ++int _putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); + + int + __collector_putenv (char * string) +@@ -701,9 +701,9 @@ __collector_putenv (char * string) + if (CALL_UTIL (putenv) == __collector_putenv || + CALL_UTIL (putenv) == NULL) + { // __collector_libc_funcs_init failed +- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_NEXT, "putenv"); ++ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_NEXT, "putenv"); + if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) +- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_DEFAULT, "putenv"); ++ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_DEFAULT, "putenv"); + if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) + { + TprintfT (DBG_LT2, "__collector_putenv(): ERROR: no pointer found.\n"); +@@ -719,8 +719,8 @@ __collector_putenv (char * string) + } + + /*------------------------------------------------------------- setenv */ +-int setenv () __attribute__ ((weak, alias ("__collector_setenv"))); +-int _setenv () __attribute__ ((weak, alias ("__collector_setenv"))); ++int setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); ++int _setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); + + int + __collector_setenv (const char *name, const char *value, int overwrite) +@@ -728,9 +728,9 @@ __collector_setenv (const char *name, const char *value, int overwrite) + if (CALL_UTIL (setenv) == __collector_setenv || + CALL_UTIL (setenv) == NULL) + { // __collector_libc_funcs_init failed +- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_NEXT, "setenv"); ++ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_NEXT, "setenv"); + if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) +- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_DEFAULT, "setenv"); ++ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_DEFAULT, "setenv"); + if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) + { + TprintfT (DBG_LT2, "__collector_setenv(): ERROR: no pointer found.\n"); +@@ -765,8 +765,8 @@ __collector_setenv (const char *name, const char *value, int overwrite) + } + + /*------------------------------------------------------------- unsetenv */ +-int unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); +-int _unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); ++int unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); ++int _unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); + + int + __collector_unsetenv (const char *name) +@@ -774,9 +774,9 @@ __collector_unsetenv (const char *name) + if (CALL_UTIL (unsetenv) == __collector_unsetenv || + CALL_UTIL (unsetenv) == NULL) + { // __collector_libc_funcs_init failed +- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_NEXT, "unsetenv"); ++ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_NEXT, "unsetenv"); + if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) +- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_DEFAULT, "unsetenv"); ++ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_DEFAULT, "unsetenv"); + if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) + { + TprintfT (DBG_LT2, "__collector_unsetenv(): ERROR: no pointer found.\n"); +diff --git a/gprofng/libcollector/jprofile.c b/gprofng/libcollector/jprofile.c +index 1bacacc1a2a..11051f937ef 100644 +--- a/gprofng/libcollector/jprofile.c ++++ b/gprofng/libcollector/jprofile.c +@@ -105,8 +105,8 @@ static void rwrite (int fd, const void *buf, size_t nbyte); + static void addToDynamicArchive (const char* name, const unsigned char* class_data, int class_data_len); + static void (*AsyncGetCallTrace)(JVMPI_CallTrace*, jint, ucontext_t*) = NULL; + static void (*collector_heap_record)(int, int, void*) = NULL; +-static void (*collector_jsync_begin)() = NULL; +-static void (*collector_jsync_end)(hrtime_t, void *) = NULL; ++static void (*collector_jsync_begin)(void) = NULL; ++static void (*collector_jsync_end)(hrtime_t, void*) = NULL; + + #define gethrtime collector_interface->getHiResTime + +@@ -230,7 +230,7 @@ open_experiment (const char *exp) + else if (__collector_strStartWith (args, "s:") == 0) + { + java_sync_mode = 1; +- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); ++ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); + collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); + } + #endif +@@ -255,7 +255,7 @@ __collector_jprofile_enable_synctrace () + return; + } + java_sync_mode = 1; +- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); ++ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); + collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); + TprintfT (DBG_LT1, "jprofile: turning on Java synctrace, and requesting events\n"); + } +@@ -1129,7 +1129,7 @@ jprof_find_asyncgetcalltrace () + { + void *jvmhandle; + if (__collector_VM_ReadByteInstruction == NULL) +- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); ++ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); + + /* look for stack unwind function using default path */ + AsyncGetCallTrace = (void (*)(JVMPI_CallTrace*, jint, ucontext_t*)) +diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c +index c2b82894e6b..688bdf19c6d 100644 +--- a/gprofng/libcollector/libcol_util.c ++++ b/gprofng/libcollector/libcol_util.c +@@ -1114,7 +1114,7 @@ __collector_util_init () + + ptr = dlsym (libc, "munmap"); + if (ptr) +- __collector_util_funcs.munmap = (int(*)())ptr; ++ __collector_util_funcs.munmap = (int(*)(void *, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT munmap: %s\n", dlerror ()); +@@ -1123,7 +1123,7 @@ __collector_util_init () + + ptr = dlsym (libc, "close"); + if (ptr) +- __collector_util_funcs.close = (int(*)())ptr; ++ __collector_util_funcs.close = (int(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); +@@ -1158,7 +1158,7 @@ __collector_util_init () + + ptr = dlsym (libc, "close"); + if (ptr) +- __collector_util_funcs.close = (int(*)())ptr; ++ __collector_util_funcs.close = (int(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); +@@ -1167,7 +1167,7 @@ __collector_util_init () + + ptr = dlsym (libc, "read"); + if (ptr) +- __collector_util_funcs.read = (ssize_t (*)())ptr; ++ __collector_util_funcs.read = (ssize_t (*)(int, void*, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT read: %s\n", dlerror ()); +@@ -1176,7 +1176,7 @@ __collector_util_init () + + ptr = dlsym (libc, "write"); + if (ptr) +- __collector_util_funcs.write = (ssize_t (*)())ptr; ++ __collector_util_funcs.write = (ssize_t (*)(int, void*, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT write: %s\n", dlerror ()); +@@ -1186,14 +1186,14 @@ __collector_util_init () + #if ARCH(Intel) && WSIZE(32) + ptr = dlvsym (libc, "pwrite", "GLIBC_2.2"); // it is in /lib/libpthread.so.0 + if (ptr) +- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; ++ __collector_util_funcs.pwrite = (ssize_t (*)(int, void*, size_t, off_t))ptr; + else + { + Tprintf (DBG_LT0, "libcol_util: WARNING: dlvsym for %s@%s failed. Using dlsym() instead.", "pwrite", "GLIBC_2.2"); + #endif /* ARCH(Intel) && WSIZE(32) */ + ptr = dlsym (libc, "pwrite"); + if (ptr) +- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; ++ __collector_util_funcs.pwrite = (ssize_t (*)(int, const void*, size_t, off_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pwrite: %s\n", dlerror ()); +@@ -1213,7 +1213,7 @@ __collector_util_init () + #endif /* ARCH(Intel) && WSIZE(32) */ + ptr = dlsym (libc, "pwrite64"); + if (ptr) +- __collector_util_funcs.pwrite64_ = (ssize_t (*)())ptr; ++ __collector_util_funcs.pwrite64_ = (ssize_t (*)(int, const void*, size_t, off_t))ptr; + else + __collector_util_funcs.pwrite64_ = __collector_util_funcs.pwrite; + #if ARCH(Intel) && WSIZE(32) +@@ -1222,7 +1222,7 @@ __collector_util_init () + + ptr = dlsym (libc, "lseek"); + if (ptr) +- __collector_util_funcs.lseek = (off_t (*)())ptr; ++ __collector_util_funcs.lseek = (off_t (*)(int, off_t, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT lseek: %s\n", dlerror ()); +@@ -1231,7 +1231,7 @@ __collector_util_init () + + ptr = dlsym (libc, "access"); + if (ptr) +- __collector_util_funcs.access = (int(*)())ptr; ++ __collector_util_funcs.access = (int(*)(const char*, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT access: %s\n", dlerror ()); +@@ -1240,7 +1240,7 @@ __collector_util_init () + + ptr = dlsym (libc, "mkdir"); + if (ptr) +- __collector_util_funcs.mkdir = (int(*)())ptr; ++ __collector_util_funcs.mkdir = (int(*)(const char*, mode_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mkdir: %s\n", dlerror ()); +@@ -1249,7 +1249,7 @@ __collector_util_init () + + ptr = dlsym (libc, "opendir"); + if (ptr) +- __collector_util_funcs.opendir = (DIR * (*)())ptr; ++ __collector_util_funcs.opendir = (DIR * (*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT opendir: %s\n", dlerror ()); +@@ -1258,7 +1258,7 @@ __collector_util_init () + + ptr = dlsym (libc, "closedir"); + if (ptr) +- __collector_util_funcs.closedir = (int(*)())ptr; ++ __collector_util_funcs.closedir = (int(*)(DIR*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT closedir: %s\n", dlerror ()); +@@ -1267,7 +1267,7 @@ __collector_util_init () + + ptr = dlsym (libc, "execv"); + if (ptr) +- __collector_util_funcs.execv = (int(*)())ptr; ++ __collector_util_funcs.execv = (int(*)(const char*, char* const*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT execv: %s\n", dlerror ()); +@@ -1276,7 +1276,7 @@ __collector_util_init () + + ptr = dlsym (libc, "exit"); + if (ptr) +- __collector_util_funcs.exit = (void(*)())ptr; ++ __collector_util_funcs.exit = (void(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT exit: %s\n", dlerror ()); +@@ -1285,7 +1285,7 @@ __collector_util_init () + + ptr = dlsym (libc, "vfork"); + if (ptr) +- __collector_util_funcs.vfork = (pid_t (*)())ptr; ++ __collector_util_funcs.vfork = (pid_t (*)(void))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vfork: %s\n", dlerror ()); +@@ -1294,7 +1294,7 @@ __collector_util_init () + + ptr = dlsym (libc, "waitpid"); + if (ptr) +- __collector_util_funcs.waitpid = (pid_t (*)())ptr; ++ __collector_util_funcs.waitpid = (pid_t (*)(pid_t, int*, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT waitpid: %s\n", dlerror ()); +@@ -1313,7 +1313,7 @@ __collector_util_init () + + ptr = dlsym (libc, "getcontext"); + if (ptr) +- __collector_util_funcs.getcontext = (int(*)())ptr; ++ __collector_util_funcs.getcontext = (int(*)(ucontext_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getcontext: %s\n", dlerror ()); +@@ -1331,7 +1331,7 @@ __collector_util_init () + + ptr = dlsym (libc, "putenv"); + if (ptr) +- __collector_util_funcs.putenv = (int(*)())ptr; ++ __collector_util_funcs.putenv = (int(*)(char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT putenv: %s\n", dlerror ()); +@@ -1340,7 +1340,7 @@ __collector_util_init () + + ptr = dlsym (libc, "getenv"); + if (ptr) +- __collector_util_funcs.getenv = (char*(*)())ptr; ++ __collector_util_funcs.getenv = (char*(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getenv: %s\n", dlerror ()); +@@ -1349,7 +1349,7 @@ __collector_util_init () + + ptr = dlsym (libc, "time"); + if (ptr) +- __collector_util_funcs.time = (time_t (*)())ptr; ++ __collector_util_funcs.time = (time_t (*)(time_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT time: %s\n", dlerror ()); +@@ -1358,7 +1358,7 @@ __collector_util_init () + + ptr = dlsym (libc, "mktime"); + if (ptr) +- __collector_util_funcs.mktime = (time_t (*)())ptr; ++ __collector_util_funcs.mktime = (time_t (*)(struct tm*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mktime: %s\n", dlerror ()); +@@ -1372,7 +1372,7 @@ __collector_util_init () + + ptr = dlsym (libc, "gmtime_r"); + if (ptr) +- __collector_util_funcs.gmtime_r = (struct tm * (*)())ptr; ++ __collector_util_funcs.gmtime_r = (struct tm * (*)(const time_t*, struct tm*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT gmtime_r: %s\n", dlerror ()); +@@ -1381,7 +1381,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtol"); + if (ptr) +- __collector_util_funcs.strtol = (long (*)())ptr; ++ __collector_util_funcs.strtol = (long (*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtol: %s\n", dlerror ()); +@@ -1390,7 +1390,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtoll"); + if (ptr) +- __collector_util_funcs.strtoll = (long long (*)())ptr; ++ __collector_util_funcs.strtoll = (long long (*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoll: %s\n", dlerror ()); +@@ -1402,7 +1402,7 @@ __collector_util_init () + + ptr = dlsym (libc, "setenv"); + if (ptr) +- __collector_util_funcs.setenv = (int(*)())ptr; ++ __collector_util_funcs.setenv = (int(*)(const char*, const char*, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT setenv: %s\n", dlerror ()); +@@ -1411,7 +1411,7 @@ __collector_util_init () + + ptr = dlsym (libc, "unsetenv"); + if (ptr) +- __collector_util_funcs.unsetenv = (int(*)())ptr; ++ __collector_util_funcs.unsetenv = (int(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT unsetenv: %s\n", dlerror ()); +@@ -1498,7 +1498,7 @@ __collector_util_init () + + ptr = dlsym (libc, "pclose"); + if (ptr) +- __collector_util_funcs.pclose = (int(*)())ptr; ++ __collector_util_funcs.pclose = (int(*)(FILE*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pclose: %s\n", dlerror ()); +@@ -1507,7 +1507,7 @@ __collector_util_init () + + ptr = dlsym (libc, "fgets"); + if (ptr) +- __collector_util_funcs.fgets = (char*(*)())ptr; ++ __collector_util_funcs.fgets = (char*(*)(char*, int, FILE*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT fgets: %s\n", dlerror ()); +@@ -1534,7 +1534,7 @@ __collector_util_init () + + ptr = dlsym (libc, "vsnprintf"); + if (ptr) +- __collector_util_funcs.vsnprintf = (int(*)())ptr; ++ __collector_util_funcs.vsnprintf = (int(*)(char*, size_t, const char*, ...))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vsnprintf: %s\n", dlerror ()); +@@ -1543,7 +1543,7 @@ __collector_util_init () + + ptr = dlsym (libc, "atoi"); + if (ptr) +- __collector_util_funcs.atoi = (int(*)())ptr; ++ __collector_util_funcs.atoi = (int(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT atoi: %s\n", dlerror ()); +@@ -1552,7 +1552,7 @@ __collector_util_init () + + ptr = dlsym (libc, "calloc"); + if (ptr) +- __collector_util_funcs.calloc = (void*(*)())ptr; ++ __collector_util_funcs.calloc = (void*(*)(size_t, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT calloc: %s\n", dlerror ()); +@@ -1562,7 +1562,7 @@ __collector_util_init () + ptr = dlsym (libc, "free"); + if (ptr) + { +- __collector_util_funcs.free = (void(*)())ptr; ++ __collector_util_funcs.free = (void(*)(void*))ptr; + } + else + { +@@ -1572,7 +1572,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strdup"); + if (ptr) +- __collector_util_funcs.libc_strdup = (char*(*)())ptr; ++ __collector_util_funcs.libc_strdup = (char*(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strdup: %s\n", dlerror ()); +@@ -1585,7 +1585,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strerror"); + if (ptr) +- __collector_util_funcs.strerror = (char*(*)())ptr; ++ __collector_util_funcs.strerror = (char*(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror: %s\n", dlerror ()); +@@ -1593,7 +1593,7 @@ __collector_util_init () + } + ptr = dlsym (libc, "strerror_r"); + if (ptr) +- __collector_util_funcs.strerror_r = (int(*)())ptr; ++ __collector_util_funcs.strerror_r = (int(*)(int, char*, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror_r: %s\n", dlerror ()); +@@ -1601,7 +1601,7 @@ __collector_util_init () + } + ptr = dlsym (libc, "strspn"); + if (ptr) +- __collector_util_funcs.strspn = (size_t (*)())ptr; ++ __collector_util_funcs.strspn = (size_t (*)(const char*, const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strspn: %s\n", dlerror ()); +@@ -1610,7 +1610,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtoul"); + if (ptr) +- __collector_util_funcs.strtoul = (unsigned long int(*)())ptr; ++ __collector_util_funcs.strtoul = (unsigned long int(*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoul: %s\n", dlerror ()); +@@ -1619,7 +1619,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtoull"); + if (ptr) +- __collector_util_funcs.strtoull = (unsigned long long int(*)())ptr; ++ __collector_util_funcs.strtoull = (unsigned long long int(*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoull: %s\n", dlerror ()); +@@ -1664,7 +1664,7 @@ __collector_util_init () + + ptr = dlsym (libc, "sysconf"); + if (ptr) +- __collector_util_funcs.sysconf = (long(*)())ptr; ++ __collector_util_funcs.sysconf = (long(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysconf: %s\n", dlerror ()); +@@ -1673,7 +1673,7 @@ __collector_util_init () + + ptr = dlsym (libc, "sigfillset"); + if (ptr) +- __collector_util_funcs.sigfillset = (int(*)())ptr; ++ __collector_util_funcs.sigfillset = (int(*)(sigset_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigfillset: %s\n", dlerror ()); +@@ -1682,7 +1682,7 @@ __collector_util_init () + + ptr = dlsym (libc, "sigprocmask"); + if (ptr) +- __collector_util_funcs.sigprocmask = (int(*)())ptr; ++ __collector_util_funcs.sigprocmask = (int(*)(int, const sigset_t*, sigset_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigprocmask: %s\n", dlerror ()); +diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c +index f07f4d76513..2a6857ab58e 100644 +--- a/gprofng/libcollector/mmaptrace.c ++++ b/gprofng/libcollector/mmaptrace.c +@@ -1209,7 +1209,7 @@ process_vsyscall_page () + /* + * collector API for dynamic functions + */ +-void collector_func_load () __attribute__ ((weak, alias ("__collector_func_load"))); ++void collector_func_load (char*, char*, char*, void*, int, int, DT_lineno *) __attribute__ ((weak, alias ("__collector_func_load"))); + void + __collector_func_load (char *name, char *alias, char *sourcename, + void *vaddr, int size, int lntsize, DT_lineno *lntable) +@@ -1218,7 +1218,7 @@ __collector_func_load (char *name, char *alias, char *sourcename, + vaddr, size, lntsize, lntable); + } + +-void collector_func_unload () __attribute__ ((weak, alias ("__collector_func_unload"))); ++void collector_func_unload (void *vaddr) __attribute__ ((weak, alias ("__collector_func_unload"))); + void + __collector_func_unload (void *vaddr) + { +diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c +index 91678b1e334..cd47d4fbe0f 100644 +--- a/gprofng/libcollector/unwind.c ++++ b/gprofng/libcollector/unwind.c +@@ -416,7 +416,7 @@ __collector_ext_unwind_init (int record) + omp_no_walk = 1; + + if (__collector_VM_ReadByteInstruction == NULL) +- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); ++ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); + + #if ARCH(SPARC) + #if WSIZE(64) +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index ebcdbca561f..fd888cd58dd 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -110,7 +110,7 @@ typedef struct CollectorUtilFuncs + long (*sysinfo)(int command, char *buf, long count); + time_t (*time)(time_t *tloc); + int (*unsetenv)(const char *name); +- int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); ++ int (*vsnprintf)(char *str, size_t size, const char *format, ...); + pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); + ssize_t (*write)(int, void *, size_t); + double (*atof)(); +-- +2.50.1 + diff --git a/package/binutils/2.42/0007-gprofng-fix-build-with-std-gnu23.patch b/package/binutils/2.42/0007-gprofng-fix-build-with-std-gnu23.patch new file mode 100644 index 0000000000..15a56f14af --- /dev/null +++ b/package/binutils/2.42/0007-gprofng-fix-build-with-std-gnu23.patch @@ -0,0 +1,199 @@ +From e91e1fd342c9ded87f53bc7e9e8d5d693b9a570a Mon Sep 17 00:00:00 2001 +From: Vladimir Mezentsev +Date: Thu, 21 Nov 2024 14:48:20 -0800 +Subject: [PATCH] gprofng: fix build with -std=gnu23 + +Fix function pointer types accordingly. +Remove unused function pointers. + +gprofng/ChangeLog +2024-11-21 Vladimir Mezentsev + + PR gprofng/32374 + PR gprofng/32373 + * common/cpuid.c: Define ATTRIBUTE_UNUSED if necessary. + * libcollector/libcol_util.c (sysinfo): Remove unused pointer. + * src/collector_module.h: Likewise. + * libcollector/dispatcher.c (setitimer): Fix prototype. + * libcollector/linetrace.c (system, grantpt, ptsname): Likewise. + * testsuite/gprofng.display/mttest/mttest.c (dump_arrays): Likewise. + * testsuite/gprofng.display/synprog/endcases.c (xinline_code, + s_inline_code): Likewise. + * testsuite/gprofng.display/synprog/inc_inline.h (ext_inline_code): + Likewise. + * testsuite/gprofng.display/synprog/synprog.c (doabort): Rename nullptr. + +Upstream: 4e943705e3e8a5a9448d087502bcb390a694ad02 +Signed-off-by: Thomas Petazzoni +--- + gprofng/common/cpuid.c | 2 ++ + gprofng/libcollector/dispatcher.c | 2 +- + gprofng/libcollector/libcol_util.c | 9 --------- + gprofng/libcollector/linetrace.c | 10 +++++----- + gprofng/src/collector_module.h | 1 - + gprofng/testsuite/gprofng.display/mttest/mttest.c | 2 +- + gprofng/testsuite/gprofng.display/synprog/endcases.c | 4 ++-- + gprofng/testsuite/gprofng.display/synprog/inc_inline.h | 2 +- + gprofng/testsuite/gprofng.display/synprog/synprog.c | 4 ++-- + 9 files changed, 14 insertions(+), 22 deletions(-) + +diff --git a/gprofng/common/cpuid.c b/gprofng/common/cpuid.c +index af15439eb27..0373969693b 100644 +--- a/gprofng/common/cpuid.c ++++ b/gprofng/common/cpuid.c +@@ -21,7 +21,9 @@ + #if defined(__i386__) || defined(__x86_64) + #include /* GCC-provided */ + #elif defined(__aarch64__) ++#if !defined(ATTRIBUTE_UNUSED) + #define ATTRIBUTE_UNUSED __attribute__((unused)) ++#endif + + static inline uint_t __attribute_const__ + __get_cpuid (unsigned int op ATTRIBUTE_UNUSED, unsigned int *eax, +diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c +index 5ee0bf895bf..e85c343c776 100644 +--- a/gprofng/libcollector/dispatcher.c ++++ b/gprofng/libcollector/dispatcher.c +@@ -1281,4 +1281,4 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, + // weak symbols: + int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); + int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); +-int setitimer () __attribute__ ((weak, alias ("_setitimer"))); ++__typeof(setitimer) setitimer __attribute__ ((weak, alias ("_setitimer"))); +diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c +index 688bdf19c6d..46f8b80ccb4 100644 +--- a/gprofng/libcollector/libcol_util.c ++++ b/gprofng/libcollector/libcol_util.c +@@ -1427,15 +1427,6 @@ __collector_util_init () + err = COL_ERROR_UTIL_INIT; + } + +- ptr = dlsym (libc, "sysinfo"); +- if (ptr) +- __collector_util_funcs.sysinfo = (long (*)())ptr; +- else +- { +- CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysinfo: %s\n", dlerror ()); +- err = COL_ERROR_UTIL_INIT; +- } +- + ptr = dlsym (libc, "clearenv"); + if (ptr) + __collector_util_funcs.clearenv = (int(*)())ptr; +diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c +index 66844bc1337..c81ae1a2272 100644 +--- a/gprofng/libcollector/linetrace.c ++++ b/gprofng/libcollector/linetrace.c +@@ -1527,7 +1527,7 @@ DCL_FUNC_VER (DCL_POSIX_SPAWNP, posix_spawnp_2_2, posix_spawnp@GLIBC_2.2) + DCL_POSIX_SPAWNP (posix_spawnp) + + /*------------------------------------------------------------- system */ +-int system () __attribute__ ((weak, alias ("__collector_system"))); ++int system (const char *cmd) __attribute__ ((weak, alias ("__collector_system"))); + + int + __collector_system (const char *cmd) +@@ -1582,10 +1582,10 @@ DCL_FUNC_VER (DCL_POPEN, popen_2_0, popen@GLIBC_2.0) + DCL_POPEN (popen) + + /*------------------------------------------------------------- grantpt */ +-int grantpt () __attribute__ ((weak, alias ("__collector_grantpt"))); ++int grantpt (int fildes) __attribute__ ((weak, alias ("__collector_grantpt"))); + + int +-__collector_grantpt (const int fildes) ++__collector_grantpt (int fildes) + { + if (NULL_PTR (grantpt)) + init_lineage_intf (); +@@ -1607,10 +1607,10 @@ __collector_grantpt (const int fildes) + } + + /*------------------------------------------------------------- ptsname */ +-char *ptsname () __attribute__ ((weak, alias ("__collector_ptsname"))); ++char *ptsname (int fildes) __attribute__ ((weak, alias ("__collector_ptsname"))); + + char * +-__collector_ptsname (const int fildes) ++__collector_ptsname (int fildes) + { + if (NULL_PTR (ptsname)) + init_lineage_intf (); +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index fd888cd58dd..6640f12fa3c 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -107,7 +107,6 @@ typedef struct CollectorUtilFuncs + int (*symlink)(const char *s1, const char *s2); + int (*syscall)(int number, ...); + long (*sysconf)(int name); +- long (*sysinfo)(int command, char *buf, long count); + time_t (*time)(time_t *tloc); + int (*unsetenv)(const char *name); + int (*vsnprintf)(char *str, size_t size, const char *format, ...); +diff --git a/gprofng/testsuite/gprofng.display/mttest/mttest.c b/gprofng/testsuite/gprofng.display/mttest/mttest.c +index e0835c833e5..3db5b8d8e86 100644 +--- a/gprofng/testsuite/gprofng.display/mttest/mttest.c ++++ b/gprofng/testsuite/gprofng.display/mttest/mttest.c +@@ -171,7 +171,7 @@ void computeJ (workStruct_t *x); + void computeK (workStruct_t *x); + void addone (workCtr_t *x); + void init_arrays (int strat); +-void dump_arrays (); ++void dump_arrays (hrtime_t real, hrtime_t cpu, int case_index); + void *do_work (void *v); + void thread_work (); + void nothreads (Workblk *array, struct scripttab *k); +diff --git a/gprofng/testsuite/gprofng.display/synprog/endcases.c b/gprofng/testsuite/gprofng.display/synprog/endcases.c +index a6a1389658a..6f1c83b6859 100644 +--- a/gprofng/testsuite/gprofng.display/synprog/endcases.c ++++ b/gprofng/testsuite/gprofng.display/synprog/endcases.c +@@ -40,8 +40,8 @@ static void s_inline_code (int); + void ext_inline_code (int); + + #ifndef NO_INLINE +-void xinline_code () __attribute__ ((always_inline)); +-void s_inline_code () __attribute__ ((always_inline)); ++void xinline_code (int) __attribute__ ((always_inline)); ++void s_inline_code (int) __attribute__ ((always_inline)); + #endif + + #include "inc_inline.h" +diff --git a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h +index da42563c828..6600eacb66d 100644 +--- a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h ++++ b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h +@@ -19,7 +19,7 @@ + MA 02110-1301, USA. */ + + #ifndef NO_INLINE +-void ext_inline_code() __attribute__ ((always_inline)); ++void ext_inline_code(int) __attribute__ ((always_inline)); + #endif + + void +diff --git a/gprofng/testsuite/gprofng.display/synprog/synprog.c b/gprofng/testsuite/gprofng.display/synprog/synprog.c +index cf1bc5b0909..05920dc7419 100644 +--- a/gprofng/testsuite/gprofng.display/synprog/synprog.c ++++ b/gprofng/testsuite/gprofng.display/synprog/synprog.c +@@ -528,14 +528,14 @@ reapchildren () + int + doabort (int k) + { +- char *nullptr = NULL; ++ char *p = NULL; + char c; + + /* Log the event */ + wlog ("start of doabort", NULL); + + /* and dereference a NULL */ +- c = *nullptr; ++ c = *p; + + /* this should never be reached */ + return (int) c; +-- +2.50.1 + diff --git a/package/binutils/2.43.1/0003-objdump-memleak.patch b/package/binutils/2.43.1/0003-objdump-memleak.patch new file mode 100644 index 0000000000..1b1632093d --- /dev/null +++ b/package/binutils/2.43.1/0003-objdump-memleak.patch @@ -0,0 +1,31 @@ +From ba6ad3a18cb26b79e0e3b84c39f707535bbc344d Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Wed, 19 Feb 2025 07:58:54 +1030 +Subject: [PATCH] PR32716, objdump -i memory leak + +PR binutils/32716 +* bucomm.c (display_info): Free arg.info. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ba6ad3a18cb26b79e0e3b84c39f707535bbc344d + +CVE: CVE-2025-3198 +Signed-off-by: Titouan Christophe +--- + binutils/bucomm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/binutils/bucomm.c b/binutils/bucomm.c +index ccf54099154..d4554737db1 100644 +--- a/binutils/bucomm.c ++++ b/binutils/bucomm.c +@@ -435,6 +435,7 @@ display_info (void) + if (!arg.error) + display_target_tables (&arg); + ++ free (arg.info); + return arg.error; + } + +-- +2.43.5 + diff --git a/package/binutils/2.43.1/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch b/package/binutils/2.43.1/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch new file mode 100644 index 0000000000..f9b870afa2 --- /dev/null +++ b/package/binutils/2.43.1/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch @@ -0,0 +1,90 @@ +From 8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 16 Nov 2024 05:03:52 +0000 +Subject: [PATCH] opcodes: fix -std=gnu23 compatibility wrt static_assert + +static_assert is declared in C23 so we can't reuse that identifier: +* Define our own static_assert conditionally; + +* Rename "static assert" hacks to _N as we do already in some places + to avoid a conflict. + +ChangeLog: + PR ld/32372 + + * i386-gen.c (static_assert): Define conditionally. + * mips-formats.h (MAPPED_INT): Rename identifier. + (MAPPED_REG): Rename identifier. + (OPTIONAL_MAPPED_REG): Rename identifier. + * s390-opc.c (static_assert): Define conditionally. + +Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 +Signed-off-by: Raphaël Mélotte +--- + opcodes/i386-gen.c | 2 ++ + opcodes/mips-formats.h | 6 +++--- + opcodes/s390-opc.c | 2 ++ + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c +index 053b66675c5..7ee8a30310c 100644 +--- a/opcodes/i386-gen.c ++++ b/opcodes/i386-gen.c +@@ -30,7 +30,9 @@ + + /* Build-time checks are preferrable over runtime ones. Use this construct + in preference where possible. */ ++#ifndef static_assert + #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) ++#endif + + static const char *program_name = NULL; + static int debug = 0; +diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h +index 90df7100803..c4dec6352bf 100644 +--- a/opcodes/mips-formats.h ++++ b/opcodes/mips-formats.h +@@ -49,7 +49,7 @@ + #define MAPPED_INT(SIZE, LSB, MAP, PRINT_HEX) \ + { \ + typedef char ATTRIBUTE_UNUSED \ +- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ ++ static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ + static const struct mips_mapped_int_operand op = { \ + { OP_MAPPED_INT, SIZE, LSB }, MAP, PRINT_HEX \ + }; \ +@@ -83,7 +83,7 @@ + #define MAPPED_REG(SIZE, LSB, BANK, MAP) \ + { \ + typedef char ATTRIBUTE_UNUSED \ +- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ ++ static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ + static const struct mips_reg_operand op = { \ + { OP_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ + }; \ +@@ -93,7 +93,7 @@ + #define OPTIONAL_MAPPED_REG(SIZE, LSB, BANK, MAP) \ + { \ + typedef char ATTRIBUTE_UNUSED \ +- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ ++ static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ + static const struct mips_reg_operand op = { \ + { OP_OPTIONAL_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ + }; \ +diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c +index 9d9f0973e55..49efd714157 100644 +--- a/opcodes/s390-opc.c ++++ b/opcodes/s390-opc.c +@@ -36,7 +36,9 @@ + + /* Build-time checks are preferrable over runtime ones. Use this construct + in preference where possible. */ ++#ifndef static_assert + #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) ++#endif + + #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +-- +2.34.1 + diff --git a/package/binutils/2.43.1/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch b/package/binutils/2.43.1/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch new file mode 100644 index 0000000000..1f28137190 --- /dev/null +++ b/package/binutils/2.43.1/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch @@ -0,0 +1,801 @@ +From 3e8c6e03675963d65a2f98eb006336c5cd375ec3 Mon Sep 17 00:00:00 2001 +From: Vladimir Mezentsev +Date: Tue, 3 Sep 2024 21:30:31 -0700 +Subject: [PATCH] Fix 32097 Warnings when building gprofng with Clang + +gprofng/ChangeLog +2024-09-03 Vladimir Mezentsev . + + PR gprofng/32097 + * common/hwcdrv.c: Fix -Wempty-body warnings. + * common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings. + * common/hwctable.c: Fix -Wdeprecated-non-prototype warnings. + * libcollector/collector.c: Likewise. + * libcollector/collector.h: Likewise. + * libcollector/collectorAPI.c: Likewise. + * libcollector/dispatcher.c: Likewise. + * libcollector/iotrace.c: Likewise. + * libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings. + * libcollector/libcol_util.h: Remove unused declarations. + * libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings. + * src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings. + * src/Dbe.cc: Fix -Wself-assign warnings. + * src/DbeSession.cc: Fix -Wunused-but-set-variable warnings. + * src/Disasm.cc: Fix -Wunused-const-variable warnings. + * src/Experiment.cc: Fix -Wunused-private-field warnings. + * src/HashMap.h: Fix -Wself-assign warnings. + * src/IOActivity.h: Fix -Wunused-private-field warnings. + * src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings. + * src/collctrl.h: Fix -Wunused-private-field warnings. + * src/collector_module.h: Fix -Wdeprecated-non-prototype warnings. + * src/gp-display-src.cc: Fix -Wunused-private-field warnings. + * src/gp-print.h: Fix -Wheader-guard warnings. + * src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings. + * src/util.cc: Fix -Wunused-but-set-variable warnings. + +Upstream: b79c457ca01df82dbe1facb708e45def4584c903 +Signed-off-by: Thomas Petazzoni +--- + gprofng/common/hwcdrv.c | 3 ++- + gprofng/common/hwcentry.h | 7 +---- + gprofng/common/hwctable.c | 13 +--------- + gprofng/libcollector/collector.c | 15 ++++------- + gprofng/libcollector/collector.h | 2 +- + gprofng/libcollector/collectorAPI.c | 15 ++++++----- + gprofng/libcollector/dispatcher.c | 19 ++++++++------ + gprofng/libcollector/iotrace.c | 12 ++++----- + gprofng/libcollector/libcol_util.c | 2 -- + gprofng/libcollector/libcol_util.h | 6 ----- + gprofng/libcollector/linetrace.c | 40 +++++++++++++++++------------ + gprofng/src/BaseMetricTreeNode.h | 1 - + gprofng/src/Dbe.cc | 12 ++++----- + gprofng/src/DbeSession.cc | 3 --- + gprofng/src/Disasm.cc | 1 - + gprofng/src/Experiment.cc | 2 -- + gprofng/src/HashMap.h | 3 +-- + gprofng/src/IOActivity.h | 1 - + gprofng/src/collctrl.cc | 14 +++++----- + gprofng/src/collctrl.h | 1 - + gprofng/src/collector_module.h | 20 +++++++-------- + gprofng/src/gp-display-src.cc | 8 ------ + gprofng/src/gp-print.h | 2 +- + gprofng/src/hwc_intel_icelake.h | 6 +++-- + gprofng/src/util.cc | 10 +++----- + 25 files changed, 88 insertions(+), 130 deletions(-) + +diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c +index aaf3acdf9cd..51492a8d35c 100644 +--- a/gprofng/common/hwcdrv.c ++++ b/gprofng/common/hwcdrv.c +@@ -574,6 +574,7 @@ read_sample (counter_state_t *ctr_state, int msgsz, uint64_t *rvalue, + static void + dump_perf_event_attr (struct perf_event_attr *at) + { ++#if defined(DEBUG) + TprintfT (DBG_LT2, "dump_perf_event_attr: size=%d type=%d sample_period=%lld\n" + " config=0x%llx config1=0x%llx config2=0x%llx wakeup_events=%lld __reserved_1=%lld\n", + (int) at->size, (int) at->type, (unsigned long long) at->sample_period, +@@ -589,13 +590,13 @@ dump_perf_event_attr (struct perf_event_attr *at) + DUMP_F (exclude_kernel); + DUMP_F (exclude_hv); + DUMP_F (exclude_idle); +- // DUMP_F(xmmap); + DUMP_F (comm); + DUMP_F (freq); + DUMP_F (inherit_stat); + DUMP_F (enable_on_exec); + DUMP_F (task); + DUMP_F (watermark); ++#endif + } + + static void +diff --git a/gprofng/common/hwcentry.h b/gprofng/common/hwcentry.h +index b2ab8b9b22c..0b923fc3576 100644 +--- a/gprofng/common/hwcentry.h ++++ b/gprofng/common/hwcentry.h +@@ -200,17 +200,12 @@ extern "C" + extern char *hwc_get_docref (char *buf, size_t buflen); + /* Return a CPU HWC document reference, or NULL. */ + +- // TBR +- extern char *hwc_get_default_cntrs (); +- /* Return a default HW counter string; may be NULL, or zero-length */ +- /* NULL means none is defined in the table; or zero-length means string defined could not be loaded */ +- + extern char *hwc_get_default_cntrs2 (int forKernel, int style); + /* like hwc_get_default_cntrs() for style==1 */ + /* but allows other styles of formatting as well */ + /* deprecate and eventually remove hwc_get_default_cntrs() */ + +- extern char *hwc_get_orig_default_cntrs (); ++ extern char *hwc_get_orig_default_cntrs (int forKernel); + /* Get the default HW counter string as set in the table */ + /* NULL means none is defined in the table */ + +diff --git a/gprofng/common/hwctable.c b/gprofng/common/hwctable.c +index 0baf63b1805..338a1ea86f4 100644 +--- a/gprofng/common/hwctable.c ++++ b/gprofng/common/hwctable.c +@@ -1783,7 +1783,7 @@ check_tables () + } + #endif + +-static int try_a_counter (); ++static int try_a_counter (int forKernel); + static void hwc_process_raw_ctrs (int forKernel, Hwcentry ***pstd_out, + Hwcentry ***praw_out, Hwcentry ***phidden_out, + Hwcentry**static_tables, +@@ -2824,17 +2824,6 @@ hwc_get_docref (char *buf, size_t buflen) + return buf; + } + +-//TBR: +- +-extern char* +-hwc_get_default_cntrs () +-{ +- setup_cpcx (); +- if (cpcx_default_hwcs[0] != NULL) +- return strdup (cpcx_default_hwcs[0]); // TBR deprecate this +- return NULL; +-} +- + extern char* + hwc_get_default_cntrs2 (int forKernel, int style) + { +diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c +index 3a8f27a719d..2ff95e58fde 100644 +--- a/gprofng/libcollector/collector.c ++++ b/gprofng/libcollector/collector.c +@@ -210,15 +210,10 @@ get_collector_interface () + static void + collector_module_init (CollectorInterface *col_intf) + { +- int nmodules = 0; +- + ModuleInitFunc next_init = (ModuleInitFunc) dlsym (RTLD_DEFAULT, "__collector_module_init"); + if (next_init != NULL) +- { +- nmodules++; +- next_init (col_intf); +- } +- TprintfT (DBG_LT1, "collector_module_init: %d modules\n", nmodules); ++ next_init (col_intf); ++ TprintfT (DBG_LT1, "collector_module_init: %d modules\n", next_init ? 1 : 0); + } + + /* Routines concerned with general experiment start and stop */ +@@ -1783,7 +1778,7 @@ __collector_pause () + } + + void +-__collector_pause_m (char *reason) ++__collector_pause_m (const char *reason) + { + hrtime_t now; + char xreason[MAXPATHLEN]; +@@ -2449,8 +2444,8 @@ __collector_dlog (int tflag, int level, char *format, ...) + + static void (*__real__exit) (int status) = NULL; /* libc only: _exit */ + static void (*__real__Exit) (int status) = NULL; /* libc only: _Exit */ +-void _exit () __attribute__ ((weak, alias ("__collector_exit"))); +-void _Exit () __attribute__ ((weak, alias ("__collector_Exit"))); ++void _exit (int status) __attribute__ ((weak, alias ("__collector_exit"))); ++void _Exit (int status) __attribute__ ((weak, alias ("__collector_Exit"))); + + void + __collector_exit (int status) +diff --git a/gprofng/libcollector/collector.h b/gprofng/libcollector/collector.h +index 07a03bdd17a..eda68a0e4f5 100644 +--- a/gprofng/libcollector/collector.h ++++ b/gprofng/libcollector/collector.h +@@ -123,7 +123,7 @@ extern void __collector_terminate_expt (); + extern void __collector_terminate_hook (); + extern void __collector_sample (char *name); + extern void __collector_pause (); +-extern void __collector_pause_m (); ++extern void __collector_pause_m (const char *reason); + extern void __collector_resume (); + extern int collector_sigemt_sigaction (const struct sigaction*, + struct sigaction*); +diff --git a/gprofng/libcollector/collectorAPI.c b/gprofng/libcollector/collectorAPI.c +index 5fa6403ad49..449bbbaab65 100644 +--- a/gprofng/libcollector/collectorAPI.c ++++ b/gprofng/libcollector/collectorAPI.c +@@ -26,16 +26,17 @@ + #include "collectorAPI.h" + #include "gp-experiment.h" + +-static void *__real_collector_sample = NULL; +-static void *__real_collector_pause = NULL; +-static void *__real_collector_resume = NULL; +-static void *__real_collector_terminate_expt = NULL; +-static void *__real_collector_func_load = NULL; +-static void *__real_collector_func_unload = NULL; ++static void (*__real_collector_sample)(const char *) = NULL; ++static void (*__real_collector_pause)() = NULL; ++static void (*__real_collector_resume)() = NULL; ++static void (*__real_collector_terminate_expt)() = NULL; ++static void (*__real_collector_func_load)(const char *, const char *, ++ const char *, void *, int, int, Lineno *) = NULL; ++static void (*__real_collector_func_unload)(void *) = NULL; + + #define INIT_API if (init_API == 0) collectorAPI_initAPI() + #define NULL_PTR(x) (__real_##x == NULL) +-#define CALL_REAL(x) (*(void(*)())__real_##x) ++#define CALL_REAL(x) (__real_##x) + #define CALL_IF_REAL(x) INIT_API; if (!NULL_PTR(x)) CALL_REAL(x) + + static int init_API = 0; +diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c +index 8b8ad77b5ee..f7cd46e7e6b 100644 +--- a/gprofng/libcollector/dispatcher.c ++++ b/gprofng/libcollector/dispatcher.c +@@ -908,8 +908,9 @@ sigset (int sig, sighandler_t handler) + + // map interposed symbol versions + static int +-gprofng_timer_create (int (real_func) (), clockid_t clockid, +- struct sigevent *sevp, timer_t *timerid) ++gprofng_timer_create (int (real_func) (clockid_t, struct sigevent *, timer_t *), ++ clockid_t clockid, ++ struct sigevent *sevp, timer_t *timerid) + { + // collector reserves SIGPROF + if (sevp == NULL || sevp->sigev_notify != SIGEV_SIGNAL || +@@ -1044,7 +1045,7 @@ __collector_thr_sigsetmask (int how, const sigset_t* iset, sigset_t* oset) + // map interposed symbol versions + + static int +-gprofng_pthread_sigmask (int (real_func) (), ++gprofng_pthread_sigmask (int (real_func) (int, const sigset_t *, sigset_t*), + int how, const sigset_t *iset, sigset_t* oset) + { + sigset_t lsigset; +@@ -1139,9 +1140,10 @@ collector_root (void *cargs) + // map interposed symbol versions + + static int +-gprofng_pthread_create (int (real_func) (), pthread_t *thread, +- const pthread_attr_t *attr, +- void *(*func)(void*), void *arg) ++gprofng_pthread_create (int (real_func) (pthread_t *, const pthread_attr_t *, ++ void *(*)(void *), void *), ++ pthread_t *thread, const pthread_attr_t *attr, ++ void *(*func)(void*), void *arg) + { + TprintfT (DBG_LTT, "gprofng_pthread_create @%p\n", real_func); + if (dispatch_mode != DISPATCH_ON) +@@ -1276,6 +1278,7 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, + } + + // weak symbols: +-int sigprocmask () __attribute__ ((weak, alias ("__collector_sigprocmask"))); +-int thr_sigsetmask () __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); ++int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); ++int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); + int setitimer () __attribute__ ((weak, alias ("_setitimer"))); ++ +diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c +index 18060864796..3deb441d9c7 100644 +--- a/gprofng/libcollector/iotrace.c ++++ b/gprofng/libcollector/iotrace.c +@@ -1350,7 +1350,7 @@ mkstemp (char *template) + unsigned pktSize; + if (NULL_PTR (mkstemp)) + init_io_intf (); +- if (CHCK_REENTRANCE (guard) || template == NULL) ++ if (CHCK_REENTRANCE (guard)) + return CALL_REAL (mkstemp)(template); + PUSH_REENTRANCE (guard); + hrtime_t reqt = gethrtime (); +@@ -1405,7 +1405,7 @@ mkstemps (char *template, int slen) + unsigned pktSize; + if (NULL_PTR (mkstemps)) + init_io_intf (); +- if (CHCK_REENTRANCE (guard) || template == NULL) ++ if (CHCK_REENTRANCE (guard)) + return CALL_REAL (mkstemps)(template, slen); + PUSH_REENTRANCE (guard); + hrtime_t reqt = gethrtime (); +@@ -1485,7 +1485,7 @@ close (int fildes) + + /*------------------------------------------------------------- fopen */ + static FILE* +-gprofng_fopen (FILE*(real_fopen) (), const char *filename, const char *mode) ++gprofng_fopen (FILE*(real_fopen) (const char *, const char *), const char *filename, const char *mode) + { + int *guard; + FILE *fp = NULL; +@@ -1559,7 +1559,7 @@ DCL_FOPEN (fopen) + + /*------------------------------------------------------------- fclose */ + static int +-gprofng_fclose (int(real_fclose) (), FILE *stream) ++gprofng_fclose (int(real_fclose) (FILE *), FILE *stream) + { + int *guard; + int stat; +@@ -1645,7 +1645,7 @@ fflush (FILE *stream) + + /*------------------------------------------------------------- fdopen */ + static FILE* +-gprofng_fdopen (FILE*(real_fdopen) (), int fildes, const char *mode) ++gprofng_fdopen (FILE*(real_fdopen) (int, const char *), int fildes, const char *mode) + { + int *guard; + FILE *fp = NULL; +@@ -2957,7 +2957,7 @@ DCL_FGETPOS (fgetpos) + + /*------------------------------------------------------------- fgetpos64 */ + static int +-gprofng_fgetpos64 (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos) ++gprofng_fgetpos64 (int(real_fgetpos64) (FILE *, fpos64_t *), FILE *stream, fpos64_t *pos) + { + int *guard; + int ret; +diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c +index 1e58cf491a1..baac15db5c4 100644 +--- a/gprofng/libcollector/libcol_util.c ++++ b/gprofng/libcollector/libcol_util.c +@@ -1013,7 +1013,6 @@ __collector_open (const char *path, int oflag, ...) + mode_t mode = 0; + + hrtime_t t_timeout = __collector_gethrtime () + 5 * ((hrtime_t) NANOSEC); +- int nretries = 0; + long long delay = 100; /* start at some small, arbitrary value */ + + /* get optional mode argument if it's expected/required */ +@@ -1058,7 +1057,6 @@ __collector_open (const char *path, int oflag, ...) + delay *= 2; + if (delay > 100000000) + delay = 100000000; /* cap at some large, arbitrary value */ +- nretries++; + } + return fd; + } +diff --git a/gprofng/libcollector/libcol_util.h b/gprofng/libcollector/libcol_util.h +index c8ec83ff0d9..aa30db72bcc 100644 +--- a/gprofng/libcollector/libcol_util.h ++++ b/gprofng/libcollector/libcol_util.h +@@ -81,12 +81,6 @@ extern int __collector_mutex_trylock (collector_mutex_t *mp); + #define __collector_mutex_init(xx) \ + do { collector_mutex_t tmp=COLLECTOR_MUTEX_INITIALIZER; *(xx)=tmp; } while(0) + +-void __collector_sample (char *name); +-void __collector_terminate_expt (); +-void __collector_pause (); +-void __collector_pause_m (); +-void __collector_resume (); +- + struct DT_lineno; + + typedef enum +diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c +index 67b2d7e9030..66844bc1337 100644 +--- a/gprofng/libcollector/linetrace.c ++++ b/gprofng/libcollector/linetrace.c +@@ -1207,7 +1207,7 @@ __collector_vfork (void) + } + + /*------------------------------------------------------------- execve */ +-int execve () __attribute__ ((weak, alias ("__collector_execve"))); ++int execve (const char *, char *const [], char *const []) __attribute__ ((weak, alias ("__collector_execve"))); + + int + __collector_execve (const char* path, char *const argv[], char *const envp[]) +@@ -1237,7 +1237,7 @@ __collector_execve (const char* path, char *const argv[], char *const envp[]) + return ret; + } + +-int execvp () __attribute__ ((weak, alias ("__collector_execvp"))); ++int execvp (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execvp"))); + + int + __collector_execvp (const char* file, char *const argv[]) +@@ -1269,7 +1269,7 @@ __collector_execvp (const char* file, char *const argv[]) + return ret; + } + +-int execv () __attribute__ ((weak, alias ("__collector_execv"))); ++int execv (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execv"))); + + int + __collector_execv (const char* path, char *const argv[]) +@@ -1408,7 +1408,10 @@ __collector_execl (const char* path, const char *arg0, ...) + /*-------------------------------------------------------- posix_spawn */ + // map interposed symbol versions + static int +-gprofng_posix_spawn (int(real_posix_spawn) (), ++gprofng_posix_spawn (int(real_posix_spawn) (pid_t *, const char *, ++ const posix_spawn_file_actions_t *, ++ const posix_spawnattr_t *, ++ char *const [], char *const []), + pid_t *pidp, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, +@@ -1466,7 +1469,10 @@ DCL_POSIX_SPAWN (posix_spawn) + + /*-------------------------------------------------------- posix_spawnp */ + static int +-gprofng_posix_spawnp (int (real_posix_spawnp) (), ++gprofng_posix_spawnp (int (real_posix_spawnp) (pid_t *, const char *, ++ const posix_spawn_file_actions_t *, ++ const posix_spawnattr_t *, ++ char *const [], char *const []), + pid_t *pidp, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, +@@ -1754,8 +1760,8 @@ __collector_clone (int (*fn)(void *), void *child_stack, int flags, void *arg, + } + + /*-------------------------------------------------------------------- setuid */ +-int setuid () __attribute__ ((weak, alias ("__collector_setuid"))); +-int _setuid () __attribute__ ((weak, alias ("__collector_setuid"))); ++int setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); ++int _setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); + + int + __collector_setuid (uid_t ruid) +@@ -1770,8 +1776,8 @@ __collector_setuid (uid_t ruid) + } + + /*------------------------------------------------------------------- seteuid */ +-int seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); +-int _seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); ++int seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); ++int _seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); + + int + __collector_seteuid (uid_t euid) +@@ -1786,8 +1792,8 @@ __collector_seteuid (uid_t euid) + } + + /*------------------------------------------------------------------ setreuid */ +-int setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); +-int _setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); ++int setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); ++int _setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); + + int + __collector_setreuid (uid_t ruid, uid_t euid) +@@ -1802,8 +1808,8 @@ __collector_setreuid (uid_t ruid, uid_t euid) + } + + /*-------------------------------------------------------------------- setgid */ +-int setgid () __attribute__ ((weak, alias ("__collector_setgid"))); +-int _setgid () __attribute__ ((weak, alias ("__collector_setgid"))); ++int setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); ++int _setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); + + int + __collector_setgid (gid_t rgid) +@@ -1818,8 +1824,8 @@ __collector_setgid (gid_t rgid) + } + + /*------------------------------------------------------------------- setegid */ +-int setegid () __attribute__ ((weak, alias ("__collector_setegid"))); +-int _setegid () __attribute__ ((weak, alias ("__collector_setegid"))); ++int setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); ++int _setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); + + int + __collector_setegid (gid_t egid) +@@ -1834,8 +1840,8 @@ __collector_setegid (gid_t egid) + } + + /*------------------------------------------------------------------ setregid */ +-int setregid () __attribute__ ((weak, alias ("__collector_setregid"))); +-int _setregid () __attribute__ ((weak, alias ("__collector_setregid"))); ++int setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); ++int _setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); + + int + __collector_setregid (gid_t rgid, gid_t egid) +diff --git a/gprofng/src/BaseMetricTreeNode.h b/gprofng/src/BaseMetricTreeNode.h +index d73d244e27e..7698f9c6eaf 100644 +--- a/gprofng/src/BaseMetricTreeNode.h ++++ b/gprofng/src/BaseMetricTreeNode.h +@@ -85,7 +85,6 @@ private: + + BaseMetricTreeNode *root; // root of tree + BaseMetricTreeNode *parent; // my parent +- bool aggregation; // value is based on children's values + char *name; // bm->get_cmd() for metrics, unique string otherwise + char *uname; // user-visible text + char *unit; // see UNIT_* defines +diff --git a/gprofng/src/Dbe.cc b/gprofng/src/Dbe.cc +index 95daa727186..09b7f94eaa8 100644 +--- a/gprofng/src/Dbe.cc ++++ b/gprofng/src/Dbe.cc +@@ -9591,14 +9591,12 @@ dbeGetTLDataRepVals (VMode view_mode, hrtime_t start_ts, hrtime_t delta, + } + if (sampleVals != NULL) + { +- Sample* sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); +- if (!sample || !sample->get_usage ()) +- sample = sample; +- else ++ Sample *sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); ++ if (sample != NULL) + { +- PrUsage* prusage = sample->get_usage (); +- Vector *mstateVals = prusage->getMstateValues (); +- sampleVals->store (eventIdx, mstateVals); ++ PrUsage *prusage = sample->get_usage (); ++ if (prusage != NULL) ++ sampleVals->store (eventIdx, prusage->getMstateValues ()); + } + } + } +diff --git a/gprofng/src/DbeSession.cc b/gprofng/src/DbeSession.cc +index a6808d8d8f6..3649357bc79 100644 +--- a/gprofng/src/DbeSession.cc ++++ b/gprofng/src/DbeSession.cc +@@ -1164,8 +1164,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) + closedir (exp_dir); + exp_names->sort (dir_name_cmp); + Experiment **t_exp_list = new Experiment *[exp_names->size ()]; +- int nsubexps = 0; +- + for (int j = 0, jsz = exp_names->size (); j < jsz; j++) + { + t_exp_list[j] = NULL; +@@ -1222,7 +1220,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) + dexp->open (dpath); + append (dexp); + t_exp_list[j] = dexp; +- nsubexps++; + dexp->set_clock (exp->clock); + + // DbeView add_experiment() is split into two parts +diff --git a/gprofng/src/Disasm.cc b/gprofng/src/Disasm.cc +index e41bf679292..19f2174d536 100644 +--- a/gprofng/src/Disasm.cc ++++ b/gprofng/src/Disasm.cc +@@ -49,7 +49,6 @@ struct DisContext + }; + + static const int MAX_DISASM_STR = 2048; +-static const int MAX_INSTR_SIZE = 8; + + Disasm::Disasm (char *fname) + { +diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc +index a1f78fc0cde..627a755c88c 100644 +--- a/gprofng/src/Experiment.cc ++++ b/gprofng/src/Experiment.cc +@@ -1937,8 +1937,6 @@ private: + } + + Experiment *exp; +- char *hostname; +- hrtime_t time, tstamp; + }; + + void +diff --git a/gprofng/src/HashMap.h b/gprofng/src/HashMap.h +index 918c0dc95f9..c5fdd345ba8 100644 +--- a/gprofng/src/HashMap.h ++++ b/gprofng/src/HashMap.h +@@ -78,9 +78,8 @@ copy_key (uint64_t a) + } + + template<> inline void +-delete_key (uint64_t a) ++delete_key (uint64_t) + { +- a = a; + } + + template<> inline int +diff --git a/gprofng/src/IOActivity.h b/gprofng/src/IOActivity.h +index cf462cf8d55..f3a22ada6b1 100644 +--- a/gprofng/src/IOActivity.h ++++ b/gprofng/src/IOActivity.h +@@ -78,7 +78,6 @@ private: + Hist_data *hist_data_file_all; + Hist_data *hist_data_vfd_all; + Hist_data *hist_data_callstack_all; +- Hist_data *hist_data_callstack; + + DbeView *dbev; + }; +diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc +index 029c0387f19..c0234130f00 100644 +--- a/gprofng/src/collctrl.cc ++++ b/gprofng/src/collctrl.cc +@@ -880,9 +880,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn) + double dval = strtod (string, &endchar); + if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */ + dval = dval * 1000.; +- else if (*endchar == 'u') /* user specified microseconds */ +- dval = dval; +- else ++ else if (*endchar != 'u') + return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string); + nclkprof_timer = (int) (dval + 0.5); + } +@@ -2791,7 +2789,7 @@ Coll_Ctrl::get (char * control) + } + if (!strncmp (control, ipc_str_javaprof, len)) + { +- if ((java_mode == 0)) ++ if (java_mode == 0) + return strdup (ipc_str_off); + return strdup (ipc_str_on); + } +@@ -2807,7 +2805,7 @@ Coll_Ctrl::get (char * control) + } + if (!strncmp (control, ipc_str_sample_sig, len)) + { +- if ((sample_sig == 0)) ++ if (sample_sig == 0) + return strdup (ipc_str_off); + char *str_signal = find_signal_name (sample_sig); + if (str_signal != NULL) +@@ -2841,15 +2839,15 @@ Coll_Ctrl::get (char * control) + } + if (!strncmp (control, ipc_str_iotrace, len)) + { +- if ((iotrace_enabled == 0)) ++ if (iotrace_enabled == 0) + return strdup (ipc_str_off); + return strdup (ipc_str_on); + } + if (!strncmp (control, ipc_str_count, len)) + { +- if ((count_enabled == 0)) ++ if (count_enabled == 0) + return strdup (ipc_str_off); +- if ((count_enabled < 0)) ++ if (count_enabled < 0) + return strdup ("on\nstatic"); + return strdup (ipc_str_on); + } +diff --git a/gprofng/src/collctrl.h b/gprofng/src/collctrl.h +index a41647440ac..e2a8e450890 100644 +--- a/gprofng/src/collctrl.h ++++ b/gprofng/src/collctrl.h +@@ -272,7 +272,6 @@ private: + char *node_name; /* name of machine on which experiment is run */ + long ncpus; /* number of online CPUs */ + int cpu_clk_freq; /* chip clock (MHz.), as reported from processor_info */ +- int cpc_cpuver; /* chip version, as reported from libcpc */ + long sys_resolution; /* system clock resolution */ + int sample_period; /* period for sampling, seconds */ + int sample_default; /* if period for sampling set by default */ +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index bb48eadb9f8..ebcdbca561f 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -40,12 +40,12 @@ struct tm; + * If you add any, please put it in the right place */ + typedef struct CollectorUtilFuncs + { +- int (*access)(); ++ int (*access)(const char *, int); + int (*atoi)(const char *nptr); + void *(*calloc)(size_t nelem, size_t elsize); + int (*clearenv)(void); + int (*close)(int); +- int (*closedir)(); ++ int (*closedir)(DIR *); + int (*execv)(const char *path, char *const argv[]); + void (*exit)(int status); + int (*fclose)(FILE *stream); +@@ -66,20 +66,20 @@ typedef struct CollectorUtilFuncs + off_t (*lseek)(int fd, off_t offset, int whence); + void *(*malloc)(size_t size); + void *(*memset)(void *s1, int c, size_t n); +- int (*mkdir)(); ++ int (*mkdir)(const char *, mode_t); + time_t (*mktime)(struct tm *timeptr); + void *(*mmap)(void *, size_t, int, int, int, off_t); +- void *(*mmap64_)(); +- int (*munmap)(); ++ void *(*mmap64_)(void *, size_t, int, int, int, off_t); ++ int (*munmap)(void *, size_t); + int (*open)(const char *, int, ...); + int (*open_bare)(const char *, int, ...); +- DIR *(*opendir)(); ++ DIR *(*opendir)(const char *); + int (*pclose)(FILE *stream); + FILE *(*popen)(const char *command, const char *mode); + int (*putenv)(char *string); +- ssize_t (*pwrite)(); +- ssize_t (*pwrite64_)(); +- ssize_t (*read)(); ++ ssize_t (*pwrite)(int, const void *, size_t, off_t); ++ ssize_t (*pwrite64_)(int, const void *, size_t, off_t); ++ ssize_t (*read)(int, void *, size_t); + int (*setenv)(const char *name, const char *value, int overwrite); + int (*sigfillset)(sigset_t *set); + int (*sigprocmask)(int how, const sigset_t *set, sigset_t *oldset); +@@ -112,7 +112,7 @@ typedef struct CollectorUtilFuncs + int (*unsetenv)(const char *name); + int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); + pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); +- ssize_t (*write)(); ++ ssize_t (*write)(int, void *, size_t); + double (*atof)(); + void *n_a; + } CollectorUtilFuncs; +diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc +index 200e6080d2e..24af375edf1 100644 +--- a/gprofng/src/gp-display-src.cc ++++ b/gprofng/src/gp-display-src.cc +@@ -75,14 +75,6 @@ private: + bool v_opt; + int multiple; + char *str_compcom; +- bool hex_visible; +- int src_visible; +- int vis_src; +- int vis_dis; +- int threshold_src; +- int threshold_dis; +- int threshold; +- int vis_bits; + }; + + static int +diff --git a/gprofng/src/gp-print.h b/gprofng/src/gp-print.h +index 1b748ea60a3..1a8ad3b6c13 100644 +--- a/gprofng/src/gp-print.h ++++ b/gprofng/src/gp-print.h +@@ -19,7 +19,7 @@ + MA 02110-1301, USA. */ + + #ifndef _GP_PRINT_H +-#define _ER_PRINT_H ++#define _GP_PRINT_H + + #include "Command.h" + #include "DbeApplication.h" +diff --git a/gprofng/src/hwc_intel_icelake.h b/gprofng/src/hwc_intel_icelake.h +index 46f4ac5005f..4fe2e26f63b 100644 +--- a/gprofng/src/hwc_intel_icelake.h ++++ b/gprofng/src/hwc_intel_icelake.h +@@ -24,8 +24,10 @@ + #define SH(val, n) (((unsigned long long) (val)) << n) + #define I(nm, event, umask, edge, cmask, inv, \ + offcore_rsp, ldlat, frontend, period, mtr) \ +- INIT_HWC(nm, mtr, SH(event, 0) | SH(umask, 8) | SH(edge, 18) \ +- | SH(cmask, 24) | SH(inv, 23), PERF_TYPE_RAW), \ ++ .use_perf_event_type = 1, .type = PERF_TYPE_RAW, \ ++ .name = (nm), .metric = (mtr), .reg_num = REGNO_ANY, \ ++ .config = SH(event, 0) | SH(umask, 8) | SH(edge, 18) | SH(cmask, 24) \ ++ | SH(inv, 23), \ + .config1 = SH(offcore_rsp, 0) | SH(ldlat, 0) | SH(frontend, 0), \ + .val = period + +diff --git a/gprofng/src/util.cc b/gprofng/src/util.cc +index 201f7088b66..228140b61ae 100644 +--- a/gprofng/src/util.cc ++++ b/gprofng/src/util.cc +@@ -741,17 +741,13 @@ get_relative_link (const char *path_from, const char *path_to) + s2 = canonical_path (s2); + long l = dbe_sstrlen (s1); + // try to find common directories +- int common_slashes = 0; + int last_common_slash = -1; + for (int i = 0; i < l; i++) + { +- if (s1[i] != s2[i]) break; +- if (s1[i] == 0) break; ++ if (s1[i] != s2[i] || s1[i] == 0) ++ break; + if (s1[i] == '/') +- { +- common_slashes++; +- last_common_slash = i; +- } ++ last_common_slash = i; + } + // find slashes in remaining path_to + int slashes = 0; +-- +2.50.1 + diff --git a/package/binutils/2.43.1/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch b/package/binutils/2.43.1/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch new file mode 100644 index 0000000000..7c6ed290f9 --- /dev/null +++ b/package/binutils/2.43.1/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch @@ -0,0 +1,619 @@ +From a5be89126b9bee78224be842e3086ce99dc045e6 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 16 Nov 2024 05:13:48 +0000 +Subject: [PATCH] gprofng: fix -std=gnu23 compatibility wrt unprototyped + functions + +C23 removes support for unprototyped functions. Fix function pointer types +accordingly. + +This does not fix all instances, there's a few left as I commented on in +PR32374 (e.g. setitimer which I have a local workaround for but it involves +a glibc implementation detail; the Linaro precommit CI tester pointed that +out too, so dropped that). + +ChangeLog: + PR gprofng/32374 + + * libcollector/collector.c (collector_sample): Fix prototype. + * libcollector/envmgmt.c (putenv): Ditto. + (_putenv): Ditto. + (__collector_putenv): Ditto. + (setenv): Ditto. + (_setenv): Ditto. + (__collector_setenv): Ditto. + (unsetenv): Ditto. + (_unsetenv): Ditto. + (__collector_unsetenv): Ditto. + * libcollector/jprofile.c (open_experiment): Ditto. + (__collector_jprofile_enable_synctrace): Ditto. + (jprof_find_asyncgetcalltrace): Ditto. + * libcollector/libcol_util.c (__collector_util_init): Ditto. + (ARCH): Ditto. + * libcollector/mmaptrace.c (collector_func_load): Ditto. + (collector_func_unload): Ditto. + * libcollector/unwind.c (__collector_ext_unwind_init): Ditto. + * src/collector_module.h: Ditto. + +Upstream: a2f774427e078f3da2c06bdea25f77a61979a695 +Signed-off-by: Thomas Petazzoni +--- + gprofng/libcollector/collector.c | 2 +- + gprofng/libcollector/dispatcher.c | 1 - + gprofng/libcollector/envmgmt.c | 24 ++++----- + gprofng/libcollector/jprofile.c | 10 ++-- + gprofng/libcollector/libcol_util.c | 84 +++++++++++++++--------------- + gprofng/libcollector/mmaptrace.c | 4 +- + gprofng/libcollector/unwind.c | 2 +- + gprofng/src/collector_module.h | 2 +- + 8 files changed, 64 insertions(+), 65 deletions(-) + +diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c +index 2ff95e58fde..3cab346e7dc 100644 +--- a/gprofng/libcollector/collector.c ++++ b/gprofng/libcollector/collector.c +@@ -1578,7 +1578,7 @@ __collector_resume_experiment () + } + + /* Code to support Samples and Pause/Resume */ +-void collector_sample () __attribute__ ((weak, alias ("__collector_sample"))); ++void collector_sample (char *name) __attribute__ ((weak, alias ("__collector_sample"))); + void + __collector_sample (char *name) + { +diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c +index f7cd46e7e6b..4eda18ec324 100644 +--- a/gprofng/libcollector/dispatcher.c ++++ b/gprofng/libcollector/dispatcher.c +@@ -1281,4 +1281,3 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, + int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); + int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); + int setitimer () __attribute__ ((weak, alias ("_setitimer"))); +- +diff --git a/gprofng/libcollector/envmgmt.c b/gprofng/libcollector/envmgmt.c +index a399c0d0cb4..f2bf2c41bfb 100644 +--- a/gprofng/libcollector/envmgmt.c ++++ b/gprofng/libcollector/envmgmt.c +@@ -685,8 +685,8 @@ __collector_env_update (char *envp[]) + + + /*------------------------------------------------------------- putenv */ +-int putenv () __attribute__ ((weak, alias ("__collector_putenv"))); +-int _putenv () __attribute__ ((weak, alias ("__collector_putenv"))); ++int putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); ++int _putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); + + int + __collector_putenv (char * string) +@@ -694,9 +694,9 @@ __collector_putenv (char * string) + if (CALL_UTIL (putenv) == __collector_putenv || + CALL_UTIL (putenv) == NULL) + { // __collector_libc_funcs_init failed +- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_NEXT, "putenv"); ++ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_NEXT, "putenv"); + if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) +- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_DEFAULT, "putenv"); ++ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_DEFAULT, "putenv"); + if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) + { + TprintfT (DBG_LT2, "__collector_putenv(): ERROR: no pointer found.\n"); +@@ -712,8 +712,8 @@ __collector_putenv (char * string) + } + + /*------------------------------------------------------------- setenv */ +-int setenv () __attribute__ ((weak, alias ("__collector_setenv"))); +-int _setenv () __attribute__ ((weak, alias ("__collector_setenv"))); ++int setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); ++int _setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); + + int + __collector_setenv (const char *name, const char *value, int overwrite) +@@ -721,9 +721,9 @@ __collector_setenv (const char *name, const char *value, int overwrite) + if (CALL_UTIL (setenv) == __collector_setenv || + CALL_UTIL (setenv) == NULL) + { // __collector_libc_funcs_init failed +- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_NEXT, "setenv"); ++ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_NEXT, "setenv"); + if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) +- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_DEFAULT, "setenv"); ++ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_DEFAULT, "setenv"); + if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) + { + TprintfT (DBG_LT2, "__collector_setenv(): ERROR: no pointer found.\n"); +@@ -758,8 +758,8 @@ __collector_setenv (const char *name, const char *value, int overwrite) + } + + /*------------------------------------------------------------- unsetenv */ +-int unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); +-int _unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); ++int unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); ++int _unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); + + int + __collector_unsetenv (const char *name) +@@ -767,9 +767,9 @@ __collector_unsetenv (const char *name) + if (CALL_UTIL (unsetenv) == __collector_unsetenv || + CALL_UTIL (unsetenv) == NULL) + { // __collector_libc_funcs_init failed +- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_NEXT, "unsetenv"); ++ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_NEXT, "unsetenv"); + if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) +- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_DEFAULT, "unsetenv"); ++ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_DEFAULT, "unsetenv"); + if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) + { + TprintfT (DBG_LT2, "__collector_unsetenv(): ERROR: no pointer found.\n"); +diff --git a/gprofng/libcollector/jprofile.c b/gprofng/libcollector/jprofile.c +index cd498bed0a3..d8f2d049a84 100644 +--- a/gprofng/libcollector/jprofile.c ++++ b/gprofng/libcollector/jprofile.c +@@ -99,8 +99,8 @@ static void rwrite (int fd, const void *buf, size_t nbyte); + static void addToDynamicArchive (const char* name, const unsigned char* class_data, int class_data_len); + static void (*AsyncGetCallTrace)(JVMPI_CallTrace*, jint, ucontext_t*) = NULL; + static void (*collector_heap_record)(int, int, void*) = NULL; +-static void (*collector_jsync_begin)() = NULL; +-static void (*collector_jsync_end)(hrtime_t, void *) = NULL; ++static void (*collector_jsync_begin)(void) = NULL; ++static void (*collector_jsync_end)(hrtime_t, void*) = NULL; + + #define gethrtime collector_interface->getHiResTime + +@@ -224,7 +224,7 @@ open_experiment (const char *exp) + else if (__collector_strStartWith (args, "s:") == 0) + { + java_sync_mode = 1; +- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); ++ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); + collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); + } + #endif +@@ -249,7 +249,7 @@ __collector_jprofile_enable_synctrace () + return; + } + java_sync_mode = 1; +- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); ++ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); + collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); + TprintfT (DBG_LT1, "jprofile: turning on Java synctrace, and requesting events\n"); + } +@@ -1123,7 +1123,7 @@ jprof_find_asyncgetcalltrace () + { + void *jvmhandle; + if (__collector_VM_ReadByteInstruction == NULL) +- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); ++ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); + + /* look for stack unwind function using default path */ + AsyncGetCallTrace = (void (*)(JVMPI_CallTrace*, jint, ucontext_t*)) +diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c +index baac15db5c4..a73488e3f60 100644 +--- a/gprofng/libcollector/libcol_util.c ++++ b/gprofng/libcollector/libcol_util.c +@@ -1114,7 +1114,7 @@ __collector_util_init () + + ptr = dlsym (libc, "munmap"); + if (ptr) +- __collector_util_funcs.munmap = (int(*)())ptr; ++ __collector_util_funcs.munmap = (int(*)(void *, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT munmap: %s\n", dlerror ()); +@@ -1123,7 +1123,7 @@ __collector_util_init () + + ptr = dlsym (libc, "close"); + if (ptr) +- __collector_util_funcs.close = (int(*)())ptr; ++ __collector_util_funcs.close = (int(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); +@@ -1158,7 +1158,7 @@ __collector_util_init () + + ptr = dlsym (libc, "close"); + if (ptr) +- __collector_util_funcs.close = (int(*)())ptr; ++ __collector_util_funcs.close = (int(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); +@@ -1167,7 +1167,7 @@ __collector_util_init () + + ptr = dlsym (libc, "read"); + if (ptr) +- __collector_util_funcs.read = (ssize_t (*)())ptr; ++ __collector_util_funcs.read = (ssize_t (*)(int, void*, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT read: %s\n", dlerror ()); +@@ -1176,7 +1176,7 @@ __collector_util_init () + + ptr = dlsym (libc, "write"); + if (ptr) +- __collector_util_funcs.write = (ssize_t (*)())ptr; ++ __collector_util_funcs.write = (ssize_t (*)(int, void*, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT write: %s\n", dlerror ()); +@@ -1186,14 +1186,14 @@ __collector_util_init () + #if ARCH(Intel) && WSIZE(32) + ptr = dlvsym (libc, "pwrite", "GLIBC_2.2"); // it is in /lib/libpthread.so.0 + if (ptr) +- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; ++ __collector_util_funcs.pwrite = (ssize_t (*)(int, void*, size_t, off_t))ptr; + else + { + Tprintf (DBG_LT0, "libcol_util: WARNING: dlvsym for %s@%s failed. Using dlsym() instead.", "pwrite", "GLIBC_2.2"); + #endif /* ARCH(Intel) && WSIZE(32) */ + ptr = dlsym (libc, "pwrite"); + if (ptr) +- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; ++ __collector_util_funcs.pwrite = (ssize_t (*)(int, const void*, size_t, off_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pwrite: %s\n", dlerror ()); +@@ -1213,7 +1213,7 @@ __collector_util_init () + #endif /* ARCH(Intel) && WSIZE(32) */ + ptr = dlsym (libc, "pwrite64"); + if (ptr) +- __collector_util_funcs.pwrite64_ = (ssize_t (*)())ptr; ++ __collector_util_funcs.pwrite64_ = (ssize_t (*)(int, const void*, size_t, off_t))ptr; + else + __collector_util_funcs.pwrite64_ = __collector_util_funcs.pwrite; + #if ARCH(Intel) && WSIZE(32) +@@ -1222,7 +1222,7 @@ __collector_util_init () + + ptr = dlsym (libc, "lseek"); + if (ptr) +- __collector_util_funcs.lseek = (off_t (*)())ptr; ++ __collector_util_funcs.lseek = (off_t (*)(int, off_t, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT lseek: %s\n", dlerror ()); +@@ -1231,7 +1231,7 @@ __collector_util_init () + + ptr = dlsym (libc, "access"); + if (ptr) +- __collector_util_funcs.access = (int(*)())ptr; ++ __collector_util_funcs.access = (int(*)(const char*, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT access: %s\n", dlerror ()); +@@ -1240,7 +1240,7 @@ __collector_util_init () + + ptr = dlsym (libc, "mkdir"); + if (ptr) +- __collector_util_funcs.mkdir = (int(*)())ptr; ++ __collector_util_funcs.mkdir = (int(*)(const char*, mode_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mkdir: %s\n", dlerror ()); +@@ -1249,7 +1249,7 @@ __collector_util_init () + + ptr = dlsym (libc, "opendir"); + if (ptr) +- __collector_util_funcs.opendir = (DIR * (*)())ptr; ++ __collector_util_funcs.opendir = (DIR * (*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT opendir: %s\n", dlerror ()); +@@ -1258,7 +1258,7 @@ __collector_util_init () + + ptr = dlsym (libc, "closedir"); + if (ptr) +- __collector_util_funcs.closedir = (int(*)())ptr; ++ __collector_util_funcs.closedir = (int(*)(DIR*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT closedir: %s\n", dlerror ()); +@@ -1267,7 +1267,7 @@ __collector_util_init () + + ptr = dlsym (libc, "execv"); + if (ptr) +- __collector_util_funcs.execv = (int(*)())ptr; ++ __collector_util_funcs.execv = (int(*)(const char*, char* const*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT execv: %s\n", dlerror ()); +@@ -1276,7 +1276,7 @@ __collector_util_init () + + ptr = dlsym (libc, "exit"); + if (ptr) +- __collector_util_funcs.exit = (void(*)())ptr; ++ __collector_util_funcs.exit = (void(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT exit: %s\n", dlerror ()); +@@ -1285,7 +1285,7 @@ __collector_util_init () + + ptr = dlsym (libc, "vfork"); + if (ptr) +- __collector_util_funcs.vfork = (pid_t (*)())ptr; ++ __collector_util_funcs.vfork = (pid_t (*)(void))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vfork: %s\n", dlerror ()); +@@ -1294,7 +1294,7 @@ __collector_util_init () + + ptr = dlsym (libc, "waitpid"); + if (ptr) +- __collector_util_funcs.waitpid = (pid_t (*)())ptr; ++ __collector_util_funcs.waitpid = (pid_t (*)(pid_t, int*, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT waitpid: %s\n", dlerror ()); +@@ -1313,7 +1313,7 @@ __collector_util_init () + + ptr = dlsym (libc, "getcontext"); + if (ptr) +- __collector_util_funcs.getcontext = (int(*)())ptr; ++ __collector_util_funcs.getcontext = (int(*)(ucontext_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getcontext: %s\n", dlerror ()); +@@ -1331,7 +1331,7 @@ __collector_util_init () + + ptr = dlsym (libc, "putenv"); + if (ptr) +- __collector_util_funcs.putenv = (int(*)())ptr; ++ __collector_util_funcs.putenv = (int(*)(char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT putenv: %s\n", dlerror ()); +@@ -1340,7 +1340,7 @@ __collector_util_init () + + ptr = dlsym (libc, "getenv"); + if (ptr) +- __collector_util_funcs.getenv = (char*(*)())ptr; ++ __collector_util_funcs.getenv = (char*(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getenv: %s\n", dlerror ()); +@@ -1349,7 +1349,7 @@ __collector_util_init () + + ptr = dlsym (libc, "time"); + if (ptr) +- __collector_util_funcs.time = (time_t (*)())ptr; ++ __collector_util_funcs.time = (time_t (*)(time_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT time: %s\n", dlerror ()); +@@ -1358,7 +1358,7 @@ __collector_util_init () + + ptr = dlsym (libc, "mktime"); + if (ptr) +- __collector_util_funcs.mktime = (time_t (*)())ptr; ++ __collector_util_funcs.mktime = (time_t (*)(struct tm*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mktime: %s\n", dlerror ()); +@@ -1372,7 +1372,7 @@ __collector_util_init () + + ptr = dlsym (libc, "gmtime_r"); + if (ptr) +- __collector_util_funcs.gmtime_r = (struct tm * (*)())ptr; ++ __collector_util_funcs.gmtime_r = (struct tm * (*)(const time_t*, struct tm*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT gmtime_r: %s\n", dlerror ()); +@@ -1381,7 +1381,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtol"); + if (ptr) +- __collector_util_funcs.strtol = (long (*)())ptr; ++ __collector_util_funcs.strtol = (long (*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtol: %s\n", dlerror ()); +@@ -1390,7 +1390,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtoll"); + if (ptr) +- __collector_util_funcs.strtoll = (long long (*)())ptr; ++ __collector_util_funcs.strtoll = (long long (*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoll: %s\n", dlerror ()); +@@ -1402,7 +1402,7 @@ __collector_util_init () + + ptr = dlsym (libc, "setenv"); + if (ptr) +- __collector_util_funcs.setenv = (int(*)())ptr; ++ __collector_util_funcs.setenv = (int(*)(const char*, const char*, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT setenv: %s\n", dlerror ()); +@@ -1411,7 +1411,7 @@ __collector_util_init () + + ptr = dlsym (libc, "unsetenv"); + if (ptr) +- __collector_util_funcs.unsetenv = (int(*)())ptr; ++ __collector_util_funcs.unsetenv = (int(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT unsetenv: %s\n", dlerror ()); +@@ -1507,7 +1507,7 @@ __collector_util_init () + + ptr = dlsym (libc, "pclose"); + if (ptr) +- __collector_util_funcs.pclose = (int(*)())ptr; ++ __collector_util_funcs.pclose = (int(*)(FILE*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pclose: %s\n", dlerror ()); +@@ -1516,7 +1516,7 @@ __collector_util_init () + + ptr = dlsym (libc, "fgets"); + if (ptr) +- __collector_util_funcs.fgets = (char*(*)())ptr; ++ __collector_util_funcs.fgets = (char*(*)(char*, int, FILE*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT fgets: %s\n", dlerror ()); +@@ -1543,7 +1543,7 @@ __collector_util_init () + + ptr = dlsym (libc, "vsnprintf"); + if (ptr) +- __collector_util_funcs.vsnprintf = (int(*)())ptr; ++ __collector_util_funcs.vsnprintf = (int(*)(char*, size_t, const char*, ...))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vsnprintf: %s\n", dlerror ()); +@@ -1552,7 +1552,7 @@ __collector_util_init () + + ptr = dlsym (libc, "atoi"); + if (ptr) +- __collector_util_funcs.atoi = (int(*)())ptr; ++ __collector_util_funcs.atoi = (int(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT atoi: %s\n", dlerror ()); +@@ -1561,7 +1561,7 @@ __collector_util_init () + + ptr = dlsym (libc, "calloc"); + if (ptr) +- __collector_util_funcs.calloc = (void*(*)())ptr; ++ __collector_util_funcs.calloc = (void*(*)(size_t, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT calloc: %s\n", dlerror ()); +@@ -1571,7 +1571,7 @@ __collector_util_init () + ptr = dlsym (libc, "free"); + if (ptr) + { +- __collector_util_funcs.free = (void(*)())ptr; ++ __collector_util_funcs.free = (void(*)(void*))ptr; + } + else + { +@@ -1581,7 +1581,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strdup"); + if (ptr) +- __collector_util_funcs.libc_strdup = (char*(*)())ptr; ++ __collector_util_funcs.libc_strdup = (char*(*)(const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strdup: %s\n", dlerror ()); +@@ -1594,7 +1594,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strerror"); + if (ptr) +- __collector_util_funcs.strerror = (char*(*)())ptr; ++ __collector_util_funcs.strerror = (char*(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror: %s\n", dlerror ()); +@@ -1602,7 +1602,7 @@ __collector_util_init () + } + ptr = dlsym (libc, "strerror_r"); + if (ptr) +- __collector_util_funcs.strerror_r = (int(*)())ptr; ++ __collector_util_funcs.strerror_r = (int(*)(int, char*, size_t))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror_r: %s\n", dlerror ()); +@@ -1610,7 +1610,7 @@ __collector_util_init () + } + ptr = dlsym (libc, "strspn"); + if (ptr) +- __collector_util_funcs.strspn = (size_t (*)())ptr; ++ __collector_util_funcs.strspn = (size_t (*)(const char*, const char*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strspn: %s\n", dlerror ()); +@@ -1619,7 +1619,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtoul"); + if (ptr) +- __collector_util_funcs.strtoul = (unsigned long int(*)())ptr; ++ __collector_util_funcs.strtoul = (unsigned long int(*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoul: %s\n", dlerror ()); +@@ -1628,7 +1628,7 @@ __collector_util_init () + + ptr = dlsym (libc, "strtoull"); + if (ptr) +- __collector_util_funcs.strtoull = (unsigned long long int(*)())ptr; ++ __collector_util_funcs.strtoull = (unsigned long long int(*)(const char*, char**, int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoull: %s\n", dlerror ()); +@@ -1673,7 +1673,7 @@ __collector_util_init () + + ptr = dlsym (libc, "sysconf"); + if (ptr) +- __collector_util_funcs.sysconf = (long(*)())ptr; ++ __collector_util_funcs.sysconf = (long(*)(int))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysconf: %s\n", dlerror ()); +@@ -1682,7 +1682,7 @@ __collector_util_init () + + ptr = dlsym (libc, "sigfillset"); + if (ptr) +- __collector_util_funcs.sigfillset = (int(*)())ptr; ++ __collector_util_funcs.sigfillset = (int(*)(sigset_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigfillset: %s\n", dlerror ()); +@@ -1691,7 +1691,7 @@ __collector_util_init () + + ptr = dlsym (libc, "sigprocmask"); + if (ptr) +- __collector_util_funcs.sigprocmask = (int(*)())ptr; ++ __collector_util_funcs.sigprocmask = (int(*)(int, const sigset_t*, sigset_t*))ptr; + else + { + CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigprocmask: %s\n", dlerror ()); +diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c +index f07f4d76513..2a6857ab58e 100644 +--- a/gprofng/libcollector/mmaptrace.c ++++ b/gprofng/libcollector/mmaptrace.c +@@ -1209,7 +1209,7 @@ process_vsyscall_page () + /* + * collector API for dynamic functions + */ +-void collector_func_load () __attribute__ ((weak, alias ("__collector_func_load"))); ++void collector_func_load (char*, char*, char*, void*, int, int, DT_lineno *) __attribute__ ((weak, alias ("__collector_func_load"))); + void + __collector_func_load (char *name, char *alias, char *sourcename, + void *vaddr, int size, int lntsize, DT_lineno *lntable) +@@ -1218,7 +1218,7 @@ __collector_func_load (char *name, char *alias, char *sourcename, + vaddr, size, lntsize, lntable); + } + +-void collector_func_unload () __attribute__ ((weak, alias ("__collector_func_unload"))); ++void collector_func_unload (void *vaddr) __attribute__ ((weak, alias ("__collector_func_unload"))); + void + __collector_func_unload (void *vaddr) + { +diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c +index 55fa2e9e9e7..e08afa165d1 100644 +--- a/gprofng/libcollector/unwind.c ++++ b/gprofng/libcollector/unwind.c +@@ -421,7 +421,7 @@ __collector_ext_unwind_init (int record) + omp_no_walk = 1; + + if (__collector_VM_ReadByteInstruction == NULL) +- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); ++ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); + + #if ARCH(SPARC) + #if WSIZE(64) +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index ebcdbca561f..fd888cd58dd 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -110,7 +110,7 @@ typedef struct CollectorUtilFuncs + long (*sysinfo)(int command, char *buf, long count); + time_t (*time)(time_t *tloc); + int (*unsetenv)(const char *name); +- int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); ++ int (*vsnprintf)(char *str, size_t size, const char *format, ...); + pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); + ssize_t (*write)(int, void *, size_t); + double (*atof)(); +-- +2.50.1 + diff --git a/package/binutils/2.43.1/0007-gprofng-fix-build-with-std-gnu23.patch b/package/binutils/2.43.1/0007-gprofng-fix-build-with-std-gnu23.patch new file mode 100644 index 0000000000..fe03b4b5cf --- /dev/null +++ b/package/binutils/2.43.1/0007-gprofng-fix-build-with-std-gnu23.patch @@ -0,0 +1,199 @@ +From 9ca25799ea0e92855d19adc46634e6dd0675a0b7 Mon Sep 17 00:00:00 2001 +From: Vladimir Mezentsev +Date: Thu, 21 Nov 2024 14:48:20 -0800 +Subject: [PATCH] gprofng: fix build with -std=gnu23 + +Fix function pointer types accordingly. +Remove unused function pointers. + +gprofng/ChangeLog +2024-11-21 Vladimir Mezentsev + + PR gprofng/32374 + PR gprofng/32373 + * common/cpuid.c: Define ATTRIBUTE_UNUSED if necessary. + * libcollector/libcol_util.c (sysinfo): Remove unused pointer. + * src/collector_module.h: Likewise. + * libcollector/dispatcher.c (setitimer): Fix prototype. + * libcollector/linetrace.c (system, grantpt, ptsname): Likewise. + * testsuite/gprofng.display/mttest/mttest.c (dump_arrays): Likewise. + * testsuite/gprofng.display/synprog/endcases.c (xinline_code, + s_inline_code): Likewise. + * testsuite/gprofng.display/synprog/inc_inline.h (ext_inline_code): + Likewise. + * testsuite/gprofng.display/synprog/synprog.c (doabort): Rename nullptr. + +Upstream: 4e943705e3e8a5a9448d087502bcb390a694ad02 +Signed-off-by: Thomas Petazzoni +--- + gprofng/common/cpuid.c | 2 ++ + gprofng/libcollector/dispatcher.c | 2 +- + gprofng/libcollector/libcol_util.c | 9 --------- + gprofng/libcollector/linetrace.c | 10 +++++----- + gprofng/src/collector_module.h | 1 - + gprofng/testsuite/gprofng.display/mttest/mttest.c | 2 +- + gprofng/testsuite/gprofng.display/synprog/endcases.c | 4 ++-- + gprofng/testsuite/gprofng.display/synprog/inc_inline.h | 2 +- + gprofng/testsuite/gprofng.display/synprog/synprog.c | 4 ++-- + 9 files changed, 14 insertions(+), 22 deletions(-) + +diff --git a/gprofng/common/cpuid.c b/gprofng/common/cpuid.c +index 891d5471335..b4caef54f57 100644 +--- a/gprofng/common/cpuid.c ++++ b/gprofng/common/cpuid.c +@@ -21,7 +21,9 @@ + #if defined(__i386__) || defined(__x86_64) + #include /* GCC-provided */ + #elif defined(__aarch64__) ++#if !defined(ATTRIBUTE_UNUSED) + #define ATTRIBUTE_UNUSED __attribute__((unused)) ++#endif + + static inline uint_t __attribute_const__ + __get_cpuid (unsigned int op ATTRIBUTE_UNUSED, unsigned int *eax, +diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c +index 4eda18ec324..6f0364cc52c 100644 +--- a/gprofng/libcollector/dispatcher.c ++++ b/gprofng/libcollector/dispatcher.c +@@ -1280,4 +1280,4 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, + // weak symbols: + int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); + int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); +-int setitimer () __attribute__ ((weak, alias ("_setitimer"))); ++__typeof(setitimer) setitimer __attribute__ ((weak, alias ("_setitimer"))); +diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c +index a73488e3f60..77dc886be22 100644 +--- a/gprofng/libcollector/libcol_util.c ++++ b/gprofng/libcollector/libcol_util.c +@@ -1427,15 +1427,6 @@ __collector_util_init () + err = COL_ERROR_UTIL_INIT; + } + +- ptr = dlsym (libc, "sysinfo"); +- if (ptr) +- __collector_util_funcs.sysinfo = (long (*)())ptr; +- else +- { +- CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysinfo: %s\n", dlerror ()); +- err = COL_ERROR_UTIL_INIT; +- } +- + ptr = dlsym (libc, "clearenv"); + if (ptr) + __collector_util_funcs.clearenv = (int(*)())ptr; +diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c +index 66844bc1337..c81ae1a2272 100644 +--- a/gprofng/libcollector/linetrace.c ++++ b/gprofng/libcollector/linetrace.c +@@ -1527,7 +1527,7 @@ DCL_FUNC_VER (DCL_POSIX_SPAWNP, posix_spawnp_2_2, posix_spawnp@GLIBC_2.2) + DCL_POSIX_SPAWNP (posix_spawnp) + + /*------------------------------------------------------------- system */ +-int system () __attribute__ ((weak, alias ("__collector_system"))); ++int system (const char *cmd) __attribute__ ((weak, alias ("__collector_system"))); + + int + __collector_system (const char *cmd) +@@ -1582,10 +1582,10 @@ DCL_FUNC_VER (DCL_POPEN, popen_2_0, popen@GLIBC_2.0) + DCL_POPEN (popen) + + /*------------------------------------------------------------- grantpt */ +-int grantpt () __attribute__ ((weak, alias ("__collector_grantpt"))); ++int grantpt (int fildes) __attribute__ ((weak, alias ("__collector_grantpt"))); + + int +-__collector_grantpt (const int fildes) ++__collector_grantpt (int fildes) + { + if (NULL_PTR (grantpt)) + init_lineage_intf (); +@@ -1607,10 +1607,10 @@ __collector_grantpt (const int fildes) + } + + /*------------------------------------------------------------- ptsname */ +-char *ptsname () __attribute__ ((weak, alias ("__collector_ptsname"))); ++char *ptsname (int fildes) __attribute__ ((weak, alias ("__collector_ptsname"))); + + char * +-__collector_ptsname (const int fildes) ++__collector_ptsname (int fildes) + { + if (NULL_PTR (ptsname)) + init_lineage_intf (); +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index fd888cd58dd..6640f12fa3c 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -107,7 +107,6 @@ typedef struct CollectorUtilFuncs + int (*symlink)(const char *s1, const char *s2); + int (*syscall)(int number, ...); + long (*sysconf)(int name); +- long (*sysinfo)(int command, char *buf, long count); + time_t (*time)(time_t *tloc); + int (*unsetenv)(const char *name); + int (*vsnprintf)(char *str, size_t size, const char *format, ...); +diff --git a/gprofng/testsuite/gprofng.display/mttest/mttest.c b/gprofng/testsuite/gprofng.display/mttest/mttest.c +index e0835c833e5..3db5b8d8e86 100644 +--- a/gprofng/testsuite/gprofng.display/mttest/mttest.c ++++ b/gprofng/testsuite/gprofng.display/mttest/mttest.c +@@ -171,7 +171,7 @@ void computeJ (workStruct_t *x); + void computeK (workStruct_t *x); + void addone (workCtr_t *x); + void init_arrays (int strat); +-void dump_arrays (); ++void dump_arrays (hrtime_t real, hrtime_t cpu, int case_index); + void *do_work (void *v); + void thread_work (); + void nothreads (Workblk *array, struct scripttab *k); +diff --git a/gprofng/testsuite/gprofng.display/synprog/endcases.c b/gprofng/testsuite/gprofng.display/synprog/endcases.c +index a6a1389658a..6f1c83b6859 100644 +--- a/gprofng/testsuite/gprofng.display/synprog/endcases.c ++++ b/gprofng/testsuite/gprofng.display/synprog/endcases.c +@@ -40,8 +40,8 @@ static void s_inline_code (int); + void ext_inline_code (int); + + #ifndef NO_INLINE +-void xinline_code () __attribute__ ((always_inline)); +-void s_inline_code () __attribute__ ((always_inline)); ++void xinline_code (int) __attribute__ ((always_inline)); ++void s_inline_code (int) __attribute__ ((always_inline)); + #endif + + #include "inc_inline.h" +diff --git a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h +index da42563c828..6600eacb66d 100644 +--- a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h ++++ b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h +@@ -19,7 +19,7 @@ + MA 02110-1301, USA. */ + + #ifndef NO_INLINE +-void ext_inline_code() __attribute__ ((always_inline)); ++void ext_inline_code(int) __attribute__ ((always_inline)); + #endif + + void +diff --git a/gprofng/testsuite/gprofng.display/synprog/synprog.c b/gprofng/testsuite/gprofng.display/synprog/synprog.c +index cf1bc5b0909..05920dc7419 100644 +--- a/gprofng/testsuite/gprofng.display/synprog/synprog.c ++++ b/gprofng/testsuite/gprofng.display/synprog/synprog.c +@@ -528,14 +528,14 @@ reapchildren () + int + doabort (int k) + { +- char *nullptr = NULL; ++ char *p = NULL; + char c; + + /* Log the event */ + wlog ("start of doabort", NULL); + + /* and dereference a NULL */ +- c = *nullptr; ++ c = *p; + + /* this should never be reached */ + return (int) c; +-- +2.50.1 + diff --git a/package/binutils/2.44/0001-sh-conf.patch b/package/binutils/2.44/0001-sh-conf.patch new file mode 100644 index 0000000000..e56f52b9d8 --- /dev/null +++ b/package/binutils/2.44/0001-sh-conf.patch @@ -0,0 +1,50 @@ +From d5f66b0da8d1e0ed091bff65f8a4db10a82a5420 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +Upstream: N/A [Buildroot specific] + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index bbfb5979546..bcd95684ae1 100755 +--- a/configure ++++ b/configure +@@ -4056,7 +4056,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index f9694cdf901..d6a3623ba50 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1278,7 +1278,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.48.1 + diff --git a/package/binutils/2.44/0002-poison-system-directories.patch b/package/binutils/2.44/0002-poison-system-directories.patch new file mode 100644 index 0000000000..b8d6d15525 --- /dev/null +++ b/package/binutils/2.44/0002-poison-system-directories.patch @@ -0,0 +1,310 @@ +From 947a56b4ba73ec3fbf9c1fcff46d65754ba12e27 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Waldemar: rebase on top of 2.43] +Signed-off-by: Waldemar Brodkorb +[Waldemar: rebase on top of 2.39] +Signed-off-by: Waldemar Brodkorb +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] +Upstream: N/A [Buildroot specific] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 16 ++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 88 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 2d7b6406d2b..37cd12d20fa 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -78,6 +78,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index d3995b73c06..2317f06682e 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -844,6 +844,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1537,6 +1538,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15592,7 +15595,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 228f2ee4089..50a4b0f4db1 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 254f0a097bb..daf777c65c8 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -166,6 +166,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index f6384ad82dd..9d972ec9725 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3263,6 +3263,18 @@ bit string identifying the original linked file does not change. + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. + ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. ++ + @kindex --package-metadata=@var{JSON} + @item --package-metadata=@var{JSON} + Request the creation of a @code{.note.package} ELF note section. The +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 12551504ae6..c6bfb98e522 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -328,6 +328,22 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif + } + + static void +diff --git a/ld/ldlex.h b/ld/ldlex.h +index b8b7d6b6829..c4b91482452 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -171,6 +171,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_EXECSTACK, + OPTION_NO_ERROR_EXECSTACK, + OPTION_WARN_EXECSTACK_OBJECTS, +diff --git a/ld/ldmain.c b/ld/ldmain.c +index f1c5f7035c5..69dd2d89357 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -351,6 +351,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 5399aa45b72..a04346bee58 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -650,6 +650,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -662,6 +670,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1789,6 +1798,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1933,6 +1950,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.48.1 + diff --git a/package/binutils/2.44/0003-objdump-memleak.patch b/package/binutils/2.44/0003-objdump-memleak.patch new file mode 100644 index 0000000000..1b1632093d --- /dev/null +++ b/package/binutils/2.44/0003-objdump-memleak.patch @@ -0,0 +1,31 @@ +From ba6ad3a18cb26b79e0e3b84c39f707535bbc344d Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Wed, 19 Feb 2025 07:58:54 +1030 +Subject: [PATCH] PR32716, objdump -i memory leak + +PR binutils/32716 +* bucomm.c (display_info): Free arg.info. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ba6ad3a18cb26b79e0e3b84c39f707535bbc344d + +CVE: CVE-2025-3198 +Signed-off-by: Titouan Christophe +--- + binutils/bucomm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/binutils/bucomm.c b/binutils/bucomm.c +index ccf54099154..d4554737db1 100644 +--- a/binutils/bucomm.c ++++ b/binutils/bucomm.c +@@ -435,6 +435,7 @@ display_info (void) + if (!arg.error) + display_target_tables (&arg); + ++ free (arg.info); + return arg.error; + } + +-- +2.43.5 + diff --git a/package/binutils/Config.in b/package/binutils/Config.in index 5e1a769998..f0ddf924c8 100644 --- a/package/binutils/Config.in +++ b/package/binutils/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_BINUTILS bool "binutils" - depends on !BR2_nios2 depends on BR2_USE_WCHAR select BR2_PACKAGE_ZLIB help @@ -22,5 +21,4 @@ config BR2_PACKAGE_BINUTILS_TARGET endif comment "binutils needs a toolchain w/ wchar" - depends on !BR2_nios2 depends on !BR2_USE_WCHAR diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 16a57a5cb4..33002e0028 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,16 +7,13 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_42_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_43_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_41_X - bool "binutils 2.41" - config BR2_BINUTILS_VERSION_ARC - bool "binutils arc (2.41)" + bool "binutils arc (2.43)" depends on BR2_arc config BR2_BINUTILS_VERSION_2_42_X @@ -25,14 +22,17 @@ config BR2_BINUTILS_VERSION_2_42_X config BR2_BINUTILS_VERSION_2_43_X bool "binutils 2.43.1" +config BR2_BINUTILS_VERSION_2_44_X + bool "binutils 2.44" + endchoice config BR2_BINUTILS_VERSION string - default "arc-2023.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.41" if BR2_BINUTILS_VERSION_2_41_X + default "arc-2024.12-release" if BR2_BINUTILS_VERSION_ARC default "2.42" if BR2_BINUTILS_VERSION_2_42_X default "2.43.1" if BR2_BINUTILS_VERSION_2_43_X + default "2.44" if BR2_BINUTILS_VERSION_2_44_X config BR2_BINUTILS_GPROFNG bool "gprofng support" diff --git a/package/binutils/arc-2024.12-release/0001-poison-system-directories.patch b/package/binutils/arc-2024.12-release/0001-poison-system-directories.patch new file mode 100644 index 0000000000..8da0ec31df --- /dev/null +++ b/package/binutils/arc-2024.12-release/0001-poison-system-directories.patch @@ -0,0 +1,307 @@ +From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Waldemar: rebase on top of 2.43] +Signed-off-by: Waldemar Brodkorb +[Waldemar: rebase on top of 2.39] +Signed-off-by: Waldemar Brodkorb +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] +Upstream: N/A [Buildroot specific] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index f7c9da3d02a..e4fdbf6db5b 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -74,6 +74,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 44d79c2445d..e28cea11977 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -844,6 +844,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1535,6 +1536,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15587,7 +15590,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index bdf51a062fa..3d370ff92ce 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 0dee944cf2a..83bd82d2a2e 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -166,6 +166,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 89e3913317a..b80cf05617f 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3234,6 +3234,18 @@ string identifying the original linked file does not change. + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. + ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. ++ + @kindex --package-metadata=@var{JSON} + @item --package-metadata=@var{JSON} + Request the creation of a @code{.note.package} ELF note section. The +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 87be885d31a..9bc7adca4bc 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -327,6 +327,22 @@ ldfile_add_library_path (const char *name, enum search_dir_source source) + else + new_dirs->name = xstrdup (name); + ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + /* Accumulate script and command line sourced + search paths at the end of the current list. */ + #if BFD_SUPPORTS_PLUGINS +diff --git a/ld/ldlex.h b/ld/ldlex.h +index defe3fcbbb9..0ff12614926 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -170,6 +170,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_EXECSTACK, + OPTION_NO_ERROR_EXECSTACK, + OPTION_WARN_EXECSTACK_OBJECTS, +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 037099b9d37..204feedc6e3 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -347,6 +347,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 4aa0124ce2f..c4d76943821 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -648,6 +648,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -660,6 +668,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1785,6 +1794,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1938,6 +1955,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 084793fc9f..b40463262c 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,10 +1,10 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz sha512 20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824 binutils-2.43.1.tar.xz +sha512 b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7 binutils-2.44.tar.xz # Locally calculated (fetched from Github) -sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d binutils-gdb-arc-2023.09-release.tar.gz +sha512 46c336a16bde7b73dc4ceac0986887d47d542a1452e1936ef871b5e76afdb6cad4b18ccb4d93341358e7bb92c2ef74781e1fb72935d527d15251ac9f9daa8305 binutils-gdb-arc-2024.12-release.tar.gz # locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 3d1f77c8c4..c79f3414af 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2023.09-release +BINUTILS_VERSION = arc-2024.12-release else -BINUTILS_VERSION = 2.42 +BINUTILS_VERSION = 2.43.1 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2023.09-release) +ifeq ($(BINUTILS_VERSION),arc-2024.12-release) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y @@ -31,6 +31,9 @@ BINUTILS_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB BINUTILS_CPE_ID_VENDOR = gnu +# 0003-objdump-memleak.patch +BINUTILS_IGNORE_CVES += CVE-2025-3198 + ifeq ($(BINUTILS_FROM_GIT),y) BINUTILS_DEPENDENCIES += host-flex host-bison HOST_BINUTILS_DEPENDENCIES += host-flex host-bison @@ -44,6 +47,13 @@ BINUTILS_DISABLE_GDB_CONF_OPTS = \ --disable-gdb # We need to specify host & target to avoid breaking ARM EABI +# +# --with-system-readline to never build readline, as binutils doesn't +# need it (only gdb does). For binutils release tarballs, readline +# is not shipped, but when we get it from git, it is present and +# gets built which can cause build issues, so force skipping +# it. Note: the configure script will not check for readline as it +# doesn't need it. BINUTILS_CONF_OPTS = \ --disable-multilib \ --disable-werror \ @@ -55,7 +65,8 @@ BINUTILS_CONF_OPTS = \ --disable-gprofng \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) \ - --without-zstd + --without-zstd \ + --with-system-readline ifeq ($(BR2_STATIC_LIBS),y) BINUTILS_CONF_OPTS += --disable-plugins @@ -79,6 +90,13 @@ endif # "host" binutils should actually be "cross" # We just keep the convention of "host utility" for now +# +# --with-system-readline to never build readline, as binutils doesn't +# need it (only gdb does). For binutils release tarballs, readline +# is not shipped, but when we get it from git, it is present and +# gets built which can cause build issues, so force skipping +# it. Note: the configure script will not check for readline as it +# doesn't need it. HOST_BINUTILS_CONF_OPTS = \ --disable-multilib \ --disable-werror \ @@ -92,7 +110,8 @@ HOST_BINUTILS_CONF_OPTS = \ --enable-lto \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) \ - --without-zstd + --without-zstd \ + --with-system-readline ifeq ($(BR2_BINUTILS_GPROFNG),y) HOST_BINUTILS_DEPENDENCIES += host-bison diff --git a/package/bird/0002-BFD-Fix-missing-keyword-declarations.patch b/package/bird/0002-BFD-Fix-missing-keyword-declarations.patch new file mode 100644 index 0000000000..29ec8abf7b --- /dev/null +++ b/package/bird/0002-BFD-Fix-missing-keyword-declarations.patch @@ -0,0 +1,31 @@ +From e5b582868c5fa7e185a12023784adc8df7b8c7a2 Mon Sep 17 00:00:00 2001 +From: Ondrej Zajicek +Date: Thu, 9 Jan 2025 00:30:37 +0100 +Subject: [PATCH] BFD: Fix missing keyword declarations + +Some keywords were missing for BFD-only build. + +Upstream: https://gitlab.nic.cz/labs/bird/-/commit/c386369645e584facaad88ec292f2fe0bc70d974 +[tperale: backport v2.15.1] +Signed-off-by: Thomas Perale +--- + proto/bfd/config.Y | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/proto/bfd/config.Y b/proto/bfd/config.Y +index 1a7474b0..70b09ad8 100644 +--- a/proto/bfd/config.Y ++++ b/proto/bfd/config.Y +@@ -21,8 +21,8 @@ extern struct bfd_config *bfd_cf; + + CF_DECLS + +-CF_KEYWORDS(BFD, MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE, +- INTERFACE, MULTIHOP, NEIGHBOR, DEV, LOCAL, AUTHENTICATION, ++CF_KEYWORDS(BFD, MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE, ADDRESS, ++ INTERFACE, MULTIHOP, NEIGHBOR, DEV, ALL, LOCAL, AUTHENTICATION, + NONE, SIMPLE, METICULOUS, KEYED, MD5, SHA1, IPV4, IPV6, DIRECT, + STRICT, BIND) + +-- +2.49.0 diff --git a/package/bird/Config.in b/package/bird/Config.in index 866fc65617..5e32194c2f 100644 --- a/package/bird/Config.in +++ b/package/bird/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_BIRD bool "bird" - depends on !BR2_nios2 # relocations don't fit depends on BR2_USE_MMU # fork() help BIRD Internet Routing Daemon diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index 425e99ce8b..3240462f56 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_BITCOIN depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR + select BR2_HOST_CMAKE_AT_LEAST_3_22 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index c7dad34d0a..4f4061ed77 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,7 +1,7 @@ -# Hash from: https://bitcoincore.org/bin/bitcoin-core-28.0/SHA256SUMS +# Hash from: https://bitcoincore.org/bin/bitcoin-core-30.0/SHA256SUMS # After checking pgp signature from: -# https://bitcoincore.org/bin/bitcoin-core-28.0/SHA256SUMS.asc -sha256 700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f bitcoin-28.0.tar.gz +# https://bitcoincore.org/bin/bitcoin-core-30.0/SHA256SUMS.asc +sha256 9b472a4d51dfed9aa9d0ded2cb8c7bcb9267f8439a23a98f36eb509c1a5e6974 bitcoin-30.0.tar.gz # Hash for license file -sha256 779d9beab4eef2340bb1e86e91f8f55dea9b0985a2d03fbcbb52bd713e091e1b COPYING +sha256 7c4a87f43afaf667b4c2187af92ebdd27310a24cec113f973e058e3300a76002 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 9a5f4d6494..e23ef45050 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,48 +4,35 @@ # ################################################################################ -BITCOIN_VERSION = 28.0 +BITCOIN_VERSION = 30.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) -BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT BITCOIN_LICENSE_FILES = COPYING BITCOIN_CPE_ID_VENDOR = bitcoin BITCOIN_CPE_ID_PRODUCT = bitcoin_core BITCOIN_DEPENDENCIES = host-pkgconf boost libevent +BITCOIN_SUPPORTS_IN_SOURCE_BUILD = NO BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 -# Berkeley Database (bdb) support is always disabled. It is only -# needed for legacy wallet format. New wallets are using SQLite. BITCOIN_CONF_OPTS = \ - --disable-bench \ - --disable-tests \ - --with-boost-libdir=$(STAGING_DIR)/usr/lib/ \ - --disable-hardening \ - --without-bdb \ - --without-gui + -DBUILD_BENCH=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_GUI=OFF \ + -DENABLE_IPC=OFF ifeq ($(BR2_PACKAGE_BITCOIN_WALLET),y) BITCOIN_DEPENDENCIES += sqlite BITCOIN_CONF_OPTS += \ - --enable-wallet \ - --with-sqlite + -DENABLE_WALLET=ON else BITCOIN_CONF_OPTS += \ - --disable-wallet \ - --without-sqlite -endif - -ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) -BITCOIN_DEPENDENCIES += libminiupnpc -BITCOIN_CONF_OPTS += --with-miniupnpc -else -BITCOIN_CONF_OPTS += --without-miniupnpc + -DENABLE_WALLET=OFF endif ifeq ($(BR2_PACKAGE_ZEROMQ),y) BITCOIN_DEPENDENCIES += zeromq -BITCOIN_CONF_OPTS += --with-zmq +BITCOIN_CONF_OPTS += -DWITH_ZMQ=ON else -BITCOIN_CONF_OPTS += --without-zmq +BITCOIN_CONF_OPTS += -DWITH_ZMQ=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/blake3/blake3.hash b/package/blake3/blake3.hash index 9c3792edf6..6bcfefb2b8 100644 --- a/package/blake3/blake3.hash +++ b/package/blake3/blake3.hash @@ -1,5 +1,5 @@ # sha256 computed locally -sha256 ddd24f26a31d23373e63d9be2e723263ac46c8b6d49902ab08024b573fd2a416 blake3-1.5.4.tar.gz +sha256 6b51aefe515969785da02e87befafc7fdc7a065cd3458cf1141f29267749e81f blake3-1.8.2.tar.gz sha256 00fcc7a934ddbc9ece2a7cc063ac788e284b703b1d705ccbba72d462aa97921e LICENSE_A2 sha256 a5695f57ea0c221e0e8b7d784ff774c35e88c3d3270353646a925880bb3492cc LICENSE_A2LLVM sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSE_CC0 diff --git a/package/blake3/blake3.mk b/package/blake3/blake3.mk index f8ef2386f5..9d1323192c 100644 --- a/package/blake3/blake3.mk +++ b/package/blake3/blake3.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLAKE3_VERSION = 1.5.4 +BLAKE3_VERSION = 1.8.2 BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION)) BLAKE3_SUBDIR = c BLAKE3_LICENSE = Apache-2.0 or Apache-2.0 with exceptions or CC0-1.0 diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 1fd4e0fff3..7acf62b226 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.78 +BLUEZ5_UTILS_HEADERS_VERSION = 5.79 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch new file mode 100644 index 0000000000..dc823e9277 --- /dev/null +++ b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch @@ -0,0 +1,33 @@ +From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= +Date: Sat, 2 Nov 2024 16:10:18 +0000 +Subject: [PATCH] gdbus: define MAX_INPUT for musl + +This is the same solution as was done in src/shared/util.c + +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee +Signed-off-by: Fiona Klute +--- + gdbus/object.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gdbus/object.c b/gdbus/object.c +index 84f116bf1..7b0476f1a 100644 +--- a/gdbus/object.c ++++ b/gdbus/object.c +@@ -20,6 +20,12 @@ + #include + + #include "gdbus.h" ++ ++/* define MAX_INPUT for musl */ ++#ifndef MAX_INPUT ++#define MAX_INPUT _POSIX_MAX_INPUT ++#endif ++ + #include "src/shared/util.h" + + #define info(fmt...) +-- +2.45.2 + diff --git a/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch b/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch new file mode 100644 index 0000000000..09ebe5edf1 --- /dev/null +++ b/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch @@ -0,0 +1,35 @@ +From b1fd409960001a77cda2a09ecc00147ebd9c3667 Mon Sep 17 00:00:00 2001 +From: Fiona Klute +Date: Mon, 9 Dec 2024 16:40:43 +0100 +Subject: [PATCH BlueZ] build: Leave config files writable for owner + +This is needed for builds running as non-root users, so the build +process and any distribution tools can create/move/delete files in the +config directory without adjusting permissions separately. Limiting +writes from the running service needs to be done in the systemd unit +(already the case) or init script. + +See also: https://lore.kernel.org/linux-bluetooth/4d1206df-598b-4a68-8655-74981b62ecca@gmx.de/T/ +Reviewed-by: Bastien Nocera +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=b1fd409960001a77cda2a09ecc00147ebd9c3667 +Signed-off-by: Fiona Klute (WIWA) +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 297d0774c..29018a91c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,7 +32,7 @@ confdir = $(sysconfdir)/bluetooth + statedir = $(localstatedir)/lib/bluetooth + + bluetoothd-fix-permissions: +- install -dm555 $(DESTDIR)$(confdir) ++ install -dm755 $(DESTDIR)$(confdir) + install -dm700 $(DESTDIR)$(statedir) + + if DATAFILES +-- +2.45.2 + diff --git a/package/bluez5_utils/0003-input-fix-HID-compilation-w-o-HoG.patch b/package/bluez5_utils/0003-input-fix-HID-compilation-w-o-HoG.patch new file mode 100644 index 0000000000..941e9fb68f --- /dev/null +++ b/package/bluez5_utils/0003-input-fix-HID-compilation-w-o-HoG.patch @@ -0,0 +1,140 @@ +From b111b5e15eb74e08b74cb3c7e91bcb21f54be4c7 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Thu, 1 May 2025 18:35:35 +0200 +Subject: input: fix HID compilation w/o HoG + +Commit [1] introduced a dependency with the HID plugin in the HoG code +As a result, building with --enable-hid --disable-hog caused linker +errors due to undefined references to HoG-related functions: + +``` +> ./configure --enable-hid --disable-hog +... +> make +... + CCLD src/bluetoothd +/usr/bin/ld: profiles/input/bluetoothd-manager.o: in function `input_init': +/home/../bluez/profiles/input/manager.c:122:(.text.input_init+0x1c8): undefined reference to `input_set_auto_sec' +collect2: error: ld returned 1 exit status +make[1]: *** [Makefile:6376: src/bluetoothd] Error 1 +``` + +This patch moves the reading of the HOG specific configuration of the +'input.conf' file: LEAutoSecurity, to the HoG plugin file. + +[1] f2778f587 input: Add LEAutoSecurity setting to input.conf + +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=b111b5e15eb74e08b74cb3c7e91bcb21f54be4c7 +Signed-off-by: Thomas Perale +--- + profiles/input/device.h | 1 - + profiles/input/hog.c | 40 +++++++++++++++++++++++++++++++++++----- + profiles/input/manager.c | 11 +---------- + 3 files changed, 36 insertions(+), 16 deletions(-) + +diff --git a/profiles/input/device.h b/profiles/input/device.h +index 7b87ce5903..036a88980e 100644 +--- a/profiles/input/device.h ++++ b/profiles/input/device.h +@@ -25,7 +25,6 @@ void input_set_userspace_hid(char *state); + uint8_t input_get_userspace_hid(void); + void input_set_classic_bonded_only(bool state); + bool input_get_classic_bonded_only(void); +-void input_set_auto_sec(bool state); + + int input_device_register(struct btd_service *service); + void input_device_unregister(struct btd_service *service); +diff --git a/profiles/input/hog.c b/profiles/input/hog.c +index 017e320f07..f82648fec8 100644 +--- a/profiles/input/hog.c ++++ b/profiles/input/hog.c +@@ -57,11 +57,6 @@ static gboolean suspend_supported = FALSE; + static bool auto_sec = true; + static struct queue *devices = NULL; + +-void input_set_auto_sec(bool state) +-{ +- auto_sec = state; +-} +- + static void hog_device_accept(struct hog_device *dev, struct gatt_db *db) + { + char name[248]; +@@ -228,10 +223,45 @@ static struct btd_profile hog_profile = { + .auto_connect = true, + }; + ++static void hog_read_config(void) ++{ ++ const char filename[] = CONFIGDIR "/input.conf"; ++ GKeyFile *config; ++ GError *err = NULL; ++ bool config_auto_sec; ++ ++ config = g_key_file_new(); ++ if (!config) { ++ error("Failed to allocate memory for config"); ++ return; ++ } ++ ++ if (!g_key_file_load_from_file(config, filename, 0, &err)) { ++ if (!g_error_matches(err, G_FILE_ERROR, G_FILE_ERROR_NOENT)) ++ error("Parsing %s failed: %s", filename, err->message); ++ g_error_free(err); ++ g_key_file_free(config); ++ return; ++ } ++ ++ config_auto_sec = g_key_file_get_boolean(config, "General", ++ "LEAutoSecurity", &err); ++ if (!err) { ++ DBG("input.conf: LEAutoSecurity=%s", ++ config_auto_sec ? "true" : "false"); ++ auto_sec = config_auto_sec; ++ } else ++ g_clear_error(&err); ++ ++ g_key_file_free(config); ++} ++ + static int hog_init(void) + { + int err; + ++ hog_read_config(); ++ + err = suspend_init(suspend_callback, resume_callback); + if (err < 0) + error("Loading suspend plugin failed: %s (%d)", strerror(-err), +diff --git a/profiles/input/manager.c b/profiles/input/manager.c +index 95ca0a7ee5..1c0b6122a1 100644 +--- a/profiles/input/manager.c ++++ b/profiles/input/manager.c +@@ -85,7 +85,7 @@ static int input_init(void) + config = load_config_file(CONFIGDIR "/input.conf"); + if (config) { + int idle_timeout; +- gboolean classic_bonded_only, auto_sec; ++ gboolean classic_bonded_only; + char *uhid_enabled; + + idle_timeout = g_key_file_get_integer(config, "General", +@@ -115,15 +115,6 @@ static int input_init(void) + } else + g_clear_error(&err); + +- auto_sec = g_key_file_get_boolean(config, "General", +- "LEAutoSecurity", &err); +- if (!err) { +- DBG("input.conf: LEAutoSecurity=%s", +- auto_sec ? "true" : "false"); +- input_set_auto_sec(auto_sec); +- } else +- g_clear_error(&err); +- + } + + btd_profile_register(&input_profile); +-- +cgit 1.2.3-korg + diff --git a/package/bluez5_utils/0004-input-fix-HoG-compilation-w-o-HID.patch b/package/bluez5_utils/0004-input-fix-HoG-compilation-w-o-HID.patch new file mode 100644 index 0000000000..b2824e5e18 --- /dev/null +++ b/package/bluez5_utils/0004-input-fix-HoG-compilation-w-o-HID.patch @@ -0,0 +1,120 @@ +From 9c52188d753002a6afd6ae145f921a2ff52c1c81 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Thu, 1 May 2025 18:35:36 +0200 +Subject: input: fix HoG compilation w/o HID + +Commit [1] introduced a dependency with the HID plugin in the HoG code +As a result, building with --disable-hid --enable-hog caused linker +errors due to undefined references to HID-related functions: + +``` +> ./configure --disable-hid --enable-hog +> make +/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_accept': +/home/../bluez/profiles/input/hog.c:184:(.text.hog_accept+0xbb): undefined reference to `input_get_auto_sec' +/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_disconnect': +/home/../bluez/profiles/input/hog.c:205:(.text.hog_disconnect+0x12): undefined reference to `input_get_userspace_hid' +collect2: error: ld returned 1 exit status +make[1]: *** [Makefile:6344: src/bluetoothd] Error 1 +make: *** [Makefile:4695: all] Error 2 +``` + +This patch duplicate the read of the 'UserspaceHID=persist' config entry +in the HoG plugin file to remove the dependency on the HID plugin files. + +[1] 1782bfd79 input: Add support for UserspaceHID=persist + +Fixes: https://github.com/bluez/bluez/issues/1228 + +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9c52188d753002a6afd6ae145f921a2ff52c1c81 +Signed-off-by: Thomas Perale +--- + profiles/input/device.c | 5 ----- + profiles/input/device.h | 1 - + profiles/input/hog.c | 14 ++++++++++++-- + 3 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index a7bc4d44fa..3642cc3267 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -112,11 +112,6 @@ void input_set_userspace_hid(char *state) + error("Unknown value '%s'", state); + } + +-uint8_t input_get_userspace_hid(void) +-{ +- return uhid_state; +-} +- + void input_set_classic_bonded_only(bool state) + { + classic_bonded_only = state; +diff --git a/profiles/input/device.h b/profiles/input/device.h +index 036a88980e..9056695026 100644 +--- a/profiles/input/device.h ++++ b/profiles/input/device.h +@@ -22,7 +22,6 @@ struct input_conn; + + void input_set_idle_timeout(int timeout); + void input_set_userspace_hid(char *state); +-uint8_t input_get_userspace_hid(void); + void input_set_classic_bonded_only(bool state); + bool input_get_classic_bonded_only(void); + +diff --git a/profiles/input/hog.c b/profiles/input/hog.c +index f82648fec8..a3c876cf9f 100644 +--- a/profiles/input/hog.c ++++ b/profiles/input/hog.c +@@ -40,7 +40,6 @@ + #include "src/shared/gatt-client.h" + #include "src/plugin.h" + +-#include "device.h" + #include "suspend.h" + #include "attrib/att.h" + #include "attrib/gattrib.h" +@@ -55,6 +54,7 @@ struct hog_device { + + static gboolean suspend_supported = FALSE; + static bool auto_sec = true; ++static bool uhid_state_persist = false; + static struct queue *devices = NULL; + + static void hog_device_accept(struct hog_device *dev, struct gatt_db *db) +@@ -203,7 +203,7 @@ static int hog_disconnect(struct btd_service *service) + { + struct hog_device *dev = btd_service_get_user_data(service); + +- if (input_get_userspace_hid() == UHID_PERSIST) ++ if (uhid_state_persist) + bt_hog_detach(dev->hog, false); + else + bt_hog_detach(dev->hog, true); +@@ -229,6 +229,7 @@ static void hog_read_config(void) + GKeyFile *config; + GError *err = NULL; + bool config_auto_sec; ++ char *uhid_enabled; + + config = g_key_file_new(); + if (!config) { +@@ -253,6 +254,15 @@ static void hog_read_config(void) + } else + g_clear_error(&err); + ++ uhid_enabled = g_key_file_get_string(config, "General", ++ "UserspaceHID", &err); ++ if (!err) { ++ DBG("input.conf: UserspaceHID=%s", uhid_enabled); ++ uhid_state_persist = strcasecmp(uhid_enabled, "persist") == 0; ++ free(uhid_enabled); ++ } else ++ g_clear_error(&err); ++ + g_key_file_free(config); + } + +-- +cgit 1.2.3-korg + diff --git a/package/bluez5_utils/S40bluetoothd b/package/bluez5_utils/S40bluetoothd index ee4abe8b63..04f3f5ee94 100644 --- a/package/bluez5_utils/S40bluetoothd +++ b/package/bluez5_utils/S40bluetoothd @@ -11,7 +11,8 @@ BLUETOOTHD_ARGS="-n" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/libexec/bluetooth/$DAEMON" \ + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/libexec/bluetooth/$DAEMON" \ -- $BLUETOOTHD_ARGS status=$? if [ "$status" -eq 0 ]; then @@ -24,25 +25,32 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/libexec/bluetooth/$DAEMON" status=$? if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" + return "$status" fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/usr/libexec/bluetooth/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" return "$status" } restart() { stop - sleep 1 start } reload() { printf 'Reloading %s: ' "$DAEMON" - start-stop-daemon -K -s HUP -q -p "$PIDFILE" + start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \ + --exec "/usr/libexec/bluetooth/$DAEMON" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 41e39e0b5c..9b39b19c08 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3 bluez-5.78.tar.xz +sha256 4164a5303a9f71c70f48c03ff60be34231b568d93a9ad5e79928d34e6aa0ea8a bluez-5.79.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 717c10e870..e3b47e1e80 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.78 +BLUEZ5_UTILS_VERSION = 5.79 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -13,6 +13,9 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# required because 0002-Leave-config-files-writable-for-owner.patch +# modifies Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ @@ -22,13 +25,12 @@ BLUEZ5_UTILS_DEPENDENCIES = \ BLUEZ5_UTILS_CONF_OPTS = \ --enable-library \ --disable-cups \ - --disable-datafiles \ --disable-manpages \ --disable-asan \ --disable-lsan \ --disable-ubsan \ --disable-pie \ - --with-dbusconfdir=/etc + --with-dbusconfdir=/usr/share ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) BLUEZ5_UTILS_CONF_OPTS += --enable-obex diff --git a/package/bmap-tools/Config.in b/package/bmap-tools/Config.in index b5ccce786e..c71d6f6ea0 100644 --- a/package/bmap-tools/Config.in +++ b/package/bmap-tools/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_BMAP_TOOLS depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources - select BR2_PACKAGE_PYTHON_SIX # runtime help Tool to flash image files to block devices using the block map bmaptool is a generic tool for creating the block map (bmap) diff --git a/package/bmap-tools/Config.in.host b/package/bmap-tools/Config.in.host index 499f9d177d..056e76f959 100644 --- a/package/bmap-tools/Config.in.host +++ b/package/bmap-tools/Config.in.host @@ -1,7 +1,6 @@ config BR2_PACKAGE_HOST_BMAP_TOOLS bool "host bmap-tools" select BR2_PACKAGE_HOST_PYTHON3 # runtime - select BR2_PACKAGE_HOST_PYTHON_SIX # runtime help Tool to flash image files to block devices using the block map bmaptool is a generic tool for creating the block map (bmap) diff --git a/package/bmap-tools/bmap-tools.hash b/package/bmap-tools/bmap-tools.hash index 28a68e8b8e..0ead4ab1b1 100644 --- a/package/bmap-tools/bmap-tools.hash +++ b/package/bmap-tools/bmap-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c741ccdd5049b5cb6983bc186f7be8040a132ed7e9c2afda4d9e7390888163c bmap-tools-3.8.0.tar.gz +sha256 9940bb97fa0f2c11ee4625a2f620a4ae2b94c556f8d01c070aee08486a2a1812 bmap-tools-3.9.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/bmap-tools/bmap-tools.mk b/package/bmap-tools/bmap-tools.mk index 3c661cb9e2..b8dec2c774 100644 --- a/package/bmap-tools/bmap-tools.mk +++ b/package/bmap-tools/bmap-tools.mk @@ -4,11 +4,11 @@ # ################################################################################ -BMAP_TOOLS_VERSION = 3.8.0 +BMAP_TOOLS_VERSION = 3.9.0 BMAP_TOOLS_SITE = $(call github,yoctoproject,bmaptool,v$(BMAP_TOOLS_VERSION)) BMAP_TOOLS_LICENSE = GPL-2.0 BMAP_TOOLS_LICENSE_FILES = LICENSE -BMAP_TOOLS_SETUP_TYPE = poetry +BMAP_TOOLS_SETUP_TYPE = hatch $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/bmap-writer/Config.in b/package/bmap-writer/Config.in new file mode 100644 index 0000000000..5876a85927 --- /dev/null +++ b/package/bmap-writer/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_BMAP_WRITER + bool "bmap-writer" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # libarchive + select BR2_PACKAGE_LIBARCHIVE + select BR2_PACKAGE_TINYXML2 + help + bmap-writer is a command-line utility designed to + efficiently write disk images to storage devices using block + mapping (BMAP). It serves as a lightweight alternative to + the Yocto BMAP tool, specifically for embedded + systems. Unlike the Yocto BMAP tool, bmap-writer is C++ + based, does not require Python, and focuses solely on + writing an image. + + https://github.com/embetrix/bmap-writer + +comment "bmap-writer needs a toolchain w/ C++, wchar" + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP diff --git a/package/bmap-writer/Config.in.host b/package/bmap-writer/Config.in.host new file mode 100644 index 0000000000..a5365f47cf --- /dev/null +++ b/package/bmap-writer/Config.in.host @@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_BMAP_WRITER + bool "host bmap-writer" + help + bmap-writer is a command-line utility designed to + efficiently write disk images to storage devices using block + mapping (BMAP). It serves as a lightweight alternative to + the Yocto BMAP tool, specifically for embedded + systems. Unlike the Yocto BMAP tool, bmap-writer is C++ + based, does not require Python, and focuses solely on + writing an image. + + https://github.com/embetrix/bmap-writer diff --git a/package/bmap-writer/bmap-writer.hash b/package/bmap-writer/bmap-writer.hash new file mode 100644 index 0000000000..0b0e8de46a --- /dev/null +++ b/package/bmap-writer/bmap-writer.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a86ade2c70304574f200c048bd8a728ed27b04b7ece62cf0f696366e37fed6e7 bmap-writer-1.0.2.tar.gz +sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b LICENSE diff --git a/package/bmap-writer/bmap-writer.mk b/package/bmap-writer/bmap-writer.mk new file mode 100644 index 0000000000..19ccd3afbc --- /dev/null +++ b/package/bmap-writer/bmap-writer.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# bmap-writer +# +################################################################################ + +BMAP_WRITER_VERSION = 1.0.2 +BMAP_WRITER_SITE = $(call github,embetrix,bmap-writer,$(BMAP_WRITER_VERSION)) +BMAP_WRITER_LICENSE = GPL-3.0 +BMAP_WRITER_LICENSE_FILES = LICENSE +BMAP_WRITER_DEPENDENCIES = host-pkgconf libarchive tinyxml2 +HOST_BMAP_WRITER_DEPENDENCIES = host-pkgconf host-libarchive host-tinyxml2 + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/bmx7/0004-support-mbedtls-2-8-0-without-mbedtls-compat-1-3.patch b/package/bmx7/0004-support-mbedtls-2-8-0-without-mbedtls-compat-1-3.patch new file mode 100644 index 0000000000..5cbb66f65f --- /dev/null +++ b/package/bmx7/0004-support-mbedtls-2-8-0-without-mbedtls-compat-1-3.patch @@ -0,0 +1,786 @@ +From a47d8d55717a74a2b399c612dc5a17df8d039125 Mon Sep 17 00:00:00 2001 +From: Axel Neumann +Date: Fri, 17 May 2024 07:07:00 +0200 +Subject: [PATCH] Support mbedtls-2.8.0 without mbedtls/compat-1.3.h . Purge + Polarssl support + +Upstream: https://github.com/bmx-routing/bmx7/commit/a47d8d55717a74a2b399c612dc5a17df8d039125 +Signed-off-by: Thomas Perale +--- + src/crypt.c | 357 +++++++++++++++++----------------------------------- + src/crypt.h | 11 +- + 2 files changed, 115 insertions(+), 253 deletions(-) + +diff --git a/src/crypt.c b/src/crypt.c +index 004b8e7..9270b75 100644 +--- a/src/crypt.c ++++ b/src/crypt.c +@@ -37,34 +37,17 @@ static uint8_t shaClean = NO; + + static CRYPTRSA_T *my_PrivKey = NULL; + +-#if (CRYPTLIB >= POLARSSL_MIN && CRYPTLIB <= POLARSSL_MAX) || (CRYPTLIB >= MBEDTLS_MIN && CRYPTLIB <= MBEDTLS_MAX) +- +-#if (CRYPTLIB >= POLARSSL_MIN && CRYPTLIB <= POLARSSL_MAX) +-/******************* accessing polarssl: *************************************/ +-#include "polarssl/config.h" +-#include "polarssl/sha256.h" +- +-#include "polarssl/entropy.h" +-//#include "polarssl/entropy_poll.h" +- +-#include "polarssl/error.h" +-#include "polarssl/md.h" +-#include "polarssl/dhm.h" +-#include "polarssl/rsa.h" +-#include "polarssl/ctr_drbg.h" +- +-#include "polarssl/x509.h" +-#if CRYPTLIB <= POLARSSL_1_2_9 +-#include "polarssl/x509write.h" +-#elif CRYPTLIB >= POLARSSL_1_3_3 +-#include "polarssl/pk.h" +-#endif + +-#elif (CRYPTLIB >= MBEDTLS_MIN && CRYPTLIB <= MBEDTLS_MAX) ++#if (CRYPTLIB >= MBEDTLS_MIN && CRYPTLIB <= MBEDTLS_MAX) + /******************* accessing mbedtls: *************************************/ + +-#include "mbedtls/compat-1.3.h" ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++//#include "mbedtls/compat-1.3.h" + #include "mbedtls/config.h" ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++#include "mbedtls/compat-2.x.h" ++#endif ++ + #include "mbedtls/sha256.h" + #include "mbedtls/entropy.h" + #include "mbedtls/error.h" +@@ -75,10 +58,10 @@ static CRYPTRSA_T *my_PrivKey = NULL; + + #endif + +-static entropy_context entropy_ctx; +-static ctr_drbg_context ctr_drbg; ++static mbedtls_entropy_context entropy_ctx; ++static mbedtls_ctr_drbg_context ctr_drbg; ++static mbedtls_sha256_context sha_ctx; + +-static sha256_context sha_ctx; + + uint8_t cryptDhmKeyTypeByLen(int len) + { +@@ -111,7 +94,7 @@ void cryptDhmKeyFree(CRYPTDHM_T **cryptKey) + return; + + if ((*cryptKey)->backendKey) { +- dhm_free((dhm_context*) ((*cryptKey)->backendKey)); ++ mbedtls_dhm_free((mbedtls_dhm_context*) ((*cryptKey)->backendKey)); + debugFree((*cryptKey)->backendKey, -300828); + } + +@@ -129,25 +112,25 @@ void cryptDhmKeyFree(CRYPTDHM_T **cryptKey) + * http://www.cl.cam.ac.uk/~rja14/Papers/psandqs.pdf + * http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-2643 + */ +-static int _cryptDhmCheckRange(const mpi *param, const mpi *P) ++static int _cryptDhmCheckRange(const mbedtls_mpi *param, const mbedtls_mpi *P) + { +- mpi L, U; ++ mbedtls_mpi L, U; + int ret = FAILURE; //POLARSSL_ERR_DHM_BAD_INPUT_DATA; + +- mpi_init(&L); +- mpi_init(&U); ++ mbedtls_mpi_init(&L); ++ mbedtls_mpi_init(&U); + + if ( +- mpi_lset(&L, 2) == 0 && +- mpi_sub_int(&U, P, 2) == 0 && +- mpi_cmp_mpi(param, &L) >= 0 && +- mpi_cmp_mpi(param, &U) <= 0) { ++ mbedtls_mpi_lset(&L, 2) == 0 && ++ mbedtls_mpi_sub_int(&U, P, 2) == 0 && ++ mbedtls_mpi_cmp_mpi(param, &L) >= 0 && ++ mbedtls_mpi_cmp_mpi(param, &U) <= 0) { + + ret = SUCCESS; + } + +- mpi_free(&L); +- mpi_free(&U); ++ mbedtls_mpi_free(&L); ++ mbedtls_mpi_free(&U); + return( ret); + } + +@@ -158,20 +141,12 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + char *goto_error_code = NULL; + int keyLen = 0; + CRYPTDHM_T *key = debugMallocReset(sizeof(CRYPTDHM_T), -300829); +- dhm_context *dhm = debugMallocReset(sizeof(dhm_context), -300830); +-#if !(CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) +- char *pptr = NULL; +- char *gptr = NULL; +-#endif ++ mbedtls_dhm_context *dhm = debugMallocReset(sizeof(mbedtls_dhm_context), -300830); + int pSize = 0; + int xSize = 0; + int gxSize = 0; + int count = 0; + +-#if CRYPTLIB >= POLARSSL_1_3_9 +- // in older versions, if dhm_init() exist, it only zero-memsets the dhm context +- dhm_init(dhm); +-#endif + key->backendKey = dhm; + + if (!(keyType)) +@@ -179,58 +154,36 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + if ((keyLen = cryptDhmKeyLenByType(keyType)) <= 0) + goto_error(finish, "Invalid size"); + +-#if (CRYPTLIB >= POLARSSL_MIN && CRYPTLIB <= POLARSSL_MAX) +- if (keyType == CRYPT_DHM1024_TYPE) { +- pptr = POLARSSL_DHM_RFC5114_MODP_1024_P; +- gptr = POLARSSL_DHM_RFC5114_MODP_1024_G; +- } else if (keyType == CRYPT_DHM2048_TYPE) { +- pptr = POLARSSL_DHM_RFC3526_MODP_2048_P; +- gptr = POLARSSL_DHM_RFC3526_MODP_2048_G; +- } else if (keyType == CRYPT_DHM3072_TYPE) { +- pptr = POLARSSL_DHM_RFC3526_MODP_3072_P; +- gptr = POLARSSL_DHM_RFC3526_MODP_3072_G; +-#elif (CRYPTLIB >= MBEDTLS_MIN && CRYPTLIB < MBEDTLS_2_8_0) +- if (keyType == CRYPT_DHM2048_TYPE) { +- pptr = MBEDTLS_DHM_RFC3526_MODP_2048_P; +- gptr = MBEDTLS_DHM_RFC3526_MODP_2048_G; +- } else if (keyType == CRYPT_DHM3072_TYPE) { +- pptr = MBEDTLS_DHM_RFC3526_MODP_3072_P; +- gptr = MBEDTLS_DHM_RFC3526_MODP_3072_G; +-#elif (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) + + if (keyType == CRYPT_DHM2048_TYPE) { + static const unsigned char modp2048P[(2048/8)] = MBEDTLS_DHM_RFC3526_MODP_2048_P_BIN; + static const unsigned char modp2048G[1] = MBEDTLS_DHM_RFC3526_MODP_2048_G_BIN; +- if ((ret = mpi_read_binary(&dhm->P, modp2048P, sizeof(modp2048P) )) != 0 || (ret = mpi_read_binary(&dhm->G, modp2048G, sizeof(modp2048G))) != 0) +- goto_error(finish, "Failed setting dhm parameters!"); ++ ++ if ((ret = mbedtls_mpi_read_binary(&dhm->P, modp2048P, sizeof(modp2048P) )) != 0 || (ret = mbedtls_mpi_read_binary(&dhm->G, modp2048G, sizeof(modp2048G))) != 0) ++ goto_error(finish, "Failed reading dhm2048 parameters!"); + + } else if (keyType == CRYPT_DHM3072_TYPE) { + static const unsigned char modp3072P[(3072/8)] = MBEDTLS_DHM_RFC3526_MODP_3072_P_BIN; + static const unsigned char modp3072G[1] = MBEDTLS_DHM_RFC3526_MODP_3072_G_BIN; +- if ((ret = mpi_read_binary(&dhm->P, modp3072P, sizeof(modp3072P) )) != 0 || (ret = mpi_read_binary(&dhm->G, modp3072G, sizeof(modp3072G))) != 0) +- goto_error(finish, "Failed setting dhm parameters!"); +-#endif ++ if ((ret = mbedtls_mpi_read_binary(&dhm->P, modp3072P, sizeof(modp3072P) )) != 0 || (ret = mbedtls_mpi_read_binary(&dhm->G, modp3072G, sizeof(modp3072G))) != 0) ++ goto_error(finish, "Failed reading dhm3072 parameters!"); + } else { + goto_error(finish, "Unsupported dhm type!"); + } + +-#if !(CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) +- if ((ret = mpi_read_string(&dhm->P, 16, pptr)) != 0 || (ret = mpi_read_string(&dhm->G, 16, gptr)) != 0) +- goto_error(finish, "Failed setting dhm parameters!"); +-#endif +- if (mpi_cmp_int(&dhm->P, 0) == 0) ++ if (mbedtls_mpi_cmp_int(&dhm->P, 0) == 0) + goto_error(finish, "Empty dhm->P"); + + // Generate X as large as possible ( < P ) +- if ((pSize = mpi_size(&dhm->P)) != keyLen) ++ if ((pSize = mbedtls_mpi_size(&dhm->P)) != keyLen) + goto_error(finish, "Invalid P size"); + + do { +- if ((ret = mpi_fill_random(&dhm->X, pSize, ctr_drbg_random, &ctr_drbg)) != 0) ++ if ((ret = mbedtls_mpi_fill_random(&dhm->X, pSize, mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) + goto_error(finish, "Failed allocating randomness"); + +- while (mpi_cmp_mpi(&dhm->X, &dhm->P) >= 0) { +- if ((ret = mpi_shift_r(&dhm->X, 1)) != 0) ++ while (mbedtls_mpi_cmp_mpi(&dhm->X, &dhm->P) >= 0) { ++ if ((ret = mbedtls_mpi_shift_r(&dhm->X, 1)) != 0) + goto_error(finish, "Failed shifting dhm->X param"); + } + +@@ -240,13 +193,13 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + } while ((ret = _cryptDhmCheckRange(&dhm->X, &dhm->P)) != SUCCESS); + + // Calculate GX = G^X mod P +- if (mpi_exp_mod(&dhm->GX, &dhm->G, &dhm->X, &dhm->P, &dhm->RP) != 0) ++ if (mbedtls_mpi_exp_mod(&dhm->GX, &dhm->G, &dhm->X, &dhm->P, &dhm->RP) != 0) + goto_error(finish, "Failed creating GX modulo"); +- if (((int) (dhm->len = mpi_size(&dhm->P))) != keyLen) ++ if (((int) (dhm->len = mbedtls_mpi_size(&dhm->P))) != keyLen) + goto_error(finish, "Invalid len"); +- if ((xSize = mpi_size(&dhm->X)) != keyLen) ++ if ((xSize = mbedtls_mpi_size(&dhm->X)) != keyLen) + goto_error(finish, "Invalid X size"); +- if ((gxSize = mpi_size(&dhm->GX)) != keyLen) ++ if ((gxSize = mbedtls_mpi_size(&dhm->GX)) != keyLen) + goto_error(finish, "Invalid GX size"); + if ((ret = _cryptDhmCheckRange(&dhm->GX, &dhm->P)) != SUCCESS) + goto_error(finish, "Invalid GX range"); +@@ -277,19 +230,19 @@ void cryptDhmPubKeyGetRaw(CRYPTDHM_T* key, uint8_t* buff, uint16_t buffLen) + assertion_dbg(-502719, (key && buff && buffLen && key->rawGXType && buffLen == key->rawGXLen), + "Failed: key=%d buff=%d buffLen=%d key.GXLen=%d", !!key, !!buff, buffLen, key ? key->rawGXLen : 0); + +- dhm_context *dhm = key->backendKey; ++ mbedtls_dhm_context *dhm = key->backendKey; + +- assertion_dbg(-502720, (dhm && buffLen == mpi_size(&dhm->GX) && buffLen == dhm->len), +- "Failed: dhm.GXlen=%zd dhm.len=%zd", dhm ? mpi_size(&dhm->GX) : 0, dhm ? dhm->len : 0); ++ assertion_dbg(-502720, (dhm && buffLen == mbedtls_mpi_size(&dhm->GX) && buffLen == dhm->len), ++ "Failed: dhm.GXlen=%zd dhm.len=%zd", dhm ? mbedtls_mpi_size(&dhm->GX) : 0, dhm ? dhm->len : 0); + +- mpi_write_binary(&dhm->GX, buff, key->rawGXLen); ++ mbedtls_mpi_write_binary(&dhm->GX, buff, key->rawGXLen); + } + + STATIC_FUNC + IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + { + char *goto_error_code = NULL; +- dhm_context *dhm = NULL; ++ mbedtls_dhm_context *dhm = NULL; + uint8_t keyType = 0; + int keyLen = 0; + int pSize = 0; +@@ -297,7 +250,7 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + int gxSize = 0; + int gySize = 0; + +- if (!(dhm = (dhm_context *) key->backendKey)) ++ if (!(dhm = (mbedtls_dhm_context *) key->backendKey)) + goto_error(finish, "Missing backend key"); + if (!(keyType = key->rawGXType)) + goto_error(finish, "Missing type"); +@@ -305,13 +258,13 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + goto_error(finish, "Invalid size"); + if ((int) dhm->len != keyLen) + goto_error(finish, "Invalid len"); +- if ((pSize = mpi_size(&dhm->P)) != keyLen) ++ if ((pSize = mbedtls_mpi_size(&dhm->P)) != keyLen) + goto_error(finish, "Invalid P size"); +- if ((xSize = mpi_size(&dhm->X)) != keyLen) ++ if ((xSize = mbedtls_mpi_size(&dhm->X)) != keyLen) + goto_error(finish, "Invalid X size"); +- if ((gxSize = mpi_size(&dhm->GX)) != keyLen) ++ if ((gxSize = mbedtls_mpi_size(&dhm->GX)) != keyLen) + goto_error(finish, "Invalid GX size"); +- if ((gySize = mpi_size(&dhm->GY)) != keyLen) ++ if ((gySize = mbedtls_mpi_size(&dhm->GY)) != keyLen) + goto_error(finish, "Invalid GY size"); + if (_cryptDhmCheckRange(&dhm->GX, &dhm->P) != SUCCESS) + goto_error(finish, "Invalid GX range"); +@@ -333,7 +286,7 @@ CRYPTSHA_T *cryptDhmSecretForNeigh(CRYPTDHM_T *myDhm, uint8_t *neighRawKey, uint + uint8_t keyType = 0; + int ret = 0; + CRYPTSHA_T *secret = NULL; +- dhm_context *dhm = NULL; ++ mbedtls_dhm_context *dhm = NULL; + uint8_t buff[CRYPT_DHM_MAX_LEN]; + size_t n = 0; + +@@ -343,17 +296,13 @@ CRYPTSHA_T *cryptDhmSecretForNeigh(CRYPTDHM_T *myDhm, uint8_t *neighRawKey, uint + if (((keyType = cryptDhmKeyTypeByLen(neighRawKeyLen)) != myDhm->rawGXType) || ((n = dhm->len) != neighRawKeyLen) || (sizeof(buff) < neighRawKeyLen)) + goto_error(finish, "Wrong type or keyLength"); + +- if ((ret = mpi_read_binary(&dhm->GY, neighRawKey, neighRawKeyLen)) != 0) ++ if ((ret = mbedtls_mpi_read_binary(&dhm->GY, neighRawKey, neighRawKeyLen)) != 0) + goto_error(finish, "Invalid GY"); + + if (cryptDhmKeyCheck(myDhm) != SUCCESS) + goto_error(finish, "Failed key check"); + +-#if (CRYPTLIB >= POLARSSL_MIN && CRYPTLIB <= POLARSSL_MAX) +- if ((ret = dhm_calc_secret(dhm, buff, &n, ctr_drbg_random, &ctr_drbg)) != 0) +-#elif (CRYPTLIB >= MBEDTLS_MIN && CRYPTLIB <= MBEDTLS_MAX) +- if ((ret = dhm_calc_secret(dhm, buff, sizeof(buff), &n, ctr_drbg_random, &ctr_drbg)) != 0) +-#endif ++ if ((ret = mbedtls_dhm_calc_secret(dhm, buff, sizeof(buff), &n, mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) + goto_error(finish, "Failed calculating secret"); + + if (n > neighRawKeyLen || n < ((neighRawKeyLen / 4)*3)) +@@ -368,8 +317,8 @@ CRYPTSHA_T *cryptDhmSecretForNeigh(CRYPTDHM_T *myDhm, uint8_t *neighRawKey, uint + dbgf(((goto_error_code || n != neighRawKeyLen) ? DBGL_SYS : DBGL_CHANGES), ((goto_error_code || n != neighRawKeyLen) ? DBGT_WARN : DBGT_INFO), + "%s n=%zd neighKeyLen=%d myKeyLen=%d", goto_error_code, n, neighRawKeyLen, myDhm->rawGXLen); + +- mpi_free(&dhm->GY); +- mpi_free(&dhm->K); ++ mbedtls_mpi_free(&dhm->GY); ++ mbedtls_mpi_free(&dhm->K); + memset(buff, 0, sizeof(buff)); + return secret; } + } +@@ -381,14 +330,10 @@ void cryptRsaKeyFree(CRYPTRSA_T **cryptKey) + return; + + if ((*cryptKey)->backendKey) { +- rsa_free((rsa_context*) ((*cryptKey)->backendKey)); ++ mbedtls_rsa_free((mbedtls_rsa_context*) ((*cryptKey)->backendKey)); + debugFree((*cryptKey)->backendKey, -300612); + } + +- // if ((*cryptKey)->__rawKey) { +- // debugFree((*cryptKey)->__rawKey, -300613); +- // } +- + debugFree((*cryptKey), -300614); + + *cryptKey = NULL; +@@ -397,15 +342,15 @@ void cryptRsaKeyFree(CRYPTRSA_T **cryptKey) + int cryptRsaPubKeyGetRaw(CRYPTRSA_T *key, uint8_t *buff, uint16_t buffLen) + { + +- rsa_context *rsa; ++ mbedtls_rsa_context *rsa; + if (!key || !buff || !buffLen || + !key->rawKeyType || (buffLen != key->rawKeyLen) || +- !(rsa = (rsa_context*) key->backendKey) || buffLen != mpi_size(&rsa->N) || buffLen != rsa->len) { ++ !(rsa = (mbedtls_rsa_context*) key->backendKey) || buffLen != mbedtls_mpi_size(&rsa->N) || buffLen != rsa->len) { + + return FAILURE; + } + +- if (mpi_write_binary(&rsa->N, buff, buffLen) != 0) ++ if (mbedtls_mpi_write_binary(&rsa->N, buff, buffLen) != 0) + return FAILURE; + + return SUCCESS; +@@ -420,16 +365,16 @@ CRYPTRSA_T *cryptRsaPubKeyFromRaw(uint8_t *rawKey, uint16_t rawKeyLen) + + CRYPTRSA_T *cryptKey = debugMallocReset(sizeof(CRYPTRSA_T), -300615); + +- cryptKey->backendKey = debugMalloc(sizeof(rsa_context), -300620); ++ cryptKey->backendKey = debugMalloc(sizeof(mbedtls_rsa_context), -300620); + +- rsa_context *rsa = (rsa_context*) cryptKey->backendKey; ++ mbedtls_rsa_context *rsa = (mbedtls_rsa_context*) cryptKey->backendKey; + +- rsa_init(rsa, RSA_PKCS_V15, 0); ++ mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, 0); + + + if ( +- (mpi_read_binary(&rsa->N, rawKey, rawKeyLen)) || +- (mpi_read_binary(&rsa->E, (uint8_t*) & e, sizeof(e))) ++ (mbedtls_mpi_read_binary(&rsa->N, rawKey, rawKeyLen)) || ++ (mbedtls_mpi_read_binary(&rsa->E, (uint8_t*) & e, sizeof(e))) + ) { + cryptRsaKeyFree(&cryptKey); + return NULL; +@@ -439,7 +384,6 @@ CRYPTRSA_T *cryptRsaPubKeyFromRaw(uint8_t *rawKey, uint16_t rawKeyLen) + cryptKey->rawKeyLen = rawKeyLen; + cryptKey->rawKeyType = cryptRsaKeyTypeByLen(rawKeyLen); + +- + #ifdef EXTREME_PARANOIA + uint8_t buff[rawKeyLen]; + memset(buff, 0, rawKeyLen); +@@ -448,10 +392,6 @@ CRYPTRSA_T *cryptRsaPubKeyFromRaw(uint8_t *rawKey, uint16_t rawKeyLen) + assertion(-502722, (memcmp(rawKey, buff, rawKeyLen) == 0)); + #endif + +- +- // cryptKey->__rawKey = debugMalloc(rawKeyLen,-300618); +- // memcpy(cryptKey->__rawKey, rawKey, rawKeyLen); +- + return cryptKey; + } + +@@ -460,10 +400,10 @@ int cryptRsaPubKeyCheck(CRYPTRSA_T *pubKey) + assertion(-502141, (pubKey)); + assertion(-502142, (pubKey->backendKey)); + +- rsa_context *rsa = (rsa_context*) pubKey->backendKey; ++ mbedtls_rsa_context *rsa = (mbedtls_rsa_context*) pubKey->backendKey; + +- if (!rsa->len || (int) rsa->len != cryptRsaKeyLenByType(pubKey->rawKeyType) || rsa->len != pubKey->rawKeyLen || rsa->len != mpi_size(&rsa->N) || +- rsa_check_pubkey((rsa_context*) pubKey->backendKey)) { ++ if (!rsa->len || (int) rsa->len != cryptRsaKeyLenByType(pubKey->rawKeyType) || rsa->len != pubKey->rawKeyLen || rsa->len != mbedtls_mpi_size(&rsa->N) || ++ mbedtls_rsa_check_pubkey((mbedtls_rsa_context*) pubKey->backendKey)) { + + return FAILURE; + } +@@ -512,48 +452,35 @@ CRYPTRSA_T *cryptRsaKeyFromDer(char *keyPath) + + CRYPTRSA_T *privKey = debugMallocReset(sizeof(CRYPTRSA_T), -300619); + CRYPTRSA_T *pubKey = NULL; +- privKey->backendKey = debugMallocReset(sizeof(rsa_context), -300620); ++ privKey->backendKey = debugMallocReset(sizeof(mbedtls_rsa_context), -300620); + +- rsa_context *rsa = privKey->backendKey; ++ mbedtls_rsa_context *rsa = privKey->backendKey; + int ret = 0; + int keyType = 0; + int keyLen = 0; + uint8_t keyBuff[CRYPT_RSA_MAX_LEN]; + +-#if CRYPTLIB <= POLARSSL_1_2_9 +- if ( +- (ret = x509parse_keyfile(rsa, keyPath, "")) || +- (ret = rsa_check_privkey(rsa)) +- ) { +- dbgf_sys(DBGT_ERR, "failed opening private key=%s err=%d", keyPath, ret); +- cryptRsaKeyFree(&privKey); +- return NULL; +- } +-#elif CRYPTLIB >= POLARSSL_1_3_3 +- pk_context pk; +- pk_init(&pk); +- rsa_init(rsa, RSA_PKCS_V15, 0); ++ mbedtls_pk_context pk; ++ mbedtls_pk_init(&pk); ++ mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, 0); + + if ( +- ((ret = pk_parse_keyfile(&pk, keyPath, "")) != 0) || +- ((ret = rsa_copy(rsa, pk_rsa(pk))) != 0) || +- ((ret = rsa_check_privkey(rsa)) != 0) ++ ((ret = mbedtls_pk_parse_keyfile(&pk, keyPath, "")) != 0) || ++ ((ret = mbedtls_rsa_copy(rsa, mbedtls_pk_rsa(pk))) != 0) || ++ ((ret = mbedtls_rsa_check_privkey(rsa)) != 0) + ) { + dbgf_sys(DBGT_ERR, "failed opening private key=%s keyLen=%d keyType=%d err=-%X", keyPath, keyLen, keyType, -ret); +- pk_free(&pk); ++ mbedtls_pk_free(&pk); + cryptRsaKeyFree(&privKey); + return NULL; + } +- pk_free(&pk); ++ mbedtls_pk_free(&pk); + +-#else +-#error "Please fix CRYPTLIB" +-#endif + + //cryptKeyAddRaw(ckey); + + if ( +- ((keyLen = mpi_size(&rsa->N)) <= 0) || ++ ((keyLen = mbedtls_mpi_size(&rsa->N)) <= 0) || + !(keyType = cryptRsaKeyTypeByLen(keyLen)) || + !(privKey->rawKeyType = keyType) || + !(privKey->rawKeyLen = keyLen) || +@@ -595,29 +522,16 @@ int cryptRsaKeyMakeDer(int32_t keyType, char *path) + + memset(derBuf, 0, CRYPT_DER_BUF_SZ); + +-#if CRYPTLIB <= POLARSSL_1_2_9 +- rsa_context rsa; +- rsa_init(&rsa, RSA_PKCS_V15, 0); ++ mbedtls_pk_context pk; ++ mbedtls_pk_init(&pk); ++ mbedtls_pk_setup(&pk, mbedtls_pk_info_from_type(MBEDTLS_PK_RSA)); + +- if ((ret = rsa_gen_key(&rsa, ctr_drbg_random, &ctr_drbg, keyBitSize, CRYPT_KEY_E_VAL))) ++ if ((ret = mbedtls_rsa_gen_key(mbedtls_pk_rsa(pk), mbedtls_ctr_drbg_random, &ctr_drbg, keyBitSize, CRYPT_KEY_E_VAL)) || ++ (ret = mbedtls_rsa_check_privkey(mbedtls_pk_rsa(pk)))) + goto_error(finish, "Failed making rsa key! ret=%d"); + +- if ((derSz = x509_write_key_der(derBuf, sizeof(derBuf), &rsa)) < 0) ++ if ((derSz = mbedtls_pk_write_key_der(&pk, derBuf, sizeof(derBuf))) <= 0) + goto_error(finish, "Failed translating rsa key to der! derSz=%d"); +-#elif CRYPTLIB >= POLARSSL_1_3_3 +- pk_context pk; +- pk_init(&pk); +- pk_init_ctx(&pk, pk_info_from_type(POLARSSL_PK_RSA)); +- +- if ((ret = rsa_gen_key(pk_rsa(pk), ctr_drbg_random, &ctr_drbg, keyBitSize, CRYPT_KEY_E_VAL)) || +- (ret = rsa_check_privkey(pk_rsa(pk)))) +- goto_error(finish, "Failed making rsa key! ret=%d"); +- +- if ((derSz = pk_write_key_der(&pk, derBuf, sizeof(derBuf))) <= 0) +- goto_error(finish, "Failed translating rsa key to der! derSz=%d"); +-#else +-#error "Please fix CRYPTLIB" +-#endif + + unsigned char *derStart = derBuf + sizeof(derBuf) - derSz; + +@@ -629,13 +543,7 @@ int cryptRsaKeyMakeDer(int32_t keyType, char *path) + { + memset(derBuf, 0, CRYPT_DER_BUF_SZ); + +-#if CRYPTLIB <= POLARSSL_1_2_9 +- rsa_free(&rsa); +-#elif CRYPTLIB >= POLARSSL_1_3_3 +- pk_free(&pk); +-#else +-#error "Please fix CRYPTLIB" +-#endif ++ mbedtls_pk_free(&pk); + + if (keyFile) + fclose(keyFile); +@@ -656,10 +564,10 @@ CRYPTRSA_T *cryptRsaKeyMake(uint8_t keyType) + char *goto_error_code = NULL; + CRYPTRSA_T *key = debugMallocReset(sizeof(CRYPTRSA_T), -300642); + +- rsa_context *rsa = debugMallocReset(sizeof(rsa_context), -300643); +- rsa_init(rsa, RSA_PKCS_V15, 0); ++ mbedtls_rsa_context *rsa = debugMallocReset(sizeof(mbedtls_rsa_context), -300643); ++ mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, 0); + +- if ((ret = rsa_gen_key(rsa, ctr_drbg_random, &ctr_drbg, (keyLen * 8), CRYPT_KEY_E_VAL))) ++ if ((ret = mbedtls_rsa_gen_key(rsa, mbedtls_ctr_drbg_random, &ctr_drbg, (keyLen * 8), CRYPT_KEY_E_VAL))) + goto_error(finish, "Failed making rsa key!"); + + key->backendKey = rsa; +@@ -679,17 +587,17 @@ CRYPTRSA_T *cryptRsaKeyMake(uint8_t keyType) + + return key; } + } +-#endif ++ + + int cryptRsaEncrypt(uint8_t *in, size_t inLen, uint8_t *out, size_t *outLen, CRYPTRSA_T *pubKey) + { + +- rsa_context *pk = pubKey->backendKey; ++ mbedtls_rsa_context *pk = pubKey->backendKey; + +- assertion(-502723, (mpi_size(&pk->N) == pubKey->rawKeyLen)); ++ assertion(-502723, (mbedtls_mpi_size(&pk->N) == pubKey->rawKeyLen)); + assertion(-502145, (*outLen >= pubKey->rawKeyLen)); + +- if (rsa_pkcs1_encrypt(pk, ctr_drbg_random, &ctr_drbg, RSA_PUBLIC, inLen, in, out)) ++ if (mbedtls_rsa_pkcs1_encrypt(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PUBLIC, inLen, in, out)) + return FAILURE; + + *outLen = pubKey->rawKeyLen; +@@ -701,19 +609,12 @@ int cryptRsaEncrypt(uint8_t *in, size_t inLen, uint8_t *out, size_t *outLen, CRY + int cryptRsaDecrypt(uint8_t *in, size_t inLen, uint8_t *out, size_t *outLen) + { + +- rsa_context *pk = my_PrivKey->backendKey; ++ mbedtls_rsa_context *pk = my_PrivKey->backendKey; + +- assertion(-502724, (mpi_size(&pk->N) == my_PrivKey->rawKeyLen)); ++ assertion(-502724, (mbedtls_mpi_size(&pk->N) == my_PrivKey->rawKeyLen)); + assertion(-502146, (inLen >= my_PrivKey->rawKeyLen)); +-#if CRYPTLIB == POLARSSL_1_2_5 +- if (rsa_pkcs1_decrypt(pk, RSA_PRIVATE, &inLen, in, out, *outLen)) ++ if (mbedtls_rsa_pkcs1_decrypt(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE, &inLen, in, out, *outLen)) + return FAILURE; +-#elif CRYPTLIB >= POLARSSL_1_2_9 +- if (rsa_pkcs1_decrypt(pk, ctr_drbg_random, &ctr_drbg, RSA_PRIVATE, &inLen, in, out, *outLen)) +- return FAILURE; +-#else +-#error "Please fix CRYPTLIB" +-#endif + *outLen = inLen; + + return SUCCESS; +@@ -725,20 +626,13 @@ int cryptRsaSign(CRYPTSHA_T *inSha, uint8_t *out, size_t outLen, CRYPTRSA_T *cry + if (!cryptKey) + cryptKey = my_PrivKey; + +- rsa_context *pk = cryptKey->backendKey; ++ mbedtls_rsa_context *pk = cryptKey->backendKey; + + if (outLen < cryptKey->rawKeyLen) + return FAILURE; + +-#if CRYPTLIB <= POLARSSL_1_2_9 +- if (rsa_pkcs1_sign(pk, ctr_drbg_random, &ctr_drbg, RSA_PRIVATE, SIG_RSA_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) inSha, out)) ++ if (mbedtls_rsa_pkcs1_sign(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) inSha, out)) + return FAILURE; +-#elif CRYPTLIB >= POLARSSL_1_3_3 +- if (rsa_pkcs1_sign(pk, ctr_drbg_random, &ctr_drbg, RSA_PRIVATE, POLARSSL_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) inSha, out)) +- return FAILURE; +-#else +-#error "Please fix CRYPTLIB" +-#endif + + return SUCCESS; + } +@@ -746,23 +640,12 @@ int cryptRsaSign(CRYPTSHA_T *inSha, uint8_t *out, size_t outLen, CRYPTRSA_T *cry + int cryptRsaVerify(uint8_t *sign, size_t signLen, CRYPTSHA_T *plainSha, CRYPTRSA_T *pubKey) + { + +- rsa_context *pk = pubKey->backendKey; ++ mbedtls_rsa_context *pk = pubKey->backendKey; + + assertion(-502147, (signLen == pubKey->rawKeyLen)); + +-#if CRYPTLIB == POLARSSL_1_2_5 +- if (rsa_pkcs1_verify(pk, RSA_PUBLIC, SIG_RSA_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) plainSha, sign)) +- return FAILURE; +-#elif CRYPTLIB == POLARSSL_1_2_9 +- if (rsa_pkcs1_verify(pk, ctr_drbg_random, &ctr_drbg, RSA_PUBLIC, SIG_RSA_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) plainSha, sign)) ++ if (mbedtls_rsa_pkcs1_verify(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) plainSha, sign)) + return FAILURE; +-#elif CRYPTLIB >= POLARSSL_1_3_3 +- if (rsa_pkcs1_verify(pk, ctr_drbg_random, &ctr_drbg, RSA_PUBLIC, POLARSSL_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) plainSha, sign)) +- return FAILURE; +-#else +-#error "Please fix CRYPTLIB" +-#endif +- + + return SUCCESS; + } +@@ -770,18 +653,18 @@ int cryptRsaVerify(uint8_t *sign, size_t signLen, CRYPTSHA_T *plainSha, CRYPTRSA + void cryptRand(void *out, uint32_t outLen) + { + +- assertion(-502139, ENTROPY_BLOCK_SIZE > sizeof(CRYPTSHA_T)); ++ assertion(-502139, MBEDTLS_ENTROPY_BLOCK_SIZE > sizeof(CRYPTSHA_T)); + + if (outLen <= sizeof(CRYPTSHA_T)) { + +- if (entropy_func(&entropy_ctx, out, outLen) != 0) ++ if (mbedtls_entropy_func(&entropy_ctx, out, outLen) != 0) + cleanup_all(-502148); + } else { + + CRYPTSHA_T seed[2]; + uint32_t outPos; + +- if (entropy_func(&entropy_ctx, (void*) &seed[0], sizeof(CRYPTSHA_T)) != 0) ++ if (mbedtls_entropy_func(&entropy_ctx, (void*) &seed[0], sizeof(CRYPTSHA_T)) != 0) + cleanup_all(-502140); + + cryptShaAtomic(&seed[0], sizeof(CRYPTSHA_T), &seed[1]); +@@ -799,20 +682,14 @@ void cryptRand(void *out, uint32_t outLen) + STATIC_FUNC + void cryptRngInit(void) + { +- + int ret; + + fflush(stdout); +- entropy_init(&entropy_ctx); ++ mbedtls_entropy_init(&entropy_ctx); + +-#if (CRYPTLIB >= POLARSSL_MIN && CRYPTLIB <= POLARSSL_MAX) +- if ((ret = ctr_drbg_init(&ctr_drbg, entropy_func, &entropy_ctx, NULL, 0)) != 0) +- cleanup_all(-502149); +-#elif (CRYPTLIB >= MBEDTLS_MIN && CRYPTLIB <= MBEDTLS_MAX) + mbedtls_ctr_drbg_init(&ctr_drbg); +- if ((ret = mbedtls_ctr_drbg_seed(&ctr_drbg, entropy_func, &entropy_ctx, NULL, 0)) != 0) ++ if ((ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy_ctx, NULL, 0)) != 0) + cleanup_all(-502149); +-#endif + + int test = 0; + +@@ -829,22 +706,14 @@ void cryptRngFree(void) + STATIC_FUNC + void cryptShaInit(void) + { +-#if CRYPTLIB < POLARSSL_1_3_9 +- memset(&sha_ctx, 0, sizeof(sha_ctx)); +-#else +- sha256_init(&sha_ctx); +-#endif ++ mbedtls_sha256_init(&sha_ctx); + shaClean = YES; + } + + STATIC_FUNC + void cryptShaFree(void) + { +-#if CRYPTLIB < POLARSSL_1_3_9 +- memset(&sha_ctx, 0, sizeof(sha_ctx)); +-#else +- sha256_free(&sha_ctx); +-#endif ++ mbedtls_sha256_free(&sha_ctx); + } + + void cryptShaAtomic(void *in, int32_t len, CRYPTSHA_T *sha) +@@ -855,14 +724,14 @@ void cryptShaAtomic(void *in, int32_t len, CRYPTSHA_T *sha) + + unsigned char output[32]; + +-#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + mbedtls_sha256_starts_ret(&sha_ctx, 1/*is224*/); + mbedtls_sha256_update_ret(&sha_ctx, in, len); + mbedtls_sha256_finish_ret(&sha_ctx, output); + #else +- sha256_starts(&sha_ctx, 1/*is224*/); +- sha256_update(&sha_ctx, in, len); +- sha256_finish(&sha_ctx, output); ++ mbedtls_sha256_starts(&sha_ctx, 1/*is224*/); ++ mbedtls_sha256_update(&sha_ctx, in, len); ++ mbedtls_sha256_finish(&sha_ctx, output); + #endif + memcpy(sha, output, sizeof(CRYPTSHA_T)); + memset(output, 0, sizeof(output)); +@@ -875,12 +744,12 @@ void cryptShaNew(void *in, int32_t len) + assertion(-502034, (in && len > 0 && !memcmp(in, in, len))); + shaClean = NO; + +-#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + mbedtls_sha256_starts_ret(&sha_ctx, 1/*is224*/); + mbedtls_sha256_update_ret(&sha_ctx, in, len); + #else +- sha256_starts(&sha_ctx, 1/*is224*/); +- sha256_update(&sha_ctx, in, len); ++ mbedtls_sha256_starts(&sha_ctx, 1/*is224*/); ++ mbedtls_sha256_update(&sha_ctx, in, len); + #endif + } + +@@ -890,10 +759,10 @@ void cryptShaUpdate(void *in, int32_t len) + assertion(-502035, (shaClean == NO)); + assertion(-502036, (in && len > 0 && !memcmp(in, in, len))); + +-#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + mbedtls_sha256_update_ret(&sha_ctx, in, len); + #else +- sha256_update(&sha_ctx, in, len); ++ mbedtls_sha256_update(&sha_ctx, in, len); + #endif + } + +@@ -904,10 +773,10 @@ void cryptShaFinal(CRYPTSHA_T *sha) + assertion(-502038, (sha)); + unsigned char output[32]; + +-#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB <= MBEDTLS_MAX) ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + mbedtls_sha256_finish_ret(&sha_ctx, output); + #else +- sha256_finish(&sha_ctx, output); ++ mbedtls_sha256_finish(&sha_ctx, output;) + #endif + memcpy(sha, output, sizeof(CRYPTSHA_T)); + memset(output, 0, sizeof(output)); +diff --git a/src/crypt.h b/src/crypt.h +index bcc91db..da34d4e 100644 +--- a/src/crypt.h ++++ b/src/crypt.h +@@ -19,20 +19,13 @@ + * Alternative cryptographic libraries are: + * libtomcrypt, gcrypt, cyassl + */ +- +-#define POLARSSL_MIN 1000 +-#define POLARSSL_1_2_5 1125 +-#define POLARSSL_1_2_9 1129 +-#define POLARSSL_1_3_3 1133 +-#define POLARSSL_1_3_4 1134 +-#define POLARSSL_1_3_9 1139 +-#define POLARSSL_MAX 1999 +- + #define MBEDTLS_MIN 2000 + #define MBEDTLS_2_4_0 2240 + #define MBEDTLS_2_6_0 2260 + #define MBEDTLS_2_7_0 2270 + #define MBEDTLS_2_8_0 2280 ++#define MBEDTLS_3_0_0 2300 ++#define MBEDTLS_3_6_0 2360 + #define MBEDTLS_MAX 2999 + + #ifndef CRYPTLIB diff --git a/package/bmx7/0005-towards-mbedtls-3-6-0-support.patch b/package/bmx7/0005-towards-mbedtls-3-6-0-support.patch new file mode 100644 index 0000000000..b73976c133 --- /dev/null +++ b/package/bmx7/0005-towards-mbedtls-3-6-0-support.patch @@ -0,0 +1,468 @@ +From d4a53a37f82b43abf9509bcb8922ced6c182e59e Mon Sep 17 00:00:00 2001 +From: Axel Neumann +Date: Sat, 18 May 2024 07:47:08 +0200 +Subject: [PATCH] Towards mbedtls-3.6.0 support + +Upstream: https://github.com/bmx-routing/bmx7/commit/d4a53a37f82b43abf9509bcb8922ced6c182e59e +Signed-off-by: Thomas Perale +--- + src/crypt.c | 215 +++++++++++++++++++++++++++++++++++++--------------- + src/crypt.h | 3 +- + 2 files changed, 154 insertions(+), 64 deletions(-) + +diff --git a/src/crypt.c b/src/crypt.c +index 9270b75..91543ef 100644 +--- a/src/crypt.c ++++ b/src/crypt.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010 Axel Neumann ++ * Copyright (c) 2024 Axel Neumann + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. +@@ -46,6 +46,7 @@ static CRYPTRSA_T *my_PrivKey = NULL; + #include "mbedtls/config.h" + #elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) + #include "mbedtls/compat-2.x.h" ++//#include "mbedtls/md.h" + #endif + + #include "mbedtls/sha256.h" +@@ -143,9 +144,7 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + CRYPTDHM_T *key = debugMallocReset(sizeof(CRYPTDHM_T), -300829); + mbedtls_dhm_context *dhm = debugMallocReset(sizeof(mbedtls_dhm_context), -300830); + int pSize = 0; +- int xSize = 0; +- int gxSize = 0; +- int count = 0; ++ unsigned char dummyPubKeyBuff[CRYPT_DHM_MAX_LEN]; + + key->backendKey = dhm; + +@@ -154,63 +153,57 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + if ((keyLen = cryptDhmKeyLenByType(keyType)) <= 0) + goto_error(finish, "Invalid size"); + ++ mbedtls_mpi dhm_P, dhm_G; ++ mbedtls_mpi_init(&dhm_P); ++ mbedtls_mpi_init(&dhm_G); ++ mbedtls_dhm_init(dhm); + + if (keyType == CRYPT_DHM2048_TYPE) { + static const unsigned char modp2048P[(2048/8)] = MBEDTLS_DHM_RFC3526_MODP_2048_P_BIN; + static const unsigned char modp2048G[1] = MBEDTLS_DHM_RFC3526_MODP_2048_G_BIN; + +- if ((ret = mbedtls_mpi_read_binary(&dhm->P, modp2048P, sizeof(modp2048P) )) != 0 || (ret = mbedtls_mpi_read_binary(&dhm->G, modp2048G, sizeof(modp2048G))) != 0) +- goto_error(finish, "Failed reading dhm2048 parameters!"); ++ if ( (ret = mbedtls_mpi_read_binary(&dhm_P, modp2048P, sizeof(modp2048P) )) != 0 ++ || (ret = mbedtls_mpi_read_binary(&dhm_G, modp2048G, sizeof(modp2048G))) != 0) ++ goto_error(finish, "Failed setting dhm2048 parameters!"); + + } else if (keyType == CRYPT_DHM3072_TYPE) { + static const unsigned char modp3072P[(3072/8)] = MBEDTLS_DHM_RFC3526_MODP_3072_P_BIN; + static const unsigned char modp3072G[1] = MBEDTLS_DHM_RFC3526_MODP_3072_G_BIN; +- if ((ret = mbedtls_mpi_read_binary(&dhm->P, modp3072P, sizeof(modp3072P) )) != 0 || (ret = mbedtls_mpi_read_binary(&dhm->G, modp3072G, sizeof(modp3072G))) != 0) +- goto_error(finish, "Failed reading dhm3072 parameters!"); ++ ++ if ( (ret = mbedtls_mpi_read_binary(&dhm_P, modp3072P, sizeof(modp3072P) )) != 0 ++ || (ret = mbedtls_mpi_read_binary(&dhm_G, modp3072G, sizeof(modp3072G))) != 0) ++ goto_error(finish, "Failed setting dhm3072 parameters!"); ++ + } else { + goto_error(finish, "Unsupported dhm type!"); + } + +- if (mbedtls_mpi_cmp_int(&dhm->P, 0) == 0) ++ if (mbedtls_mpi_cmp_int(&dhm_P, 0) == 0) + goto_error(finish, "Empty dhm->P"); + +- // Generate X as large as possible ( < P ) +- if ((pSize = mbedtls_mpi_size(&dhm->P)) != keyLen) ++ if ((pSize = mbedtls_mpi_size(&dhm_P)) != keyLen) + goto_error(finish, "Invalid P size"); + +- do { +- if ((ret = mbedtls_mpi_fill_random(&dhm->X, pSize, mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) +- goto_error(finish, "Failed allocating randomness"); +- +- while (mbedtls_mpi_cmp_mpi(&dhm->X, &dhm->P) >= 0) { +- if ((ret = mbedtls_mpi_shift_r(&dhm->X, 1)) != 0) +- goto_error(finish, "Failed shifting dhm->X param"); +- } +- +- if ((ret = count++) > 10) +- goto_error(finish, "Failed creating dhm->X param"); ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if ((pSize = mbedtls_dhm_get_len(dhm)) != keyLen) ++ goto_error(finish, "Invalid P size"); ++#endif + +- } while ((ret = _cryptDhmCheckRange(&dhm->X, &dhm->P)) != SUCCESS); ++ if ((ret = mbedtls_dhm_set_group(dhm, &dhm_P, &dhm_G) != 0)) ++ goto_error(finish, "Failed grouping dhm parameters!"); + +- // Calculate GX = G^X mod P +- if (mbedtls_mpi_exp_mod(&dhm->GX, &dhm->G, &dhm->X, &dhm->P, &dhm->RP) != 0) +- goto_error(finish, "Failed creating GX modulo"); +- if (((int) (dhm->len = mbedtls_mpi_size(&dhm->P))) != keyLen) +- goto_error(finish, "Invalid len"); +- if ((xSize = mbedtls_mpi_size(&dhm->X)) != keyLen) +- goto_error(finish, "Invalid X size"); +- if ((gxSize = mbedtls_mpi_size(&dhm->GX)) != keyLen) +- goto_error(finish, "Invalid GX size"); +- if ((ret = _cryptDhmCheckRange(&dhm->GX, &dhm->P)) != SUCCESS) +- goto_error(finish, "Invalid GX range"); ++ if ((ret = mbedtls_dhm_make_public(dhm, (int) keyLen, dummyPubKeyBuff, keyLen, ++ mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) ++ goto_error(finish, "Failed creating dhm key pair"); + + key->rawGXType = keyType; + key->rawGXLen = keyLen; + + finish: + dbgf(goto_error_code ? DBGL_SYS : DBGL_CHANGES, goto_error_code ? DBGT_ERR : DBGT_INFO, +- "%s ret=%d keyType=%d keyLen=%d pSize=%d xSize=%d gxSize=%d count=%d attempt=%d", +- goto_error_code, ret, keyType, keyLen, pSize, xSize, gxSize, count, attempt); ++ "%s ret=%d keyType=%d keyLen=%d pSize=%d attempt=%d", ++ goto_error_code, ret, keyType, keyLen, pSize, attempt); + + if (goto_error_code) { + cryptDhmKeyFree(&key); +@@ -222,6 +215,9 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + return NULL; + } + ++ mbedtls_mpi_free(&dhm_G); ++ mbedtls_mpi_free(&dhm_P); ++ + return key; + } + +@@ -231,9 +227,14 @@ void cryptDhmPubKeyGetRaw(CRYPTDHM_T* key, uint8_t* buff, uint16_t buffLen) + "Failed: key=%d buff=%d buffLen=%d key.GXLen=%d", !!key, !!buff, buffLen, key ? key->rawGXLen : 0); + + mbedtls_dhm_context *dhm = key->backendKey; +- ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + assertion_dbg(-502720, (dhm && buffLen == mbedtls_mpi_size(&dhm->GX) && buffLen == dhm->len), + "Failed: dhm.GXlen=%zd dhm.len=%zd", dhm ? mbedtls_mpi_size(&dhm->GX) : 0, dhm ? dhm->len : 0); ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ assertion_dbg(-502720, (dhm && buffLen == mbedtls_dhm_get_len(dhm)), ++ "Failed: dhm.len=%zd", dhm ? mbedtls_dhm_get_len(dhm) : 0); ++#endif ++ + + mbedtls_mpi_write_binary(&dhm->GX, buff, key->rawGXLen); + } +@@ -256,6 +257,7 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + goto_error(finish, "Missing type"); + if ((keyLen = cryptDhmKeyLenByType(keyType)) <= 0) + goto_error(finish, "Invalid size"); ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + if ((int) dhm->len != keyLen) + goto_error(finish, "Invalid len"); + if ((pSize = mbedtls_mpi_size(&dhm->P)) != keyLen) +@@ -270,6 +272,10 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + goto_error(finish, "Invalid GX range"); + if (_cryptDhmCheckRange(&dhm->GY, &dhm->P) != SUCCESS) + goto_error(finish, "Invalid GY range"); ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if ((pSize = mbedtls_dhm_get_len(dhm)) != keyLen) ++ goto_error(finish, "Invalid len"); ++#endif + + return SUCCESS; + +@@ -293,10 +299,17 @@ CRYPTSHA_T *cryptDhmSecretForNeigh(CRYPTDHM_T *myDhm, uint8_t *neighRawKey, uint + if (!myDhm || !(dhm = myDhm->backendKey) || !myDhm->rawGXType) + goto_error(finish, "Disabled dhm link signing"); + +- if (((keyType = cryptDhmKeyTypeByLen(neighRawKeyLen)) != myDhm->rawGXType) || ((n = dhm->len) != neighRawKeyLen) || (sizeof(buff) < neighRawKeyLen)) +- goto_error(finish, "Wrong type or keyLength"); ++ if (((keyType = cryptDhmKeyTypeByLen(neighRawKeyLen)) != myDhm->rawGXType)) ++ goto_error(finish, "Wrong type"); + +- if ((ret = mbedtls_mpi_read_binary(&dhm->GY, neighRawKey, neighRawKeyLen)) != 0) ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ if (((n = dhm->len) != neighRawKeyLen) || (sizeof(buff) < neighRawKeyLen)) ++ goto_error(finish, "Wrong keyLength"); ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if (((n = mbedtls_dhm_get_len(dhm)) != neighRawKeyLen) || (sizeof(buff) < neighRawKeyLen)) ++ goto_error(finish, "Wrong keyLength"); ++#endif ++ if ((ret = mbedtls_dhm_read_public(dhm, neighRawKey, neighRawKeyLen)) != 0) + goto_error(finish, "Invalid GY"); + + if (cryptDhmKeyCheck(myDhm) != SUCCESS) +@@ -311,14 +324,13 @@ CRYPTSHA_T *cryptDhmSecretForNeigh(CRYPTDHM_T *myDhm, uint8_t *neighRawKey, uint + secret = debugMallocReset(sizeof(CRYPTSHA_T), -300831); + cryptShaAtomic(buff, n, secret); + +- + finish: + { + dbgf(((goto_error_code || n != neighRawKeyLen) ? DBGL_SYS : DBGL_CHANGES), ((goto_error_code || n != neighRawKeyLen) ? DBGT_WARN : DBGT_INFO), + "%s n=%zd neighKeyLen=%d myKeyLen=%d", goto_error_code, n, neighRawKeyLen, myDhm->rawGXLen); + +- mbedtls_mpi_free(&dhm->GY); +- mbedtls_mpi_free(&dhm->K); ++// mbedtls_mpi_free(&dhm->GY); ++// mbedtls_mpi_free(&dhm->K); + memset(buff, 0, sizeof(buff)); + return secret; } + } +@@ -345,12 +357,21 @@ int cryptRsaPubKeyGetRaw(CRYPTRSA_T *key, uint8_t *buff, uint16_t buffLen) + mbedtls_rsa_context *rsa; + if (!key || !buff || !buffLen || + !key->rawKeyType || (buffLen != key->rawKeyLen) || +- !(rsa = (mbedtls_rsa_context*) key->backendKey) || buffLen != mbedtls_mpi_size(&rsa->N) || buffLen != rsa->len) { ++ !(rsa = (mbedtls_rsa_context*) key->backendKey) || ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ buffLen != mbedtls_mpi_size(&rsa->N) || buffLen != rsa->len || ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++#endif ++ buffLen != mbedtls_rsa_get_len(rsa) ++ ) { + + return FAILURE; + } + +- if (mbedtls_mpi_write_binary(&rsa->N, buff, buffLen) != 0) ++ mbedtls_mpi mpi_N; ++ mbedtls_mpi_init(&mpi_N); ++ mbedtls_rsa_export(rsa, &mpi_N, NULL, NULL, NULL, NULL); ++ if (mbedtls_mpi_write_binary(&mpi_N, buff, buffLen) != 0) + return FAILURE; + + return SUCCESS; +@@ -368,10 +389,11 @@ CRYPTRSA_T *cryptRsaPubKeyFromRaw(uint8_t *rawKey, uint16_t rawKeyLen) + cryptKey->backendKey = debugMalloc(sizeof(mbedtls_rsa_context), -300620); + + mbedtls_rsa_context *rsa = (mbedtls_rsa_context*) cryptKey->backendKey; ++ mbedtls_mpi rsa_N, rsa_E; + +- mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, 0); +- +- ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE); ++ /* + if ( + (mbedtls_mpi_read_binary(&rsa->N, rawKey, rawKeyLen)) || + (mbedtls_mpi_read_binary(&rsa->E, (uint8_t*) & e, sizeof(e))) +@@ -379,8 +401,23 @@ CRYPTRSA_T *cryptRsaPubKeyFromRaw(uint8_t *rawKey, uint16_t rawKeyLen) + cryptRsaKeyFree(&cryptKey); + return NULL; + } ++ */ ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ mbedtls_rsa_init(rsa); ++#endif ++ mbedtls_mpi_init(&rsa_N); ++ mbedtls_mpi_init(&rsa_E); ++ ++ if ( ++ (mbedtls_mpi_read_binary(&rsa_N, rawKey, rawKeyLen)) || ++ (mbedtls_mpi_read_binary(&rsa_E, (uint8_t*)&e, sizeof(e))) || ++ (mbedtls_rsa_import(rsa, &rsa_N, NULL, NULL, NULL, &rsa_E)) ++ ) { ++ cryptRsaKeyFree(&cryptKey); ++ return NULL; ++ } + +- rsa->len = rawKeyLen; ++ assertion(-500000, (mbedtls_rsa_get_len(rsa) == rawKeyLen)); + cryptKey->rawKeyLen = rawKeyLen; + cryptKey->rawKeyType = cryptRsaKeyTypeByLen(rawKeyLen); + +@@ -401,9 +438,16 @@ int cryptRsaPubKeyCheck(CRYPTRSA_T *pubKey) + assertion(-502142, (pubKey->backendKey)); + + mbedtls_rsa_context *rsa = (mbedtls_rsa_context*) pubKey->backendKey; ++ size_t len = mbedtls_rsa_get_len(rsa); + +- if (!rsa->len || (int) rsa->len != cryptRsaKeyLenByType(pubKey->rawKeyType) || rsa->len != pubKey->rawKeyLen || rsa->len != mbedtls_mpi_size(&rsa->N) || +- mbedtls_rsa_check_pubkey((mbedtls_rsa_context*) pubKey->backendKey)) { ++ if ( !len ++ || (int) len != cryptRsaKeyLenByType(pubKey->rawKeyType) ++ || len != pubKey->rawKeyLen ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ || len != mbedtls_mpi_size(&rsa->N) ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++#endif ++ || mbedtls_rsa_check_pubkey((mbedtls_rsa_context*) pubKey->backendKey)) { + + return FAILURE; + } +@@ -462,10 +506,18 @@ CRYPTRSA_T *cryptRsaKeyFromDer(char *keyPath) + + mbedtls_pk_context pk; + mbedtls_pk_init(&pk); +- mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, 0); ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE); ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ mbedtls_rsa_init(rsa); ++#endif + + if ( +- ((ret = mbedtls_pk_parse_keyfile(&pk, keyPath, "")) != 0) || ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ ((ret = mbedtls_pk_parse_keyfile(&pk, keyPath, "")) != 0) || ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ ((ret = mbedtls_pk_parse_keyfile(&pk, keyPath, "", mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) || ++#endif + ((ret = mbedtls_rsa_copy(rsa, mbedtls_pk_rsa(pk))) != 0) || + ((ret = mbedtls_rsa_check_privkey(rsa)) != 0) + ) { +@@ -478,9 +530,8 @@ CRYPTRSA_T *cryptRsaKeyFromDer(char *keyPath) + + + //cryptKeyAddRaw(ckey); +- + if ( +- ((keyLen = mbedtls_mpi_size(&rsa->N)) <= 0) || ++ ((keyLen = mbedtls_rsa_get_len(rsa)) <= 0) || + !(keyType = cryptRsaKeyTypeByLen(keyLen)) || + !(privKey->rawKeyType = keyType) || + !(privKey->rawKeyLen = keyLen) || +@@ -490,6 +541,10 @@ CRYPTRSA_T *cryptRsaKeyFromDer(char *keyPath) + cryptRsaKeyFree(&privKey); + return NULL; + } ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ assertion(-502723, (((int)mbedtls_mpi_size(&rsa->N)) == keyLen)); ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++#endif + + my_PrivKey = privKey; + return pubKey; +@@ -565,7 +620,12 @@ CRYPTRSA_T *cryptRsaKeyMake(uint8_t keyType) + CRYPTRSA_T *key = debugMallocReset(sizeof(CRYPTRSA_T), -300642); + + mbedtls_rsa_context *rsa = debugMallocReset(sizeof(mbedtls_rsa_context), -300643); +- mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, 0); ++ ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++ mbedtls_rsa_init(rsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE); ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ mbedtls_rsa_init(rsa); ++#endif + + if ((ret = mbedtls_rsa_gen_key(rsa, mbedtls_ctr_drbg_random, &ctr_drbg, (keyLen * 8), CRYPT_KEY_E_VAL))) + goto_error(finish, "Failed making rsa key!"); +@@ -591,30 +651,37 @@ CRYPTRSA_T *cryptRsaKeyMake(uint8_t keyType) + + int cryptRsaEncrypt(uint8_t *in, size_t inLen, uint8_t *out, size_t *outLen, CRYPTRSA_T *pubKey) + { +- + mbedtls_rsa_context *pk = pubKey->backendKey; +- +- assertion(-502723, (mbedtls_mpi_size(&pk->N) == pubKey->rawKeyLen)); + assertion(-502145, (*outLen >= pubKey->rawKeyLen)); ++ assertion(-502723, (mbedtls_rsa_get_len(pk) == pubKey->rawKeyLen)); + ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + if (mbedtls_rsa_pkcs1_encrypt(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PUBLIC, inLen, in, out)) + return FAILURE; ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if (mbedtls_rsa_pkcs1_encrypt(pk, mbedtls_ctr_drbg_random, &ctr_drbg, inLen, in, out)) ++ return FAILURE; ++#endif + + *outLen = pubKey->rawKeyLen; + + return SUCCESS; +- + } + + int cryptRsaDecrypt(uint8_t *in, size_t inLen, uint8_t *out, size_t *outLen) + { +- + mbedtls_rsa_context *pk = my_PrivKey->backendKey; ++ assertion(-502146, (inLen >= my_PrivKey->rawKeyLen)); ++ assertion(-502724, (mbedtls_rsa_get_len(pk) == my_PrivKey->rawKeyLen)); + ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + assertion(-502724, (mbedtls_mpi_size(&pk->N) == my_PrivKey->rawKeyLen)); +- assertion(-502146, (inLen >= my_PrivKey->rawKeyLen)); + if (mbedtls_rsa_pkcs1_decrypt(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE, &inLen, in, out, *outLen)) + return FAILURE; ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if (mbedtls_rsa_pkcs1_decrypt(pk, mbedtls_ctr_drbg_random, &ctr_drbg, &inLen, in, out, *outLen)) ++ return FAILURE; ++#endif + *outLen = inLen; + + return SUCCESS; +@@ -631,8 +698,13 @@ int cryptRsaSign(CRYPTSHA_T *inSha, uint8_t *out, size_t outLen, CRYPTRSA_T *cry + if (outLen < cryptKey->rawKeyLen) + return FAILURE; + ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + if (mbedtls_rsa_pkcs1_sign(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) inSha, out)) + return FAILURE; ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if (mbedtls_rsa_pkcs1_sign(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) inSha, out)) ++ return FAILURE; ++#endif + + return SUCCESS; + } +@@ -643,9 +715,26 @@ int cryptRsaVerify(uint8_t *sign, size_t signLen, CRYPTSHA_T *plainSha, CRYPTRSA + mbedtls_rsa_context *pk = pubKey->backendKey; + + assertion(-502147, (signLen == pubKey->rawKeyLen)); ++/* ++ mbedtls_rsa_context rsa; ++ mbedtls_mpi N, E; ++ mbedtls_rsa_init(&rsa); ++ mbedtls_mpi_init(&N); ++ mbedtls_mpi_init(&E); ++ ++ if ((ret = mbedtls_mpi_read_file(&N, 16, f)) != 0 || ++ (ret = mbedtls_mpi_read_file(&E, 16, f)) != 0 || ++ (ret = mbedtls_rsa_import(&rsa, &N, NULL, NULL, NULL, &E) != 0)) ++ return FAILURE; ++*/ + ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + if (mbedtls_rsa_pkcs1_verify(pk, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) plainSha, sign)) + return FAILURE; ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if (mbedtls_rsa_pkcs1_verify(pk, MBEDTLS_MD_SHA224, sizeof(CRYPTSHA_T), (uint8_t*) plainSha, sign)) ++ return FAILURE; ++#endif + + return SUCCESS; + } +@@ -776,7 +865,7 @@ void cryptShaFinal(CRYPTSHA_T *sha) + #if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + mbedtls_sha256_finish_ret(&sha_ctx, output); + #else +- mbedtls_sha256_finish(&sha_ctx, output;) ++ mbedtls_sha256_finish(&sha_ctx, output); + #endif + memcpy(sha, output, sizeof(CRYPTSHA_T)); + memset(output, 0, sizeof(output)); +diff --git a/src/crypt.h b/src/crypt.h +index da34d4e..119c788 100644 +--- a/src/crypt.h ++++ b/src/crypt.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010 Axel Neumann ++ * Copyright (c) 2024 Axel Neumann + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. +@@ -30,6 +30,7 @@ + + #ifndef CRYPTLIB + #define CRYPTLIB MBEDTLS_2_8_0 ++//#define CRYPTLIB MBEDTLS_3_6_0 + #endif + + #define CRYPT_DER_BUF_SZ 16000 diff --git a/package/bmx7/0006-support-mbedtls-3-6-0-also-disable-no-further-supported.patch b/package/bmx7/0006-support-mbedtls-3-6-0-also-disable-no-further-supported.patch new file mode 100644 index 0000000000..6fb67096f1 --- /dev/null +++ b/package/bmx7/0006-support-mbedtls-3-6-0-also-disable-no-further-supported.patch @@ -0,0 +1,396 @@ +From fb45b7d30899ee295a0580cdab6710b510150f73 Mon Sep 17 00:00:00 2001 +From: Axel Neumann +Date: Sat, 18 May 2024 14:00:49 +0200 +Subject: [PATCH] Support mbedtls-3.6.0 Also disable no-further-supported + RSA896 + +Upstream: https://github.com/bmx-routing/bmx7/commit/fb45b7d30899ee295a0580cdab6710b510150f73 +[thomas: backport to 7.1.1] +Signed-off-by: Thomas Perale +--- + src/Common.mk | 2 +- + src/crypt.c | 71 ++++++++++++++++++++++++--------------------------- + src/crypt.h | 4 +-- + src/msg.c | 6 ++--- + src/sec.c | 28 ++++++++++++-------- + src/sec.h | 18 ++++++------- + 6 files changed, 67 insertions(+), 62 deletions(-) + +diff --git a/src/Common.mk b/src/Common.mk +index 32b2d34..c73df44 100644 +--- a/src/Common.mk ++++ b/src/Common.mk +@@ -2,7 +2,7 @@ GIT_REV ?= $(shell [ -r .git ] && git --no-pager log -n 1 --oneline | cut -d " " + + CFLAGS += -pedantic -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Os -g3 -std=gnu99 -DGIT_REV=\"$(GIT_REV)\" + # CFLAGS += -DHAVE_CONFIG_H +-# CFLAGS += -DCRYPTLIB=MBEDTLS_2_4_0 # POLARSSL_1_2_5 POLARSSL_1_2_9 POLARSSL_1_3_3 POLARSSL_1_3_4 CYASSL_2_8_0 ++# CFLAGS += -DCRYPTLIB=MBEDTLS_2_8_0 # -DCRYPTLIB=MBEDTLS_3_6_0 + + # optional defines: + # CFLAGS += -static +diff --git a/src/crypt.c b/src/crypt.c +index 91543ef..69918a1 100644 +--- a/src/crypt.c ++++ b/src/crypt.c +@@ -66,18 +66,16 @@ static mbedtls_sha256_context sha_ctx; + + uint8_t cryptDhmKeyTypeByLen(int len) + { +- return len == CRYPT_DHM1024_LEN ? CRYPT_DHM1024_TYPE : ( +- len == CRYPT_DHM2048_LEN ? CRYPT_DHM2048_TYPE : ( ++ return len == CRYPT_DHM2048_LEN ? CRYPT_DHM2048_TYPE : ( + len == CRYPT_DHM3072_LEN ? CRYPT_DHM3072_TYPE : ( +- 0))); ++ 0)); + } + + uint16_t cryptDhmKeyLenByType(int type) + { +- return type == CRYPT_DHM1024_TYPE ? CRYPT_DHM1024_LEN : ( +- type == CRYPT_DHM2048_TYPE ? CRYPT_DHM2048_LEN : ( ++ return type == CRYPT_DHM2048_TYPE ? CRYPT_DHM2048_LEN : ( + type == CRYPT_DHM3072_TYPE ? CRYPT_DHM3072_LEN : ( +- 0))); ++ 0)); + } + + char *cryptDhmKeyTypeAsString(int type) +@@ -104,6 +102,7 @@ void cryptDhmKeyFree(CRYPTDHM_T **cryptKey) + *cryptKey = NULL; + } + ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + /* + * Verify sanity of parameter with regards to P + * +@@ -134,10 +133,10 @@ static int _cryptDhmCheckRange(const mbedtls_mpi *param, const mbedtls_mpi *P) + mbedtls_mpi_free(&U); + return( ret); + } ++#endif + + CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + { +- + int ret = 0; + char *goto_error_code = NULL; + int keyLen = 0; +@@ -184,11 +183,6 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + if ((pSize = mbedtls_mpi_size(&dhm_P)) != keyLen) + goto_error(finish, "Invalid P size"); + +-#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) +-#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) +- if ((pSize = mbedtls_dhm_get_len(dhm)) != keyLen) +- goto_error(finish, "Invalid P size"); +-#endif + + if ((ret = mbedtls_dhm_set_group(dhm, &dhm_P, &dhm_G) != 0)) + goto_error(finish, "Failed grouping dhm parameters!"); +@@ -197,19 +191,25 @@ CRYPTDHM_T *cryptDhmKeyMake(uint8_t keyType, uint8_t attempt) + mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) + goto_error(finish, "Failed creating dhm key pair"); + ++#if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) ++#elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) ++ if ((pSize = mbedtls_dhm_get_len(dhm)) != keyLen) ++ goto_error(finish, "Invalid dhm len"); ++#endif ++ + key->rawGXType = keyType; + key->rawGXLen = keyLen; + + finish: + dbgf(goto_error_code ? DBGL_SYS : DBGL_CHANGES, goto_error_code ? DBGT_ERR : DBGT_INFO, + "%s ret=%d keyType=%d keyLen=%d pSize=%d attempt=%d", +- goto_error_code, ret, keyType, keyLen, pSize, attempt); ++ goto_error_code?goto_error_code:"SUCCESS", ret, keyType, keyLen, pSize, attempt); + + if (goto_error_code) { + cryptDhmKeyFree(&key); + +- if ((++attempt) < 10) +- return cryptDhmKeyMake(keyType, attempt); ++// if ((++attempt) < 10) ++// return cryptDhmKeyMake(keyType, attempt); + + assertion(-502718, (0)); + return NULL; +@@ -230,13 +230,19 @@ void cryptDhmPubKeyGetRaw(CRYPTDHM_T* key, uint8_t* buff, uint16_t buffLen) + #if (CRYPTLIB >= MBEDTLS_2_8_0 && CRYPTLIB < MBEDTLS_3_0_0) + assertion_dbg(-502720, (dhm && buffLen == mbedtls_mpi_size(&dhm->GX) && buffLen == dhm->len), + "Failed: dhm.GXlen=%zd dhm.len=%zd", dhm ? mbedtls_mpi_size(&dhm->GX) : 0, dhm ? dhm->len : 0); ++ ++ mbedtls_mpi_write_binary(&dhm->GX, buff, key->rawGXLen); ++ + #elif (CRYPTLIB >= MBEDTLS_3_0_0 && CRYPTLIB < MBEDTLS_MAX) + assertion_dbg(-502720, (dhm && buffLen == mbedtls_dhm_get_len(dhm)), + "Failed: dhm.len=%zd", dhm ? mbedtls_dhm_get_len(dhm) : 0); +-#endif +- + +- mbedtls_mpi_write_binary(&dhm->GX, buff, key->rawGXLen); ++ mbedtls_mpi mpi_GX; ++ mbedtls_mpi_init(&mpi_GX); ++ mbedtls_dhm_get_value(dhm, MBEDTLS_DHM_PARAM_GX, &mpi_GX); ++ mbedtls_mpi_write_binary(&mpi_GX, buff, key->rawGXLen); ++ mbedtls_mpi_free(&mpi_GX); ++#endif + } + + STATIC_FUNC +@@ -247,9 +253,6 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + uint8_t keyType = 0; + int keyLen = 0; + int pSize = 0; +- int xSize = 0; +- int gxSize = 0; +- int gySize = 0; + + if (!(dhm = (mbedtls_dhm_context *) key->backendKey)) + goto_error(finish, "Missing backend key"); +@@ -262,11 +265,11 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + goto_error(finish, "Invalid len"); + if ((pSize = mbedtls_mpi_size(&dhm->P)) != keyLen) + goto_error(finish, "Invalid P size"); +- if ((xSize = mbedtls_mpi_size(&dhm->X)) != keyLen) ++ if ((pSize = mbedtls_mpi_size(&dhm->X)) != keyLen) + goto_error(finish, "Invalid X size"); +- if ((gxSize = mbedtls_mpi_size(&dhm->GX)) != keyLen) ++ if ((pSize = mbedtls_mpi_size(&dhm->GX)) != keyLen) + goto_error(finish, "Invalid GX size"); +- if ((gySize = mbedtls_mpi_size(&dhm->GY)) != keyLen) ++ if ((pSize = mbedtls_mpi_size(&dhm->GY)) != keyLen) + goto_error(finish, "Invalid GY size"); + if (_cryptDhmCheckRange(&dhm->GX, &dhm->P) != SUCCESS) + goto_error(finish, "Invalid GX range"); +@@ -280,8 +283,7 @@ IDM_T cryptDhmKeyCheck(CRYPTDHM_T *key) + return SUCCESS; + + finish: +- dbgf_track(DBGT_WARN, "%s keyType=%d keyLen=%d dhmLen=%zd pSize=%d xSize=%d gxSize=%d gySize=%d", +- goto_error_code, keyType, keyLen, dhm ? dhm->len : 0, pSize, xSize, gxSize, gySize); ++ dbgf_track(DBGT_WARN, "%s keyType=%d keyLen=%d dhmLen=%zd", goto_error_code, keyType, keyLen, pSize); + + return FAILURE; + } +@@ -641,7 +643,8 @@ finish: + + cryptRsaKeyFree(&key); + +- dbgf_sys(DBGT_ERR, "%s ret=%d", goto_error_code, ret); ++ dbgf_sys(DBGT_ERR, "%s ret=%d len=%d", goto_error_code, ret, keyLen); ++ assertion(-500000, 0); + return NULL; + } + +@@ -923,28 +926,22 @@ int cryptShasEqual(CRYPTSHA_T *shaA, CRYPTSHA_T *shaB) + + uint8_t cryptRsaKeyTypeByLen(int len) + { +- return len == CRYPT_RSA512_LEN ? CRYPT_RSA512_TYPE : ( +- len == CRYPT_RSA768_LEN ? CRYPT_RSA768_TYPE : ( +- len == CRYPT_RSA896_LEN ? CRYPT_RSA896_TYPE : ( +- len == CRYPT_RSA1024_LEN ? CRYPT_RSA1024_TYPE : ( ++ return len == CRYPT_RSA1024_LEN ? CRYPT_RSA1024_TYPE : ( + len == CRYPT_RSA1536_LEN ? CRYPT_RSA1536_TYPE : ( + len == CRYPT_RSA2048_LEN ? CRYPT_RSA2048_TYPE : ( + len == CRYPT_RSA3072_LEN ? CRYPT_RSA3072_TYPE : ( + len == CRYPT_RSA4096_LEN ? CRYPT_RSA4096_TYPE : ( +- 0)))))))); ++ 0))))); + } + + uint16_t cryptRsaKeyLenByType(int type) + { +- return type == CRYPT_RSA512_TYPE ? CRYPT_RSA512_LEN : ( +- type == CRYPT_RSA768_TYPE ? CRYPT_RSA768_LEN : ( +- type == CRYPT_RSA896_TYPE ? CRYPT_RSA896_LEN : ( +- type == CRYPT_RSA1024_TYPE ? CRYPT_RSA1024_LEN : ( ++ return type == CRYPT_RSA1024_TYPE ? CRYPT_RSA1024_LEN : ( + type == CRYPT_RSA1536_TYPE ? CRYPT_RSA1536_LEN : ( + type == CRYPT_RSA2048_TYPE ? CRYPT_RSA2048_LEN : ( + type == CRYPT_RSA3072_TYPE ? CRYPT_RSA3072_LEN : ( + type == CRYPT_RSA4096_TYPE ? CRYPT_RSA4096_LEN : ( +- 0)))))))); ++ 0))))); + } + + char *cryptRsaKeyTypeAsString(int type) +diff --git a/src/crypt.h b/src/crypt.h +index 119c788..cae8df7 100644 +--- a/src/crypt.h ++++ b/src/crypt.h +@@ -63,7 +63,7 @@ + #define CRYPT_RSA4096_LEN (4096/8) //512 + #define CRYPT_RSA4096_NAME "RSA4096" + +-#define CRYPT_RSA_MIN_TYPE CRYPT_RSA512_TYPE ++#define CRYPT_RSA_MIN_TYPE CRYPT_RSA1024_TYPE + #define CRYPT_RSA_MAX_TYPE 8 + #define CRYPT_RSA_MAX_LEN 512 + +@@ -77,7 +77,7 @@ + #define CRYPT_DHM3072_LEN (3072/8) + #define CRYPT_DHM3072_NAME "DH3072M112" + +-#define CRYPT_DHM_MIN_TYPE CRYPT_DHM1024_TYPE ++#define CRYPT_DHM_MIN_TYPE CRYPT_DHM2048_TYPE + #define CRYPT_DHM_MAX_TYPE CRYPT_DHM3072_TYPE + #define CRYPT_DHM_MAX_LEN CRYPT_DHM3072_LEN + +diff --git a/src/msg.c b/src/msg.c +index e04358c..22c22da 100644 +--- a/src/msg.c ++++ b/src/msg.c +@@ -924,9 +924,9 @@ void tx_packets(void *unused) + assertion(-502442, (it.frame_type < FRAME_TYPE_SIGNATURE_ADV || it.frame_type > FRAME_TYPE_OGM_AGG_SQN_ADV)); + assertion(-502443, (!it.frame_cache_msgs_size)); + assertion(-500430, (it.frames_out_pos)); // single message larger than MAX_UDPD_SIZE +- assertion_dbg(-502444, IMPLIES((it.frame_type > FRAME_TYPE_OGM_AGG_SQN_ADV), +- it.frames_out_pos > (int) (FRM_SIGN_VERS_SIZE_MIN + ((my_RsaLinkKey && !my_DhmLinkKey) ? my_RsaLinkKey->rawKeyLen : 0))), +- "%d %d %lu %d+%d", it.frame_type, it.frames_out_pos, FRM_SIGN_VERS_SIZE_MIN, !!my_DhmLinkKey, (my_RsaLinkKey ? my_RsaLinkKey->rawKeyLen : 0)); ++// assertion_dbg(-502444, IMPLIES((it.frame_type > FRAME_TYPE_OGM_AGG_SQN_ADV), ++// it.frames_out_pos > (int) (FRM_SIGN_VERS_SIZE_MIN + ((my_RsaLinkKey && !my_DhmLinkKey) ? my_RsaLinkKey->rawKeyLen : 0))), ++// "%d %d %lu %d+%d", it.frame_type, it.frames_out_pos, FRM_SIGN_VERS_SIZE_MIN, !!my_DhmLinkKey, (my_RsaLinkKey ? my_RsaLinkKey->rawKeyLen : 0)); + } + + assertion_dbg(-502519, (++cnt) < 10000, "cnt=%d result=%d nextFType=%d fType=%d fLen=%d fPos=%d fPosMax=%d", +diff --git a/src/sec.c b/src/sec.c +index bbd65cf..cde3813 100644 +--- a/src/sec.c ++++ b/src/sec.c +@@ -862,6 +862,8 @@ void createMyDhmLinkKey(IDM_T randomLifetime) + + my_DhmLinkKey = cryptDhmKeyMake(linkDhmSignType, 0); + ++ assertion(-500000, my_DhmLinkKey); ++ + my_DhmLinkKey->endOfLife = (linkSignLifetime ? bmx_time_sec + thisSignLifetime : 0); + + if (linkSignLifetime) +@@ -913,7 +915,7 @@ int process_dsc_tlv_dhmLinkKey(struct rx_frame_iterator *it) + char *goto_error_code = NULL; + int32_t msgLen = it->f_dlen; + struct dsc_msg_dhm_link_key *msg = (struct dsc_msg_dhm_link_key*) (it->f_data); +- ++ IDM_T TODO_Tolerate_unknown_dhm_link_keys_like_process_dsc_tlv_rsaPubKey; + if (it->op == TLV_OP_TEST) { + + if (!msg) +@@ -1017,7 +1019,7 @@ int create_dsc_tlv_rsaLinkKey(struct tx_frame_iterator *it) + } + + STATIC_FUNC +-int process_dsc_tlv_pubKey(struct rx_frame_iterator *it) ++int process_dsc_tlv_rsaPubKey(struct rx_frame_iterator *it) + { + char *goto_error_code = NULL; + CRYPTRSA_T *pkey = NULL; +@@ -1026,14 +1028,20 @@ int process_dsc_tlv_pubKey(struct rx_frame_iterator *it) + + if (it->op == TLV_OP_TEST) { + +- if (!msg || !cryptRsaKeyTypeAsString(msg->type) || cryptRsaKeyLenByType(msg->type) != key_len) ++ if (!msg) + goto_error(finish, "1"); + +- if (!(pkey = cryptRsaPubKeyFromRaw(msg->key, key_len))) +- goto_error(finish, "2"); ++ if (cryptRsaKeyLenByType(msg->type)) ++ { ++ if (!cryptRsaKeyTypeAsString(msg->type) || cryptRsaKeyLenByType(msg->type) != key_len) ++ goto_error(finish, "2"); ++ ++ if (!(pkey = cryptRsaPubKeyFromRaw(msg->key, key_len))) ++ goto_error(finish, "3"); + +- if (cryptRsaPubKeyCheck(pkey) != SUCCESS) +- goto_error(finish, "3"); ++ if (cryptRsaPubKeyCheck(pkey) != SUCCESS) ++ goto_error(finish, "4"); ++ } + + } else if (it->op == TLV_OP_DEL && it->f_type == BMX_DSC_TLV_RSA_LINK_PUBKEY && it->on->neigh) { + +@@ -1045,7 +1053,7 @@ int process_dsc_tlv_pubKey(struct rx_frame_iterator *it) + if (it->on->neigh->rsaLinkKey) + cryptRsaKeyFree(&it->on->neigh->rsaLinkKey); + +- if (msg) { ++ if (msg && cryptRsaKeyLenByType(msg->type)) { + it->on->neigh->rsaLinkKey = cryptRsaPubKeyFromRaw(msg->key, cryptRsaKeyLenByType(msg->type)); + assertion(-502206, (it->on->neigh->rsaLinkKey && cryptRsaPubKeyCheck(it->on->neigh->rsaLinkKey) == SUCCESS)); + } +@@ -2398,7 +2406,7 @@ void init_sec(void) + handl.dextReferencing = (int32_t*) & fref_always_l1; + handl.dextCompression = (int32_t*) & never_fzip; + handl.tx_frame_handler = create_dsc_tlv_nodeKey; +- handl.rx_frame_handler = process_dsc_tlv_pubKey; ++ handl.rx_frame_handler = process_dsc_tlv_rsaPubKey; + handl.msg_format = pubkey_format; + register_frame_handler(description_tlv_db, BMX_DSC_TLV_NODE_PUBKEY, &handl); + +@@ -2427,7 +2435,7 @@ void init_sec(void) + handl.dextReferencing = (int32_t*) & fref_always_l1; + handl.dextCompression = (int32_t*) & never_fzip; + handl.tx_frame_handler = create_dsc_tlv_rsaLinkKey; +- handl.rx_frame_handler = process_dsc_tlv_pubKey; ++ handl.rx_frame_handler = process_dsc_tlv_rsaPubKey; + handl.msg_format = pubkey_format; + register_frame_handler(description_tlv_db, BMX_DSC_TLV_RSA_LINK_PUBKEY, &handl); + +diff --git a/src/sec.h b/src/sec.h +index 2266a29..5619a37 100644 +--- a/src/sec.h ++++ b/src/sec.h +@@ -70,28 +70,28 @@ + + + #define ARG_NODE_RSA_TX_TYPE "nodeRsaKey" +-#define MIN_NODE_RSA_TX_TYPE CRYPT_RSA512_TYPE ++#define MIN_NODE_RSA_TX_TYPE CRYPT_RSA_MIN_TYPE + #define MAX_NODE_RSA_TX_TYPE CRYPT_RSA4096_TYPE + #define DEF_NODE_RSA_TX_TYPE CRYPT_RSA2048_TYPE +-#define HLP_NODE_RSA_TX_TYPE "sign own descriptions with given RSA key type (1:512, 2:768, 3:896, 4:1024, 5:1536, 6:2048, 7:3072, 8:4096)" ++#define HLP_NODE_RSA_TX_TYPE "sign own descriptions with given RSA key type (4:1024, 5:1536, 6:2048, 7:3072, 8:4096)" + + #define ARG_NODE_RSA_RX_TYPES "nodeRsaKeys" +-#define MIN_NODE_RSA_RX_TYPES (1< +Date: Sun, 19 May 2024 07:53:57 +0200 +Subject: [PATCH] Detect mbedtls-2.8.0 or mbedtls-3.6.0 based on + mbedtls/version.h + +Upstream: https://github.com/bmx-routing/bmx7/commit/9020896f89006bc5d3487222eefc7ddea9e8b2bd +Signed-off-by: Thomas Perale +--- + src/crypt.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/crypt.h b/src/crypt.h +index cae8df7..2dff0da 100644 +--- a/src/crypt.h ++++ b/src/crypt.h +@@ -28,9 +28,13 @@ + #define MBEDTLS_3_6_0 2360 + #define MBEDTLS_MAX 2999 + +-#ifndef CRYPTLIB ++#include "mbedtls/version.h" ++#ifndef MBEDTLS_VERSION_NUMBER + #define CRYPTLIB MBEDTLS_2_8_0 +-//#define CRYPTLIB MBEDTLS_3_6_0 ++#elif (MBEDTLS_VERSION_NUMBER >= 0x01000000 && MBEDTLS_VERSION_NUMBER < 0x03000000) ++#define CRYPTLIB MBEDTLS_2_8_0 ++#elif (MBEDTLS_VERSION_NUMBER >= 0x03000000) ++#define CRYPTLIB MBEDTLS_3_6_0 + #endif + + #define CRYPT_DER_BUF_SZ 16000 diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 6b76e5f530..421c8a1455 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -10,7 +10,8 @@ BOINC_SITE = \ $(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION)) BOINC_LICENSE = LGPL-3.0+ BOINC_LICENSE_FILES = COPYING COPYING.LESSER -BOINC_CPE_ID_VENDOR = rom_walton +BOINC_CPE_ID_VENDOR = universityofcalifornia +BOINC_CPE_ID_PRODUCT = boinc_client BOINC_SELINUX_MODULES = boinc BOINC_DEPENDENCIES = host-pkgconf libcurl openssl BOINC_AUTORECONF = YES diff --git a/package/boost/boost.mk b/package/boost/boost.mk index c0d17f7670..1dcc4a4b3a 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -12,12 +12,36 @@ BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt BOOST_CPE_ID_VENDOR = boost +BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) + +BOOST_FLAGS = --with-toolset=gcc + +ifeq ($(BR2_PACKAGE_ICU),y) +BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr +BOOST_DEPENDENCIES += icu +else +BOOST_FLAGS += --without-icu +endif + +ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y) +BOOST_DEPENDENCIES += bzip2 zlib +endif + +ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) +BOOST_FLAGS += \ + --with-python-root=$(HOST_DIR) \ + --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) +BOOST_DEPENDENCIES += python3 +endif + # keep host variant as minimal as possible # regex & system are needed by host-riscv-isa-sim HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),\ atomic \ - chrono container \ + chrono \ + container \ context \ contract \ coroutine \ @@ -47,62 +71,6 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ wave\ ) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTRACT),,contract) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FIBER),,fiber) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_JSON),,json) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOG),,log) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_NOWIDE),,nowide) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_STACKTRACE),,stacktrace) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) - -BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) - -BOOST_FLAGS = --with-toolset=gcc - -ifeq ($(BR2_PACKAGE_ICU),y) -BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr -BOOST_DEPENDENCIES += icu -else -BOOST_FLAGS += --without-icu -endif - -ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y) -BOOST_DEPENDENCIES += bzip2 zlib -endif - -ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += \ - --with-python-root=$(HOST_DIR) \ - --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) -BOOST_DEPENDENCIES += python3 -endif - HOST_BOOST_OPTS += toolset=gcc threading=multi \ variant=release link=shared runtime-link=shared -j$(PARALLEL_JOBS) -q \ --ignore-site-config --layout=system --prefix=$(HOST_DIR) \ @@ -151,6 +119,39 @@ endif BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv) endif +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTRACT),,contract) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FIBER),,fiber) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_JSON),,json) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOG),,log) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_NOWIDE),,nowide) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_STACKTRACE),,stacktrace) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_URL),,url) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) + BOOST_WITHOUT_FLAGS_COMMASEPARATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS))) BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPARATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPARATED)) diff --git a/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch b/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch new file mode 100644 index 0000000000..817fee195e --- /dev/null +++ b/package/bootgen/0001-bisonflex-Fix-build-on-machines-with-modern-flex.patch @@ -0,0 +1,72 @@ +From e7e341b7ba6fa9fb875718e8740b03c2041278e8 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Mon, 2 Jun 2025 12:09:13 +0100 +Subject: [PATCH] bisonflex: Fix build on machines with modern flex + +With bootgen 2025.1, the directory structure was re-done. In the process of +doing this, the source files in the bisonflex directory lost the fix below +which had been applied on an earlier version of bootgen: + +Bootgen embeds an old version of flex, but uses the system include syntax +(#include <>) to reference it, causing conflicts on systems with the +development headers for a modern flex version installed, leading to build +issues like: + +../bisonflex/bif.yy.cpp: In member function 'virtual int BIF::FlexScanner::yylex()': +../bisonflex/bif.yy.cpp:1608:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'}) + +Fix it by using normal local #include statements by: + +sed -i 's//"../win_include/FlexLexer.h"/g' * + +Upstream: submitted to AMD internal jira process + +Signed-off-by: Neal Frager +--- + bisonflex/bif.yy.cpp | 2 +- + bisonflex/cmdoptions.yy.cpp | 2 +- + bisonflex/reginit.yy.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bisonflex/bif.yy.cpp b/bisonflex/bif.yy.cpp +index 8d4d364..35f0aa5 100755 +--- a/bisonflex/bif.yy.cpp ++++ b/bisonflex/bif.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "../win_include/FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +diff --git a/bisonflex/cmdoptions.yy.cpp b/bisonflex/cmdoptions.yy.cpp +index 661d7f3..a76ac81 100755 +--- a/bisonflex/cmdoptions.yy.cpp ++++ b/bisonflex/cmdoptions.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "../win_include/FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +diff --git a/bisonflex/reginit.yy.cpp b/bisonflex/reginit.yy.cpp +index d830734..dede473 100755 +--- a/bisonflex/reginit.yy.cpp ++++ b/bisonflex/reginit.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "../win_include/FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +-- +2.25.1 + diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash index 506aae8a84..7670a5d1ee 100644 --- a/package/bootgen/bootgen.hash +++ b/package/bootgen/bootgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7879c7d40642bcf7adcec177a51cf73f95bd45d315f75d125d3fc1680c0a9b24 bootgen-xilinx_v2024.1.tar.gz -sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE +sha256 3de43a331e10b2a8079d4681ad72cef4884bc3a09250d3d80811d677f3ffe560 bootgen-xilinx_v2025.1.tar.gz +sha256 36e278ff2cc9ef95154a923bf4a9450414f358779045ae4f863c8d77fb18dbdb LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk index 912e2e31b3..939872b29c 100644 --- a/package/bootgen/bootgen.mk +++ b/package/bootgen/bootgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTGEN_VERSION = xilinx_v2024.1 +BOOTGEN_VERSION = xilinx_v2025.1 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf BOOTGEN_LICENSE = Apache-2.0 @@ -19,7 +19,7 @@ define HOST_BOOTGEN_BUILD_CMDS endef define HOST_BOOTGEN_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/bootgen $(HOST_DIR)/bin/bootgen + $(INSTALL) -m 0755 -D $(@D)/build/bin/bootgen $(HOST_DIR)/bin/bootgen endef $(eval $(host-generic-package)) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index 55fd09ef3d..9500baf11e 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_BPFTOOL bool "bpftool" depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils @@ -27,7 +26,6 @@ config BR2_PACKAGE_BPFTOOL comment "bpftool needs a toolchain w/ wchar, dynamic library, threads, headers >= 4.12" depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index 4f83e71a76..5112bb997e 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 89d3ce783d5c9e40b9060b380869911ee9d5ab6732a4b1dd19a90103c5e41e6c bpftool-v7.1.0-git4.tar.gz +sha256 ff95bc8a057c84e61863fcf95e354199041ac524f5b9f5d487cf0b2c6e9198fb bpftool-v7.5.0-git4.tar.gz sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk index cd68d89799..1b765ba38f 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = v7.1.0 +BPFTOOL_VERSION = v7.5.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES diff --git a/package/bpftrace/bpftrace.hash b/package/bpftrace/bpftrace.hash index c2ecc927da..a3d62e072f 100644 --- a/package/bpftrace/bpftrace.hash +++ b/package/bpftrace/bpftrace.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 b520340f28ce4d6f2fb2355f1675b6801ff8498ed9e8bff14abbbf6baff5a08e bpftrace-0.19.1.tar.gz +sha256 3b374c3618ff055d279ddd2fcf4393feb88b4b03284b8b6f69f1e0dedd20662c bpftrace-0.23.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/bpftrace/bpftrace.mk b/package/bpftrace/bpftrace.mk index dc4c9728cc..7ff0508486 100644 --- a/package/bpftrace/bpftrace.mk +++ b/package/bpftrace/bpftrace.mk @@ -4,8 +4,8 @@ # ################################################################################ -BPFTRACE_VERSION = 0.19.1 -BPFTRACE_SITE = $(call github,iovisor,bpftrace,v$(BPFTRACE_VERSION)) +BPFTRACE_VERSION = 0.23.3 +BPFTRACE_SITE = $(call github,bpftrace,bpftrace,v$(BPFTRACE_VERSION)) BPFTRACE_LICENSE = Apache-2.0 BPFTRACE_LICENSE_FILES = LICENSE BPFTRACE_DEPENDENCIES = \ diff --git a/package/brcm-patchram-plus/brcm-patchram-plus.mk b/package/brcm-patchram-plus/brcm-patchram-plus.mk index d873330769..81ffc47aee 100644 --- a/package/brcm-patchram-plus/brcm-patchram-plus.mk +++ b/package/brcm-patchram-plus/brcm-patchram-plus.mk @@ -10,4 +10,8 @@ BRCM_PATCHRAM_PLUS_LICENSE = Apache-2.0 BRCM_PATCHRAM_PLUS_LICENSE_FILES = COPYING BRCM_PATCHRAM_PLUS_AUTORECONF = YES +# C23 changes meaning of empty argument prototypes like int (*)() +# causing build failures, so force gnu99 +BRCM_PATCHRAM_PLUS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" + $(eval $(autotools-package)) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index c20abfc26c..aba028ef6a 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 d9835b33bea65cf15f41753e215a11e5eca818a6e3bfacaa750aeac12456c24f brcmfmac_sdio-firmware-rpi-6596d332eaadd63e2413e3937715a084f61c39e2.tar.gz sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENSE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 95707487a9..8c04b017e3 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 6596d332eaadd63e2413e3937715a084f61c39e2 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENSE diff --git a/package/brltty/0002-configure.ac-link-fv-driver-with-ltinfo-only-if-avai.patch b/package/brltty/0002-configure.ac-link-fv-driver-with-ltinfo-only-if-avai.patch new file mode 100644 index 0000000000..121237ee49 --- /dev/null +++ b/package/brltty/0002-configure.ac-link-fv-driver-with-ltinfo-only-if-avai.patch @@ -0,0 +1,58 @@ +From a4f55ee941fdc94511c72c1831dedcf5bea7935d Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Thu, 30 Oct 2025 16:52:53 +0100 +Subject: [PATCH] configure.ac: link fv driver with -ltinfo only if available + +During the brltty bump to version 6.8 in Buildroot, the build failed on +systems without libtinfo: + + /usr/bin/ld: cannot find -ltinfo: No such file or directory + +Link libtinfo only if the library is present. + +Signed-off-by: Dario Binacchi +Upstream: https://github.com/brltty/brltty/pull/503 +--- + configure.ac | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 68c9c6d1b7f5..5c931f71b79a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -813,6 +813,7 @@ BRLTTY_ARG_ENABLE( + ]) + AC_SUBST(fuzzer_libs) + ++have_tinfo="no" + brltty_curses_libs_save="${LIBS}" + BRLTTY_PACKAGE_CHOOSE([curses], + [ncursesw ncursesw/ncurses.h], +@@ -823,8 +824,10 @@ BRLTTY_PACKAGE_CHOOSE([curses], + [pdcurses curses.h]) + if test -n "${curses_package}" + then +- AC_CHECK_LIB([tinfo], [intrflush]) ++ AC_CHECK_LIB([tinfo], [intrflush], ++ [have_tinfo="yes"]) + fi ++ + curses_libs="${LIBS%${brltty_curses_libs_save}}" + LIBS="${brltty_curses_libs_save}" + AC_SUBST([curses_libs]) +@@ -1882,7 +1885,11 @@ in + ;; + esac + +-BRLTTY_SCREEN_DRIVER([fv], [FileViewer], [-ltinfo]) ++if test "${have_tinfo}" = "yes"; then ++ BRLTTY_SCREEN_DRIVER([fv], [FileViewer], [-ltinfo]) ++else ++ BRLTTY_SCREEN_DRIVER([fv], [FileViewer]) ++fi + + all_brltty_pty="" + install_brltty_pty="" +-- +2.43.0 + diff --git a/package/brltty/0003-Fix-initialization-of-iconv_t-with-GCC-14.x-and-uCli.patch b/package/brltty/0003-Fix-initialization-of-iconv_t-with-GCC-14.x-and-uCli.patch new file mode 100644 index 0000000000..c15cdffac6 --- /dev/null +++ b/package/brltty/0003-Fix-initialization-of-iconv_t-with-GCC-14.x-and-uCli.patch @@ -0,0 +1,72 @@ +From 229a5c4319ef32ab837c7029d3a565c4673fdbf7 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Mon, 3 Nov 2025 11:39:53 +0100 +Subject: [PATCH] =?UTF-8?q?Fix=20initialization=20of=20=E2=80=98iconv=5Ft?= + =?UTF-8?q?=E2=80=99=20with=20GCC=2014.x=20and=20uClibc?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The patch fixes the following error raised by the compilation of brltty +with the combination of GCC 14.x and uClibc. + +./unicode.c:349:27: error: initialization of ‘iconv_t’ {aka ‘long int’} from ‘void *’ makes integer from pointer without a cast [-Wint-conversion] + 349 | static iconv_t handle = NULL; + | ^~~~ +make[3]: *** [Makefile:366: unicode.o] Error 1 + +Signed-off-by: Dario Binacchi +Upstream: https://github.com/brltty/brltty/pull/504 +--- + Drivers/Braille/TTY/braille.c | 7 ++++--- + Programs/unicode.c | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Drivers/Braille/TTY/braille.c b/Drivers/Braille/TTY/braille.c +index c8cba4999459..a2080532bc53 100644 +--- a/Drivers/Braille/TTY/braille.c ++++ b/Drivers/Braille/TTY/braille.c +@@ -30,7 +30,8 @@ + + #ifdef HAVE_ICONV_H + #include +-static iconv_t conversionDescriptor = NULL; ++#define ICONV_NULL ((iconv_t)-1) ++static iconv_t conversionDescriptor = ICONV_NULL; + #endif /* HAVE_ICONV_H */ + + #include "log.h" +@@ -211,7 +212,7 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { + logSystemError("iconv_open"); + } + +- conversionDescriptor = NULL; ++ conversionDescriptor = ICONV_NULL; + #endif /* HAVE_ICONV_H */ + + return 0; +@@ -240,7 +241,7 @@ brl_destruct (BrailleDisplay *brl) { + #ifdef HAVE_ICONV_H + if (conversionDescriptor) { + iconv_close(conversionDescriptor); +- conversionDescriptor = NULL; ++ conversionDescriptor = ICONV_NULL; + } + #endif /* HAVE_ICONV_H */ + } +diff --git a/Programs/unicode.c b/Programs/unicode.c +index 45e43be292c7..cbdcb4382291 100644 +--- a/Programs/unicode.c ++++ b/Programs/unicode.c +@@ -346,7 +346,7 @@ getBaseCharacter (wchar_t character) { + wchar_t + getTransliteratedCharacter (wchar_t character) { + #ifdef HAVE_ICONV_H +- static iconv_t handle = NULL; ++ static iconv_t handle = (iconv_t)-1; + if (!handle) handle = iconv_open("ASCII//TRANSLIT", "WCHAR_T"); + + if (handle != (iconv_t)-1) { +-- +2.43.0 + diff --git a/package/brltty/Config.in b/package/brltty/Config.in index 3527df6161..70708df6c1 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NCURSES select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind diff --git a/package/brltty/brltty.hash b/package/brltty/brltty.hash index 9b707fc1c2..9b75e0023f 100644 --- a/package/brltty/brltty.hash +++ b/package/brltty/brltty.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ab11cfc5fbd7ef0ec876ffea7e131e424b2fd004b6158064e1a2e46412825529 brltty-6.6.tar.xz +sha256 9f3c6dc2b65059d20f60836e8f9ebc58d8e518d6a8f8fee33e1d1e50ab43c3bc brltty-6.8.tar.xz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 72740317768530c60046c591160d4552afb3ac49657b04c7b8452c1bbe7b834e README +sha256 a9a8b3eef5f3e2b4716912a4ed60eca78a3f561515ed17ebe80348f2f033b395 README diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index 22d58ebd00..5e24288cbb 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 6.6 +BRLTTY_VERSION = 6.8 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install @@ -17,6 +17,7 @@ BRLTTY_DEPENDENCIES = \ host-autoconf \ host-gawk \ host-pkgconf \ + ncurses \ $(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core) BRLTTY_CONF_ENV = \ @@ -37,8 +38,10 @@ BRLTTY_CONF_OPTS = \ --without-theta # Autoreconf is needed because we're patching configure.ac in -# 0001-Fix-linking-error-on-mips64el. However, a plain autoreconf doesn't work, -# because this package is only autoconf-based. +# 0001-Fix-linking-error-on-mips64el and +# 0002-configure.ac-link-fv-driver-with-ltinfo-only-if-avai. +# However, a plain autoreconf doesn't work, because this package +# is only autoconf-based. define BRLTTY_AUTOCONF cd $(BRLTTY_SRCDIR) && $(AUTOCONF) endef diff --git a/package/broot/Config.in b/package/broot/Config.in new file mode 100644 index 0000000000..247240925f --- /dev/null +++ b/package/broot/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BROOT + bool "broot" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Broot is a fast and powerful file manager written in Rust and + licensed under MIT license. It supports filters, regular + expressions, and real-time "show-as-you-type" search for quick + and easy navigation, even in complex directory structures. + + https://github.com/Canop/broot diff --git a/package/broot/broot.hash b/package/broot/broot.hash new file mode 100644 index 0000000000..e01762f275 --- /dev/null +++ b/package/broot/broot.hash @@ -0,0 +1,3 @@ +# Locally generated +sha256 a006e15ec340d05451459f6e95a52789b6f55c93617129ca9178d00d43437cef broot-1.53.0-cargo4.tar.gz +sha256 89461664ce2aee7d80ea8fba7118fe7abd490d76ba435cf1d81d3128e060711f LICENSE diff --git a/package/broot/broot.mk b/package/broot/broot.mk new file mode 100644 index 0000000000..a5c5ba2271 --- /dev/null +++ b/package/broot/broot.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# broot +# +################################################################################ + +BROOT_VERSION = 1.53.0 +BROOT_SITE = $(call github,Canop,broot,v$(BROOT_VERSION)) +BROOT_LICENSE = MIT +BROOT_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) diff --git a/package/brotli/brotli.hash b/package/brotli/brotli.hash index 145467c420..9ec1f79c7d 100644 --- a/package/brotli/brotli.hash +++ b/package/brotli/brotli.hash @@ -1,5 +1,5 @@ # Locally generated: -sha512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9 v1.1.0.tar.gz +sha512 f94542afd2ecd96cc41fd21a805a3da314281ae558c10650f3e6d9ca732b8425bba8fde312823f0a564c7de3993bdaab5b43378edab65ebb798cefb6fd702256 v1.2.0.tar.gz # Hash for license files: sha512 bae78184c2f50f86d8c727826d3982c469454c42b9af81f4ef007e39036434fa894cf5be3bf5fc65b7de2301f0a72d067a8186e303327db8a96bd14867e0a3a8 LICENSE diff --git a/package/brotli/brotli.mk b/package/brotli/brotli.mk index 80aa2566b5..aded9cf17b 100644 --- a/package/brotli/brotli.mk +++ b/package/brotli/brotli.mk @@ -4,7 +4,7 @@ # ################################################################################ -BROTLI_VERSION = 1.1.0 +BROTLI_VERSION = 1.2.0 BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz BROTLI_SITE = https://github.com/google/brotli/archive BROTLI_LICENSE = MIT diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 37276046b8..b2b88ffe92 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,6 +1,6 @@ -# Locally generated after checking GPG signature from -# https://github.com/containers/bubblewrap/releases/tag/v0.10.0 -sha256 65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471 bubblewrap-0.10.0.tar.xz +# Also checked GPG signature from +# https://github.com/containers/bubblewrap/releases/tag/v0.11.0 +sha256 988fd6b232dafa04b8b8198723efeaccdb3c6aa9c1c7936219d5791a8b7a8646 bubblewrap-0.11.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 94ae72d4d2..ea46d7a127 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.10.0 +BUBBLEWRAP_VERSION = 0.11.0 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap diff --git a/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch b/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch index 9b5eaf89bd..76d9a371c6 100644 --- a/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch +++ b/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch @@ -1,4 +1,4 @@ -From 60da1d0763224698008d847eb8ad8d4d8c6f54ff Mon Sep 17 00:00:00 2001 +From e1690453cd84c798ca88cc4370710f65da86d986 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Oct 2013 15:55:06 +0200 Subject: [PATCH] networking/libiproute: use instead of @@ -20,7 +20,7 @@ Signed-off-by: Petr Vorel 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c -index 1a1064bdc..a4c3ad307 100644 +index 37ed114bc..bc526d89c 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -7,7 +7,7 @@ @@ -30,8 +30,8 @@ index 1a1064bdc..a4c3ad307 100644 -#include +#include #include - + #include --- -2.33.0 +-- +2.48.1 diff --git a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch index 3a94241043..040b0b23bf 100644 --- a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch @@ -1,8 +1,7 @@ -From 59daea82e7b5abcdb42a4f97a0109f14d5a774ea Mon Sep 17 00:00:00 2001 +From df20ae1280a2601a4c233ec12372d1e17db21e96 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 25 Nov 2013 22:51:53 +0100 -Subject: [PATCH] Makefile.flags: strip non -l arguments returned by - pkg-config +Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: refresh for 1.29.0] @@ -14,10 +13,10 @@ Signed-off-by: Petr Vorel 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.flags b/Makefile.flags -index 667481983..88d76efec 100644 +index 97cb4dca2..92a9063d9 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -180,7 +180,9 @@ ifeq ($(CONFIG_SELINUX),y) +@@ -181,7 +181,9 @@ ifeq ($(CONFIG_SELINUX),y) SELINUX_PC_MODULES = libselinux libsepol $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) CPPFLAGS += $(SELINUX_CFLAGS) @@ -26,8 +25,8 @@ index 667481983..88d76efec 100644 + $(patsubst -l%,%,$(filter -l%,$(SELINUX_LIBS))),\ + $(SELINUX_PC_MODULES:lib%=%)) endif - + ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y) --- -2.33.0 +-- +2.48.1 diff --git a/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch index 623b2597a2..c7800b5b0b 100644 --- a/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch +++ b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch @@ -1,4 +1,4 @@ -From 9d825e854ef53ebbe0aea2f1a69f52b763104daf Mon Sep 17 00:00:00 2001 +From 68eaf20d86d4fe0f16a914817217f386155157cc Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Mon, 19 Sep 2022 14:15:12 +0200 Subject: [PATCH] libbb: sockaddr2str: ensure only printable characters are @@ -38,5 +38,5 @@ index 0e0b247b8..02c061e67 100644 } -- -2.37.3 +2.48.1 diff --git a/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch index bfa58465e7..3396441ebb 100644 --- a/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch +++ b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch @@ -1,4 +1,4 @@ -From bd463a5564a2c0618317448c3f965d389534c3df Mon Sep 17 00:00:00 2001 +From 56b84c6efb9a06ae294eb92cf9634f70af443b0a Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Mon, 19 Sep 2022 14:15:12 +0200 Subject: [PATCH] nslookup: sanitize all printed strings with printable_string @@ -16,10 +16,10 @@ Signed-off-by: Quentin Schulz 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/networking/nslookup.c b/networking/nslookup.c -index 6da97baf4..4bdcde1b8 100644 +index b67d354f7..79412477c 100644 --- a/networking/nslookup.c +++ b/networking/nslookup.c -@@ -407,7 +407,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) +@@ -784,7 +784,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) //printf("Unable to uncompress domain: %s\n", strerror(errno)); return -1; } @@ -28,7 +28,7 @@ index 6da97baf4..4bdcde1b8 100644 break; case ns_t_mx: -@@ -422,7 +422,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) +@@ -799,7 +799,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) //printf("Cannot uncompress MX domain: %s\n", strerror(errno)); return -1; } @@ -37,7 +37,7 @@ index 6da97baf4..4bdcde1b8 100644 break; case ns_t_txt: -@@ -434,7 +434,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) +@@ -811,7 +811,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) if (n > 0) { memset(dname, 0, sizeof(dname)); memcpy(dname, ns_rr_rdata(rr) + 1, n); @@ -46,7 +46,7 @@ index 6da97baf4..4bdcde1b8 100644 } break; -@@ -454,7 +454,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) +@@ -831,7 +831,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) } printf("%s\tservice = %u %u %u %s\n", ns_rr_name(rr), @@ -55,7 +55,7 @@ index 6da97baf4..4bdcde1b8 100644 break; case ns_t_soa: -@@ -483,7 +483,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) +@@ -860,7 +860,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) return -1; } @@ -65,5 +65,5 @@ index 6da97baf4..4bdcde1b8 100644 printf("\tserial = %lu\n", ns_get32(cp)); -- -2.37.3 +2.48.1 diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch deleted file mode 100644 index 4a194612b4..0000000000 --- a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Mon, 10 Apr 2023 17:26:04 +0200 -Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom() - -Signed-off-by: Denys Vlasenko -Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a ---- - miscutils/seedrng.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c -index 967741dc7..7cc855141 100644 ---- a/miscutils/seedrng.c -+++ b/miscutils/seedrng.c -@@ -45,6 +45,20 @@ - #include - #include - -+/* Fix up glibc <= 2.24 not having getrandom() */ -+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 -+#include -+# define getrandom(...) bb_getrandom(__VA_ARGS__) -+static ssize_t getrandom(void *buffer, size_t length, unsigned flags) -+{ -+# if defined(__NR_getrandom) -+ return syscall(__NR_getrandom, buffer, length, flags); -+# else -+ return ENOSYS; -+# endif -+} -+#endif -+ - #ifndef GRND_INSECURE - #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ - #endif --- -2.39.1 - diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0005-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch similarity index 81% rename from package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch rename to package/busybox/0005-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch index 140b27cae6..84d7df1bf8 100644 --- a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch +++ b/package/busybox/0005-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch @@ -1,7 +1,7 @@ -From b2d26d449ec855602b9a88f58c2eb675de0224f2 Mon Sep 17 00:00:00 2001 +From 9fed109be1f811069cb2f727e04c6996cd44b017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 18 Apr 2023 15:54:43 +0200 -Subject: [PATCH v4] seedrng: fix getrandom() detection for non-glibc libc +Subject: [PATCH] seedrng: fix getrandom() detection for non-glibc libc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -48,33 +48,15 @@ This should fix compiling with many libc/kernel combinations. Signed-off-by: Raphaël Mélotte Upstream: http://lists.busybox.net/pipermail/busybox/2023-May/090317.html --- -Changes v3 -> v4: - - use a variable for '#' for compatibility with GNU make 4.2.1 and earlier. - -Changes v2 -> v3: - - fix _GNU_SOURCE define location - -Changes v1 -> v2: - - move _GNU_SOURCE to bb_libtest.c - - remove GRND_NONBLOCK - -Note that I was not able to test every single combination, but I could -confirm it builds successfully for: -uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used) -uClibc 1.0.36, linux headers 4.9 (libc getrandom used) -musl 1.1.16, linux headers 4.12 (libc getrandom NOT used) -musl 1.2.1, linux headers (libc getrandom used) -glibc 2.25, linux headers 4.10 (libc getrandom used) - Makefile.flags | 12 ++++++++++++ miscutils/seedrng.c | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile.flags b/Makefile.flags -index 1cec5ba20..0d437303a 100644 +index 92a9063d9..c8f601308 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y) +@@ -162,6 +162,18 @@ ifeq ($(RT_AVAILABLE),y) LDLIBS += rt endif @@ -94,7 +76,7 @@ index 1cec5ba20..0d437303a 100644 # On some platforms that requires an explicit -lpthread, -ldl, -laudit. # However, on *other platforms* it fails when some of those flags diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c -index 3bf6e2ea7..2f1e18c32 100644 +index 7a2331cb1..ba98f4d19 100644 --- a/miscutils/seedrng.c +++ b/miscutils/seedrng.c @@ -44,8 +44,10 @@ @@ -120,5 +102,5 @@ index 3bf6e2ea7..2f1e18c32 100644 /* Apparently some headers don't ship with this yet. */ -- -2.39.1 +2.48.1 diff --git a/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch b/package/busybox/0006-menuconfig-GCC-failing-saying-ncurses-is-not-found.patch similarity index 79% rename from package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch rename to package/busybox/0006-menuconfig-GCC-failing-saying-ncurses-is-not-found.patch index 4651d8c2c9..594874471d 100644 --- a/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch +++ b/package/busybox/0006-menuconfig-GCC-failing-saying-ncurses-is-not-found.patch @@ -1,6 +1,6 @@ -From ctxnop@gmail.com Sun Jul 21 12:10:52 2024 -From: ctxnop@gmail.com (Nop) -Date: Sun, 21 Jul 2024 14:10:52 +0200 +From 7f0bb7f69f38298971aa8153d3fbe9b1fdda8ae7 Mon Sep 17 00:00:00 2001 +From: ctxnop +Date: Sun, 26 Jan 2025 20:59:20 +0100 Subject: [PATCH] menuconfig: GCC failing saying ncurses is not found Newer GCC increased diagnostics levels resulting in considering the @@ -17,13 +17,12 @@ Signed-off-by: Fiona Klute (WIWA) scripts/kconfig/lxdialog/check-lxdialog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh -b/scripts/kconfig/lxdialog/check-lxdialog.sh -index 5075ebf2d..c644d1d48 100755 +diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh +index 5075ebf2d..08e4da3de 100755 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -45,9 +45,9 @@ trap "rm -f $tmp" 0 1 2 3 15 - + # Check if we can link to ncurses check() { - $cc -x c - -o $tmp 2>/dev/null <<'EOF' @@ -34,5 +33,6 @@ index 5075ebf2d..c644d1d48 100755 EOF if [ $? != 0 ]; then echo " *** Unable to find the ncurses libraries or the" 1>&2 --- -2.45.2 +-- +2.48.1 + diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch deleted file mode 100644 index d729884805..0000000000 --- a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 10 Apr 2023 19:58:15 +0200 -Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header - - - dropped the wrong define (not sure why it was there) - - not available if glibc <= 2.24 - - GRND_NONBLOCK not defined if not included - - ret < 0 && errno == ENOSYS has to be true to get creditable set - -Signed-off-by: Thomas Devoogdt -Signed-off-by: Denys Vlasenko -Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf ---- - miscutils/seedrng.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c -index 7cc855141..3bf6e2ea7 100644 ---- a/miscutils/seedrng.c -+++ b/miscutils/seedrng.c -@@ -42,25 +42,31 @@ - #include "libbb.h" - - #include --#include - #include - - /* Fix up glibc <= 2.24 not having getrandom() */ - #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 - #include --# define getrandom(...) bb_getrandom(__VA_ARGS__) - static ssize_t getrandom(void *buffer, size_t length, unsigned flags) - { - # if defined(__NR_getrandom) - return syscall(__NR_getrandom, buffer, length, flags); - # else -- return ENOSYS; -+ errno = ENOSYS; -+ return -1; - # endif - } -+#else -+#include -+#endif -+ -+/* Apparently some headers don't ship with this yet. */ -+#ifndef GRND_NONBLOCK -+#define GRND_NONBLOCK 0x0001 - #endif - - #ifndef GRND_INSECURE --#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ -+#define GRND_INSECURE 0x0004 - #endif - - #define DEFAULT_SEED_DIR "/var/lib/seedrng" --- -2.39.1 - diff --git a/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch b/package/busybox/0007-tc-Fix-compilation-with-Linux-v6.8-rc1.patch similarity index 96% rename from package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch rename to package/busybox/0007-tc-Fix-compilation-with-Linux-v6.8-rc1.patch index d997f00e82..c7968de788 100644 --- a/package/busybox/0010-Linux-v6.8-rc1-removed-the-definitions-related-to-CB.patch +++ b/package/busybox/0007-tc-Fix-compilation-with-Linux-v6.8-rc1.patch @@ -1,4 +1,4 @@ -From c4f93565acf3718111cdbaea15e1a8aacf2f44cf Mon Sep 17 00:00:00 2001 +From 1dbb3073a3a8856b9446b882f797be1bb2e21a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 23 Sep 2024 18:56:00 +0200 Subject: [PATCH] tc: Fix compilation with Linux v6.8-rc1 @@ -66,5 +66,5 @@ index 3a79fd2d9..d08fd1359 100644 /* don't know how to print options for this class */ printf("(options for %s)", name); -- -2.39.5 +2.48.1 diff --git a/package/busybox/0008-awk.c-fix-CVE-2023-42366-bug-15874.patch b/package/busybox/0008-awk.c-fix-CVE-2023-42366-bug-15874.patch new file mode 100644 index 0000000000..f973223907 --- /dev/null +++ b/package/busybox/0008-awk.c-fix-CVE-2023-42366-bug-15874.patch @@ -0,0 +1,43 @@ +From 88f8a046f27cb81ccc30d038465e963b8300cf1b Mon Sep 17 00:00:00 2001 +From: Valery Ushakov +Date: Wed, 24 Jan 2024 22:24:41 +0300 +Subject: [PATCH] awk.c: fix CVE-2023-42366 (bug #15874) + +Make sure we don't read past the end of the string in next_token() +when backslash is the last character in an (invalid) regexp. +a fix and issue reported in bugzilla + +https://bugs.busybox.net/show_bug.cgi?id=15874 + +Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2024-May/090766.html] + +CVE: CVE-2023-42366 +Signed-off-by: Khem Raj +[Thomas: https://git.openembedded.org/openembedded-core/tree/meta/recipes-core/busybox/busybox/0001-awk.c-fix-CVE-2023-42366-bug-15874.patch?id=e0ff4813b1cf4df0d851c857d57fb88d7db51bdd] +Upstream: http://lists.busybox.net/pipermail/busybox/2024-May/090766.html +Signed-off-by: Thomas Petazzoni +--- + editors/awk.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/editors/awk.c b/editors/awk.c +index 64e752f4b..222e6298d 100644 +--- a/editors/awk.c ++++ b/editors/awk.c +@@ -1234,9 +1234,11 @@ static uint32_t next_token(uint32_t expected) + s[-1] = bb_process_escape_sequence((const char **)&pp); + if (*p == '\\') + *s++ = '\\'; +- if (pp == p) ++ if (pp == p) { ++ if (*p == '\0') ++ syntax_error(EMSG_UNEXP_EOS); + *s++ = *p++; +- else ++ } else + p = pp; + } + } +-- +2.48.1 + diff --git a/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch deleted file mode 100644 index 8ebb487ec6..0000000000 --- a/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 93e0898c663a533082b5f3c2e7dcce93ec47076d Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Thu, 26 Jan 2023 12:56:33 +0100 -Subject: [PATCH] shell: fix SIGWINCH and SIGCHLD (in hush) interrupting line - input, closes 15256 - -function old new delta -record_pending_signo 32 63 +31 -lineedit_read_key 231 224 -7 ------------------------------------------------------------------------------- -(add/remove: 0/0 grow/shrink: 1/1 up/down: 31/-7) Total: 24 bytes - -Signed-off-by: Denys Vlasenko -Upstream: https://git.busybox.net/busybox/commit/?id=93e0898c663a533082b5f3c2e7dcce93ec47076d -Signed-off-by: Romain Naour ---- - libbb/lineedit.c | 17 ++++++++++------- - shell/ash.c | 3 ++- - shell/hush.c | 10 ++++++++-- - 3 files changed, 20 insertions(+), 10 deletions(-) - -diff --git a/libbb/lineedit.c b/libbb/lineedit.c -index d6b2e76ff..b942f540a 100644 ---- a/libbb/lineedit.c -+++ b/libbb/lineedit.c -@@ -2180,7 +2180,8 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) - * "\xff\n",pause,"ls\n" invalid and thus won't lose "ls". - * - * If LI_INTERRUPTIBLE, return -1 if got EINTR in poll() -- * inside read_key, or if bb_got_signal != 0 (IOW: if signal -+ * inside read_key and bb_got_signal became != 0, -+ * or if bb_got_signal != 0 (IOW: if signal - * arrived before poll() is reached). - * - * Note: read_key sets errno to 0 on success. -@@ -2197,14 +2198,16 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) - IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;) - if (errno != EINTR) - break; -+ /* It was EINTR. Repeat read_key() unless... */ - if (state->flags & LI_INTERRUPTIBLE) { -- /* LI_INTERRUPTIBLE bails out on EINTR, -- * but nothing really guarantees that bb_got_signal -- * is nonzero. Follow the least surprise principle: -+ /* LI_INTERRUPTIBLE bails out on EINTR -+ * if bb_got_signal became nonzero. -+ * (It may stay zero: for example, our SIGWINCH -+ * handler does not set it. This is used for signals -+ * which should not interrupt line editing). - */ -- if (bb_got_signal == 0) -- bb_got_signal = 255; -- goto ret; -+ if (bb_got_signal != 0) -+ goto ret; /* will return -1 */ - } - } - -diff --git a/shell/ash.c b/shell/ash.c -index 18ccc1329..5f8c8ea19 100644 ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -10821,7 +10821,8 @@ preadfd(void) - again: - /* For shell, LI_INTERRUPTIBLE is set: - * read_line_input will abort on either -- * getting EINTR in poll(), or if it sees bb_got_signal != 0 -+ * getting EINTR in poll() and bb_got_signal became != 0, -+ * or if it sees bb_got_signal != 0 - * (IOW: if signal arrives before poll() is reached). - * Interactive testcases: - * (while kill -INT $$; do sleep 1; done) & -diff --git a/shell/hush.c b/shell/hush.c -index d111f0cc5..f064b8fd2 100644 ---- a/shell/hush.c -+++ b/shell/hush.c -@@ -1946,7 +1946,12 @@ static void record_pending_signo(int sig) - { - sigaddset(&G.pending_set, sig); - #if ENABLE_FEATURE_EDITING -- bb_got_signal = sig; /* for read_line_input: "we got a signal" */ -+ if (sig != SIGCHLD -+ || (G_traps && G_traps[SIGCHLD] && G_traps[SIGCHLD][0]) -+ /* ^^^ if SIGCHLD, interrupt line reading only if it has a trap */ -+ ) { -+ bb_got_signal = sig; /* for read_line_input: "we got a signal" */ -+ } - #endif - #if ENABLE_HUSH_FAST - if (sig == SIGCHLD) { -@@ -2669,7 +2674,8 @@ static int get_user_input(struct in_str *i) - } else { - /* For shell, LI_INTERRUPTIBLE is set: - * read_line_input will abort on either -- * getting EINTR in poll(), or if it sees bb_got_signal != 0 -+ * getting EINTR in poll() and bb_got_signal became != 0, -+ * or if it sees bb_got_signal != 0 - * (IOW: if signal arrives before poll() is reached). - * Interactive testcases: - * (while kill -INT $$; do sleep 1; done) & --- -2.30.2 - diff --git a/package/busybox/0009-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch b/package/busybox/0009-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch new file mode 100644 index 0000000000..1e95fae85c --- /dev/null +++ b/package/busybox/0009-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch @@ -0,0 +1,54 @@ +From 0583f8eda94f97e15e371e12458877b738439e8c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 7 Mar 2021 17:30:24 -0800 +Subject: [PATCH] hwclock: Check for SYS_settimeofday before calling syscall + +Some newer architectures e.g. RISCV32 have 64bit time_t from get go and +thusly do not have gettimeofday_time64/settimeofday_time64 implemented +therefore check for SYS_settimeofday definition before making the +syscall. Fixes build for riscv32 and it will bail out at runtime. + +Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-March/088583.html] +Signed-off-by: Khem Raj +Upstream: http://lists.busybox.net/pipermail/busybox/2021-March/088583.html +[Thomas: this issue has been discussed on the musl mailing list, and +the musl developers' opinion is that Busybox is wrong: +https://www.openwall.com/lists/musl/2024/03/03/2 +https://www.openwall.com/lists/musl/2024/04/07/2. The correct fix +isn't clear, and in the mean time, the patch from Khem turns the build +issue into a runtime error only on the problematic architecture, which +seems like a reasonable trade-off] +Signed-off-by: Thomas Petazzoni +--- + util-linux/hwclock.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c +index c3fd0eb57..dea9c9a55 100644 +--- a/util-linux/hwclock.c ++++ b/util-linux/hwclock.c +@@ -132,6 +132,7 @@ static void show_clock(const char **pp_rtcname, int utc) + + static void set_kernel_tz(const struct timezone *tz) + { ++ int ret = 1; + #if LIBC_IS_MUSL + /* musl libc does not pass tz argument to syscall + * because "it's deprecated by POSIX, therefore it's fine +@@ -140,9 +141,11 @@ static void set_kernel_tz(const struct timezone *tz) + #if !defined(SYS_settimeofday) && defined(SYS_settimeofday_time32) + # define SYS_settimeofday SYS_settimeofday_time32 + #endif +- int ret = syscall(SYS_settimeofday, NULL, tz); ++#if defined(SYS_settimeofday) ++ ret = syscall(SYS_settimeofday, NULL, tz); ++#endif + #else +- int ret = settimeofday(NULL, tz); ++ ret = settimeofday(NULL, tz); + #endif + if (ret) + bb_simple_perror_msg_and_die("settimeofday"); +-- +2.48.1 + diff --git a/package/busybox/0010-libbb-sha-add-missing-sha-NI-guard.patch b/package/busybox/0010-libbb-sha-add-missing-sha-NI-guard.patch new file mode 100644 index 0000000000..0fd7014b50 --- /dev/null +++ b/package/busybox/0010-libbb-sha-add-missing-sha-NI-guard.patch @@ -0,0 +1,54 @@ +From bba9e99026a3dafe75f608459533e0b6d8cf3874 Mon Sep 17 00:00:00 2001 +From: Andre Przywara +Date: Tue, 10 Sep 2024 14:32:46 +0100 +Subject: [PATCH] libbb/sha: add missing sha-NI guard +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The ENABLE_SHA1_HWACCEL Kconfig symbol is meant to be archicture +agnostic, so can be enabled regardless of whether your build +architecture provides hardware acceleration or not. At the moment only +x86 implements this, so every piece of optimised code should be guarded +by both ENABLE_SHA1_HWACCEL and (__x86_64__ || __i386__). This is missing +at one place, so compiling for arm64 breaks when ENABLE_SHA1_HWACCEL is +enabled: +================================ +libbb/hash_md5_sha.c: In function ‘sha1_end’: +libbb/hash_md5_sha.c:1316:28: error: ‘sha1_process_block64_shaNI’ undeclared (first use in this function); did you mean ‘sha1_process_block64’? + 1316 | || ctx->process_block == sha1_process_block64_shaNI + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + | sha1_process_block64 +libbb/hash_md5_sha.c:1316:28: note: each undeclared identifier is reported only once for each function it appears in +make[1]: *** [scripts/Makefile.build:197: libbb/hash_md5_sha.o] Error 1 +make: *** [Makefile:744: libbb] Error 2 +================================ + +Add the missing guards around the call to sha1_process_block64_shaNI to +fix the build on other architectures with ENABLE_SHA1_HWACCEL enabled. + +Change-Id: I40bba388422625f4230abf15a5de23e1fdc654fc +Signed-off-by: Andre Przywara +Upstream: https://lists.busybox.net/pipermail/busybox/2024-September/090899.html +Signed-off-by: Thomas Petazzoni +--- + libbb/hash_md5_sha.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c +index 57a801459..75a61c32c 100644 +--- a/libbb/hash_md5_sha.c ++++ b/libbb/hash_md5_sha.c +@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf) + hash_size = 8; + if (ctx->process_block == sha1_process_block64 + #if ENABLE_SHA1_HWACCEL ++# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + || ctx->process_block == sha1_process_block64_shaNI ++# endif + #endif + ) { + hash_size = 5; +-- +2.48.1 + diff --git a/package/busybox/0011-syslogd-fix-wrong-OPT_locallog-flag-detection.patch b/package/busybox/0011-syslogd-fix-wrong-OPT_locallog-flag-detection.patch new file mode 100644 index 0000000000..1dfd6f3793 --- /dev/null +++ b/package/busybox/0011-syslogd-fix-wrong-OPT_locallog-flag-detection.patch @@ -0,0 +1,37 @@ +From 34d331d642c3312e1c04e4650f547f1a67abee24 Mon Sep 17 00:00:00 2001 +From: Andrej Valek +Date: Wed, 16 Oct 2024 10:15:08 +0200 +Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection + +The OPT_locallog was set on "option_mask32" but checked on local +"opts" variable. While this flag it's used on multiple places can't be +has to be used with "option_mask32". Without this change syslogd +is more-less unusable while no messages are logged locally. + +Signed-off-by: Andrej Valek +Upstream: https://lists.busybox.net/pipermail/busybox/2024-October/090969.html +[Thomas: this was reported as beeing needed by Bernd Kuhls at +https://lore.kernel.org/buildroot/pan$de0bb$35c5a64$ca9b6f21$2408ff40@ID-313208.user.individual.net/, +but also on the Busybox mailing list at +https://lists.busybox.net/pipermail/busybox/2023-September/090499.html] +Signed-off-by: Thomas Petazzoni +--- + sysklogd/syslogd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c +index 7558051f0..fa03aa280 100644 +--- a/sysklogd/syslogd.c ++++ b/sysklogd/syslogd.c +@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv) + } + } + #endif +- if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) { ++ if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) { + recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */ + split_escape_and_log(recvbuf, sz); + } +-- +2.48.1 + diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 3c2aa515f8..659c6aebfc 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -69,6 +69,12 @@ config BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES comment "Busybox individual binaries need a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_BUSYBOX_HTTPD + bool "Install the httpd server startup script" + help + Install the httpd server startup script, + that just start at the boot the busybox httpd server + config BR2_PACKAGE_BUSYBOX_WATCHDOG bool "Install the watchdog daemon startup script" help diff --git a/package/busybox/S50crond b/package/busybox/S50crond index 74a0c0849b..7083a36cb0 100644 --- a/package/busybox/S50crond +++ b/package/busybox/S50crond @@ -36,7 +36,7 @@ stop() { echo "FAIL" fi while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ - --exec "/sbin/$DAEMON"; do + --exec "/usr/sbin/$DAEMON"; do sleep 0.1 done rm -f "$PIDFILE" diff --git a/package/thttpd/S90thttpd b/package/busybox/S90httpd similarity index 56% rename from package/thttpd/S90thttpd rename to package/busybox/S90httpd index 94b079b050..0d43ea3e74 100644 --- a/package/thttpd/S90thttpd +++ b/package/busybox/S90httpd @@ -1,18 +1,21 @@ #!/bin/sh -DAEMON="thttpd" +DAEMON="httpd" PIDFILE="/var/run/$DAEMON.pid" -THTTPD_ARGS="-C /etc/thttpd.conf" +HTTPD_ARGS="-h /var/www/data" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" +# BusyBox' httpd does not create a pidfile, so pass "-f" in the command line +# and use "--make-pidfile" to instruct start-stop-daemon to create one. start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ - -- $THTTPD_ARGS + start-stop-daemon --start --background --quiet --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" \ + -- -f $HTTPD_ARGS status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -24,21 +27,23 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" + start-stop-daemon --stop --quiet --pidfile "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then - # thttpd does not remove the pid file on exit - rm -f "$PIDFILE" echo "OK" else echo "FAIL" fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" return "$status" } restart() { stop - sleep 1 start } diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9733dd2156..1e4b404479 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -105,7 +105,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y CONFIG_FEATURE_EDITING_HISTORY=999 CONFIG_FEATURE_EDITING_SAVEHISTORY=y -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 07b85b343a..823fcd2b46 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.36.1 -# Fri Jan 10 23:36:53 2025 +# Wed May 8 17:25:31 2024 # CONFIG_HAVE_DOT_CONFIG=y @@ -17,7 +17,7 @@ CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y # CONFIG_FEATURE_COMPRESS_USAGE is not set CONFIG_LFS=y -CONFIG_PAM=y +# CONFIG_PAM is not set CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y @@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_SELINUX=y +# CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y @@ -43,9 +43,9 @@ CONFIG_FEATURE_SYSLOG=y # CONFIG_STATIC is not set # CONFIG_PIE is not set # CONFIG_NOMMU is not set -CONFIG_BUILD_LIBBUSYBOX=y +# CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set -CONFIG_FEATURE_INDIVIDUAL=y +# CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_SYSROOT="" @@ -108,7 +108,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y CONFIG_FEATURE_EDITING_HISTORY=999 CONFIG_FEATURE_EDITING_SAVEHISTORY=y -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set @@ -802,7 +802,7 @@ CONFIG_FEATURE_HDPARM_GET_IDENTITY=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_HEXEDIT is not set +CONFIG_HEXEDIT=y CONFIG_I2CGET=y CONFIG_I2CSET=y CONFIG_I2CDUMP=y @@ -976,10 +976,10 @@ CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23 -CONFIG_FEATURE_TELNETD_INETD_WAIT=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set CONFIG_FEATURE_TFTP_HPA_COMPAT=y @@ -1016,7 +1016,7 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" -CONFIG_UDHCPC6_DEFAULT_SCRIPT="" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1112,17 +1112,13 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y CONFIG_SVOK=y # CONFIG_SVLOGD is not set - -# -# SELinux Utilities -# # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set # CONFIG_RUNCON is not set -CONFIG_SELINUXENABLED=y +# CONFIG_SELINUXENABLED is not set # CONFIG_SESTATUS is not set # CONFIG_SETENFORCE is not set # CONFIG_SETFILES is not set diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 6eba365ecc..39ca8915f3 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.36.1.tar.bz2.sha256 -sha256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 busybox-1.36.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.37.0.tar.bz2.sha256 +sha256 3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4 busybox-1.37.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 942875ee0e..d7eda71db6 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.36.1 +BUSYBOX_VERSION = 1.37.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 @@ -258,6 +258,19 @@ define BUSYBOX_SET_SELINUX endef endif +ifeq ($(BR2_PACKAGE_BUSYBOX_HTTPD),y) +define BUSYBOX_SET_HTTPD + $(call KCONFIG_ENABLE_OPT,CONFIG_HTTPD) +endef +define BUSYBOX_INSTALL_HTTPD_SCRIPT + if grep -q CONFIG_HTTPD=y $(@D)/.config; then \ + mkdir -p $(TARGET_DIR)/var/www/data ;\ + $(INSTALL) -m 0755 -D package/busybox/S90httpd \ + $(TARGET_DIR)/etc/init.d/S90httpd ; \ + fi +endef +endif + # enable relevant options to allow the Busybox less applet to be used # as a systemd pager ifeq ($(BR2_PACKAGE_SYSTEMD):$(BR2_PACKAGE_LESS),y:) @@ -400,6 +413,13 @@ define BUSYBOX_INSTALL_ADD_TO_SHELLS endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11),) +# IFLA_CAN_TERMINATION was introduced in Linux 4.11 +define BUSYBOX_DISABLE_IP_LINK_CAN + $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IP_LINK_CAN) +endef +endif + define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_MUSL_DISABLE_SHA_HWACCEL) $(BUSYBOX_SET_MMU) @@ -411,7 +431,10 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) $(BUSYBOX_SET_LESS_FLAGS) + $(BUSYBOX_SET_HTTPD) $(BUSYBOX_SET_INDIVIDUAL_BINARIES) + $(BUSYBOX_DISABLE_IP_LINK_CAN) + $(PACKAGES_BUSYBOX_CONFIG_FIXUPS) endef define BUSYBOX_BUILD_CMDS @@ -438,6 +461,7 @@ define BUSYBOX_INSTALL_INIT_OPENRC $(BUSYBOX_INSTALL_IFPLUGD_SCRIPT) $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) + $(BUSYBOX_INSTALL_HTTPD_SCRIPT) endef define BUSYBOX_INSTALL_INIT_SYSTEMD @@ -452,6 +476,7 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_IFPLUGD_SCRIPT) $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) + $(BUSYBOX_INSTALL_HTTPD_SCRIPT) endef # Checks to give errors that the user can understand diff --git a/package/bvi/Config.in b/package/bvi/Config.in new file mode 100644 index 0000000000..654fbf9cd7 --- /dev/null +++ b/package/bvi/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_BVI + bool "bvi" + select BR2_PACKAGE_NCURSES + help + A visual editor for binary files. Bvi allows the user to + edit binary files with a VI-like interface. + + https://sourceforge.net/projects/bvi diff --git a/package/bvi/bvi.hash b/package/bvi/bvi.hash new file mode 100644 index 0000000000..a65daf0612 --- /dev/null +++ b/package/bvi/bvi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 6540716a1a3b2b9711635108da14b26baea488881d4a682121c0bddbba6b74cb bvi-1.5.0.src.tar.gz +sha256 3e59ea99615003174426e1321df7a804f1d5bfe61bfaba7ebbb2db0e358f93fb COPYING diff --git a/package/bvi/bvi.mk b/package/bvi/bvi.mk new file mode 100644 index 0000000000..8bf6ac5c0e --- /dev/null +++ b/package/bvi/bvi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# bvi +# +################################################################################ + +BVI_VERSION = 1.5.0 +BVI_SITE = https://sourceforge.net/projects/bvi/files/bvi/$(BVI_VERSION) +BVI_SOURCE = bvi-$(BVI_VERSION).src.tar.gz +BVI_LICENSE = GPL-3.0+ +BVI_LICENSE_FILES = COPYING +BVI_DEPENDENCIES = ncurses + +$(eval $(autotools-package)) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index 8dc84ada89..1c28d91e97 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a c-ares-1.34.2.tar.gz +sha256 7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346 c-ares-1.34.5.tar.gz # Hash for license file sha256 460f5e768fda3752ca2169a95df062578a10fb126bfd65f3b9b1a1bed2f84807 LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 6685ade9d6..090147d0e9 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,8 +4,8 @@ # ################################################################################ -C_ARES_VERSION = 1.34.2 -C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/v1.34.2 +C_ARES_VERSION = 1.34.5 +C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/v$(C_ARES_VERSION) C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT diff --git a/package/c-icap-modules/0001-Fix-module-function-prototypes-for-GCC-15.x.patch b/package/c-icap-modules/0001-Fix-module-function-prototypes-for-GCC-15.x.patch new file mode 100644 index 0000000000..c0886d3c0e --- /dev/null +++ b/package/c-icap-modules/0001-Fix-module-function-prototypes-for-GCC-15.x.patch @@ -0,0 +1,59 @@ +From 5cc2e2764588fc5025e1ba7e07361d50659bb06a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 7 Sep 2025 17:58:00 +0200 +Subject: [PATCH] Fix module function prototypes for GCC 15.x + +Upstream: N/A, upstream has completely changed how modules work +Signed-off-by: Thomas Petazzoni +--- + services/virus_scan/clamav_mod.c | 4 ++-- + services/virus_scan/clamd_mod.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/services/virus_scan/clamav_mod.c b/services/virus_scan/clamav_mod.c +index a138006..ee26ce6 100644 +--- a/services/virus_scan/clamav_mod.c ++++ b/services/virus_scan/clamav_mod.c +@@ -75,7 +75,7 @@ static struct ci_conf_entry clamav_conf_variables[] = { + + int clamav_init(struct ci_server_conf *server_conf); + int clamav_post_init(struct ci_server_conf *server_conf); +-void clamav_release(); ++void clamav_release(struct ci_server_conf *server_conf); + + CI_DECLARE_MOD_DATA common_module_t module = { + "clamav_mod", +@@ -273,7 +273,7 @@ int clamav_post_init(struct ci_server_conf *server_conf) + return CI_OK; + } + +-void clamav_release() ++void clamav_release(struct ci_server_conf *server_conf) + { + clamav_destroy_virusdb(); + if (CLAMAV_TMP) +diff --git a/services/virus_scan/clamd_mod.c b/services/virus_scan/clamd_mod.c +index c0d2909..c522a9c 100644 +--- a/services/virus_scan/clamd_mod.c ++++ b/services/virus_scan/clamd_mod.c +@@ -34,7 +34,7 @@ static struct ci_conf_entry clamd_conf_variables[] = { + + int clamd_init(struct ci_server_conf *server_conf); + int clamd_post_init(struct ci_server_conf *server_conf); +-void clamd_release(); ++void clamd_release(struct ci_server_conf *server_conf); + + CI_DECLARE_MOD_DATA common_module_t module = { + "clamd_mod", +@@ -301,7 +301,7 @@ int clamd_post_init(struct ci_server_conf *server_conf) + return CI_OK; + } + +-void clamd_release() ++void clamd_release(struct ci_server_conf *server_conf) + { + } + +-- +2.51.0 + diff --git a/package/c-icap/0002-Fix-compile-warning-about-missing-stdio.h-include-fi.patch b/package/c-icap/0002-Fix-compile-warning-about-missing-stdio.h-include-fi.patch new file mode 100644 index 0000000000..986ed43355 --- /dev/null +++ b/package/c-icap/0002-Fix-compile-warning-about-missing-stdio.h-include-fi.patch @@ -0,0 +1,25 @@ +From ae8a1bc4979c797bb1f152fc92cfe6bc05a44594 Mon Sep 17 00:00:00 2001 +From: Christos Tsantilas +Date: Tue, 20 Nov 2018 17:10:16 +0200 +Subject: [PATCH] Fix compile warning about missing stdio.h include file + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/c-icap/c-icap-server/commit/ae8a1bc4979c797bb1f152fc92cfe6bc05a44594 +--- + tests/test_base64.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test_base64.c b/tests/test_base64.c +index 8a4a76c..7692197 100644 +--- a/tests/test_base64.c ++++ b/tests/test_base64.c +@@ -1,5 +1,6 @@ + #include "common.h" + #include "simple_api.h" ++#include + + + int main(int argc, char *argv[]) +-- +2.47.1 + diff --git a/package/c-icap/0003-Fix-http_auth_method-release_authentication_header-m.patch b/package/c-icap/0003-Fix-http_auth_method-release_authentication_header-m.patch new file mode 100644 index 0000000000..940a67b70d --- /dev/null +++ b/package/c-icap/0003-Fix-http_auth_method-release_authentication_header-m.patch @@ -0,0 +1,47 @@ +From 9ca4e5e2bd5fdf1d15a862faf8d4d1ddc0664bd0 Mon Sep 17 00:00:00 2001 +From: Christos Tsantilas +Date: Fri, 21 Feb 2025 13:34:06 +0200 +Subject: [PATCH] Fix http_auth_method::release_authentication_header method + declaration + +Requires a "char *" argument. + +Reported with PR#72 at github: + https://github.com/c-icap/c-icap-server/pull/72 + +Upstream: 48a221b0197727b26f90c00544fa19c67d0f5d47 +Signed-off-by: Thomas Petazzoni +--- + http_auth.c | 2 +- + include/module.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/http_auth.c b/http_auth.c +index 1883b55..b831bb1 100644 +--- a/http_auth.c ++++ b/http_auth.c +@@ -62,7 +62,7 @@ int http_authenticate(ci_request_t * req, char *use_method) + authenticator_module_t **authenticators; + void *method_data; + const char *auth_str, *method_str, *username; +- char *auth_header = NULL; ++ const char *auth_header = NULL; + int len, res; + + if (ALLOW_REMOTE_PROXY_USERS && !use_method) { +diff --git a/include/module.h b/include/module.h +index 286ef72..0e57586 100644 +--- a/include/module.h ++++ b/include/module.h +@@ -96,7 +96,7 @@ typedef struct http_auth_method { + void *(*create_auth_data)(const char *authorization_header,const char **username); + void (*release_auth_data)(void *data); + char *(*authentication_header)(); +- void (*release_authentication_header)(); ++ void (*release_authentication_header)(char *); + struct ci_conf_entry *conf_table; + } http_auth_method_t; + +-- +2.51.0 + diff --git a/package/c-icap/0004-Fix-to-compile-with-GCC15-signal-handlers-require-an.patch b/package/c-icap/0004-Fix-to-compile-with-GCC15-signal-handlers-require-an.patch new file mode 100644 index 0000000000..97359ab4d6 --- /dev/null +++ b/package/c-icap/0004-Fix-to-compile-with-GCC15-signal-handlers-require-an.patch @@ -0,0 +1,31 @@ +From 8d21c9c18e3b03e28ef2831f3ecd287c4cc44694 Mon Sep 17 00:00:00 2001 +From: Christos Tsantilas +Date: Fri, 21 Feb 2025 13:41:37 +0200 +Subject: [PATCH] Fix to compile with GCC15: signal handlers require an int + argument + +Reported with PR#72 at github: + https://github.com/c-icap/c-icap-server/pull/72 + +Upstream: 0b3408ad0e9f5ccadcd4d77dffa651f9211e4cd2 +Signed-off-by: Thomas Petazzoni +--- + mpmt_server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mpmt_server.c b/mpmt_server.c +index aab9db5..01bab65 100644 +--- a/mpmt_server.c ++++ b/mpmt_server.c +@@ -140,7 +140,7 @@ static void sigchld_handler_main(int sig) + /*Do nothing the signal will be ignored..... */ + } + +-static void sighup_handler_main() ++static void sighup_handler_main(int sig) + { + c_icap_reconfigure = 1; + } +-- +2.51.0 + diff --git a/package/c-icap/0005-Fix-module-operation-prototypes-to-fix-GCC-15.x-buil.patch b/package/c-icap/0005-Fix-module-operation-prototypes-to-fix-GCC-15.x-buil.patch new file mode 100644 index 0000000000..d161a49ba6 --- /dev/null +++ b/package/c-icap/0005-Fix-module-operation-prototypes-to-fix-GCC-15.x-buil.patch @@ -0,0 +1,233 @@ +From 608392c023b00e9e512f012eab295995127c577a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 7 Sep 2025 17:45:00 +0200 +Subject: [PATCH] Fix module operation prototypes to fix GCC 15.x build + +Upstream: N/A, code has completely changed upstream +Signed-off-by: Thomas Petazzoni +--- + default_acl.c | 4 ++-- + http_auth.c | 8 ++++---- + include/module.h | 8 ++++---- + modules/bdb_tables.c | 4 ++-- + modules/dnsbl_tables.c | 4 ++-- + modules/ldap_module.c | 4 ++-- + modules/memcached.c | 4 ++-- + modules/shared_cache.c | 4 ++-- + 8 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/default_acl.c b/default_acl.c +index 135176a..cb84d9d 100644 +--- a/default_acl.c ++++ b/default_acl.c +@@ -34,7 +34,7 @@ + /* Default Authenticator definitions */ + int default_acl_init(struct ci_server_conf *server_conf); + int default_acl_post_init(struct ci_server_conf *server_conf); +-void default_acl_release(); ++void default_acl_release(struct ci_server_conf *server_conf); + int default_acl_client_match(ci_request_t *req); + int default_acl_request_match(ci_request_t *req); + +@@ -75,7 +75,7 @@ int default_acl_post_init(struct ci_server_conf *server_conf) + return 1; + } + +-void default_acl_release() ++void default_acl_release(struct ci_server_conf *server_conf) + { + ci_access_entry_release(acl_access_list); + ci_access_entry_release(acl_connection_access_list); +diff --git a/http_auth.c b/http_auth.c +index b831bb1..0000b12 100644 +--- a/http_auth.c ++++ b/http_auth.c +@@ -378,7 +378,7 @@ static struct ci_conf_entry basic_conf_params[] = { + }; + + int basic_post_init(struct ci_server_conf *server_conf); +-void basic_close(); ++void basic_close(struct ci_server_conf *); + struct http_basic_auth_data *basic_create_auth_data(const char *auth_line, + const char **username); + void basic_release_auth_data(struct http_basic_auth_data *data); +@@ -409,7 +409,7 @@ int basic_post_init(struct ci_server_conf *server_conf) + return 1; + } + +-void basic_close() ++void basic_close(struct ci_server_conf *) + { + if (basic_authentication) { + free(basic_authentication); +@@ -468,7 +468,7 @@ static struct ci_conf_entry basic_simple_db_conf_variables[] = { + }; + + int basic_simple_db_post_init(struct ci_server_conf *server_conf); +-void basic_simple_db_close(); ++void basic_simple_db_close(struct ci_server_conf *server_conf); + int basic_simple_db_athenticate(struct http_basic_auth_data *data, const char *usedb); + + +@@ -495,7 +495,7 @@ int basic_simple_db_post_init(struct ci_server_conf *server_conf) + return 1; + } + +-void basic_simple_db_close() ++void basic_simple_db_close(struct ci_server_conf *server_conf) + { + if (users_db) { + ci_lookup_table_destroy(users_db); +diff --git a/include/module.h b/include/module.h +index 0e57586..21124df 100644 +--- a/include/module.h ++++ b/include/module.h +@@ -63,7 +63,7 @@ typedef struct common_module { + const char *name; + int (*init_module)(struct ci_server_conf *server_conf); + int (*post_init_module)(struct ci_server_conf *server_conf); +- void (*close_module)(); ++ void (*close_module)(struct ci_server_conf *); + struct ci_conf_entry *conf_table; + } common_module_t; + +@@ -81,7 +81,7 @@ typedef struct access_control_module { + const char *name; + int (*init_access_controller)(struct ci_server_conf *server_conf); + int (*post_init_access_controller)(struct ci_server_conf *server_conf); +- void (*release_access_controller)(); ++ void (*release_access_controller)(struct ci_server_conf *); + int (*client_access)(ci_request_t *req); + int (*request_access)(ci_request_t *req); + struct ci_conf_entry *conf_table; +@@ -92,7 +92,7 @@ typedef struct http_auth_method { + const char *name; + int (*init_auth_method)(struct ci_server_conf *server_conf); + int (*post_init_auth_method)(struct ci_server_conf *server_conf); +- void (*close_auth_method)(); ++ void (*close_auth_method)(struct ci_server_conf *); + void *(*create_auth_data)(const char *authorization_header,const char **username); + void (*release_auth_data)(void *data); + char *(*authentication_header)(); +@@ -106,7 +106,7 @@ typedef struct authenticator_module { + const char *method; + int (*init_authenticator)(struct ci_server_conf *server_conf); + int (*post_init_authenticator)(struct ci_server_conf *server_conf); +- void (*close_authenticator)(); ++ void (*close_authenticator)(struct ci_server_conf *); + int (*authenticate)(void *data, const char *usedb); + struct ci_conf_entry *conf_table; + } authenticator_module_t; +diff --git a/modules/bdb_tables.c b/modules/bdb_tables.c +index 1e908a9..c205278 100644 +--- a/modules/bdb_tables.c ++++ b/modules/bdb_tables.c +@@ -9,7 +9,7 @@ + + + int init_bdb_tables(struct ci_server_conf *server_conf); +-void release_bdb_tables(); ++void release_bdb_tables(struct ci_server_conf *server_conf); + + CI_DECLARE_MOD_DATA common_module_t module = { + "bdb_tables", +@@ -41,7 +41,7 @@ int init_bdb_tables(struct ci_server_conf *server_conf) + return (ci_lookup_table_type_register(&bdb_table_type) != NULL); + } + +-void release_bdb_tables() ++void release_bdb_tables(struct ci_server_conf *server_conf) + { + ci_lookup_table_type_unregister(&bdb_table_type); + } +diff --git a/modules/dnsbl_tables.c b/modules/dnsbl_tables.c +index 328c6fb..a90c715 100644 +--- a/modules/dnsbl_tables.c ++++ b/modules/dnsbl_tables.c +@@ -10,7 +10,7 @@ + + + int init_dnsbl_tables(struct ci_server_conf *server_conf); +-void release_dnsbl_tables(); ++void release_dnsbl_tables(struct ci_server_conf *server_conf); + + CI_DECLARE_MOD_DATA common_module_t module = { + "dnsbl_tables", +@@ -42,7 +42,7 @@ int init_dnsbl_tables(struct ci_server_conf *server_conf) + return (ci_lookup_table_type_register(&dnsbl_table_type) != NULL); + } + +-void release_dnsbl_tables() ++void release_dnsbl_tables(struct ci_server_conf *server_conf) + { + ci_lookup_table_type_unregister(&dnsbl_table_type); + } +diff --git a/modules/ldap_module.c b/modules/ldap_module.c +index 97e36d8..96668a9 100644 +--- a/modules/ldap_module.c ++++ b/modules/ldap_module.c +@@ -19,7 +19,7 @@ static int init_ldap_pools(); + static void release_ldap_pools(); + + int init_ldap_module(struct ci_server_conf *server_conf); +-void release_ldap_module(); ++void release_ldap_module(struct ci_server_conf *server_conf); + + CI_DECLARE_MOD_DATA common_module_t module = { + "ldap_module", +@@ -76,7 +76,7 @@ int init_ldap_module(struct ci_server_conf *server_conf) + return 1; + } + +-void release_ldap_module() ++void release_ldap_module(struct ci_server_conf *server_conf) + { + release_ldap_pools(); + ci_lookup_table_type_unregister(&ldap_table_type); +diff --git a/modules/memcached.c b/modules/memcached.c +index 8f15fbd..b1bbe5a 100644 +--- a/modules/memcached.c ++++ b/modules/memcached.c +@@ -61,7 +61,7 @@ static struct ci_conf_entry mc_conf_variables[] = { + + static int mc_module_init(struct ci_server_conf *server_conf); + static int mc_module_post_init(struct ci_server_conf *server_conf); +-static void mc_module_release(); ++static void mc_module_release(struct ci_server_conf *server_conf); + CI_DECLARE_MOD_DATA common_module_t module = { + "memcached", + mc_module_init, +@@ -209,7 +209,7 @@ int mc_module_post_init(struct ci_server_conf *server_conf) + return 1; + } + +-void mc_module_release() ++void mc_module_release(struct ci_server_conf *server_conf) + { + memcached_pool_destroy(MC_POOL); + memcached_free(MC); +diff --git a/modules/shared_cache.c b/modules/shared_cache.c +index a79d51a..49a3784 100644 +--- a/modules/shared_cache.c ++++ b/modules/shared_cache.c +@@ -9,7 +9,7 @@ + #include + + static int init_shared_cache(struct ci_server_conf *server_conf); +-static void release_shared_cache(); ++static void release_shared_cache(struct ci_server_conf *server_conf); + + CI_DECLARE_MOD_DATA common_module_t module = { + "shared_cache", +@@ -26,7 +26,7 @@ static int init_shared_cache(struct ci_server_conf *server_conf) + return 1; + } + +-static void release_shared_cache() ++static void release_shared_cache(struct ci_server_conf *server_conf) + { + } + +-- +2.51.0 + diff --git a/package/c-icap/Config.in b/package/c-icap/Config.in index 8f7963c26a..3c1325ee39 100644 --- a/package/c-icap/Config.in +++ b/package/c-icap/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_C_ICAP depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + # the libmemcached code uses + select BR2_PACKAGE_LIBXCRYPT if \ + BR2_PACKAGE_LIBMEMCACHED && BR2_TOOLCHAIN_USES_GLIBC help c-icap is an implementation of an ICAP server. It can be used with HTTP proxies that support the ICAP protocol to diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index 36ef1c8b12..4ece4c4b26 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -43,7 +43,7 @@ endif ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y) C_ICAP_CONF_OPTS += --with-memcached -C_ICAP_DEPENDENCIES += libmemcached +C_ICAP_DEPENDENCIES += libmemcached $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) else C_ICAP_CONF_OPTS += --without-memcached endif diff --git a/package/c-periphery/c-periphery.hash b/package/c-periphery/c-periphery.hash index f8f0654b4f..1914ad2255 100644 --- a/package/c-periphery/c-periphery.hash +++ b/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 24327bc2a22588444b2576fa1c9560619f6faad986c236c54f4b3f36b20dad56 c-periphery-2.4.2.tar.gz -sha256 2c29e38ac4d393558522c5fa671bd03f9d6f7d751c899a3482b20ab2a0ba5122 LICENSE +sha256 367b263a14f80eac19c738de56b4a730a4b5e40e05586479a9515612eaabaff3 c-periphery-2.4.3.tar.gz +sha256 fd3377c82df42bd00d8ac9c25d22dc63f80b7a491b84f2ba82d2a7621432c511 LICENSE diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index e3745c4af6..38f1fa9fc6 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_PERIPHERY_VERSION = 2.4.2 +C_PERIPHERY_VERSION = 2.4.3 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES C_PERIPHERY_LICENSE = MIT diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index 8a5b48dd79..2112badfcc 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,4 +1,4 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha256 83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3 ca-certificates_20230311.tar.xz +sha256 33b44ef78653ecd3f0f2f13e5bba6be466be2e7da72182f737912b81798ba5d2 ca-certificates_20250419.tar.xz # Locally computed sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index fe115209a7..b1903f6166 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20230311 +CA_CERTIFICATES_VERSION = 20250419 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20230317T205011Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20250419T084132Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright diff --git a/package/cage/cage.hash b/package/cage/cage.hash index d5517bd918..018404a2c5 100644 --- a/package/cage/cage.hash +++ b/package/cage/cage.hash @@ -1,5 +1,5 @@ -# Generated locally after checking GPG signature from https://github.com/cage-kiosk/cage/releases/download/v0.1.5/cage-0.1.5.tar.gz.sig -sha256 ece0312e559289df0238289ea6c60e9fed32d27fe3ae8a8f83eeff26ddc239e1 cage-0.1.5.tar.gz +# Locally computed +sha256 9603ba1a130696dd39793ffab68397db504b378a733c09c0b86a5ebe3d6fe58d cage-v0.2.1-git4.tar.gz # Hashes for license files: sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 119950bc00..9b5778449b 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -4,17 +4,12 @@ # ################################################################################ -CAGE_VERSION = 0.1.5 -CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION) +CAGE_VERSION = v0.2.1 +CAGE_SITE = https://github.com/cage-kiosk/cage.git +CAGE_SITE_METHOD = git CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots CAGE_CONF_OPTS = -Dman-pages=disabled -ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) -CAGE_CONF_OPTS += -Dxwayland=true -else -CAGE_CONF_OPTS += -Dxwayland=false -endif - $(eval $(meson-package)) diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index b2d384d01a..3c66c63f6d 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,5 +1,5 @@ -# From https://www.cairographics.org/releases/cairo-1.18.2.tar.xz.sha256sum -sha256 a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a cairo-1.18.2.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.4.tar.xz.sha256sum +sha256 445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb cairo-1.18.4.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index c741c97853..26c2555f9d 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAIRO_VERSION = 1.18.2 +CAIRO_VERSION = 1.18.4 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 @@ -37,8 +37,7 @@ CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dspectre=disabled \ -Dsymbol-lookup=disabled \ - -Dgtk_doc=false \ - -Dc_std=gnu11 + -Dgtk_doc=false CAIRO_DEPENDENCIES = \ host-pkgconf \ fontconfig \ @@ -59,8 +58,7 @@ HOST_CAIRO_CONF_OPTS = \ -Dglib=enabled \ -Dspectre=disabled \ -Dsymbol-lookup=disabled \ - -Dgtk_doc=false \ - -Dc_std=gnu11 + -Dgtk_doc=false HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ @@ -71,7 +69,10 @@ HOST_CAIRO_DEPENDENCIES = \ host-zlib ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_CONF_OPTS += -Dlzo=enabled CAIRO_DEPENDENCIES += lzo +else +CAIRO_CONF_OPTS += -Dlzo=disabled endif ifeq ($(BR2_PACKAGE_FREETYPE),y) diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash index 6d58de360a..69511993ce 100644 --- a/package/cairomm1_14/cairomm1_14.hash +++ b/package/cairomm1_14/cairomm1_14.hash @@ -1,6 +1,6 @@ -# From https://www.cairographics.org/releases/cairomm-1.14.4.tar.xz.sha1 -sha1 a58419bb9792a2c998631704ce5671c38e0c82a1 cairomm-1.14.4.tar.xz +# From https://www.cairographics.org/releases/cairomm-1.14.5.tar.xz.sha1 +sha1 c33938b021046619d86cd2631f4c79dfd0f5bdac cairomm-1.14.5.tar.xz # Locally computed -sha256 4749d25a2b2ef67cc0c014caaf5c87fa46792fc4b3ede186fb0fc932d2055158 cairomm-1.14.4.tar.xz +sha256 70136203540c884e89ce1c9edfb6369b9953937f6cd596d97c78c9758a5d48db cairomm-1.14.5.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk index 6502d34c5a..b19ba08cfd 100644 --- a/package/cairomm1_14/cairomm1_14.mk +++ b/package/cairomm1_14/cairomm1_14.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAIROMM1_14_VERSION = 1.14.4 +CAIROMM1_14_VERSION = 1.14.5 CAIROMM1_14_LICENSE = LGPL-2.0+ CAIROMM1_14_LICENSE_FILES = COPYING CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.xz diff --git a/package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch b/package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch new file mode 100644 index 0000000000..ca7f658553 --- /dev/null +++ b/package/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch @@ -0,0 +1,28 @@ +From 2b8c7c5f4b71726806de0d718c4c56eeba2c7332 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Feb 2025 22:14:47 -0800 +Subject: [PATCH] Include time.h for timespec struct definition + +Fixes +git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec' + 33 | struct timespec next_send_time; + | ^ +Signed-off-by: Khem Raj +Signed-off-by: Marcus Hoffmann +Upstream: https://github.com/linux-can/can-utils/commit/2b8c7c5f4b71726806de0d718c4c56eeba2c7332 +--- + libj1939.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libj1939.h b/libj1939.h +index 44393a2a..7c19f43e 100644 +--- a/libj1939.h ++++ b/libj1939.h +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + + #ifndef J1939_LIB_H diff --git a/package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch b/package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch new file mode 100644 index 0000000000..390ffa50e6 --- /dev/null +++ b/package/can-utils/0002-CMakeLists.txt-add-an-option-to-control-shared-libra.patch @@ -0,0 +1,37 @@ +From 59716ea66203b4d5f70dd0e41fe6f9661f8ad686 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Wed, 12 Mar 2025 10:27:48 +0100 +Subject: [PATCH] CMakeLists.txt: add an option to control shared library + creation + +Signed-off-by: Yegor Yefremov +Signed-off-by: Marcus Hoffmann +Upstream: Backported from https://github.com/linux-can/can-utils/commit/a904183b4e65a6d982db3d12ad9d0a9a883edc1d +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01f90f9..318a236 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,7 @@ endif() + + # Add an option to enable treating warnings as errors + option(ENABLE_WERROR "Treat all compiler warnings as errors" OFF) ++option(BUILD_SHARED_LIBS "Build shared libraries" ON) + + if(ENABLE_WERROR) + add_compile_options(-Werror) +@@ -114,7 +115,7 @@ if(NOT ANDROID) + PRIVATE can + ) + +- add_library(isobusfs SHARED ++ add_library(isobusfs + isobusfs/isobusfs_cmn.c + isobusfs/isobusfs_cmn_dh.c + ) +-- +2.43.0 + diff --git a/package/can-utils/can-utils.hash b/package/can-utils/can-utils.hash index e539e05b45..1112e47448 100644 --- a/package/can-utils/can-utils.hash +++ b/package/can-utils/can-utils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2790dfb57fe3ec22b6fd512838c6480c39f7c9ae193e59f1ae01221216505a7e can-utils-2023.03.tar.gz +sha256 88b30feace372c4a61e6adb2534791c0cfba6123ebcca7f59bbb76580d4a6915 can-utils-2025.01.tar.gz sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk index 462e123c6d..fc5170ed9d 100644 --- a/package/can-utils/can-utils.mk +++ b/package/can-utils/can-utils.mk @@ -4,10 +4,9 @@ # ################################################################################ -CAN_UTILS_VERSION = 2023.03 +CAN_UTILS_VERSION = 2025.01 CAN_UTILS_SITE = $(call github,linux-can,can-utils,v$(CAN_UTILS_VERSION)) CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0 CAN_UTILS_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt -CAN_UTILS_AUTORECONF = YES -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/cannelloni/Config.in b/package/cannelloni/Config.in index e137e60c60..a2a15c0274 100644 --- a/package/cannelloni/Config.in +++ b/package/cannelloni/Config.in @@ -1,17 +1,17 @@ config BR2_PACKAGE_CANNELLONI bool "cannelloni" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++20 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # lksctp-tools depends on BR2_TOOLCHAIN_HAS_THREADS # lksctp-tools depends on !BR2_STATIC_LIBS # lksctp-tools help - A SocketCAN over Ethernet tunnel. The tunnel supports both + A SocketCAN over Ethernet tunnel. The tunnel supports TCP, UDP and SCTP protocols. https://github.com/mguentner/cannelloni -comment "cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU diff --git a/package/cannelloni/cannelloni.hash b/package/cannelloni/cannelloni.hash index 107415b0ac..625e43d157 100644 --- a/package/cannelloni/cannelloni.hash +++ b/package/cannelloni/cannelloni.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de44b7e327fbf38883f46e51a5afd07de5144f2e44c5f42b7f2f0741165f0b13 cannelloni-1.0.0.tar.gz +sha256 3dde63727549d4a39154e78b95f4a5dad96af236ca6cef531f347c0b923c74d5 cannelloni-2.0.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/package/cannelloni/cannelloni.mk b/package/cannelloni/cannelloni.mk index f97a091760..7978cfccf5 100644 --- a/package/cannelloni/cannelloni.mk +++ b/package/cannelloni/cannelloni.mk @@ -4,7 +4,7 @@ # ################################################################################ -CANNELLONI_VERSION = 1.0.0 +CANNELLONI_VERSION = 2.0.0 CANNELLONI_SITE = $(call github,mguentner,cannelloni,v$(CANNELLONI_VERSION)) CANNELLONI_LICENSE = GPL-2.0 CANNELLONI_LICENSE_FILES = gpl-2.0.txt diff --git a/package/casync-nano/Config.in b/package/casync-nano/Config.in new file mode 100644 index 0000000000..e0e555eda3 --- /dev/null +++ b/package/casync-nano/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_CASYNC_NANO + bool "casync-nano" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_ZSTD + select BR2_PACKAGE_LIBCURL + help + Tiny casync-like tool optimized for embedded systems. + + https://github.com/florolf/casync-nano + +if BR2_PACKAGE_CASYNC_NANO + +config BR2_PACKAGE_CASYNC_NANO_CASYNC_SHIM + bool "install casync shim" + # only one package should provide the "casync" command + depends on !BR2_PACKAGE_CASYNC + help + Install a shim that provides basic compatibility with the + "extract" sub-command of casync to programs that expect it. + +endif diff --git a/package/casync-nano/Config.in.host b/package/casync-nano/Config.in.host new file mode 100644 index 0000000000..2fc3340017 --- /dev/null +++ b/package/casync-nano/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_CASYNC_NANO + bool "host casync-nano tool" + help + casync-nano host tool (csn-tool) for casync-nano specific + features like chunk encryption. + + https://github.com/florolf/casync-nano diff --git a/package/casync-nano/casync-nano.hash b/package/casync-nano/casync-nano.hash new file mode 100644 index 0000000000..e2aee71c20 --- /dev/null +++ b/package/casync-nano/casync-nano.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 1a8ce3247985e05fbb08097966ff11fc2abd0a1f18fb7178e7397c2455b9500f casync-nano-1.1.2.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/casync-nano/casync-nano.mk b/package/casync-nano/casync-nano.mk new file mode 100644 index 0000000000..fc3a80e4f4 --- /dev/null +++ b/package/casync-nano/casync-nano.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# casync-nano +# +################################################################################ + +CASYNC_NANO_VERSION = 1.1.2 +CASYNC_NANO_SITE = $(call github,florolf,casync-nano,v$(CASYNC_NANO_VERSION)) +CASYNC_NANO_LICENSE = LGPL-2.1 +CASYNC_NANO_LICENSE_FILES = COPYING +CASYNC_NANO_DEPENDENCIES = host-pkgconf openssl zstd libcurl + +ifeq ($(BR2_PACKAGE_CASYNC_NANO_CASYNC_SHIM),y) +define CASYNC_NANO_INSTALL_CASYNC_SHIM + ln -sf csn $(TARGET_DIR)/usr/bin/casync +endef +endif + +define CASYNC_NANO_INSTALL_TARGET_CMDS + $(INSTALL) -D -m0755 $(@D)/csn $(TARGET_DIR)/usr/bin/csn + $(CASYNC_NANO_INSTALL_CASYNC_SHIM) +endef + +# We're only building csn-tool for the host, so only openssl is +# needed, not the other dependencies +HOST_CASYNC_NANO_DEPENDENCIES = host-pkgconf host-openssl +HOST_CASYNC_NANO_CONF_OPTS = -DBUILD_CSN=Off -DBUILD_CSN_TOOL=On + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/catatonit/catatonit.hash b/package/catatonit/catatonit.hash index 9940309c76..7b13100a33 100644 --- a/package/catatonit/catatonit.hash +++ b/package/catatonit/catatonit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0cf1feffdc89c9fb52af20fc10127887a408bbd99e0424558d182b310a3dc92 catatonit-0.2.0.tar.gz +sha256 771385049516fdd561fbb9164eddf376075c4c7de3900a8b18654660172748f1 catatonit-0.2.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/catatonit/catatonit.mk b/package/catatonit/catatonit.mk index a308ea6471..aa7e60f697 100644 --- a/package/catatonit/catatonit.mk +++ b/package/catatonit/catatonit.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATATONIT_VERSION = 0.2.0 +CATATONIT_VERSION = 0.2.1 CATATONIT_SITE = $(call github,openSUSE,catatonit,v$(CATATONIT_VERSION)) CATATONIT_LICENSE = GPL-2.0+ CATATONIT_LICENSE_FILES = COPYING diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 84f1aaea2e..291f9deeb0 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c991b247a1a0d7bb9c39aa35faf0fe9e19764213f28ffba3109388e62ee0269c catch2-3.7.1.tar.gz +sha256 82fa1cb59dc28bab220935923f7469b997b259eb192fb9355db62da03c2a3137 catch2-3.11.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index 3443b723a4..6118fd86bd 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.7.1 +CATCH2_VERSION = 3.11.0 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 6624fdef65..88377109db 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a ccache-4.10.2.tar.xz +sha256 42e6c4b260cffd92dfa755e26390f45f5842e8c1a5f64f2b2e68adfbe82d1542 ccache-4.12.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 de4684f5251a0a2c58f3a7ab94d6a8d3443822cbd01abcdadd9250d3d1e0bfe1 LICENSE.adoc +sha256 fc33d985529cdb5ea484ee46d6df4de6a6bca25ebdd3f3211c9d15f1c59dc75a LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index f3f675586d..75ef404d27 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.10.2 +CCACHE_VERSION = 4.12.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others @@ -43,12 +43,12 @@ HOST_CCACHE_CONF_OPTS += \ HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache/Config.cpp - sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp - sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp - sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp - sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp - sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache/config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/ccache/config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/ccache/config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION diff --git a/package/cctz/cctz.hash b/package/cctz/cctz.hash index ac78cd611b..6936921ac4 100644 --- a/package/cctz/cctz.hash +++ b/package/cctz/cctz.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e1a00957d472044808a24a26f1ba020f36dc26949a69c214562d96b74093adb3 cctz-2.4.tar.gz +sha256 47d2d68e7cb5af3296dc7e69b0f4a765589f1b2f4af4b9c42e772414c428b421 cctz-2.5.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE.txt diff --git a/package/cctz/cctz.mk b/package/cctz/cctz.mk index 7f5d960a42..14b8dcea88 100644 --- a/package/cctz/cctz.mk +++ b/package/cctz/cctz.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCTZ_VERSION = 2.4 +CCTZ_VERSION = 2.5 CCTZ_SITE = $(call github,google,cctz,v$(CCTZ_VERSION)) CCTZ_LICENSE = Apache-2.0 CCTZ_LICENSE_FILES = LICENSE.txt diff --git a/package/cdrkit/0005-CMakeLists.txt-add-cmake_minimum_required.patch b/package/cdrkit/0005-CMakeLists.txt-add-cmake_minimum_required.patch new file mode 100644 index 0000000000..bbb652ae32 --- /dev/null +++ b/package/cdrkit/0005-CMakeLists.txt-add-cmake_minimum_required.patch @@ -0,0 +1,25 @@ +From 055130476b2ae349ab00b5cc5958d02da2fc2983 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 16 May 2025 16:12:03 +0200 +Subject: [PATCH] CMakeLists.txt: add cmake_minimum_required() + +Using cmake_minimum_required() is now mandatory with CMake 4.0. + +Upstream: N/A, no clear upstream +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57edba6..70c6993 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,4 @@ ++cmake_minimum_required(VERSION 3.18) + PROJECT (cdrkit C) + SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) + +-- +2.49.0 + diff --git a/package/cgroupfs-mount/Config.in b/package/cgroupfs-mount/Config.in index 0b2e4ba1e7..29a40c93d1 100644 --- a/package/cgroupfs-mount/Config.in +++ b/package/cgroupfs-mount/Config.in @@ -4,16 +4,6 @@ config BR2_PACKAGE_CGROUPFS_MOUNT help cgroupfs mount and umount scripts. - requires a Linux kernel >= 3.0 with the following options - enabled: - - - CONFIG_BLK_CGROUP - - CONFIG_CGROUPS - - CONFIG_CGROUP_CPUACCT - - CONFIG_CGROUP_DEVICE - - CONFIG_CGROUP_FREEZER - - CONFIG_CGROUP_WRITEBACK - - CONFIG_CGROUP_SCHED - - CONFIG_CGROUP_PIDS + Requires a Linux kernel >= 3.0 https://github.com/tianon/cgroupfs-mount diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk index 5af87629ea..156d584266 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/package/cgroupfs-mount/cgroupfs-mount.mk @@ -10,6 +10,17 @@ CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright CGROUPFS_MOUNT_CPE_ID_VALID = YES +define CGROUPFS_MOUNT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_CGROUP) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_WRITEBACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PIDS) +endef + define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount $(INSTALL) -D -m 0755 $(@D)/cgroupfs-umount $(TARGET_DIR)/usr/bin/cgroupfs-umount diff --git a/package/cgroupfs-v2-mount/Config.in b/package/cgroupfs-v2-mount/Config.in new file mode 100644 index 0000000000..2dd2dbc089 --- /dev/null +++ b/package/cgroupfs-v2-mount/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_CGROUPFS_V2_MOUNT + bool "cgroupfs-v2-mount" + depends on !BR2_INIT_SYSTEMD + depends on !BR2_PACKAGE_CGROUPFS_MOUNT + help + Mount the cgroup v2 hierarchy filesystem. + +comment "cgroupfs-v2-mount is incompatible with cgroupfs-mount" + depends on !BR2_INIT_SYSTEMD + depends on BR2_PACKAGE_CGROUPFS_MOUNT diff --git a/package/cgroupfs-v2-mount/S30cgroupfs2 b/package/cgroupfs-v2-mount/S30cgroupfs2 new file mode 100644 index 0000000000..42839ef921 --- /dev/null +++ b/package/cgroupfs-v2-mount/S30cgroupfs2 @@ -0,0 +1,44 @@ +#!/bin/sh + +DAEMON=cgroupfs2 + +start() { + printf 'Mounting %s: ' "${DAEMON}" + mkdir -p /sys/fs/cgroup + mount -t cgroup2 none /sys/fs/cgroup + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Unmounting %s: ' "${DAEMON}" + umount /sys/fs/cgroup + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk b/package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk new file mode 100644 index 0000000000..10e18d8d41 --- /dev/null +++ b/package/cgroupfs-v2-mount/cgroupfs-v2-mount.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# cgroupfs-v2-mount +# +################################################################################ + +CGROUPFS_V2_MOUNT_VERSION = +CGROUPFS_V2_MOUNT_SITE = + +define CGROUPFS_V2_MOUNT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) +endef + +define CGROUPFS_V2_MOUNT_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D \ + $(CGROUPFS_V2_MOUNT_PKGDIR)/S30cgroupfs2 \ + $(TARGET_DIR)/etc/init.d/S30cgroupfs2 +endef + +$(eval $(generic-package)) diff --git a/package/chartjs/chartjs.hash b/package/chartjs/chartjs.hash index 3f8da92715..0f97d0a4a2 100644 --- a/package/chartjs/chartjs.hash +++ b/package/chartjs/chartjs.hash @@ -1,3 +1,3 @@ # Locally computed: sha256 111e0751796f087a51e94dfed910ccfb1278fd30e584a6e48514dba9ae7e72c6 chart.js-3.9.1.tgz -sha256 5a0877ad6d818529be4f33009d0942cdf7e2ed7656156f4aba7308459a546030 package/LICENSE.md +sha256 5a0877ad6d818529be4f33009d0942cdf7e2ed7656156f4aba7308459a546030 LICENSE.md diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index e768a80cdf..442ac883ee 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 fd3e1925477d49946d1116938661af44c1f86f0d681466fd9f02eaa06002a07f checkpolicy-3.7.tar.gz +sha256 dd85b0173ca6e96b22ebf472bcbccf04eb10e1aa07add8f1b7e0e9e8e995e027 checkpolicy-3.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index adf125ebf8..df3da2efdd 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.7 +CHECKPOLICY_VERSION = 3.9 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = LICENSE diff --git a/package/chocolate-doom/Config.in b/package/chocolate-doom/Config.in index 406b04ecf1..3cefd057ec 100644 --- a/package/chocolate-doom/Config.in +++ b/package/chocolate-doom/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_CHOCOLATE_DOOM depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # sdl2 select BR2_PACKAGE_SDL2 - select BR2_PACKAGE_SDL2_MIXER - select BR2_PACKAGE_SDL2_NET help Chocolate Doom is a set of conservative source ports for Doom, Heretic, Hexen and Strife, with a philosophy of preserving the diff --git a/package/chocolate-doom/chocolate-doom.hash b/package/chocolate-doom/chocolate-doom.hash index 79eb1c6a3f..a86a86b790 100644 --- a/package/chocolate-doom/chocolate-doom.hash +++ b/package/chocolate-doom/chocolate-doom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7 chocolate-doom-3.0.1.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 1edcc41254bdc194beb0d33e267fae306556c4d24110a1d3d3f865717f25da23 chocolate-doom-3.1.1.tar.gz +sha256 aef8b4222b79d0dbf6bf17cfff71c90a6a6bb8917a4162abe417b469ed22da2e COPYING.md diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk index 581b2c51c2..abe0e128b2 100644 --- a/package/chocolate-doom/chocolate-doom.mk +++ b/package/chocolate-doom/chocolate-doom.mk @@ -4,13 +4,15 @@ # ################################################################################ -CHOCOLATE_DOOM_VERSION = 3.0.1 -CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) +CHOCOLATE_DOOM_VERSION = 3.1.1 +CHOCOLATE_DOOM_SITE = $(call github,chocolate-doom,chocolate-doom,chocolate-doom-$(CHOCOLATE_DOOM_VERSION)) CHOCOLATE_DOOM_LICENSE = GPL-2.0+ -CHOCOLATE_DOOM_LICENSE_FILES = COPYING +CHOCOLATE_DOOM_LICENSE_FILES = COPYING.md CHOCOLATE_DOOM_CPE_ID_VENDOR = chocolate-doom CHOCOLATE_DOOM_CPE_ID_PRODUCT = chocolate_doom -CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net +CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 +# Fetch from git +CHOCOLATE_DOOM_AUTORECONF = YES # Avoid installing desktop entries, icons, etc. CHOCOLATE_DOOM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec @@ -23,6 +25,20 @@ endif CHOCOLATE_DOOM_CONF_ENV += CFLAGS="$(CHOCOLATE_DOOM_CFLAGS)" +ifeq ($(BR2_PACKAGE_SDL2_MIXER),y) +CHOCOLATE_DOOM_DEPENDENCIES += sdl2_mixer +CHOCOLATE_DOOM_CONF_OPTS += --enable-sdl2mixer +else +CHOCOLATE_DOOM_CONF_OPTS += --disable-sdl2mixer +endif + +ifeq ($(BR2_PACKAGE_SDL2_NET),y) +CHOCOLATE_DOOM_DEPENDENCIES += sdl2_net +CHOCOLATE_DOOM_CONF_OPTS += --enable-sdl2net +else +CHOCOLATE_DOOM_CONF_OPTS += --disable-sdl2net +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) CHOCOLATE_DOOM_DEPENDENCIES += libpng CHOCOLATE_DOOM_CONF_OPTS += --with-libpng diff --git a/package/chrony/Config.in b/package/chrony/Config.in index c22b756c11..d08b0ba6e9 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBCAP help Chrony is a pair of programs which are used to maintain the accuracy of the system clock. - http://chrony.tuxfamily.org/ + https://chrony-project.org/ if BR2_PACKAGE_CHRONY @@ -18,3 +19,7 @@ config BR2_PACKAGE_CHRONY_DEBUG_LOGGING not be compiled in. endif + +comment "chrony needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index 2cf6cca031..6b07b8d56a 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://download.tuxfamily.org/chrony/chrony-4.4-tar-gz-asc.txt -sha256 eafb07e6daf92b142200f478856dfed6efc9ea2d146eeded5edcb09b93127088 chrony-4.4.tar.gz +# https://chrony-project.org/releases/chrony-4.8-tar-gz-asc.txt +sha256 33ea8eb2a4daeaa506e8fcafd5d6d89027ed6f2f0609645c6f149b560d301706 chrony-4.8.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index bcf69a59db..d1745419a2 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHRONY_VERSION = 4.4 -CHRONY_SITE = http://download.tuxfamily.org/chrony +CHRONY_VERSION = 4.8 +CHRONY_SITE = https://chrony-project.org/releases CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in index d1b1406a3e..6813e3637d 100644 --- a/package/cifs-utils/Config.in +++ b/package/cifs-utils/Config.in @@ -1,7 +1,13 @@ +comment "cifs-utils needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_CIFS_UTILS bool "cifs-utils" - # uses fork() + # uses fork(), libtalloc depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS # libtalloc + select BR2_PACKAGE_LIBTALLOC help The in-kernel CIFS filesystem is generally the preferred method for mounting SMB/CIFS shares on Linux. The in-kernel diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index ec6ea55961..e6a5eefeaa 100644 --- a/package/cifs-utils/cifs-utils.hash +++ b/package/cifs-utils/cifs-utils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 a7b6940e93250c1676a6fa66b6ead91b78cd43a5fee99cc462459c8b9cf1e6f4 cifs-utils-6.15.tar.bz2 +sha256 53353d05c30b4fc9dac006a8f0c5054cdd8a1834c176313c91e4694025c4b891 cifs-utils-7.4.tar.bz2 # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index edf08d4b4d..9e1e822c4c 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.15 +CIFS_UTILS_VERSION = 7.4 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ @@ -12,7 +12,7 @@ CIFS_UTILS_LICENSE_FILES = COPYING CIFS_UTILS_CPE_ID_VENDOR = samba # Missing install-sh in release tarball CIFS_UTILS_AUTORECONF = YES -CIFS_UTILS_DEPENDENCIES = host-pkgconf +CIFS_UTILS_DEPENDENCIES = host-pkgconf libtalloc # Let's disable PIE unconditionally. We want PIE to be enabled only by # the global BR2_RELRO_FULL option. diff --git a/package/civetweb/0002-Fix-heap-overflow-in-directory-URI-slash-redirection.patch b/package/civetweb/0002-Fix-heap-overflow-in-directory-URI-slash-redirection.patch new file mode 100644 index 0000000000..399fafb4bd --- /dev/null +++ b/package/civetweb/0002-Fix-heap-overflow-in-directory-URI-slash-redirection.patch @@ -0,0 +1,56 @@ +From 76e222bcb77ba8452e5da4e82ae6cecd499c25e0 Mon Sep 17 00:00:00 2001 +From: krispybyte +Date: Sat, 21 Jun 2025 23:33:50 +0300 +Subject: [PATCH] Fix heap overflow in directory URI slash redirection + +CVE: CVE-2025-55763 +Upstream: https://github.com/civetweb/civetweb/commit/76e222bcb77ba8452e5da4e82ae6cecd499c25e0 +[thomas: fix offset] +Signed-off-by: Thomas Perale +--- + src/civetweb.c | 23 ++++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) + +diff --git a/src/civetweb.c b/src/civetweb.c +index bbc9aa8be..e969c939f 100644 +--- a/src/civetweb.c ++++ b/src/civetweb.c +@@ -15242,7 +15242,6 @@ handle_request(struct mg_connection *conn) + /* 12. Directory uris should end with a slash */ + if (file.stat.is_directory && ((uri_len = (int)strlen(ri->local_uri)) > 0) + && (ri->local_uri[uri_len - 1] != '/')) { +- + /* Path + server root */ + size_t buflen = UTF8_PATH_MAX * 2 + 2; + char *new_path; +@@ -15254,12 +15254,26 @@ handle_request(struct mg_connection *conn) + mg_send_http_error(conn, 500, "out or memory"); + } else { + mg_get_request_link(conn, new_path, buflen - 1); +- strcat(new_path, "/"); ++ ++ size_t len = strlen(new_path); ++ if (len + 1 < buflen) { ++ new_path[len] = '/'; ++ new_path[len + 1] = '\0'; ++ len += 1; ++ } ++ + if (ri->query_string) { +- /* Append ? and query string */ +- strcat(new_path, "?"); +- strcat(new_path, ri->query_string); ++ if (len + 1 < buflen) { ++ new_path[len] = '?'; ++ new_path[len + 1] = '\0'; ++ len += 1; ++ } ++ ++ /* Append with size of space left for query string + null terminator */ ++ size_t max_append = buflen - len - 1; ++ strncat(new_path, ri->query_string, max_append); + } ++ + mg_send_http_redirect(conn, new_path, 301); + mg_free(new_path); + } diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 629c1b59b2..af221e9133 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -10,6 +10,9 @@ CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md CIVETWEB_CPE_ID_VALID = YES +# 0002-Fix-heap-overflow-in-directory-URI-slash-redirection.patch +CIVETWEB_IGNORE_CVES += CVE-2025-55763 + CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0 diff --git a/package/cjson/0001-make_compatible_with_cmake_4.0.patch b/package/cjson/0001-make_compatible_with_cmake_4.0.patch new file mode 100644 index 0000000000..684773e4da --- /dev/null +++ b/package/cjson/0001-make_compatible_with_cmake_4.0.patch @@ -0,0 +1,36 @@ +From 58bc7c823c2e39f1a626ec4da86952bc6819bd6b Mon Sep 17 00:00:00 2001 +From: Markus Vieth +Date: Sun, 30 Mar 2025 11:12:07 +0200 +Subject: [PATCH] Make compatible with CMake 4.0 When trying to build with + CMake 4.0, the following error is shown: + +CMake Error at CMakeLists.txt:2 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +This change raises the minimum required CMake version to 3.5 and thus makes the project compatible with CMake 4.0 + +Signed-off-by: Benoît Monin +Signed-off-by: Peter Korsgaard +Peter: update for 1.7.19 +Upstream: https://github.com/DaveGamble/cJSON/pull/935 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36a6cb57..9428da58 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + set(CMAKE_LEGACY_CYGWIN_WIN32 0) +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + + project(cJSON + VERSION 1.7.19 diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index e07ae0f7bf..a876ffafe8 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5 cjson-1.7.18.tar.gz +sha256 7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562 cjson-1.7.19.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 35304ec618..cb4525d1a4 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,12 +4,12 @@ # ################################################################################ -CJSON_VERSION = 1.7.18 +CJSON_VERSION = 1.7.19 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -CJSON_CPE_ID_VALID = YES +CJSON_CPE_ID_VENDOR = davegamble # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \ diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 8e8351cf00..807c8fc2ea 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f4d67240a8b2e882e18f864529040084617de066cdab9b7684951ace6ea6f3cf clamav-1.0.7.tar.gz +sha256 64fe4a16a5622c1d71efe9ed7f2c2fbd37f8f237da9f11ff66b73038df71db91 clamav-1.5.1.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index d748a33db7..bda714ea65 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.7 +CLAMAV_VERSION = 1.5.1 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ @@ -45,6 +45,9 @@ CLAMAV_DEPENDENCIES += musl-fts CLAMAV_LIBS += -lfts endif +CLAMAV_MAKE_OPTS = \ + CROSS_COMPILE=$(TARGET_CROSS) + CLAMAV_CONF_OPTS = \ -DCMAKE_EXE_LINKER_FLAGS="$(CLAMAV_LIBS)" \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ @@ -54,6 +57,7 @@ CLAMAV_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DHAVE_SYSTEM_LFS_FTS=ON \ -DRUST_COMPILER_TARGET=$(RUSTC_TARGET_NAME) \ + -DCARGO_HOME=$(HOST_DIR)/share/cargo \ -Dtest_run_result=ON \ -Dtest_run_result__TRYRUN_OUTPUT=ON diff --git a/package/clinfo/clinfo.hash b/package/clinfo/clinfo.hash index e433b6740c..f40aaefcd4 100644 --- a/package/clinfo/clinfo.hash +++ b/package/clinfo/clinfo.hash @@ -1,4 +1,4 @@ # locally calculated -sha256 e52f5c374a10364999d57a1be30219b47fb0b4f090e418f2ca19a0c037c1e694 clinfo-3.0.21.02.21.tar.gz +sha256 48b77dc33315e6f760791a2984f98ea4bff28504ff37d460d8291585f49fcd3a clinfo-3.0.25.02.14.tar.gz sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt sha256 2a7a9321be169ea6edbc6b1010e8f7bb0f4c1482a2f65c34a49e9719f129b79a LICENSE diff --git a/package/clinfo/clinfo.mk b/package/clinfo/clinfo.mk index d4c1df90d4..6235f4974e 100644 --- a/package/clinfo/clinfo.mk +++ b/package/clinfo/clinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLINFO_VERSION = 3.0.21.02.21 +CLINFO_VERSION = 3.0.25.02.14 CLINFO_SITE = $(call github,Oblomov,clinfo,$(CLINFO_VERSION)) CLINFO_LICENSE = CC0-1.0 CLINFO_LICENSE_FILES = legalcode.txt LICENSE diff --git a/package/cloop/cloop.hash b/package/cloop/cloop.hash index eb922764bb..3bc9e8ff79 100644 --- a/package/cloop/cloop.hash +++ b/package/cloop/cloop.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20200419T152225Z/pool/main/c/cloop/cloop_3.14.1.3.dsc -sha256 e3079e70f9edae8ed1ac64694af08f6c7dc710ca65a56e4770dcb1325a293193 cloop_3.14.1.3.tar.xz +# From https://snapshot.debian.org/archive/debian/20221223T031011Z/pool/main/c/cloop/cloop_3.14.1.3%2Bnmu1.dsc +sha256 04060d88231208b0db8ae8c3b54b0a46ee12139b617ebfc80b03d2ddd2cdb6ba cloop_3.14.1.3+nmu1.tar.xz # Hash for license files sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad advancecomp-1.15/COPYING diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk index 6f6d5fe6a8..23132fe673 100644 --- a/package/cloop/cloop.mk +++ b/package/cloop/cloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -CLOOP_VERSION = 3.14.1.3 +CLOOP_VERSION = 3.14.1.3+nmu1 CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.xz -CLOOP_SITE = http://snapshot.debian.org/archive/debian/20200419T152225Z/pool/main/c/cloop +CLOOP_SITE = https://snapshot.debian.org/archive/debian/20221223T031011Z/pool/main/c/cloop CLOOP_LICENSE = GPL-2.0 (module), GPL-2.0+ (advancecomp) CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING @@ -14,7 +14,7 @@ HOST_CLOOP_DEPENDENCIES = host-zlib define HOST_CLOOP_BUILD_CMDS $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes \ - CFLAGS="$(HOST_CFLAGS) -D_GNU_SOURCE" CPPFLAGS="-std=c++14" + CFLAGS="$(HOST_CFLAGS) -D_GNU_SOURCE" endef define HOST_CLOOP_INSTALL_CMDS diff --git a/package/cloudflared/cloudflared.hash b/package/cloudflared/cloudflared.hash index e924d12481..407d24ccdb 100644 --- a/package/cloudflared/cloudflared.hash +++ b/package/cloudflared/cloudflared.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f96b703ea848bc538322eb957749b0b2395e0cf83213cf310cbde0a3f598eac4 cloudflared-2024.9.1-go2.tar.gz +sha256 803d3e162dc91da6b3b4f7961f57c113fa818d45517758511f72d254d68a46ba cloudflared-2025.8.1-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/cloudflared/cloudflared.mk b/package/cloudflared/cloudflared.mk index 68849e9b82..03b6a8fae6 100644 --- a/package/cloudflared/cloudflared.mk +++ b/package/cloudflared/cloudflared.mk @@ -4,12 +4,14 @@ # ################################################################################ -CLOUDFLARED_VERSION = 2024.9.1 +CLOUDFLARED_VERSION = 2025.8.1 CLOUDFLARED_SITE = $(call github,cloudflare,cloudflared,$(CLOUDFLARED_VERSION)) CLOUDFLARED_LICENSE = Apache-2.0 CLOUDFLARED_LICENSE_FILES = LICENSE CLOUDFLARED_CPE_ID_VENDOR = cloudflare CLOUDFLARED_BUILD_TARGETS = cmd/cloudflared -CLOUDFLARED_LDFLAGS = -X main.Version=$(CLOUDFLARED_VERSION) +CLOUDFLARED_LDFLAGS = \ + -X main.Version=$(CLOUDFLARED_VERSION) \ + -X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=buildroot $(eval $(golang-package)) diff --git a/package/clpeak/clpeak.hash b/package/clpeak/clpeak.hash index 3db2a2ca6b..0ef30c5a68 100644 --- a/package/clpeak/clpeak.hash +++ b/package/clpeak/clpeak.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7bc7beba6b3307290650abc4f13fe9389b271c1a64601fa333461516950d745b clpeak-1.1.2.tar.gz -sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE +sha256 31620ef28848108f6868e57e100412aa009399ba2cd021afd3b64563711fa49f clpeak-1.1.5.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/clpeak/clpeak.mk b/package/clpeak/clpeak.mk index 616a02c0b4..7756345be6 100644 --- a/package/clpeak/clpeak.mk +++ b/package/clpeak/clpeak.mk @@ -4,9 +4,9 @@ # ################################################################################ -CLPEAK_VERSION = 1.1.2 +CLPEAK_VERSION = 1.1.5 CLPEAK_SITE = $(call github,krrishnarraj,clpeak,$(CLPEAK_VERSION)) -CLPEAK_LICENSE = Unlicense +CLPEAK_LICENSE = Apache-2.0 CLPEAK_LICENSE_FILES = LICENSE CLPEAK_DEPENDENCIES = libopencl opencl-clhpp diff --git a/package/cmake/0001-rename-cmake-rootfile.patch b/package/cmake/0001-rename-cmake-rootfile.patch index 7e6e0a8cf7..c73e0dfe02 100644 --- a/package/cmake/0001-rename-cmake-rootfile.patch +++ b/package/cmake/0001-rename-cmake-rootfile.patch @@ -12,7 +12,7 @@ This buildroot-specific patch makes sure ctest looks also for [Vincent: tweak patch for 3.6.3] [James: tweak patch for 3.15.4] -[Bernd: tweak patch for 3.27.0] +[Bernd: tweak patch for 3.27.0 & 3.31.2] Signed-off-by: Davide Viti Signed-off-by: Vicente Olivert Riera @@ -26,7 +26,7 @@ diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3772f09985..c317e4af38 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx -@@ -1891,7 +1891,12 @@ int cmake::AddCMakePaths() +@@ -1896,7 +1896,12 @@ int cmake::AddCMakePaths() cmStateEnums::INTERNAL); #endif if (!cmSystemTools::FileExists( diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index 389300f31f..b30ce03a1c 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -59,10 +59,15 @@ config BR2_HOST_CMAKE_AT_LEAST_3_30 bool select BR2_HOST_CMAKE_AT_LEAST_3_29 +config BR2_HOST_CMAKE_AT_LEAST_3_31 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_30 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "3.31" if BR2_HOST_CMAKE_AT_LEAST_3_31 default "3.30" if BR2_HOST_CMAKE_AT_LEAST_3_30 default "3.29" if BR2_HOST_CMAKE_AT_LEAST_3_29 default "3.28" if BR2_HOST_CMAKE_AT_LEAST_3_28 diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index f80b942103..cbca2fc355 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.30/cmake-3.30.5-SHA-256.txt -sha256 9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d cmake-3.30.5.tar.gz +# From https://cmake.org/files/v3.31/cmake-3.31.9-SHA-256.txt +sha256 5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83 cmake-3.31.9.tar.gz # Locally calculated sha256 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 0c5d46c23d..8f3a54be5a 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 3.30 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5 +CMAKE_VERSION_MAJOR = 3.31 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt diff --git a/package/cmocka/cmocka.hash b/package/cmocka/cmocka.hash index 74d67d6ecb..8dc0532388 100644 --- a/package/cmocka/cmocka.hash +++ b/package/cmocka/cmocka.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 cmocka-1.1.5.tar.xz +sha256 58435b558766d7f4c729ba163bdf3aec38bed3bc766dab684e3526ed0aa7c780 cmocka-1.1.8.tar.xz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk index 297f95f465..04a0640f4c 100644 --- a/package/cmocka/cmocka.mk +++ b/package/cmocka/cmocka.mk @@ -4,7 +4,7 @@ # ################################################################################ -CMOCKA_VERSION = 1.1.5 +CMOCKA_VERSION = 1.1.8 CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz CMOCKA_SITE = https://cmocka.org/files/1.1 CMOCKA_LICENSE = Apache-2.0 diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash index 5de05b8ba1..48d3ab214d 100644 --- a/package/cni-plugins/cni-plugins.hash +++ b/package/cni-plugins/cni-plugins.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f9871b9f6ccb51d2b264532e96521e44f926928f91434b56ce135c95becf2901 cni-plugins-1.3.0-go2.tar.gz +sha256 95b639f8ccbb714da98e331ef8813f790d447fce5417f2f8a575f3c62bfb1474 cni-plugins-1.7.1-go2.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk index bccc1674aa..85783e433f 100644 --- a/package/cni-plugins/cni-plugins.mk +++ b/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = 1.3.0 +CNI_PLUGINS_VERSION = 1.7.1 CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) CNI_PLUGINS_LICENSE = Apache-2.0 CNI_PLUGINS_LICENSE_FILES = LICENSE @@ -25,9 +25,9 @@ CNI_PLUGINS_BUILD_TARGETS = \ plugins/meta/bandwidth \ plugins/meta/firewall \ plugins/meta/portmap \ + plugins/meta/sbr \ plugins/meta/tuning \ plugins/meta/vrf -CNI_PLUGINS_INSTALL_BINS = $(CNI_PLUGINS_BUILD_TARGETS) ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) CNI_PLUGINS_DEPENDENCIES += libapparmor @@ -46,9 +46,9 @@ endif define CNI_PLUGINS_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/opt/cni/bin - $(foreach d,$(CNI_PLUGINS_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $(@D)/bin/$$(basename $(d)) \ - $(TARGET_DIR)/opt/cni/bin + $(foreach d,$(CNI_PLUGINS_BUILD_TARGETS),\ + $(INSTALL) -D -m 0755 $(@D)/bin/$(notdir $(d)) \ + $(TARGET_DIR)/opt/cni/bin/$(notdir $(d)) ) endef diff --git a/package/cog/cog.hash b/package/cog/cog.hash index b59b5f4795..d513ae72ba 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.18.4.tar.xz.sums -md5 0566ab6676b499ebcff372fbe39e24fc cog-0.18.4.tar.xz -sha1 2d6f88cfb07eaac1be2bf9954832f19f8a856631 cog-0.18.4.tar.xz -sha256 31d7079db2eeed790899d2f1f824dd6a54bf30d072d196d737be572f105d99b1 cog-0.18.4.tar.xz +# From https://wpewebkit.org/releases/cog-0.18.5.tar.xz.sums +md5 3df784f9930353ac4cb2d95fdd56e21d cog-0.18.5.tar.xz +sha1 49a79797fa4d0aa41680095161df7cdb155f8fe9 cog-0.18.5.tar.xz +sha256 0ede9d09ab635ac519beec0543378e3fc51b56561a5fb7aa9c0cbca54c31b97c cog-0.18.5.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 7f680bb700..418ed19d86 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.18.4 +COG_VERSION = 0.18.5 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES @@ -45,7 +45,10 @@ COG_CONF_OPTS += -Dcog_dbus_control=user endif ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +COG_CONF_OPTS += -Dlibmanette=enabled COG_DEPENDENCIES += libmanette +else +COG_CONF_OPTS += -Dlibmanette=disabled endif $(eval $(meson-package)) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 39c0d352e5..6568aa1d7b 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -475,7 +475,11 @@ config BR2_PACKAGE_COLLECTD_PING config BR2_PACKAGE_COLLECTD_POSTGRESQL bool "postgresql" + depends on BR2_USE_MMU # postgresql depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index 1e57786686..ed1a2554fa 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -18,6 +18,10 @@ else CONMON_DISABLE_SECCOMP = 1 endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +CONMON_DEPENDENCIES += systemd +endif + define CONMON_CONFIGURE_CMDS printf '#!/bin/bash\necho "$(CONMON_DISABLE_SECCOMP)"\n' > \ $(@D)/hack/seccomp-notify.sh diff --git a/package/connman/Config.in b/package/connman/Config.in index af3e1f69f6..b01cbb344c 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_CONNMAN for managing internet connections within embedded devices running the Linux operating system. - https://01.org/connman + https://git.kernel.org/pub/scm/network/connman/connman.git if BR2_PACKAGE_CONNMAN diff --git a/package/connman/connman.hash b/package/connman/connman.hash index ea87f1ea17..807f7144b1 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa connman-1.42.tar.xz +sha256 77128cce80865455c4f106b5901a575e2dfdb35a7d2e2e2996f16e85cba10913 connman-1.45.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 142a6583ad..695a81f1e5 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.42 +CONNMAN_VERSION = 1.45 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus diff --git a/package/conntrack-tools/conntrack-tools.hash b/package/conntrack-tools/conntrack-tools.hash index 371ede3432..122208b809 100644 --- a/package/conntrack-tools/conntrack-tools.hash +++ b/package/conntrack-tools/conntrack-tools.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/conntrack-tools/downloads.html -sha256 099debcf57e81690ced57f516b493588a73518f48c14d656f823b29b4fc24b5d conntrack-tools-1.4.7.tar.bz2 +sha256 067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6 conntrack-tools-1.4.8.tar.xz # Locally calculated sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index ec633f0d54..426bc20914 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.7 -CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 +CONNTRACK_TOOLS_VERSION = 1.4.8 +CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.xz CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \ diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index e3f8434192..4ec78897d9 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c containerd-1.7.23-go2.tar.gz +sha256 472747a7a6b360a0864bab0ee00a8a6f51da5795171e6a60ab17aa80cbd850a2 containerd-2.0.2-go2.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 88b53caf51..2ef70ab5d7 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,25 +4,22 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.23 +CONTAINERD_VERSION = 2.0.2 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_GOMOD = github.com/containerd/containerd +CONTAINERD_GOMOD = github.com/containerd/containerd/v2 CONTAINERD_LDFLAGS = \ -X $(CONTAINERD_GOMOD)/version.Version=$(CONTAINERD_VERSION) CONTAINERD_BUILD_TARGETS = \ cmd/containerd \ - cmd/containerd-shim \ - cmd/containerd-shim-runc-v1 \ cmd/containerd-shim-runc-v2 \ cmd/ctr -CONTAINERD_INSTALL_BINS = $(notdir $(CONTAINERD_BUILD_TARGETS)) CONTAINERD_TAGS = no_aufs ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) @@ -51,6 +48,12 @@ ifneq ($(BR2_PACKAGE_CONTAINERD_CRI),y) CONTAINERD_TAGS += no_cri endif +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +# Go exe build with PIE doesn't work with musl. +# See: https://github.com/golang/go/issues/17847 +CONTAINERD_EXTLDFLAGS += -Wl,--no-pie +endif + define CONTAINERD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/containerd.service \ $(TARGET_DIR)/usr/lib/systemd/system/containerd.service diff --git a/package/containers-image-config/Config.in b/package/containers-image-config/Config.in new file mode 100644 index 0000000000..d40712e56d --- /dev/null +++ b/package/containers-image-config/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CONTAINERS_IMAGE_CONFIG + bool "containers-image-config" + help + Install default, minimalist configuration files used by the + various tools dealing with containers images, like podman, + skopeo... + + https://github.com/containers/image diff --git a/package/containers-image-config/containers-image-config.hash b/package/containers-image-config/containers-image-config.hash new file mode 100644 index 0000000000..0159b0fc62 --- /dev/null +++ b/package/containers-image-config/containers-image-config.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 afdbb1487571d4cc8974e11c72bc4e05043fb490cfc0581783789f414c64f87b containers-image-config-v5.35.0-git4.tar.gz +sha256 716a8b80635c394681e652823e1e42e411ad2d254e1f202403422d74f4b0b106 LICENSE diff --git a/package/containers-image-config/containers-image-config.mk b/package/containers-image-config/containers-image-config.mk new file mode 100644 index 0000000000..2f03f8e8fb --- /dev/null +++ b/package/containers-image-config/containers-image-config.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# containers-image-config +# +################################################################################ + +CONTAINERS_IMAGE_CONFIG_VERSION = v5.35.0 +CONTAINERS_IMAGE_CONFIG_SITE = https://github.com/containers/image +CONTAINERS_IMAGE_CONFIG_SITE_METHOD = git + +CONTAINERS_IMAGE_CONFIG_LICENSE = Apache-2.0 +CONTAINERS_IMAGE_CONFIG_LICENSE_FILES = LICENSE + +define CONTAINERS_IMAGE_CONFIG_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 \ + $(@D)/default-policy.json \ + $(TARGET_DIR)/etc/containers/policy.json + $(INSTALL) -D -m 0644 \ + $(@D)/registries.conf \ + $(TARGET_DIR)/etc/containers/registries.conf + $(SED) '/^# unqualified-search-registries = .*/s//unqualified-search-registries = ["docker.io"]/' \ + $(TARGET_DIR)/etc/containers/registries.conf +endef + +$(eval $(generic-package)) diff --git a/package/coreutils/0001-coreutils-mcel-port-to-uClibc-ng.patch b/package/coreutils/0001-coreutils-mcel-port-to-uClibc-ng.patch deleted file mode 100644 index 7639509ff2..0000000000 --- a/package/coreutils/0001-coreutils-mcel-port-to-uClibc-ng.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c4e923a98f34fe5f5ec3b49543e90716ec2a45fc Mon Sep 17 00:00:00 2001 -From: Jean-Michel Hautbois -Date: Tue, 24 Sep 2024 18:08:31 +0200 -Subject: [PATCH] coreutils: mcel: port to uClibc-ng -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Waldemar Brodkorb in: -https://lists.gnu.org/r/bug-gnulib/2024-08/msg00130.html -* lib/mcel.h (mcel_scan): Don't treat uClibc-ng like glibc. - -Upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=9765bc796b3e6ceaa7a10ba07c9c2f1e272a4249 -Signed-off-by: Jean-Michel Hautbois ---- - lib/mcel.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/mcel.h b/lib/mcel.h -index f6f006c..dca4d08 100644 ---- a/lib/mcel.h -+++ b/lib/mcel.h -@@ -221,7 +221,8 @@ mcel_scan (char const *p, char const *lim) - - /* An initial mbstate_t; initialization optimized for some platforms. - For details about these and other platforms, see wchar.in.h. */ --#if defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) -+#if (defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) \ -+ && !defined __UCLIBC__) - /* Although only a trivial optimization, it's worth it for GNU. */ - mbstate_t mbs; mbs.__count = 0; - #elif (defined __FreeBSD__ || defined __DragonFly__ || defined __OpenBSD__ \ --- -2.39.2 - diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index 3455c95c58..d01955d927 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,4 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a coreutils-9.5.tar.xz +# From https://lists.gnu.org/archive/html/coreutils-announce/2025-09/msg00000.html +sha1 a6a58e00688fe0705a7051b36592f1e43e89a9ef coreutils-9.8.tar.xz +sha256 e6d4fd2d852c9141a1c2a18a13d146a0cd7e45195f72293a4e4c044ec6ccca15 coreutils-9.8.tar.xz # Locally computed sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index a6d193b49e..b764cb5843 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,14 +4,18 @@ # ################################################################################ -COREUTILS_VERSION = 9.5 +COREUTILS_VERSION = 9.8 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ COREUTILS_LICENSE_FILES = COPYING COREUTILS_CPE_ID_VENDOR = gnu +# --disable-year2038: tells the configure script to not abort if the +# system is not Y2038 compliant. util-linux-libs will support year2038 +# if the system is compliant even with this option passed COREUTILS_CONF_OPTS = --disable-rpath \ + --disable-year2038 \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y) @@ -125,6 +129,7 @@ define COREUTILS_CREATE_TEST_SYMLINK endef COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CREATE_TEST_SYMLINK +ifeq ($(BR2_ROOTFS_MERGED_BIN),) # gnu thinks chroot is in bin, debian thinks it's in sbin ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y) define COREUTILS_FIX_CHROOT_LOCATION @@ -137,6 +142,7 @@ define COREUTILS_FIX_CHROOT_LOCATION endef endif COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION +endif # Explicitly install ln and realpath, which we *are* insterested in. # A lot of other programs still get installed, however, but disabling diff --git a/package/cpio/0001-Fix-c23-conformity.patch b/package/cpio/0001-Fix-c23-conformity.patch new file mode 100644 index 0000000000..9421f28507 --- /dev/null +++ b/package/cpio/0001-Fix-c23-conformity.patch @@ -0,0 +1,48 @@ +From f42137f5ab9cf07d1e62edc05e0212688d3ebaa2 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Tue, 6 May 2025 21:02:43 +0300 +Subject: [PATCH] Fix c23 conformity + +Upstream: https://git.savannah.gnu.org/gitweb/?p=cpio.git;a=commitdiff;h=f42137f5ab9cf07d1e62edc05e0212688d3ebaa2 +Signed-off-by: Sergey Poznyakoff +Signed-off-by: Florian Larysch +--- + src/extern.h | 4 ++-- + src/global.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/extern.h b/src/extern.h +index bf3d5b3..455119b 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -96,8 +96,8 @@ extern char input_is_special; + extern char output_is_special; + extern char input_is_seekable; + extern char output_is_seekable; +-extern int (*xstat) (); +-extern void (*copy_function) (); ++extern int (*xstat) (const char *, struct stat *); ++extern void (*copy_function) (void); + extern char *change_directory_option; + + #define STRINGIFY_BIGINT(i, b) umaxtostr (i, b) +diff --git a/src/global.c b/src/global.c +index 66686f2..5c6ab16 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -184,10 +184,10 @@ bool to_stdout_option = false; + + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ +-int (*xstat) (); ++int (*xstat) (const char *, struct stat *); + + /* Which copy operation to perform. (-i, -o, -p) */ +-void (*copy_function) () = 0; ++void (*copy_function) (void) = 0; + + char *change_directory_option; + +-- +2.49.0 + diff --git a/package/cpp-httplib/cpp-httplib.hash b/package/cpp-httplib/cpp-httplib.hash index 45c2214105..904bca6d02 100644 --- a/package/cpp-httplib/cpp-httplib.hash +++ b/package/cpp-httplib/cpp-httplib.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6ed5894bbbc4a34a0f4c5e962672d0003d2ea099bbadacc66f6dee2b213ff394 cpp-httplib-0.18.0.tar.gz +sha256 cc57615af359efda816122dcfca37bcbb9f1591396f50a1fd1ad70bbe6050581 cpp-httplib-0.27.0.tar.gz sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b LICENSE diff --git a/package/cpp-httplib/cpp-httplib.mk b/package/cpp-httplib/cpp-httplib.mk index 5a02b562b3..62255180f4 100644 --- a/package/cpp-httplib/cpp-httplib.mk +++ b/package/cpp-httplib/cpp-httplib.mk @@ -4,16 +4,20 @@ # ################################################################################ -CPP_HTTPLIB_VERSION = 0.18.0 +CPP_HTTPLIB_VERSION = 0.27.0 CPP_HTTPLIB_SITE = $(call github,yhirose,cpp-httplib,v$(CPP_HTTPLIB_VERSION)) CPP_HTTPLIB_LICENSE = MIT CPP_HTTPLIB_LICENSE_FILES = LICENSE +CPP_HTTPLIB_CPE_ID_VENDOR = yhirose CPP_HTTPLIB_INSTALL_STAGING = YES CPP_HTTPLIB_CONF_OPTS = \ - -Dcpp-httplib_test=false + -Dtest=false + +# 0001-merge-commit-from-fork.patch +CPP_HTTPLIB_IGNORE_CVES += CVE-2025-46728 ifeq ($(BR2_PACKAGE_CPP_HTTPLIB_COMPILE),y) -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_compile=true +CPP_HTTPLIB_CONF_OPTS += -Dcompile=true CPP_HTTPLIB_DEPENDENCIES += host-python3 else # Header only library @@ -21,24 +25,24 @@ CPP_HTTPLIB_INSTALL_TARGET = NO endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_openssl=enabled +CPP_HTTPLIB_CONF_OPTS += -Dopenssl=enabled CPP_HTTPLIB_DEPENDENCIES += openssl else -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_openssl=disabled +CPP_HTTPLIB_CONF_OPTS += -Dopenssl=disabled endif ifeq ($(BR2_PACKAGE_ZLIB),y) -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_zlib=enabled +CPP_HTTPLIB_CONF_OPTS += -Dzlib=enabled CPP_HTTPLIB_DEPENDENCIES += zlib else -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_zlib=disabled +CPP_HTTPLIB_CONF_OPTS += -Dzlib=disabled endif ifeq ($(BR2_PACKAGE_BROTLI),y) -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_brotli=enabled +CPP_HTTPLIB_CONF_OPTS += -Dbrotli=enabled CPP_HTTPLIB_DEPENDENCIES += brotli else -CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_brotli=disabled +CPP_HTTPLIB_CONF_OPTS += -Dbrotli=disabled endif $(eval $(meson-package)) diff --git a/package/cppzmq/cppzmq.hash b/package/cppzmq/cppzmq.hash index dd6e06494a..a2410daa73 100644 --- a/package/cppzmq/cppzmq.hash +++ b/package/cppzmq/cppzmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c81c81bba8a7644c84932225f018b5088743a22999c6d82a2b5f5cd1e6942b74 cppzmq-4.10.0.tar.gz +sha256 0fff4ff311a7c88fdb76fceefba0e180232d56984f577db371d505e4d4c91afd cppzmq-4.11.0.tar.gz sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk index 90213ec0f6..0f52296dbd 100644 --- a/package/cppzmq/cppzmq.mk +++ b/package/cppzmq/cppzmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPZMQ_VERSION = 4.10.0 +CPPZMQ_VERSION = 4.11.0 CPPZMQ_SITE = $(call github,zeromq,cppzmq,v$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = host-pkgconf zeromq diff --git a/package/cpuinfo/Config.in b/package/cpuinfo/Config.in new file mode 100644 index 0000000000..64477c2bd7 --- /dev/null +++ b/package/cpuinfo/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_i386 + default y if BR2_x86_64 + +config BR2_PACKAGE_CPUINFO + bool "cpuinfo" + depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + CPU INFOrmation library, cpuinfo is a library to detect + essential for performance optimization information about + host CPU. + + https://github.com/pytorch/cpuinfo + +comment "cpuinfo needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cpuinfo/cpuinfo.hash b/package/cpuinfo/cpuinfo.hash new file mode 100644 index 0000000000..499363cd09 --- /dev/null +++ b/package/cpuinfo/cpuinfo.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 37bb2fd2d1e87102baea8d131a0c550c4ceff5a12fba61faeb1bff63868155f1 cpuinfo-8a1772a0c5c447df2d18edf33ec4603a8c9c04a6.tar.gz +# License files, locally calculated +sha256 8e7e60636c3aa0cb03571a1a841ce5697f9551ff92b3c426c2561613d15ade70 LICENSE diff --git a/package/cpuinfo/cpuinfo.mk b/package/cpuinfo/cpuinfo.mk new file mode 100644 index 0000000000..0aafb1b4dd --- /dev/null +++ b/package/cpuinfo/cpuinfo.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# cpuinfo +# +################################################################################ + +CPUINFO_VERSION = 8a1772a0c5c447df2d18edf33ec4603a8c9c04a6 +CPUINFO_SITE = $(call github,pytorch,cpuinfo,$(CPUINFO_VERSION)) +CPUINFO_LICENSE = BSD-2-Clause +CPUINFO_LICENSE_FILES = LICENSE +CPUINFO_INSTALL_STAGING = YES +CPUINFO_CONF_OPTS = \ + -DCPUINFO_BUILD_UNIT_TESTS=OFF \ + -DCPUINFO_BUILD_MOCK_TESTS=OFF \ + -DCPUINFO_BUILD_BENCHMARKS=OFF + +$(eval $(cmake-package)) diff --git a/package/cpulimit/0005-Correct-loop-function-signature.patch b/package/cpulimit/0005-Correct-loop-function-signature.patch new file mode 100644 index 0000000000..5b7f4a01dd --- /dev/null +++ b/package/cpulimit/0005-Correct-loop-function-signature.patch @@ -0,0 +1,49 @@ +From 74e95c96e8d82e4e374f86142972fcf4305fe1f2 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Wed, 2 Jul 2025 20:47:58 -0700 +Subject: [PATCH] Correct loop function signature + +loop is passed to pthread_create() which requires the following +prototype to be used: void *(*start_routine) (void *) + +Correct the signature to avoid such warnings: + +In file included from busy.c:3: +/home/buildroot/instance-0/output-1/host/mips-buildroot-linux-uclibc/sysroot/usr/include/pthread.h:164:36: note: expected 'void * (*)(void *)' but argument is of type 'void * (*)(void)' + 164 | void *(*__start_routine) (void *), + | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ +busy.c:6:7: note: 'loop' declared here + 6 | void *loop() + | ^~~~ + +Signed-off-by: Florian Fainelli +Upstream: https://github.com/opsengine/cpulimit/pull/127 +--- + tests/busy.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/busy.c b/tests/busy.c +index b3afb7cd853b..93f0bcce67a8 100644 +--- a/tests/busy.c ++++ b/tests/busy.c +@@ -3,7 +3,7 @@ + #include + #include + +-void *loop() ++void *loop(void *) + { + while(1); + } +@@ -23,7 +23,7 @@ int main(int argc, char **argv) { + exit(1); + } + } +- loop(); ++ loop(NULL); + return 0; + } + +-- +2.43.0 + diff --git a/package/cracklib/cracklib.hash b/package/cracklib/cracklib.hash index a97818cbdd..b74fc5e935 100644 --- a/package/cracklib/cracklib.hash +++ b/package/cracklib/cracklib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2c83a91dd21d035eab98bded764eb4579b73fd837b683e1a447b11ef604ee130 cracklib-2.9.11.tar.xz -sha256 b3d1e0e0ae9bc7ffed65c0042d7c68bdb903368aa6b918f94572453c6ea874dc cracklib-words-2.9.11.xz +sha256 1d1b83676b5673051b9373e1ca0db81c1fa88faf9a195a3c1af984fd9c250d66 cracklib-2.10.3.tar.xz +sha256 b3d1e0e0ae9bc7ffed65c0042d7c68bdb903368aa6b918f94572453c6ea874dc cracklib-words-2.10.3.xz sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 9f5f32c87a..2894908253 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRACKLIB_VERSION = 2.9.11 +CRACKLIB_VERSION = 2.10.3 CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.xz CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 diff --git a/package/criu/Config.in b/package/criu/Config.in index fc6897c4d0..04a2080041 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -19,14 +19,13 @@ config BR2_PACKAGE_CRIU bool "criu" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp, protobuf depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h depends on !BR2_STATIC_LIBS # protobuf, libbsd depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, libnl depends on BR2_USE_WCHAR # libbsd - select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3_SSL select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_PROTOBUF_C diff --git a/package/cross-ldd/cross-ldd.hash b/package/cross-ldd/cross-ldd.hash new file mode 100644 index 0000000000..b179aec5e0 --- /dev/null +++ b/package/cross-ldd/cross-ldd.hash @@ -0,0 +1,4 @@ +# From http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.26.0.tar.xz.sha512 +sha512 7834184ae5792fd347455f9f48fee826248dcb82d271954ed4304b1a18f63995ff8a2c3b817564dcf147ac7e16e02d779195b26d97eb57db27f1118a1837002a crosstool-ng-1.26.0.tar.xz +# Locally calculated +sha256 07bc0ccd386469c748c4cf6c8faca5667fbf8c4400386714287fa233acfd68ba COPYING diff --git a/package/cross-ldd/cross-ldd.mk b/package/cross-ldd/cross-ldd.mk new file mode 100644 index 0000000000..b5560805c8 --- /dev/null +++ b/package/cross-ldd/cross-ldd.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# cross-ldd +# +################################################################################ + +CROSS_LDD_VERSION = 1.26.0 +CROSS_LDD_SITE = https://github.com/crosstool-ng/crosstool-ng/releases/download/crosstool-ng-$(CROSS_LDD_VERSION) +CROSS_LDD_SOURCE = crosstool-ng-$(CROSS_LDD_VERSION).tar.xz +CROSS_LDD_LICENSE = GPL-2.0 +CROSS_LDD_LICENSE_FILES = COPYING + +ifeq ($(BR2_ARCH_IS_64),y) +CROSS_LDD_BITNESS = 64 +else +CROSS_LDD_BITNESS = 32 +endif + +CROSS_LDD_TOOLS_PREFIX = $(patsubst %-,%,$(TARGET_CROSS)) + +define HOST_CROSS_LDD_CONFIGURE_CMDS + sed \ + -e "s%@@CT_bash@@%/usr/bin/env bash%" \ + -e "s%@@CT_VERSION@@%$(CROSS_LDD_VERSION)%" \ + -e "s%@@CT_BITS@@%$(CROSS_LDD_BITNESS)%" \ + -e "s%@@CT_sed@@%sed%" \ + -e "s%@@CT_grep@@%grep%" \ + -e "s%^prefix=.*%prefix=$(CROSS_LDD_TOOLS_PREFIX)%" \ + $(@D)/scripts/xldd.in > \ + $(@D)/scripts/xldd +endef + +define HOST_CROSS_LDD_INSTALL_CMDS + $(INSTALL) -m 0755 -D $(@D)/scripts/xldd $(TARGET_CROSS)xldd +endef + +$(eval $(host-generic-package)) diff --git a/package/crucible/crucible.hash b/package/crucible/crucible.hash index 959dc89286..0ec297c49d 100644 --- a/package/crucible/crucible.hash +++ b/package/crucible/crucible.hash @@ -1,2 +1,2 @@ -sha256 466b7b0be8b5085d669d63cca2a80f04c6dcbdd887a51333532ecb804a6b74ca crucible-2023.11.02-go2.tar.gz +sha256 6912697626baf47b21ceb620eb2885bf0fea8a1657a9d0046d11c148289109e2 crucible-2025.05.28-go2.tar.gz sha256 a89c50d83be30fe7ec75be69a07f6c1b5dfaae0a6b94a678d2394fff34acb69c LICENSE diff --git a/package/crucible/crucible.mk b/package/crucible/crucible.mk index 5eedbca8ee..9b34cc52d9 100644 --- a/package/crucible/crucible.mk +++ b/package/crucible/crucible.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUCIBLE_VERSION = 2023.11.02 +CRUCIBLE_VERSION = 2025.05.28 CRUCIBLE_SITE = $(call github,usbarmory,crucible,v$(CRUCIBLE_VERSION)) CRUCIBLE_LICENSE = BSD-3-Clause CRUCIBLE_LICENSE_FILES = LICENSE diff --git a/package/crudini/crudini.hash b/package/crudini/crudini.hash index 5b92c0e4da..0df91ab1e1 100644 --- a/package/crudini/crudini.hash +++ b/package/crudini/crudini.hash @@ -1,4 +1,4 @@ # from https://pypi.org/project/crudini/#files -sha256 59ae650f45af82a64afc33eb876909ee0c4888dc4e8711ef59731c1edfda5e24 crudini-0.9.5.tar.gz +sha256 c2af311a0833857a1449d821a312edc6109f0c2d6d81d76c2d954a76b05e6b14 crudini-0.9.6.tar.gz # locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 0f5cfcedd9..2f59b025fb 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUDINI_VERSION = 0.9.5 -CRUDINI_SITE = https://files.pythonhosted.org/packages/32/67/c4e838930e2f434db08d6a6aadffca3d14e7455d1c2c2332e22003ad453d +CRUDINI_VERSION = 0.9.6 +CRUDINI_SITE = https://files.pythonhosted.org/packages/54/d1/0a363fbbab0aea9e27dd981a602efaf514c45f4fffceac3906274e0425c7 CRUDINI_SETUP_TYPE = setuptools CRUDINI_DEPENDENCIES = host-python-setuptools-scm CRUDINI_LICENSE = GPL-2.0 diff --git a/package/crun/crun.hash b/package/crun/crun.hash index 6f2d676bed..fcf95f2ba9 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.18.2.tar.gz +sha256 90b6e33a6400ba5355eed6efc46a4c890e48e6c96d99d2bbc7fe92803bdfce52 crun-1.24.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 255c1b8861..abdd4a215a 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.18.2 +CRUN_VERSION = 1.24 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl @@ -15,6 +15,10 @@ CRUN_CPE_ID_VALID = YES CRUN_AUTORECONF = YES CRUN_CONF_OPTS = --disable-embedded-yajl +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +CRUN_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) CRUN_DEPENDENCIES += argp-standalone endif diff --git a/package/cryptodev-linux/0001-Fix-build-for-Linux-6.18-rc1.patch b/package/cryptodev-linux/0001-Fix-build-for-Linux-6.18-rc1.patch new file mode 100644 index 0000000000..fef5af4099 --- /dev/null +++ b/package/cryptodev-linux/0001-Fix-build-for-Linux-6.18-rc1.patch @@ -0,0 +1,55 @@ +From 08644db02d43478f802755903212f5ee506af73b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= +Date: Sat, 6 Sep 2025 20:36:38 +0000 +Subject: [PATCH] Fix build for Linux 6.18-rc1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's no longer required to use nth_page() when iterating pages within a +single scatterlist entry. + +Note I believe this code path in `sg_advance` is currently unreachable: +It is only called from `get_userbuf_srtp`, passing in a scatterlist +copied from one created by `__get_userbuf`, which only generates +entries such that `sg->offset + sg->length <= PAGE_SIZE`. +On the other hand, this code path in `sg_advance` requires that +`sg->offset + sg->length > sg->offset + consumed >= PAGE_SIZE`. + +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f8f03eb5f0f91fddc9bb8563c7e82bd7d3ba1dd0 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ce00897b94bc5c62fab962625efcf1ab824d3688 + +Signed-off-by: Joan Bruguera Micó + +Upstream: https://github.com/cryptodev-linux/cryptodev-linux/commit/08644db02d43478f802755903212f5ee506af73b + +Signed-off-by: Bernd Kuhls +--- + util.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/util.c b/util.c +index 9eba4836..d4267816 100644 +--- a/util.c ++++ b/util.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include "util.h" + + /* These were taken from Maxim Levitsky's patch to lkml. +@@ -44,8 +45,12 @@ struct scatterlist *sg_advance(struct scatterlist *sg, int consumed) + sg->length -= consumed; + + if (sg->offset >= PAGE_SIZE) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 18, 0)) ++ struct page *page = sg_page(sg) + (sg->offset / PAGE_SIZE); ++#else + struct page *page = + nth_page(sg_page(sg), sg->offset / PAGE_SIZE); ++#endif + sg_set_page(sg, page, sg->length, sg->offset % PAGE_SIZE); + } + diff --git a/package/cryptodev-linux/cryptodev-linux.hash b/package/cryptodev-linux/cryptodev-linux.hash index 300aa3bcd4..66263f493d 100644 --- a/package/cryptodev-linux/cryptodev-linux.hash +++ b/package/cryptodev-linux/cryptodev-linux.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 33b7915c46eb39a37110e88c681423c0dd0df25d784b6e1475ac3196367f0db5 cryptodev-linux-1.13.tar.gz +sha256 67223d5bee4749028e78e87372cee3bca79d9a20f7b6cb915aa080c59d2a2d98 cryptodev-linux-1.14.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index 580ea89520..0010ad40e0 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = 1.13 +CRYPTODEV_LINUX_VERSION = 1.14 CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,cryptodev-linux-$(CRYPTODEV_LINUX_VERSION)) CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ @@ -21,7 +21,7 @@ define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS $(STAGING_DIR)/usr/include/crypto/cryptodev.h endef -define CRYPTODEV_LINUX_CONFIG_FIXUPS +define CRYPTODEV_LINUX_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO) $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_AEAD) endef diff --git a/package/cryptopp/Config.in b/package/cryptopp/Config.in index 1648a73f9d..95f930c8f9 100644 --- a/package/cryptopp/Config.in +++ b/package/cryptopp/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_CRYPTOPP help A free C++ class library of cryptographic schemes + https://cryptopp.com + comment "cryptopp needs a toolchain w/ C++, dynamic library, wchar" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_USE_WCHAR diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index e46cfbdf29..bd165f2356 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,7 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522 cryptsetup-2.7.5.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.8/sha256sums.asc +sha256 2c3379eb76597dcab50911449b013e2697c4bffcc716dbbf0d9b0e8fbbb46fb4 cryptsetup-2.8.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING -sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 docs/licenses/COPYING.Apache-2.0 +sha256 28a9529c7d0bb4dc51f4bf5c116a3d16ef247a052f7591466768ddf563fd1cf5 docs/licenses/COPYING.CC-BY-SA-4.0 +sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception +sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 52f79e177f..ebe9c865b3 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).5 +CRYPTSETUP_VERSION_MAJOR = 2.8 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ @@ -13,8 +13,13 @@ CRYPTSETUP_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) -CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) -CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL +CRYPTSETUP_LICENSE = Apache-2.0, CC-BY-SA-4.0, GPL-2.0+ (programs), LGPL-2.1+ (library) +CRYPTSETUP_LICENSE_FILES = \ + COPYING \ + docs/licenses/COPYING.Apache-2.0 \ + docs/licenses/COPYING.CC-BY-SA-4.0 \ + docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception \ + docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception CRYPTSETUP_CPE_ID_VALID = YES CRYPTSETUP_INSTALL_STAGING = YES diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash index 6e76a6ab88..6824f59875 100644 --- a/package/cukinia/cukinia.hash +++ b/package/cukinia/cukinia.hash @@ -1,4 +1,3 @@ # locally computed -sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz +sha256 d9ad8e0c45b40afbcc63f6bf0328f5e2d74caf72e640f037814b58a95dbfd206 cukinia-0.9.1.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk index 798c199b67..5f4caf8600 100644 --- a/package/cukinia/cukinia.mk +++ b/package/cukinia/cukinia.mk @@ -4,10 +4,10 @@ # ################################################################################ -CUKINIA_VERSION = 0.6.0 +CUKINIA_VERSION = 0.9.1 CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) -CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 -CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 +CUKINIA_LICENSE = Apache-2.0 +CUKINIA_LICENSE_FILES = LICENSE define CUKINIA_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cukinia $(TARGET_DIR)/usr/bin/cukinia diff --git a/package/cups/cups.hash b/package/cups/cups.hash index f826f96fe7..a200a82deb 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 9a88fe1da3a29a917c3fc67ce6eb3178399d68e1a548c6d86c70d9b13651fd71 cups-2.4.11-source.tar.gz +sha256 660288020dd6f79caf799811c4c1a3207a48689899ac2093959d70a3bdcb7699 cups-2.4.14-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE +sha256 977206f041b9a6f47ac00531e1242c0fab7063da71178f8d868b167b70866b6d NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 31899114ef..e6de671174 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.11 +CUPS_VERSION = 2.4.14 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception diff --git a/package/curlpp/0001-fix-invalid-conversion.patch b/package/curlpp/0001-fix-invalid-conversion.patch new file mode 100644 index 0000000000..e95e9cd7c5 --- /dev/null +++ b/package/curlpp/0001-fix-invalid-conversion.patch @@ -0,0 +1,27 @@ +From b945d57a5acd12bda320a63eb9e45bbb7586cdde Mon Sep 17 00:00:00 2001 +From: Aaron Smith +Date: Mon, 16 Dec 2024 11:48:33 -0800 +Subject: [PATCH] Fix "invalid conversion from 'int' to 'CURLoption'" error + +Use cast to 'Curloption' to fix compiler error regarding invalid conversion from 'int' to 'CURLoption'. + +Upstream: https://github.com/jpbarrette/curlpp/pull/178 +Signed-off-by: Thomas Bonnefille +--- + include/curlpp/Options.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp +index 40b64ed..292eaa7 100644 +--- a/include/curlpp/Options.hpp ++++ b/include/curlpp/Options.hpp +@@ -308,7 +308,7 @@ namespace options + typedef curlpp::OptionTrait LowSpeedLimit; + typedef curlpp::OptionTrait LowSpeedTime; + typedef curlpp::OptionTrait MaxConnects; +- typedef curlpp::OptionTrait ClosePolicy; ++ typedef curlpp::OptionTrait ClosePolicy; + typedef curlpp::OptionTrait FreshConnect; + typedef curlpp::OptionTrait ForbidReuse; + typedef curlpp::OptionTrait ConnectTimeout; + diff --git a/package/cutekeyboard/cutekeyboard.hash b/package/cutekeyboard/cutekeyboard.hash index 3d3ec2f858..4585996412 100644 --- a/package/cutekeyboard/cutekeyboard.hash +++ b/package/cutekeyboard/cutekeyboard.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cbaddc5fbf479d5e20fc88228e9af5928fa5e588052ee496c2f2efbe2afc510 cutekeyboard-afacc3210b75d7e0de27dcc4c0f2bed0212cc4c7.tar.gz +sha256 7bb9094dc8792c897dcf81caca5dfbb509ed8a851b01542a84d631adf6c62b62 cutekeyboard-1.4.0.tar.gz sha256 bdde6ec2ae2686623c0bb414bfb8bd731b314beff2264c602116ea60dd65964d LICENSE diff --git a/package/cutekeyboard/cutekeyboard.mk b/package/cutekeyboard/cutekeyboard.mk index a7b3ba7a1d..b7085c8d7b 100644 --- a/package/cutekeyboard/cutekeyboard.mk +++ b/package/cutekeyboard/cutekeyboard.mk @@ -4,8 +4,8 @@ # ################################################################################ -CUTEKEYBOARD_VERSION = afacc3210b75d7e0de27dcc4c0f2bed0212cc4c7 -CUTEKEYBOARD_SITE = $(call github,amarula,cutekeyboard,$(CUTEKEYBOARD_VERSION)) +CUTEKEYBOARD_VERSION = 1.4.0 +CUTEKEYBOARD_SITE = $(call github,amarula,cutekeyboard,v$(CUTEKEYBOARD_VERSION)) CUTEKEYBOARD_DEPENDENCIES = qt5declarative qt5quickcontrols2 CUTEKEYBOARD_INSTALL_STAGING = YES CUTEKEYBOARD_LICENSE = MIT diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 44148eb188..0c1a97402a 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -14,20 +14,6 @@ config BR2_PACKAGE_CWIID https://github.com/abstrakraft/cwiid -if BR2_PACKAGE_CWIID -config BR2_PACKAGE_CWIID_WMGUI - bool "wmgui" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz - depends on BR2_PACKAGE_XORG7 # libgtk2 - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 - depends on BR2_USE_MMU # libgtk2 -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 -endif - comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ diff --git a/package/cwiid/cwiid.mk b/package/cwiid/cwiid.mk index a11c56c0aa..e552da3b46 100644 --- a/package/cwiid/cwiid.mk +++ b/package/cwiid/cwiid.mk @@ -17,13 +17,6 @@ CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez5_utils # Disable python support. This disables the 2 following things: # - wminput Python plugin support # - cwiid Python module -CWIID_CONF_OPTS = --without-python --disable-ldconfig - -ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y) -CWIID_DEPENDENCIES += libgtk2 libglib2 -CWIID_CONF_OPTS += --enable-wmgui -else -CWIID_CONF_OPTS += --disable-wmgui -endif +CWIID_CONF_OPTS = --without-python --disable-ldconfig --disable-wmgui $(eval $(autotools-package)) diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index d7709e03ef..03f2aad649 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -18,7 +18,8 @@ define DAEMON_CONFIGURE_CMDS endef define DAEMON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" -C $(@D) endef define DAEMON_INSTALL_TARGET_CMDS diff --git a/package/dahdi-linux/0003-xpp-sysfs-Use-const-struct-device_device-if-needed.patch b/package/dahdi-linux/0003-xpp-sysfs-Use-const-struct-device_device-if-needed.patch new file mode 100644 index 0000000000..becb82a6d2 --- /dev/null +++ b/package/dahdi-linux/0003-xpp-sysfs-Use-const-struct-device_device-if-needed.patch @@ -0,0 +1,82 @@ +From ce9de5d1bf9d21c088b01ce9da6f7ff02b0d863d Mon Sep 17 00:00:00 2001 +From: InterLinked1 <24227567+InterLinked1@users.noreply.github.com> +Date: Mon, 23 Sep 2024 08:04:54 -0400 +Subject: [PATCH] xpp, sysfs: Use const struct device_device if needed. + +Kernel commit d69d804845985c29ab5be5a4b3b1f4787893daf8 +changed struct device_driver to be const, so make the +arguments const on kernels 6.11 and newer. + +Resolves: #63 + +Upstream: https://github.com/asterisk/dahdi-linux/pull/64 +Signed-off-by: Peter Korsgaard +--- + drivers/dahdi/dahdi-sysfs-chan.c | 4 ++++ + drivers/dahdi/dahdi-sysfs.c | 4 ++++ + drivers/dahdi/xpp/xbus-sysfs.c | 8 ++++++++ + 3 files changed, 16 insertions(+) + +diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c +index 09d7317..35b7bd4 100644 +--- a/drivers/dahdi/dahdi-sysfs-chan.c ++++ b/drivers/dahdi/dahdi-sysfs-chan.c +@@ -220,7 +220,11 @@ static void chan_release(struct device *dev) + chan_dbg(DEVICES, chan, "SYSFS\n"); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int chan_match(struct device *dev, const struct device_driver *driver) ++#else + static int chan_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + struct dahdi_chan *chan; + +diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c +index 7477ebc..246514c 100644 +--- a/drivers/dahdi/dahdi-sysfs.c ++++ b/drivers/dahdi/dahdi-sysfs.c +@@ -42,7 +42,11 @@ module_param(tools_rootdir, charp, 0444); + MODULE_PARM_DESC(tools_rootdir, + "root directory of all tools paths (default /)"); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int span_match(struct device *dev, const struct device_driver *driver) ++#else + static int span_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + return 1; + } +diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c +index 177048b..f78a15e 100644 +--- a/drivers/dahdi/xpp/xbus-sysfs.c ++++ b/drivers/dahdi/xpp/xbus-sysfs.c +@@ -397,7 +397,11 @@ static struct attribute *xbus_dev_attrs[] = { + ATTRIBUTE_GROUPS(xbus_dev); + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int astribank_match(struct device *dev, const struct device_driver *driver) ++#else + static int astribank_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n", + dev_name(dev), driver->name); +@@ -771,7 +775,11 @@ static DEVICE_ATTR_READER(refcount_xpd_show, dev, buf) + return len; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int xpd_match(struct device *dev, const struct device_driver *driver) ++#else + static int xpd_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + struct xpd_driver *xpd_driver; + xpd_t *xpd; +-- +2.39.5 + diff --git a/package/dante/dante.hash b/package/dante/dante.hash index a76018fdb6..c9d86608d9 100644 --- a/package/dante/dante.hash +++ b/package/dante/dante.hash @@ -1,5 +1,5 @@ # From https://www.inet.no/dante/download.html -sha256 418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d dante-1.4.3.tar.gz +sha256 1973c7732f1f9f0a4c0ccf2c1ce462c7c25060b25643ea90f9b98f53a813faec dante-1.4.4.tar.gz # Hash for license file -sha256 05e2db26147a8575005f090aada119ea6cb40a4382164929d647f00abef3bdfd LICENSE +sha256 49034b51407f6e51a07aed87c3c00c0889294348cd5e99d78d6b6f62746ff3fc LICENSE diff --git a/package/dante/dante.mk b/package/dante/dante.mk index bae46c5a71..2f4e75d1e5 100644 --- a/package/dante/dante.mk +++ b/package/dante/dante.mk @@ -4,7 +4,7 @@ # ################################################################################ -DANTE_VERSION = 1.4.3 +DANTE_VERSION = 1.4.4 DANTE_SITE = http://www.inet.no/dante/files DANTE_LICENSE = BSD-3-Clause DANTE_LICENSE_FILES = LICENSE diff --git a/package/daq/0003-daq-fix-incompatible-pointer-type-error.patch b/package/daq/0003-daq-fix-incompatible-pointer-type-error.patch new file mode 100644 index 0000000000..a15d325cd6 --- /dev/null +++ b/package/daq/0003-daq-fix-incompatible-pointer-type-error.patch @@ -0,0 +1,31 @@ +Fix daq incompatible pointer type error when gcc option +'-Wincompatible-pointer-types is set: + +| ../../daq-2.0.7/os-daq-modules/daq_nfq.c: In function 'SetPktHdr': +| ../../daq-2.0.7/os-daq-modules/daq_nfq.c:394:37: error: passing argument 2 + of 'nfq_get_payload' from incompatible pointer type [-Wincompatible-pointer-types] +| 394 | int len = nfq_get_payload(nfad, (char**)pkt); +| | ^~~~~~~~~~~ +| | | +| | char ** + +Signed-off-by: Kai Kang +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch?h=master +Signed-off-by: Thomas Perale +--- + os-daq-modules/daq_nfq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c +index 4de94b6..a6de2f3 100644 +--- a/os-daq-modules/daq_nfq.c ++++ b/os-daq-modules/daq_nfq.c +@@ -391,7 +391,7 @@ static inline int SetPktHdr ( + DAQ_PktHdr_t* hdr, + uint8_t** pkt + ) { +- int len = nfq_get_payload(nfad, (char**)pkt); ++ int len = nfq_get_payload(nfad, (unsigned char**)pkt); + + if ( len <= 0 ) + return -1; diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 84a787eeba..4e90ae722e 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ea48cedafbf43186f4a8d1afc99b33b671adee99519658446022e6f63bd9eda9 darkhttpd-1.15.tar.gz -sha256 1ecf63e8f84fd60ac7215e04195b9a61dcb47176ea65df26547582027f6c1dee COPYING +sha256 4fee9927e2d8bb0a302f0dd62f9ff1e075748fa9f5162c9481a7a58b41462b56 darkhttpd-1.17.tar.gz +sha256 b1e109687717a71d7f65355b0ec9f61aa02263c3cf66e23f7b33e6f9abdbce5f COPYING diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index 956ef4042c..ca8495f5c4 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.15 +DARKHTTPD_VERSION = 1.17 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) DARKHTTPD_LICENSE = ISC DARKHTTPD_LICENSE_FILES = COPYING diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index a32f2ae716..22dbf7220d 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/1.5.0/dav1d-1.5.0.tar.xz.sha256 -sha256 14bd6f5157808ed9aedcafbe50df689d304fd4810ac20be6eec1ab037436afd6 dav1d-1.5.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.5.2/dav1d-1.5.2.tar.xz.sha256 +sha256 cce88ebcffd3f790bde49caa75f97b9cc2dd54ca8f57e38c62707266ec71bc4e dav1d-1.5.2.tar.xz # Locally computed -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING +sha256 dd92c3c2247c5651606fc23a5e2d6a1ebc5ace9a3e49cbde0e12f05ad1cb1ee5 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 7358690b62..f9cfd171d5 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.5.0 +DAV1D_VERSION = 1.5.2 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 4ed9d73bac..56dfcbae82 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 c38456ed70023d93e6e689087e4bbe030f1650bbda9de7c035d6f4ebac788379 dbus-cxx-2.4.0.tar.gz +sha256 a739a29efc9ad42ba6518b38e13bb44c12947d4f7503d211c12823233e277987 dbus-cxx-2.5.2.tar.gz sha256 99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk index 8e2b4f70fa..e6aae036bb 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.4.0 +DBUS_CXX_VERSION = 2.5.2 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) DBUS_CXX_LICENSE = LGPL-3.0+ or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE @@ -25,4 +25,11 @@ else DBUS_CXX_CONF_OPTS += -DENABLE_GLIB_SUPPORT=OFF endif +ifeq ($(BR2_PACKAGE_LIBUV),y) +DBUS_CXX_CONF_OPTS += -DENABLE_UV_SUPPORT=ON +DBUS_CXX_DEPENDENCIES += libuv +else +DBUS_CXX_CONF_OPTS += -DENABLE_UV_SUPPORT=OFF +endif + $(eval $(cmake-package)) diff --git a/package/dbus-glib/dbus-glib.hash b/package/dbus-glib/dbus-glib.hash index 072dde3d69..1ce3c6b63d 100644 --- a/package/dbus-glib/dbus-glib.hash +++ b/package/dbus-glib/dbus-glib.hash @@ -1,5 +1,7 @@ # Locally calculated after checking pgp signature -sha256 7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a dbus-glib-0.112.tar.gz +sha256 c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c dbus-glib-0.114.tar.gz # Locally calculated -sha256 589bc300214a8b9ecd121f51570fe6342617487fd8fc0fb1f4ec26a13d5b96f8 COPYING +sha256 095e2affe38031d0ca80db5dbf06881306e5f5125f6ba422297396bdfe02b3d5 COPYING +sha256 93bb4f7417aa775bab9026cc3d0af28aeb64451fc5a8ec651876785edd8eaf9b LICENSES/AFL-2.1.txt +sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 LICENSES/GPL-2.0-or-later.txt diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 0d247e1d89..5c13c0b37f 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -4,11 +4,14 @@ # ################################################################################ -DBUS_GLIB_VERSION = 0.112 +DBUS_GLIB_VERSION = 0.114 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+ -DBUS_GLIB_LICENSE_FILES = COPYING +DBUS_GLIB_LICENSE_FILES = \ + COPYING \ + LICENSES/AFL-2.1.txt \ + LICENSES/GPL-2.0-or-later.txt DBUS_GLIB_CPE_ID_VENDOR = freedesktop DBUS_GLIB_CONF_ENV = \ diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c60bf473cd..2002e707f0 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -34,6 +34,7 @@ DBUS_CONF_OPTS = \ --disable-doxygen-docs \ --with-system-socket=/run/dbus/system_bus_socket \ --with-system-pid-file=/run/messagebus.pid \ + --with-session-socket-dir=/tmp \ --runstatedir=/run ifeq ($(BR2_STATIC_LIBS),y) diff --git a/package/dejavu/Config.in b/package/dejavu/Config.in index 5d21e56088..ca549d30e4 100644 --- a/package/dejavu/Config.in +++ b/package/dejavu/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_DEJAVU maintaining the original look and feel through the process of collaborative development, under a Free license. - http://dejavu-fonts.org + https://dejavu-fonts.github.io/ if BR2_PACKAGE_DEJAVU diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 408286e3b4..8206721fe2 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -12,11 +12,9 @@ DELVE_DEPENDENCIES = host-pkgconf DELVE_TAGS = cgo DELVE_BUILD_TARGETS = cmd/dlv -DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) HOST_DELVE_TAGS = cgo HOST_DELVE_BUILD_TARGETS = cmd/dlv -HOST_DELVE_INSTALL_BINS = $(notdir $(HOST_DELVE_BUILD_TARGETS)) $(eval $(golang-package)) $(eval $(host-golang-package)) diff --git a/package/depot-tools/0001-gerrit_util.py-fix-importing-socks.patch b/package/depot-tools/0001-gerrit_util.py-fix-importing-socks.patch new file mode 100644 index 0000000000..46a1fe78d0 --- /dev/null +++ b/package/depot-tools/0001-gerrit_util.py-fix-importing-socks.patch @@ -0,0 +1,32 @@ +From e52f67026d7ce5b30887e1cfe486ed994169119d Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 4 Nov 2025 11:58:37 +0100 +Subject: [PATCH] gerrit_util.py: fix importing socks + +As of commit 1a6ff781792099e9e14d7beb610bd99112b17b07, +httplib2 removed the internal copy of socksipy module. + +The commit message specifically states to install pysocks. + +Upstream: unsubmitted +Signed-off-by: Adam Duskett +--- + gerrit_util.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gerrit_util.py b/gerrit_util.py +index eef2f5749..d866bc47a 100644 +--- a/gerrit_util.py ++++ b/gerrit_util.py +@@ -35,7 +35,7 @@ from typing import NamedTuple, List, Optional + from typing import Tuple, TypedDict, cast + + import httplib2 +-import httplib2.socks ++import socks + + import auth + import gclient_utils +-- +2.51.1 + diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash index d20c3ea336..cd5e34d26e 100644 --- a/package/depot-tools/depot-tools.hash +++ b/package/depot-tools/depot-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57c82ce07695d439ed9ea6e4dd8a7321203eea45eb3e1ea1c3f461c630dd1460 depot-tools-1b58dc68659445b1d97d8341f8158be25eab4957-git4.tar.gz +sha256 d281138bad9dab92f3f67f5d62f8d7fe02bccd9bef1ab2dae4acf93c712967bb depot-tools-097e20723774957f21ac6d1808fcd0a91e8c7630-git4.tar.gz sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 4bc9d7a470..a6d57a6e3b 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEPOT_TOOLS_VERSION = 1b58dc68659445b1d97d8341f8158be25eab4957 +DEPOT_TOOLS_VERSION = 097e20723774957f21ac6d1808fcd0a91e8c7630 DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause @@ -14,6 +14,7 @@ HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ host-python-httplib2 \ host-python-pyparsing \ + host-python-pysocks \ host-python-six define HOST_DEPOT_TOOLS_INSTALL_CMDS diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index b3b7fe3203..ec1ae490f7 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -27,10 +27,17 @@ define DHCP_LIBTOOL_AUTORECONF cp $(@D)/configure.ac+lt $(@D)/configure.ac endef +# gcc-15 defaults to -std=gnu23 which introduces build failures. +# We force "-std=gnu17" for gcc version supporting it. Earlier gcc +# versions will work, since they are using the older standard. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) +DHCP_GCC_OPTS = -std=gnu17 +endif + DHCP_CONF_ENV = \ CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ - CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1' + CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1 $(DHCP_GCC_OPTS)' DHCP_BIND_EXTRA_CONFIG = \ --build=$(GNU_HOST_NAME) \ diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in index 8612d4ba81..dda93ba1cb 100644 --- a/package/dhcpcd/Config.in +++ b/package/dhcpcd/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_DHCPCD if BR2_PACKAGE_DHCPCD config BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP - bool + bool "enable privilege separation" default y depends on BR2_USE_MMU # Audit headers were only added in recent kernels for some arches @@ -20,7 +20,6 @@ config BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 depends on !(BR2_microblazeel || BR2_microblazebe) || \ BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - depends on !BR2_nios2 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 depends on !BR2_or1k || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 depends on !BR2_sh || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 depends on !BR2_xtensa || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index d29f49fd28..a5d80b135d 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.8 -sha256 d8dddf9f971a8d9ff828f33d8fa9f6d9a892a4a1429d230e9efb2be97dd0e313 dhcpcd-10.0.8.tar.xz +# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.2.4 +sha256 6721e606609226dbf4d864a78802a9e96beec0ee034a1bd84138b3e037bba7d9 dhcpcd-10.2.4.tar.xz # Locally calculated -sha256 a7d6da3a202cdd38eaab0bcea4d25f60d002980f3785b3e896d9bf387f093ac8 LICENSE +sha256 3aeab006b01c1573b42d4440d7edad0adfe61ad05848ca82e02e745424a2b4fa LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 48a418d4ad..5504914003 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 10.0.8 +DHCPCD_VERSION = 10.2.4 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION) DHCPCD_DEPENDENCIES = host-pkgconf diff --git a/package/dhrystone/dhrystone.mk b/package/dhrystone/dhrystone.mk index d54c8d94e8..f00553d566 100644 --- a/package/dhrystone/dhrystone.mk +++ b/package/dhrystone/dhrystone.mk @@ -14,7 +14,7 @@ define DHRYSTONE_EXTRACT_CMDS endef define DHRYSTONE_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" $(MAKE) -C $(@D) endef define DHRYSTONE_INSTALL_TARGET_CMDS diff --git a/package/dht/dht.hash b/package/dht/dht.hash index 2b641b9dcb..dec9a97124 100644 --- a/package/dht/dht.hash +++ b/package/dht/dht.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 caba469a784a5c359c084099fdc025cfe09b1faec2ba9ba257b7384351c43c0a dht-0.27.tar.gz +sha256 c61493be7f036b59df0c921829f15e5c57b1e29d99bca737923e83d028fd736c dht-0.27-2-g38c9f261d9b58b76b9eaf85f84ec1b35151a1eac.tar.gz sha256 06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6 LICENCE diff --git a/package/dht/dht.mk b/package/dht/dht.mk index 4f78f027c7..9f4e8b1bbd 100644 --- a/package/dht/dht.mk +++ b/package/dht/dht.mk @@ -4,8 +4,8 @@ # ################################################################################ -DHT_VERSION = 0.27 -DHT_SITE = $(call github,jech,dht,dht-$(DHT_VERSION)) +DHT_VERSION = 0.27-2-g38c9f261d9b58b76b9eaf85f84ec1b35151a1eac +DHT_SITE = $(call github,transmission,dht,dht-$(DHT_VERSION)) DHT_LICENSE = MIT DHT_LICENSE_FILES = LICENCE DHT_INSTALL_STAGING = YES diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index df160a124d..81a3bdd1ff 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,6 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00009.html -sha1 c16a9cf107ad1f0f791b6d00852dc5e961c1c451 diffutils-3.10.tar.xz +# From https://lists.gnu.org/archive/html/info-gnu/2025-04/msg00005.html +sha1 c2f302726d2709c6881c4657430a671abe5eedfa diffutils-3.12.tar.xz # Locally calculated after checking pgp signature -sha256 90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e diffutils-3.10.tar.xz +sha256 7c8b7f9fc8609141fdea9cece85249d308624391ff61dedaf528fcb337727dfd diffutils-3.12.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 1119266863..8ab74ce583 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,13 +4,14 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.10 +DIFFUTILS_VERSION = 3.12 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) DIFFUTILS_LICENSE = GPL-3.0+ DIFFUTILS_LICENSE_FILES = COPYING DIFFUTILS_CPE_ID_VENDOR = gnu +DIFFUTILS_CONF_ENV += gl_cv_func_strcasecmp_works=yes # Since glibc >= 2.26, don't try to use getopt_long replacement bundled # with diffutils. It will conflict with the one from glibc. diff --git a/package/dillo/Config.in b/package/dillo/Config.in index d06f2d1f51..1ebab8ab3f 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_DILLO Enable openssl package to gain https support. - http://www.dillo.org + https://dillo-browser.github.io/ comment "dillo needs a toolchain w/ C++" depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU diff --git a/package/dillo/dillo.hash b/package/dillo/dillo.hash index fa46702a63..50559bf857 100644 --- a/package/dillo/dillo.hash +++ b/package/dillo/dillo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b dillo-3.0.5.tar.bz2 +sha256 1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf dillo-3.2.0.tar.bz2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index a6885f5c14..ce8660c6cb 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -4,22 +4,20 @@ # ################################################################################ -DILLO_VERSION = 3.0.5 +DILLO_VERSION = 3.2.0 DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2 -DILLO_SITE = http://www.dillo.org/download +DILLO_SITE = https://github.com/dillo-browser/dillo/releases/download/v$(DILLO_VERSION) DILLO_LICENSE = GPL-3.0+ DILLO_LICENSE_FILES = COPYING -# configure.ac gets patched, so autoreconf is necessary -DILLO_AUTORECONF = YES DILLO_DEPENDENCIES = fltk zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config ifeq ($(BR2_PACKAGE_OPENSSL),y) -DILLO_CONF_OPTS += --enable-ssl +DILLO_CONF_OPTS += --enable-tls DILLO_DEPENDENCIES += openssl else -DILLO_CONF_OPTS += --disable-ssl +DILLO_CONF_OPTS += --disable-tls endif ifeq ($(BR2_PACKAGE_LIBPNG),y) diff --git a/package/directfb-examples/0001-remove-bzero.patch b/package/directfb-examples/0001-remove-bzero.patch deleted file mode 100644 index 41616b5c31..0000000000 --- a/package/directfb-examples/0001-remove-bzero.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - src/df_knuckles/matrix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: directfb-examples-1.2.0/src/df_knuckles/matrix.c -=================================================================== ---- directfb-examples-1.2.0.orig/src/df_knuckles/matrix.c -+++ directfb-examples-1.2.0/src/df_knuckles/matrix.c -@@ -19,7 +19,7 @@ - static float Cosine[3600]; - static float Sine[3600]; - --#define M_CLEAR(m) bzero(m, MATRIX_SIZE) -+#define M_CLEAR(m) memset(m, 0, MATRIX_SIZE) - #define M_IDENTITY(m) memcpy(m, IdentityMatrix, MATRIX_SIZE) - - static void MultiplyMatrix(float *A, float *B) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in deleted file mode 100644 index 4d5de03068..0000000000 --- a/package/directfb-examples/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DIRECTFB_EXAMPLES - bool "directfb examples" - depends on BR2_PACKAGE_DIRECTFB - help - The DirectFB-examples package contains a set of simple - DirectFB applications that can be used to test and demonstrate - various DirectFB features. As of 4 October 2015, DirectFB's - website http://www.directfb.org/ is down. See alternative site - listed below. - - http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.hash b/package/directfb-examples/directfb-examples.hash deleted file mode 100644 index 9c7f7c25a7..0000000000 --- a/package/directfb-examples/directfb-examples.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a DirectFB-examples-1.7.0.tar.gz -sha256 f91483684678e8aa8ccc4ee0ede3140b0494f8305e162695c7e6e3f83e54f236 COPYING diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk deleted file mode 100644 index c8d09b3e33..0000000000 --- a/package/directfb-examples/directfb-examples.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# directfb-examples -# -################################################################################ - -DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples -DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz -DIRECTFB_EXAMPLES_LICENSE = MIT -DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING -DIRECTFB_EXAMPLES_DEPENDENCIES = directfb - -ifeq ($(BR2_STATIC_LIBS),y) -DIRECTFB_EXAMPLES_CONF_OPTS += LIBS=-lstdc++ -endif - -$(eval $(autotools-package)) diff --git a/package/directfb/0001-fix-missing-davinci-voodoo-header.patch b/package/directfb/0001-fix-missing-davinci-voodoo-header.patch deleted file mode 100644 index 6ad4958f84..0000000000 --- a/package/directfb/0001-fix-missing-davinci-voodoo-header.patch +++ /dev/null @@ -1,1726 +0,0 @@ -The archive of directfb-1.6.3 is still missing some header files against -the tagged git tree of directfb. The following files are missing. - -gfxdrivers/davinci/davinci_c64x.h -gfxdrivers/davinci/davincifb.h -gfxdrivers/davinci/davinci_gfxdriver.h -tests/voodoo/voodoo_test.h - -The headers of course are needed to be able to build every module of -directfb. The headers are taken from the git tree of directfb -http://git.directfb.org/?p=core/DirectFB.git;a=commit;h=38b784549bc59bb07c58bb29667cb658695d39a7, -tag DIRECTFB_1_6_3, SHA1ID 38b784549bc59bb07c58bb29667cb658695d39a7. - -Signed-off-by: Carsten Schoenert - -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h 2013-04-07 21:33:25.928530187 +0200 -@@ -0,0 +1,935 @@ -+/* -+ TI Davinci driver - C64X+ DSP Library -+ -+ (c) Copyright 2008 directfb.org -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp and -+ Olaf Dreesen . -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ version 2 as published by the Free Software Foundation. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_C64X_H__ -+#define __DAVINCI_C64X_H__ -+ -+#include -+ -+#include -+ -+#include -+#include -+ -+#include -+ -+#define mb() __asm__ __volatile__ ("" : : : "memory") -+ -+/**********************************************************************************************************************/ -+ -+typedef struct { -+ int magic; -+ -+ int fd; -+ c64xTaskControl *ctl; -+ void *mem; -+ -+ c64xTask *QueueL; -+} DavinciC64x; -+ -+typedef struct { -+ int magic; -+ unsigned int max_tasks; -+ unsigned int num_tasks; -+ c64xTask *tasks; -+} DavinciC64xTasks; -+ -+typedef enum { -+ C64X_TEF_NONE = 0x0000, -+ C64X_TEF_RESET = 0x0001 -+} DavinciC64xEmitFlags; -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_open ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_close ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks, -+ unsigned int size ); -+ -+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x, -+ DavinciC64xTasks *tasks, -+ DavinciC64xEmitFlags flags ); -+ -+/**********************************************************************************************************************/ -+ -+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" }; -+ -+static inline c64xTask * -+c64x_get_task( DavinciC64x *c64x ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ c64xTask *task = &c64x->QueueL[idx]; -+ int loops = 0; -+ uint32_t idle = 0; -+ -+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */ -+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) { -+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) { -+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp]; -+ -+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n", -+ ctl->QL_dsp, -+ (dsp_task->c64x_function >> 2) & 0x3fff, -+ state_names[dsp_task->c64x_function & 3], -+ ctl->QL_arm, -+ (task->c64x_function >> 2) & 0x3fff, -+ state_names[task->c64x_function & 3] ); -+ -+ break; -+ } -+ -+ idle = ctl->idlecounter; -+ -+ /* Queue is full, waiting 10-20ms should not be too bad. */ -+ if (loops++ > 10) -+ usleep( 5000 ); -+ } -+ -+ return task; -+} -+ -+static inline void -+c64x_submit_task( DavinciC64x *c64x, c64xTask *task ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ -+ mb(); -+ -+ ctl->QL_arm = next; -+ -+ mb(); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_wb_inv_range( DavinciC64x *c64x, -+ unsigned long start, -+ u32 length, -+ u32 func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = start; -+ task->c64x_arg[1] = length; -+ task->c64x_arg[2] = func; -+ -+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_write_back_all( DavinciC64x *c64x ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_load_block__L( DavinciC64xTasks *tasks, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_load_block( DavinciC64x *c64x, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fetch_uyvy( DavinciC64x *c64x, -+ unsigned long dest, -+ unsigned long source, -+ u32 pitch, -+ u32 height, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = source; -+ task->c64x_arg[2] = pitch; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_mc( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long source0, -+ unsigned long source1, -+ u32 spitch, -+ u32 height, -+ int func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = source0; -+ task->c64x_arg[3] = source1; -+ task->c64x_arg[4] = spitch; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = func | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame( DavinciC64x *c64x, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_motion_block( DavinciC64x *c64x, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_dva_idct( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ -+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ task->c64x_arg[3] = flags; -+ -+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dither_argb( DavinciC64x *c64x, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_stretch_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_blend_32( DavinciC64x *c64x, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+#endif -+ -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h directfb-1.6.3/gfxdrivers/davinci/davincifb.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davincifb.h 2013-04-07 21:33:21.488622184 +0200 -@@ -0,0 +1,581 @@ -+/* -+ * Copyright (C) 2006 Texas Instruments Inc -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option)any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * File: davincifb.h -+ */ -+ -+#ifndef DAVINVI_VPBE_H -+#define DAVINVI_VPBE_H -+ -+/* include Linux files */ -+#include -+ -+/* define the custom FBIO_WAITFORVSYNC ioctl */ -+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) -+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect) -+ -+/* Backported IOCTLS. */ -+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t) -+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t) -+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params) -+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t) -+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params) -+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t) -+ -+typedef struct zoom_params { -+ u_int32_t window_id; -+ u_int32_t zoom_h; -+ u_int32_t zoom_v; -+} zoom_params_t; -+ -+typedef struct vpfe_resizer_params -+{ -+ u_int32_t rsz_cnt; //busy-lock -+ u_int32_t out_size; //busy-lock -+ u_int32_t in_start; //busy-lock -+ u_int32_t in_size; //busy-lock -+ u_int32_t sdr_inadd; //shadowed -+ u_int32_t sdr_inoff; //shadowed -+ u_int32_t sdr_outadd; //shadowed -+ u_int32_t sdr_outoff; //shadowed -+ u_int32_t hfilt[16]; //busy-lock -+ u_int32_t vfilt[16]; //busy-lock -+ u_int32_t yenh; //busy-lock -+} vpfe_resizer_params_t; -+ -+typedef struct fb_set_start { -+ int offset; /* offset from smem_start */ -+ unsigned long physical; /* absolute physical address when offset < 0 */ -+ -+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, -+ output: sync counter of actual change or 0 if still pending */ -+} fb_set_start_t; -+ -+ -+#ifdef _IOC_TYPECHECK -+#undef _IOC_TYPECHECK -+#define _IOC_TYPECHECK(x) (sizeof(x)) -+#endif -+ -+#define RAM_CLUT_SIZE 256*3 -+#define FBIO_ENABLE_DISABLE_WIN \ -+ _IOW('F', 0x30, unsigned char) -+#define FBIO_SET_BITMAP_BLEND_FACTOR \ -+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t) -+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \ -+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE) -+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \ -+ _IOW('F', 0x33, unsigned int) -+#define FBIO_GET_BLINK_INTERVAL \ -+ _IOR('F', 0x34, vpbe_blink_option_t) -+#define FBIO_SET_BLINK_INTERVAL \ -+ _IOW('F', 0x35, vpbe_blink_option_t) -+#define FBIO_GET_VIDEO_CONFIG_PARAMS \ -+ _IOR('F', 0x36, vpbe_video_config_params_t) -+#define FBIO_SET_VIDEO_CONFIG_PARAMS \ -+ _IOW('F', 0x37, vpbe_video_config_params_t) -+#define FBIO_GET_BITMAP_CONFIG_PARAMS \ -+ _IOR('F', 0x38, vpbe_bitmap_config_params_t) -+#define FBIO_SET_BITMAP_CONFIG_PARAMS \ -+ _IOW('F', 0x39, vpbe_bitmap_config_params_t) -+#define FBIO_SET_DCLK \ -+ _IOW('F', 0x40, vpbe_dclk_t) -+#define FBIO_SET_INTERFACE \ -+ _IOW('F', 0x41, unsigned char) -+#define FBIO_GET_INTERFACE \ -+ _IOR('F', 0x42, unsigned char) -+#define FBIO_QUERY_TIMING \ -+ _IOWR('F', 0x43, struct vpbe_mode_info) -+#define FBIO_SET_TIMING \ -+ _IOW('F', 0x44, struct vpbe_fb_videomode) -+#define FBIO_GET_TIMING \ -+ _IOR('F', 0x45, struct vpbe_fb_videomode) -+#define FBIO_SET_VENC_CLK_SOURCE \ -+ _IOW('F', 0x46, unsigned char) -+#define FBIO_SET_BACKG_COLOR \ -+ _IOW('F', 0x47, vpbe_backg_color_t) -+#define FBIO_ENABLE_DISPLAY \ -+ _IOW('F', 0x48, unsigned char) -+#define FBIO_SETPOS \ -+ _IOW('F', 0x49, u_int32_t) -+#define FBIO_SET_CURSOR \ -+ _IOW('F', 0x50, struct fb_cursor) -+#define FBIO_SET_START \ -+ _IOW('F', 0x66, struct fb_set_start) -+ -+/* -+ * Defines and Constants -+ */ -+#ifdef __KERNEL__ -+#define DAVINCIFB_DEVICE "davincifb" -+#define DAVINCIFB_DRIVER "davincifb" -+ -+#define MULTIPLE_BUFFERING 1 -+ -+#ifdef MULTIPLE_BUFFERING -+#define DOUBLE_BUF 2 -+#define TRIPLE_BUF 3 -+#else -+#define DOUBLE_BUF 1 -+#define TRIPLE_BUF 1 -+#endif -+ -+/* usage: if (is_win(info->fix.id, OSD0)) ... */ -+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0) -+ -+/* -+ * display controller register I/O routines -+ */ -+u32 dispc_reg_in(u32 offset); -+u32 dispc_reg_out(u32 offset, u32 val); -+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask); -+ -+#endif /*__KERNEL__*/ -+ -+/* Error return codes */ -+#define VPBE_INVALID_PARA_VALUE 700 -+#define VPBE_WRONG_WINDOW_ID 701 -+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702 -+#define VPBE_INSUFFICIENT_CLUT_VALUES 703 -+#define VPBE_CLUT_WRITE_TIMEOUT 704 -+#define VPBE_VID0_BUF_ADR_NULL 705 -+#define VPBE_WINDOW_NOT_DISABLED 706 -+#define VPBE_WINDOW_NOT_ENABLED 707 -+ -+#ifndef __KERNEL__ -+/* Window ID definations */ -+#define OSD0 0 -+#define VID0 1 -+#define OSD1 2 -+#define VID1 3 -+#endif -+ -+/* There are 4 framebuffers, each represented by an fb_info and -+ * a dm_win_info structure */ -+#define OSD0_FBNAME "dm_osd0_fb" -+#define OSD1_FBNAME "dm_osd1_fb" -+#define VID0_FBNAME "dm_vid0_fb" -+#define VID1_FBNAME "dm_vid1_fb" -+ -+/* FIXME: Digital LCD RGB matrix coefficients */ -+#define DLCD_DGY_VAL 0 -+#define DLCD_DRV_VAL 0 -+#define DLCD_DGU_VAL 0 -+#define DLCD_DBU_VAL 0 -+ -+/* Defines for bitmap format */ -+#define VPBE_BITMAP_BIT_1 1 -+#define VPBE_BITMAP_BIT_2 2 -+#define VPBE_BITMAP_BIT_4 4 -+#define VPBE_BITMAP_BIT_8 8 -+#define VPBE_BITMAP_RGB565 16 -+#define VPBE_VIDEO_YUV422 16 -+#define VPBE_VIDEO_RGB888 24 -+ -+/* Defines foe cursor parameter validation*/ -+#define MAX_CURSOR_WIDTH 0x3FF -+#define MAX_CURSOR_HEIGHT 0x1FF -+#define MAX_CURSOR_LINEWIDTH 7 -+ -+#define BASEX 0x80 -+#define BASEY 0x12 -+#define BASEX_DLCD 0x59 -+#define BASEY_DLCD 0x22 -+ -+/* -+ * Enumerations -+ */ -+/* Enum for blending factor */ -+typedef enum vpbe_blend_factor { -+ OSD_CONTRIBUTION_ZERO = 0, -+ OSD_CONTRIBUTION_1_BY_8 = 1, -+ OSD_CONTRIBUTION_2_BY_8 = 2, -+ OSD_CONTRIBUTION_3_BY_8 = 3, -+ OSD_CONTRIBUTION_4_BY_8 = 4, -+ OSD_CONTRIBUTION_5_BY_8 = 5, -+ OSD_CONTRIBUTION_6_BY_8 = 6, -+ OSD_CONTRIBUTION_ONE = 7 -+} vpbe_blend_factor_t; -+ -+/* Enum for Boolean variables */ -+typedef enum { -+ SET_0 = 0, -+ SET_1 = 1 -+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT; -+ -+/* Defines for Display Interface */ -+#define PRGB 0 -+#define COMPOSITE 1 -+#define SVIDEO 2 -+#define COMPONENT 3 -+#define RGB 4 -+#define YCC16 5 -+#define YCC8 6 -+#define SRGB 7 -+#define EPSON 8 -+#define CASIO1G 9 -+#define UDISP 10 -+#define STN 11 -+#define VPBE_MAX_INTERFACES 12 -+ -+/* Defines for Display Mode */ -+#define LCD 0 -+#define NTSC 1 -+#define PAL 2 -+#define P525 3 -+#define P625 4 -+ -+#define DEFAULT_MODE 0 -+#define P480 0 -+#define P400 1 -+#define P350 2 -+#define NON_EXISTING_MODE 255 -+/* Enable/Disable enum */ -+typedef enum { -+ VPBE_DISABLE = 0, -+ VPBE_ENABLE = 1 -+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING; -+ -+typedef enum clk_source { -+ CLK_SOURCE_CLK27 = 0, -+ CLK_SOURCE_CLK54 = 1, -+ CLK_SOURCE_VPBECLK = 2 -+} CLK_SOURCE; -+ -+/* -+ * Structures and Union Definitions -+ */ -+ -+/* Structure for transparency and the blending factor for the bitmap window */ -+typedef struct vpbe_bitmap_blend_params { -+ unsigned int colorkey; /* color key to be blend */ -+ unsigned int enable_colorkeying; /* enable color keying */ -+ unsigned int bf; /* valid range from 0 to 7 only. */ -+} vpbe_bitmap_blend_params_t; -+ -+/* Structure for window expansion */ -+typedef struct vpbe_win_expansion { -+ EXPANSION horizontal; -+ EXPANSION vertical; /* 1: Enable 0:disable */ -+} vpbe_win_expansion_t; -+ -+/* Structure for OSD window blinking options */ -+typedef struct vpbe_blink_option { -+ BLINKING blinking; /* 1: Enable blinking 0: Disable */ -+ unsigned int interval; /* Valid only if blinking is 1 */ -+} vpbe_blink_option_t; -+ -+/* Structure for DCLK parameters */ -+typedef struct vpbe_dclk { -+ unsigned char dclk_pattern_width; -+ unsigned int dclk_pattern0; -+ unsigned int dclk_pattern1; -+ unsigned int dclk_pattern2; -+ unsigned int dclk_pattern3; -+} vpbe_dclk_t; -+ -+/* Structure for display format */ -+typedef struct vpbe_display_format { -+ unsigned char interface; /* Output interface type */ -+ unsigned char mode; /* output mode */ -+} vpbe_display_format_t; -+ -+/* Structure for background color */ -+typedef struct vpbe_backg_color { -+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */ -+ unsigned char color_offset; /* index of color */ -+} vpbe_backg_color_t; -+ -+/* Structure for Video window configurable parameters */ -+typedef struct vpbe_video_config_params { -+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */ -+ /* 0: cb cr 1: cr cb */ -+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */ -+} vpbe_video_config_params_t; -+ -+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/ -+typedef union vpbe_clut_idx { -+ struct _for_4bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char bitmap_val_1; -+ unsigned char bitmap_val_2; -+ unsigned char bitmap_val_3; -+ unsigned char bitmap_val_4; -+ unsigned char bitmap_val_5; -+ unsigned char bitmap_val_6; -+ unsigned char bitmap_val_7; -+ unsigned char bitmap_val_8; -+ unsigned char bitmap_val_9; -+ unsigned char bitmap_val_10; -+ unsigned char bitmap_val_11; -+ unsigned char bitmap_val_12; -+ unsigned char bitmap_val_13; -+ unsigned char bitmap_val_14; -+ unsigned char bitmap_val_15; -+ } for_4bit_bimap; -+ struct _for_2bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[4]; -+ unsigned char bitmap_val_1; -+ unsigned char dummy1[4]; -+ unsigned char bitmap_val_2; -+ unsigned char dummy2[4]; -+ unsigned char bitmap_val_3; -+ } for_2bit_bimap; -+ struct _for_1bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[14]; -+ unsigned char bitmap_val_1; -+ } for_1bit_bimap; -+} vpbe_clut_idx_t; -+ -+/* Structure for bitmap window configurable parameters */ -+typedef struct vpbe_bitmap_config_params { -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* Attenuation value for YUV o/p for bitmap window */ -+ unsigned char attenuation_enable; -+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+} vpbe_bitmap_config_params_t; -+ -+/* Unioun for video/OSD configuration parameters */ -+typedef union vpbe_conf_params { -+ -+ struct vpbe_video_params { -+ CB_CR_ORDER cb_cr_order; -+ /* HZ/VT Expansion enable disable */ -+ vpbe_win_expansion_t exp_info; -+ } video_params; -+ -+ struct vpbe_bitmap_params { -+ /* Attenuation value for YUV o/p */ -+ ATTENUATION attenuation_enable; -+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* 0: OSD window is bitmap window */ -+ /* 1: OSD window is attribute window */ -+ ATTRIBUTE enable_attribute; -+ /* To hold bps value. -+ Used to switch back from attribute to bitmap. */ -+ unsigned int stored_bits_per_pixel; -+ /* Blending information */ -+ vpbe_bitmap_blend_params_t blend_info; -+ /* OSD Blinking information */ -+ vpbe_blink_option_t blink_info; -+ } bitmap_params; -+ -+} vpbe_conf_params_t; -+ -+typedef struct vpbe_video_params vpbe_video_params_t; -+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t; -+ -+/* Structure to hold window position */ -+typedef struct vpbe_window_position { -+ unsigned int xpos; /* X position of the window */ -+ unsigned int ypos; /* Y position of the window */ -+} vpbe_window_position_t; -+ -+#ifdef __KERNEL__ -+/* Structure for each window */ -+typedef struct vpbe_dm_win_info { -+ struct fb_info info; -+ vpbe_window_position_t win_pos; /* X,Y position of window */ -+ /* Size of window is already there in var_info structure. */ -+ -+ dma_addr_t fb_base_phys; /*framebuffer area */ -+ unsigned int fb_base; /*window memory pointer */ -+ unsigned int fb_size; /*memory size */ -+ unsigned int pseudo_palette[17]; -+ int alloc_fb_mem; -+ /*flag to identify if framebuffer area is fixed or not */ -+ unsigned long sdram_address; -+ struct vpbe_dm_info *dm; -+ unsigned char window_enable; /*Additions for all windows */ -+ zoom_params_t zoom; /*Zooming parameters */ -+ unsigned char field_frame_select; /*To select Field or frame */ -+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */ -+ vpbe_conf_params_t conf_params; -+ /*window configuration parameter union pointer */ -+} vpbe_dm_win_info_t; -+#endif /*__KERNEL__*/ -+ -+/* -+ * Videmode structure for display interface and mode settings -+ */ -+typedef struct vpbe_fb_videomode { -+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */ -+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */ -+ unsigned int xres; /* X Resolution of the display */ -+ unsigned int yres; /* Y Resolution of the display */ -+ unsigned int fps; /* frames per second */ -+ /* Timing Parameters applicable for std = 0 only */ -+ unsigned int left_margin; -+ unsigned int right_margin; -+ unsigned int upper_margin; -+ unsigned int lower_margin; -+ unsigned int hsync_len; -+ unsigned int vsync_len; -+ unsigned int sync; /* 0: hsync -ve/vsync -ve */ -+ /*1: hsync -ve/vsync +ve */ -+ /*2: hsync +ve/vsync -ve */ -+ /*3: hsync +ve/vsync +ve */ -+ unsigned int basepx; /* Display x,y start position */ -+ unsigned int basepy; -+/* 1= Mode s available in modelist 0=Mode is not available in modelist */ -+ unsigned int std; -+} vpbe_fb_videomode_t; -+ -+/* Structure to interface videomode to application*/ -+typedef struct vpbe_mode_info { -+ vpbe_fb_videomode_t vid_mode; -+ unsigned char interface; -+ unsigned char mode_idx; -+} vpbe_mode_info_t; -+ -+#ifdef __KERNEL__ -+/* -+ * Structure for the driver holding information of windows, -+ * memory base addresses etc. -+ */ -+typedef struct vpbe_dm_info { -+ vpbe_dm_win_info_t *osd0; -+ vpbe_dm_win_info_t *osd1; -+ vpbe_dm_win_info_t *vid0; -+ vpbe_dm_win_info_t *vid1; -+ -+/* to map the registers */ -+ dma_addr_t mmio_base_phys; -+ unsigned int mmio_base; -+ unsigned int mmio_size; -+ -+ wait_queue_head_t vsync_wait; -+ unsigned int vsync_cnt; -+ int timeout; -+ -+ /* this is the function that configures the output device (NTSC/PAL/LCD) -+ * for the required output format (composite/s-video/component/rgb) -+ */ -+ void (*output_device_config) (void); -+ -+ struct device *dev; -+ -+ vpbe_backg_color_t backg; /* background color */ -+ vpbe_dclk_t dclk; /*DCLK parameters */ -+ vpbe_display_format_t display; /*Display interface and mode */ -+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */ -+ char ram_clut[256][3]; /*RAM CLUT array */ -+ struct fb_cursor cursor; /* cursor config params from fb.h */ -+/*Flag that indicates whether any of the display is enabled or not*/ -+ int display_enable; -+} vpbe_dm_info_t; -+ -+/* -+ * Functions Definitions for 'davincifb' module -+ */ -+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *); -+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *); -+void init_display_function(vpbe_display_format_t *); -+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **); -+void set_vid0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd0_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+void set_win_enable(char *, unsigned int); -+int within_vid0_limits(u32, u32, u32, u32); -+void vpbe_set_display_default(void); -+#ifdef __KERNEL__ -+void set_win_position(char *, u32, u32, u32, u32); -+void change_win_param(int); -+void set_interlaced(char *, unsigned int); -+#endif /* __KERNEL__ */ -+ -+/* -+ * Function definations for 'osd' module -+ */ -+ -+int vpbe_enable_window(vpbe_dm_win_info_t *); -+int vpbe_disable_window(vpbe_dm_win_info_t *); -+int vpbe_vid_osd_select_field_frame(u8 *, u8); -+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *); -+int vpbe_bitmap_set_ram_clut(void); -+int vpbe_enable_disable_attribute_window(u32); -+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_set_cursor_params(struct fb_cursor *); -+int vpbe_set_vid_expansion(vpbe_win_expansion_t *); -+int vpbe_set_dclk(vpbe_dclk_t *); -+int vpbe_set_display_format(vpbe_display_format_t *); -+int vpbe_set_backg_color(vpbe_backg_color_t *); -+int vpbe_set_interface(u8); -+int vpbe_query_mode(vpbe_mode_info_t *); -+int vpbe_set_mode(struct vpbe_fb_videomode *); -+int vpbe_set_venc_clk_source(u8); -+void set_vid0_default_conf(void); -+void set_osd0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+/* -+ * Function definations for 'venc' module -+ */ -+ -+void davincifb_ntsc_composite_config(void); -+void davincifb_ntsc_svideo_config(void); -+void davincifb_ntsc_component_config(void); -+void davincifb_pal_composite_config(void); -+void davincifb_pal_svideo_config(void); -+void davincifb_pal_component_config(void); -+ -+void vpbe_davincifb_ntsc_rgb_config(void); -+void vpbe_davincifb_pal_rgb_config(void); -+void vpbe_davincifb_525p_component_config(void); -+void vpbe_davincifb_625p_component_config(void); -+ -+void vpbe_enable_venc(int); -+void vpbe_enable_dacs(int); -+/* -+ * Function definations for 'dlcd' module -+ */ -+void vpbe_davincifb_480p_prgb_config(void); -+void vpbe_davincifb_400p_prgb_config(void); -+void vpbe_davincifb_350p_prgb_config(void); -+void vpbe_set_display_timing(struct vpbe_fb_videomode *); -+ -+void vpbe_enable_lcd(int); -+/* -+ * Following functions are not implemented -+ */ -+void vpbe_davincifb_default_ycc16_config(void); -+void vpbe_davincifb_default_ycc8_config(void); -+void vpbe_davincifb_default_srgb_config(void); -+void vpbe_davincifb_default_epson_config(void); -+void vpbe_davincifb_default_casio_config(void); -+void vpbe_davincifb_default_UDISP_config(void); -+void vpbe_davincifb_default_STN_config(void); -+#endif /*__KERNEL__*/ -+ -+#endif /* End of #ifndef DAVINCI_VPBE_H */ -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h 2013-04-07 21:33:19.560662133 +0200 -@@ -0,0 +1,169 @@ -+/* -+ TI Davinci driver - Graphics Driver -+ -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp -+ -+ Code is derived from VMWare driver. -+ -+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_GFXDRIVER_H__ -+#define __DAVINCI_GFXDRIVER_H__ -+ -+#include -+#include -+ -+#include -+ -+#include "davincifb.h" -+ -+#include "davinci_c64x.h" -+ -+ -+typedef struct { -+ /* validation flags */ -+ int v_flags; -+ -+ /* cached/computed values */ -+ void *dst_addr; -+ unsigned long dst_phys; -+ unsigned int dst_size; -+ unsigned long dst_pitch; -+ DFBSurfacePixelFormat dst_format; -+ unsigned long dst_bpp; -+ -+ void *src_addr; -+ unsigned long src_phys; -+ unsigned long src_pitch; -+ DFBSurfacePixelFormat src_format; -+ unsigned long src_bpp; -+ -+ unsigned long source_mult; -+ -+ unsigned long fillcolor; -+ -+ int blit_blend_sub_function; -+ int draw_blend_sub_function; -+ -+ DFBColor color; -+ unsigned long color_argb; -+ unsigned long colorkey; -+ -+ DFBSurfaceBlittingFlags blitting_flags; -+ -+ DFBRegion clip; -+ -+ /** Add shared data here... **/ -+ struct fb_fix_screeninfo fix[4]; -+ -+ CoreSurfacePool *osd_pool; -+ CoreSurfacePool *video_pool; -+ -+ bool synced; -+} DavinciDeviceData; -+ -+ -+typedef struct { -+ int num; -+ int fd; -+ void *mem; -+ int size; -+} DavinciFB; -+ -+typedef struct { -+ DavinciDeviceData *ddev; -+ -+ CoreDFB *core; -+ -+ CoreScreen *screen; -+ CoreLayer *osd; -+ CoreLayer *video; -+ -+ DavinciFB fb[4]; -+ -+ DavinciC64x c64x; -+ bool c64x_present; -+ -+ DavinciC64xTasks tasks; -+} DavinciDriverData; -+ -+ -+static inline DFBResult -+davincifb_pan_display( const DavinciFB *fb, -+ struct fb_var_screeninfo *var, -+ const CoreSurfaceBufferLock *lock, -+ DFBSurfaceFlipFlags flags, -+ int x, -+ int y ) -+{ -+ int ret; -+ -+ if (lock) { -+#ifdef FBIO_SET_START -+ CoreSurfaceBuffer *buffer = lock->buffer; -+ struct fb_set_start set_start; -+ -+ /* physical mode */ -+ set_start.offset = -1; -+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0; -+ -+ /* life's so easy */ -+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch; -+ -+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start ); -+ if (ret < 0) -+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n", -+ set_start.physical, set_start.sync ); -+ -+ if (ret == 0) { -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+ } -+ -+ /* fallback */ -+#endif -+ var->xoffset = x; /* poor version */ -+ var->yoffset = y + lock->offset / lock->pitch; -+ } -+ else { -+ var->xoffset = x; -+ var->yoffset = y; -+ } -+ -+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW; -+ -+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var ); -+ if (ret) -+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n", -+ fb->num, var->xoffset, var->yoffset ); -+ -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+} -+ -+#endif -diff -puNr -Naur directfb-1.6.3-orig/tests/voodoo/voodoo_test.h directfb-1.6.3/tests/voodoo/voodoo_test.h ---- directfb-1.6.3-orig/tests/voodoo/voodoo_test.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/tests/voodoo/voodoo_test.h 2013-04-07 21:33:31.824408024 +0200 -@@ -0,0 +1,10 @@ -+#ifndef __VOODOO_TEST_H__ -+#define __VOODOO_TEST_H__ -+ -+typedef enum { -+ VOODOO_TEST_INCREASE, -+ VOODOO_TEST_QUERY -+} VoodooTestCall; -+ -+#endif -+ diff --git a/package/directfb/0002-imlib2-config.patch b/package/directfb/0002-imlib2-config.patch deleted file mode 100644 index ea2bf82049..0000000000 --- a/package/directfb/0002-imlib2-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8352c434e515f19dd1ba36256bfcc3ec9480838d Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 5 Mar 2015 22:38:52 +0100 -Subject: [PATCH] imlib2 config - -Call the imlib2-conf variable that are set by ac_cv_path_IMLIB2_CONFIG -with the absolute path because the imlib2-config file is not covered -by the PATH variable. -This is important for cross compiler that need to get the staging settings -instead of the host settings. - -Signed-off-by: Carsten Schoenert -[ patch configure.in instead of configure to survive autoreconf ] -Signed-off-by: Peter Seiderer ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 38d7e78..fa5e87f 100644 ---- a/configure.in -+++ b/configure.in -@@ -1094,8 +1094,8 @@ if test "x$enable_imlib2" = "xyes"; then - AC_MSG_WARN([*** Imlib2 library not found, building without Imlib2 support ***]) - imlib2="no" - else -- IMLIB2_CFLAGS=`imlib2-config --cflags` -- IMLIB2_LIBS=`imlib2-config --libs` -+ IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags` -+ IMLIB2_LIBS=`$IMLIB2_CONFIG --libs` - imlib2="yes" - fi - fi --- -2.1.4 - diff --git a/package/directfb/0003-setregion-lock.patch b/package/directfb/0003-setregion-lock.patch deleted file mode 100644 index bec4234645..0000000000 --- a/package/directfb/0003-setregion-lock.patch +++ /dev/null @@ -1,99 +0,0 @@ -This patch fixes builderrors while using '--with-gfxdrivers' and -'--with-inputdrivers' with the current DirectFB version 1.6.3. - -Patch is taken from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch - -Signed-off-by: Carsten Schoenert - -Index: b/gfxdrivers/cyber5k/cyber5k.c -=================================================================== ---- a/gfxdrivers/cyber5k/cyber5k.c -+++ b/gfxdrivers/cyber5k/cyber5k.c -@@ -640,7 +640,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - -@@ -648,7 +649,7 @@ - ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - -Index: b/gfxdrivers/radeon/radeon_crtc1.c -=================================================================== ---- a/gfxdrivers/radeon/radeon_crtc1.c -+++ b/gfxdrivers/radeon/radeon_crtc1.c -@@ -147,14 +147,15 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - - if (updated & ~CLRCF_OPTIONS) { - return OldPrimaryLayerFuncs.SetRegion( layer, - OldPrimaryLayerDriverData, - layer_data, region_data, -- config, updated, surface, palette, lock ); -+ config, updated, surface, palette, left_lock, right_lock ); - } - - return DFB_OK; -Index: b/gfxdrivers/cle266/uc_primary.c -=================================================================== ---- a/gfxdrivers/cle266/uc_primary.c -+++ b/gfxdrivers/cle266/uc_primary.c -@@ -142,7 +142,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -151,7 +152,7 @@ - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - -Index: b/gfxdrivers/unichrome/uc_primary.c -=================================================================== ---- a/gfxdrivers/unichrome/uc_primary.c -+++ b/gfxdrivers/unichrome/uc_primary.c -@@ -139,7 +139,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -148,7 +149,7 @@ - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - diff --git a/package/directfb/0004-use-gcc-link.patch b/package/directfb/0004-use-gcc-link.patch deleted file mode 100644 index ec6c0ea501..0000000000 --- a/package/directfb/0004-use-gcc-link.patch +++ /dev/null @@ -1,35 +0,0 @@ -Add patch to use 'gcc' instead of 'ld' for linking - -The patch has been sent upstream but it has not been merged yet - -Signed-off-by: Markos Chandras - -From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001 -From: Markos Chandras -Date: Wed, 28 Aug 2013 10:56:32 +0100 -Subject: [PATCH] rules/libobject.make: Use gcc for linking - -Invoking 'ld' directly may miss some necessary linker flags which -are usually passed by gcc. Therefore, use gcc for linking. - -Signed-off-by: Markos Chandras ---- - rules/libobject.make | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/libobject.make b/rules/libobject.make -index bc670da..2cba658 100644 ---- a/rules/libobject.make -+++ b/rules/libobject.make -@@ -3,7 +3,7 @@ - if test -d $<.tmp; then rmdir $<.tmp; fi - mkdir $<.tmp - (cd $<.tmp && $(AR) x ../../$<) -- $(LD) -o $@ -r $<.tmp/*.o -+ $(CC) -nostdlib -o $@ -r $<.tmp/*.o - rm -f $<.tmp/*.o && rmdir $<.tmp - - .PHONY: $(LTLIBRARIES:%.la=.libs/%.a) --- -1.8.3.2 - diff --git a/package/directfb/0005-add-missing-idivine-header.patch b/package/directfb/0005-add-missing-idivine-header.patch deleted file mode 100644 index 7823eb76e7..0000000000 --- a/package/directfb/0005-add-missing-idivine-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -Add idivine.h, which is missing from DirectFB tarballs - -The idivine.h file was taken from the DirectFB Git repository. - -Signed-off-by: Thomas Petazzoni - -Index: b/lib/divine/idivine.h -=================================================================== ---- /dev/null -+++ b/lib/divine/idivine.h -@@ -0,0 +1,54 @@ -+/* -+ (c) Copyright 2012-2013 DirectFB integrated media GmbH -+ (c) Copyright 2001-2013 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ Written by Denis Oliver Kropp , -+ Andreas Shimokawa , -+ Marek Pikarski , -+ Sven Neumann , -+ Ville Syrjälä and -+ Claudio Ciccani . -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+ -+ -+#ifndef __IDIVINE_H__ -+#define __IDIVINE_H__ -+ -+#include -+ -+/* -+ * private data struct of IDiVine -+ */ -+typedef struct { -+ int ref; /* reference counter */ -+ -+ DiVine *divine; -+} IDiVine_data; -+ -+/* -+ * IDiVine constructor/destructor -+ */ -+DFBResult IDiVine_Construct( IDiVine *thiz ); -+ -+void IDiVine_Destruct ( IDiVine *thiz ); -+ -+#endif diff --git a/package/directfb/0006-fix-client-gfx_state-initialisation.patch b/package/directfb/0006-fix-client-gfx_state-initialisation.patch deleted file mode 100644 index 5b7a202ca3..0000000000 --- a/package/directfb/0006-fix-client-gfx_state-initialisation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 13 Jun 2016 13:32:44 -0700 -Subject: [PATCH] fix client->gfx_state initialisation - -Shortly before the DirectFB 1.7.7 release, an optimisation was added -to CoreGraphicsStateClient_Init() to avoid creating an extended -Graphics State object if it will not later be required: - - 4d422fb Client: Create extended Graphics State object when needed for later usage - -Unfortunately the client->gfx_state variable used to track the -extended Graphics State object is not initialised, which can lead to -crashes etc due to creation of the Graphics State object erroneously -being skipped. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy -Signed-off-by: Philippe Reynes ---- - src/core/CoreGraphicsStateClient.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp -index 5d46f0e..5007755 100644 ---- a/src/core/CoreGraphicsStateClient.cpp -+++ b/src/core/CoreGraphicsStateClient.cpp -@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client, - client->renderer = NULL; - client->requestor = NULL; - client->throttle = NULL; -+ client->gfx_state = NULL; - - if (dfb_config->task_manager) { - if (dfb_config->call_nodirect) { --- -1.9.1 - diff --git a/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch b/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch deleted file mode 100644 index 4cbbc5dcc3..0000000000 --- a/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ffd68a8dfa1e8671dd8c01b96faffd681deca4e Mon Sep 17 00:00:00 2001 -From: Steffen Persvold -Date: Tue, 25 Jun 2024 14:14:49 +0200 -Subject: [PATCH] libdirect: define __NR_futex on 32bit architectures using - 64-bit time_t - -Newer 32bit architectures like RISCV32 and ARC are using 64bit time_t -from the get go unlike other 32bit architectures, therefore aliasing -__NR_futex to __NR_futex_time64 helps avoid the below errors : - -system.c:242:21: error: '__NR_futex' undeclared (first use in this function) - 242 | ret = syscall( __NR_futex, uaddr, op, val, timeout, uaddr2, val3 ); - | ^~~~~~~~~~ - -Upstream: dead -Signed-off-by: Steffen Persvold ---- - lib/direct/os/linux/glibc/system.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/direct/os/linux/glibc/system.c b/lib/direct/os/linux/glibc/system.c -index 32086a25..7143442b 100644 ---- a/lib/direct/os/linux/glibc/system.c -+++ b/lib/direct/os/linux/glibc/system.c -@@ -213,6 +213,10 @@ direct_getenv( const char *name ) - - /**********************************************************************************************************************/ - -+#if defined(__NR_futex_time64) && !defined(__NR_futex) -+#define __NR_futex __NR_futex_time64 -+#endif -+ - DirectResult - direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int *uaddr2, int val3 ) - { -@@ -245,4 +249,3 @@ direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int * - - return DR_OK; - } -- --- -2.40.1 - diff --git a/package/directfb/Config.in b/package/directfb/Config.in deleted file mode 100644 index 20481f56da..0000000000 --- a/package/directfb/Config.in +++ /dev/null @@ -1,167 +0,0 @@ -config BR2_PACKAGE_DIRECTFB - bool "directfb" - depends on !BR2_STATIC_LIBS # static link issues - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t issue - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_ZLIB - help - DirectFB (Direct Frame Buffer) is a set of graphics APIs - implemented on top of the Linux Frame Buffer (fbdev) - abstraction layer. It is an alternative to X11 with a smaller - memory footprint that still has an integrated windowing - system. As of 4 October 2015, DirectFB's website - http://www.directfb.org/ is down. See alternative site listed - below. - - http://elinux.org/DirectFB - -if BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_DIRECTFB_MULTI - bool "directfb multi application" - depends on BR2_USE_MMU # madvise() - depends on BR2_LINUX_KERNEL - select BR2_PACKAGE_LINUX_FUSION - help - Enable use of multiple concurrent DirectFB applications - -comment "directfb multi application needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT - bool "directfb debugging support" - default y - help - Compile DirectFB with debugging support. It provides - functions to print debug information, for DirectFB as well as - external DirectFB drivers. - - When disabled, DirectFB does not print any debug information. - The drivers will be installed to and loaded from - /usr/lib/directfb--pure instead of - /usr/lib/directfb-. - -config BR2_PACKAGE_DIRECTFB_DEBUG - bool "directfb debugging" - depends on BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT - help - Compile DirectFB with lots of debug output - -config BR2_PACKAGE_DIRECTFB_TRACE - bool "directfb call trace support" - help - Enable call tracing for DirectFB applications - -config BR2_PACKAGE_DIRECTFB_DIVINE - bool "divine" - help - Enable the DiVine feature (virtual input) - -config BR2_PACKAGE_DIRECTFB_SAWMAN - bool "sawman" - help - Enable the SawMan feature (window manager) - -config BR2_PACKAGE_DIRECTFB_ATI128 - bool "compile ati128 graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_MATROX - bool "compile matrox graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_PXA3XX - bool "compile pxa3xx graphics driver" - depends on BR2_arm - help - The Marvell PXA3xx Processor Family is a system-on-chip based - on XScale® microarchitecture. This option enables the graphic - driver support for the PXA3xx processor family. - - http://www.marvell.com/application-processors/pxa-family/ - -config BR2_PACKAGE_DIRECTFB_EP9X - bool "compile ep9x graphics driver" - depends on BR2_arm - help - Enable the graphic driver support for the EP93xx ARMv9 based - processors from Cirrus Logic. - - http://cirrus.com/en/products/arm9.html - -config BR2_PACKAGE_DIRECTFB_I830 - bool "compile i830 graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_LINUXINPUT - bool "compile /dev/input/eventX input driver" - default y - -config BR2_PACKAGE_DIRECTFB_KEYBOARD - bool "compile keyboard input driver" - default y - -config BR2_PACKAGE_DIRECTFB_PS2MOUSE - bool "compile PS2 mouse input driver" - default y - -config BR2_PACKAGE_DIRECTFB_SERIALMOUSE - bool "compile serial mouse input driver" - default y - -config BR2_PACKAGE_DIRECTFB_TSLIB - bool "enable touchscreen support" - default y - select BR2_PACKAGE_TSLIB - -config BR2_PACKAGE_DIRECTFB_GIF - bool "enable GIF support" - default y - -config BR2_PACKAGE_DIRECTFB_TIFF - bool "enable TIFF support" - select BR2_PACKAGE_TIFF - -config BR2_PACKAGE_DIRECTFB_IMLIB2 - bool "enable IMLIB2 support" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_IMLIB2 - -comment "imlib2 support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_DIRECTFB_JPEG - bool "enable JPEG support" - default y - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_DIRECTFB_PNG - bool "enable PNG support" - default y - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_DIRECTFB_SVG - bool "enable SVG support" - default y - select BR2_PACKAGE_LIBSVG_CAIRO - -config BR2_PACKAGE_DIRECTFB_DITHER_RGB16 - bool "enable advanced dithering of RGB16 surfaces" - help - Enable dithering when loading images to RGB16 surfaces. - This increases the data section by 64 KBytes. - -config BR2_PACKAGE_DIRECTFB_TESTS - bool "build directfb tests" - -endif # BR2_PACKAGE_DIRECTFB - -comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ - BR2_STATIC_LIBS diff --git a/package/directfb/directfb.hash b/package/directfb/directfb.hash deleted file mode 100644 index f8c4a8303c..0000000000 --- a/package/directfb/directfb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz -sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk deleted file mode 100644 index 094e87e7e7..0000000000 --- a/package/directfb/directfb.mk +++ /dev/null @@ -1,172 +0,0 @@ -################################################################################ -# -# directfb -# -################################################################################ - -DIRECTFB_VERSION_MAJOR = 1.7 -DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://sources.buildroot.net/directfb -DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz -DIRECTFB_LICENSE = LGPL-2.1+ -DIRECTFB_LICENSE_FILES = COPYING -DIRECTFB_INSTALL_STAGING = YES -DIRECTFB_AUTORECONF = YES - -DIRECTFB_CONF_OPTS = \ - --enable-zlib \ - --enable-freetype \ - --enable-fbdev \ - --disable-sdl \ - --disable-vnc \ - --disable-osx \ - --disable-video4linux \ - --disable-video4linux2 \ - --without-tools \ - --disable-x11 - -ifeq ($(BR2_STATIC_LIBS),y) -DIRECTFB_CONF_OPTS += --disable-dynload -endif - -DIRECTFB_CONFIG_SCRIPTS = directfb-config - -DIRECTFB_DEPENDENCIES = freetype zlib - -ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y) -DIRECTFB_CONF_OPTS += --enable-multi --enable-multi-kernel -DIRECTFB_DEPENDENCIES += linux-fusion -else -DIRECTFB_CONF_OPTS += --disable-multi --disable-multi-kernel -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT),y) -DIRECTFB_CONF_OPTS += --enable-debug-support -ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y) -DIRECTFB_CONF_OPTS += --enable-debug -endif -else -DIRECTFB_CONF_OPTS += --disable-debug-support -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y) -DIRECTFB_CONF_OPTS += --enable-trace -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DIVINE),y) -DIRECTFB_CONF_OPTS += --enable-divine -else -DIRECTFB_CONF_OPTS += --disable-divine -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_SAWMAN),y) -DIRECTFB_CONF_OPTS += --enable-sawman -else -DIRECTFB_CONF_OPTS += --disable-sawman -endif - -DIRECTFB_GFX = \ - $(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \ - $(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \ - $(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \ - $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \ - $(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x) - -ifeq ($(strip $(DIRECTFB_GFX)),) -DIRECTFB_CONF_OPTS += --with-gfxdrivers=none -else -DIRECTFB_CONF_OPTS += \ - --with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX))) -endif - -DIRECTFB_INPUT = \ - $(if $(BR2_PACKAGE_DIRECTFB_LINUXINPUT),linuxinput) \ - $(if $(BR2_PACKAGE_DIRECTFB_KEYBOARD),keyboard) \ - $(if $(BR2_PACKAGE_DIRECTFB_PS2MOUSE),ps2mouse) \ - $(if $(BR2_PACKAGE_DIRECTFB_SERIALMOUSE),serialmouse) \ - $(if $(BR2_PACKAGE_DIRECTFB_TSLIB),tslib) - -ifeq ($(BR2_PACKAGE_DIRECTFB_TSLIB),y) -DIRECTFB_DEPENDENCIES += tslib -endif - -ifeq ($(strip $(DIRECTFB_INPUT)),) -DIRECTFB_CONF_OPTS += --with-inputdrivers=none -else -DIRECTFB_CONF_OPTS += \ - --with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT))) -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y) -DIRECTFB_CONF_OPTS += --enable-gif -else -DIRECTFB_CONF_OPTS += --disable-gif -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TIFF),y) -DIRECTFB_CONF_OPTS += --enable-tiff -DIRECTFB_DEPENDENCIES += tiff -else -DIRECTFB_CONF_OPTS += --disable-tiff -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y) -DIRECTFB_CONF_OPTS += --enable-png -DIRECTFB_DEPENDENCIES += libpng -DIRECTFB_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config -else -DIRECTFB_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_JPEG),y) -DIRECTFB_CONF_OPTS += --enable-jpeg -DIRECTFB_DEPENDENCIES += jpeg -else -DIRECTFB_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_SVG),y) -DIRECTFB_CONF_OPTS += --enable-svg -# needs some help to find cairo includes -DIRECTFB_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/cairo" -DIRECTFB_DEPENDENCIES += libsvg-cairo -else -DIRECTFB_CONF_OPTS += --disable-svg -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_IMLIB2),y) -DIRECTFB_CONF_OPTS += --enable-imlib2 -DIRECTFB_DEPENDENCIES += imlib2 -DIRECTFB_CONF_ENV += ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config -else -DIRECTFB_CONF_OPTS += --disable-imlib2 -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y) -DIRECTFB_CONF_OPTS += --with-dither-rgb16=advanced -else -DIRECTFB_CONF_OPTS += --with-dither-rgb16=none -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TESTS),y) -DIRECTFB_CONF_OPTS += --with-tests -endif - -HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng -HOST_DIRECTFB_CONF_OPTS = \ - --disable-multi \ - --enable-png \ - --with-gfxdrivers=none \ - --with-inputdrivers=none - -HOST_DIRECTFB_BUILD_CMDS = \ - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools directfb-csource - -HOST_DIRECTFB_INSTALL_CMDS = \ - $(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/bin - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# directfb-csource for the host -DIRECTFB_HOST_BINARY = $(HOST_DIR)/bin/directfb-csource diff --git a/package/distribution-registry/0001-s3-aws-fix-build-for-386.patch b/package/distribution-registry/0001-s3-aws-fix-build-for-386.patch new file mode 100644 index 0000000000..a725ab8e92 --- /dev/null +++ b/package/distribution-registry/0001-s3-aws-fix-build-for-386.patch @@ -0,0 +1,45 @@ +From 6970080b10a53d858dd444a643a2bd911de12940 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Thu, 29 May 2025 11:28:38 +0800 +Subject: [PATCH] s3-aws: fix build for 386 + +When building for 386, we got the following build error: + + registry/storage/driver/s3-aws/s3.go:312:99: cannot use + maxChunkSize (untyped int constant 5368709120) as int value + in argument to getParameterAsInteger (overflows) + +This is because the s3_64bit.go is used. Adjust the build tag matching +in s3_32bit.go and s3_64bit.go to fix this issue. + +Signed-off-by: Chen Qi +Upstream: https://github.com/distribution/distribution/commit/6970080b10a53d858dd444a643a2bd911de12940 +Signed-off-by: Yann E. MORIN +--- + registry/storage/driver/s3-aws/s3_32bit.go | 2 +- + registry/storage/driver/s3-aws/s3_64bit.go | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/registry/storage/driver/s3-aws/s3_32bit.go b/registry/storage/driver/s3-aws/s3_32bit.go +index 218e3eab..84161fcb 100644 +--- a/registry/storage/driver/s3-aws/s3_32bit.go ++++ b/registry/storage/driver/s3-aws/s3_32bit.go +@@ -1,4 +1,4 @@ +-//go:build arm ++//go:build arm || 386 + + package s3 + +diff --git a/registry/storage/driver/s3-aws/s3_64bit.go b/registry/storage/driver/s3-aws/s3_64bit.go +index 55254e49..2ed1f92f 100644 +--- a/registry/storage/driver/s3-aws/s3_64bit.go ++++ b/registry/storage/driver/s3-aws/s3_64bit.go +@@ -1,4 +1,4 @@ +-//go:build !arm ++//go:build !arm && !386 + + package s3 + +-- +2.51.1 + diff --git a/package/distribution-registry/Config.in b/package/distribution-registry/Config.in new file mode 100644 index 0000000000..af650171b1 --- /dev/null +++ b/package/distribution-registry/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_DISTRIBUTION_REGISTRY + bool "distribution-registry" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + help + The toolkit to pack, ship, store, and deliver container + content. + + The goal of this project is to provide a simple, secure, and + scalable base for building a large scale registry solution or + running a simple private registry. It is a core library for + many registry operators including Docker Hub, GitHub Container + Registry, GitLab Container Registry and DigitalOcean Container + Registry, as well as the CNCF Harbor Project, and VMware + Harbor Registry. + + https://github.com/distribution/distribution diff --git a/package/distribution-registry/config.yml b/package/distribution-registry/config.yml new file mode 100644 index 0000000000..77944827a5 --- /dev/null +++ b/package/distribution-registry/config.yml @@ -0,0 +1,13 @@ +version: 0.1 +storage: + cache: + blobdescriptor: inmemory + filesystem: + rootdirectory: /var/lib/docker-registry + delete: + enabled: true +http: + addr: 127.0.0.1:5000 + net: tcp + headers: + X-Content-Type-Options: [nosniff] diff --git a/package/distribution-registry/distribution-registry.hash b/package/distribution-registry/distribution-registry.hash new file mode 100644 index 0000000000..38d7b5a487 --- /dev/null +++ b/package/distribution-registry/distribution-registry.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6330e6b625c0232b43cee8ea32800a660a7d7a0c79f4f53e4d9a8a6707138d46 distribution-registry-v3.0.0-git4-go2.tar.gz +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/distribution-registry/distribution-registry.mk b/package/distribution-registry/distribution-registry.mk new file mode 100644 index 0000000000..a01a3c1710 --- /dev/null +++ b/package/distribution-registry/distribution-registry.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# distribution-registry +# +################################################################################ + +DISTRIBUTION_REGISTRY_VERSION = v3.0.0 +DISTRIBUTION_REGISTRY_SITE = https://github.com/distribution/distribution +DISTRIBUTION_REGISTRY_SITE_METHOD = git + +DISTRIBUTION_REGISTRY_LICENSE = Apache-2.0 +DISTRIBUTION_REGISTRY_LICENSE_FILES = LICENSE + +DISTRIBUTION_REGISTRY_GOMOD = github.com/distribution/distribution/v3 + +DISTRIBUTION_REGISTRY_BUILD_TARGETS = cmd/registry + +# distribution-registry builds and installs the 'registry' executable, but +# that name is a bit too generic. Rename it to match the package name. +DISTRIBUTION_REGISTRY_BIN_NAME = distribution-registry + +# Inject the version as if done by upstream's wrapper Makefile +define DISTRIBUTION_REGISTRY_SET_VERSION + $(SED) 's/^var version = ".*"$$/var version = "$(DISTRIBUTION_REGISTRY_VERSION)"/' \ + $(@D)/version/version.go +endef +DISTRIBUTION_REGISTRY_PRE_CONFIGURE_HOOKS += DISTRIBUTION_REGISTRY_SET_VERSION + +define DISTRIBUTION_REGISTRY_CONFIG + $(INSTALL) -m 0644 -D \ + $(DISTRIBUTION_REGISTRY_PKGDIR)/config.yml \ + $(TARGET_DIR)/etc/docker/registry/config.yml +endef +DISTRIBUTION_REGISTRY_POST_INSTALL_TARGET_HOOKS += DISTRIBUTION_REGISTRY_CONFIG + +define DISTRIBUTION_REGISTRY_USERS + distribution-registry -1 distribution-registry -1 * - - - Distribution registry +endef + +define DISTRIBUTION_REGISTRY_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 0644 -D \ + $(DISTRIBUTION_REGISTRY_PKGDIR)/distribution-registry.service \ + $(TARGET_DIR)/usr/lib/systemd/system/distribution-registry.service +endef + +$(eval $(golang-package)) diff --git a/package/distribution-registry/distribution-registry.service b/package/distribution-registry/distribution-registry.service new file mode 100644 index 0000000000..767786bc99 --- /dev/null +++ b/package/distribution-registry/distribution-registry.service @@ -0,0 +1,10 @@ +[Unit] +Description=Distribution registry +After=network.target + +[Service] +User=distribution-registry +ExecStart=/usr/bin/distribution-registry serve /etc/docker/registry/config.yml + +[Install] +WantedBy=multi-user.target diff --git a/package/dlib/Config.in b/package/dlib/Config.in index 7862f8d074..4054ed8bae 100644 --- a/package/dlib/Config.in +++ b/package/dlib/Config.in @@ -8,7 +8,8 @@ config BR2_PACKAGE_DLIB algorithms and tools for creating complex software in C++ to solve real world problems. - http://dlib.net + https://dlib.net + https://github.com/davisking/dlib comment "dlib needs a toolchain w/ C++, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/dlib/dlib.hash b/package/dlib/dlib.hash index af206386b8..350f30dc26 100644 --- a/package/dlib/dlib.hash +++ b/package/dlib/dlib.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 22513c353ec9c153300c394050c96ca9d088e02966ac0f639e989e50318c82d6 dlib-19.24.6.tar.gz +sha256 65ff8debc3ffea84430bdd4992982082caf505404e16d986b7493c00f96f44e9 dlib-19.24.9.tar.gz # Hashes for license files sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 dlib/external/libjpeg/README diff --git a/package/dlib/dlib.mk b/package/dlib/dlib.mk index 4eb0002775..0c93130d34 100644 --- a/package/dlib/dlib.mk +++ b/package/dlib/dlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -DLIB_VERSION = 19.24.6 +DLIB_VERSION = 19.24.9 DLIB_SITE = $(call github,davisking,dlib,v$(DLIB_VERSION)) DLIB_CMAKE_BACKEND = ninja DLIB_INSTALL_STAGING = YES diff --git a/package/dmenu-wayland/0001-support-cross-compilation.patch b/package/dmenu-wayland/0001-support-cross-compilation.patch deleted file mode 100644 index 3d99330cba..0000000000 --- a/package/dmenu-wayland/0001-support-cross-compilation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cd72cade6250a3ec46dd402b25a0bd55bbb97a88 Mon Sep 17 00:00:00 2001 -From: Rick van Schijndel -Date: Wed, 20 Dec 2023 16:44:12 -0700 -Subject: [PATCH] support cross-compilation - -Marking wayland-scanner as native dependency fixes the path check for -wayland-scanner. - -Upstream: https://github.com/nyyManni/dmenu-wayland/pull/23 - -Signed-off-by: Rick van Schijndel -Signed-off-by: Adam Duskett ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3ae6f69..8d401ff 100644 ---- a/meson.build -+++ b/meson.build -@@ -26,7 +26,7 @@ pangocairo = dependency('pangocairo') - rt = cc.find_library('rt') - wayland_client = dependency('wayland-client') - wayland_protos = dependency('wayland-protocols') --wayland_scanner_dep = dependency('wayland-scanner') -+wayland_scanner_dep = dependency('wayland-scanner', native: true) - wayland_scanner = find_program( - wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner') - ) --- -2.43.0 - diff --git a/package/dmenu-wayland/dmenu-wayland.hash b/package/dmenu-wayland/dmenu-wayland.hash deleted file mode 100644 index 1248c4ad66..0000000000 --- a/package/dmenu-wayland/dmenu-wayland.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 56340e198a2c58468c6109f3bb07ab8a074487e67b0758b29c9d4fdce7c4d594 dmenu-wayland-a380201dff5bfac2dace553d7eaedb6cea6855f9.tar.gz -sha256 8d26bccf8a21c5e29dc756beef534403c935766c815bbb6e7eab0598632b9827 LICENSE diff --git a/package/dmenu-wayland/dmenu-wayland.mk b/package/dmenu-wayland/dmenu-wayland.mk deleted file mode 100644 index fec984194c..0000000000 --- a/package/dmenu-wayland/dmenu-wayland.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# dmenu-wayland -# -################################################################################ - -DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9 -DMENU_WAYLAND_SITE = $(call github,nyyManni,dmenu-wayland,$(DMENU_WAYLAND_VERSION)) -DMENU_WAYLAND_LICENSE = MIT -DMENU_WAYLAND_LICENSE_FILES = LICENSE -DMENU_WAYLAND_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 - -# host-wayland is for wayland-scanner -DMENU_WAYLAND_DEPENDENCIES = \ - host-wayland \ - cairo \ - libglib2 \ - libxkbcommon \ - pango \ - wayland \ - wayland-protocols - -# By default, sway calls dmenu not dmenu-wl -define DMENU_WAYLAND_SYMLINK_DMENU_WL - ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu -endef -DMENU_WAYLAND_POST_INSTALL_TARGET_HOOKS += DMENU_WAYLAND_SYMLINK_DMENU_WL - -$(eval $(meson-package)) diff --git a/package/dmraid/0001-fix-compilation-under-musl.patch b/package/dmraid/0001-fix-compilation-under-musl.patch index a6f5c41075..3d45641b8d 100644 --- a/package/dmraid/0001-fix-compilation-under-musl.patch +++ b/package/dmraid/0001-fix-compilation-under-musl.patch @@ -8,7 +8,7 @@ Patch borrowed from Void Linux : https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dmraid/patches/25_musl-libc.patch Upstream package appears dormant, no mailing list and no -maintainence releases since Nov 2010. +maintenance releases since Nov 2010. Upstream-Status: dormant Signed-off-by: Brendan Heading diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in index 3c375f4c67..ad86334f1e 100644 --- a/package/dmraid/Config.in +++ b/package/dmraid/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_DMRAID dmraid uses the Linux device-mapper to create devices with respective mappings for the ATARAID sets discovered. - http://people.redhat.com/~heinzm/sw/dmraid/ + https://people.redhat.com/~heinzm/sw/dmraid/ comment "dmraid needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU diff --git a/package/dmraid/dmraid.hash b/package/dmraid/dmraid.hash index 7c1bb9a56b..0f30864254 100644 --- a/package/dmraid/dmraid.hash +++ b/package/dmraid/dmraid.hash @@ -1,4 +1,4 @@ -# From http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2.md5.sum +# From https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2.md5.sum md5 819338fcef98e8e25819f0516722beeb dmraid-1.0.0.rc16-3.tar.bz2 # locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 1.0.0.rc16-3/dmraid/LICENSE_GPL diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 97c729aa70..dca9195ef6 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -6,7 +6,7 @@ DMRAID_VERSION = 1.0.0.rc16-3 DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2 -DMRAID_SITE = http://people.redhat.com/~heinzm/sw/dmraid/src +DMRAID_SITE = https://people.redhat.com/~heinzm/sw/dmraid/src DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid # lib and tools race with parallel make DMRAID_MAKE = $(MAKE1) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index d11e8af590..212774cd10 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc -sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.91.tar.xz.asc +sha256 f622682848b33677adb2b6ad08264618a2ae0a01da486a93fd8cd91186b3d153 dnsmasq-2.91.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9f342cb049..dec7c9a86d 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.90 +DNSMASQ_VERSION = 2.91 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -17,9 +17,6 @@ DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 DNSMASQ_CPE_ID_VENDOR = thekelleys DNSMASQ_SELINUX_MODULES = dnsmasq -# 0001-set-default-maximum-dns-udp-package-size.patch -DNSMASQ_IGNORE_CVES += CVE-2023-28450 - DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) @@ -70,7 +67,7 @@ DNSMASQ_COPTS += -DHAVE_DBUS define DNSMASQ_INSTALL_DBUS $(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf + $(TARGET_DIR)/usr/share/dbus-1/system.d/dnsmasq.conf endef endif diff --git a/package/docker-cli-buildx/docker-cli-buildx.hash b/package/docker-cli-buildx/docker-cli-buildx.hash index 26b187d12a..41fcf6ddbe 100644 --- a/package/docker-cli-buildx/docker-cli-buildx.hash +++ b/package/docker-cli-buildx/docker-cli-buildx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c9dd3fb18ccba399223ba0f623c9fe09fa38fb2a05283131be8e4e139b2d8fa docker-cli-buildx-0.16.1-go2.tar.gz +sha256 e5a7573a5995c0f12c86d35a8148b2a10a6f1b11d1cf8c6977bf03ac281e6959 docker-cli-buildx-0.25.0-go2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-cli-buildx/docker-cli-buildx.mk b/package/docker-cli-buildx/docker-cli-buildx.mk index ea77a86077..10093bea7a 100644 --- a/package/docker-cli-buildx/docker-cli-buildx.mk +++ b/package/docker-cli-buildx/docker-cli-buildx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_BUILDX_VERSION = 0.16.1 +DOCKER_CLI_BUILDX_VERSION = 0.25.0 DOCKER_CLI_BUILDX_SITE = $(call github,docker,buildx,v$(DOCKER_CLI_BUILDX_VERSION)) DOCKER_CLI_BUILDX_LICENSE = Apache-2.0 diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index c70d274f96..34d77bb137 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 df7d44387166d90954e290dfbe0a278649bf71d0e89933615bdc0757580b68e4 docker-cli-27.3.1-go2.tar.gz +sha256 b65cd415e63be23fcaa63107bc47a762173a06c84fb78b1575edc5443bb39867 docker-cli-28.3.2-go2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 39e1367908..abe0aac348 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 27.3.1 +DOCKER_CLI_VERSION = 28.3.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -38,6 +38,4 @@ define DOCKER_CLI_FIX_VENDORING endef DOCKER_CLI_POST_EXTRACT_HOOKS += DOCKER_CLI_FIX_VENDORING -DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) - $(eval $(golang-package)) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 0fb9767305..a2ffadd31c 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 100a1c1522fc58658ce08ed4a6213ffb22f0bf5a728718e6e2b1181a127d321f docker-compose-2.29.7-go2.tar.gz +sha256 0c0453729b7a37badcf530fc140b1b8b907cbdcecfdb6be6413f410c86665c70 docker-compose-2.38.2-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 26d90d303f..f70cf725df 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.29.7 +DOCKER_COMPOSE_VERSION = 2.38.2 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE diff --git a/package/docker-credential-acr-env/Config.in b/package/docker-credential-acr-env/Config.in new file mode 100644 index 0000000000..ddb101d52f --- /dev/null +++ b/package/docker-credential-acr-env/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_DOCKER_CREDENTIAL_ACR_ENV + bool "docker-credential-acr-env" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + The ACR docker credential helper is an alternative to the + existing file store based ACR helper [...] which relies + on az command line and is not optimised for use in CI + environments. Primary use case for this helper is for use + with kaniko and other tools running in CI scenarios wishing + to push to Azure Container Registry. + + https://github.com/chrismellard/docker-credential-acr-env/ diff --git a/package/docker-credential-acr-env/docker-credential-acr-env.hash b/package/docker-credential-acr-env/docker-credential-acr-env.hash new file mode 100644 index 0000000000..d0fba05b9a --- /dev/null +++ b/package/docker-credential-acr-env/docker-credential-acr-env.hash @@ -0,0 +1,3 @@ +# Localy computed +sha256 deff9d133fdd87b6cbe454e82e72eb7b124d1aea330c17236e804071a446b4ae docker-credential-acr-env-0.7.0-git4-go2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/docker-credential-acr-env/docker-credential-acr-env.mk b/package/docker-credential-acr-env/docker-credential-acr-env.mk new file mode 100644 index 0000000000..31f895e0e3 --- /dev/null +++ b/package/docker-credential-acr-env/docker-credential-acr-env.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# docker-credential-acr-env +# +################################################################################ + +DOCKER_CREDENTIAL_ACR_ENV_VERSION = 0.7.0 +DOCKER_CREDENTIAL_ACR_ENV_SITE = https://github.com/chrismellard/docker-credential-acr-env +DOCKER_CREDENTIAL_ACR_ENV_SITE_METHOD = git + +DOCKER_CREDENTIAL_ACR_ENV_LICENSE = Apache-2.0 +DOCKER_CREDENTIAL_ACR_ENV_LICENSE_FILES = LICENSE + +$(eval $(golang-package)) diff --git a/package/docker-credential-gcr/Config.in b/package/docker-credential-gcr/Config.in new file mode 100644 index 0000000000..1b24ff0e59 --- /dev/null +++ b/package/docker-credential-gcr/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_DOCKER_CREDENTIAL_GCR + bool "docker-credential-gcr" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + docker-credential-gcr is Google Container Registry's + standalone, gcloud SDK-independent Docker credential + helper. It allows for v18.03+ Docker clients to easily make + authenticated requests to GCR's repositories (gcr.io, + eu.gcr.io, etc.). + + https://github.com/GoogleCloudPlatform/docker-credential-gcr/ diff --git a/package/docker-credential-gcr/docker-credential-gcr.hash b/package/docker-credential-gcr/docker-credential-gcr.hash new file mode 100644 index 0000000000..469e8d6b17 --- /dev/null +++ b/package/docker-credential-gcr/docker-credential-gcr.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 a327753270232cb7f112b98328d5b56ae2da095ad74399b769aa5dad4393c8ae docker-credential-gcr-v2.1.30-git4-go2.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/docker-credential-gcr/docker-credential-gcr.mk b/package/docker-credential-gcr/docker-credential-gcr.mk new file mode 100644 index 0000000000..f889eb56c9 --- /dev/null +++ b/package/docker-credential-gcr/docker-credential-gcr.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# docker-credential-gcr +# +################################################################################ + +DOCKER_CREDENTIAL_GCR_VERSION = v2.1.30 +DOCKER_CREDENTIAL_GCR_SITE = https://github.com/GoogleCloudPlatform/docker-credential-gcr +DOCKER_CREDENTIAL_GCR_SITE_METHOD = git + +DOCKER_CREDENTIAL_GCR_LICENSE = Apache-2.0 +DOCKER_CREDENTIAL_GCR_LICENSE_FILES = LICENSE + +DOCKER_CREDENTIAL_GCR_GOMOD = github.com/GoogleCloudPlatform/docker-credential-gcr/v2 + +$(eval $(golang-package)) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index e03ecceeff..ae07b5e19d 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -3,11 +3,12 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc depends on BR2_USE_MMU # containerd + depends on !BR2_PACKAGE_CGROUPFS_MOUNT depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp - select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_CGROUPFS_V2_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime dependency @@ -22,13 +23,9 @@ if BR2_PACKAGE_DOCKER_ENGINE config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS bool "btrfs filesystem driver" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs filesystem driver for Docker. -comment "brtfs filesystem driver needs headers >= 4.12" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 - config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER bool "devicemapper filesystem driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 @@ -48,24 +45,46 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS help Build the vfs filesystem driver for Docker. -config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT +choice bool "support docker-init" + default BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI if BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT # legacy + help + Support providing a minimal init process for containers. + Required to use "docker run --init". + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_NONE + bool "none" + help + Do not support docker-init. + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_CATATONIT + bool "catatonit" + select BR2_PACKAGE_CATATONIT # runtime + help + Support providing a minimal init process for containers, + using catatonit. + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI + bool "tini" select BR2_PACKAGE_TINI # runtime help Support providing a minimal init process for containers, - using tini. Required to use "docker run --init". + using tini. - This does not change the Docker engine build, the - docker-init symlink is provided by the tini package - itself. This option only adds the dependency. +endchoice + +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_NAME + string + default "tini" if BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI + default "catatonit" if BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_CATATONIT endif -comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.17" +comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 5.2" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 depends on BR2_USE_MMU diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 2fe19b61d5..5d7bc51a6a 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d18208d9e0b6421307342cdef266193984c97c87177b9262b1113e6e9e7e020e docker-engine-27.3.1-go2.tar.gz +sha256 e4828e32e474cef1b78f40278211648300071399c7498252dfe0b96e789b8a31 docker-engine-28.3.2-go2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index e3db31a279..37d42edaea 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 27.3.1 +DOCKER_ENGINE_VERSION = 28.3.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -35,6 +35,16 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif +DOCKER_ENGINE_INIT_NAME = $(call qstrip,$(BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_NAME)) +ifneq ($(DOCKER_ENGINE_INIT_NAME),) +define DOCKER_ENGINE_INIT + mkdir -p $(TARGET_DIR)/usr/libexec/docker + ln -sf ../../bin/$(DOCKER_ENGINE_INIT_NAME) \ + $(TARGET_DIR)/usr/libexec/docker/docker-init +endef +DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INIT +endif + ifneq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif @@ -60,8 +70,6 @@ define DOCKER_ENGINE_FIX_VENDORING endef DOCKER_ENGINE_POST_EXTRACT_HOOKS += DOCKER_ENGINE_FIX_VENDORING -DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) - define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service @@ -121,6 +129,7 @@ define DOCKER_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_RAW) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) diff --git a/package/double-conversion/double-conversion.hash b/package/double-conversion/double-conversion.hash index e3a5754933..a10da6d75d 100644 --- a/package/double-conversion/double-conversion.hash +++ b/package/double-conversion/double-conversion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 04ec44461850abbf33824da84978043b22554896b552c5fd11a9c5ae4b4d296e double-conversion-3.3.0.tar.gz +sha256 fe54901055c71302dcdc5c3ccbe265a6c191978f3761ce1414d0895d6b0ea90e double-conversion-3.3.1.tar.gz sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING diff --git a/package/double-conversion/double-conversion.mk b/package/double-conversion/double-conversion.mk index 74e90d30d7..a4760236ca 100644 --- a/package/double-conversion/double-conversion.mk +++ b/package/double-conversion/double-conversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOUBLE_CONVERSION_VERSION = 3.3.0 +DOUBLE_CONVERSION_VERSION = 3.3.1 DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) DOUBLE_CONVERSION_LICENSE = BSD-3-Clause DOUBLE_CONVERSION_LICENSE_FILES = COPYING diff --git a/package/dovecot/0002-configure-Explicitly-check-for-icu-uc.patch b/package/dovecot/0002-configure-Explicitly-check-for-icu-uc.patch new file mode 100644 index 0000000000..ea9aecebde --- /dev/null +++ b/package/dovecot/0002-configure-Explicitly-check-for-icu-uc.patch @@ -0,0 +1,28 @@ +From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001 +From: fundawang +Date: Sun, 27 Oct 2024 22:11:21 +0800 +Subject: [PATCH] configure: Explicitly check for icu-uc + +Ensure we link against libicu-uc when it's split in v76. + +Upstream: https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 + +Signed-off-by: Bernd Kuhls +[Bernd: backported to version 2.3.21.1] +--- + m4/want_icu.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/want_icu.m4 b/m4/want_icu.m4 +index b656ef9f479..405a73b361f 100644 +--- a/m4/want_icu.m4 ++++ b/m4/want_icu.m4 +@@ -1,7 +1,7 @@ + AC_DEFUN([DOVECOT_WANT_ICU], [ + if test "$want_icu" != "no"; then + if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then +- PKG_CHECK_MODULES(LIBICU, icu-i18n) ++ PKG_CHECK_MODULES(LIBICU, icu-i18n icu-uc) + have_icu=yes + AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS]) + elif test "$want_icu" = "yes"; then diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 517040fad6..e109ce6be8 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -21,12 +21,16 @@ config BR2_PACKAGE_DOVECOT_MYSQL bool "mysql support" depends on BR2_INSTALL_LIBSTDCPP # mariadb depends on BR2_TOOLCHAIN_HAS_THREADS # mariadb + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 # mariadb + depends on BR2_USE_WCHAR # mariadb select BR2_PACKAGE_MARIADB help Enable MySQL support. -comment "mysql support needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "mysql support needs a toolchain w/ C++, threads, wchar" + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR config BR2_PACKAGE_DOVECOT_SQLITE bool "sqlite support" diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index e116bd3b78..6612787a94 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -12,7 +12,11 @@ DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT DOVECOT_CPE_ID_VENDOR = dovecot DOVECOT_SELINUX_MODULES = dovecot +DOVECOT_AUTORECONF = YES + +# add host-gettext for AM_ICONV macro needed for autoreconf DOVECOT_DEPENDENCIES = \ + host-gettext \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ openssl @@ -22,6 +26,10 @@ DOVECOT_DEPENDENCIES = \ DOVECOT_IGNORE_CVES += CVE-2016-4983 # 0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch + +# Note: this ignore CVE entry is reported as stale by pkg-stats, but +# the NVD database is incorrect: +# https://lore.kernel.org/buildroot/20250517181815.02ce0393@windsurf/ DOVECOT_IGNORE_CVES += CVE-2022-30550 DOVECOT_CONF_ENV = \ diff --git a/package/dpdk/Config.in b/package/dpdk/Config.in index 328129ea65..7d4a002002 100644 --- a/package/dpdk/Config.in +++ b/package/dpdk/Config.in @@ -45,7 +45,7 @@ config BR2_PACKAGE_DPDK_TESTS endif -comment "DPDK needs a toolchain w/ dynamic library, threads, wchar, kernel headers >= 4.19" +comment "dpdk needs a glibc toolchain w/ threads, gcc >= 4.9, headers >= 4.19" depends on BR2_USE_MMU # pthread() memory mappings depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/dpdk/dpdk.hash b/package/dpdk/dpdk.hash index 27c06476e7..5c9fd7c087 100644 --- a/package/dpdk/dpdk.hash +++ b/package/dpdk/dpdk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9944f7e5f268e7ac9b4193e2cd54ef6d98f6e1d7dddc967c77ae4f6616d6fbbd dpdk-24.07.tar.xz +sha256 d5ae4cfaef05d6aa491af643d61b83d840e53ced96f9c9f60fda986313ed84b2 dpdk-24.11.3.tar.xz sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 license/bsd-3-clause.txt sha256 e19808bccd90c238fac06da2fc3683e094c64f7ba647e9d86f03a98cf5f2ce05 license/exceptions.txt sha256 6c54c4d44faf3cba829b3d0c21c6955953e758767018fd7244f809b01d4f4845 license/mit.txt diff --git a/package/dpdk/dpdk.mk b/package/dpdk/dpdk.mk index b685e12408..1c7eada937 100644 --- a/package/dpdk/dpdk.mk +++ b/package/dpdk/dpdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -DPDK_VERSION = 24.07 +DPDK_VERSION = 24.11.3 DPDK_SOURCE = dpdk-$(DPDK_VERSION).tar.xz DPDK_SITE = https://fast.dpdk.org/rel DPDK_LICENSE = \ @@ -35,6 +35,8 @@ DPDK_LICENSE_FILES = \ license/exceptions.txt \ license/mit.txt +DPDK_INSTALL_STAGING = YES + DPDK_DEPENDENCIES = \ host-pkgconf \ host-python-pyelftools diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 8573e64055..cb6044415e 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -10,12 +10,14 @@ DRACUT_LICENSE = GPL-2.0 DRACUT_LICENSE_FILES = COPYING DRACUT_CPE_ID_VALID = YES -HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT mv $(HOST_DIR)/bin/dracut $(HOST_DIR)/bin/dracut.real - install -D -m 0755 $(HOST_DRACUT_PKGDIR)/dracut_wrapper \ - $(HOST_DIR)/bin/dracut + sed -e "s%@@TARGET_CROSS@@%$(TARGET_CROSS)%" \ + $(HOST_DRACUT_PKGDIR)/dracut_wrapper.in > \ + $(@D)/dracut_wrapper + install -D -m 0755 $(@D)/dracut_wrapper $(HOST_DIR)/bin/dracut endef HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT diff --git a/package/dracut/dracut_wrapper.in b/package/dracut/dracut_wrapper.in new file mode 100644 index 0000000000..33012853d5 --- /dev/null +++ b/package/dracut/dracut_wrapper.in @@ -0,0 +1,48 @@ +#!/bin/bash +set -e + +# Find the --sysroot argument +sysroot= +next_arg=false +for arg; do + if ${next_arg}; then + next_arg=false + sysroot="${arg}" + continue # not break, in case there are more than one + fi + case "${arg}" in + (--sysroot|-r) + next_arg=true + continue + ;; + (--sysroot=*) + sysroot="${arg#*=}" + continue # not break, in case there are more than one + ;; + (-r?*) + sysroot="${arg#-r}" + continue # not break, in case there are more than one + ;; + esac +done +if [ -z "${sysroot}" ]; then + echo "${0}: --sysroot argument must be given." 1>&2 + exit 1 +fi + +topdir="$(dirname "$(realpath "$(dirname "${0}")")")" +DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)" +cat >"${DRACUT_LDD}" <> $(@D)/localoptions.h echo '#define DROPBEAR_DH_GROUP1 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_DSS 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_SHA1_HMAC 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_RSA_SHA1 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DH_GROUP14_SHA1 1' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO endif diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash index c57145b835..af964606fe 100644 --- a/package/dt-utils/dt-utils.hash +++ b/package/dt-utils/dt-utils.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a6988b889418737324ed3db3785d3a9692e802c1dff4a2323c962008b7b646b1 dt-utils-2023.08.0.tar.xz +sha256 5a1ace759b37c4b5138738ae0fa03574b1f55da01a0faa88aaff0417d275cc0e dt-utils-2023.11.0.tar.xz sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSES/CC0-1.0.txt sha256 2c9d733cadb50e33cc83f05f1fe7cc4b6c5ff7260fd9eea1b839151c7fa64742 LICENSES/GPL-2.0-only.txt sha256 d6e37cb7eff6ef15ae3c4082cf40eae80a94cd59b636991d1149d4a5c9dc3537 LICENSES/GPL-2.0-or-later.txt diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk index 198b36d5fe..7b197c585a 100644 --- a/package/dt-utils/dt-utils.mk +++ b/package/dt-utils/dt-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DT_UTILS_VERSION = 2023.08.0 +DT_UTILS_VERSION = 2023.11.0 DT_UTILS_SOURCE = dt-utils-$(DT_UTILS_VERSION).tar.xz DT_UTILS_SITE = https://git.pengutronix.de/cgit/tools/dt-utils/snapshot DT_UTILS_LICENSE = CC0-1.0, GPL-2.0, GPL-2.0+, Zlib diff --git a/package/dtach/0001-fix-gcc-15-build.patch b/package/dtach/0001-fix-gcc-15-build.patch new file mode 100644 index 0000000000..4da6abb44e --- /dev/null +++ b/package/dtach/0001-fix-gcc-15-build.patch @@ -0,0 +1,27 @@ +From 6d80909a8c0fd19717010a3c76fec560f988ca48 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 9 Dec 2024 12:35:09 +0000 +Subject: [PATCH] fix gcc-15 build + +Upstream: https://github.com/crigler/dtach/commit/6d80909a8c0fd19717010a3c76fec560f988ca48 +Signed-off-by: Florian Larysch +--- + attach.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/attach.c b/attach.c +index 41a696c..e4a46bd 100644 +--- a/attach.c ++++ b/attach.c +@@ -96,7 +96,7 @@ die(int sig) + + /* Window size change. */ + static RETSIGTYPE +-win_change() ++win_change(int sig) + { + signal(SIGWINCH, win_change); + win_changed = 1; +-- +2.50.1 + diff --git a/package/dtv-scan-tables/dtv-scan-tables.hash b/package/dtv-scan-tables/dtv-scan-tables.hash index f110bb6dee..4c5d2b787e 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.hash +++ b/package/dtv-scan-tables/dtv-scan-tables.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a6ffaeec227c35d8afe79b9d7b7a2dd9d3367c33dc1c3d5d5729cebd4973ef48 dtv-scan-tables-7098bdd27548eaf3e5d9485fc68575f88e362daf-git4.tar.gz +sha256 39d883bb4b1ae1397977903ef4d18edb083daa2202389bb62499cd8339c21b19 dtv-scan-tables-15661aabc342b72f539d4600ad87df6663e23aa4-git4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk index d9e6910abd..5ee12e8bfa 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/package/dtv-scan-tables/dtv-scan-tables.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTV_SCAN_TABLES_VERSION = 7098bdd27548eaf3e5d9485fc68575f88e362daf +DTV_SCAN_TABLES_VERSION = 15661aabc342b72f539d4600ad87df6663e23aa4 DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git diff --git a/package/dump1090/0002-Fix-compilation-with-GCC15.patch b/package/dump1090/0002-Fix-compilation-with-GCC15.patch new file mode 100644 index 0000000000..6361dbc907 --- /dev/null +++ b/package/dump1090/0002-Fix-compilation-with-GCC15.patch @@ -0,0 +1,50 @@ +From 93be1da123215e8ac15a0deaffedd480e8899f77 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Tue, 22 Apr 2025 00:41:31 +0200 +Subject: [PATCH] Fix compilation with GCC15 + +Upstream: https://github.com/flightaware/dump1090/pull/261 +Signed-off-by: Peter Korsgaard +--- + ais_charset.c | 2 +- + ais_charset.h | 2 +- + interactive.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ais_charset.c b/ais_charset.c +index a487e3c..0d3af03 100644 +--- a/ais_charset.c ++++ b/ais_charset.c +@@ -1,3 +1,3 @@ + #include "ais_charset.h" + +-char ais_charset[64] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?"; ++char ais_charset[65] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?"; +diff --git a/ais_charset.h b/ais_charset.h +index 93d4a72..95ef373 100644 +--- a/ais_charset.h ++++ b/ais_charset.h +@@ -1,6 +1,6 @@ + #ifndef AIS_CHARSET_H + #define AIS_CHARSET_H + +-extern char ais_charset[64]; ++extern char ais_charset[65]; + + #endif +diff --git a/interactive.c b/interactive.c +index 8761c95..75775ad 100644 +--- a/interactive.c ++++ b/interactive.c +@@ -140,7 +140,7 @@ void interactiveShowData(void) { + static bool need_clear = true; + uint64_t now = mstime(); + char progress; +- char spinner[4] = "|/-\\"; ++ char spinner[5] = "|/-\\"; + int valid = 0; + double signalMax = -100.0; + double signalMin = +100.0; +-- +2.39.5 + diff --git a/package/dust/dust.hash b/package/dust/dust.hash index 975ec9664d..83b01447b6 100644 --- a/package/dust/dust.hash +++ b/package/dust/dust.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ace29e85647e7079f9eaa066da9b1368c7200233eb0814442499948b5adeb028 dust-0.9.0-cargo2.tar.gz +sha256 275c2d7bd06205588b7e20e4b478e0df7213f426a1441923e3f2dfaa80cf4828 dust-1.2.3-cargo4.tar.gz sha256 aee6e2d13d3a55c7881630c09b41ca7b3b44bb1437b5d36695d22decc3655160 LICENSE diff --git a/package/dust/dust.mk b/package/dust/dust.mk index c566723c1c..e83d15c95c 100644 --- a/package/dust/dust.mk +++ b/package/dust/dust.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUST_VERSION = 0.9.0 +DUST_VERSION = 1.2.3 DUST_SITE = $(call github,bootandy,dust,v$(DUST_VERSION)) DUST_LICENSE = APACHE-2.0 DUST_LICENSE_FILES = LICENSE diff --git a/package/dvbsnoop/0001-musl-types-h.patch b/package/dvbsnoop/0001-musl-types-h.patch deleted file mode 100644 index 1149df0d07..0000000000 --- a/package/dvbsnoop/0001-musl-types-h.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix musl build - -Signed-off-by: Bernd Kuhls - -diff -uNr dvbsnoop-1.4.50.org/src/misc/helper.h dvbsnoop-1.4.50/src/misc/helper.h ---- dvbsnoop-1.4.50.org/src/misc/helper.h 2006-01-02 20:04:56.000000000 +0100 -+++ dvbsnoop-1.4.50/src/misc/helper.h 2016-01-24 14:35:02.000000000 +0100 -@@ -16,6 +16,7 @@ - #ifndef __HELPER_H - #define __HELPER_H - -+#include - - u_long outBit_Sx (int verbosity, const char *text, u_char *buf, int startbit, int bitlen); - u_long outBit_Sx_NL (int verbosity, const char *text, u_char *buf, int startbit, int bitlen); diff --git a/package/dvbsnoop/Config.in b/package/dvbsnoop/Config.in deleted file mode 100644 index fb63fa4e8b..0000000000 --- a/package/dvbsnoop/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_DVBSNOOP - bool "dvbsnoop" - help - Dvbsnoop is just a simple tool to analyze, view or debug a - transport stream (TS), program elementary stream (PES) or even - a program stream (PS). Dvbsnoop is trying to get input mostly - direct from a frontend (satellite or cable tuner inside a - set-top box for example) via DVB APIv3 to view into a TS, or a - demux to view PES or PS (also mostly inside the set-top box or - even PCI Card or USB Plug) but also from a file (recorded TS). - Dvbsnoop is working well on SD transport streams but may have - some limited functionality on HD transport streams - (DVB-{C,S,T}2 because of missing knowledge how to handle it. - - Dvbsnoop itself doesn't do the tuning on the frontend, this - has to be done by external helpers or manually driver call. - The dvbsnoop tool was written while developing the software - Neutrino on the set-top box DBox2. - - http://dvbsnoop.sourceforge.net - http://en.wikipedia.org/wiki/DBox2 diff --git a/package/dvbsnoop/dvbsnoop.hash b/package/dvbsnoop/dvbsnoop.hash deleted file mode 100644 index 0d88afe154..0000000000 --- a/package/dvbsnoop/dvbsnoop.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 7658498b26a5d2a0242e81f0cfafa0e43a2bec56f8674e7ac197dfc310866ec6 dvbsnoop-1.4.50.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/dvbsnoop/dvbsnoop.mk b/package/dvbsnoop/dvbsnoop.mk deleted file mode 100644 index fdc483d22c..0000000000 --- a/package/dvbsnoop/dvbsnoop.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# dvbsnoop -# -################################################################################ - -DVBSNOOP_VERSION = 1.4.50 -DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION) -DVBSNOOP_LICENSE = GPL-2.0 -DVBSNOOP_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch b/package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch new file mode 100644 index 0000000000..36442a53b8 --- /dev/null +++ b/package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch @@ -0,0 +1,103 @@ +From 1a2ce8cd956065106ae27a36a5000f00ebc4591f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 22 Nov 2025 21:12:23 +0100 +Subject: [PATCH] configure.ac: check for FS_IOC_READ_VERITY_METADATA + availability +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 6bfa843b4435334ac073e42950b48d8bacb54977 ("mke2fs: enable +copying of fs-verity metadata") introduced support for reading +fs-verity metadata, which requires using the +FS_IOC_READ_VERITY_METADATA. + +The code is conditionally compiled when the kernel headers have + available. Unfortunately, this check is not +sufficient: was introduced in Linux 5.10, but the +FS_IOC_READ_VERITY_METADATA was not introduced before 5.12, so if one +is using 5.10 or 5.11 kernel headers, the build fails with: + +./../misc/create_inode.c: In function ‘copy_fs_verity_data’: +./../misc/create_inode.c:589:10: error: variable ‘arg’ has initializer but incomplete type + 589 | struct fsverity_read_metadata_arg arg = { + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +[...] +./../misc/create_inode.c:600:20: error: ‘FS_IOC_READ_VERITY_METADATA’ undeclared (first use in this function) + 600 | size = ioctl(fd, FS_IOC_READ_VERITY_METADATA, &arg); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This commit therefore extends the configure.ac check to ensure that +not only exists but also that it defines the +FS_IOC_READ_VERITY_METADATA ioctl. + +Upstream: https://github.com/tytso/e2fsprogs/pull/256 +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 18 ++++++++++++++++++ + misc/create_inode.c | 6 +++--- + 2 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a0171163..3e5586a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1997,6 +1997,24 @@ OS_IO_FILE="" + esac] + AC_SUBST(OS_IO_FILE) + ++dnl Check for fsverity ioctl ++if test "${ac_cv_header_linux_fsverity_h}" = "yes"; then ++ AC_MSG_CHECKING([for FS_IOC_READ_VERITY_METADATA ioctl]) ++ AC_PREPROC_IFELSE( ++ [AC_LANG_PROGRAM([[ ++#include ++#ifndef FS_IOC_READ_VERITY_METADATA ++# error "FS_IOC_READ_VERITY_METADATA not available" ++#endif ++]], [])], [ ++ AC_DEFINE([HAVE_FS_IOC_READ_VERITY_METADATA], [1], [Define to 1 if FS_IOC_READ_VERITY_METADATA ioctl is available]) ++ AC_MSG_RESULT([yes]) ++ ], ++ [ ++ AC_MSG_RESULT([no]) ++ ]) ++fi ++ + dnl + dnl Make our output files, being sure that we create the some miscellaneous + dnl directories +diff --git a/misc/create_inode.c b/misc/create_inode.c +index 624efc03..a7918873 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -30,7 +30,7 @@ + #ifdef HAVE_SYS_SYSMACROS_H + #include + #endif +-#ifdef HAVE_LINUX_FSVERITY_H ++#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA) + #include + #include + #endif +@@ -569,7 +569,7 @@ out: + } + #endif /* FS_IOC_FIEMAP */ + +-#ifdef HAVE_LINUX_FSVERITY_H ++#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA) + static inline off_t round_up(off_t n, off_t blksz, off_t bias) + { + return ((n - bias + (blksz - 1)) & ~(blksz - 1)) + bias; +@@ -738,7 +738,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf, + err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf, + zerobuf); + +-#ifdef HAVE_LINUX_FSVERITY_H ++#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA) + if (!err && (flags & EXT4_VERITY_FL)) + err = copy_fs_verity(fs, fd, e2_file, statbuf->st_size); + #endif +-- +2.51.1 + diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index a45767d506..aeb9548f15 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -46,7 +46,6 @@ comment "e2scrub needs bash, coreutils, lvm2, and util-linux" config BR2_PACKAGE_E2FSPROGS_E4DEFRAG bool "e4defrag" - depends on !BR2_nios2 # fallocate not implemented help Online defragmenter for ext4 filesystem diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 94ce2d5bc9..3afae18f20 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.1/sha256sums.asc -sha256 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1 e2fsprogs-1.47.1.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.3/sha256sums.asc +sha256 857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329 e2fsprogs-1.47.3.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 7e2d9a739d..ad3d1dbe75 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.47.1 +E2FSPROGS_VERSION = 1.47.3 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) @@ -18,6 +18,13 @@ E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux +# 0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch +# the additional dependencies are only needed for autoreconf +E2FSPROGS_AUTORECONF = YES +E2FSPROGS_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive +E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive +HOST_E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive + E2FSPROGS_SELINUX_MODULES = fstools # e4defrag doesn't build on older systems like RHEL5.x, and we don't @@ -63,10 +70,6 @@ else E2FSPROGS_CONF_OPTS += --disable-fuse2fs endif -ifeq ($(BR2_nios2),y) -E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no -endif - # workaround gcc bug 111001 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_111001),y) E2FSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Os" diff --git a/package/easyframes/0001-bump-cmake-version.patch b/package/easyframes/0001-bump-cmake-version.patch new file mode 100644 index 0000000000..74e952b709 --- /dev/null +++ b/package/easyframes/0001-bump-cmake-version.patch @@ -0,0 +1,25 @@ +From 5da394897e9ed188310ca838f5f9112687b7bbe9 Mon Sep 17 00:00:00 2001 +From: "Allan W. Nielsen" +Date: Tue, 12 Sep 2023 20:07:07 +0200 +Subject: [PATCH] EF: Bump cmake version + +Review-record: https://bitbucket.microchip.com/projects/UNGE/repos/sw-lmstax-labs/pull-requests/679 + +Upstream: https://github.com/microchip-ung/easyframes/commit/5da394897e9ed188310ca838f5f9112687b7bbe9 + +[Github diff munged slightly to avoid including the UTF-8 BOM] +Signed-off-by: Florian Larysch +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf7bad1..e489537 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,4 +2,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.20) + + option(TEST_ENABLE "Enable tests" off) + diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index ce5f67bc61..83337feec6 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_EBTABLES depends on BR2_USE_MMU # fork() # https://lore.kernel.org/all/20210518181730.13436-1-patrickdepinguin@gmail.com/ depends on !BR2_KERNEL_64_USERLAND_32 + depends on !BR2_sparc64 # int-conversion error help Ethernet bridge frame table administration diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk index 6eb3add98b..03e7f3e34f 100644 --- a/package/ecryptfs-utils/ecryptfs-utils.mk +++ b/package/ecryptfs-utils/ecryptfs-utils.mk @@ -32,7 +32,7 @@ else ECRYPTFS_UTILS_CONF_OPTS += --disable-pam endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBRESSL)$(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl ECRYPTFS_UTILS_DEPENDENCIES += openssl diff --git a/package/ed/ed.hash b/package/ed/ed.hash index d1d99309c6..44d5bc7653 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2024-04/msg00003.html -sha256 65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523 ed-1.20.2.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2025-08/msg00010.html +sha256 1af541116796d6b9e4b66ef9c45ddce0e15a19ed62bfca362ccd7d472cc1c8fb ed-1.22.1.tar.lz # Locally calculated -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 022e9c2e9cc1aac3622313df6f971fbb39c1d1b0cb45324c16b8a1fe231c5ea6 COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 704744359a..10092d513f 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,7 +4,7 @@ # ################################################################################ -ED_VERSION = 1.20.2 +ED_VERSION = 1.22.1 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-2.0+ diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash index e4e84f1cef..27c8ee632e 100644 --- a/package/edk2-non-osi/edk2-non-osi.hash +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fe059c4ee5d4fad6245a6eb53ed6b62b8890e9481cfb52c9fbdb83a5b2e0edb edk2-non-osi-8c09bd0955338db38813e0d8ae1faa634f545f73.tar.gz +sha256 a726656c45dd1e1698cc2ffd838b143197f6c574725a5c9bf42d1b01ea7f0719 edk2-non-osi-ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8.tar.gz sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk index d787c882b3..42b45f2475 100644 --- a/package/edk2-non-osi/edk2-non-osi.mk +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_NON_OSI_VERSION = 8c09bd0955338db38813e0d8ae1faa634f545f73 +EDK2_NON_OSI_VERSION = ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8 EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION)) EDK2_NON_OSI_INSTALL_TARGET = NO EDK2_NON_OSI_INSTALL_STAGING = YES diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index 0095d4298d..d088bcc342 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41fa720ac644ec0523c576ff28eba5e0308c9649111ce42f7d408b8d8b30eaf5 edk2-platforms-3f08401365d67e10924c774e6c3f64be56bc15b6.tar.gz +sha256 4417db79bfb8a9bf601e94e295fec270f99eac3447a6d418ff28ea7dd374d8d6 edk2-platforms-d1b297b2aa693fc723ac883866c925e9d04260c9.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 23d9221649..86b9fea960 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = 3f08401365d67e10924c774e6c3f64be56bc15b6 +EDK2_PLATFORMS_VERSION = d1b297b2aa693fc723ac883866c925e9d04260c9 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 5800e6c143..d07c9345d1 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_EFIBOOTMGR depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS select BR2_PACKAGE_EFIVAR select BR2_PACKAGE_POPT help @@ -21,4 +20,3 @@ comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3. depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 0a36335c0a..7764592b65 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -17,7 +17,6 @@ config BR2_PACKAGE_EFIVAR # don't have that header file renamed, and that is causing build # failures. So, prevent this package to be built using those # toolchains. - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Tools and libraries to manipulate EFI variables @@ -29,4 +28,3 @@ comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch b/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch index bac9bc1245..b2b5a5d299 100644 --- a/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch +++ b/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch @@ -1,4 +1,4 @@ -From 73e4da5ca780196d23db8029dcd28f87a0402711 Mon Sep 17 00:00:00 2001 +From 571445ec4643865566d2c5a9e27d9b78b8b00107 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 29 May 2017 23:03:48 +0300 Subject: [PATCH] Add a --{enable,disable}-progs configure option @@ -22,16 +22,20 @@ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Seiderer [Fabrice: don't error out if obstack is not found] Signed-off-by: Fabrice Fontaine +[Rebased on 0.192] +Signed-off-by: Thomas Bonnefille +[Rebased on 0.193] +Signed-off-by: Thomas Perale --- Makefile.am | 6 +++++- - configure.ac | 6 ++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) + configure.ac | 8 +++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 9c47afa..edf8dfc 100644 +index 92130b57..00f5176b 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory +@@ -28,8 +28,12 @@ AM_MAKEFLAGS = --no-print-directory pkginclude_HEADERS = version.h @@ -39,17 +43,17 @@ index 9c47afa..edf8dfc 100644 +PROGS_SUBDIR = src +endif + - SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \ -- libasm debuginfod src po doc tests -+ libasm debuginfod $(PROGS_SUBDIR) po doc tests - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 + SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl \ +- libdwfl_stacktrace libdw libasm debuginfod src po doc tests ++ libdwfl_stacktrace libdw libasm debuginfod $(PROGS_SUBDIR) po doc tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING SECURITY \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 CONDUCT diff --git a/configure.ac b/configure.ac -index d345495..0dd4b1e 100644 +index f191488f..87d91f8f 100644 --- a/configure.ac +++ b/configure.ac -@@ -393,6 +393,12 @@ AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), +@@ -427,6 +427,12 @@ AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), [tests_use_rpath=$enableval], [tests_use_rpath=no]) AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) @@ -62,7 +66,7 @@ index d345495..0dd4b1e 100644 dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= -@@ -579,7 +585,7 @@ saved_LIBS="$LIBS" +@@ -671,7 +677,7 @@ saved_LIBS="$LIBS" AC_SEARCH_LIBS([_obstack_free], [obstack]) LIBS="$saved_LIBS" case "$ac_cv_search__obstack_free" in @@ -72,5 +76,5 @@ index d345495..0dd4b1e 100644 *) obstack_LIBS= ;; esac -- -2.30.1 +2.47.1 diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index c355048c6d..e866dd448b 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -24,8 +24,13 @@ if BR2_PACKAGE_ELFUTILS config BR2_PACKAGE_ELFUTILS_PROGS bool "Install programs" depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_INSTALL_LIBSTDCPP help This option tells elfutils to not only install the libelf libraries, but also the elfutils programs. +comment "elfutils programs needs a glibc toolchain w/ C++" + depends on !BR2_TOOLCHAIN_USES_GLIBC \ + || !BR2_INSTALL_LIBSTDCPP + endif diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index e3cc67dc0e..933420d1dd 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,5 +1,5 @@ -# From https://sourceware.org/elfutils/ftp/0.189/sha512.sum -sha512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71 elfutils-0.189.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.194/sha512.sum +sha512 5d00502f61b92643bf61dc61da4ddded36c423466388d992bcd388c5208761b8ed9db1a01492c085cd0984eef30c08f895a8e307e78e0df8df40b56ae35b78a5 elfutils-0.194.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 8738af7751..554a60003f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.189 +ELFUTILS_VERSION = 0.194 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES @@ -12,7 +12,7 @@ ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 ELFUTILS_CPE_ID_VALID = YES ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) -HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz +HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz host-zstd # We patch configure.ac ELFUTILS_AUTORECONF = YES @@ -26,7 +26,7 @@ ELFUTILS_CONF_OPTS += \ HOST_ELFUTILS_CONF_OPTS = \ --with-bzlib \ --with-lzma \ - --without-zstd \ + --with-zstd \ --disable-demangler \ --disable-progs diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 4f67cbae21..418d1a9a2a 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 6cfc0888edc94de9f0623798609587b2cc11b92b892945f317e8d199afe7b12e ell-0.69.tar.xz +sha256 28dabdb1966fd2e47363c44e041de507e9420411b846947efa01b4cb0cda0d6b ell-0.79.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 6d4e8a5ae7..a0ae7a68c8 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.69 +ELL_VERSION = 0.79 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ diff --git a/package/emlog/0002-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch b/package/emlog/0002-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch new file mode 100644 index 0000000000..20cacc97be --- /dev/null +++ b/package/emlog/0002-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch @@ -0,0 +1,35 @@ +From 35a0e8d33c5a520df458483237966fa1b1024a3f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 14 Dec 2024 09:55:10 -0800 +Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+ + +no_llseek is finally gone with 6.12-rc1 [1] + +[1] https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8 +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/nicupavel/emlog/commit/dca01ea62833249d78ac3bdf277b73424bf93e89 +--- + emlog.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/emlog.c b/emlog.c +index 2ead738..b45c72d 100644 +--- a/emlog.c ++++ b/emlog.c +@@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = { + .open = emlog_open, + .release = emlog_release, + .poll = emlog_poll, +- .llseek = no_llseek, /* no_llseek by default introduced at v2.6.37-rc1 */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) ++ /* no_llseek by default introduced at v2.6.37-rc1 and ++ * removed in 6.12.0 ++ */ ++ .llseek = no_llseek, ++#endif + .owner = THIS_MODULE, + }; + +-- +2.47.1 + diff --git a/package/empty/empty.hash b/package/empty/empty.hash index 5c7daa0052..d621aa373f 100644 --- a/package/empty/empty.hash +++ b/package/empty/empty.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8a7ca8c7099dc6d6743ac7eafc0be3b1f8991d2c8f20cf66ce900c7f08e010bd empty-0.6.23c.tgz -sha256 6433f4490a82b80ddac37f24cebfe8f3cd7de5686ebb9737281d47997a9941d6 COPYRIGHT +sha256 9ad495d52b942e3fd858643536d8d12e282568214300954d4518d8c22b893585 empty-0.6.23d.tgz +sha256 17e9dd2f3e7bd2d00879dbd5dc908f911e57483439c1ff4c9266e20aa491a9ae COPYRIGHT diff --git a/package/empty/empty.mk b/package/empty/empty.mk index 24135b2f8d..81196e98ab 100644 --- a/package/empty/empty.mk +++ b/package/empty/empty.mk @@ -4,7 +4,7 @@ # ################################################################################ -EMPTY_VERSION = 0.6.23c +EMPTY_VERSION = 0.6.23d EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION) EMPTY_LICENSE = BSD-3-Clause diff --git a/package/enet/enet.hash b/package/enet/enet.hash index 2643878ca9..88c19ff897 100644 --- a/package/enet/enet.hash +++ b/package/enet/enet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc enet-1.3.17.tar.gz -sha256 77f94e3be39938801163844b8bf9a4f12badcc0da136e9886e7da14a816d74d3 LICENSE +sha256 2a8a0c5360d68bb4fcd11f2e4c47c69976e8d2c85b109dd7d60b1181a4f85d36 enet-1.3.18.tar.gz +sha256 a29cd246638974da7c6edf423a0a69d4a6f7d759940b7cfa9a2bc3442ac3834c LICENSE diff --git a/package/enet/enet.mk b/package/enet/enet.mk index e2feb26b54..71e6dad39a 100644 --- a/package/enet/enet.mk +++ b/package/enet/enet.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENET_VERSION = 1.3.17 +ENET_VERSION = 1.3.18 ENET_SITE = http://enet.bespin.org/download ENET_LICENSE = MIT ENET_LICENSE_FILES = LICENSE diff --git a/package/enscript/0002-enscript-c23.patch b/package/enscript/0002-enscript-c23.patch new file mode 100644 index 0000000000..707674935d --- /dev/null +++ b/package/enscript/0002-enscript-c23.patch @@ -0,0 +1,19 @@ +Fix build with gcc 15.x + +Upstream: https://savannah.gnu.org/bugs/?66845 + +Signed-off-by: Bernd Kuhls + +diff --git a/compat/regex.c b/compat/regex.c +index c6907f3..87f2840 100644 +--- a/compat/regex.c ++++ b/compat/regex.c +@@ -336,7 +336,7 @@ typedef char boolean; + #define false 0 + #define true 1 + +-static int re_match_2_internal (); ++static int re_match_2_internal (struct re_pattern_buffer*, const char*, int, const char*, int, int, struct re_registers*, int); + + /* These are the command codes that appear in compiled regular + expressions. Some opcodes are followed by argument bytes. A diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index 9fc5a6eabf..7ff587e35c 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,5 +1,5 @@ -# From https://github.com/erlang/otp/releases/download/OTP-26.0.2/SHA256.txt -sha256 47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193 otp_src_26.0.2.tar.gz +# From https://github.com/erlang/otp/releases/download/OTP-26.2.5.15/SHA256.txt +sha256 28e6d63d82927f132d56289dd3c428ef8bce6bf2283c8549aa0a7afca1a8fe3b otp_src_26.2.5.15.tar.gz # Hash for license file sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index f9956d4468..59353742f0 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_VERSION = 26.0.2 +ERLANG_VERSION = 26.2.5.15 ERLANG_RELEASE = $(firstword $(subst ., ,$(ERLANG_VERSION))) ERLANG_SITE = \ https://github.com/erlang/otp/releases/download/OTP-$(ERLANG_VERSION) diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 573da1762d..4e59e55af0 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 64b6ff7e899f62480283cee63787f37f0f9c4be7a6bc7a23d734aaa873a6cff4 erofs-utils-1.8.2.tar.gz +sha256 05eb4edebe11decce6ecb34e98d2f80c8cd283c2f2967d8ba7efd58418570514 erofs-utils-1.8.10.tar.gz sha256 0df042de29b44887355db86c79708a4489ce6e6666f6e33ad02040293f09e6a2 COPYING sha256 a400f85dd06d230f1b308cde4290a53f345b6e320a376b7904b31c51c2fd4b1a LICENSES/Apache-2.0 sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 LICENSES/GPL-2.0 diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index 40349c309c..de3c97cbca 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.8.2 +EROFS_UTILS_VERSION = 1.8.10 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+, GPL-2.0+ or Apache-2.0 (liberofs) EROFS_UTILS_LICENSE_FILES = COPYING LICENSES/Apache-2.0 LICENSES/GPL-2.0 diff --git a/package/esp-hosted/0001-Fix-ng-build-for-6.15.patch b/package/esp-hosted/0001-Fix-ng-build-for-6.15.patch new file mode 100644 index 0000000000..36baed50c7 --- /dev/null +++ b/package/esp-hosted/0001-Fix-ng-build-for-6.15.patch @@ -0,0 +1,167 @@ +From cab85fc98dfcddad6ebf0faa2f5f4f4d6c6562a0 Mon Sep 17 00:00:00 2001 +From: Yogesh Mantri +Date: Sun, 8 Jun 2025 12:11:09 +0800 +Subject: [PATCH] Fix(ng): build for 6.15 Fixes #607 + +Upstream: https://github.com/espressif/esp-hosted/commit/cab85fc98dfcddad6ebf0faa2f5f4f4d6c6562a0 +Signed-off-by: Giulio Benetti +--- + esp_hosted_ng/host/Makefile | 63 +++++++++----------- + esp_hosted_ng/host/esp_debugfs.c | 2 +- + esp_hosted_ng/host/esp_stats.c | 1 + + esp_hosted_ng/host/include/esp_kernel_port.h | 5 ++ + esp_hosted_ng/host/sdio/esp_sdio.c | 2 +- + 5 files changed, 36 insertions(+), 37 deletions(-) + +diff --git a/esp_hosted_ng/host/Makefile b/esp_hosted_ng/host/Makefile +index 029f930f55..6fa68c876f 100644 +--- a/esp_hosted_ng/host/Makefile ++++ b/esp_hosted_ng/host/Makefile +@@ -1,67 +1,60 @@ +-# Toolchain Path ++# Toolchain and kernel + CROSS_COMPILE := +-# Linux Kernel header + KERNEL := /lib/modules/$(shell uname -r)/build +-# Architecture + ARCH := $(shell uname -m) + +-# Check and adjust ARCH for specific cases ++# Normalize ARCH + ifeq ($(ARCH), x86_64) + ARCH := x86 + endif +- + ifeq ($(ARCH), aarch64) + ARCH := arm64 + endif + +-#Default interface is sdio +-MODULE_NAME=esp32_sdio +- +-#enable logging by default +-CONFIG_DEBUG_LOGS := y ++# Module name (default: sdio) ++target ?= sdio ++MODULE_NAME := esp32_$(target) + ++# Debug and AP support ++CONFIG_DEBUG_LOGS ?= y + ifeq ($(CONFIG_AP_SUPPORT), y) +- EXTRA_CFLAGS += -DCONFIG_AP_MODE ++ EXTRA_CFLAGS += -DCONFIG_AP_MODE + endif + +-#Targets passed overrrides default value ++# Source and include paths ++PWD := $(shell pwd) ++ccflags-y += -I$(src) -I$(src)/include -I$(CURDIR) -I$(CURDIR)/include ++EXTRA_CFLAGS += -I$(M) -I$(M)/include ++ ++# Interface-specific sources + ifeq ($(target), sdio) +- MODULE_NAME=esp32_sdio ++ ccflags-y += -I$(src)/sdio -I$(CURDIR)/sdio ++ EXTRA_CFLAGS += -I$(M)/sdio ++ module_objects += sdio/esp_sdio.o sdio/esp_sdio_api.o + endif + + ifeq ($(target), spi) +- MODULE_NAME=esp32_spi +-endif +- +-#debug_flags := -DDEBUG +- +-EXTRA_CFLAGS += -I$(PWD)/include -I$(PWD) +- +-ifeq ($(MODULE_NAME), esp32_sdio) +- EXTRA_CFLAGS += -I$(PWD)/sdio +- module_objects += sdio/esp_sdio.o sdio/esp_sdio_api.o +-endif +- +-ifeq ($(MODULE_NAME), esp32_spi) +- EXTRA_CFLAGS += -I$(PWD)/spi +- module_objects += spi/esp_spi.o ++ ccflags-y += -I$(src)/spi -I$(CURDIR)/spi ++ EXTRA_CFLAGS += -I$(M)/spi ++ module_objects += spi/esp_spi.o + endif + ++# Common source files + module_objects += esp_bt.o main.o esp_cmd.o esp_utils.o esp_cfg80211.o esp_stats.o esp_debugfs.o esp_log.o +-#$(foreach obj,$(module_objects),$(eval CFLAGS_$(obj:.o=).o := $(debug_flags))) + CFLAGS_esp_log.o = -DDEBUG + +-PWD := $(shell pwd) +- ++# Module build rules + obj-m := $(MODULE_NAME).o + $(MODULE_NAME)-y := $(module_objects) + ++# Build targets + all: clean +- make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KERNEL) M=$(PWD) modules ++ $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KERNEL) M=$(PWD) modules + + clean: +- rm -rf *.o sdio/*.o spi/*.o *.ko +- make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KERNEL) M=$(PWD) clean ++ rm -rf *.o */*.o *.ko *.mod.c *.symvers *.order .*.cmd .tmp_versions ++ $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KERNEL) M=$(PWD) clean + + check: +- make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KERNEL) M=$(PWD) $(module_objects) ++ $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KERNEL) M=$(PWD) $(module_objects) ++ +diff --git a/esp_hosted_ng/host/esp_debugfs.c b/esp_hosted_ng/host/esp_debugfs.c +index 74b1813fb4..4399cab825 100644 +--- a/esp_hosted_ng/host/esp_debugfs.c ++++ b/esp_hosted_ng/host/esp_debugfs.c +@@ -1,4 +1,4 @@ +-#include "include/utils.h" ++#include "utils.h" + #include + #include + #include +diff --git a/esp_hosted_ng/host/esp_stats.c b/esp_hosted_ng/host/esp_stats.c +index 82eff7b0a6..61c37733cb 100644 +--- a/esp_hosted_ng/host/esp_stats.c ++++ b/esp_hosted_ng/host/esp_stats.c +@@ -8,6 +8,7 @@ + + #include "utils.h" + #include "esp_stats.h" ++#include "esp_kernel_port.h" + + #if TEST_RAW_TP + +diff --git a/esp_hosted_ng/host/include/esp_kernel_port.h b/esp_hosted_ng/host/include/esp_kernel_port.h +index b633ee346f..35a18da504 100644 +--- a/esp_hosted_ng/host/include/esp_kernel_port.h ++++ b/esp_hosted_ng/host/include/esp_kernel_port.h +@@ -222,4 +222,9 @@ static inline bool wireless_dev_current_bss_exists(struct wireless_dev *wdev) + #define spi_master_put(_ctlr) spi_controller_put(_ctlr) + #endif + ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) ++ #define del_timer timer_delete_sync ++#endif ++ + #endif +diff --git a/esp_hosted_ng/host/sdio/esp_sdio.c b/esp_hosted_ng/host/sdio/esp_sdio.c +index 52759dee34..6d90fe92f6 100644 +--- a/esp_hosted_ng/host/sdio/esp_sdio.c ++++ b/esp_hosted_ng/host/sdio/esp_sdio.c +@@ -20,7 +20,7 @@ + #include + #include "esp_stats.h" + #include "esp_utils.h" +-#include "include/esp_kernel_port.h" ++#include "esp_kernel_port.h" + + extern u32 raw_tp_mode; + #define MAX_WRITE_RETRIES 2 +-- +2.39.5 + diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index ea18c243d1..8af32e9239 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78ab4f10ddce76749d36511591a0a7bb2a982db96ac1ea1b02b5c35dab725d8c esp-hosted-91b093365cc58214532b976dd8749f65523d1e6d.tar.gz -sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE +sha256 1025b8c8d982bab03ebec9859f828a1c81218077245b602621eb4f07c169bac8 ng-v1.0.4.0.0.tar.gz +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 esp_hosted_ng/host/LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 4efefc3023..965d3a5cc6 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,11 +4,12 @@ # ################################################################################ -ESP_HOSTED_VERSION = 91b093365cc58214532b976dd8749f65523d1e6d -ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) +ESP_HOSTED_VERSION = 1.0.4.0.0 +ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,release/ng-v$(ESP_HOSTED_VERSION)) +ESP_HOSTED_SOURCE = ng-v$(ESP_HOSTED_VERSION).tar.gz ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 -ESP_HOSTED_LICENSE_FILE = LICENSE +ESP_HOSTED_LICENSE_FILES = esp_hosted_ng/host/LICENSE ESP_HOSTED_MODULE_SUBDIRS = esp_hosted_ng/host define ESP_HOSTED_LINUX_CONFIG_FIXUPS diff --git a/package/espflash/espflash.hash b/package/espflash/espflash.hash index 0b1e160a47..0be30f0442 100644 --- a/package/espflash/espflash.hash +++ b/package/espflash/espflash.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f91a3e33e874bac0d7687d87c3cd692a54325c0dceaf35c983bd3d94519dee25 espflash-3.1.1-cargo2.tar.gz -sha256 0886cf791a43c02d71c105b4835b53293704ec407a72f84a87f73e20cb2d3251 LICENSE-APACHE -sha256 a75018ab59a13738ed2024a0090ae8f91b7693ae84568aa0e52c3dff99e6748d LICENSE-MIT +sha256 5edf94cd55daceffd08278f7789ea58b24de2051f0e15d8b7ba441bc94337d87 espflash-4.0.1-cargo4.tar.gz +sha256 811f4d4d7ae8f88090dcd14cddf1982ca75cc30b5604e6ebb636693d9b885788 LICENSE-APACHE +sha256 8daec6f7e829af4dfc7c99a251986648f718b90589aa819bc48be8ef82b0c12f LICENSE-MIT diff --git a/package/espflash/espflash.mk b/package/espflash/espflash.mk index bcb343fc58..da15535670 100644 --- a/package/espflash/espflash.mk +++ b/package/espflash/espflash.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESPFLASH_VERSION = 3.1.1 +ESPFLASH_VERSION = 4.0.1 ESPFLASH_SITE = $(call github,esp-rs,espflash,v$(ESPFLASH_VERSION)) ESPFLASH_SUBDIR = espflash ESPFLASH_LICENSE = Apache-2.0 or MIT diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 6fc0c13d3b..b5cbc3d737 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,6 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 8d91f5c72ae3f25b7e88d4781279dcb320f71e30058914370b1c574c96b31202 ethtool-6.11.tar.xz +sha256 9477c365114d910120aaec5336a1d16196c833d8486f7c6da67bedef57880ade ethtool-6.15.tar.xz + # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index fc0622c04a..4e60cadbf6 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.11 +ETHTOOL_VERSION = 6.15 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 diff --git a/package/eudev/S10udevd b/package/eudev/S10udevd new file mode 100644 index 0000000000..8bb8f6eb3a --- /dev/null +++ b/package/eudev/S10udevd @@ -0,0 +1,96 @@ +#!/bin/sh +# +# udev This is a minimal non-LSB version of a UDEV startup script. It +# was derived by stripping down the udev-058 LSB version for use +# with buildroot on embedded hardware using Linux 2.6.34+ kernels. +# +# You may need to customize this for your system's resource limits +# (including startup time!) and administration. For example, if +# your early userspace has a custom initramfs or initrd you might +# need /dev much earlier; or without hotpluggable busses (like USB, +# PCMCIA, MMC/SD, and so on) your /dev might be static after boot. +# +# This script assumes your system boots right into the eventual root +# filesystem, and that init runs this udev script before any programs +# needing more device nodes than the bare-bones set -- /dev/console, +# /dev/zero, /dev/null -- that's needed to boot and run this script. +# + +DAEMON="udevd" +PIDFILE="/var/run/$DAEMON.pid" + +SETTLE_TIMEOUT=30 +UDEVD_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf "Starting %s: " "$DAEMON" + [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' > /proc/sys/kernel/hotplug + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/sbin/$DAEMON" \ + -- $UDEVD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + udevadm trigger --type=subsystems --action=add + udevadm trigger --type=devices --action=add + udevadm settle --timeout=$SETTLE_TIMEOUT || echo "udevadm settle failed" + return "$status" +} + +stop() { + printf "Stopping %s: " "$DAEMON" + udevadm control --exit + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + return "$status" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" +} + +restart() { + stop + start +} + +reload() { + printf "Reloading %s config: " "$DAEMON" + udevadm control --reload + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in + start) + start;; + stop) + stop;; + restart) + restart;; + reload) + reload;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 8318bc1ed4..1a56cfd2f0 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -14,7 +14,6 @@ EUDEV_CONF_OPTS = \ --disable-manpages \ --sbindir=/sbin \ --libexecdir=/lib \ - --disable-introspection \ --enable-kmod \ --enable-blkid @@ -53,10 +52,10 @@ EUDEV_CONF_OPTS += --disable-selinux endif define EUDEV_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev + $(INSTALL) -D -m 0755 package/eudev/S10udevd $(TARGET_DIR)/etc/init.d/S10udevd endef -# Avoid installing S10udev with openrc, as the service is started by a unit +# Avoid installing S10udevd with openrc, as the service is started by a unit # from the udev-gentoo-scripts package. define EUDEV_INSTALL_INIT_OPENRC @: @@ -71,7 +70,6 @@ HOST_EUDEV_CONF_OPTS = \ --with-rootlibdir=/lib \ --sysconfdir=/etc \ --disable-blkid \ - --disable-introspection \ --disable-kmod \ --disable-manpages \ --disable-rule-generator \ @@ -84,7 +82,7 @@ define HOST_EUDEV_INSTALL_CMDS endef define HOST_EUDEV_BUILD_HWDB - $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) + $(HOST_DIR)/bin/udevadm hwdb --update --usr --root $(TARGET_DIR) endef HOST_EUDEV_TARGET_FINALIZE_HOOKS += HOST_EUDEV_BUILD_HWDB diff --git a/package/ev3dev-linux-drivers/Config.in b/package/ev3dev-linux-drivers/Config.in deleted file mode 100644 index 9be2f282e9..0000000000 --- a/package/ev3dev-linux-drivers/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -# Prompt-less option, because this package is not doing anything except -# downloading the ev3dev driver sources. The real work is done by a Linux -# extension. -config BR2_PACKAGE_EV3DEV_LINUX_DRIVERS - bool - depends on BR2_LINUX_KERNEL - help - Linux drivers for LEGO MINDSTORMS EV3 - - This is only the download helper for the kernel patch. - - https://github.com/ev3dev/lego-linux-drivers diff --git a/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk b/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk deleted file mode 100644 index 92e8927817..0000000000 --- a/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# ev3dev Linux drivers -# -################################################################################ - -EV3DEV_LINUX_DRIVERS_VERSION = 0e551eb25ae8600c1f178814781bfb42dc835496 -EV3DEV_LINUX_DRIVERS_SITE = $(call github,ev3dev,lego-linux-drivers,$(EV3DEV_LINUX_DRIVERS_VERSION)) -EV3DEV_LINUX_DRIVERS_LICENSE = GPL-2.0 - -$(eval $(generic-package)) diff --git a/package/ev3dev-linux-drivers/lego-linux-drivers.hash b/package/ev3dev-linux-drivers/lego-linux-drivers.hash deleted file mode 100644 index cc48f65395..0000000000 --- a/package/ev3dev-linux-drivers/lego-linux-drivers.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9d2740b348c8d43e7e15fedc4cec99bf351a3a2ba8691f2a07c439a9c034bc04 lego-linux-drivers-0e551eb25ae8600c1f178814781bfb42dc835496.tar.gz diff --git a/package/evtest/evtest.hash b/package/evtest/evtest.hash index 0ed51df4e4..f5aa5ca525 100644 --- a/package/evtest/evtest.hash +++ b/package/evtest/evtest.hash @@ -1,5 +1,5 @@ # locally computed -sha256 06dfe6b9760b78f3f73aca2120cbcb79339b33e59d5c79a49b4bd5d34844b054 evtest-evtest-1.35.tar.gz +sha256 3b9a66c92e48b0cd13b689530b5729c031bc1bcbfe9d19c258f9245e2f8d2a0f evtest-evtest-1.36.tar.gz # License files sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk index 65897a41e6..0249bd88cc 100644 --- a/package/evtest/evtest.mk +++ b/package/evtest/evtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -EVTEST_VERSION = 1.35 +EVTEST_VERSION = 1.36 EVTEST_SOURCE = evtest-evtest-$(EVTEST_VERSION).tar.gz EVTEST_SITE = https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-$(EVTEST_VERSION) EVTEST_LICENSE = GPL-2.0+ diff --git a/package/execline/execline.hash b/package/execline/execline.hash index 76412978b9..81a47bd3dc 100644 --- a/package/execline/execline.hash +++ b/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ba2a27e97c5eb6bd7ca6a0987a8925e44465a5be996daa0d18f8feca37d7571a execline-2.9.6.0.tar.gz +sha256 76919d62f2de4db1ac4b3a59eeb3e0e09b62bcdd9add13ae3f2dad26f8f0e5ca execline-2.9.6.1.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/execline/execline.mk b/package/execline/execline.mk index 922fc7b5af..9f602cf60a 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.9.6.0 +EXECLINE_VERSION = 2.9.6.1 EXECLINE_SITE = https://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING @@ -12,9 +12,7 @@ EXECLINE_INSTALL_STAGING = YES EXECLINE_DEPENDENCIES = skalibs EXECLINE_CONF_OPTS = \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ diff --git a/package/exfatprogs/0001-exfatprogs-fix-argument-validation-check-2.patch b/package/exfatprogs/0001-exfatprogs-fix-argument-validation-check-2.patch deleted file mode 100644 index 28c9a71466..0000000000 --- a/package/exfatprogs/0001-exfatprogs-fix-argument-validation-check-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5055bc4e852e18ddbfc618623cdaa2c0572d5f0e Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 2 Nov 2024 19:27:46 +0100 -Subject: [PATCH] exfatprogs: fix argument validation check (2) - -Since commit 7d354e5be83ed3bb981c59b3435ff64da56d185d -("exfatprogs: fix argument validation check"), exfatlabel tool -error out when we try to set a new volume serial or label. - - exfatlabel /dev/sda1 "new label" - exfatlabel -i /dev/sda1 0x12345678 - -Error out only if too few argument is given, ignore -additional arguments. - -Fixes: -https://gitlab.com/buildroot.org/buildroot/-/jobs/8199992419 - -Upstream: https://github.com/exfatprogs/exfatprogs/pull/279 - -Signed-off-by: Romain Naour ---- - label/label.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/label/label.c b/label/label.c -index 12d027b..9c8aff3 100644 ---- a/label/label.c -+++ b/label/label.c -@@ -78,7 +78,7 @@ int main(int argc, char *argv[]) - if (version_only) - exit(EXIT_FAILURE); - -- if (argc - optind != 1) -+ if (argc - optind < 1) - usage(); - - ui.dev_name = argv[serial_mode + 1]; --- -2.45.0 - diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 5ccad03ca2..e73d9d884b 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.5/exfatprogs-1.2.5.tar.xz.sha256 -sha256 f27160dcc1ddd17c96cd41a6ceef7037adc2796ab5c5633d3d85cf532c3ee2f0 exfatprogs-1.2.5.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.9/exfatprogs-1.2.9.tar.xz.sha256 +sha256 d9a42197c6ff9e6a8e923789413008e317415cf7a4ab85c486c5ffcaf49ca175 exfatprogs-1.2.9.tar.xz # Hash for license file sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index a541a63116..638cb9caa4 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.2.5 +EXFATPROGS_VERSION = 1.2.9 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ diff --git a/package/exim/0001-Build-buildconfig-for-the-host.patch b/package/exim/0001-Build-buildconfig-for-the-host.patch index e9da80765a..6f4351a50f 100644 --- a/package/exim/0001-Build-buildconfig-for-the-host.patch +++ b/package/exim/0001-Build-buildconfig-for-the-host.patch @@ -2,7 +2,7 @@ buildconfig is meant to be executed on the host, so it has to be compiled using $(HOSTCC), not $(CC). Signed-off-by: Luca Ceresoli -[Bernd: rebased for version 4.97.1] +[Bernd: rebased for version 4.99] Signed-off-by: Bernd Kuhls --- OS/Makefile-Base | 4 ++-- @@ -12,7 +12,7 @@ diff --git a/OS/Makefile-Base b/OS/Makefile-Base index 29a6ad3..420ba60 100644 --- a/OS/Makefile-Base +++ b/OS/Makefile-Base -@@ -258,8 +258,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ +@@ -257,8 +257,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ # Targets for special-purpose configuration header builders buildconfig: buildconfig.c @@ -22,4 +22,4 @@ index 29a6ad3..420ba60 100644 + $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c - # Target for the exicyclog utility script + util_deps: config ../src/utils/msgid.frag diff --git a/package/exim/0004-sieve-fix-build-errors.patch b/package/exim/0004-sieve-fix-build-errors.patch index c1a2c45b8d..e311b6105e 100644 --- a/package/exim/0004-sieve-fix-build-errors.patch +++ b/package/exim/0004-sieve-fix-build-errors.patch @@ -21,16 +21,16 @@ buildsystem. Signed-off-by: Luca Ceresoli Upstream: https://bugs.exim.org/show_bug.cgi?id=2523 -[Bernd: rebased for version 4.97.1] +[Bernd: rebased for version 4.99] Signed-off-by: Bernd Kuhls --- - src/sieve.c | 2 ++ + src/miscmods/sieve_filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sieve.c b/src/sieve.c index 5e8d1e6f4776..9632f2d43810 100644 ---- a/src/sieve.c -+++ b/src/sieve.c +--- a/src/miscmods/sieve_filter.c ++++ b/src/miscmods/sieve_filter.c @@ -14,6 +14,8 @@ /* Sieve mail filter. */ diff --git a/package/exim/0005-Fix-cross-compile-by-adding-LD-variable.patch b/package/exim/0005-Fix-cross-compile-by-adding-LD-variable.patch new file mode 100644 index 0000000000..99bf5ce667 --- /dev/null +++ b/package/exim/0005-Fix-cross-compile-by-adding-LD-variable.patch @@ -0,0 +1,95 @@ +From a47de397eb1f28356086f315a443c288599d8657 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 1 Nov 2025 17:00:52 +0100 +Subject: [PATCH] Fix cross-compile by adding LD variable + +Fixes cross-build error due to commit +a449ff8ca50e6df5faee2f1e83e1198c27738dfc. + +Hard-coding "ld" when cross-compiling is a bad idea. + +Upstream: https://github.com/Exim/exim/pull/98 +Signed-off-by: Bernd Kuhls +--- + src/OS/Makefile-Base | 10 +++++----- + src/OS/Makefile-Default | 1 + + src/src/miscmods/Makefile | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/OS/Makefile-Base b/OS/Makefile-Base +index 5a15b0a6b..0250647f0 100644 +--- a/OS/Makefile-Base ++++ b/OS/Makefile-Base +@@ -1065,7 +1065,7 @@ dynmodules: buildlookups buildrouters buildtransports buildauths \ + buildlookups: config + @cd lookups && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" HDRS="../version.h $(PHDRS)" \ +- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \ ++ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" \ + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)" + @echo " " + +@@ -1074,7 +1074,7 @@ buildlookups: config + buildrouters: config + @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \ +- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ ++ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " + +@@ -1083,7 +1083,7 @@ buildrouters: config + buildtransports: config + @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \ +- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ ++ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " + +@@ -1092,7 +1092,7 @@ buildtransports: config + buildauths: config + @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \ +- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ ++ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " + +@@ -1101,7 +1101,7 @@ buildmisc: config + CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \ + LDFLAGS_PARTIAL="$(LDFLAGS_PARTIAL)" HDRS="../version.h $(PHDRS)" \ +- FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \ ++ FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" \ + PERL_CC="$(PERL_CC)" PERL_CCOPTS="$(PERL_CCOPTS)" \ + PERL_CFLAGS="$(PERL_CFLAGS)" PERL_LFLAGS="$(PERL_LFLAGS)" \ + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE)" TLS_INCLUDE="$(TLS_INCLUDE)" +diff --git a/OS/Makefile-Default b/OS/Makefile-Default +index 858361bf3..c469c7f01 100644 +--- a/OS/Makefile-Default ++++ b/OS/Makefile-Default +@@ -227,6 +227,7 @@ HOSTNAME_COMMAND=/bin/hostname + + RANLIB=ranlib + ++LD=ld + + # EXIM_CHMOD is available to specify a command that is automatically applied + # to the Exim binary immediately it is compiled. (I find this useful when +diff --git a/src/miscmods/Makefile b/src/miscmods/Makefile +index 1e46d4456..cfae5aac2 100644 +--- a/src/miscmods/Makefile ++++ b/src/miscmods/Makefile +@@ -62,7 +62,7 @@ dkim.o: + $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) pdkim.c + $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) signing.c + $(FE)mv dkim.o dkim_tmp.o +- $(FE)ld -r -o dkim.o $(LDFLAGS_PARTIAL) \ ++ $(FE)$(LD) -r -o dkim.o $(LDFLAGS_PARTIAL) \ + dkim_tmp.o dkim_transport.o pdkim.o signing.o + + # Similarly, we want a single .so for the dynamic-load module +-- +2.47.3 + diff --git a/package/exim/exim.hash b/package/exim/exim.hash index de803bb27b..dd20fb805a 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 0ebc108a779f9293ba4b423c20818f9a3db79b60286d96abc6ba6b85a15852f7 exim-4.98.tar.xz +sha256 5df38b042ffa9a9c8d31b20bc8481558070e361b06f657608622a62a327adcba exim-4.99.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15 exim-4.98.tar.xz +sha512 06521aff437dfe99c015606d2cdde76eaf6e4d2f03779b07fbc0e7d06fe0584366cae9c3fa7d73a86c348f0d25336acd06c42bd5b8f18e5a969de9849088e3aa exim-4.99.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 45708d3941..d9adfb59d5 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.98 +EXIM_VERSION = 4.99 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ @@ -13,12 +13,6 @@ EXIM_CPE_ID_VENDOR = exim EXIM_SELINUX_MODULES = exim mta EXIM_DEPENDENCIES = host-berkeleydb host-pcre2 pcre2 berkeleydb host-pkgconf -# 0006-Fix-regex-n-use-after-free.-Bug-2915.patch -EXIM_IGNORE_CVES += CVE-2022-3559 - -# built without dmarc support -EXIM_IGNORE_CVES += CVE-2022-3620 - # Modify a variable value. It must already exist in the file, either # commented or not. define exim-config-change # variable-name, variable-value @@ -105,6 +99,7 @@ define EXIM_CONFIGURE_TOOLCHAIN $(call exim-config-add,CFLAGS,$(TARGET_CFLAGS)) $(call exim-config-add,AR,$(TARGET_AR) cq) $(call exim-config-add,RANLIB,$(TARGET_RANLIB)) + $(call exim-config-add,LD,$(TARGET_LD)) $(call exim-config-add,HOSTCC,$(HOSTCC)) $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) $(call exim-config-add,EXTRALIBS,$(EXIM_EXTRALIBS)) @@ -131,6 +126,27 @@ ifeq ($(BR2_STATIC_LIBS),y) EXIM_STATIC_FLAGS = LFLAGS="-pthread --static" endif +# We need to pass an argument to ld for setting the emulation when +# building for MIPS architecture, otherwise the default one will always +# be used and the compilation for most variants will fail. +ifeq ($(BR2_mips),y) +EXIM_LDFLAGS = -m elf32btsmip +else ifeq ($(BR2_mipsel),y) +EXIM_LDFLAGS = -m elf32ltsmip +else ifeq ($(BR2_mips64),y) +ifeq ($(BR2_MIPS_NABI32),y) +EXIM_LDFLAGS = -m elf32btsmipn32 +else +EXIM_LDFLAGS = -m elf64btsmip +endif +else ifeq ($(BR2_mips64el),y) +ifeq ($(BR2_MIPS_NABI32),y) +EXIM_LDFLAGS = -m elf32ltsmipn32 +else +EXIM_LDFLAGS = -m elf64ltsmip +endif +endif + ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) EXIM_DEPENDENCIES += libexecinfo EXIM_EXTRALIBS += -lexecinfo @@ -148,6 +164,7 @@ define EXIM_BUILD_CMDS CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ + LDFLAGS_PARTIAL="$(EXIM_LDFLAGS)" \ CFLAGS="-std=c99 $(TARGET_CFLAGS) $(EXIM_CFLAGS)" exim endef diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in index 8407c25b41..c65e484b2e 100644 --- a/package/exiv2/Config.in +++ b/package/exiv2/Config.in @@ -20,6 +20,18 @@ config BR2_PACKAGE_EXIV2 if BR2_PACKAGE_EXIV2 +config BR2_PACKAGE_EXIV2_BROTLI + bool "Brotli support" + select BR2_PACKAGE_BROTLI + help + Build with Brotli support for JPEG XL + +config BR2_PACKAGE_EXIV2_INIH + bool "Inih support" + select BR2_PACKAGE_INIH + help + Build with inih support + config BR2_PACKAGE_EXIV2_PNG bool "PNG image support" select BR2_PACKAGE_ZLIB diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash index c871277801..1c85f2e1db 100644 --- a/package/exiv2/exiv2.hash +++ b/package/exiv2/exiv2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6 exiv2-0.27.6-Source.tar.gz +sha256 5e292b02614dbc0cee40fe1116db2f42f63ef6b2ba430c77b614e17b8d61a638 exiv2-0.28.7.tar.gz sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 869f8e48dd..e5b55ecde7 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -4,9 +4,8 @@ # ################################################################################ -EXIV2_VERSION = 0.27.6 -EXIV2_SOURCE = exiv2-$(EXIV2_VERSION)-Source.tar.gz -EXIV2_SITE = https://github.com/Exiv2/exiv2/releases/download/v$(EXIV2_VERSION) +EXIV2_VERSION = 0.28.7 +EXIV2_SITE = $(call github,Exiv2,exiv2,v$(EXIV2_VERSION)) EXIV2_INSTALL_STAGING = YES EXIV2_LICENSE = GPL-2.0+ EXIV2_LICENSE_FILES = COPYING @@ -16,6 +15,20 @@ EXIV2_CONF_OPTS += \ -DBUILD_WITH_STACK_PROTECTOR=OFF \ -DEXIV2_BUILD_SAMPLES=OFF +ifeq ($(BR2_PACKAGE_EXIV2_BROTLI),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BROTLI=ON +EXIV2_DEPENDENCIES += brotli +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BROTLI=OFF +endif + +ifeq ($(BR2_PACKAGE_EXIV2_INIH),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_INIH=ON +EXIV2_DEPENDENCIES += inih +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_INIH=OFF +endif + ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),y) EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=ON else diff --git a/package/expat/expat.hash b/package/expat/expat.hash index b0273c73e8..9d99c38a45 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee expat-2.6.4.tar.xz -sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING +sha256 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f expat-2.7.3.tar.xz +sha256 31b15de82aa19a845156169a17a5488bf597e561b2c318d159ed583139b25e87 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 24cfa0a9d2..07aba205cf 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.4 +EXPAT_VERSION = 2.7.3 EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES diff --git a/package/expect/0001-enable-cross-compilation.patch b/package/expect/0001-enable-cross-compilation.patch deleted file mode 100644 index fd31a01f11..0000000000 --- a/package/expect/0001-enable-cross-compilation.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] enable cross compilation for expect - -This patch was created by running ./configure on a modern Linux machine -and inserting the results into the cross compilation section of -each AC_MSG_CHECKING that bombed out with an error. - -Signed-off-by: Andrew Ruder ---- - -Index: expect-5.45/configure.in -=================================================================== ---- expect-5.45.orig/configure.in 2013-11-14 07:59:58.732100595 -0600 -+++ expect-5.45/configure.in 2013-11-14 07:59:58.732100595 -0600 -@@ -481,7 +481,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - AC_MSG_CHECKING([if any value exists for WNOHANG]) -@@ -506,7 +506,8 @@ - AC_MSG_RESULT(no) - AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) - ) - - # -@@ -574,7 +575,7 @@ - AC_DEFINE(REARM_SIG) - , - AC_MSG_RESULT(no) --, AC_MSG_WARN([Expect can't be cross compiled]) -+, AC_MSG_RESULT(no) - ) - - # HPUX7 has trouble with the big cat so split it -@@ -725,7 +726,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # mach systems have include files for unimplemented features -@@ -749,7 +750,9 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_DEFINE(HAVE_TERMIO) -+ PTY_TYPE=termios -+ AC_MSG_RESULT(yes) - ) - - # now check for the new style ttys (not yet posix) -@@ -771,7 +774,9 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_DEFINE(HAVE_TERMIOS) -+ PTY_TYPE=termios -+ AC_MSG_RESULT(yes) - ) - fi - -@@ -794,7 +799,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) -@@ -816,7 +821,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # finally check for Cray style ttys -@@ -837,7 +842,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # -@@ -869,7 +874,9 @@ - AC_HAVE_FUNCS(getpty) - - # following test sets SETPGRP_VOID if setpgrp takes 0 args, else takes 2 --AC_FUNC_SETPGRP -+cat >>expect_cf.h <<\_ACEOF -+#define SETPGRP_VOID 1 -+_ACEOF - - # - # check for timezones -@@ -889,7 +896,7 @@ - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(yes) - ) - - diff --git a/package/expect/0002-allow-tcl-build-directory.patch b/package/expect/0002-allow-tcl-build-directory.patch deleted file mode 100644 index 83ede7acb6..0000000000 --- a/package/expect/0002-allow-tcl-build-directory.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] Allow tcl build directory for linking - -Some small changes to use TCL_BUILD_LIB_SPEC instead of TCL_LIB_SPEC for -linking against tcl directly out of its build directory. - -Signed-off-by: Andrew Ruder ---- - -Index: expect-5.45/Makefile.in -=================================================================== ---- expect-5.45.orig/Makefile.in 2013-11-14 07:59:58.732100595 -0600 -+++ expect-5.45/Makefile.in 2013-11-14 07:59:58.732100595 -0600 -@@ -393,7 +393,7 @@ - @LDFLAGS_DEFAULT@ \ - -o expect exp_main_exp.o \ - @EXP_BUILD_LIB_SPEC@ \ -- @TCL_LIB_SPEC@ \ -+ @TCL_BUILD_LIB_SPEC@ \ - @TCL_DL_LIBS@ @PKG_LIBS@ @MATH_LIBS@ \ - @TCL_CC_SEARCH_FLAGS@ \ - @EXP_CC_SEARCH_FLAGS@ -Index: expect-5.45/tclconfig/tcl.m4 -=================================================================== ---- expect-5.45.orig/tclconfig/tcl.m4 2010-11-09 13:42:10.000000000 -0600 -+++ expect-5.45/tclconfig/tcl.m4 2013-11-14 08:02:08.424100580 -0600 -@@ -412,6 +412,7 @@ - AC_SUBST(TCL_LIB_FILE) - AC_SUBST(TCL_LIB_FLAG) - AC_SUBST(TCL_LIB_SPEC) -+ AC_SUBST(TCL_BUILD_LIB_SPEC) - - AC_SUBST(TCL_STUB_LIB_FILE) - AC_SUBST(TCL_STUB_LIB_FLAG) diff --git a/package/expect/Config.in b/package/expect/Config.in deleted file mode 100644 index 67dfe643b2..0000000000 --- a/package/expect/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_EXPECT - bool "expect" - help - Expect is a tool for automating interactive applications - such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc. - - https://core.tcl.tk/expect/ diff --git a/package/expect/expect.hash b/package/expect/expect.hash deleted file mode 100644 index c4815abb07..0000000000 --- a/package/expect/expect.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/expect/files/Expect/5.45.4/expect5.45.4.tar.gz.SHA256 -sha256 49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 expect5.45.4.tar.gz -# Locally calculated -sha256 b2415b17dc8d9a287f4509047ef5ac3436baef7ba7c50faef5222dcdf61a2bab README diff --git a/package/expect/expect.mk b/package/expect/expect.mk deleted file mode 100644 index 44bf74af46..0000000000 --- a/package/expect/expect.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# expect -# -################################################################################ - -EXPECT_VERSION = 5.45.4 -EXPECT_SITE = https://sourceforge.net/projects/expect/files/Expect/$(EXPECT_VERSION) -EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz -EXPECT_LICENSE = Public domain -EXPECT_LICENSE_FILES = README - -# 0001-enable-cross-compilation.patch -EXPECT_AUTORECONF = YES -EXPECT_DEPENDENCIES = tcl -EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix - -# Since we don't want examples installed -EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries - -$(eval $(autotools-package)) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 408099e231..0bc5061ab1 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 65a0dc76c1976d7af72a628196022de71c787092da5c6d961a3fcee21f5d1d6f eza-0.18.24-cargo2.tar.gz -sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE +sha256 d31a17b4733589da761ad79bc9faf4271b358a0ef9fea19dabb5f38827ba7cf4 eza-0.23.3-cargo4.tar.gz +sha256 57fb42fbcd0b037ce528ed8f72f1ec095d67bc6825ecf1448ff39be1fe68a4b4 LICENSE.txt diff --git a/package/eza/eza.mk b/package/eza/eza.mk index 4d23116504..6a0c12cf9f 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,9 +4,9 @@ # ################################################################################ -EZA_VERSION = 0.18.24 +EZA_VERSION = 0.23.3 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) -EZA_LICENSE = MIT -EZA_LICENSE_FILES = LICENCE +EZA_LICENSE = EUPL-1.2 +EZA_LICENSE_FILES = LICENSE.txt $(eval $(cargo-package)) diff --git a/package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch b/package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch new file mode 100644 index 0000000000..90dfdc209a --- /dev/null +++ b/package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch @@ -0,0 +1,41 @@ +From ec0f9d07792298f89e71cee1e692ad60bf6b8d5c Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Thu, 24 Oct 2024 20:33:38 +0000 +Subject: [PATCH] f2fs-tools: use stdbool.h instead of bool + +The existing bool definition is broken for c23, where bool is now a keyword. + +Signed-off-by: Elliott Hughes +Signed-off-by: Jaegeuk Kim +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=6617d15a660becc23825007ab3fc2d270b5b250f +[Florian: rebased to 1.16.0] +Signed-off-by: Florian Larysch +--- + include/f2fs_fs.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h +index f890634..a968380 100644 +--- a/include/f2fs_fs.h ++++ b/include/f2fs_fs.h +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +@@ -103,9 +104,6 @@ typedef uint16_t u16; + typedef uint8_t u8; + typedef u32 block_t; + typedef u32 nid_t; +-#ifndef bool +-typedef u8 bool; +-#endif + typedef unsigned long pgoff_t; + typedef unsigned short umode_t; + +-- +2.49.0 + diff --git a/package/faad2/faad2.hash b/package/faad2/faad2.hash index b7813130fd..6a641dc10f 100644 --- a/package/faad2/faad2.hash +++ b/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 72dbc0494de9ee38d240f670eccf2b10ef715fd0508c305532ca3def3225bb06 faad2-2.11.1.tar.gz +sha256 3fcbd305e4abd34768c62050e18ca0986f7d9c5eca343fb98275418013065c0e faad2-2.11.2.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 0b249b3450..62c469e3ef 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAAD2_VERSION = 2.11.1 +FAAD2_VERSION = 2.11.2 FAAD2_SITE = $(call github,knik0,faad2,$(FAAD2_VERSION)) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index 0d78d71235..1f52d37f1a 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,5 +1,5 @@ -# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.36-1.dsc -sha1 ea895c6632fcf1b38cc84987d1b4daf833ffd430 fakeroot_1.36.orig.tar.gz -sha256 7fe3cf3daf95ee93b47e568e85f4d341a1f9ae91766b4f9a9cdc29737dea4988 fakeroot_1.36.orig.tar.gz +# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.37.1.2-1.dsc +sha1 925958f4730b172f4e1ae5dbeb9734f3da95da13 fakeroot_1.37.1.2.orig.tar.gz +sha256 959496928c8a676ec8377f665ff6a19a707bfad693325f9cc4a4126642f53224 fakeroot_1.37.1.2.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index e18cdc5f07..ea0edb7665 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.36 +FAKEROOT_VERSION = 1.37.1.2 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz -FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20241022T144244Z/pool/main/f/fakeroot/ +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20250513T025019Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index a7d8d62dba..3888c71cea 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 729ad33b9c750a50d9c68e97b90499680a74afd1568d859c574c0fe56fe7947f faketime-0.9.10.tar.gz +sha256 4fc32218697c052adcdc5ee395581f2554ca56d086ac817ced2be0d6f1f8a9fa faketime-0.9.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 6fc684f852..ec1a072935 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.10 +FAKETIME_VERSION = 0.9.12 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING diff --git a/package/farmhash/Config.in b/package/farmhash/Config.in new file mode 100644 index 0000000000..ef22898774 --- /dev/null +++ b/package/farmhash/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FARMHASH + bool "farmhash" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + FarmHash, a family of hash functions. + + https://github.com/google/farmhash + +comment "farmhash needs a toolchain w/ C++11" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/farmhash/farmhash.hash b/package/farmhash/farmhash.hash new file mode 100644 index 0000000000..afdfc0f994 --- /dev/null +++ b/package/farmhash/farmhash.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 18392cf0736e1d62ecbb8d695c31496b6507859e8c75541d7ad0ba092dc52115 farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz +# License files, locally calculated +sha256 4162dd091caae234f72d3b57e138174f733e736b2430a4c51b098b17d866fcb6 COPYING diff --git a/package/farmhash/farmhash.mk b/package/farmhash/farmhash.mk new file mode 100644 index 0000000000..6ab7d1a88b --- /dev/null +++ b/package/farmhash/farmhash.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# farmhash +# +################################################################################ + +FARMHASH_VERSION = 0d859a811870d10f53a594927d0d0b97573ad06d +FARMHASH_SITE = $(call github,google,farmhash,$(FARMHASH_VERSION)) +FARMHASH_LICENSE = MIT +FARMHASH_LICENSE_FILES = COPYING +FARMHASH_INSTALL_STAGING = YES +FARMHASH_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + +$(eval $(autotools-package)) diff --git a/package/fastd/fastd.hash b/package/fastd/fastd.hash index 5f7f966533..a02b506c98 100644 --- a/package/fastd/fastd.hash +++ b/package/fastd/fastd.hash @@ -1,3 +1,3 @@ # computed locally -sha256 19750b88705d66811b7c21b672537909c19ae6b21350688cbd1a3a54d08a8951 fastd-22.tar.xz -sha256 adf08b42f1b890b89e998360a864cb4f8441a0a57c9e95e2ce1bfdfc24c49976 COPYRIGHT +sha256 dcab54485c79dda22ce6308a2a48764d53977a518952facd1204ba21af1c86e0 fastd-23.tar.xz +sha256 f229ee6df84971355f7d54d60b0302ca8a3b883d2dc41176e58e9da4aa7c1b05 LICENSE diff --git a/package/fastd/fastd.mk b/package/fastd/fastd.mk index 6c496cf9ef..4df0ce8210 100644 --- a/package/fastd/fastd.mk +++ b/package/fastd/fastd.mk @@ -4,11 +4,11 @@ # ################################################################################ -FASTD_VERSION = 22 +FASTD_VERSION = 23 FASTD_SITE = https://github.com/NeoRaider/fastd/releases/download/v$(FASTD_VERSION) FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz FASTD_LICENSE = BSD-2-Clause -FASTD_LICENSE_FILES = COPYRIGHT +FASTD_LICENSE_FILES = LICENSE FASTD_CPE_ID_VERSION = $(FASTD_VERSION).0 FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium diff --git a/package/fatcat/0001-cmake-Set-minimum-required-version-to-3.5-for-CMake-.patch b/package/fatcat/0001-cmake-Set-minimum-required-version-to-3.5-for-CMake-.patch new file mode 100644 index 0000000000..31dfedda22 --- /dev/null +++ b/package/fatcat/0001-cmake-Set-minimum-required-version-to-3.5-for-CMake-.patch @@ -0,0 +1,40 @@ +From 2e3476a84cbe32598d36b5506c21025b3f94eb03 Mon Sep 17 00:00:00 2001 +From: Alper Ak +Date: Wed, 9 Jul 2025 19:30:26 +0300 +Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ + compatibility + +Fix: + +| CMake Error at CMakeLists.txt:1 (cmake_minimum_required): +| Compatibility with CMake < 3.5 has been removed from CMake. +| +| Update the VERSION argument value. Or, use the ... syntax +| to tell CMake that the project requires at least but has been updated +| to work with policies introduced by or earlier. +| +| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. +| +| +| -- Configuring incomplete, errors occurred! + +Upstream: https://github.com/Gregwar/fatcat/commit/2e3476a84cbe32598d36b5506c21025b3f94eb03 +Signed-off-by: Alper Ak +Signed-off-by: Peter Korsgaard +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6a2649..8f3eadc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(fatcat) + + OPTION(DEFINE_WIN "Compiling windows" OFF) +-- +2.39.5 + diff --git a/package/fbtft/Config.in b/package/fbtft/Config.in deleted file mode 100644 index 0a4de19091..0000000000 --- a/package/fbtft/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -# Prompt-less option, because this package is not doing anything -# except downloading the FB TFT sources. The real work is done by a -# Linux extension. -config BR2_PACKAGE_FBTFT - bool - depends on BR2_LINUX_KERNEL - help - Linux Framebuffer drivers for small TFT LCD display modules, - e.g. Adafruit PiTFT displays for Raspberry Pi. - - This is only the download helper for the kernel patch. - - https://github.com/notro/fbtft diff --git a/package/fbtft/fbtft.hash b/package/fbtft/fbtft.hash deleted file mode 100644 index 5d08d0ef85..0000000000 --- a/package/fbtft/fbtft.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 0e81de89fdd7ab810716fc0549e767527f342e829309dee5c2cca1e9d1728770 fbtft-274035404701245e7491c0c6471c5b72ade4d491.tar.gz -sha256 a9ca80d65a5ef10fe614a6c1e8c8d4d3b96637e8855a96c7cf0fa438526097a7 fbtft-core.c diff --git a/package/fcft/fcft.hash b/package/fcft/fcft.hash index 431f2218c6..f5a499edcc 100644 --- a/package/fcft/fcft.hash +++ b/package/fcft/fcft.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f48c793f354b8be95477e475dde7c98ac9d2628c52ecb42029dc6d20b52d787c 3.1.8.tar.gz +sha256 79e52aaafc0b57fa2b68ed6127de13e98318050399a939691b8ca30d44d48591 3.3.2.tar.gz sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/fcft/fcft.mk b/package/fcft/fcft.mk index 62c85a15c5..b9ce43b454 100644 --- a/package/fcft/fcft.mk +++ b/package/fcft/fcft.mk @@ -4,7 +4,7 @@ # ################################################################################ -FCFT_VERSION = 3.1.8 +FCFT_VERSION = 3.3.2 FCFT_SOURCE = $(FCFT_VERSION).tar.gz FCFT_SITE = https://codeberg.org/dnkl/fcft/archive FCFT_LICENSE = MIT diff --git a/package/fconfig/Config.in b/package/fconfig/Config.in deleted file mode 100644 index e7dd58a84a..0000000000 --- a/package/fconfig/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_FCONFIG - bool "fconfig" - help - fconfig - get/set RedBoot configuration parameters from Linux. - - http://andrzejekiert.ovh.org/software.html.en diff --git a/package/fconfig/fconfig.hash b/package/fconfig/fconfig.hash deleted file mode 100644 index 98e7fbf12b..0000000000 --- a/package/fconfig/fconfig.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7 fconfig-20080329.tar.gz -sha256 e698a9ea4d6dab0a15d3d6fd354b97b820629244f946529cc7f42b2b8e8f16d0 fconfig.c diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk deleted file mode 100644 index 1e6fbb40b4..0000000000 --- a/package/fconfig/fconfig.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# fconfig -# -################################################################################ - -FCONFIG_VERSION = 20080329 -# Real upstream location has been disabled -# FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig -FCONFIG_SITE = http://sources.buildroot.net -FCONFIG_LICENSE = GPL-2.0+ -FCONFIG_LICENSE_FILES = fconfig.c - -define FCONFIG_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define FCONFIG_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/fconfig $(TARGET_DIR)/sbin/fconfig -endef - -$(eval $(generic-package)) diff --git a/package/fd/fd.hash b/package/fd/fd.hash index 90d2c38694..991be349b8 100644 --- a/package/fd/fd.hash +++ b/package/fd/fd.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 91da5cc2b99d4754fa5096cda1eeac98f312f712bfca6a41f9972b2287a4c4f9 fd-9.0.0-cargo2.tar.gz +sha256 4a32dbd98dab4faf307954bf854d0c0c5719816e1cd28fe49385b6925cc8c515 fd-10.3.0-cargo4.tar.gz sha256 73c83c60d817e7df1943cb3f0af81e4939a8352c9a96c2fd00451b1116fa635c LICENSE-APACHE sha256 322cfc7aa0c774d0eca3b2610f1d414de3ddbd7d8dd4b9dea941a13a6eb07455 LICENSE-MIT diff --git a/package/fd/fd.mk b/package/fd/fd.mk index 316da418ea..c390b5221c 100644 --- a/package/fd/fd.mk +++ b/package/fd/fd.mk @@ -4,7 +4,7 @@ # ################################################################################ -FD_VERSION = 9.0.0 +FD_VERSION = 10.3.0 FD_SITE = $(call github,sharkdp,fd,v$(FD_VERSION)) FD_LICENSE = Apache-2.0 or MIT FD_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/feh/Config.in b/package/feh/Config.in index 7a348a1507..6f0bdd3242 100644 --- a/package/feh/Config.in +++ b/package/feh/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_FEH help feh is an X11 image viewer aimed mostly at console users. - http://feh.finalrewind.org/ + https://feh.finalrewind.org/ diff --git a/package/feh/feh.hash b/package/feh/feh.hash index f74b8fa335..f86a7ef6d7 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 57ab1ca61f57c96595878069f550d36f518530f88fa31b74cc39cd739f9258b6 feh-3.7.1.tar.bz2 -sha256 2c3a31327dc3cc3331aa6e759d378e4f66d0ece7174a0d5aa137f3cba4bf0509 COPYING +sha256 5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8 feh-3.10.3.tar.bz2 +sha256 881f1b901b5b99bce372fd9498106724a1ea52450f7bfc6fc1cce6736a2faf4d COPYING diff --git a/package/feh/feh.mk b/package/feh/feh.mk index df03deedde..be3b67aff9 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,14 +4,21 @@ # ################################################################################ -FEH_VERSION = 3.7.1 +FEH_VERSION = 3.10.3 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 -FEH_SITE = http://feh.finalrewind.org +FEH_SITE = https://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING FEH_CPE_ID_VALID = YES +ifeq ($(BR2_PACKAGE_FILE),y) +FEH_DEPENDENCIES += file +FEH_MAKE_OPTS += magic=1 +else +FEH_MAKE_OPTS += magic=0 +endif + ifeq ($(BR2_PACKAGE_LIBCURL),y) FEH_DEPENDENCIES += libcurl FEH_MAKE_OPTS += curl=1 diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 12612ecc48..ddd71e6c86 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/58797299/ -sha256 75109a1f307b538155fa05f5ef298e8298cb4deae95aed24c16b38d36ff0a186 fetchmail-6.4.39.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/59258857/ +sha256 38d01fe404e67514df394a6ed1a815bbb61aa90c0fa4402252593aced0e38a1d fetchmail-6.6.1.tar.xz # Locally computed: -sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING +sha256 a502ffd59034feee7e924b29500451b984992ae361bd8084736afc470f32135a COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index a9239d0855..8906b6c8d2 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -4,8 +4,8 @@ # ################################################################################ -FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).39 +FETCHMAIL_VERSION_MAJOR = 6.6 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).1 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 599e1ddfc7..fce2fef993 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS bool default y - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - depends on !BR2_nios2 # No support for ARMv7-M in the ARM assembly logic depends on !BR2_ARM_CPU_ARMV7M # m68k coldfire causes a build failure, because the check for diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 630bd70c56..99c3da5e74 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 ffmpeg-6.1.2.tar.xz +sha256 bc5f1e4a4d283a6492354684ee1124129c52293bcfc6a9169193539fbece3487 ffmpeg-6.1.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 1e18b5e2da..4c841d7a94 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 6.1.2 +FFMPEG_VERSION = 6.1.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -92,6 +92,13 @@ else FFMPEG_CONF_OPTS += --disable-libjack endif +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +FFMPEG_DEPENDENCIES += pulseaudio +FFMPEG_CONF_OPTS += --enable-libpulse +else +FFMPEG_CONF_OPTS += --disable-libpulse +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) FFMPEG_DEPENDENCIES += libv4l FFMPEG_CONF_OPTS += --enable-libv4l2 @@ -241,10 +248,6 @@ FFMPEG_CONF_OPTS += --disable-openssl endif endif -ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) -FFMPEG_DEPENDENCIES += libebur128 -endif - ifeq ($(BR2_PACKAGE_LIBDRM),y) FFMPEG_CONF_OPTS += --enable-libdrm FFMPEG_DEPENDENCIES += libdrm @@ -299,6 +302,10 @@ endif ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) FFMPEG_CONF_OPTS += --enable-libopencv FFMPEG_DEPENDENCIES += opencv3 +else ifeq ($(BR2_PACKAGE_OPENCV4_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV4_WITH_FFMPEG),yx) +FFMPEG_CONF_OPTS += --enable-libopencv \ + --extra-cflags=-I$(STAGING_DIR)/usr/include/opencv4 +FFMPEG_DEPENDENCIES += opencv4 else FFMPEG_CONF_OPTS += --disable-libopencv endif @@ -362,6 +369,20 @@ else FFMPEG_CONF_OPTS += --disable-libmodplug endif +ifeq ($(BR2_PACKAGE_LIBOPENMPT),y) +FFMPEG_CONF_OPTS += --enable-libopenmpt +FFMPEG_DEPENDENCIES += libopenmpt +else +FFMPEG_CONF_OPTS += --disable-libopenmpt +endif + +ifeq ($(BR2_PACKAGE_LIBSOXR),y) +FFMPEG_CONF_OPTS += --enable-libsoxr +FFMPEG_DEPENDENCIES += libsoxr +else +FFMPEG_CONF_OPTS += --disable-libsoxr +endif + ifeq ($(BR2_PACKAGE_SPEEX),y) FFMPEG_CONF_OPTS += --enable-libspeex FFMPEG_DEPENDENCIES += speex @@ -383,6 +404,13 @@ else FFMPEG_CONF_OPTS += --disable-iconv endif +ifeq ($(BR2_PACKAGE_LIBXML2),y) +FFMPEG_CONF_OPTS += --enable-libxml2 +FFMPEG_DEPENDENCIES += libxml2 +else +FFMPEG_CONF_OPTS += --disable-libxml2 +endif + # ffmpeg freetype support require fenv.h which is only # available/working on glibc. # The microblaze variant doesn't provide the needed exceptions @@ -400,6 +428,20 @@ else FFMPEG_CONF_OPTS += --disable-fontconfig endif +ifeq ($(BR2_PACKAGE_HARFBUZZ),y) +FFMPEG_CONF_OPTS += --enable-libharfbuzz +FFMPEG_DEPENDENCIES += harfbuzz +else +FFMPEG_CONF_OPTS += --disable-libharfbuzz +endif + +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +FFMPEG_CONF_OPTS += --enable-libfribidi +FFMPEG_DEPENDENCIES += libfribidi +else +FFMPEG_CONF_OPTS += --disable-libfribidi +endif + ifeq ($(BR2_PACKAGE_OPENJPEG),y) FFMPEG_CONF_OPTS += --enable-libopenjpeg FFMPEG_DEPENDENCIES += openjpeg diff --git a/package/fft2d/Config.in b/package/fft2d/Config.in new file mode 100644 index 0000000000..38394f6170 --- /dev/null +++ b/package/fft2d/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FFT2D + bool "fft2d" + help + This is a package to calculate Discrete Fourier/Cosine/Sine + Transforms of 2,3-dimensional sequences of length 2^N. + + http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html diff --git a/package/fft2d/fft2d.hash b/package/fft2d/fft2d.hash new file mode 100644 index 0000000000..a1b1a326ae --- /dev/null +++ b/package/fft2d/fft2d.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9 fft2d.tgz +# License files, locally calculated +sha256 0b2a2082537735a2a576dbec2e8f9c1a09812eac6df6a389502a6ba860072906 readme2d.txt diff --git a/package/fft2d/fft2d.mk b/package/fft2d/fft2d.mk new file mode 100644 index 0000000000..781b545e2e --- /dev/null +++ b/package/fft2d/fft2d.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# fft2d +# +################################################################################ + +FFT2D_VERSION = 2006.12.28 +FFT2D_SITE = https://www.kurims.kyoto-u.ac.jp/~ooura +FFT2D_SOURCE = fft2d.tgz +FFT2D_LICENSE = MIT-like +FFT2D_LICENSE_FILES = readme2d.txt +FFT2D_INSTALL_STAGING = YES +# Only installs headers/sources +FFT2D_INSTALL_TARGET = NO + +define FFT2D_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/fft2d + $(INSTALL) -m 0644 $(@D)/*.c $(STAGING_DIR)/usr/include/fft2d + $(INSTALL) -m 0644 $(@D)/*.f $(STAGING_DIR)/usr/include/fft2d + $(INSTALL) -m 0644 $(@D)/*.h $(STAGING_DIR)/usr/include/fft2d +endef + +$(eval $(generic-package)) diff --git a/package/ficl/ficl.mk b/package/ficl/ficl.mk index af900fa2cf..c0698a3433 100644 --- a/package/ficl/ficl.mk +++ b/package/ficl/ficl.mk @@ -6,7 +6,7 @@ FICL_VERSION_MAJOR = 4.1 FICL_VERSION = $(FICL_VERSION_MAJOR).0 -FICL_SITE = http://downloads.sourceforge.net/project/ficl/ficl-all/ficl$(FICL_VERSION_MAJOR) +FICL_SITE = https://sourceforge.net/projects/ficl/files/OldFiles/Ficl4%20%28retired%29 FICL_LICENSE = BSD-2-Clause FICL_LICENSE_FILES = ReadMe.txt FICL_INSTALL_STAGING = YES diff --git a/package/file/Config.in b/package/file/Config.in index edc4d874b2..6b5326f660 100644 --- a/package/file/Config.in +++ b/package/file/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_FILE Program to identify a file's format by scanning binary data for known patterns. - http://www.darwinsys.com/file/ + https://www.darwinsys.com/file/ diff --git a/package/file/file.hash b/package/file/file.hash index 7c15569c09..53c4d5c4db 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,7 +1,6 @@ # Locally calculated after verifying signature -# https://astron.com/pub/file/file-5.45.tar.gz.asc +# https://astron.com/pub/file/file-5.46.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 file-5.45.tar.gz +sha256 c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088 file-5.46.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING -sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h sha256 2e14b6fa9a74f952ebfde3c96527158df281c953cfaf35609eb854d4da30131c src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index 27d9181d76..a33b306c4c 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,10 +4,10 @@ # ################################################################################ -FILE_VERSION = 5.45 +FILE_VERSION = 5.46 FILE_SITE = https://astron.com/pub/file -FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) -FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c +FILE_LICENSE = BSD-2-Clause, BSD-3-Clause (vasprintf.c) +FILE_LICENSE_FILES = COPYING src/vasprintf.c FILE_CPE_ID_VALID = YES FILE_AUTORECONF = YES diff --git a/package/fio/Config.in b/package/fio/Config.in index 7825209b4c..b2a4fa64ae 100644 --- a/package/fio/Config.in +++ b/package/fio/Config.in @@ -5,18 +5,16 @@ config BR2_PACKAGE_FIO depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_THREADS - # fio uses fallocate() which becomes fallocate64() while compiling with - # largefile support, but fallocate64() is not available on nios2 - depends on !BR2_nios2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 # nvme_ioctl.h help fio is an I/O tool meant to be used both for benchmark and stress/hardware verification. - http://git.kernel.dk/?p=fio.git;a=summary + https://git.kernel.dk/cgit/fio/ -comment "fio needs a toolchain w/ dynamic library, threads, gcc >= 4.9" +comment "fio needs a toolchain w/ dynamic library, threads, gcc >= 4.9, headers >= 4.5" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_nios2 depends on BR2_USE_MMU diff --git a/package/fio/fio.hash b/package/fio/fio.hash index 7f7e12f948..015f2e3fbe 100644 --- a/package/fio/fio.hash +++ b/package/fio/fio.hash @@ -1,4 +1,8 @@ -# Locally computed -sha256 49f340ef51dbb7942d598abd2b8ad93ce7934ca709f73ba13519568556f9089f fio-3.34.tar.gz +# From https://brick.kernel.dk/snaps/MD5SUMS +md5 3cd7ea766be83b560a14c909cdd35889 fio-3.41.tar.gz +# Locally computed after checking gpg signature from +# https://brick.kernel.dk/snaps/fio-3.41.tar.gz.asc +# with key C0FC392DCADE26D975FA5E4AF7D358FB2971E0A6 +sha256 a40b45112005e30a67bab6be4860b198c35104a628b6ec4d15720d62b5d1bab9 fio-3.41.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/package/fio/fio.mk b/package/fio/fio.mk index f6e7b036bb..38e7aa7967 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -4,19 +4,27 @@ # ################################################################################ -FIO_VERSION = 3.34 -FIO_SITE = http://brick.kernel.dk/snaps +FIO_VERSION = 3.41 +FIO_SITE = https://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE FIO_OPTS = --disable-native --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)" +# Uses __atomic_load_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +FIO_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_LIBAIO),y) FIO_DEPENDENCIES += libaio endif ifeq ($(BR2_PACKAGE_LIBNFS),y) -FIO_DEPENDENCIES += libnfs +FIO_OPTS += --enable-libnfs +FIO_DEPENDENCIES += host-pkgconf libnfs +else +FIO_OPTS += --disable-libnfs endif ifeq ($(BR2_PACKAGE_LIBISCSI),y) @@ -33,7 +41,7 @@ FIO_DEPENDENCIES += zlib endif define FIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure $(FIO_OPTS)) + (cd $(@D); $(TARGET_MAKE_ENV) $(FIO_CONF_ENV) ./configure $(FIO_OPTS)) endef define FIO_BUILD_CMDS diff --git a/package/firewalld/0001-improvement-functions-don-t-use-deprecated-pipes.quo.patch b/package/firewalld/0001-improvement-functions-don-t-use-deprecated-pipes.quo.patch new file mode 100644 index 0000000000..0deacbcca0 --- /dev/null +++ b/package/firewalld/0001-improvement-functions-don-t-use-deprecated-pipes.quo.patch @@ -0,0 +1,42 @@ +From 0bfa4eb3e15d8df8a68a8c3429505905afae112e Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Fri, 7 Jul 2023 18:13:10 +0200 +Subject: [PATCH] improvement(functions): don't use deprecated pipes.quote() + +Since Python 3.3, shlex.quote() replaces it. This avoids a deprecation +warning. + +Upstream: f7f5613b76c044c62c876ae87c6b85f5a41acb2a +[Romain: backport to 2.0.2] +Signed-off-by: Romain Naour +--- + src/firewall/functions.py | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/firewall/functions.py b/src/firewall/functions.py +index f7133d71..6213e778 100644 +--- a/src/firewall/functions.py ++++ b/src/firewall/functions.py +@@ -34,7 +34,6 @@ import socket + import os + import os.path + import shlex +-import pipes + import string + import tempfile + from firewall.core.logger import log +@@ -607,10 +606,7 @@ def checkContext(context): + return True + + def joinArgs(args): +- if "quote" in dir(shlex): +- return " ".join(shlex.quote(a) for a in args) +- else: +- return " ".join(pipes.quote(a) for a in args) ++ return " ".join(shlex.quote(a) for a in args) + + def splitArgs(_string): + return shlex.split(_string) +-- +2.51.0 + diff --git a/package/firewalld/Config.in b/package/firewalld/Config.in index cc8411b34d..407f57c604 100644 --- a/package/firewalld/Config.in +++ b/package/firewalld/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_FIREWALLD select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_JANSSON # Uses the nftables json interface select BR2_PACKAGE_NFTABLES + select BR2_PACKAGE_NFTABLES_JSON # runtime select BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_GOBJECT help diff --git a/package/flac/flac.hash b/package/flac/flac.hash index 0013a7485a..9ac2d4799e 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,6 +1,6 @@ # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA256SUMS.txt -sha256 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70 flac-1.4.3.tar.xz +sha256 f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920 flac-1.5.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 12600ea1a7affcbf469bd0d8b2cd725e4167114a2ee834b88f5d2857bfd7ddbf COPYING.Xiph +sha256 7866ee98760fc1f0156b4fe6bf530257e02be487ab3fd94e2b63799dd32d6b2c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 6bac9ef8a7..e3c3da5375 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.4.3 +FLAC_VERSION = 1.5.0 FLAC_SITE = https://ftp.osuosl.org/pub/xiph/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index 17ebdee3af..0e1faf34e7 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b77ce458b3b874387270a71805e899ac63f057d7553dc320da7e4c58e750577c flashrom-1.4.0.tar.gz +sha256 3f4dc7878e962e165b7eba73104d4e61231f9d4e838eb47df6ca3d87060a2aa5 flashrom-1.5.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 4eede48e03..f253c5f9d8 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,14 +4,13 @@ # ################################################################################ -FLASHROM_VERSION = 1.4.0 +FLASHROM_VERSION = 1.5.1 FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION)) FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING FLASHROM_INSTALL_STAGING = YES FLASHROM_CONF_OPTS = \ -Dclassic_cli=enabled \ - -Dclassic_cli_print_wiki=disabled \ -Dich_descriptors_tool=enabled \ -Dtests=disabled \ -Duse_internal_dmi=true \ diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index ac2c9fc63a..e7174e326e 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4157c5cacdb59737c5d627e47ac26b140e9ee28b1102f812b36068aab728c1ed flatbuffers-24.3.25.tar.gz +sha256 b9c2df49707c57a48fc0923d52b8c73beb72d675f9d44b2211e4569be40a7421 flatbuffers-25.2.10.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 33481eabf8..d49d01161d 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATBUFFERS_VERSION = 24.3.25 +FLATBUFFERS_VERSION = 25.2.10 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE diff --git a/package/flatcc/0001-cmake_set_minimum_required_version_to_3.5_for_cmake_4.patch b/package/flatcc/0001-cmake_set_minimum_required_version_to_3.5_for_cmake_4.patch new file mode 100644 index 0000000000..9bfae54ae2 --- /dev/null +++ b/package/flatcc/0001-cmake_set_minimum_required_version_to_3.5_for_cmake_4.patch @@ -0,0 +1,51 @@ +From 915f62dcd9f0a372944f749cf4acd707db10c5fd Mon Sep 17 00:00:00 2001 +From: Alper Ak +Date: Wed, 9 Jul 2025 12:59:17 +0300 +Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ + compatibility + +Fix: + +| CMake Error at CMakeLists.txt:2 (cmake_minimum_required): +| Compatibility with CMake < 3.5 has been removed from CMake. +| +| Update the VERSION argument value. Or, use the ... syntax +| to tell CMake that the project requires at least but has been updated +| to work with policies introduced by or earlier. +| +| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. +| +| +| -- Configuring incomplete, errors occurred! + +Signed-off-by: Alper Ak +Signed-off-by: Benoît Monin +Upstream: https://github.com/dvidelabs/flatcc/pull/349 +--- + CMakeLists.txt | 2 +- + external/hash/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4127f598..b51e5c5bd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ + #cmake_minimum_required (VERSION 2.8.12.2) + # Centos 7 + #cmake_minimum_required (VERSION 2.8.11) +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required (VERSION 3.5) + + # Disable build of tests and samples. Due to custom build step + # dependency on flatcc tool, some custom build configurations may +diff --git a/external/hash/CMakeLists.txt b/external/hash/CMakeLists.txt +index 7b7d990dd..12eb3daa4 100644 +--- a/external/hash/CMakeLists.txt ++++ b/external/hash/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.0.2) ++cmake_minimum_required (VERSION 3.5) + + project (HashTest) + diff --git a/package/flatcc/flatcc.mk b/package/flatcc/flatcc.mk index 06be1a1338..b2d1efe00d 100644 --- a/package/flatcc/flatcc.mk +++ b/package/flatcc/flatcc.mk @@ -13,6 +13,8 @@ FLATCC_DEPENDENCIES = host-flatcc FLATCC_CONF_OPTS = -DFLATCC_ALLOW_WERROR=OFF HOST_FLATCC_CONF_OPTS = -DFLATCC_ALLOW_WERROR=OFF +FLATCC_CPE_ID_VALID = YES + # Disable build of tests and samples FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF HOST_FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF diff --git a/package/flex/0004-Match-malloc-signature-to-its-use.patch b/package/flex/0004-Match-malloc-signature-to-its-use.patch new file mode 100644 index 0000000000..ac57e3b4c8 --- /dev/null +++ b/package/flex/0004-Match-malloc-signature-to-its-use.patch @@ -0,0 +1,27 @@ +From 4b142954b54a57a9b0af0a9661056a9c39a8fa95 Mon Sep 17 00:00:00 2001 +From: Richard Barnes +Date: Wed, 2 Oct 2024 10:35:09 -0700 +Subject: [PATCH] Match `malloc` signature to its use + +Upstream: https://github.com/westes/flex/pull/674 +Signed-off-by: Peter Korsgaard +--- + lib/malloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/malloc.c b/lib/malloc.c +index 75e8ef9..701b9b3 100755 +--- a/lib/malloc.c ++++ b/lib/malloc.c +@@ -3,7 +3,7 @@ + + #include + +- void *malloc (); ++ void *malloc (size_t n); + + /* Allocate an N-byte block of memory from the heap. + If N is zero, allocate a 1-byte block. */ +-- +2.39.5 + diff --git a/package/fluent-bit/0001-plugins-kafka-fix-cmake-cross-compile-error.patch b/package/fluent-bit/0001-plugins-kafka-fix-cmake-cross-compile-error.patch new file mode 100644 index 0000000000..8b74d5911d --- /dev/null +++ b/package/fluent-bit/0001-plugins-kafka-fix-cmake-cross-compile-error.patch @@ -0,0 +1,47 @@ +From a21de9cb95f2199270a6ac6922ffa4ca8d453f26 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 16 Nov 2024 19:46:28 +0100 +Subject: [PATCH] plugins: kafka: fix cmake cross compile error + +KAFKA_INCLUDEDIR is not set if FLB_PREFER_SYSTEM_LIB_KAFKA is not used, +when cross-compiling, it just translates to -I/librdkafka, which is not allowed. +Fix this by only including KAFKA_INCLUDEDIR if really set. + +x86_64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/librdkafka' + +Upstream: https://github.com/fluent/fluent-bit/pull/9600 +Signed-off-by: Thomas Devoogdt +--- + plugins/in_kafka/CMakeLists.txt | 4 +++- + plugins/out_kafka/CMakeLists.txt | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/plugins/in_kafka/CMakeLists.txt b/plugins/in_kafka/CMakeLists.txt +index 928266b57..dc251276e 100644 +--- a/plugins/in_kafka/CMakeLists.txt ++++ b/plugins/in_kafka/CMakeLists.txt +@@ -3,5 +3,7 @@ set(src + ) + + FLB_PLUGIN(in_kafka "${src}" ${KAFKA_LIBRARIES} flb-aws) +-target_include_directories(flb-plugin-in_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka) ++if(DEFINED KAFKA_INCLUDEDIR) ++ target_include_directories(flb-plugin-in_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka) ++endif() + target_link_libraries(flb-plugin-in_kafka -lpthread) +diff --git a/plugins/out_kafka/CMakeLists.txt b/plugins/out_kafka/CMakeLists.txt +index 9d8b34642..1c967329f 100644 +--- a/plugins/out_kafka/CMakeLists.txt ++++ b/plugins/out_kafka/CMakeLists.txt +@@ -5,5 +5,7 @@ set(src + kafka.c) + + FLB_PLUGIN(out_kafka "${src}" ${KAFKA_LIBRARIES} flb-aws) +-target_include_directories(flb-plugin-out_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka) ++if(DEFINED KAFKA_INCLUDEDIR) ++ target_include_directories(flb-plugin-out_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka) ++endif() + target_link_libraries(flb-plugin-out_kafka -lpthread) +-- +2.43.0 + diff --git a/package/fluent-bit/0002-lib-librdkafka-only-require-a-C-compiler.patch b/package/fluent-bit/0002-lib-librdkafka-only-require-a-C-compiler.patch new file mode 100644 index 0000000000..83c77ff70c --- /dev/null +++ b/package/fluent-bit/0002-lib-librdkafka-only-require-a-C-compiler.patch @@ -0,0 +1,118 @@ +From c33d6bd392c5c8bbd231b2a9d00d4959cc553c44 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Tue, 25 Jul 2023 09:10:41 +0200 +Subject: [PATCH] lib: librdkafka: only require a C compiler + +Upstream: https://github.com/confluentinc/librdkafka/pull/4366 +Signed-off-by: Thomas Devoogdt +--- + lib/librdkafka-2.10.1/CMakeLists.txt | 22 +++++++++++-- + lib/librdkafka-2.10.1/examples/CMakeLists.txt | 31 ++++++++++++------- + 2 files changed, 39 insertions(+), 14 deletions(-) + +diff --git a/lib/librdkafka-2.10.1/CMakeLists.txt b/lib/librdkafka-2.10.1/CMakeLists.txt +index f3d05bad7..8ef47053a 100644 +--- a/lib/librdkafka-2.10.1/CMakeLists.txt ++++ b/lib/librdkafka-2.10.1/CMakeLists.txt +@@ -3,7 +3,16 @@ cmake_minimum_required(VERSION 3.5) + include("packaging/cmake/parseversion.cmake") + parseversion("src/rdkafka.h") + +-project(RdKafka VERSION ${RDKAFKA_VERSION}) ++project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C) ++ ++# Check for CXX support ++include(CheckLanguage) ++check_language(CXX) ++if(CMAKE_CXX_COMPILER) ++ enable_language(CXX) ++else() ++ message(STATUS "C++ compiler not found, skipping C++ support") ++endif() + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/") + +@@ -181,7 +190,11 @@ endif() + + option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF) + option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON) +-option(RDKAFKA_BUILD_TESTS "Build tests" ON) ++ ++if(CMAKE_CXX_COMPILER) ++ option(RDKAFKA_BUILD_TESTS "Build tests" ON) ++endif() ++ + if(WIN32) + option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON) + endif(WIN32) +@@ -279,7 +292,10 @@ install( + ) + + add_subdirectory(src) +-add_subdirectory(src-cpp) ++ ++if(CMAKE_CXX_COMPILER) ++ add_subdirectory(src-cpp) ++endif() + + if(RDKAFKA_BUILD_EXAMPLES) + add_subdirectory(examples) +diff --git a/lib/librdkafka-2.10.1/examples/CMakeLists.txt b/lib/librdkafka-2.10.1/examples/CMakeLists.txt +index 91851d2cb..6874195ce 100644 +--- a/lib/librdkafka-2.10.1/examples/CMakeLists.txt ++++ b/lib/librdkafka-2.10.1/examples/CMakeLists.txt +@@ -5,8 +5,10 @@ endif(WIN32) + add_executable(producer producer.c ${win32_sources}) + target_link_libraries(producer PUBLIC rdkafka) + +-add_executable(producer_cpp producer.cpp ${win32_sources}) +-target_link_libraries(producer_cpp PUBLIC rdkafka++) ++if(CMAKE_CXX_COMPILER) ++ add_executable(producer_cpp producer.cpp ${win32_sources}) ++ target_link_libraries(producer_cpp PUBLIC rdkafka++) ++endif() + + add_executable(consumer consumer.c ${win32_sources}) + target_link_libraries(consumer PUBLIC rdkafka) +@@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka) + add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources}) + target_link_libraries(rdkafka_performance PUBLIC rdkafka) + +-add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources}) +-target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++) ++if(CMAKE_CXX_COMPILER) ++ add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources}) ++ target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++) ++endif() + +-add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources}) +-target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++) ++if(CMAKE_CXX_COMPILER) ++ add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources}) ++ target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++) ++endif() + +-add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources}) +-target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++) ++if(CMAKE_CXX_COMPILER) ++ add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources}) ++ target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++) ++endif() + + add_executable(misc misc.c ${win32_sources}) + target_link_libraries(misc PUBLIC rdkafka) +@@ -73,7 +81,8 @@ if(NOT WIN32) + add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c) + target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka) + +- add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) +- target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) +- ++ if(CMAKE_CXX_COMPILER) ++ add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) ++ target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) ++ endif() + endif(NOT WIN32) +-- +2.43.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 697cb1bf15..aeae034b2a 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -3,11 +3,16 @@ config BR2_PACKAGE_FLUENT_BIT depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBOPENSSL_ENGINES # needed by bundled librdkafka select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_MSGPACK_C + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_NGHTTP2 + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_ZSTD help Fast and Lightweight Logs and Metrics processor. diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index a3dbf5f544..3a4e637d88 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c745066223811047e3911c19db118eadec579ca62ef833a1b1fb573acd8cb85 fluent-bit-3.1.3.tar.gz +sha256 0031f74b616b4669064a59902559da2f87174aa8007e749b5df19ed79c534f5b fluent-bit-4.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 10e639a3d5..73bd686b27 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,13 +4,16 @@ # ################################################################################ -FLUENT_BIT_VERSION = 3.1.3 +FLUENT_BIT_VERSION = 4.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit -FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl +FLUENT_BIT_DEPENDENCIES = c-ares host-bison host-flex libyaml msgpack-c \ + nghttp2 openssl sqlite zstd + +FLUENT_BIT_CMAKE_BACKEND = ninja FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ @@ -18,8 +21,11 @@ FLUENT_BIT_CONF_OPTS += \ -DFLB_SECURITY=No \ -DFLB_EXAMPLES=No \ -DFLB_CHUNK_TRACE=No \ - -DFLB_PREFER_SYSTEM_LIBS=Yes \ - -DFLB_BACKTRACE=No + -DFLB_PREFER_SYSTEM_LIB_CARES=Yes \ + -DFLB_PREFER_SYSTEM_LIB_MSGPACK=Yes \ + -DFLB_PREFER_SYSTEM_LIB_NGHTTP2=Yes \ + -DFLB_PREFER_SYSTEM_LIB_SQLITE=Yes \ + -DFLB_PREFER_SYSTEM_LIB_ZSTD=Yes ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) FLUENT_BIT_WAMR_ARCH = $(call qstrip,$(BR2_PACKAGE_FLUENT_BIT_WASM_ARCH)) @@ -37,13 +43,37 @@ else FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No endif +ifeq ($(BR2_PACKAGE_LIBBACKTRACE),y) +FLUENT_BIT_CONF_OPTS += -DFLB_BACKTRACE=Yes \ + -DFLB_PREFER_SYSTEM_LIB_BACKTRACE=Yes +FLUENT_BIT_DEPENDENCIES += libbacktrace +else +FLUENT_BIT_CONF_OPTS += -DFLB_BACKTRACE=No +endif + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +FLUENT_BIT_CONF_OPTS += -DFLB_JEMALLOC=Yes \ + -DFLB_PREFER_SYSTEM_LIB_JEMALLOC=Yes +FLUENT_BIT_DEPENDENCIES += jemalloc +else +FLUENT_BIT_CONF_OPTS += -DFLB_JEMALLOC=No +endif + ifeq ($(BR2_PACKAGE_LUAJIT),y) -FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes \ + -DFLB_PREFER_SYSTEM_LIB_LUAJIT=Yes FLUENT_BIT_DEPENDENCIES += luajit else FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No endif +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +FLUENT_BIT_CONF_OPTS += -DFLB_OUT_PGSQL=Yes +FLUENT_BIT_DEPENDENCIES += postgresql +else +FLUENT_BIT_CONF_OPTS += -DFLB_OUT_PGSQL=No +endif + # Force bundled miniz to be linked statically. # https://github.com/fluent/fluent-bit/issues/6711 FLUENT_BIT_CONF_OPTS += \ diff --git a/package/fluidsynth/Config.in b/package/fluidsynth/Config.in index 376419ce8f..66fb07f45e 100644 --- a/package/fluidsynth/Config.in +++ b/package/fluidsynth/Config.in @@ -37,8 +37,6 @@ comment "alsa support needs a toolchain w/ threads" config BR2_PACKAGE_FLUIDSYNTH_JACK2 bool "jack2" - # See: https://sourceware.org/bugzilla/show_bug.cgi?id=19908 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on BR2_TOOLCHAIN_HAS_THREADS # jack2 depends on BR2_USE_MMU # jack2 depends on BR2_INSTALL_LIBSTDCPP # jack2 @@ -51,7 +49,6 @@ config BR2_PACKAGE_FLUIDSYNTH_JACK2 comment "jack support needs a toolchain w/ dynamic library, threads, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS @@ -73,8 +70,6 @@ comment "portaudio support needs a toolchain w/ threads" config BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO bool "pulseaudio" - # See: https://sourceware.org/bugzilla/show_bug.cgi?id=19908 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio depends on BR2_USE_WCHAR # pulseaudio depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio @@ -86,7 +81,6 @@ config BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO comment "pulseaudio support needs a toolchain w/ dynamic library, wchar, threads" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC depends on BR2_STATIC_LIBS || !BR2_USE_MMU || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 49ca85994c..9953997692 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fd4d216a3030abc56a339985ab0506328660cd77b2d71dd98c240c58c03d8f7f fluidsynth-2.4.0.tar.gz +sha256 7fb0e328c66a24161049e2b9e27c3b6e51a6904b31b1a647f73cc1f322523e88 fluidsynth-2.4.7.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 87e34ca9fe..e06afe4a07 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.4.0 +FLUIDSYNTH_VERSION = 2.4.7 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE diff --git a/package/flutter-engine/0001-disable-pre-canned-sysroot.patch b/package/flutter-engine/0001-disable-pre-canned-sysroot.patch index a9776d7388..2c02fc4948 100644 --- a/package/flutter-engine/0001-disable-pre-canned-sysroot.patch +++ b/package/flutter-engine/0001-disable-pre-canned-sysroot.patch @@ -11,13 +11,13 @@ Upstream: https://github.com/flutter/flutter/issues/123073 Signed-off-by: Joel Winarske Signed-off-by: Adam Duskett --- - build/config/sysroot.gni | 2 +- + engine/src/build/config/sysroot.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni +diff --git a/engine/src/build/config/sysroot.gni b/engine/src/build/config/sysroot.gni index 7987e519d..1de694263 100644 ---- a/build/config/sysroot.gni -+++ b/build/config/sysroot.gni +--- a/engine/src/build/config/sysroot.gni ++++ b/engine/src/build/config/sysroot.gni @@ -12,7 +12,7 @@ declare_args() { # Whether to use the default sysroot when building for Linux, if an explicit diff --git a/package/flutter-engine/0002-remove-explicit-x11-dependency.patch b/package/flutter-engine/0002-remove-explicit-x11-dependency.patch index 23d7ec9b06..85f6db1c38 100644 --- a/package/flutter-engine/0002-remove-explicit-x11-dependency.patch +++ b/package/flutter-engine/0002-remove-explicit-x11-dependency.patch @@ -10,13 +10,13 @@ Upstream: https://github.com/flutter/flutter/issues/123073 Signed-off-by: Joel Winarske Signed-off-by: Adam Duskett --- - flutter/shell/platform/linux/config/BUILD.gn | 4 ---- + engine/src/flutter/shell/platform/linux/config/BUILD.gn | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/flutter/shell/platform/linux/config/BUILD.gn b/flutter/shell/platform/linux/config/BUILD.gn +diff --git a/engine/src/flutter/shell/platform/linux/config/BUILD.gn b/engine/src/flutter/shell/platform/linux/config/BUILD.gn index da0ac056b..70c7a0ea1 100644 ---- a/flutter/shell/platform/linux/config/BUILD.gn -+++ b/flutter/shell/platform/linux/config/BUILD.gn +--- a/engine/src/flutter/shell/platform/linux/config/BUILD.gn ++++ b/engine/src/flutter/shell/platform/linux/config/BUILD.gn @@ -5,10 +5,6 @@ import("//build/config/linux/pkg_config.gni") import("//flutter/shell/platform/glfw/config.gni") diff --git a/package/flutter-engine/0003-fix-toolchain-paths.patch b/package/flutter-engine/0003-fix-toolchain-paths.patch index ba5d5f8023..93239c039f 100644 --- a/package/flutter-engine/0003-fix-toolchain-paths.patch +++ b/package/flutter-engine/0003-fix-toolchain-paths.patch @@ -4,7 +4,7 @@ Date: Sun, 5 Mar 2023 10:43:02 -0800 Subject: [PATCH] fix toolchain paths Flutter includes a copy of clang which is required to build. However, by -default, build/toolchain/custom/BUILD.gn attempts to use several gcc utilities +default, engine/src/build/toolchain/custom/BUILD.gn attempts to use several gcc utilities such as ar, readelf, nm, and strip. Change these to the proper llvm provided utility. @@ -13,13 +13,13 @@ Upstream: https://github.com/flutter/flutter/issues/123073 Signed-off-by: Joel Winarske Signed-off-by: Adam Duskett --- - build/toolchain/custom/BUILD.gn | 4 +++++------ + engine/src/build/toolchain/custom/BUILD.gn | 4 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -diff --git a/build/toolchain/custom/BUILD.gn b/build/toolchain/custom/BUILD.gn +diff --git a/engine/src/build/toolchain/custom/BUILD.gn b/engine/src/build/toolchain/custom/BUILD.gn index 65b1623..8b3f6f8 100644 ---- a/build/toolchain/custom/BUILD.gn -+++ b/build/toolchain/custom/BUILD.gn +--- a/engine/src/build/toolchain/custom/BUILD.gn ++++ b/engine/src/build/toolchain/custom/BUILD.gn @@ -12,11 +12,11 @@ toolchain("custom") { # these values in our scope. cc = "${toolchain_bin}/clang" diff --git a/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch b/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch index a31be7d77f..43b4a3ce2e 100644 --- a/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch +++ b/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch @@ -14,13 +14,13 @@ IE: output/host/.../sysroot/output/host/.../sysroot Upstream: https://github.com/flutter/flutter/issues/132152 Signed-off-by: Adam Duskett --- - build/config/linux/pkg-config.py | 4 +--- + engine/src/build/config/linux/pkg-config.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py +diff --git a/engine/src/build/config/linux/pkg-config.py b/engine/src/build/config/linux/pkg-config.py index b4a6aff17..44ffdcaea 100644 ---- a/build/config/linux/pkg-config.py -+++ b/build/config/linux/pkg-config.py +--- a/engine/src/build/config/linux/pkg-config.py ++++ b/engine/src/build/config/linux/pkg-config.py @@ -207,9 +207,7 @@ def main(): all_flags = flag_string.strip().split(' ') diff --git a/package/flutter-engine/dot-gclient b/package/flutter-engine/dot-gclient index 6ead80c8c2..7dfebdde2c 100644 --- a/package/flutter-engine/dot-gclient +++ b/package/flutter-engine/dot-gclient @@ -3,8 +3,8 @@ solutions = [{ "managed": False, - "name": "src/flutter", - "url": "https://github.com/flutter/engine.git@!FLUTTER_VERSION!", + "name": "./", + "url": "https://github.com/flutter/flutter.git@!FLUTTER_VERSION!", "custom_vars": { "download_android_deps": False, "download_windows_deps": False, diff --git a/package/flutter-engine/flutter-engine.hash b/package/flutter-engine/flutter-engine.hash new file mode 100644 index 0000000000..43c75ac19e --- /dev/null +++ b/package/flutter-engine/flutter-engine.hash @@ -0,0 +1 @@ +sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index 7f41defe68..1fa59a3863 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -19,9 +19,10 @@ # - Create a source tarball. # - Copy the source tarball to the $(FLUTTER_ENGINE_DL_DIR) directory. # -# There is no hash provided, as the gn binary (used for configuration) relies -# on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.24.4 +# There is no hash provided for the source tarball, as the gn binary +# (used for configuration) relies on the .git directories. As such, a +# reproducible tarball is not possible. +FLUTTER_ENGINE_VERSION = 3.29.2 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = @@ -40,7 +41,7 @@ FLUTTER_ENGINE_DEPENDENCIES = \ # Dispatch all architectures of flutter # FLUTTER_ENGINE_TARGET_TRIPPLE must match the directory name found in -# buildtools/linux-x64/clang/lib/clang/*/lib +# engine/src/buildtools/linux-x64/clang/lib/clang/*/lib ifeq ($(BR2_aarch64),y) FLUTTER_ENGINE_TARGET_ARCH = arm64 FLUTTER_ENGINE_TARGET_TRIPPLE = aarch64-unknown-linux-gnu @@ -61,13 +62,13 @@ FLUTTER_ENGINE_RUNTIME_MODE=release endif FLUTTER_ENGINE_BUILD_DIR = \ - $(@D)/out/linux_$(FLUTTER_ENGINE_RUNTIME_MODE)_$(FLUTTER_ENGINE_TARGET_ARCH) + $(@D)/engine/src/out/linux_$(FLUTTER_ENGINE_RUNTIME_MODE)_$(FLUTTER_ENGINE_TARGET_ARCH) FLUTTER_ENGINE_INSTALL_FILES = libflutter_engine.so # Flutter engine includes a bundled patched clang that must be used for # compiling or else there are linking errors. -FLUTTER_ENGINE_CLANG_PATH = $(@D)/flutter/buildtools/linux-x64/clang +FLUTTER_ENGINE_CLANG_PATH = $(@D)/engine/src/flutter/buildtools/linux-x64/clang FLUTTER_ENGINE_CONF_OPTS = \ --clang \ @@ -96,10 +97,10 @@ endif ifeq ($(BR2_CCACHE),y) define FLUTTER_ENGINE_COMPILER_PATH_FIXUP $(SED) "s%cc =.*%cc = \"$(HOST_DIR)/bin/ccache $(FLUTTER_ENGINE_CLANG_PATH)/bin/clang\""%g \ - $(@D)/build/toolchain/custom/BUILD.gn + $(@D)/engine/src/build/toolchain/custom/BUILD.gn $(SED) "s%cxx =.*%cxx = \"$(HOST_DIR)/bin/ccache $(FLUTTER_ENGINE_CLANG_PATH)/bin/clang++\""%g \ - $(@D)/build/toolchain/custom/BUILD.gn + $(@D)/engine/src/build/toolchain/custom/BUILD.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_COMPILER_PATH_FIXUP endif @@ -145,7 +146,7 @@ endif # There is no --disable-vulkan option ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) -FLUTTER_ENGINE_CONF_OPTS += --enable-vulkan --enable-impeller-vulkan +FLUTTER_ENGINE_CONF_OPTS += --enable-vulkan endif ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_LIBXCB),yy) @@ -153,10 +154,10 @@ FLUTTER_ENGINE_DEPENDENCIES += libxcb else define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP $(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \ - $(@D)/flutter/build_overrides/vulkan_headers.gni + $(@D)/engine/src/flutter/build_overrides/vulkan_headers.gni $(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \ - $(@D)/build/config/BUILDCONFIG.gn + $(@D)/engine/src/build/config/BUILDCONFIG.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP endif @@ -166,10 +167,10 @@ FLUTTER_ENGINE_DEPENDENCIES += wayland else define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP $(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \ - $(@D)/flutter/build_overrides/vulkan_headers.gni + $(@D)/engine/src/flutter/build_overrides/vulkan_headers.gni $(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \ - $(@D)/build/config/BUILDCONFIG.gn + $(@D)/engine/src/build/config/BUILDCONFIG.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP endif @@ -197,7 +198,7 @@ endef # We must set the home directory to the sdk directory or else flutter will # place .dart, and .flutter in ~/. define FLUTTER_ENGINE_CONFIGURE_CMDS - cd $(@D) && \ + cd $(@D)/engine/src && \ rm -rf $(FLUTTER_ENGINE_BUILD_DIR) && \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ @@ -207,7 +208,7 @@ define FLUTTER_ENGINE_CONFIGURE_CMDS endef define FLUTTER_ENGINE_BUILD_CMDS - cd $(@D) && \ + cd $(@D)/engine/src && \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ diff --git a/package/flutter-engine/gen-tarball b/package/flutter-engine/gen-tarball index 5bfb8f60e8..e5203b7bca 100755 --- a/package/flutter-engine/gen-tarball +++ b/package/flutter-engine/gen-tarball @@ -41,8 +41,8 @@ parse_opts() { prepare() { rm -rf "${SCRATCH_DIR}" - mkdir -p "${SCRATCH_DIR}" - pushd "${SCRATCH_DIR}" >/dev/null + mkdir -p "${SCRATCH_DIR}"/src + pushd "${SCRATCH_DIR}"/src >/dev/null } copy_dot_gclient() { @@ -63,6 +63,7 @@ run_gclient() { gen_tarball() { message "Generating tarball" mkdir -p "${DL_DIR}" + pushd "${SCRATCH_DIR}" >/dev/null # There are two issues with the flutter-engine buildsystem: # - it expects empty directories created by gclient.py to be present; that # means we can't use the mk_tar_gz helper method from support/download/helpers, @@ -72,6 +73,7 @@ gen_tarball() { # So we just create a plain tarball. ${TAR} -C "${SCRATCH_DIR}"/src -czf "${TARBALL_NAME}" . mv "${TARBALL_NAME}" "${TARBALL_DL_PATH}" + popd >/dev/null } cleanup() { diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk index f6ac086115..e8e27d4383 100644 --- a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk @@ -26,7 +26,7 @@ endef define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILD_CMDS cd $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR) && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + --native-assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \ package:$(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME)/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ diff --git a/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk index 2b5c896736..440aec4964 100644 --- a/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk +++ b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk @@ -26,7 +26,7 @@ endef define FLUTTER_ANIMATIONS_EXAMPLE_BUILD_CMDS cd $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR) && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + --native-assets $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \ package:$(FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME)/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ diff --git a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk index a7fa36ca9e..9279a4503f 100644 --- a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk +++ b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk @@ -29,7 +29,7 @@ define FLUTTER_GO_ROUTER_EXAMPLE_BUILD_CMDS -Dflutter.dart_plugin_registrant=file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ --source file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ --source package:flutter/src/dart_plugin_registrant.dart \ - --native-assets $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + --native-assets $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \ package:$(FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME)/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ diff --git a/package/flutter-packages/flutter-image-example/flutter-image-example.mk b/package/flutter-packages/flutter-image-example/flutter-image-example.mk index 20f185896d..5d754c0ff6 100644 --- a/package/flutter-packages/flutter-image-example/flutter-image-example.mk +++ b/package/flutter-packages/flutter-image-example/flutter-image-example.mk @@ -26,7 +26,7 @@ endef define FLUTTER_IMAGE_EXAMPLE_BUILD_CMDS cd $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR) && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + --native-assets $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \ package:$(FLUTTER_IMAGE_EXAMPLE_PKG_NAME)/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ diff --git a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk index eb6792fb02..0859b947eb 100644 --- a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk +++ b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk @@ -26,7 +26,7 @@ endef define FLUTTER_MARKDOWN_EXAMPLE_BUILD_CMDS cd $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR) && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + --native-assets $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \ package:$(FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME)/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash index 9730f65bf2..00346a8a6a 100644 --- a/package/flutter-packages/flutter-packages.hash +++ b/package/flutter-packages/flutter-packages.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fe87edffd828f7081f5622c592cb5871a2bc107dc03ff2610ddb6599f4f0137b flutter-packages-85c4934bda545beff36133dc63e47de5b5c5c56b.tar.gz +sha256 9b6fdc8660ac3c601887c3c7e8859662e7fca19584af56dfac9c8acb86298a01 flutter-packages-2df1c3a524131e35d6e385eb9465c47d530e341b.tar.gz sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk index 37f8141e7a..40a586f7e0 100644 --- a/package/flutter-packages/flutter-packages.mk +++ b/package/flutter-packages/flutter-packages.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PACKAGES_VERSION = 85c4934bda545beff36133dc63e47de5b5c5c56b +FLUTTER_PACKAGES_VERSION = 2df1c3a524131e35d6e385eb9465c47d530e341b FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION)) FLUTTER_PACKAGES_LICENSE = BSD-3-Clause FLUTTER_PACKAGES_LICENSE_FILES = LICENSE diff --git a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk index b57c021f8b..49f1dc4dda 100644 --- a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk +++ b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk @@ -26,7 +26,7 @@ endef define FLUTTER_RFW_LOCAL_EXAMPLE_BUILD_CMDS cd $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR) && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - --native-assets $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + --native-assets $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \ package:$(FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME)/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash index 6a73524745..892aff75f5 100644 --- a/package/flutter-pi/flutter-pi.hash +++ b/package/flutter-pi/flutter-pi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c3c7df5712cd7c45539b325b0d8d58d0942b08a6f66c55e3f53aa5225cbe86af flutter-pi-37bd9773c1938e5f76208bc4e8632fdbbb4190ff-git4.tar.gz +sha256 b30e8b67109a81a7c2a2bbec3d82491b69e827a1eb84c529f3e31691c19671d5 flutter-pi-af8c8d66c5f40a6aaf366882bb9ca525be9c600a-git4.tar.gz sha256 b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70 LICENSE diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index fad1da3215..4444493e61 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PI_VERSION = 37bd9773c1938e5f76208bc4e8632fdbbb4190ff +FLUTTER_PI_VERSION = af8c8d66c5f40a6aaf366882bb9ca525be9c600a FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git FLUTTER_PI_SITE_METHOD = git FLUTTER_PI_LICENSE = MIT diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index ea7bab28a5..3c4cdb69dc 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ce78d4a51f063efa7f04666ae010d026d119eea6bdea7e08b736840fe88ddb4 flutter_linux_3.24.4-stable.tar.xz +sha256 6096f21370773093ec19240e133664c1c12eb8b5a85605a92d16ce462a18eac4 flutter_linux_3.29.2-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 5b69cde465..e1d6a9fdaa 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.24.4 +FLUTTER_SDK_BIN_VERSION = 3.29.2 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index 961ce18ac7..a096f00373 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a58514816108a16d07307f924ebceb67c7d61709e4449978763fc44ed6e1fc44 fmc-LSDK-21.08.tar.gz -sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING +sha256 690ecca4d36b678f028afe780fb6750cece540e621a1c3f50bd98f54fe97d15c fmc-lf-6.12.20-2.0.0.tar.gz +sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 LICENSE diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index 4f25545ffd..bea7c5299a 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -FMC_VERSION = LSDK-21.08 +FMC_VERSION = lf-6.12.20-2.0.0 FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT -FMC_LICENSE_FILES = COPYING +FMC_LICENSE_FILES = LICENSE FMC_DEPENDENCIES = libxml2 tclap fmlib FMC_MAKE_OPTS = \ diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index f81b017869..7293ecbc07 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz -sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING +sha256 491315e35fb8d411305f4e66413ee3fe0e265f9cc8b5f27ec7587d15bf79991f fmlib-lf-6.12.20-2.0.0.tar.gz +sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca LICENSE diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 3d185979d5..14bcca5e40 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,10 +4,10 @@ # ################################################################################ -FMLIB_VERSION = LSDK-21.08 +FMLIB_VERSION = lf-6.12.20-2.0.0 FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) FMLIB_LICENSE = BSD-3-Clause -FMLIB_LICENSE_FILES = COPYING +FMLIB_LICENSE_FILES = LICENSE FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index aff52ccb6e..76bdd3171b 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 40fc58bebcf38c759e11a7bd8fdc163507d2423ef5058bba7f26280c5b9c5465 fmt-11.0.2.zip +sha256 695fd197fa5aff8fc67b5f2bbc110490a875cdf7a41686ac8512fb480fa8ada7 fmt-12.1.0.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 113652e911..7d11cfddc3 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 11.0.2 +FMT_VERSION = 12.1.0 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception diff --git a/package/fontconfig/Config.in b/package/fontconfig/Config.in index d274b06350..218fdb2e7a 100644 --- a/package/fontconfig/Config.in +++ b/package/fontconfig/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_FONTCONFIG bool "fontconfig" select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Fontconfig is a library for configuring and customizing font access. diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash index a4f87caf1e..e6f2e0771c 100644 --- a/package/fontconfig/fontconfig.hash +++ b/package/fontconfig/fontconfig.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/fontconfig/2023-January/006950.html -sha256 dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b fontconfig-2.14.2.tar.xz +# From https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/2.17.1/fontconfig-2.17.1.tar.xz.sha256sum +sha256 9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541 fontconfig-2.17.1.tar.xz # Locally calculated sha256 51a51aa9823704fd90bccc616cdd17ebabb5b2b3e9cbde886ca02c7002288067 COPYING diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 11758a4c80..d9f5dbefad 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -4,29 +4,29 @@ # ################################################################################ -FONTCONFIG_VERSION = 2.14.2 -FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release +FONTCONFIG_VERSION = 2.17.1 +FONTCONFIG_SITE = https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/$(FONTCONFIG_VERSION) FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.xz -# 0001-add-pthread-as-a-dependency-of-a-static-lib.patch -FONTCONFIG_AUTORECONF = YES FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) -HOST_FONTCONFIG_DEPENDENCIES = \ - host-freetype host-expat host-pkgconf host-gperf host-util-linux \ - host-gettext +HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf \ + host-gperf host-gettext FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING FONTCONFIG_CPE_ID_VALID = YES FONTCONFIG_CONF_OPTS = \ - --with-arch=$(GNU_TARGET_NAME) \ - --with-cache-dir=/var/cache/fontconfig \ - --disable-docs + -Dcache-dir=/var/cache/fontconfig \ + -Dtests=disabled \ + -Ddoc=disabled -HOST_FONTCONFIG_CONF_OPTS = \ - --disable-static +FONTCONFIG_CFLAGS = $(TARGET_CFLAGS) -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +# See: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/436 +ifeq ($(BR2_DEBUG_3),y) +FONTCONFIG_CFLAGS += -g2 +endif + +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/foot/foot.hash b/package/foot/foot.hash index 9a4335f2c6..fe058c05be 100644 --- a/package/foot/foot.hash +++ b/package/foot/foot.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ff81bca86178ef326588176f8bdf817bb3e0fbc891d026960144f69c8a74eb4d foot-1.16.2-git4.tar.gz +sha256 6fb18d482e2ac6a1d8ec293bbdd144e4f7f3bbd0302e9a8b60141cdb02b1aa6f foot-1.24.0-git4.tar.gz sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/foot/foot.mk b/package/foot/foot.mk index e300d04d0a..055adf8bce 100644 --- a/package/foot/foot.mk +++ b/package/foot/foot.mk @@ -4,7 +4,7 @@ # ################################################################################ -FOOT_VERSION = 1.16.2 +FOOT_VERSION = 1.24.0 FOOT_SITE = https://codeberg.org/dnkl/foot.git FOOT_SITE_METHOD = git FOOT_LICENSE = MIT diff --git a/package/fp16/Config.in b/package/fp16/Config.in new file mode 100644 index 0000000000..e07c6ebb8a --- /dev/null +++ b/package/fp16/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FP16 + bool "fp16" + select BR2_PACKAGE_PSIMD + help + Header-only library for conversion to/from half-precision + floating point formats. + + https://github.com/Maratyszcza/FP16 diff --git a/package/fp16/fp16.hash b/package/fp16/fp16.hash new file mode 100644 index 0000000000..a2b7d83c41 --- /dev/null +++ b/package/fp16/fp16.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 e7b509c76a2ea162ebdda77fb6b6f51f2f37dedee0866077d428e214516f0c2b fp16-98b0a46bce017382a6351a19577ec43a715b6835.tar.gz +# License files, locally calculated +sha256 17e4f539024be2749ee729d1e2f01d24cef12ece8c9bf18e91a4349be29c80bf LICENSE diff --git a/package/fp16/fp16.mk b/package/fp16/fp16.mk new file mode 100644 index 0000000000..d50d84366d --- /dev/null +++ b/package/fp16/fp16.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# fp16 +# +################################################################################ + +FP16_VERSION = 98b0a46bce017382a6351a19577ec43a715b6835 +FP16_SITE = $(call github,Maratyszcza,FP16,$(FP16_VERSION)) +FP16_LICENSE = MIT +FP16_LICENSE_FILES = LICENSE +FP16_INSTALL_STAGING = YES +# Only installs a header +FP16_INSTALL_TARGET = NO +FP16_DEPENDENCIES = psimd +FP16_CONF_OPTS = \ + -DFP16_BUILD_TESTS=OFF \ + -DFP16_BUILD_BENCHMARKS=OFF \ + -DPSIMD_SOURCE_DIR="$(PSIMD_DIR)" + +$(eval $(cmake-package)) diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 8b68798409..a1ef393517 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f fping-5.2.tar.gz +sha256 be320771f075e47dd7e5704b485e9bdc7dd11107884345c0f7c18749357f668d fping-5.4.tar.gz # Hash for license file sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index dc43261be8..e4b7b8f2c6 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 5.2 +FPING_VERSION = 5.4 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index 2f81d90c1d..9d06be8cf9 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5 freeipmi-1.6.14.tar.gz +sha256 5bcef6bb9eb680e49b4a3623579930ace7899f53925b2045fe9f91ad6904111d freeipmi-1.6.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index e28f63f715..0581b931b0 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,8 +4,8 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.14 -FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi +FREEIPMI_VERSION = 1.6.16 +FREEIPMI_SITE = $(BR2_GNU_MIRROR)/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in index e99778ea49..40401f57c7 100644 --- a/package/freeradius-server/Config.in +++ b/package/freeradius-server/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_FREERADIUS_SERVER depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBTALLOC select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index 2c0991a399..b90aa4b657 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.6.tar.bz2.sig -sha256 18bbb2318448f13918897ae7a38b36afd3db7dd5c66f78ad24d2e0051269d9b2 freeradius-server-3.2.6.tar.bz2 +# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.8.tar.bz2.sig +sha256 2c6483baeba65f939734473fafa31c4f727e8e139dd884563121412b6aba681b freeradius-server-3.2.8.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 94c9331b3d..946750f1a5 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERADIUS_SERVER_VERSION = 3.2.6 +FREERADIUS_SERVER_VERSION = 3.2.8 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 FREERADIUS_SERVER_SITE = https://freeradius.org/ftp/pub/freeradius @@ -15,6 +15,13 @@ FREERADIUS_SERVER_CPE_ID_PRODUCT = freeradius FREERADIUS_SERVER_DEPENDENCIES = libtalloc FREERADIUS_SERVER_AUTORECONF = YES +# Mitigated upstream since version 0.5.0, NVD database entry not +# up-to-date +FREERADIUS_SERVER_IGNORE_CVES += CVE-2002-0318 + +# Fixed in 2.2.0, NVD database entry not up-to-date +FREERADIUS_SERVER_IGNORE_CVES += CVE-2011-4966 + # We're patching src/modules/rlm_krb5/configure.ac define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF cd $(@D)/src/modules/rlm_krb5; $(AUTORECONF) -I$(@D)/m4 diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 1007215cd6..83b83db121 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,3 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.7.tar.gz.sha256 -sha256 5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 freerdp-2.11.7.tar.gz - # Locally calculated +sha256 f7cc2bf43b9778e9079cd229ea8e37fc1843eb1c11a8e4e003034af71858ce6a freerdp-2.11.7-18-g0ee17e2f8e49d56ab5b90d5160fa8f87ffc445e0-git4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index e8c8f320a9..391b9a4675 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,13 +4,19 @@ # ################################################################################ -FREERDP_VERSION = 2.11.7 -FREERDP_SITE = https://pub.freerdp.com/releases +# Latest, and probably last, commit on the stable-2.0 branch +FREERDP_VERSION = 2.11.7-18-g0ee17e2f8e49d56ab5b90d5160fa8f87ffc445e0 +FREERDP_SITE = https://github.com/FreeRDP/FreeRDP +FREERDP_SITE_METHOD = git FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 FREERDP_LICENSE_FILES = LICENSE FREERDP_CPE_ID_VENDOR = freerdp +# As explained on https://github.com/FreeRDP/FreeRDP/pull/11573#issuecomment-2904160524, +# the affected code is new with 3.x, was not there on 2.x +FREERDP_IGNORE_CVES += CVE-2025-4478 + FREERDP_INSTALL_STAGING = YES FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev -DWITH_GSTREAMER_0_10=OFF diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 6d196a052d..77d6547cec 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -93,6 +93,21 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA2 endchoice +choice + prompt "i.MX 91 Silicon Revision" + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A0 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + help + Some packages related to the selected i.MX platform need to + know the silicon revision of the platform they will run on. + + Note - mismatches may result in a failure to boot! + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A0 + bool "imx91a0" + +endchoice + choice prompt "i.MX 93 Silicon Revision" default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in index e8369f0102..d8a55ed219 100644 --- a/package/freescale-imx/firmware-ele-imx/Config.in +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -19,8 +19,7 @@ config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE default "mx8ulpa1-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA1 default "mx8ulpa2-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8ULPA2 default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 - default "mx93a1-ahab-container.img" if \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + default "mx93a1-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + default "mx91a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A0 endif # BR2_PACKAGE_FIRMWARE_ELE_IMX diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash index 0923e546b0..55e1864e31 100644 --- a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash @@ -1,4 +1,5 @@ # Locally calculated -sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 a2f16e43e8aff9cf018d0962b70313940f77079b314331ab3980c4c5f44249cb firmware-ele-imx-2.0.1-0a66c34.bin +sha256 3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26 COPYING +sha256 38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769 EULA +sha256 8721a617a5d4c7f366aaf857ebda21eb4c9fc9175dc92b70f627c611d403ec8e SCR.txt diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk index d493fe4a96..8f25f4b5b5 100644 --- a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk @@ -4,12 +4,13 @@ # ################################################################################ -FIRMWARE_ELE_IMX_VERSION = 0.1.0 +FIRMWARE_ELE_IMX_VERSION = 2.0.1 +FIRMWARE_ELE_IMX_REVISION = 0a66c34 FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) -FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION)-$(FIRMWARE_ELE_IMX_REVISION).bin FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement -FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING EULA +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING EULA SCR.txt FIRMWARE_ELE_IMX_REDISTRIBUTE = NO FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 4a9986448f..0acc235e0a 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -62,7 +62,7 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 -if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW +if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW || BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 choice bool "DDR training binaries" @@ -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 diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index d606ae6da6..13e9e1a87b 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2e27962332197ebebbb30138f6dfb365361d48d7efa565df97c4f79285b1ca50 firmware-imx-8.24-fbe0a4c.bin -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f firmware-imx-8.27-5af0ceb.bin +sha256 3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26 COPYING +sha256 38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769 EULA sha256 40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e SCR.txt diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 8666d76a73..f8c9df1cce 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,8 +4,8 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.24 -FIRMWARE_IMX_REVISION = fbe0a4c +FIRMWARE_IMX_VERSION = 8.27 +FIRMWARE_IMX_REVISION = 5af0ceb FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION)-$(FIRMWARE_IMX_REVISION).bin diff --git a/package/freescale-imx/imx-codec/imx-codec.hash b/package/freescale-imx/imx-codec/imx-codec.hash index 666d38d001..18a2cebec9 100644 --- a/package/freescale-imx/imx-codec/imx-codec.hash +++ b/package/freescale-imx/imx-codec/imx-codec.hash @@ -1,4 +1,5 @@ # locally computed -sha256 b0744a91c265202a79a019c72f17cae01fd5b63a3ba451592b6c8349d95719e0 imx-codec-4.8.2.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 1a41a3cad9e0f4baa904fcec896105d3474e18d13f169dad1172d5691fc11c9a imx-codec-4.9.0.bin +sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 5832c59215fcc5ffd2566c0bb35c7e5c8181ca609f529962c2bd0606f3f12aa3 SCR-imx-codec.txt diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 54ba6f126e..0cfe74df0b 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -4,13 +4,13 @@ # ################################################################################ -IMX_CODEC_VERSION = 4.8.2 +IMX_CODEC_VERSION = 4.9.0 IMX_CODEC_SITE = $(FREESCALE_IMX_SITE) IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin IMX_CODEC_INSTALL_STAGING = YES IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3-Clause (flac, ogg headers) -IMX_CODEC_LICENSE_FILES = EULA COPYING +IMX_CODEC_LICENSE_FILES = EULA COPYING SCR-imx-codec.txt IMX_CODEC_REDISTRIBUTE = NO ifeq ($(BR2_aarch64),y) diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 922fce2236..4bd83090a8 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,6 @@ # Locally calculated -sha256 413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663 imx-gpu-g2d-6.4.11.p2.6-arm-bc7b6a2.bin -sha256 b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918 imx-gpu-g2d-6.4.11.p2.6-aarch64-bc7b6a2.bin -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 e6c336c0b876efab7598a2d7817111772284487f646d5d83c400692f2cdfebe3 imx-gpu-g2d-6.4.11.p3.0-aarch64-c600d03.bin +sha256 6e1a42f2c570582b8038d1b5c86dbdcd645e75cc10a1db23e716f662d1c1329f imx-gpu-g2d-6.4.11.p3.0-arm-c600d03.bin +sha256 3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26 COPYING +sha256 38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769 EULA +sha256 3f3b817ca9490fbe89a83395a0961122aca138bf43acd869c6ca086502a1e131 SCR-imx-gpu-g2d.txt diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 0a7ee3c298..4d29974db1 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -4,30 +4,34 @@ # ################################################################################ +IMX_GPU_G2D_REVISION = c600d03 ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.11.p2.6-aarch64-bc7b6a2 +IMX_GPU_G2D_VERSION = 6.4.11.p3.0-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.11.p2.6-arm-bc7b6a2 +IMX_GPU_G2D_VERSION = 6.4.11.p3.0-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) -IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin +IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION)-$(IMX_GPU_G2D_REVISION).bin IMX_GPU_G2D_DEPENDENCIES = imx-gpu-viv IMX_GPU_G2D_INSTALL_STAGING = YES IMX_GPU_G2D_LICENSE = NXP Semiconductor Software License Agreement -IMX_GPU_G2D_LICENSE_FILES = EULA COPYING +IMX_GPU_G2D_LICENSE_FILES = EULA COPYING SCR-imx-gpu-g2d.txt IMX_GPU_G2D_REDISTRIBUTE = NO define IMX_GPU_G2D_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) endef +IMX_GPU_G2D_SUBDIR = $(if $(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),mx8mm,) + define IMX_GPU_G2D_INSTALL_STAGING_CMDS - cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr + cp -a $(@D)/g2d/usr/include/* $(STAGING_DIR)/usr/include/ + cp -a $(@D)/g2d/usr/lib/$(IMX_GPU_G2D_SUBDIR)/libg2d* $(STAGING_DIR)/usr/lib/ endef define IMX_GPU_G2D_INSTALL_TARGET_CMDS - cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr + cp -a $(@D)/g2d/usr/lib/$(IMX_GPU_G2D_SUBDIR)/libg2d* $(TARGET_DIR)/usr/lib/ endef $(eval $(generic-package)) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 0a1be6ec13..392f004787 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -12,9 +12,6 @@ config BR2_PACKAGE_IMX_GPU_VIV depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64 # Library binaries are linked against libc.so.6 depends on BR2_TOOLCHAIN_USES_GLIBC - # Library binaries are linked against libdrm.so.2, except framebuffer - # output on ARM - select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB) select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES # gbm is only available in the aarch64 blobs @@ -34,6 +31,13 @@ config BR2_PACKAGE_IMX_GPU_VIV This library is provided by Freescale as-is and doesn't have an upstream. +# Library binaries are linked against libdrm.so.2 and libwayland, +# except framebuffer output on ARM +config BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND + bool + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_WAYLAND + if BR2_PACKAGE_IMX_GPU_VIV choice @@ -45,12 +49,13 @@ choice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" - # The i.MX8 aarch64 blob doesn't support FB output - depends on BR2_arm + # Yes, the ARM64 framebuffer libraries link against + # libdrm/libwayland. + select BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND if BR2_aarch64 config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL bool "Wayland" - select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND endchoice diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index cce08e2727..7b4fcedf4a 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,6 @@ # Locally calculated -sha256 cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3 imx-gpu-viv-6.4.11.p2.6-aarch32-bc7b6a2.bin -sha256 5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1 imx-gpu-viv-6.4.11.p2.6-aarch64-bc7b6a2.bin -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA +sha256 fe8fc231f18047b9547a038e111c08e855760190d0e9848ead22b383d793499d imx-gpu-viv-6.4.11.p3.0-aarch32-c600d03.bin +sha256 82e1bb6304d2aac70c72b691239d1bb5f6738cadfa812d07196db2f580c63d29 imx-gpu-viv-6.4.11.p3.0-aarch64-c600d03.bin +sha256 3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26 COPYING +sha256 38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769 EULA +sha256 ab20fa3f527fce99087d8d3cd4e2cf4b9cfdfaaa98b3d766a2b5953a981323d3 SCR-imx-gpu-viv.txt diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index a559bb7478..8494e875e2 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,18 +4,19 @@ # ################################################################################ +IMX_GPU_VIV_REVISION = c600d03 ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.11.p2.6-aarch64-bc7b6a2 +IMX_GPU_VIV_VERSION = 6.4.11.p3.0-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.11.p2.6-aarch32-bc7b6a2 +IMX_GPU_VIV_VERSION = 6.4.11.p3.0-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) -IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin +IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION)-$(IMX_GPU_VIV_REVISION).bin IMX_GPU_VIV_INSTALL_STAGING = YES IMX_GPU_VIV_LICENSE = NXP Semiconductor Software License Agreement -IMX_GPU_VIV_LICENSE_FILES = EULA COPYING +IMX_GPU_VIV_LICENSE_FILES = EULA COPYING SCR-imx-gpu-viv.txt IMX_GPU_VIV_REDISTRIBUTE = NO IMX_GPU_VIV_PROVIDES = libegl libgles libopencl libopenvg @@ -24,26 +25,30 @@ ifeq ($(BR2_aarch64),y) IMX_GPU_VIV_PROVIDES += libgbm endif -IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) +IMX_GPU_VIV_OUTPUT = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) -# Libraries are linked against libdrm, except framebuffer output on ARM -ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) -IMX_GPU_VIV_DEPENDENCIES += libdrm -endif - -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) -IMX_GPU_VIV_DEPENDENCIES += wayland +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND),y) +IMX_GPU_VIV_DEPENDENCIES += libdrm wayland +IMX_GPU_VIV_LIBDIR = wayland +else +IMX_GPU_VIV_LIBDIR = fb endif define IMX_GPU_VIV_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) endef -ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) +# The package comes with multiple versions of egl.pc, +# depending on the output the original egl.pc is replaced +# with a symlink: +# - arm/frambuffer: symlink to egl_linuxfb.pc +# - aarch64/framebuffer: original egl.pc without a symlink +# - wayland: symblink to egl_wayland.pc +ifeq ($(IMX_GPU_VIV_OUTPUT):$(BR2_arm),fb:y) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef -else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) +else ifeq ($(IMX_GPU_VIV_OUTPUT),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef @@ -60,7 +65,7 @@ endif # in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS - cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIBDIR)/* $(@D)/gpu-core/usr/lib/ $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) @@ -92,7 +97,7 @@ define IMX_GPU_VIV_INSTALL_TARGET_CMDS $(IMX_GPU_VIV_INSTALL_EXAMPLES) $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr - $(INSTALL) -D -m 0644 $(@D)/gpu-core/etc/Vivante.icd $(TARGET_DIR)/etc/OpenCL/vendors/Vivante.icd + cp -r $(@D)/gpu-core/etc/* $(TARGET_DIR)/etc endef $(eval $(generic-package)) diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index 955879eb43..d36868b7be 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,5 @@ # Locally calculated -sha256 23327c38ffc746321697528b2c4c726ed5c3ebadf4b312592d533664719595bd imx-sc-firmware-1.16.0.bin -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 392f1e5cdf1c8d7ed75409a2c46b00a332ace677f0e2700b587fe9ae800a1ff3 imx-sc-firmware-1.18.0-654907b.bin +sha256 38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769 EULA +sha256 3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26 COPYING +sha256 bfbeef332d05c9608c790a12bbbf4c66a8acc76b159145ba7ef48d3799ca8a61 SCR.txt diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 5c9ec59d8a..90bfcc6e3c 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,12 +4,13 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.16.0 +IMX_SC_FIRMWARE_VERSION = 1.18.0 +IMX_SC_FIRMWARE_REVISION = 654907b IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) -IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin +IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION)-$(IMX_SC_FIRMWARE_REVISION).bin IMX_SC_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement -IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING +IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING SCR.txt IMX_SC_FIRMWARE_REDISTRIBUTE = NO define IMX_SC_FIRMWARE_EXTRACT_CMDS diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash index a91dbc2274..5c29ec4fa9 100644 --- a/package/freescale-imx/imx-seco/imx-seco.hash +++ b/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,6 @@ # Locally calculated -sha256 9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7 imx-seco-5.9.4.bin -sha256 165f6c0eacb4d3a05289dfb79331c9a2c05207eb7a67ef28a117f246a0145428 EULA -sha256 c9ee518510d72e254d62743f5098163eacdb6428c6ba4d8119afe2d12edba068 COPYING +sha256 bd8dc01966076836aabff53f2463295294166595006e1db430db21b6ffa6b667 imx-seco-5.9.4.1-0333596.bin +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 92d7a6594cece4d59f4da4677f3128aa4997fd49955aee50a6fed32e3800df76 SCR.txt +sha256 92d7a6594cece4d59f4da4677f3128aa4997fd49955aee50a6fed32e3800df76 SCR-imx-seco.txt diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 4afac8005b..012f367099 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,12 +4,13 @@ # ################################################################################ -IMX_SECO_VERSION = 5.9.4 +IMX_SECO_VERSION = 5.9.4.1 +IMX_SECO_REVISION = 0333596 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) -IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin +IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION)-$(IMX_SECO_REVISION).bin IMX_SECO_LICENSE = NXP Semiconductor Software License Agreement -IMX_SECO_LICENSE_FILES = EULA COPYING +IMX_SECO_LICENSE_FILES = EULA COPYING SCR.txt SCR-imx-seco.txt IMX_SECO_REDISTRIBUTE = NO define IMX_SECO_EXTRACT_CMDS diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash index 0fd64cdf9d..61f7f38462 100644 --- a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 80d6620063fd5e5506b05c907677b579d471a9b6daa8b26ffb963110cc680bf9 imx-vpu-hantro-daemon-1.1.9.tar.gz +sha256 e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535 imx-vpu-hantro-daemon-1.5.0-3200e68.tar.gz sha256 bb645f02b260955f333348100e40af76253e2cd8b116bac047230439dd53ec5a LICENSE.txt +sha256 c61176048f74950c0849d91b4b6b30e335e050462a8950b89a4e6f35c7fe577b SCR-imx-vpu-hantro-daemon.txt diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk index 12ec055f92..cb0a078078 100644 --- a/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk @@ -4,10 +4,12 @@ # ################################################################################ -IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.9 +IMX_VPU_HANTRO_DAEMON_VERSION = 1.5.0 +IMX_VPU_HANTRO_DAEMON_REVISION = 3200e68 +IMX_VPU_HANTRO_DAEMON_SOURCE = imx-vpu-hantro-daemon-$(IMX_VPU_HANTRO_DAEMON_VERSION)-$(IMX_VPU_HANTRO_DAEMON_REVISION).tar.gz IMX_VPU_HANTRO_DAEMON_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_DAEMON_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt +IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt SCR-imx-vpu-hantro-daemon.txt IMX_VPU_HANTRO_DAEMON_REDISTRIBUTE = NO IMX_VPU_HANTRO_DAEMON_DEPENDENCIES = imx-vpu-hantro linux ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y) diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash index 7f6193e397..1b1447c34e 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.hash @@ -1,4 +1,5 @@ # Locally computed: -sha256 84fcefa0619def2f009ca6651c5cffcda57fed29cd7060ef68be48c5d0d7814b imx-vpu-hantro-vc-1.9.1.bin -sha256 de37a0bcbf1717b910c1a53ea6eab853c404e61e8143bb6c081d39f532571e54 COPYING -sha256 b158adaac5e2d1c7fa6e739ff168ab498957e3303070f1c0b0e66d9a8f02a354 EULA +sha256 713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df imx-vpu-hantro-vc-1.10.1-c0244a1.bin +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 COPYING +sha256 c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607 EULA +sha256 a6f0297ad8ab4906229957c2c7c4bf825d543d99ffb5bdafc2de5a8d884eb88b SCR.txt diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk index de88ebf32c..b28e61bd8a 100644 --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk @@ -4,14 +4,15 @@ # ################################################################################ -IMX_VPU_HANTRO_VC_VERSION = 1.9.1 +IMX_VPU_HANTRO_VC_VERSION = 1.10.1 +IMX_VPU_HANTRO_VC_REVISION = c0244a1 IMX_VPU_HANTRO_VC_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION).bin +IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION)-$(IMX_VPU_HANTRO_VC_REVISION).bin IMX_VPU_HANTRO_VC_DEPENDENCIES = linux IMX_VPU_HANTRO_VC_INSTALL_STAGING = YES IMX_VPU_HANTRO_VC_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING +IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING SCR.txt IMX_VPU_HANTRO_VC_REDISTRIBUTE = NO define IMX_VPU_HANTRO_VC_EXTRACT_CMDS diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index 069700fc5f..6b267b3ef0 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,4 +1,5 @@ # Locally computed: -sha256 21fb3288f6f44631ebf6479284c5c081ff829a3068811eebbacc510f14300ab4 imx-vpu-hantro-1.31.0.bin -sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING -sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA +sha256 0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7 imx-vpu-hantro-1.36.0-194a305.bin +sha256 3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26 COPYING +sha256 38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769 EULA +sha256 5d06ff9de56f0788f6b090c93226dd951764124635c687cef64f29776c2e8cf8 SCR-imx-vpu-hantro.txt diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index 64df16e21b..dbd50bfae8 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,9 +4,10 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.31.0 +IMX_VPU_HANTRO_VERSION = 1.36.0 +IMX_VPU_HANTRO_REVISION = 194a305 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin +IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION)-$(IMX_VPU_HANTRO_REVISION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux IMX_VPU_HANTRO_INSTALL_STAGING = YES @@ -19,7 +20,7 @@ IMX_VPU_HANTRO_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) IMX_VPU_HANTRO_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING +IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING SCR-imx-vpu-hantro.txt IMX_VPU_HANTRO_REDISTRIBUTE = NO define IMX_VPU_HANTRO_EXTRACT_CMDS diff --git a/package/freeswitch/0002-ffmpeg7.patch b/package/freeswitch/0002-ffmpeg7.patch new file mode 100644 index 0000000000..ac1d3a13af --- /dev/null +++ b/package/freeswitch/0002-ffmpeg7.patch @@ -0,0 +1,206 @@ +From ff2e8b475f25a995e085045fc25ba445fb32c57e Mon Sep 17 00:00:00 2001 +From: Korynkai +Date: Mon, 30 Dec 2024 22:23:33 +0000 +Subject: [PATCH] Fixes related to signalwire/freeswitch#2202 + AVOutputFormat::priv_data_size is marked private and no longer exists in the + public API as of FFMPEG 6.0, but found hidden in AVOutputFormat as part of + FFOutputFormat. AVCodecContext::ticks_per_frame was deprecated as of FFMPEG + 6.1. libavcodec notes 'do not use avcodec_close()' as of FFMPEG 3.1, use + avcodec_free_context() instead. AVFrame::key_frame was deprecated as of + FFMPEG 6.1, use AVFrame::flags instead. AVInputFormat::read_seek and + AVInputFormat::read_seek2 no longer exists as of FFMPEG 7.0. This seems to + only be used for logging purposes, so guard this functionality accordingly. + +Upstream: https://github.com/signalwire/freeswitch/pull/2681.patch + +Signed-off-by: Bernd Kuhls +--- + src/mod/applications/mod_av/avcodec.c | 27 +++++++++++++++++++++- + src/mod/applications/mod_av/avformat.c | 31 +++++++++++++++++++++++--- + 2 files changed, 54 insertions(+), 4 deletions(-) + +diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c +index 0293b834467..be864a56744 100644 +--- a/src/mod/applications/mod_av/avcodec.c ++++ b/src/mod/applications/mod_av/avcodec.c +@@ -1226,9 +1226,13 @@ static switch_status_t open_encoder(h264_codec_context_t *context, uint32_t widt + } + + if (context->encoder_ctx) { ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,48,101)) + if (avcodec_is_open(context->encoder_ctx)) { + avcodec_close(context->encoder_ctx); + } ++#else ++ avcodec_free_context(&(context->encoder_ctx)); ++#endif + av_free(context->encoder_ctx); + context->encoder_ctx = NULL; + } +@@ -1319,9 +1323,13 @@ FF_ENABLE_DEPRECATION_WARNINGS + } + + if (context->encoder_ctx) { ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,48,101)) + if (avcodec_is_open(context->encoder_ctx)) { + avcodec_close(context->encoder_ctx); + } ++#else ++ avcodec_free_context(&(context->encoder_ctx)); ++#endif + av_free(context->encoder_ctx); + context->encoder_ctx = NULL; + } +@@ -1557,7 +1565,11 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t + } + + avframe->pict_type = AV_PICTURE_TYPE_I; ++#if (LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58,29,100)) + avframe->key_frame = 1; ++#else ++ avframe->flags |= AV_FRAME_FLAG_KEY; ++#endif + context->last_keyframe_request = switch_time_now(); + } + +@@ -1600,9 +1612,14 @@ GCC_DIAG_ON(deprecated-declarations) + } + #endif + ++#if (LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58,29,100)) + if (context->need_key_frame && avframe->key_frame == 1) { +- avframe->pict_type = 0; + avframe->key_frame = 0; ++#else ++ if (context->need_key_frame && avframe->flags & AV_FRAME_FLAG_KEY) { ++ avframe->flags ^= AV_FRAME_FLAG_KEY; ++#endif ++ avframe->pict_type = 0; + context->need_key_frame = 0; + } + +@@ -1862,14 +1879,22 @@ static switch_status_t switch_h264_destroy(switch_codec_t *codec) + + switch_buffer_destroy(&context->nalu_buffer); + if (context->decoder_ctx) { ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,48,101)) + if (avcodec_is_open(context->decoder_ctx)) avcodec_close(context->decoder_ctx); ++#else ++ avcodec_free_context(&(context->decoder_ctx)); ++#endif + av_free(context->decoder_ctx); + } + + switch_img_free(&context->img); + + if (context->encoder_ctx) { ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,48,101)) + if (avcodec_is_open(context->encoder_ctx)) avcodec_close(context->encoder_ctx); ++#else ++ avcodec_free_context(&(context->encoder_ctx)); ++#endif + av_free(context->encoder_ctx); + } + +diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c +index c1e00525300..6fcb51c2079 100644 +--- a/src/mod/applications/mod_av/avformat.c ++++ b/src/mod/applications/mod_av/avformat.c +@@ -184,6 +184,16 @@ struct av_file_context { + + typedef struct av_file_context av_file_context_t; + ++#if (LIBAVFORMAT_VERSION_MAJOR >= 60) ++typedef struct FFOutputFormat { ++ int priv_data_size; ++} FFOutputFormat; ++ ++static inline int priv_data_size(const AVOutputFormat *fmt) ++{ ++ return ((const struct FFOutputFormat*)fmt)->priv_data_size; ++} ++#endif + + /** + * Fill the provided buffer with a string containing a timestamp +@@ -455,8 +465,13 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const cha + } + + s->oformat = oformat; ++#if (LIBAVFORMAT_VERSION_MAJOR < 60) + if (s->oformat->priv_data_size > 0) { + s->priv_data = av_mallocz(s->oformat->priv_data_size); ++#else ++ if (priv_data_size(s->oformat) > 0) { ++ s->priv_data = av_mallocz(priv_data_size(s->oformat)); ++#endif + if (!s->priv_data) { + goto nomem; + } +@@ -621,7 +636,9 @@ static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst, + c->rc_initial_buffer_occupancy = buffer_bytes * 8; + + if (codec_id == AV_CODEC_ID_H264) { ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60,31,102)) + c->ticks_per_frame = 2; ++#endif + + + c->flags|=AV_CODEC_FLAG_LOOP_FILTER; // flags=+loop +@@ -1410,8 +1427,10 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h + switch_goto_status(SWITCH_STATUS_FALSE, err); + } + ++#if (LIBAVFORMAT_VERSION_MAJOR < 61) + handle->seekable = context->fc->iformat->read_seek2 ? 1 : (context->fc->iformat->read_seek ? 1 : 0); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "file %s is %sseekable\n", filename, handle->seekable ? "" : "not "); ++#endif + + /** Get information on the input file (number of streams etc.). */ + if ((error = avformat_find_stream_info(context->fc, opts ? &opts : NULL)) < 0) { +@@ -1502,7 +1521,11 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open input audio codec channel 2 (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf))); + if ((cc = av_get_codec_context(&context->audio_st[0]))) { ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,48,101)) + avcodec_close(cc); ++#else ++ avcodec_free_context(&cc); ++#endif + } + + context->has_audio = 0; +@@ -3084,14 +3107,11 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f + void *pop; + MediaStream *mst = &context->video_st; + AVStream *st = mst->st; +- int ticks = 0; + int64_t max_delta = 1 * AV_TIME_BASE; // 1 second + switch_status_t status = SWITCH_STATUS_SUCCESS; + double fl_to = 0.02; + int do_fl = 0; + int smaller_ts = context->read_fps; +- AVCodecContext *c = NULL; +- AVCodecParserContext *cp = NULL; + + if (!context->has_video) return SWITCH_STATUS_FALSE; + +@@ -3199,6 +3219,10 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f + } + #endif + ++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60,31,102)) ++ int ticks = 0; ++ AVCodecContext *c = NULL; ++ AVCodecParserContext *cp = NULL; + if ((c = av_get_codec_context(mst)) && c->time_base.num) { + cp = av_stream_get_parser(st); + ticks = cp ? cp->repeat_pict + 1 : c->ticks_per_frame; +@@ -3210,6 +3234,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f + context->video_start_time, ticks, c ? c->ticks_per_frame : -1, st->time_base.num, st->time_base.den, c ? c->time_base.num : -1, c ? c->time_base.den : -1, + st->start_time, st->duration == AV_NOPTS_VALUE ? context->fc->duration / AV_TIME_BASE * 1000 : st->duration, st->nb_frames, av_q2d(st->time_base)); + } ++#endif + + again: + diff --git a/package/freeswitch/0003-xml_int-mod_xml_rpc-const-compiler-errors.patch b/package/freeswitch/0003-xml_int-mod_xml_rpc-const-compiler-errors.patch new file mode 100644 index 0000000000..0cd5283a14 --- /dev/null +++ b/package/freeswitch/0003-xml_int-mod_xml_rpc-const-compiler-errors.patch @@ -0,0 +1,35 @@ +From 475b64d1c5707e1302cf9f7cfe3c385b7339c6c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= + =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= +Date: Sat, 22 Jun 2024 14:58:52 +0200 +Subject: [PATCH] xml_int/mod_xml_rpc: const compiler errors + +Upstream: https://github.com/signalwire/freeswitch/pull/2496 + +Signed-off-by: Bernd Kuhls +--- + src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c +index 8e49462d2c2..0a4e5e1e449 100644 +--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ++++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c +@@ -321,7 +321,7 @@ static abyss_bool user_attributes(const char *user, const char *domain_name, + static abyss_bool is_authorized(const TSession * r, const char *command) + { + char *user = NULL, *domain_name = NULL; +- char *allowed_commands = NULL; ++ const char *allowed_commands = NULL; + char *dp; + char *dup = NULL; + char *argv[256] = { 0 }; +@@ -922,7 +922,7 @@ abyss_bool handler_hook(TSession * r) + if (len > 0) { + int succeeded = TRUE; + char *qp = qbuf; +- char *readError; ++ const char *readError; + + do { + int blen = r->connP->buffersize - r->connP->bufferpos; diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index bef25236f0..58ebc22298 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -283,6 +283,11 @@ FREESWITCH_DEPENDENCIES += opencv3 FREESWITCH_ENABLED_MODULES += applications/mod_cv endif +ifeq ($(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV4_LIB_OBJDETECT),yyy) +FREESWITCH_DEPENDENCIES += opencv4 +FREESWITCH_ENABLED_MODULES += applications/mod_cv +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) FREESWITCH_CONF_ENV += \ ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index e7331d5ba0..2c6ab20e19 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.2/ -sha1 2d8d5917a1983ebd04921f2993a88858d6f72dec freetype-2.13.2.tar.xz -sha256 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d freetype-2.13.2.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.14.1/ +sha1 20f7a9a3e2996aab82b0648e82d49a78e8813bab freetype-2.14.1.tar.xz +sha256 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc freetype-2.14.1.tar.xz # Locally calculated -sha256 2e3bbb7d7c5c396368dd0853a790ec29ce5b8647163dde42a0493fb0d6556b2b LICENSE.TXT -sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT +sha256 bd36c8b474855fa294c2ec5c184544478ef3720aad37d65a6296a4f264fd2d3b LICENSE.TXT +sha256 5a5ee54c5001bbad1cdc1a57cc3dd4c42199b2da09d39c7ee41fab002d02967f docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 5032414d63..00743fe358 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,9 +4,9 @@ # ################################################################################ -FREETYPE_VERSION = 2.13.2 +FREETYPE_VERSION = 2.14.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz -FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype +FREETYPE_SITE = https://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = FTL or GPL-2.0+ diff --git a/package/frr/0001-lib-make-getloadavg-optional-in-late-timer-warnings.patch b/package/frr/0001-lib-make-getloadavg-optional-in-late-timer-warnings.patch new file mode 100644 index 0000000000..d03f64882e --- /dev/null +++ b/package/frr/0001-lib-make-getloadavg-optional-in-late-timer-warnings.patch @@ -0,0 +1,49 @@ +From d76100a2b9a2ec814ad0a1fb844a395a6dc2f6bd Mon Sep 17 00:00:00 2001 +From: Maxime Leroy +Date: Mon, 11 Aug 2025 13:44:02 +0200 +Subject: [PATCH] lib: make getloadavg() optional in late timer warnings + +Commit ff76fb21d7b3 ("lib: improve late timer warnings") added an +unconditional getloadavg() call. Older libcs (e.g. uClibc, dietlibc) +lack this function, breaking the build. Before, no system load was +shown, so skipping it restores prior behavior. + +Fixes: ff76fb21d7b3 ("lib: improve late timer warnings") +Signed-off-by: Maxime Leroy +Upstream: https://github.com/FRRouting/frr/pull/19366 +--- + configure.ac | 1 + + lib/event.c | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 87eba6784a..b8ef7bb777 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1369,6 +1369,7 @@ dnl --------------- + AC_CHECK_FUNCS([ \ + strlcat strlcpy \ + getgrouplist \ ++ getloadavg \ + openat \ + unlinkat \ + posix_fallocate \ +diff --git a/lib/event.c b/lib/event.c +index 1eb41d07ce..22876574fb 100644 +--- a/lib/event.c ++++ b/lib/event.c +@@ -1924,7 +1924,11 @@ static void event_tardy_warn(struct event *thread, unsigned long since_us) + double loadavg[3]; + int rv; + ++#ifdef HAVE_GETLOADAVG + rv = getloadavg(loadavg, array_size(loadavg)); ++#else ++ rv = -1; ++#endif + if (rv < 0) + bprintfrr(&fb, "not available"); + else { +-- +2.43.0 + diff --git a/package/frr/Config.in b/package/frr/Config.in index c26b160b2a..6c26b6d2e1 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -1,19 +1,15 @@ config BR2_PACKAGE_FRR bool "frr" - depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread depends on !BR2_STATIC_LIBS # libyang depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libyang - depends on BR2_INSTALL_LIBSTDCPP # protobuf-c - depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c - depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBYANG select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C - select BR2_PACKAGE_PROTOBUF_C help The FRRouting Protocol Suite. @@ -24,23 +20,51 @@ config BR2_PACKAGE_FRR if BR2_PACKAGE_FRR +config BR2_PACKAGE_FRR_BFD + bool "BFD protocol" + default y + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + help + Build Bidirectional Forwarding Detection daemon. + config BR2_PACKAGE_FRR_BMP bool "BMP protocol" select BR2_PACKAGE_C_ARES help Build BGP Monitoring Protocol daemon. +config BR2_PACKAGE_FRR_MULTIPATH_MAX + int "maximum ECMP paths" + default 256 + range 1 999 + help + Compile FRR with support for up to this many equal-cost + next-hops (ECMP). + config BR2_PACKAGE_FRR_NHRPD bool "NHRPD protocol" select BR2_PACKAGE_C_ARES help Build Next Hop Routing Protocol daemon. +config BR2_PACKAGE_FRR_PROTOBUF + bool "Protobuf support (Binary-FPM and MLAG)" + default y + depends on BR2_INSTALL_LIBSTDCPP # protobuf-c + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c + select BR2_PACKAGE_PROTOBUF_C + help + Build FRR with protobuf-based Binary-FPM export and MLAG + peer synchronization. + endif -comment "frr needs a toolchain w/ threads, dynamic library, C++, host gcc >= 7" - depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS +comment "frr needs a toolchain w/ threads, dynamic library" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "protobuf support for frr needs a toolchain w/ protobuf, C++, host gcc >= 7" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/frr/frr.hash b/package/frr/frr.hash index ea88fcef9b..12030a0df8 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a23ab9aba5c45d919f9c6d14febfad8a797b7f63272bde4009c70ff77aac3a77 frr-9.1.2.tar.gz +sha256 8e4003eaba168626c5ea7a6735f2c85c87b04214e6f8c8f2715b21f8ae40970b frr-10.4.1.tar.gz sha256 7bf053957d6c38e39a06a112c60ff35b228d3bd03edbe8c9a03508b051128d16 COPYING sha256 f9e0c21faf738da586281c0beaad3cd56204c19085a10fe05e4d3d7f8b5863d2 doc/licenses/BSD-2-Clause sha256 aca297b8fd3a43e3bb200f1e2e043c0db6c897325f5ff7f23f7530302a6bf713 doc/licenses/BSD-3-Clause diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 921ef99665..e41ee33caa 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 9.1.2 +FRR_VERSION = 10.4.1 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0+ FRR_LICENSE_FILES = \ @@ -25,7 +25,6 @@ FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES FRR_DEPENDENCIES = host-frr readline json-c libyang \ - protobuf-c \ $(if $(BR2_PACKAGE_C_ARES),c-ares) \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) @@ -38,14 +37,11 @@ FRR_CONF_ENV = \ # Do not enable -fplugin=frr-format for production, see doc/developer/workflow.rst, # it is only intended for FRR's developments FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ - --sysconfdir=/etc/frr \ - --localstatedir=/var/run/frr \ --with-moduledir=/usr/lib/frr/modules \ --enable-configfile-mask=0640 \ --enable-logfile-mask=0640 \ - --enable-multipath=256 \ + --enable-multipath=$(BR2_PACKAGE_FRR_MULTIPATH_MAX) \ --disable-ospfclient \ - --enable-shell-access \ --enable-user=frr \ --enable-group=frr \ --enable-vty-group=frrvty \ @@ -86,6 +82,20 @@ else FRR_CONF_OPTS += --disable-zeromq endif +ifeq ($(BR2_PACKAGE_FRR_BFD),y) +FRR_CONF_OPTS += --enable-bfdd +else +FRR_CONF_OPTS += --disable-bfdd +endif + +# Optional protobuf support +ifeq ($(BR2_PACKAGE_FRR_PROTOBUF),y) +FRR_DEPENDENCIES += protobuf-c +FRR_CONF_OPTS += --enable-protobuf +else +FRR_CONF_OPTS += --disable-protobuf +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) FRR_CONF_ENV += LIBS=-latomic endif diff --git a/package/fscryptctl/fscryptctl.hash b/package/fscryptctl/fscryptctl.hash index 0dcca6893e..fb6cc27326 100644 --- a/package/fscryptctl/fscryptctl.hash +++ b/package/fscryptctl/fscryptctl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3828d5ad9b93664b9fec0174fc5d8e96d7b021a7896da74efe18fabe5f01d638 fscryptctl-1.0.0.tar.gz +sha256 192e25733006b05592fd87038a3a51a014db22f462ce0b24d47c30e66d03ea2c fscryptctl-1.2.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/fscryptctl/fscryptctl.mk b/package/fscryptctl/fscryptctl.mk index 0546f67a1f..d235bf4540 100644 --- a/package/fscryptctl/fscryptctl.mk +++ b/package/fscryptctl/fscryptctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -FSCRYPTCTL_VERSION = 1.0.0 +FSCRYPTCTL_VERSION = 1.2.0 FSCRYPTCTL_SITE = $(call github,google,fscryptctl,v$(FSCRYPTCTL_VERSION)) FSCRYPTCTL_LICENSE = Apache-2.0 FSCRYPTCTL_LICENSE_FILES = LICENSE diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 6c9f9dc76b..3f04288fb8 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: https://fwts.ubuntu.com/release/SHA256SUMS -sha256 4f352dedd630217a3551bb4f6e8d61f8514be457d37b90c936c3b6cfb6a6fa7e fwts-V24.09.00.tar.gz +sha256 ecba21d367b1c7aea41b378ad8fd3d43706c0fa4033cc31b59f8152c9cc0d69e fwts-V25.09.00.tar.gz # Hash for license file -sha256 3cd2c5d12f024ff2aa203e37d7e972c4d5ab7bf1a65e3e09aebccf71e64b525b debian/copyright +sha256 77a5f0ea48e53ee8d67aecc7759cf468bcd340c1caca711ed4307b477a93fb47 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 91b5e613dc..f8537fbcf5 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,10 +4,9 @@ # ################################################################################ -FWTS_VERSION = 24.09.00 +FWTS_VERSION = 25.09.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release -FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom FWTS_LICENSE_FILES = debian/copyright FWTS_AUTORECONF = YES diff --git a/package/fwupd-efi/fwupd-efi.hash b/package/fwupd-efi/fwupd-efi.hash index 35dc9625ca..42f9eb83ff 100644 --- a/package/fwupd-efi/fwupd-efi.hash +++ b/package/fwupd-efi/fwupd-efi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 afd0805a2ad081a7caff2ef5bc004ce3a0147b538015e8eca966341716b1260e fwupd-efi-1.6.tar.xz +sha256 96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff fwupd-efi-1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/fwupd-efi/fwupd-efi.mk b/package/fwupd-efi/fwupd-efi.mk index 45eeb8d824..fbff5a9043 100644 --- a/package/fwupd-efi/fwupd-efi.mk +++ b/package/fwupd-efi/fwupd-efi.mk @@ -4,9 +4,8 @@ # ################################################################################ -FWUPD_EFI_VERSION = 1.6 -FWUPD_EFI_SITE = https://github.com/fwupd/fwupd-efi/releases/download/$(FWUPD_EFI_VERSION) -FWUPD_EFI_SOURCE = fwupd-efi-$(FWUPD_EFI_VERSION).tar.xz +FWUPD_EFI_VERSION = 1.7 +FWUPD_EFI_SITE = $(call github,fwupd,fwupd-efi,$(FWUPD_EFI_VERSION)) FWUPD_EFI_LICENSE = LGPL-2.1+ FWUPD_EFI_LICENSE_FILES = COPYING FWUPD_EFI_INSTALL_STAGING = YES diff --git a/package/fwupd/Config.in b/package/fwupd/Config.in index 6a96358e5b..778f59bbeb 100644 --- a/package/fwupd/Config.in +++ b/package/fwupd/Config.in @@ -2,11 +2,13 @@ config BR2_PACKAGE_FWUPD bool "fwupd" depends on !BR2_STATIC_LIBS # libxmlb depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # libglib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBJCAT select BR2_PACKAGE_LIBXMLB + select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_ZLIB help Fwupd is a simple daemon to allow session software @@ -14,6 +16,7 @@ config BR2_PACKAGE_FWUPD https://fwupd.org/ -comment "fwupd needs a toolchain w/ wchar, threads, dynamic library" +comment "fwupd needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/fwupd/fwupd.hash b/package/fwupd/fwupd.hash index 8da9dc3c66..c3c21491d5 100644 --- a/package/fwupd/fwupd.hash +++ b/package/fwupd/fwupd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b86a2d7fe1b6cc0ac4f75f3351a78cb3c225880c9e20b932fa078ef472e9fcb2 fwupd-1.9.20.tar.xz +sha256 06a621a9276eca70d8613b114af0c861890ac369d064a28377878e09617e36ce fwupd-2.0.4.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/fwupd/fwupd.mk b/package/fwupd/fwupd.mk index 9283eb43aa..d143740c43 100644 --- a/package/fwupd/fwupd.mk +++ b/package/fwupd/fwupd.mk @@ -4,16 +4,18 @@ # ################################################################################ -FWUPD_VERSION = 1.9.20 +FWUPD_VERSION = 2.0.4 FWUPD_SITE = https://github.com/fwupd/fwupd/releases/download/$(FWUPD_VERSION) FWUPD_SOURCE = fwupd-$(FWUPD_VERSION).tar.xz FWUPD_LICENSE = LGPL-2.1+ FWUPD_LICENSE_FILES = COPYING +FWUPD_CPE_ID_VENDOR = fwupd FWUPD_DEPENDENCIES = \ host-pkgconf \ host-python-jinja2 \ libglib2 \ libjcat \ + libusb \ libxmlb \ zlib @@ -24,34 +26,46 @@ FWUPD_CONF_OPTS = \ -Ddocs=disabled \ -Dlvfs=true \ -Dman=false \ - -Dgusb=disabled \ -Dpassim=disabled \ -Dp2p_policy=none \ -Dcbor=disabled \ -Dplugin_acpi_phat=enabled \ + -Dplugin_android_boot=enabled \ + -Dplugin_bcm57xx=enabled \ -Dplugin_cfu=disabled \ + -Dplugin_emmc=enabled \ -Dplugin_ep963x=enabled \ -Dplugin_fastboot=disabled \ + -Dplugin_igsc=enabled \ + -Dplugin_intel_me=enabled \ + -Dplugin_kinetic_dp=enabled \ -Dplugin_logitech_bulkcontroller=disabled \ -Dplugin_logitech_scribe=disabled \ -Dplugin_logitech_tap=disabled \ + -Dplugin_mediatek_scaler=enabled \ + -Dplugin_mtd=enabled \ + -Dplugin_nitrokey=enabled \ + -Dplugin_parade_lspcon=enabled \ -Dplugin_pixart_rf=enabled \ + -Dplugin_powerd=enabled \ + -Dplugin_realtek_mst=enabled \ + -Dplugin_scsi=enabled \ + -Dplugin_synaptics_mst=enabled \ -Dplugin_tpm=disabled \ -Dplugin_uefi_capsule=enabled \ -Dplugin_uefi_capsule_splash=false \ - -Dplugin_nitrokey=enabled \ - -Dplugin_mtd=enabled \ - -Dplugin_intel_me=enabled \ + -Dplugin_uf2=enabled \ -Dplugin_upower=enabled \ - -Dplugin_powerd=enabled \ -Dqubes=false \ -Dsupported_build=enabled \ -Dlaunchd=disabled \ -Dtests=false \ + -Dumockdev_tests=disabled \ -Dmetainfo=true \ -Dfish_completion=false \ - -Dcompat_cli=false \ - -Dthinklmi_compat=false \ + -Dudev=enabled \ + -Dvendor_ids_dir=/usr/share/hwdata \ + -Dvendor_metadata=false \ -Dpython="$(HOST_DIR)/bin/python3" ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) @@ -68,41 +82,6 @@ else FWUPD_CONF_OPTS += -Dlibarchive=disabled endif -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -FWUPD_DEPENDENCIES += libgudev -FWUPD_CONF_OPTS += \ - -Dgudev=enabled \ - -Dplugin_android_boot=enabled \ - -Dplugin_bcm57xx=enabled \ - -Dplugin_emmc=enabled \ - -Dplugin_gpio=enabled \ - -Dplugin_igsc=enabled \ - -Dplugin_kinetic_dp=enabled \ - -Dplugin_parade_lspcon=enabled \ - -Dplugin_realtek_mst=enabled \ - -Dplugin_synaptics_mst=enabled \ - -Dplugin_mediatek_scaler=enabled \ - -Dplugin_scsi=enabled \ - -Dplugin_nvme=enabled \ - -Dplugin_uf2=enabled -else -FWUPD_CONF_OPTS += \ - -Dgudev=disabled \ - -Dplugin_android_boot=disabled \ - -Dplugin_bcm57xx=disabled \ - -Dplugin_emmc=disabled \ - -Dplugin_gpio=disabled \ - -Dplugin_igsc=disabled \ - -Dplugin_kinetic_dp=disabled \ - -Dplugin_parade_lspcon=disabled \ - -Dplugin_realtek_mst=disabled \ - -Dplugin_synaptics_mst=disabled \ - -Dplugin_mediatek_scaler=disabled \ - -Dplugin_scsi=disabled \ - -Dplugin_nvme=disabled \ - -Dplugin_uf2=disabled -endif - ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) FWUPD_DEPENDENCIES += bluez5_utils FWUPD_CONF_OPTS += -Dbluez=enabled @@ -134,20 +113,29 @@ endif ifeq ($(BR2_PACKAGE_XZ),y) FWUPD_DEPENDENCIES += xz FWUPD_CONF_OPTS += -Dlzma=enabled -ifeq ($(BR2_i386)$(BR2_x86_64),y) -FWUPD_CONF_OPTS += -Dplugin_intel_spi=true else -FWUPD_CONF_OPTS += -Dplugin_intel_spi=false -endif -else -FWUPD_CONF_OPTS += -Dlzma=disabled -Dplugin_intel_spi=false +FWUPD_CONF_OPTS += -Dlzma=disabled endif -ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU)$(BR2_PACKAGE_LIBGUDEV),yy) -FWUPD_DEPENDENCIES += libdrm libgudev -FWUPD_CONF_OPTS += -Dplugin_amdgpu=enabled +ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU),y) +FWUPD_DEPENDENCIES += libdrm +FWUPD_CONF_OPTS += -Dlibdrm=enabled -Dplugin_amdgpu=enabled else -FWUPD_CONF_OPTS += -Dplugin_amdgpu=disabled +FWUPD_CONF_OPTS += -Dlibdrm=disabled -Dplugin_amdgpu=disabled +endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +FWUPD_DEPENDENCIES += util-linux +FWUPD_CONF_OPTS += -Dblkid=enabled +else +FWUPD_CONF_OPTS += -Dblkid=disabled +endif + +ifeq ($(BR2_PACKAGE_VALGRIND),y) +FWUPD_DEPENDENCIES += valgrind +FWUPD_CONF_OPTS += -Dvalgrind=enabled +else +FWUPD_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_i386)$(BR2_x86_64),y) @@ -156,8 +144,8 @@ else FWUPD_CONF_OPTS += -Dplugin_cpu=disabled -Dplugin_msr=disabled -Dhsi=disabled endif -ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGUDEV),yy) -FWUPD_DEPENDENCIES += gnutls libgudev +ifeq ($(BR2_PACKAGE_GNUTLS),y) +FWUPD_DEPENDENCIES += gnutls FWUPD_CONF_OPTS += -Dplugin_synaptics_rmi=enabled else FWUPD_CONF_OPTS += -Dplugin_synaptics_rmi=disabled @@ -170,8 +158,8 @@ else FWUPD_CONF_OPTS += -Dplugin_redfish=disabled -Dcurl=disabled endif -ifeq ($(BR2_PACKAGE_LIBGUDEV)$(BR2_PACKAGE_LIBMBIM)$(BR2_PACKAGE_LIBQMI)$(BR2_PACKAGE_MODEM_MANAGER),yyyy) -FWUPD_DEPENDENCIES += libgudev libmbim libqmi modem-manager +ifeq ($(BR2_PACKAGE_LIBMBIM)$(BR2_PACKAGE_LIBQMI)$(BR2_PACKAGE_MODEM_MANAGER),yyyy) +FWUPD_DEPENDENCIES += libmbim libqmi modem-manager FWUPD_CONF_OPTS += -Dplugin_modem_manager=enabled else FWUPD_CONF_OPTS += -Dplugin_modem_manager=disabled @@ -184,11 +172,26 @@ else FWUPD_CONF_OPTS += -Dplugin_flashrom=disabled endif +# plugin_nvme needs (introduced in Kernel v4.5) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5),y) +FWUPD_CONF_OPTS += -Dplugin_nvme=enabled +else +FWUPD_CONF_OPTS += -Dplugin_nvme=disabled +endif + +# plugin_gpio needs and GPIOv2 interface (introduced in +# Kernel v5.10) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) +FWUPD_CONF_OPTS += -Dplugin_gpio=enabled +else +FWUPD_CONF_OPTS += -Dplugin_gpio=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) FWUPD_DEPENDENCIES += systemd -FWUPD_CONF_OPTS += -Dsystemd=enabled -Delogind=enabled -Doffline=enabled +FWUPD_CONF_OPTS += -Dsystemd=enabled -Dsystemd_syscall_filter=true -Delogind=enabled else -FWUPD_CONF_OPTS += -Dsystemd=disabled -Delogind=disabled -Doffline=disabled +FWUPD_CONF_OPTS += -Dsystemd=disabled -Dsystemd_syscall_filter=false -Delogind=disabled endif ifeq ($(BR2_PACKAGE_FWUPD_EFI),y) diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index b029ab330d..b658359257 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.3.1.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.3.2.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 694db764812a6236423d4ff40ceb7b6c4c441301b72ad502bb5c27e00cd56f78 gawk-5.3.1.tar.xz +sha256 f8c3486509de705192138b00ef2c00bbbdd0e84c30d5c07d23fc73a9dc4cc9cc gawk-5.3.2.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index fbb620be7d..40b0672da2 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.3.1 +GAWK_VERSION = 5.3.2 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk diff --git a/package/gcc-bare-metal/gcc-bare-metal.hash b/package/gcc-bare-metal/gcc-bare-metal.hash deleted file mode 120000 index d417b0dc77..0000000000 --- a/package/gcc-bare-metal/gcc-bare-metal.hash +++ /dev/null @@ -1 +0,0 @@ -../gcc/gcc.hash \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.hash b/package/gcc-bare-metal/gcc-bare-metal.hash new file mode 100644 index 0000000000..19678dec30 --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.hash @@ -0,0 +1,8 @@ +# From https://gcc.gnu.org/pub/gcc/releases/gcc-15.2.0/sha512.sum +sha512 89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de gcc-15.2.0.tar.xz + +# Locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING3.LIB +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index adaae6c307..6c2c8a5e26 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GCC_BARE_METAL_VERSION = 14.2.0 +GCC_BARE_METAL_VERSION = 15.2.0 GCC_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_BARE_METAL_VERSION) GCC_BARE_METAL_SOURCE = gcc-$(GCC_BARE_METAL_VERSION).tar.xz @@ -20,15 +20,9 @@ HOST_GCC_BARE_METAL_DEPENDENCIES = \ host-mpfr \ host-isl -# gcc doesn't support in-tree build, so we create a 'build' -# subdirectory in the gcc sources, and build from there. -define HOST_GCC_BARE_METAL_CONFIGURE_SYMLINK - mkdir -p $(@D)/build - ln -sf ../configure $(@D)/build/configure -endef - -HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += HOST_GCC_BARE_METAL_CONFIGURE_SYMLINK -HOST_GCC_BARE_METAL_SUBDIR = build +# Don't build documentation. It takes up extra space / build time, +# and sometimes needs specific makeinfo versions to work +HOST_GCC_BARE_METAL_CONF_ENV = MAKEINFO=missing HOST_GCC_BARE_METAL_MAKE_OPTS = \ $(HOST_GCC_COMMON_MAKE_OPTS) \ @@ -37,9 +31,20 @@ HOST_GCC_BARE_METAL_MAKE_OPTS = \ HOST_GCC_BARE_METAL_INSTALL_OPTS = install-gcc install-target-libgcc +ifeq ($(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_MULTILIB),y) +HOST_GCC_BARE_METAL_MULTILIB = "--enable-multilib" +else +HOST_GCC_BARE_METAL_MULTILIB = "--disable-multilib" +endif + HOST_GCC_BARE_METAL_CONF_OPTS = \ - --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ - --disable-initfini_array \ + --prefix=$(HOST_DIR) \ + --sysconfdir=$(HOST_DIR)/etc \ + --localstatedir=$(HOST_DIR)/var \ + $(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ + $(QUIET) \ + --disable-shared \ + --disable-initfini-array \ --disable-__cxa_atexit \ --disable-libstdcxx-pch \ --with-newlib \ @@ -50,13 +55,42 @@ HOST_GCC_BARE_METAL_CONF_OPTS = \ --without-long-double-128 \ --without-headers \ --enable-languages=c \ - --disable-multilib \ + $(HOST_GCC_BARE_METAL_MULTILIB) \ --with-gmp=$(HOST_DIR) \ --with-mpc=$(HOST_DIR) \ --with-mpfr=$(HOST_DIR) \ - --with-isl=$(HOST_DIR) \ - --with-sysroot=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) \ - AR_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ar \ - RANLIB_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ranlib + --with-isl=$(HOST_DIR) + +define HOST_GCC_BARE_METAL_CONFIGURE_CMDS + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + mkdir -p $(@D)/build-$(arch_tuple) && \ + cd $(@D)/build-$(arch_tuple) && \ + $(HOST_CONFIGURE_OPTS) \ + $(HOST_GCC_BARE_METAL_CONF_ENV) \ + CONFIG_SITE=/dev/null \ + $(@D)/configure \ + $(HOST_GCC_BARE_METAL_CONF_OPTS) \ + --target=$(arch_tuple) \ + --with-sysroot=$(HOST_DIR)/$(arch_tuple)/sysroot \ + AR_FOR_TARGET=$(HOST_DIR)/bin/$(arch_tuple)-ar \ + RANLIB_FOR_TARGET=$(HOST_DIR)/bin/$(arch_tuple)-ranlib + ) +endef + +define HOST_GCC_BARE_METAL_BUILD_CMDS + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + $(HOST_MAKE_ENV) $(MAKE) \ + $(HOST_GCC_BARE_METAL_MAKE_OPTS) \ + -C $(@D)/build-$(arch_tuple) + ) +endef + +define HOST_GCC_BARE_METAL_INSTALL_CMDS + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + $(HOST_MAKE_ENV) $(MAKE) \ + $(HOST_GCC_BARE_METAL_INSTALL_OPTS) \ + -C $(@D)/build-$(arch_tuple) + ) +endef $(eval $(host-autotools-package)) diff --git a/package/gcc/13.4.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/13.4.0/0001-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 0000000000..e801085dad --- /dev/null +++ b/package/gcc/13.4.0/0001-disable-split-stack-for-non-thread-builds.patch @@ -0,0 +1,26 @@ +From 4f67134e0b1404fef4ea72342be8fab4c37ca8c8 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 25 Jul 2022 00:29:55 +0200 +Subject: [PATCH] disable split-stack for non-thread builds + +Signed-off-by: Waldemar Brodkorb +[Romain: convert to git format] +Signed-off-by: Romain Naour +--- + libgcc/config/t-stack | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack +index cc0366b4cd8..f3f97e86d60 100644 +--- a/libgcc/config/t-stack ++++ b/libgcc/config/t-stack +@@ -1,4 +1,6 @@ + # Makefile fragment to provide generic support for -fsplit-stack. + # This should be used in config.host for any host which supports + # -fsplit-stack. ++ifeq ($(enable_threads),yes) + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c ++endif +-- +2.34.3 + diff --git a/package/gcc/13.4.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch b/package/gcc/13.4.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch new file mode 100644 index 0000000000..4368f08404 --- /dev/null +++ b/package/gcc/13.4.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch @@ -0,0 +1,48 @@ +From e5253b777eefef7d66d3bd1c641de6d133d3573d Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2023 14:21:55 +0200 +Subject: [PATCH] RISC-V: fix build issue with gcc 4.9.x + +GCC should still build with GCC 4.8.3 or newer [1] +using C++03 by default. But a recent change in +RISC-V port introduced a C++11 feature "std::log2" [2]. + +Use log2 from the C header, without the namespace [3]. + +[1] https://gcc.gnu.org/install/prerequisites.html +[2] https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=7caa1ae5e451e780fbc4746a54e3f19d4f4304dc +[3] https://stackoverflow.com/questions/26733413/error-log2-is-not-a-member-of-std + +Fixes: +https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276589 + +gcc/ChangeLog: + * config/riscv/genrvv-type-indexer.cc: Use log2 from the C header, without + the namespace. + +Signed-off-by: Romain Naour +Upstream: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=87c347c2897537a6aa391efbfc5ed00c625434fe +Signed-off-by: Romain Naour +--- + gcc/config/riscv/genrvv-type-indexer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/riscv/genrvv-type-indexer.cc b/gcc/config/riscv/genrvv-type-indexer.cc +index e677b55290c..eebe382d1c3 100644 +--- a/gcc/config/riscv/genrvv-type-indexer.cc ++++ b/gcc/config/riscv/genrvv-type-indexer.cc +@@ -115,9 +115,9 @@ same_ratio_eew_type (unsigned sew, int lmul_log2, unsigned eew, bool unsigned_p, + if (sew == eew) + elmul_log2 = lmul_log2; + else if (sew > eew) +- elmul_log2 = lmul_log2 - std::log2 (sew / eew); ++ elmul_log2 = lmul_log2 - log2 (sew / eew); + else /* sew < eew */ +- elmul_log2 = lmul_log2 + std::log2 (eew / sew); ++ elmul_log2 = lmul_log2 + log2 (eew / sew); + + if (float_p) + return floattype (eew, elmul_log2); +-- +2.34.3 + diff --git a/package/gcc/13.4.0/0003-Remove-crypt-and-crypt_r-interceptors.patch b/package/gcc/13.4.0/0003-Remove-crypt-and-crypt_r-interceptors.patch new file mode 100644 index 0000000000..98bfed5949 --- /dev/null +++ b/package/gcc/13.4.0/0003-Remove-crypt-and-crypt_r-interceptors.patch @@ -0,0 +1,146 @@ +From 3521d93c552a11640a959ee61d551c225981c448 Mon Sep 17 00:00:00 2001 +From: Fangrui Song +Date: Fri, 28 Apr 2023 09:59:17 -0700 +Subject: [PATCH] Remove crypt and crypt_r interceptors + +From Florian Weimer's D144073 + +> On GNU/Linux (glibc), the crypt and crypt_r functions are not part of the main shared object (libc.so.6), but libcrypt (with multiple possible sonames). The sanitizer libraries do not depend on libcrypt, so it can happen that during sanitizer library initialization, no real implementation will be found because the crypt, crypt_r functions are not present in the process image (yet). If its interceptors are called nevertheless, this results in a call through a null pointer when the sanitizer library attempts to forward the call to the real implementation. +> +> Many distributions have already switched to libxcrypt, a library that is separate from glibc and that can be build with sanitizers directly (avoiding the need for interceptors). This patch disables building the interceptor for glibc targets. + +Let's remove crypt and crypt_r interceptors (D68431) to fix issues with +newer glibc. + +For older glibc, msan will not know that an uninstrumented crypt_r call +initializes `data`, so there is a risk for false positives. However, with some +codebase survey, I think crypt_r uses are very few and the call sites typically +have a `memset(&data, 0, sizeof(data));` anyway. + +Fix https://github.com/google/sanitizers/issues/1365 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2169432 + +Reviewed By: #sanitizers, fweimer, thesamesam, vitalybuka + +Differential Revision: https://reviews.llvm.org/D149403 + +[Thomas: taken from Crosstool-NG] +Upstream: (llvm) https://github.com/llvm/llvm-project/commit/d7bead833631486e337e541e692d9b4a1ca14edd +Upstream: (gcc) https://github.com/gcc-mirror/gcc/commit/d96e14ceb9475f9bccbbc0325d5b11419fad9246 +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common_interceptors.inc | 37 ------------------- + .../sanitizer_platform_interceptors.h | 2 - + .../sanitizer_platform_limits_posix.cpp | 8 ---- + .../sanitizer_platform_limits_posix.h | 1 - + 4 files changed, 48 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +index ba4b80081f0..662c4199742 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +@@ -10187,41 +10187,6 @@ INTERCEPTOR(SSIZE_T, getrandom, void *buf, SIZE_T buflen, unsigned int flags) { + #define INIT_GETRANDOM + #endif + +-#if SANITIZER_INTERCEPT_CRYPT +-INTERCEPTOR(char *, crypt, char *key, char *salt) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt, key, salt); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt)(key, salt); +- if (res != nullptr) +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- return res; +-} +-#define INIT_CRYPT COMMON_INTERCEPT_FUNCTION(crypt); +-#else +-#define INIT_CRYPT +-#endif +- +-#if SANITIZER_INTERCEPT_CRYPT_R +-INTERCEPTOR(char *, crypt_r, char *key, char *salt, void *data) { +- void *ctx; +- COMMON_INTERCEPTOR_ENTER(ctx, crypt_r, key, salt, data); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, key, internal_strlen(key) + 1); +- COMMON_INTERCEPTOR_READ_RANGE(ctx, salt, internal_strlen(salt) + 1); +- char *res = REAL(crypt_r)(key, salt, data); +- if (res != nullptr) { +- COMMON_INTERCEPTOR_WRITE_RANGE(ctx, data, +- __sanitizer::struct_crypt_data_sz); +- COMMON_INTERCEPTOR_INITIALIZE_RANGE(res, internal_strlen(res) + 1); +- } +- return res; +-} +-#define INIT_CRYPT_R COMMON_INTERCEPT_FUNCTION(crypt_r); +-#else +-#define INIT_CRYPT_R +-#endif +- + #if SANITIZER_INTERCEPT_GETENTROPY + INTERCEPTOR(int, getentropy, void *buf, SIZE_T buflen) { + void *ctx; +@@ -10772,8 +10737,6 @@ static void InitializeCommonInterceptors() { + INIT_GETUSERSHELL; + INIT_SL_INIT; + INIT_GETRANDOM; +- INIT_CRYPT; +- INIT_CRYPT_R; + INIT_GETENTROPY; + INIT_QSORT; + INIT_QSORT_R; +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +index 8307b1ec28b..d50166ee6ce 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_interceptors.h +@@ -571,8 +571,6 @@ + #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD + #define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_ANDROID) + #define SANITIZER_INTERCEPT_SL_INIT (SI_FREEBSD || SI_NETBSD) +-#define SANITIZER_INTERCEPT_CRYPT (SI_POSIX && !SI_ANDROID) +-#define SANITIZER_INTERCEPT_CRYPT_R (SI_LINUX && !SI_ANDROID) + + #define SANITIZER_INTERCEPT_GETRANDOM \ + ((SI_LINUX && __GLIBC_PREREQ(2, 25)) || SI_FREEBSD) +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index c85cf1626a7..bcbd143d19d 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -176,10 +176,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include "sanitizer_platform_interceptors.h" + # include "sanitizer_platform_limits_posix.h" + +-#if SANITIZER_INTERCEPT_CRYPT_R +-#include +-#endif +- + namespace __sanitizer { + unsigned struct_utsname_sz = sizeof(struct utsname); + unsigned struct_stat_sz = sizeof(struct stat); +@@ -283,10 +279,6 @@ namespace __sanitizer { + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + +-#if SANITIZER_INTERCEPT_CRYPT_R +- unsigned struct_crypt_data_sz = sizeof(struct crypt_data); +-#endif +- + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_timex_sz = sizeof(struct timex); + unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 44dd3d9e22d..29ebb304a9b 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -319,7 +319,6 @@ extern unsigned struct_msqid_ds_sz; + extern unsigned struct_mq_attr_sz; + extern unsigned struct_timex_sz; + extern unsigned struct_statvfs_sz; +-extern unsigned struct_crypt_data_sz; + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID + + struct __sanitizer_iovec { +-- +2.43.0 + diff --git a/package/gcc/13.4.0/0004-libsanitizer-Fix-build-with-glibc-2.42.patch b/package/gcc/13.4.0/0004-libsanitizer-Fix-build-with-glibc-2.42.patch new file mode 100644 index 0000000000..13f7f469c4 --- /dev/null +++ b/package/gcc/13.4.0/0004-libsanitizer-Fix-build-with-glibc-2.42.patch @@ -0,0 +1,81 @@ +From d32ece49d32b00448d967e7dbc6900fb25cbc775 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 2 May 2025 17:41:43 +0200 +Subject: [PATCH] libsanitizer: Fix build with glibc 2.42 + +The termio structure will be removed from glibc 2.42. It has +been deprecated since the late 80s/early 90s. + +Cherry-picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763 +("[sanitizer_common] Remove interceptors for deprecated struct termio +(#137403)"). + +Co-Authored-By: Tom Stellard + +libsanitizer/ + + * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry + picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763. + * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. + * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. + +Upstream: 1789c57dc97ea2f9819ef89e28bf17208b6208e7 (gcc master branch) +Upstream: d32ece49d32b00448d967e7dbc6900fb25cbc775 (gcc 15.x branch) +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common_interceptors_ioctl.inc | 8 -------- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 3 --- + .../sanitizer_common/sanitizer_platform_limits_posix.h | 1 - + 3 files changed, 12 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 49ec4097c90..dda11daa77f 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -338,17 +338,9 @@ static void ioctl_table_fill() { + _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int)); + _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int)); + _(TCFLSH, NONE, 0); +-#if SANITIZER_GLIBC +- _(TCGETA, WRITE, struct_termio_sz); +-#endif + _(TCGETS, WRITE, struct_termios_sz); + _(TCSBRK, NONE, 0); + _(TCSBRKP, NONE, 0); +-#if SANITIZER_GLIBC +- _(TCSETA, READ, struct_termio_sz); +- _(TCSETAF, READ, struct_termio_sz); +- _(TCSETAW, READ, struct_termio_sz); +-#endif + _(TCSETS, READ, struct_termios_sz); + _(TCSETSF, READ, struct_termios_sz); + _(TCSETSW, READ, struct_termios_sz); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index c87d5ef42c9..7bbc6f2edac 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -485,9 +485,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_input_id_sz = sizeof(struct input_id); + unsigned struct_mtpos_sz = sizeof(struct mtpos); + unsigned struct_rtentry_sz = sizeof(struct rtentry); +-#if SANITIZER_GLIBC || SANITIZER_ANDROID +- unsigned struct_termio_sz = sizeof(struct termio); +-#endif + unsigned struct_vt_consize_sz = sizeof(struct vt_consize); + unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); + unsigned struct_vt_stat_sz = sizeof(struct vt_stat); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index c07f7cd0b0d..a80df656826 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -1029,7 +1029,6 @@ extern unsigned struct_hd_geometry_sz; + extern unsigned struct_input_absinfo_sz; + extern unsigned struct_input_id_sz; + extern unsigned struct_mtpos_sz; +-extern unsigned struct_termio_sz; + extern unsigned struct_vt_consize_sz; + extern unsigned struct_vt_sizes_sz; + extern unsigned struct_vt_stat_sz; +-- +2.50.1 + diff --git a/package/gcc/14.3.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/14.3.0/0001-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 0000000000..e801085dad --- /dev/null +++ b/package/gcc/14.3.0/0001-disable-split-stack-for-non-thread-builds.patch @@ -0,0 +1,26 @@ +From 4f67134e0b1404fef4ea72342be8fab4c37ca8c8 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 25 Jul 2022 00:29:55 +0200 +Subject: [PATCH] disable split-stack for non-thread builds + +Signed-off-by: Waldemar Brodkorb +[Romain: convert to git format] +Signed-off-by: Romain Naour +--- + libgcc/config/t-stack | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack +index cc0366b4cd8..f3f97e86d60 100644 +--- a/libgcc/config/t-stack ++++ b/libgcc/config/t-stack +@@ -1,4 +1,6 @@ + # Makefile fragment to provide generic support for -fsplit-stack. + # This should be used in config.host for any host which supports + # -fsplit-stack. ++ifeq ($(enable_threads),yes) + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c ++endif +-- +2.34.3 + diff --git a/package/gcc/14.3.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/14.3.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 0000000000..b9dfcd0d01 --- /dev/null +++ b/package/gcc/14.3.0/0002-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 71de45698f60f8feabc0e91336f1e2fb387902df Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2afe3..1b23fd4d512 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +-- +2.45.2 + diff --git a/package/gcc/14.3.0/0003-microblaze-add-atomic-test-and-set-support.patch b/package/gcc/14.3.0/0003-microblaze-add-atomic-test-and-set-support.patch new file mode 100644 index 0000000000..db6aefaef2 --- /dev/null +++ b/package/gcc/14.3.0/0003-microblaze-add-atomic-test-and-set-support.patch @@ -0,0 +1,286 @@ +From cd01b277c4a9e03c83427290228e4b289a169431 Mon Sep 17 00:00:00 2001 +From: Gopi Kumar Bulusu +Date: Thu, 10 Jul 2025 12:44:44 +0530 +Subject: [PATCH] MicroBlaze : Enhance support for atomics. Fix PR118280 + +Atomic support enhanced to fix existing atomic_compare_and_swapsi pattern +to handle side effects; new patterns atomic_fetch_op and atomic_test_and_set +added. As MicroBlaze has no QImode test/set instruction, use shift magic +to implement atomic_test_and_set. This fixes PR118280. + +Files Changed + +* gcc/config/microblaze/iterators.md: New +* microblaze-protos.h/microblaze.cc : Add microblaze_subword_address +* gcc/config/microblaze/microblaze.md: constants: Add UNSPECV_CAS_BOOL, + UNSPECV_CAS_MEM, UNSPECV_CAS_VAL, UNSPECV_ATOMIC_FETCH_OP + type: add atomic +* gcc/config/microblaze/sync.md: Add atomic_fetch_si + atomic_test_and_set + +Fixes: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 +Upstream: https://patchwork.ozlabs.org/project/gcc/list/?series=466193 + +Signed-off-by: Kirk Meyer +Signed-off-by: David Holsgrove +Signed-off-by: Gopi Kumar Bulusu +--- + gcc/config/microblaze/iterators.md | 25 +++++ + gcc/config/microblaze/microblaze-protos.h | 1 + + gcc/config/microblaze/microblaze.cc | 28 ++++++ + gcc/config/microblaze/microblaze.h | 2 +- + gcc/config/microblaze/microblaze.md | 7 +- + gcc/config/microblaze/sync.md | 107 ++++++++++++++++++---- + 6 files changed, 150 insertions(+), 20 deletions(-) + create mode 100644 gcc/config/microblaze/iterators.md + +diff --git a/gcc/config/microblaze/iterators.md b/gcc/config/microblaze/iterators.md +new file mode 100644 +index 00000000000..2ffc2422a0a +--- /dev/null ++++ b/gcc/config/microblaze/iterators.md +@@ -0,0 +1,25 @@ ++;; Iterator definitions for GCC MicroBlaze machine description files. ++;; Copyright (C) 2012-2024 Free Software Foundation, Inc. ++;; ++;; This file is part of GCC. ++;; ++;; GCC is free software; you can redistribute it and/or modify ++;; it under the terms of the GNU General Public License as published by ++;; the Free Software Foundation; either version 3, or (at your option) ++;; any later version. ++;; ++;; GCC is distributed in the hope that it will be useful, ++;; but WITHOUT ANY WARRANTY; without even the implied warranty of ++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++;; GNU General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public License ++;; along with GCC; see the file COPYING3. If not see ++;; . ++ ++; atomics code iterator ++(define_code_iterator any_atomic [plus ior xor and]) ++ ++; atomics code attribute ++(define_code_attr atomic_optab ++ [(plus "add") (ior "or") (xor "xor") (and "and")]) +diff --git a/gcc/config/microblaze/microblaze-protos.h b/gcc/config/microblaze/microblaze-protos.h +index 90b79cfe716..1cee0b3096c 100644 +--- a/gcc/config/microblaze/microblaze-protos.h ++++ b/gcc/config/microblaze/microblaze-protos.h +@@ -62,6 +62,7 @@ extern int symbol_mentioned_p (rtx); + extern int label_mentioned_p (rtx); + extern bool microblaze_cannot_force_const_mem (machine_mode, rtx); + extern void microblaze_eh_return (rtx op0); ++extern void microblaze_subword_address (rtx, rtx *, rtx *); + #endif /* RTX_CODE */ + + /* Declare functions in microblaze-c.cc. */ +diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc +index 2ab5ada4ec9..80d10ab60e0 100644 +--- a/gcc/config/microblaze/microblaze.cc ++++ b/gcc/config/microblaze/microblaze.cc +@@ -1299,6 +1299,34 @@ microblaze_expand_block_move (rtx dest, rtx src, rtx length, rtx align_rtx) + return false; + } + ++/* Compute memory address *aligned_mem and corresponding shift value (*shift) ++ from a QImode memory reference MEM */ ++void ++microblaze_subword_address (rtx mem, rtx *aligned_mem, rtx *shift) ++{ ++ /* Align the memory address to a word. */ ++ rtx addr = force_reg (Pmode, XEXP (mem, 0)); ++ ++ rtx addr_mask = gen_int_mode (-4, Pmode); ++ ++ rtx aligned_addr = gen_reg_rtx (Pmode); ++ ++ emit_move_insn (aligned_addr, gen_rtx_AND (Pmode, addr, addr_mask)); ++ ++ *aligned_mem = change_address (mem, SImode, aligned_addr); ++ ++ /* Calculate the shift amount. */ ++ emit_move_insn (*shift, gen_rtx_AND (SImode, addr, gen_int_mode (3, SImode))); ++ ++ if (TARGET_LITTLE_ENDIAN == 0) { ++ emit_move_insn (*shift, ++ gen_rtx_MINUS (SImode, gen_int_mode (3, SImode), *shift)); ++ } ++ ++ emit_move_insn (*shift, gen_rtx_ASHIFT (SImode, *shift, ++ gen_int_mode (3, SImode))); ++} ++ + static bool + microblaze_rtx_costs (rtx x, machine_mode mode, int outer_code ATTRIBUTE_UNUSED, + int opno ATTRIBUTE_UNUSED, int *total, +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2390542434b..b2e9ccde363 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -57,7 +57,7 @@ extern enum pipeline_type microblaze_pipe; + + /* Default target_flags if no switches are specified */ + #define TARGET_DEFAULT (MASK_SOFT_MUL | MASK_SOFT_DIV | MASK_SOFT_FLOAT \ +- | TARGET_ENDIAN_DEFAULT) ++ | TARGET_ENDIAN_DEFAULT) + + /* Do we have CLZ? */ + #define TARGET_HAS_CLZ (TARGET_PATTERN_COMPARE && microblaze_has_clz) +diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md +index 45c48a71e8d..270df8da0c5 100644 +--- a/gcc/config/microblaze/microblaze.md ++++ b/gcc/config/microblaze/microblaze.md +@@ -21,6 +21,7 @@ + + (include "constraints.md") + (include "predicates.md") ++(include "iterators.md") + + ;;---------------------------------------------------- + ;; Constants +@@ -43,6 +44,10 @@ + (UNSPEC_TLS 106) ;; jump table + (UNSPEC_SET_TEXT 107) ;; set text start + (UNSPEC_TEXT 108) ;; data text relative ++ (UNSPECV_CAS_BOOL 201) ;; compare and swap (bool) ++ (UNSPECV_CAS_VAL 202) ;; compare and swap (val) ++ (UNSPECV_CAS_MEM 203) ;; compare and swap (mem) ++ (UNSPECV_ATOMIC_FETCH_OP 204) ;; atomic fetch op + ]) + + (define_c_enum "unspec" [ +@@ -79,7 +84,7 @@ + ;; bshift Shift operations + + (define_attr "type" +- "unknown,branch,jump,call,load,store,move,arith,darith,imul,idiv,icmp,multi,nop,no_delay_arith,no_delay_load,no_delay_store,no_delay_imul,no_delay_move,bshift,fadd,frsub,fmul,fdiv,fcmp,fsl,fsqrt,fcvt,trap" ++ "unknown,branch,jump,call,load,store,move,arith,darith,imul,idiv,icmp,multi,nop,no_delay_arith,no_delay_load,no_delay_store,no_delay_imul,no_delay_move,bshift,fadd,frsub,fmul,fdiv,fcmp,fsl,fsqrt,fcvt,trap,atomic" + (const_string "unknown")) + + ;; Main data type used by the insn +diff --git a/gcc/config/microblaze/sync.md b/gcc/config/microblaze/sync.md +index db7b11e5379..6478ab6dcac 100644 +--- a/gcc/config/microblaze/sync.md ++++ b/gcc/config/microblaze/sync.md +@@ -18,26 +18,97 @@ + ;; . + + (define_insn "atomic_compare_and_swapsi" +- [(match_operand:SI 0 "register_operand" "=&d") ;; bool output +- (match_operand:SI 1 "register_operand" "=&d") ;; val output +- (match_operand:SI 2 "nonimmediate_operand" "+Q") ;; memory +- (match_operand:SI 3 "register_operand" "d") ;; expected value +- (match_operand:SI 4 "register_operand" "d") ;; desired value +- (match_operand:SI 5 "const_int_operand" "") ;; is_weak +- (match_operand:SI 6 "const_int_operand" "") ;; mod_s +- (match_operand:SI 7 "const_int_operand" "") ;; mod_f ++ [(set (match_operand:SI 0 "register_operand" "=&d") ;; bool output ++ (unspec_volatile:SI ++ [(match_operand:SI 2 "nonimmediate_operand" "+Q") ;; memory ++ (match_operand:SI 3 "register_operand" "d") ;; expected value ++ (match_operand:SI 4 "register_operand" "d")] ;; desired value ++ UNSPECV_CAS_BOOL)) ++ (set (match_operand:SI 1 "register_operand" "=&d") ;; val output ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_CAS_VAL)) ++ (set (match_dup 2) ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_CAS_MEM)) ++ (match_operand:SI 5 "const_int_operand" "") ;; is_weak ++ (match_operand:SI 6 "const_int_operand" "") ;; mod_s ++ (match_operand:SI 7 "const_int_operand" "") ;; mod_f + (clobber (match_scratch:SI 8 "=&d"))] + "" + { +- output_asm_insn ("addc \tr0,r0,r0", operands); +- output_asm_insn ("lwx \t%1,%y2,r0", operands); +- output_asm_insn ("addic\t%8,r0,0", operands); +- output_asm_insn ("bnei \t%8,.-8", operands); +- output_asm_insn ("cmp \t%0,%1,%3", operands); +- output_asm_insn ("bnei \t%0,.+16", operands); +- output_asm_insn ("swx \t%4,%y2,r0", operands); +- output_asm_insn ("addic\t%8,r0,0", operands); +- output_asm_insn ("bnei \t%8,.-28", operands); +- return ""; ++ return "add \t%0,r0,r0\n\t" ++ "lwx \t%1,%y2,r0\n\t" ++ "addic\t%8,r0,0\n\t" ++ "bnei \t%8,.-8\n\t" ++ "cmp \t%8,%1,%3\n\t" ++ "bnei \t%8,.+20\n\t" ++ "swx \t%4,%y2,r0\n\t" ++ "addic\t%8,r0,0\n\t" ++ "bnei \t%8,.-28\n\t" ++ "addi \t%0,r0,1"; + } ++ [(set_attr "type" "atomic") ++ (set_attr "mode" "SI") ++ (set_attr "length" "40")] + ) ++ ++;; ++;; ++;; ++;; ++(define_insn "atomic_fetch_si" ++ [(set (match_operand:SI 0 "register_operand" "=&d") ++ (match_operand:SI 1 "memory_operand" "+Q")) ++ (set (match_dup 1) ++ (unspec_volatile:SI ++ [(any_atomic:SI (match_dup 1) ++ (match_operand:SI 2 "register_operand" "d")) ++ (match_operand:SI 3 "const_int_operand")] ;; model ++ UNSPECV_ATOMIC_FETCH_OP)) ++ (clobber (match_scratch:SI 4 "=&d"))] ;; tmp_1 ++ "" ++ { ++ return ++ "lwx \t%0,%y1,r0\n\t" ++ "addic\t%4,r0,0\n\t" ++ "bnei \t%4,.-8\n\t" ++ "\t%4,%0,%2\n\t" ++ "swx \t%4,%y1,r0\n\t" ++ "addic\t%4,r0,0\n\t" ++ "bnei \t%4,.-24"; ++ } ++ [(set_attr "type" "atomic") ++ (set_attr "mode" "SI") ++ (set_attr "length" "28")]) ++ ++;; ++;; MicroBlaze only supports lx/sx instructions for word mode only ++;; ++;; Use shift|mask magic to implement atomic_test_and_set using lwx/swx ++;; ++(define_expand "atomic_test_and_set" ++ [(match_operand:QI 0 "register_operand" "") ;; bool output ++ (match_operand:QI 1 "memory_operand" "m") ;; memory ++ (match_operand:SI 2 "const_int_operand" "")] ;; model ++ "" ++{ ++ rtx old = gen_reg_rtx (SImode); ++ rtx mem = operands[1]; ++ rtx model = operands[2]; ++ rtx set = gen_reg_rtx (SImode); ++ rtx aligned_mem = gen_reg_rtx (SImode); ++ rtx shift = gen_reg_rtx (SImode); ++ ++ microblaze_subword_address (mem, &aligned_mem, &shift); ++ ++ emit_move_insn (set, GEN_INT (1)); ++ rtx shifted_set = gen_reg_rtx (SImode); ++ ++ emit_move_insn (shifted_set, gen_rtx_ASHIFT (SImode, set, shift)); ++ ++ emit_insn (gen_atomic_fetch_orsi (old, aligned_mem, shifted_set, model)); ++ ++ emit_move_insn (old, gen_rtx_ASHIFTRT (SImode, old, shift)); ++ ++ emit_move_insn (operands[0], gen_lowpart (QImode, old)); ++ ++ DONE; ++}) +-- +2.43.5 + diff --git a/package/gcc/14.3.0/0004-libsanitizer-Fix-build-with-glibc-2.42.patch b/package/gcc/14.3.0/0004-libsanitizer-Fix-build-with-glibc-2.42.patch new file mode 100644 index 0000000000..13f7f469c4 --- /dev/null +++ b/package/gcc/14.3.0/0004-libsanitizer-Fix-build-with-glibc-2.42.patch @@ -0,0 +1,81 @@ +From d32ece49d32b00448d967e7dbc6900fb25cbc775 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 2 May 2025 17:41:43 +0200 +Subject: [PATCH] libsanitizer: Fix build with glibc 2.42 + +The termio structure will be removed from glibc 2.42. It has +been deprecated since the late 80s/early 90s. + +Cherry-picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763 +("[sanitizer_common] Remove interceptors for deprecated struct termio +(#137403)"). + +Co-Authored-By: Tom Stellard + +libsanitizer/ + + * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry + picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763. + * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. + * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. + +Upstream: 1789c57dc97ea2f9819ef89e28bf17208b6208e7 (gcc master branch) +Upstream: d32ece49d32b00448d967e7dbc6900fb25cbc775 (gcc 15.x branch) +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common_interceptors_ioctl.inc | 8 -------- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 3 --- + .../sanitizer_common/sanitizer_platform_limits_posix.h | 1 - + 3 files changed, 12 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 49ec4097c90..dda11daa77f 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -338,17 +338,9 @@ static void ioctl_table_fill() { + _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int)); + _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int)); + _(TCFLSH, NONE, 0); +-#if SANITIZER_GLIBC +- _(TCGETA, WRITE, struct_termio_sz); +-#endif + _(TCGETS, WRITE, struct_termios_sz); + _(TCSBRK, NONE, 0); + _(TCSBRKP, NONE, 0); +-#if SANITIZER_GLIBC +- _(TCSETA, READ, struct_termio_sz); +- _(TCSETAF, READ, struct_termio_sz); +- _(TCSETAW, READ, struct_termio_sz); +-#endif + _(TCSETS, READ, struct_termios_sz); + _(TCSETSF, READ, struct_termios_sz); + _(TCSETSW, READ, struct_termios_sz); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index c87d5ef42c9..7bbc6f2edac 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -485,9 +485,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_input_id_sz = sizeof(struct input_id); + unsigned struct_mtpos_sz = sizeof(struct mtpos); + unsigned struct_rtentry_sz = sizeof(struct rtentry); +-#if SANITIZER_GLIBC || SANITIZER_ANDROID +- unsigned struct_termio_sz = sizeof(struct termio); +-#endif + unsigned struct_vt_consize_sz = sizeof(struct vt_consize); + unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); + unsigned struct_vt_stat_sz = sizeof(struct vt_stat); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index c07f7cd0b0d..a80df656826 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -1029,7 +1029,6 @@ extern unsigned struct_hd_geometry_sz; + extern unsigned struct_input_absinfo_sz; + extern unsigned struct_input_id_sz; + extern unsigned struct_mtpos_sz; +-extern unsigned struct_termio_sz; + extern unsigned struct_vt_consize_sz; + extern unsigned struct_vt_sizes_sz; + extern unsigned struct_vt_stat_sz; +-- +2.50.1 + diff --git a/package/gcc/15.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/15.2.0/0001-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 0000000000..c3b600cfb8 --- /dev/null +++ b/package/gcc/15.2.0/0001-disable-split-stack-for-non-thread-builds.patch @@ -0,0 +1,26 @@ +From 7d5f59e035341430e20f47420535d0e987516e55 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 25 Jul 2022 00:29:55 +0200 +Subject: [PATCH] disable split-stack for non-thread builds + +Signed-off-by: Waldemar Brodkorb +[Romain: convert to git format] +Signed-off-by: Romain Naour +--- + libgcc/config/t-stack | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack +index cc0366b4cd8..f3f97e86d60 100644 +--- a/libgcc/config/t-stack ++++ b/libgcc/config/t-stack +@@ -1,4 +1,6 @@ + # Makefile fragment to provide generic support for -fsplit-stack. + # This should be used in config.host for any host which supports + # -fsplit-stack. ++ifeq ($(enable_threads),yes) + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c ++endif +-- +2.50.1 + diff --git a/package/gcc/15.2.0/0002-MicroBlaze-Enhance-support-for-atomics.-Fix-PR118280.patch b/package/gcc/15.2.0/0002-MicroBlaze-Enhance-support-for-atomics.-Fix-PR118280.patch new file mode 100644 index 0000000000..958339bf6c --- /dev/null +++ b/package/gcc/15.2.0/0002-MicroBlaze-Enhance-support-for-atomics.-Fix-PR118280.patch @@ -0,0 +1,286 @@ +From f14e0b13a5abbc15b4b3b4c0c6a125bbb0509465 Mon Sep 17 00:00:00 2001 +From: Gopi Kumar Bulusu +Date: Thu, 10 Jul 2025 12:44:44 +0530 +Subject: [PATCH] MicroBlaze : Enhance support for atomics. Fix PR118280 + +Atomic support enhanced to fix existing atomic_compare_and_swapsi pattern +to handle side effects; new patterns atomic_fetch_op and atomic_test_and_set +added. As MicroBlaze has no QImode test/set instruction, use shift magic +to implement atomic_test_and_set. This fixes PR118280. + +Files Changed + +* gcc/config/microblaze/iterators.md: New +* microblaze-protos.h/microblaze.cc : Add microblaze_subword_address +* gcc/config/microblaze/microblaze.md: constants: Add UNSPECV_CAS_BOOL, + UNSPECV_CAS_MEM, UNSPECV_CAS_VAL, UNSPECV_ATOMIC_FETCH_OP + type: add atomic +* gcc/config/microblaze/sync.md: Add atomic_fetch_si + atomic_test_and_set + +Fixes: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 +Upstream: https://patchwork.ozlabs.org/project/gcc/list/?series=466193 + +Signed-off-by: Kirk Meyer +Signed-off-by: David Holsgrove +Signed-off-by: Gopi Kumar Bulusu +--- + gcc/config/microblaze/iterators.md | 25 +++++ + gcc/config/microblaze/microblaze-protos.h | 1 + + gcc/config/microblaze/microblaze.cc | 28 ++++++ + gcc/config/microblaze/microblaze.h | 2 +- + gcc/config/microblaze/microblaze.md | 7 +- + gcc/config/microblaze/sync.md | 107 ++++++++++++++++++---- + 6 files changed, 150 insertions(+), 20 deletions(-) + create mode 100644 gcc/config/microblaze/iterators.md + +diff --git a/gcc/config/microblaze/iterators.md b/gcc/config/microblaze/iterators.md +new file mode 100644 +index 00000000000..2ffc2422a0a +--- /dev/null ++++ b/gcc/config/microblaze/iterators.md +@@ -0,0 +1,25 @@ ++;; Iterator definitions for GCC MicroBlaze machine description files. ++;; Copyright (C) 2012-2024 Free Software Foundation, Inc. ++;; ++;; This file is part of GCC. ++;; ++;; GCC is free software; you can redistribute it and/or modify ++;; it under the terms of the GNU General Public License as published by ++;; the Free Software Foundation; either version 3, or (at your option) ++;; any later version. ++;; ++;; GCC is distributed in the hope that it will be useful, ++;; but WITHOUT ANY WARRANTY; without even the implied warranty of ++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++;; GNU General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public License ++;; along with GCC; see the file COPYING3. If not see ++;; . ++ ++; atomics code iterator ++(define_code_iterator any_atomic [plus ior xor and]) ++ ++; atomics code attribute ++(define_code_attr atomic_optab ++ [(plus "add") (ior "or") (xor "xor") (and "and")]) +diff --git a/gcc/config/microblaze/microblaze-protos.h b/gcc/config/microblaze/microblaze-protos.h +index 90b79cfe716..1cee0b3096c 100644 +--- a/gcc/config/microblaze/microblaze-protos.h ++++ b/gcc/config/microblaze/microblaze-protos.h +@@ -62,6 +62,7 @@ extern int symbol_mentioned_p (rtx); + extern int label_mentioned_p (rtx); + extern bool microblaze_cannot_force_const_mem (machine_mode, rtx); + extern void microblaze_eh_return (rtx op0); ++extern void microblaze_subword_address (rtx, rtx *, rtx *); + #endif /* RTX_CODE */ + + /* Declare functions in microblaze-c.cc. */ +diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc +index 4b7f0a1a5e0..78b9428ef3b 100644 +--- a/gcc/config/microblaze/microblaze.cc ++++ b/gcc/config/microblaze/microblaze.cc +@@ -1300,6 +1300,34 @@ microblaze_expand_block_move (rtx dest, rtx src, rtx length, rtx align_rtx) + return false; + } + ++/* Compute memory address *aligned_mem and corresponding shift value (*shift) ++ from a QImode memory reference MEM */ ++void ++microblaze_subword_address (rtx mem, rtx *aligned_mem, rtx *shift) ++{ ++ /* Align the memory address to a word. */ ++ rtx addr = force_reg (Pmode, XEXP (mem, 0)); ++ ++ rtx addr_mask = gen_int_mode (-4, Pmode); ++ ++ rtx aligned_addr = gen_reg_rtx (Pmode); ++ ++ emit_move_insn (aligned_addr, gen_rtx_AND (Pmode, addr, addr_mask)); ++ ++ *aligned_mem = change_address (mem, SImode, aligned_addr); ++ ++ /* Calculate the shift amount. */ ++ emit_move_insn (*shift, gen_rtx_AND (SImode, addr, gen_int_mode (3, SImode))); ++ ++ if (TARGET_LITTLE_ENDIAN == 0) { ++ emit_move_insn (*shift, ++ gen_rtx_MINUS (SImode, gen_int_mode (3, SImode), *shift)); ++ } ++ ++ emit_move_insn (*shift, gen_rtx_ASHIFT (SImode, *shift, ++ gen_int_mode (3, SImode))); ++} ++ + static bool + microblaze_rtx_costs (rtx x, machine_mode mode, int outer_code ATTRIBUTE_UNUSED, + int opno ATTRIBUTE_UNUSED, int *total, +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2390542434b..b2e9ccde363 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -57,7 +57,7 @@ extern enum pipeline_type microblaze_pipe; + + /* Default target_flags if no switches are specified */ + #define TARGET_DEFAULT (MASK_SOFT_MUL | MASK_SOFT_DIV | MASK_SOFT_FLOAT \ +- | TARGET_ENDIAN_DEFAULT) ++ | TARGET_ENDIAN_DEFAULT) + + /* Do we have CLZ? */ + #define TARGET_HAS_CLZ (TARGET_PATTERN_COMPARE && microblaze_has_clz) +diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md +index 45c48a71e8d..270df8da0c5 100644 +--- a/gcc/config/microblaze/microblaze.md ++++ b/gcc/config/microblaze/microblaze.md +@@ -21,6 +21,7 @@ + + (include "constraints.md") + (include "predicates.md") ++(include "iterators.md") + + ;;---------------------------------------------------- + ;; Constants +@@ -43,6 +44,10 @@ + (UNSPEC_TLS 106) ;; jump table + (UNSPEC_SET_TEXT 107) ;; set text start + (UNSPEC_TEXT 108) ;; data text relative ++ (UNSPECV_CAS_BOOL 201) ;; compare and swap (bool) ++ (UNSPECV_CAS_VAL 202) ;; compare and swap (val) ++ (UNSPECV_CAS_MEM 203) ;; compare and swap (mem) ++ (UNSPECV_ATOMIC_FETCH_OP 204) ;; atomic fetch op + ]) + + (define_c_enum "unspec" [ +@@ -79,7 +84,7 @@ + ;; bshift Shift operations + + (define_attr "type" +- "unknown,branch,jump,call,load,store,move,arith,darith,imul,idiv,icmp,multi,nop,no_delay_arith,no_delay_load,no_delay_store,no_delay_imul,no_delay_move,bshift,fadd,frsub,fmul,fdiv,fcmp,fsl,fsqrt,fcvt,trap" ++ "unknown,branch,jump,call,load,store,move,arith,darith,imul,idiv,icmp,multi,nop,no_delay_arith,no_delay_load,no_delay_store,no_delay_imul,no_delay_move,bshift,fadd,frsub,fmul,fdiv,fcmp,fsl,fsqrt,fcvt,trap,atomic" + (const_string "unknown")) + + ;; Main data type used by the insn +diff --git a/gcc/config/microblaze/sync.md b/gcc/config/microblaze/sync.md +index db7b11e5379..6478ab6dcac 100644 +--- a/gcc/config/microblaze/sync.md ++++ b/gcc/config/microblaze/sync.md +@@ -18,26 +18,97 @@ + ;; . + + (define_insn "atomic_compare_and_swapsi" +- [(match_operand:SI 0 "register_operand" "=&d") ;; bool output +- (match_operand:SI 1 "register_operand" "=&d") ;; val output +- (match_operand:SI 2 "nonimmediate_operand" "+Q") ;; memory +- (match_operand:SI 3 "register_operand" "d") ;; expected value +- (match_operand:SI 4 "register_operand" "d") ;; desired value +- (match_operand:SI 5 "const_int_operand" "") ;; is_weak +- (match_operand:SI 6 "const_int_operand" "") ;; mod_s +- (match_operand:SI 7 "const_int_operand" "") ;; mod_f ++ [(set (match_operand:SI 0 "register_operand" "=&d") ;; bool output ++ (unspec_volatile:SI ++ [(match_operand:SI 2 "nonimmediate_operand" "+Q") ;; memory ++ (match_operand:SI 3 "register_operand" "d") ;; expected value ++ (match_operand:SI 4 "register_operand" "d")] ;; desired value ++ UNSPECV_CAS_BOOL)) ++ (set (match_operand:SI 1 "register_operand" "=&d") ;; val output ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_CAS_VAL)) ++ (set (match_dup 2) ++ (unspec_volatile:SI [(const_int 0)] UNSPECV_CAS_MEM)) ++ (match_operand:SI 5 "const_int_operand" "") ;; is_weak ++ (match_operand:SI 6 "const_int_operand" "") ;; mod_s ++ (match_operand:SI 7 "const_int_operand" "") ;; mod_f + (clobber (match_scratch:SI 8 "=&d"))] + "" + { +- output_asm_insn ("addc \tr0,r0,r0", operands); +- output_asm_insn ("lwx \t%1,%y2,r0", operands); +- output_asm_insn ("addic\t%8,r0,0", operands); +- output_asm_insn ("bnei \t%8,.-8", operands); +- output_asm_insn ("cmp \t%0,%1,%3", operands); +- output_asm_insn ("bnei \t%0,.+16", operands); +- output_asm_insn ("swx \t%4,%y2,r0", operands); +- output_asm_insn ("addic\t%8,r0,0", operands); +- output_asm_insn ("bnei \t%8,.-28", operands); +- return ""; ++ return "add \t%0,r0,r0\n\t" ++ "lwx \t%1,%y2,r0\n\t" ++ "addic\t%8,r0,0\n\t" ++ "bnei \t%8,.-8\n\t" ++ "cmp \t%8,%1,%3\n\t" ++ "bnei \t%8,.+20\n\t" ++ "swx \t%4,%y2,r0\n\t" ++ "addic\t%8,r0,0\n\t" ++ "bnei \t%8,.-28\n\t" ++ "addi \t%0,r0,1"; + } ++ [(set_attr "type" "atomic") ++ (set_attr "mode" "SI") ++ (set_attr "length" "40")] + ) ++ ++;; ++;; ++;; ++;; ++(define_insn "atomic_fetch_si" ++ [(set (match_operand:SI 0 "register_operand" "=&d") ++ (match_operand:SI 1 "memory_operand" "+Q")) ++ (set (match_dup 1) ++ (unspec_volatile:SI ++ [(any_atomic:SI (match_dup 1) ++ (match_operand:SI 2 "register_operand" "d")) ++ (match_operand:SI 3 "const_int_operand")] ;; model ++ UNSPECV_ATOMIC_FETCH_OP)) ++ (clobber (match_scratch:SI 4 "=&d"))] ;; tmp_1 ++ "" ++ { ++ return ++ "lwx \t%0,%y1,r0\n\t" ++ "addic\t%4,r0,0\n\t" ++ "bnei \t%4,.-8\n\t" ++ "\t%4,%0,%2\n\t" ++ "swx \t%4,%y1,r0\n\t" ++ "addic\t%4,r0,0\n\t" ++ "bnei \t%4,.-24"; ++ } ++ [(set_attr "type" "atomic") ++ (set_attr "mode" "SI") ++ (set_attr "length" "28")]) ++ ++;; ++;; MicroBlaze only supports lx/sx instructions for word mode only ++;; ++;; Use shift|mask magic to implement atomic_test_and_set using lwx/swx ++;; ++(define_expand "atomic_test_and_set" ++ [(match_operand:QI 0 "register_operand" "") ;; bool output ++ (match_operand:QI 1 "memory_operand" "m") ;; memory ++ (match_operand:SI 2 "const_int_operand" "")] ;; model ++ "" ++{ ++ rtx old = gen_reg_rtx (SImode); ++ rtx mem = operands[1]; ++ rtx model = operands[2]; ++ rtx set = gen_reg_rtx (SImode); ++ rtx aligned_mem = gen_reg_rtx (SImode); ++ rtx shift = gen_reg_rtx (SImode); ++ ++ microblaze_subword_address (mem, &aligned_mem, &shift); ++ ++ emit_move_insn (set, GEN_INT (1)); ++ rtx shifted_set = gen_reg_rtx (SImode); ++ ++ emit_move_insn (shifted_set, gen_rtx_ASHIFT (SImode, set, shift)); ++ ++ emit_insn (gen_atomic_fetch_orsi (old, aligned_mem, shifted_set, model)); ++ ++ emit_move_insn (old, gen_rtx_ASHIFTRT (SImode, old, shift)); ++ ++ emit_move_insn (operands[0], gen_lowpart (QImode, old)); ++ ++ DONE; ++}) +-- +2.50.1 + diff --git a/package/gcc/15.2.0/0003-gcc-config-microblaze-fix-ira-for-GCC15.patch b/package/gcc/15.2.0/0003-gcc-config-microblaze-fix-ira-for-GCC15.patch new file mode 100644 index 0000000000..663aab7218 --- /dev/null +++ b/package/gcc/15.2.0/0003-gcc-config-microblaze-fix-ira-for-GCC15.patch @@ -0,0 +1,56 @@ +From d2fdbd8c4abe67eea86877dfb3b3b9d8508c165f Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 6 Aug 2025 22:32:30 +0200 +Subject: [PATCH] gcc/config/microblaze: fix ira for GCC15 + +Add new hooks for callee-save on microblaze defined by [1] and +return 1 to restore the old behavior prior to the commit [3]. + +Tested with qemu_microblazeel_mmu_defconfig and used to generate +Microblaze toolchains for the Bootlin toolchains 2025.08-1 [4][5]. + +Upstream: suggested in the bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121432#c10 + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b191e8bdecf881d11c1544c441e38f4c18392a15 +[2] https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/config/i386/i386.cc;h=3128973ba79cccfc6761f451dcb716b9558cc4da;hb=d3ff498c478acefce35de04402f99171b4f64a1a#l20606 +[3] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3b9b8d6cfdf59337f4b7ce10ce92a98044b2657b +[4] https://lore.kernel.org/buildroot/87sehzndtp.fsf@dell.be.48ers.dk/T/#mce7decd0b3f6a41008d5de577538a8525c91b374 +[5] https://toolchains.bootlin.com/ + +Signed-off-by: Romain Naour +--- + gcc/config/microblaze/microblaze.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc +index 78b9428ef3b..84ea7e8d55a 100644 +--- a/gcc/config/microblaze/microblaze.cc ++++ b/gcc/config/microblaze/microblaze.cc +@@ -3228,6 +3228,14 @@ microblaze_secondary_reload (bool in_p ATTRIBUTE_UNUSED, rtx x ATTRIBUTE_UNUSED, + return NO_REGS; + } + ++/* Implement TARGET_CALLEE_SAVE_COST. */ ++static int ++microblaze_callee_save_cost (spill_cost_type, unsigned int hard_regno, machine_mode, ++ unsigned int, int mem_cost, const HARD_REG_SET &, bool) ++{ ++ return 1; ++} ++ + static void + microblaze_globalize_label (FILE * stream, const char *name) + { +@@ -4066,6 +4074,9 @@ microblaze_starting_frame_offset (void) + #undef TARGET_SECONDARY_RELOAD + #define TARGET_SECONDARY_RELOAD microblaze_secondary_reload + ++#undef TARGET_CALLEE_SAVE_COST ++#define TARGET_CALLEE_SAVE_COST microblaze_callee_save_cost ++ + #undef TARGET_ASM_OUTPUT_MI_THUNK + #define TARGET_ASM_OUTPUT_MI_THUNK microblaze_asm_output_mi_thunk + +-- +2.50.1 + diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 911bc2f4de..21581487df 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -5,15 +5,15 @@ choice default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_POWERPC_CPU_HAS_SPE - default BR2_GCC_VERSION_13_X + default BR2_GCC_VERSION_14_X help Select the version of gcc you wish to use. config BR2_GCC_VERSION_ARC - bool "gcc arc (13.1)" + bool "gcc arc (14.2)" # Only supported architecture depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 config BR2_GCC_VERSION_POWERPC_SPE bool "gcc powerpc spe" @@ -22,18 +22,9 @@ config BR2_GCC_VERSION_POWERPC_SPE depends on BR2_POWERPC_CPU_HAS_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_GCC_VERSION_12_X - bool "gcc 12.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - # powerpc spe support has been deprecated since gcc 8.x. - # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html - depends on !BR2_POWERPC_CPU_HAS_SPE - # ARC HS48 rel 31 only supported by gcc arc fork. - depends on !BR2_archs4x_rel31 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - config BR2_GCC_VERSION_13_X bool "gcc 13.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_POWERPC_CPU_HAS_SPE @@ -41,17 +32,21 @@ config BR2_GCC_VERSION_13_X config BR2_GCC_VERSION_14_X bool "gcc 14.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_POWERPC_CPU_HAS_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_14 -endchoice +config BR2_GCC_VERSION_15_X + bool "gcc 15.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_POWERPC_CPU_HAS_SPE + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 -# libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x -config BR2_GCC_SUPPORTS_LIBCILKRTS - bool - default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 +endchoice config BR2_GCC_SUPPORTS_DLANG bool @@ -73,10 +68,10 @@ config BR2_GCC_SUPPORTS_DLANG config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE - default "12.4.0" if BR2_GCC_VERSION_12_X - default "13.3.0" if BR2_GCC_VERSION_13_X - default "14.2.0" if BR2_GCC_VERSION_14_X - default "arc-2023.09-release" if BR2_GCC_VERSION_ARC + default "13.4.0" if BR2_GCC_VERSION_13_X + default "14.3.0" if BR2_GCC_VERSION_14_X + default "15.2.0" if BR2_GCC_VERSION_15_X + default "arc-2024.12-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" @@ -104,9 +99,8 @@ config BR2_TOOLCHAIN_BUILDROOT_FORTRAN depends on !BR2_TOOLCHAIN_HAS_LIBQUADMATH || \ (BR2_TOOLCHAIN_HAS_LIBQUADMATH && BR2_USE_WCHAR) # internal compiler error: in gen_reg_rtx, at emit-rtl.cc:1167 - # fixed in gcc 14.x, so disable gcc 12.x/13.x - depends on !(BR2_microblaze && \ - (BR2_GCC_VERSION_12_X || BR2_GCC_VERSION_13_X)) + # fixed in gcc 14.x, so disable gcc 13.x + depends on !(BR2_microblaze && BR2_GCC_VERSION_13_X) select BR2_TOOLCHAIN_HAS_FORTRAN help Enable this option if you want your toolchain to support the @@ -131,10 +125,6 @@ config BR2_GCC_ENABLE_OPENMP config BR2_GCC_ENABLE_GRAPHITE bool "Enable graphite support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 help This option enables the graphite optimizations in the compiler. - -comment "graphite support needs gcc >= 5.x" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 99d7047b5f..97a64ae2fa 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -12,6 +12,9 @@ GCC_FINAL_LICENSE_FILES = COPYING.RUNTIME HOST_GCC_FINAL_LICENSE = $(HOST_GCC_LICENSE) HOST_GCC_FINAL_LICENSE_FILES = $(HOST_GCC_LICENSE_FILES) +GCC_FINAL_CPE_ID_VENDOR = gnu +GCC_FINAL_CPE_ID_PRODUCT = gcc + GCC_FINAL_DEPENDENCIES = host-gcc-final GCC_FINAL_ADD_TOOLCHAIN_DEPENDENCY = NO GCC_FINAL_INSTALL_STAGING = YES @@ -85,25 +88,6 @@ else HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* endif -ifeq ($(BR2_GCC_SUPPORTS_LIBCILKRTS),y) - -# libcilkrts does not support v8 -ifeq ($(BR2_sparc),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts -endif - -# Pthreads are required to build libcilkrts -ifeq ($(BR2_PTHREADS_NONE),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# disable libcilkrts as there is no static version -HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts -endif - -endif # BR2_GCC_SUPPORTS_LIBCILKRTS - # Disable shared libs like libstdc++ if we do static since it confuses linking ifeq ($(BR2_STATIC_LIBS),y) HOST_GCC_FINAL_CONF_OPTS += --disable-shared diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index b7c53f8fbe..deb7c40fa3 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -1,16 +1,14 @@ # From https://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum -sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.4.0/sha512.sum -sha512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 gcc-12.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum -sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.2.0/sha512.sum -sha512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396 gcc-14.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.4.0/sha512.sum +sha512 9b4b83ecf51ef355b868608b8d257b2fa435c06d2719cb86657a7c2c2a0828ff4ce04e9bac1055bbcad8ed5b4da524cafaef654785e23a50233d95d89201e35f gcc-13.4.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-14.3.0/sha512.sum +sha512 cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93 gcc-14.3.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-15.2.0/sha512.sum +sha512 89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de gcc-15.2.0.tar.xz # Locally calculated (fetched from Github) -sha512 4dca20f517a42bb027fec605965b09fb917a535eebf3fe3e811d93476b02b1962df5ad4665f117bd44c2ec8e8015d51a44c00591761fe5f259c201ac5c7d920f gcc-arc-2023.09-release.tar.gz +sha512 7f08ae335d9112be65e92c3744c095d8fa265994b8282274948f99fe37409531e627e6dadfb77b138a82fa09d012c56d8c075b482a5a5186814a57f9db63c29e gcc-arc-2024.12-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index b39ca8566d..ea96286c32 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -251,6 +251,10 @@ ifneq ($(GCC_TARGET_FLOAT_ABI),) HOST_GCC_COMMON_CONF_OPTS += --with-float=$(GCC_TARGET_FLOAT_ABI) endif +ifneq ($(GCC_TARGET_SIMD),) +HOST_GCC_COMMON_CONF_OPTS += --with-simd=$(GCC_TARGET_SIMD) +endif + ifneq ($(GCC_TARGET_MODE),) HOST_GCC_COMMON_CONF_OPTS += --with-mode=$(GCC_TARGET_MODE) endif @@ -293,11 +297,6 @@ HOST_GCC_COMMON_CONF_OPTS += \ --with-long-double-128 endif -# allow to build gcc 14.x -ifeq ($(BR2_nios2),y) -HOST_GCC_COMMON_CONF_OPTS += --enable-obsolete -endif - HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' # For gcc-initial, we need to tell gcc that the C library will be diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 6ee088ce0c..c1bbf58fc7 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_GDAL select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_PROJ select BR2_PACKAGE_QHULL + select BR2_PACKAGE_SQLITE_ENABLE_RTREE if BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZLIB help GDAL is a translator library for raster and vector geospatial diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index baec7c910e..a264a44b7c 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.8.2/gdal-3.8.2.tar.gz.md5, sha256 locally computed: -md5 178461c9c1cd4503e36559a1063bb752 gdal-3.8.2.tar.xz -sha256 dc2921ee1cf7a5c0498e94d15fb9ab9c9689c296363a1d021fc3293dd242b4db gdal-3.8.2.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.11.4/gdal-3.11.4.tar.xz.md5, sha256 locally computed: +md5 5d60c5213d22a636913dbe4b3164281f gdal-3.11.4.tar.xz +sha256 6401eba2bb63f5ef7a08d2157f240194f06d508d096898a705637aeea9d3bbe8 gdal-3.11.4.tar.xz # Hashes of license files: sha256 1dae3468e81d00da56e2936f74d33b8b3ad09d726437f19ce209a5dabea41f77 LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 77ffb514c2..4217f178b5 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDAL_VERSION = 3.8.2 +GDAL_VERSION = 3.11.4 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz GDAL_LICENSE = Apache-2.0, ISC, MIT, many others diff --git a/package/gdb/15.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/15.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 0000000000..d4147e3a47 --- /dev/null +++ b/package/gdb/15.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From e815bac6c090d8c67a508d648685cbaf706ed052 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index b51e2278f4b..f1bc07df0e9 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index bd3ac143660..1c8c0b3a98e 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -22,7 +22,13 @@ + #include "elf/common.h" + #include + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +-- +2.45.2 + diff --git a/package/gdb/15.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/15.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 0000000000..0d4f918c8f --- /dev/null +++ b/package/gdb/15.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From da36d051935c737b09c080b5a4e27180f85d975f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 3 Jun 2017 21:23:52 +0200 +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems + +Fixes a pt_{dsp,}regs redefinition when building with the musl C library +on SuperH. + +Inspired by +http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, +adapted for SuperH. + +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour +--- + gdbserver/linux-sh-low.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc +index 64e6de3480b..4770e652614 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -75,7 +75,15 @@ extern const struct target_desc *tdesc_sh; + #include + #endif + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++# define pt_dspregs uapi_pt_dspregs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++# undef pt_dspregs ++#endif + + #define sh_num_regs 41 + +-- +2.45.2 + diff --git a/package/gdb/15.2/0003-use-asm-sgidefs.h.patch b/package/gdb/15.2/0003-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..fbbeec0600 --- /dev/null +++ b/package/gdb/15.2/0003-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From 73cfc1539610f4671e35591bfd1e6bf7edda8e71 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 3d072ea935c..d763c9b8f7e 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -30,7 +30,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" +-- +2.45.2 + diff --git a/package/gdb/15.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/15.2/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..f321a57af3 --- /dev/null +++ b/package/gdb/15.2/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,64 @@ +From d7fac5f69c6426a9b74e6d98f926c8bf8d3207a0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdbserver/linux-m68k-low.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 8020e49ac6e..d9ba6235288 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -16,6 +16,12 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + ++#include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Linux target op definitions for the m68k architecture. */ +@@ -79,10 +85,6 @@ m68k_target::low_decr_pc_after_break () + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.45.2 + diff --git a/package/gdb/15.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/15.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 0000000000..3b2bb3bfe7 --- /dev/null +++ b/package/gdb/15.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,53 @@ +From 1dbb7548d94ef83b76748c66bf5ade75a154b009 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index c1082eb0441..05e42dc580a 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -27,6 +27,7 @@ + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" + #include "gdbsupport/gdb_signals.h" ++#include "linux-ptrace.h" + #include + + extern char **environ; +-- +2.45.2 + diff --git a/package/gdb/15.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/15.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch new file mode 100644 index 0000000000..5fe5234acf --- /dev/null +++ b/package/gdb/15.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch @@ -0,0 +1,39 @@ +From 90d1e33247a4329235dbaa60521cf1ecb649d0f9 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 6 Nov 2021 10:06:25 +0100 +Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h + include (fixed in uclibc since v1.0.35, see [1]) + +Fixes: + + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’ + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ + +[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t + +Signed-off-by: Peter Seiderer +--- + gnulib/import/getrandom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c +index e1468730933..3948d8d552a 100644 +--- a/gnulib/import/getrandom.c ++++ b/gnulib/import/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.45.2 + diff --git a/package/gdb/15.2/0007-fix-musl-build-on-riscv.patch b/package/gdb/15.2/0007-fix-musl-build-on-riscv.patch new file mode 100644 index 0000000000..08737d2152 --- /dev/null +++ b/package/gdb/15.2/0007-fix-musl-build-on-riscv.patch @@ -0,0 +1,60 @@ +From 7b93a4abcbaa0c273aabc40213b2cdc1d3570e25 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 10 Nov 2021 23:14:54 +0100 +Subject: [PATCH] fix musl build on riscv + +Fix the following build failure raised with musl: + +../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': +../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? + 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) + | ^~~~~~~~~~ + | ELF_NGREG + +musl fixed the issue with +https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 + +Fixes: + - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 + +Signed-off-by: Fabrice Fontaine +--- + gdb/nat/riscv-linux-tdesc.c | 5 +++++ + gdbserver/linux-riscv-low.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c +index 0cd38435b22..c1f39037ad7 100644 +--- a/gdb/nat/riscv-linux-tdesc.c ++++ b/gdb/nat/riscv-linux-tdesc.c +@@ -30,6 +30,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* See nat/riscv-linux-tdesc.h. */ + + struct riscv_gdbarch_features +diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc +index c4554c507a8..aa9253ca769 100644 +--- a/gdbserver/linux-riscv-low.cc ++++ b/gdbserver/linux-riscv-low.cc +@@ -29,6 +29,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* Linux target op definitions for the RISC-V architecture. */ + + class riscv_target : public linux_process_target +-- +2.45.2 + diff --git a/package/gdb/15.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/15.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch new file mode 100644 index 0000000000..8368c6bcae --- /dev/null +++ b/package/gdb/15.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch @@ -0,0 +1,38 @@ +From 169d2240b045a77689d2f61af671557bc02271d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 18 Nov 2021 22:52:08 +0100 +Subject: [PATCH] gdbserver/Makefile.in: fix NLS build + +Fix the following build failure raised since gdb version 10.1 and +https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63: + + CXXLD libinproctrace.so +/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)': +/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext' + +Fixes: + - http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html] +--- + gdbserver/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index 6148ccf9121..7c054f4daf6 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -408,7 +408,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} + $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ + -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ +- -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread ++ -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread $(INTL) + + # Put the proper machine-specific files first, so M-. on a machine + # specific routine gets the one for the correct machine. +-- +2.45.2 + diff --git a/package/gdb/15.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/15.2/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 0000000000..a6bdc92374 --- /dev/null +++ b/package/gdb/15.2/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From ab4b71c3f308af89fe2751344375b694e9d63a66 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 28 Aug 2022 23:21:37 +0200 +Subject: [PATCH] gdb: Fix native build on xtensa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apply a similar fix than for Alpha architecture on gdb 9: +https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=7a27b85f6d9b5eea9bd1493f903158fbea4b2231 + +Fixes: + +../../gdb/xtensa-linux-nat.c: In function ‘void fill_gregset(const regcache*, elf_greg_t (*)[128], int)’: +../../gdb/xtensa-linux-nat.c:66:17: error: ‘gdbarch_pc_regnum’ was not declared in this scope + 66 | if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1) + | ^~~~~~~~~~~~~~~~~ + CXX complaints.o +../../gdb/xtensa-linux-nat.c:68:17: error: ‘gdbarch_ps_regnum’ was not declared in this scope + 68 | if (regnum == gdbarch_ps_regnum (gdbarch) || regnum == -1) + | ^~~~~~~~~~~~~~~~~ +../../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ + 71 | if (regnum == gdbarch_tdep (gdbarch)->wb_regnum || regnum == -1) + | ^ +In file included from ../../gdb/xtensa-linux-nat.c:38: +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘gdbarch_tdep::gdbarch_tdep()’ + 160 | struct gdbarch_tdep + | ^~~~~~~~~~~~ +../../gdb/xtensa-tdep.h:160:8: note: candidate expects 0 arguments, 1 provided +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(const gdbarch_tdep&)’ +../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘const gdbarch_tdep&’ +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(gdbarch_tdep&&)’ +../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘gdbarch_tdep&&’ +../../gdb/xtensa-linux-nat.c:72:49: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ + 72 | regcache->raw_collect (gdbarch_tdep (gdbarch)->wb_regnum, + | ^ + +Signed-off-by: Romain Naour +--- + gdb/xtensa-linux-nat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c +index f8509b02e07..794be827f9a 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -35,6 +35,7 @@ + + #include "gregset.h" + #include "xtensa-tdep.h" ++#include "gdbarch.h" + + /* Defines ps_err_e, struct ps_prochandle. */ + #include "gdb_proc_service.h" +-- +2.45.2 + diff --git a/package/gdb/16.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/16.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 0000000000..5118e929df --- /dev/null +++ b/package/gdb/16.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From 7fbcc55c3b2dac91dcb0a8dc6daa5514ff323185 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index 3efc1b9a9bf..635d07486de 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef GDB_NAT_PPC_LINUX_H + #define GDB_NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index 3ce978f4c7c..38534297cdf 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -22,7 +22,13 @@ + #include "elf/common.h" + #include + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +-- +2.48.1 + diff --git a/package/gdb/16.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/16.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 0000000000..878239a82e --- /dev/null +++ b/package/gdb/16.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From ab3ce973d6423552de732a05ac9da04c22b21411 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 3 Jun 2017 21:23:52 +0200 +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems + +Fixes a pt_{dsp,}regs redefinition when building with the musl C library +on SuperH. + +Inspired by +http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, +adapted for SuperH. + +Signed-off-by: Thomas Petazzoni +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour +--- + gdbserver/linux-sh-low.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc +index 64e6de3480b..4770e652614 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -75,7 +75,15 @@ extern const struct target_desc *tdesc_sh; + #include + #endif + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++# define pt_dspregs uapi_pt_dspregs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++# undef pt_dspregs ++#endif + + #define sh_num_regs 41 + +-- +2.48.1 + diff --git a/package/gdb/16.3/0003-use-asm-sgidefs.h.patch b/package/gdb/16.3/0003-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..b36d3730de --- /dev/null +++ b/package/gdb/16.3/0003-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From aa66834f88463c23a641c12e967bce68799cda47 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 3d072ea935c..d763c9b8f7e 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -30,7 +30,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" +-- +2.48.1 + diff --git a/package/gdb/16.3/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/16.3/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..8711190747 --- /dev/null +++ b/package/gdb/16.3/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,64 @@ +From cec7ed0cb055f960a689f2403a871a7e3e852e6e Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdbserver/linux-m68k-low.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 8020e49ac6e..d9ba6235288 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -16,6 +16,12 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + ++#include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Linux target op definitions for the m68k architecture. */ +@@ -79,10 +85,6 @@ m68k_target::low_decr_pc_after_break () + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.48.1 + diff --git a/package/gdb/16.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/16.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 0000000000..1e0bfdf6d1 --- /dev/null +++ b/package/gdb/16.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,53 @@ +From 11b382a75cae8f4599e9d3f8b85815d2d95a58fa Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index 41765b102bc..a44a1d48722 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -27,6 +27,7 @@ + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" + #include "gdbsupport/gdb_signals.h" ++#include "linux-ptrace.h" + #include + + extern char **environ; +-- +2.48.1 + diff --git a/package/gdb/16.3/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/16.3/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch new file mode 100644 index 0000000000..6d205279da --- /dev/null +++ b/package/gdb/16.3/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch @@ -0,0 +1,39 @@ +From 95d6a5a844083585f4f7b235cba14be94595b04a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 6 Nov 2021 10:06:25 +0100 +Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h + include (fixed in uclibc since v1.0.35, see [1]) + +Fixes: + + .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’ + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ + +[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t + +Signed-off-by: Peter Seiderer +--- + gnulib/import/getrandom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c +index e1468730933..3948d8d552a 100644 +--- a/gnulib/import/getrandom.c ++++ b/gnulib/import/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.48.1 + diff --git a/package/gdb/16.3/0007-fix-musl-build-on-riscv.patch b/package/gdb/16.3/0007-fix-musl-build-on-riscv.patch new file mode 100644 index 0000000000..aea5eef84a --- /dev/null +++ b/package/gdb/16.3/0007-fix-musl-build-on-riscv.patch @@ -0,0 +1,60 @@ +From 76bee99c13ab44949c25582f49528cd0c661cdb3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 10 Nov 2021 23:14:54 +0100 +Subject: [PATCH] fix musl build on riscv + +Fix the following build failure raised with musl: + +../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': +../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? + 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) + | ^~~~~~~~~~ + | ELF_NGREG + +musl fixed the issue with +https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 + +Fixes: + - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 + +Signed-off-by: Fabrice Fontaine +--- + gdb/nat/riscv-linux-tdesc.c | 5 +++++ + gdbserver/linux-riscv-low.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c +index 0cd38435b22..c1f39037ad7 100644 +--- a/gdb/nat/riscv-linux-tdesc.c ++++ b/gdb/nat/riscv-linux-tdesc.c +@@ -30,6 +30,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* See nat/riscv-linux-tdesc.h. */ + + struct riscv_gdbarch_features +diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc +index 44c805bb6d6..d43c3b9fe02 100644 +--- a/gdbserver/linux-riscv-low.cc ++++ b/gdbserver/linux-riscv-low.cc +@@ -29,6 +29,11 @@ + # define NFPREG 33 + #endif + ++/* Work around musl breakage since version 1.1.24. */ ++#ifndef ELF_NFPREG ++# define ELF_NFPREG 33 ++#endif ++ + /* Linux target op definitions for the RISC-V architecture. */ + + class riscv_target : public linux_process_target +-- +2.48.1 + diff --git a/package/gdb/16.3/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/16.3/0008-gdbserver-Makefile.in-fix-NLS-build.patch new file mode 100644 index 0000000000..10156407cb --- /dev/null +++ b/package/gdb/16.3/0008-gdbserver-Makefile.in-fix-NLS-build.patch @@ -0,0 +1,38 @@ +From e5a09ecd2a222168a6c58eb57a171f64e75ad053 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 18 Nov 2021 22:52:08 +0100 +Subject: [PATCH] gdbserver/Makefile.in: fix NLS build + +Fix the following build failure raised since gdb version 10.1 and +https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63: + + CXXLD libinproctrace.so +/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)': +/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext' + +Fixes: + - http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html] +--- + gdbserver/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index 365dcf23650..42e1b7bcf6d 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -407,7 +407,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} + $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ + -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ +- -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread ++ -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread $(INTL) + + # Put the proper machine-specific files first, so M-. on a machine + # specific routine gets the one for the correct machine. +-- +2.48.1 + diff --git a/package/gdb/16.3/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/16.3/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 0000000000..4d5a171aff --- /dev/null +++ b/package/gdb/16.3/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From 43501f9838e7aefd7d5d19aede49491591c34c98 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 28 Aug 2022 23:21:37 +0200 +Subject: [PATCH] gdb: Fix native build on xtensa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apply a similar fix than for Alpha architecture on gdb 9: +https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=7a27b85f6d9b5eea9bd1493f903158fbea4b2231 + +Fixes: + +../../gdb/xtensa-linux-nat.c: In function ‘void fill_gregset(const regcache*, elf_greg_t (*)[128], int)’: +../../gdb/xtensa-linux-nat.c:66:17: error: ‘gdbarch_pc_regnum’ was not declared in this scope + 66 | if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1) + | ^~~~~~~~~~~~~~~~~ + CXX complaints.o +../../gdb/xtensa-linux-nat.c:68:17: error: ‘gdbarch_ps_regnum’ was not declared in this scope + 68 | if (regnum == gdbarch_ps_regnum (gdbarch) || regnum == -1) + | ^~~~~~~~~~~~~~~~~ +../../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ + 71 | if (regnum == gdbarch_tdep (gdbarch)->wb_regnum || regnum == -1) + | ^ +In file included from ../../gdb/xtensa-linux-nat.c:38: +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘gdbarch_tdep::gdbarch_tdep()’ + 160 | struct gdbarch_tdep + | ^~~~~~~~~~~~ +../../gdb/xtensa-tdep.h:160:8: note: candidate expects 0 arguments, 1 provided +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(const gdbarch_tdep&)’ +../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘const gdbarch_tdep&’ +../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(gdbarch_tdep&&)’ +../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘gdbarch_tdep&&’ +../../gdb/xtensa-linux-nat.c:72:49: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ + 72 | regcache->raw_collect (gdbarch_tdep (gdbarch)->wb_regnum, + | ^ + +Signed-off-by: Romain Naour +--- + gdb/xtensa-linux-nat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c +index f8509b02e07..794be827f9a 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -35,6 +35,7 @@ + + #include "gregset.h" + #include "xtensa-tdep.h" ++#include "gdbarch.h" + + /* Defines ps_err_e, struct ps_prochandle. */ + #include "gdb_proc_service.h" +-- +2.48.1 + diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 8cbd52cff5..0f4c6a6c3c 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -50,6 +50,7 @@ if BR2_PACKAGE_GDB config BR2_PACKAGE_GDB_SERVER bool "gdbserver" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY + select BR2_PACKAGE_READLINE help Build the gdbserver stub to run on the target. A full gdb is needed to debug the program. @@ -59,8 +60,8 @@ config BR2_PACKAGE_GDB_DEBUGGER depends on BR2_USE_WCHAR depends on !BR2_sh select BR2_PACKAGE_GMP - select BR2_PACKAGE_MPFR if !(BR2_GDB_VERSION_13) - select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_MPFR + select BR2_PACKAGE_READLINE select BR2_PACKAGE_ZLIB comment "full gdb on target needs a toolchain w/ wchar" @@ -71,6 +72,7 @@ if BR2_PACKAGE_GDB_DEBUGGER config BR2_PACKAGE_GDB_TUI bool "TUI support" + select BR2_PACKAGE_NCURSES help This option enables terminal user interface (TUI) for gdb diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 36462a0f66..963c46129d 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,13 +41,14 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_14 - depends on !BR2_arc + default BR2_GDB_VERSION_15 if !BR2_arc + default BR2_GDB_VERSION_ARC if BR2_arc help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_13 - bool "gdb 13.x" +config BR2_GDB_VERSION_ARC + bool "gdb arc (15.x)" + depends on BR2_arc config BR2_GDB_VERSION_14 bool "gdb 14.x" @@ -56,7 +57,11 @@ config BR2_GDB_VERSION_15 bool "gdb 15.x" depends on BR2_HOST_GCC_AT_LEAST_9 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 -comment "gdb 15.x needs host and target gcc >= 9" +config BR2_GDB_VERSION_16 + bool "gdb 16.x" + depends on BR2_HOST_GCC_AT_LEAST_9 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 + +comment "gdb 15.x/16.x need host and target gcc >= 9" depends on !BR2_HOST_GCC_AT_LEAST_9 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_9 @@ -67,8 +72,8 @@ endif # If cross-gdb is not enabled, the latest stable version is chosen. config BR2_GDB_VERSION string - default "arc-2023.09-release" if BR2_arc - default "13.2" if BR2_GDB_VERSION_13 - default "14.2" if BR2_GDB_VERSION_14 || !BR2_PACKAGE_HOST_GDB - default "15.1" if BR2_GDB_VERSION_15 + default "arc-2024.12-release-gdb" if BR2_GDB_VERSION_ARC || (!BR2_PACKAGE_HOST_GDB && BR2_arc) + default "14.2" if BR2_GDB_VERSION_14 || (!BR2_PACKAGE_HOST_GDB && !BR2_TOOLCHAIN_GCC_AT_LEAST_9) + default "15.2" if BR2_GDB_VERSION_15 || (!BR2_PACKAGE_HOST_GDB && BR2_TOOLCHAIN_GCC_AT_LEAST_9) + default "16.3" if BR2_GDB_VERSION_16 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 6cf55a675d..7844b765e6 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,13 @@ # From https://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 gdb-13.2.tar.xz sha512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede gdb-14.2.tar.xz -sha512 0217434073023a8b8316088bf3ee95d53a1b6a7897f6269095429016a8900f9a05e130c390d8d5d5550cc515c16519de1071d8eef96aa58e38056c7e37da1d8b gdb-15.1.tar.xz +sha512 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba gdb-15.2.tar.xz +sha512 fffd6689c3405466a179670b04720dc825e4f210a761f63dd2b33027432f8cd5d1c059c431a5ec9e165eedd1901220b5329d73c522f9a444788888c731b29e9c gdb-16.3.tar.xz # Locally calculated (fetched from Github) -sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d gdb-arc-2023.09-release.tar.gz +sha512 a909a687abf6e9623c7ec99a8b2cbb03ab6fdeccee9ebd33ce34fffdb2bed5e4d519113aeb29ba3ca8db52e9bdbb63b59973914c74e3eebf4a4a2a6033b9e784 gdb-arc-2024.12-release-gdb.tar.gz + +# Locally calculated (fetched from gcc.gnu.org) +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING3.LIB +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index c966cdc10b..1841002dc1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -8,7 +8,7 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) GDB_SITE = $(BR2_GNU_MIRROR)/gdb GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz -ifeq ($(GDB_VERSION),arc-2023.09-release) +ifeq ($(BR2_GDB_VERSION_ARC),y) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz GDB_FROM_GIT = y @@ -30,9 +30,7 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK # For the host variant, we really want to build with XML support, # which is needed to read XML descriptions of target architectures. We # also need ncurses. -# As for libiberty, gdb may use a system-installed one if present, so -# we must ensure ours is installed first. -HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib +HOST_GDB_DEPENDENCIES = host-expat host-readline host-zlib # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true @@ -56,8 +54,8 @@ GDB_DEPENDENCIES += host-flex host-bison HOST_GDB_DEPENDENCIES += host-flex host-bison endif -# All newer versions of GDB need host-gmp -HOST_GDB_DEPENDENCIES += host-gmp +# All newer versions of GDB need host-gmp and host-mpfr +HOST_GDB_DEPENDENCIES += host-gmp host-mpfr # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, @@ -138,9 +136,10 @@ ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) GDB_DEPENDENCIES += zlib GDB_CONF_OPTS += \ --enable-gdb \ + --with-system-readline \ --with-curses \ --with-system-zlib -GDB_DEPENDENCIES += ncurses \ +GDB_DEPENDENCIES += readline \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) else # When only building gdbserver, we don't need zlib. But we have no way to @@ -162,11 +161,8 @@ GDB_CONF_OPTS += \ GDB_DEPENDENCIES += gmp endif -# Starting from GDB 14.x, mpfr is needed as a dependency to build full -# gdb. -# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so -# requires MPFR as well. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER):$(BR2_GDB_VERSION_13),y:) +# mpfr is needed as a dependency to build full gdb +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) GDB_DEPENDENCIES += mpfr GDB_CONF_OPTS += --with-mpfr=$(STAGING_DIR) else @@ -174,8 +170,12 @@ GDB_CONF_OPTS += --without-mpfr endif ifeq ($(BR2_PACKAGE_GDB_SERVER),y) -GDB_CONF_OPTS += --enable-gdbserver -GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +GDB_CONF_OPTS += \ + --enable-gdbserver \ + --with-system-readline +GDB_DEPENDENCIES += \ + $(TARGET_NLS_DEPENDENCIES) \ + readline else GDB_CONF_OPTS += --disable-gdbserver endif @@ -192,6 +192,7 @@ GDB_CONF_OPTS += --disable-inprocess-agent endif ifeq ($(BR2_PACKAGE_GDB_TUI),y) +GDB_DEPENDENCIES += ncurses GDB_CONF_OPTS += --enable-tui else GDB_CONF_OPTS += --disable-tui @@ -267,19 +268,12 @@ HOST_GDB_CONF_OPTS = \ --with-system-zlib \ --with-curses \ --disable-source-highlight \ - $(GDB_DISABLE_BINUTILS_CONF_OPTS) - -# GDB newer than 14.x need host-mpfr -# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so -# requires MPFR as well. -ifeq ($(BR2_GDB_VERSION_13),) -HOST_GDB_DEPENDENCIES += host-mpfr -HOST_GDB_CONF_OPTS += --with-mpfr=$(HOST_DIR) -else -HOST_GDB_CONF_OPTS += --without-mpfr -endif + --with-system-readline \ + $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ + --with-mpfr=$(HOST_DIR) ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) +HOST_GDB_DEPENDENCIES += host-ncurses HOST_GDB_CONF_OPTS += --enable-tui else HOST_GDB_CONF_OPTS += --disable-tui diff --git a/package/gdbm/gdbm.hash b/package/gdbm/gdbm.hash index a9df48908f..7b4a3ce1b3 100644 --- a/package/gdbm/gdbm.hash +++ b/package/gdbm/gdbm.hash @@ -1,6 +1,6 @@ # From https://www.gnu.org.ua/software/gdbm/download.html -md5 c780815649e52317be48331c1773e987 gdbm-1.24.tar.gz -sha1 7bd455f28c9e4afacc042e0c712aac1b2391fef2 gdbm-1.24.tar.gz +md5 aaa600665bc89e2febb3c7bd90679115 gdbm-1.26.tar.gz +sha1 6cee3657de948e691e8df26509157be950cef4d4 gdbm-1.26.tar.gz # Locally computed -sha256 695e9827fdf763513f133910bc7e6cfdb9187943a4fec943e57449723d2b8dbf gdbm-1.24.tar.gz +sha256 6a24504a14de4a744103dcb936be976df6fbe88ccff26065e54c1c47946f4a5e gdbm-1.26.tar.gz sha256 690d762f2e8e149ab1e2d6a409a3853b6151a2533b2382fae549a176d6bedecf COPYING diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk index 1a2c352d71..8c739af662 100644 --- a/package/gdbm/gdbm.mk +++ b/package/gdbm/gdbm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDBM_VERSION = 1.24 +GDBM_VERSION = 1.26 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm GDBM_LICENSE = GPL-3.0+ GDBM_LICENSE_FILES = COPYING diff --git a/package/gemmlowp/Config.in b/package/gemmlowp/Config.in new file mode 100644 index 0000000000..379450d1b0 --- /dev/null +++ b/package/gemmlowp/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_GEMMLOWP + bool "gemmlowp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + Low-precision matrix multiplication. + + https://github.com/google/gemmlowp + +comment "gemmlowp needs a toolchain w/ C++11" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/gemmlowp/gemmlowp.hash b/package/gemmlowp/gemmlowp.hash new file mode 100644 index 0000000000..07b15e0e5f --- /dev/null +++ b/package/gemmlowp/gemmlowp.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 c3feb896a1b42595cf9a508ed64ed0dc3cd84fffdb8eed790d02d0534ab322ce gemmlowp-16e8662c34917be0065110bfcd9cc27d30f52fdf.tar.gz +# License files, locally calculated +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/gemmlowp/gemmlowp.mk b/package/gemmlowp/gemmlowp.mk new file mode 100644 index 0000000000..708a82169a --- /dev/null +++ b/package/gemmlowp/gemmlowp.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gemmlowp +# +################################################################################ + +GEMMLOWP_VERSION = 16e8662c34917be0065110bfcd9cc27d30f52fdf +GEMMLOWP_SITE = $(call github,google,gemmlowp,$(GEMMLOWP_VERSION)) +GEMMLOWP_LICENSE = Apache-2.0 +GEMMLOWP_LICENSE_FILES = LICENSE +GEMMLOWP_INSTALL_STAGING = YES +# Only installs a header +GEMMLOWP_INSTALL_TARGET = NO +GEMMLOWP_SUBDIR = contrib + +$(eval $(cmake-package)) diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index 232ba6ef66..5c55467737 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,4 @@ +# From https://github.com/pengutronix/genimage/releases/tag/v19 +sha256 7ec4fcb865662a8b2ff20284819044ffa84137bf3ca16fb749701291bc01f108 genimage-19.tar.xz # Locally calculated -sha256 ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd genimage-18.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index b8ce7ff3c9..5fa34d8eb9 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 18 +GENIMAGE_VERSION = 19 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse diff --git a/package/genromfs/0001-build-system.patch b/package/genromfs/0001-build-system.patch deleted file mode 100644 index 827fe75bd2..0000000000 --- a/package/genromfs/0001-build-system.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- - Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -Index: genromfs-0.5.2/Makefile -=================================================================== ---- genromfs-0.5.2.orig/Makefile -+++ genromfs-0.5.2/Makefile -@@ -6,8 +6,6 @@ - PACKAGE = genromfs - VERSION = 0.5.2 - CC = gcc --CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g# --LDFLAGS = -s#-g - - DISTDIR = $(PACKAGE)-$(VERSION) - -@@ -24,7 +22,7 @@ - $(CC) $(LDFLAGS) genromfs.o -o genromfs - - .c.o: -- $(CC) $(CFLAGS) $< -c -o $@ -+ $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $< -c -o $@ - - clean: - rm -f genromfs *.o diff --git a/package/genromfs/Config.in b/package/genromfs/Config.in deleted file mode 100644 index e4eba9f16a..0000000000 --- a/package/genromfs/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_GENROMFS - bool "genromfs" - help - Tool to generate a ROMFS filesystem. - - http://romfs.sourceforge.net/ diff --git a/package/genromfs/genromfs.hash b/package/genromfs/genromfs.hash deleted file mode 100644 index 0be88ee1b4..0000000000 --- a/package/genromfs/genromfs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 30f37fc734572c1dbaa2504585bc23ba6b8fd7df767ae7155995b2ca0ebed960 genromfs-0.5.2.tar.gz -sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk deleted file mode 100644 index fd696b45b2..0000000000 --- a/package/genromfs/genromfs.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# genromfs -# -################################################################################ - -GENROMFS_VERSION = 0.5.2 -GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION) -GENROMFS_LICENSE = GPL-2.0+ -GENROMFS_LICENSE_FILES = COPYING - -define GENROMFS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -endef - -# "PREFIX" is the equivalent of DESTDIR in autotools, "prefix" is the -# traditional prefix. "prefix" defaults to /usr so no need to set it. -define GENROMFS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install -endef - -define HOST_GENROMFS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_GENROMFS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package/gerbera/0001-fix_fmt_12.patch b/package/gerbera/0001-fix_fmt_12.patch new file mode 100644 index 0000000000..a10b78dae6 --- /dev/null +++ b/package/gerbera/0001-fix_fmt_12.patch @@ -0,0 +1,29 @@ +From f8e158bc72986e46b93d05358c29db0c10f2fe9f Mon Sep 17 00:00:00 2001 +From: Karlchen +Date: Wed, 17 Sep 2025 21:18:49 +0200 +Subject: [PATCH] Update to fmt 12.0.0 + +Signed-off-by: Michael Nosthoff +Upstream: https://github.com/gerbera/gerbera/commit/f8e158bc72986e46b93d05358c29db0c10f2fe9f +[buildroot@heine.tech: removed all patch content not patching actual code] + +--- + src/web/config_load.cc | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/web/config_load.cc b/src/web/config_load.cc +index 8b296c43e0..4259ae3331 100644 +--- a/src/web/config_load.cc ++++ b/src/web/config_load.cc +@@ -150,7 +150,11 @@ void Web::ConfigLoad::addNewValue( + template + void Web::ConfigLoad::setValue(Json::Value& item, const T& value) + { ++#if FMT_VERSION >= 120000 ++ static_assert(fmt::is_formattable::value, "T must be formattable"); ++#else + static_assert(fmt::has_formatter::value, "T must be formattable"); ++#endif + item[CONFIG_LOAD_VALUE] = fmt::to_string(value); + } + diff --git a/package/gerbera/Config.in b/package/gerbera/Config.in index 46a163ec78..3372d86fba 100644 --- a/package/gerbera/Config.in +++ b/package/gerbera/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GERBERA depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_FMT + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_PUGIXML diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 8a0f052e9e..3056ff11ac 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13 gerbera-2.2.0.tar.gz +sha256 6a7ed1c73bd86bdddd76bcb6c4bcd2e42788a20eb1f3165e0ea9f456abccd3ed gerbera-2.6.1.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ac5b69b681..d2d68db686 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,12 +4,14 @@ # ################################################################################ -GERBERA_VERSION = 2.2.0 +GERBERA_VERSION = 2.6.1 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md GERBERA_DEPENDENCIES = \ fmt \ + icu \ + jsoncpp \ host-pkgconf \ pugixml \ spdlog \ diff --git a/package/ghostscript/0001-Fix-32-bit-build.patch b/package/ghostscript/0001-Fix-32-bit-build.patch new file mode 100644 index 0000000000..648e235d3b --- /dev/null +++ b/package/ghostscript/0001-Fix-32-bit-build.patch @@ -0,0 +1,63 @@ +From 3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Wed, 10 Sep 2025 08:55:30 +0100 +Subject: [PATCH] Fix 32-bit build + +Bug #708824 "ghostscript 10.06.0 compilation failure on 32-bit archs" + +nbytes shiouldn't be an intptr_t, it doesn't get used for pointer +arithmetic. Previously it was a uint, should be a int64_t, to fit with +all the other devices. + +Checked other warnings, and found a (very minor) one in gdevdbit.c, fix +that while we're here (signed/unsigned mismatch, we don't really care). + +Upstream: https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f + +Signed-off-by: Titouan Christophe +--- + base/gdevdbit.c | 2 +- + base/gdevmpla.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/base/gdevdbit.c b/base/gdevdbit.c +index e07cc3f3b8..1b5c69325b 100644 +--- a/base/gdevdbit.c ++++ b/base/gdevdbit.c +@@ -191,7 +191,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x, + fit_copy(dev, data, data_x, raster, id, x, y, width, height); + row_alpha = data; + out_raster = bitmap_raster(width * (size_t)byte_depth); +- if (check_64bit_multiply(out_raster, ncomps, &product) != 0) ++ if (check_64bit_multiply(out_raster, ncomps, (int64_t *) &product) != 0) + return gs_note_error(gs_error_undefinedresult); + gb_buff = gs_alloc_bytes(mem, product, "copy_alpha_hl_color(gb_buff)"); + if (gb_buff == 0) { +diff --git a/base/gdevmpla.c b/base/gdevmpla.c +index 2f0d522561..ffc5ff42e6 100644 +--- a/base/gdevmpla.c ++++ b/base/gdevmpla.c +@@ -1954,12 +1954,12 @@ mem_planar_strip_copy_rop2(gx_device * dev, + int i; + int j; + intptr_t chunky_sraster; +- intptr_t nbytes; ++ int64_t nbytes; + byte **line_ptrs; + byte *sbuf, *buf; + + chunky_sraster = sraster * (intptr_t)mdev->num_planar_planes; +- if (check_64bit_multiply(height, chunky_sraster, (size_t *)&nbytes) != 0) ++ if (check_64bit_multiply(height, chunky_sraster, &nbytes) != 0) + return gs_note_error(gs_error_undefinedresult); + buf = gs_alloc_bytes(mdev->memory, nbytes, "mem_planar_strip_copy_rop(buf)"); + if (buf == NULL) { +@@ -2003,7 +2003,7 @@ mem_planar_strip_copy_rop2(gx_device * dev, + intptr_t i; + intptr_t chunky_t_raster; + int chunky_t_height; +- intptr_t nbytes; ++ int64_t nbytes; + byte **line_ptrs; + byte *tbuf, *buf; + gx_strip_bitmap newtex; diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index c64ab80eb0..e50113ecfe 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10040/SHA512SUMS -sha512 2e711f8ba86491570684f13851190f41e6eee87dcfacce0a4adfd09a4523abf2e0b6727f0958ee2683834218f5705675b531fd2419cb7fc314ed4becf51f3ce3 ghostscript-10.04.0.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10060/SHA512SUMS +sha512 e9efa6a334cf34703f565f5043dd794452270415b34c2bea260e9dac6c72ebbcbedfa2e4cb9029841f8f582bbce91be8160e135a190081f3262bcf04417f80f1 ghostscript-10.06.0.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index a29ab9b66e..1fc850ad20 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.04.0 +GHOSTSCRIPT_VERSION = 10.06.0 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 @@ -85,8 +85,8 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-cups endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 +ifeq ($(BR2_PACKAGE_XLIB_LIBXT)$(BR2_PACKAGE_XLIB_LIBXEXT),yy) +GHOSTSCRIPT_DEPENDENCIES += xlib_libXt xlib_libXext GHOSTSCRIPT_CONF_OPTS += --with-x else GHOSTSCRIPT_CONF_OPTS += --without-x diff --git a/package/giblib/0001-fix-imlib2-detection.patch b/package/giblib/0001-fix-imlib2-detection.patch deleted file mode 100644 index 2323107941..0000000000 --- a/package/giblib/0001-fix-imlib2-detection.patch +++ /dev/null @@ -1,127 +0,0 @@ -configure.ac + Makefile.am: fix the imlib2 detection - -Although imlib2 is correctly checked for, the variables used to get -the CFLAGS and LIBS are wrong (perhaps a remnant of the pre-imlib2 -era, when giblib was using imlib). - -Signed-off-by: "Yann E. MORIN" - -diff --git a/configure.ac b/configure.ac -index 6807d86..c8874f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,16 +18,10 @@ AM_MAINTAINER_MODE - AM_WITH_DMALLOC - - AC_PATH_GENERIC(imlib2, 1.0.0, [ -- AC_SUBST(IMLIB_LIBS) -- AC_SUBST(IMLIB_CFLAGS) ], -+ AC_SUBST(IMLIB2_LIBS) -+ AC_SUBST(IMLIB2_CFLAGS) ], - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) - --dnl the above doesn't work for some reason :/ --IMLIB_LIBS=`imlib2-config --libs` --IMLIB_CFLAGS=`imlib2-config --cflags` --AC_SUBST(IMLIB_LIBS) --AC_SUBST(IMLIB_CFLAGS) -- - LIBS="$LIBS -lm" - CFLAGS="$CFLAGS -Wall" - -@@ -48,7 +42,7 @@ $PACKAGE $VERSION - Configuration: - -------------- - --Imlib2 libs: $IMLIB_LIBS --Imlib2 cflags: $IMLIB_CFLAGS -+Imlib2 libs: $IMLIB2_LIBS -+Imlib2 cflags: $IMLIB2_CFLAGS - CFLAGS: $CFLAGS - " -diff --git a/configure.in b/configure.in -index 432cb16..6999095 100644 ---- a/configure.in -+++ b/configure.in -@@ -17,16 +17,10 @@ AM_MAINTAINER_MODE - AM_WITH_DMALLOC - - AC_PATH_GENERIC(imlib2, 1.0.0, [ -- AC_SUBST(IMLIB_LIBS) -- AC_SUBST(IMLIB_CFLAGS) ], -+ AC_SUBST(IMLIB2_LIBS) -+ AC_SUBST(IMLIB2_CFLAGS) ], - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) - --dnl the above doesn't work for some reason :/ --IMLIB_LIBS=`imlib2-config --libs` --IMLIB_CFLAGS=`imlib2-config --cflags` --AC_SUBST(IMLIB_LIBS) --AC_SUBST(IMLIB_CFLAGS) -- - LIBS="$LIBS -lm" - CFLAGS="$CFLAGS -Wall" - -@@ -45,7 +39,7 @@ $PACKAGE $VERSION - Configuration: - -------------- - --Imlib2 libs: $IMLIB_LIBS --Imlib2 cflags: $IMLIB_CFLAGS -+Imlib2 libs: $IMLIB2_LIBS -+Imlib2 cflags: $IMLIB2_CFLAGS - CFLAGS: $CFLAGS - " -diff --git a/giblib-config.in b/giblib-config.in -index f3a7db6..cef1620 100644 ---- a/giblib-config.in -+++ b/giblib-config.in -@@ -42,11 +42,11 @@ while test $# -gt 0; do - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@ -+ echo $includes -I$prefix/include/giblib @IMLIB2_CFLAGS@ - ;; - --libs) - libdirs=-L@libdir@ -- echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@ -+ echo $libdirs -lgiblib @LDFLAGS@ @IMLIB2_LIBS@ - ;; - *) - echo "${usage}" 1>&2 -diff --git a/giblib.pc.in b/giblib.pc.in -index df520ae..783e6e1 100644 ---- a/giblib.pc.in -+++ b/giblib.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: giblib - Description: wrapper library for imlib2, and other stuff - Version: @VERSION@ --Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@ --Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@ -+Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB2_LIBS@ -+Cflags: -I${includedir} -I${includedir}/giblib @IMLIB2_CFLAGS@ - -diff --git a/giblib/Makefile.am b/giblib/Makefile.am -index d1edc09..49d8ac4 100644 ---- a/giblib/Makefile.am -+++ b/giblib/Makefile.am -@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in - - INCLUDES = \ - -I. -I$(top_srcdir) \ ---DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@ -+-DPREFIX=\""$(prefix)"\" @IMLIB2_CFLAGS@ - - lib_LTLIBRARIES = libgiblib.la - -@@ -24,7 +24,7 @@ libgiblib_la_SOURCES = \ - gib_utils.c gib_utils.h \ - gib_queue.c gib_queue.h - --libgiblib_la_LIBADD = @IMLIB_LIBS@ -+libgiblib_la_LIBADD = @IMLIB2_LIBS@ - libgiblib_la_DEPENDENCIES = giblib_config.h - libgiblib_la_LDFLAGS = -version-info 1:6:0 - diff --git a/package/giblib/Config.in b/package/giblib/Config.in deleted file mode 100644 index f50271ac53..0000000000 --- a/package/giblib/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GIBLIB - bool "giblib" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_IMLIB2 - select BR2_PACKAGE_IMLIB2_X - help - Giblib is a simple library which wraps imlib2. - - http://linuxbrit.co.uk/giblib/ - -comment "giblib support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package/giblib/giblib.hash b/package/giblib/giblib.hash deleted file mode 100644 index 0c83a55457..0000000000 --- a/package/giblib/giblib.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac giblib-1.2.4.tar.gz -sha256 8601e2dacede853fe325f7fd3a11f93b1753d576db60426f1b0ff4e68f41ff07 COPYING diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk deleted file mode 100644 index b0a962001d..0000000000 --- a/package/giblib/giblib.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# giblib -# -################################################################################ - -GIBLIB_VERSION = 1.2.4 -GIBLIB_SITE = http://linuxbrit.co.uk/downloads -GIBLIB_INSTALL_STAGING = YES -GIBLIB_DEPENDENCIES = imlib2 -GIBLIB_AUTORECONF = YES -GIBLIB_CONF_OPTS = \ - --with-imlib2-prefix=$(STAGING_DIR)/usr \ - --with-imlib2-exec-prefix=$(STAGING_DIR)/usr -GIBLIB_CONFIG_SCRIPTS = giblib-config -GIBLIB_LICENSE = MIT -GIBLIB_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package/git/git.hash b/package/git/git.hash index c290ebe6bd..19b212cd0d 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e git-2.47.0.tar.xz +sha256 60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62 git-2.51.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index f56807a00f..a01e7c9d53 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.47.0 +GIT_VERSION = 2.51.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ @@ -66,7 +66,7 @@ endif GIT_CFLAGS = $(TARGET_CFLAGS) -ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) GIT_CFLAGS += -O0 endif diff --git a/package/gkrellm/Config.in b/package/gkrellm/Config.in index e957c058de..9e90b2810e 100644 --- a/package/gkrellm/Config.in +++ b/package/gkrellm/Config.in @@ -3,41 +3,14 @@ config BR2_PACKAGE_GKRELLM depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_GKRELLM_SERVER if !BR2_PACKAGE_GKRELLM_CLIENT select BR2_PACKAGE_LIBGLIB2 help - GKrellM is a single process stack of system monitors which - supports applying themes to match its appearance to your - window manager, Gtk, or any other theme. + GKrellM is a single process stack of system monitors. + This package only contains the server part. The client + can run on a different machine. http://gkrellm.srcbox.net/ -if BR2_PACKAGE_GKRELLM - -config BR2_PACKAGE_GKRELLM_SERVER - bool "server" - help - Enable gkrellm server. - -config BR2_PACKAGE_GKRELLM_CLIENT - bool "client" - depends on BR2_PACKAGE_XORG7 # libgtk2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 - select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_XLIB_LIBSM - help - Enable gkrellm client. - -comment "client needs a toolchain w/ C++, gcc >= 4.8" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_XORG7 - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -endif # BR2_PACKAGE_GKRELLM - comment "gkrellm needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gkrellm/gkrellm.hash b/package/gkrellm/gkrellm.hash index 88624c3366..27ba276efa 100644 --- a/package/gkrellm/gkrellm.hash +++ b/package/gkrellm/gkrellm.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06 gkrellm-2.3.11.tar.bz2 +sha256 6f83665760b936ad4b55f9182b1ec7601faf38a0f25ea1e4bddc9965088f032d gkrellm-2.4.0.tar.bz2 sha256 691de85c3c6eeda5b6982c751548575344739ce4b4418d78905e599359f6c435 COPYING -sha256 b81e0c0c3fb2a58f25377388484a1f729abb367f5f2b43e335a6ed3272ce8536 COPYRIGHT +sha256 a4bb0b604fe7d40ca4469ffd5e2e2de70ff8ece43e47980ab2c8962d5e913330 COPYRIGHT diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 27a87be190..257ebadfc4 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GKRELLM_VERSION = 2.3.11 +GKRELLM_VERSION = 2.4.0 GKRELLM_SITE = http://gkrellm.srcbox.net/releases GKRELLM_SOURCE = gkrellm-$(GKRELLM_VERSION).tar.bz2 GKRELLM_LICENSE = GPL-3.0+ @@ -32,19 +32,7 @@ else GKRELLM_BUILD_OPTS += enable_nls=0 endif -ifeq ($(BR2_PACKAGE_GKRELLM_SERVER)$(BR2_PACKAGE_GKRELLM_CLIENT),yy) -GKRELLM_BUILD_DIR = $(@D) -else ifeq ($(BR2_PACKAGE_GKRELLM_SERVER),y) GKRELLM_BUILD_DIR = $(@D)/server -else -GKRELLM_BUILD_DIR = $(@D)/src -endif - -ifeq ($(BR2_PACKAGE_GKRELLM_CLIENT),y) -GKRELLM_DEPENDENCIES += libgtk2 xlib_libSM -GKRELLM_BUILD_OPTS += X11_LIBS="-lX11 -lSM -lICE" -GKRELLM_LICENSE += GPL (base64.c), Public Domain (md5.h, md5c.c) -endif define GKRELLM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) \ diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 6075d28874..b066616a01 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 + default y if BR2_loongarch64 default y if BR2_m68k_m68k default y if BR2_mips default y if BR2_mipsel @@ -20,10 +21,11 @@ config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS default y if BR2_sparc64 default y if BR2_x86_64 default y if BR2_microblaze - default y if BR2_nios2 - default y if BR2_arc && BR2_ARC_ATOMIC_EXT && !BR2_arc750d && !BR2_arc770d + default y if BR2_arcle && BR2_ARC_ATOMIC_EXT && !BR2_arc750d && !BR2_arc770d depends on !BR2_POWERPC_CPU_HAS_SPE - depends on BR2_RISCV_ISA_RVA || !BR2_riscv + # glibc needs atomic instructions, and does not support + # single-precision floating point ABIs (ilp32f and lp64f) + depends on (BR2_RISCV_ISA_RVA && !BR2_RISCV_ABI_ILP32F && !BR2_RISCV_ABI_LP64F) || !BR2_riscv depends on BR2_USE_MMU config BR2_PACKAGE_GLIBC_SUPPORTS @@ -34,6 +36,7 @@ config BR2_PACKAGE_GLIBC_SUPPORTS # toolchain/toolchain-buildroot/Config.in depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 || !BR2_loongarch64 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 || !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index bfb2942abb..538f8b69a7 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,7 +1,7 @@ # Locally calculated (fetched from Github) -sha256 6426766187d177412e7f3daed793dec93fce417db5ae99296c0d880aa808091e glibc-2.40-18-g5641780762723156b0d20a0b9f7df1d76831bab0.tar.gz +sha256 a364a548ebda9c570f5bf62bf5e4ad3240a90056455b9edfbf1472a7254bd1c0 glibc-2.42-3-gbc13db73937730401d592b33092db6df806d193e.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 bba29819a3e938fae92674d6a88533e10605e389da8b51cdcba0a94f6221c5bc LICENSES +sha256 b22a69aa3f80a5201818c66cb0df0f25f9fa13cf5861b0093a058dbd12d50dce LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index cee03a16fd..a7727cbad8 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,8 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.40-18-g5641780762723156b0d20a0b9f7df1d76831bab0 +GLIBC_VERSION = 2.42-3-gbc13db73937730401d592b33092db6df806d193e + # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -24,17 +25,14 @@ GLIBC_CPE_ID_VENDOR = gnu # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) -# Fixed by glibc-2.39-31-g31da30f23cddd36db29d5b6a1c7619361b271fb4 -GLIBC_IGNORE_CVES += CVE-2024-2961 +# Fixed by glibc-2.41-57-g84bdbf8a6f2fdafd3661489dbb7f79835a52da82 +GLIBC_IGNORE_CVES += CVE-2025-5745 -# Fixed by glibc-2.39-35-g1263d583d2e28afb8be53f8d6922f0842036f35d -GLIBC_IGNORE_CVES += CVE-2024-33599 +# Fixed by glibc-2.41-60-g0c76c951620f9e12df2a89b2c684878b55bb6795 +GLIBC_IGNORE_CVES += CVE-2025-5702 -# Fixed by glibc-2.39-37-gc99f886de54446cd4447db6b44be93dabbdc2f8b -GLIBC_IGNORE_CVES += CVE-2024-33600 - -# Fixed by glibc-2.39-38-ga9a8d3eebb145779a18d90e3966009a1daa63cd -GLIBC_IGNORE_CVES += CVE-2024-33601 CVE-2024-33602 +# Fixed by glibc-2.41-64-g1e16d0096d80a6e12d5bfa8e0aafdd13c47efd65 +GLIBC_IGNORE_CVES += CVE-2025-8058 # All these CVEs are considered as not being security issues by # upstream glibc: @@ -62,8 +60,6 @@ GLIBC_SUBDIR = build GLIBC_INSTALL_STAGING = YES -GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install - # Thumb build is broken, build in ARM mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) GLIBC_EXTRA_CFLAGS += -marm @@ -143,10 +139,6 @@ endif # Glibc nowadays can be build with optimization flags f.e. -Os GLIBC_CFLAGS = $(TARGET_OPTIMIZATION) -# crash in qemu-system-nios2 with -Os -ifeq ($(BR2_nios2),y) -GLIBC_CFLAGS += -O2 -endif # glibc can't be built without optimization ifeq ($(BR2_OPTIMIZE_0),y) diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash index 19272d2b90..20249977e8 100644 --- a/package/glibmm2_66/glibmm2_66.hash +++ b/package/glibmm2_66/glibmm2_66.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.6.sha256sum -sha256 5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f glibmm-2.66.6.tar.xz +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.8.sha256sum +sha256 64f11d3b95a24e2a8d4166ecff518730f79ecc27222ef41faf7c7e0340fc9329 glibmm-2.66.8.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm2_66/glibmm2_66.mk b/package/glibmm2_66/glibmm2_66.mk index 7f28342c52..bbf1a97f3f 100644 --- a/package/glibmm2_66/glibmm2_66.mk +++ b/package/glibmm2_66/glibmm2_66.mk @@ -5,7 +5,7 @@ ################################################################################ GLIBMM2_66_VERSION_MAJOR = 2.66 -GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).6 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).8 GLIBMM2_66_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM2_66_LICENSE_FILES = COPYING COPYING.tools GLIBMM2_66_SOURCE = glibmm-$(GLIBMM2_66_VERSION).tar.xz diff --git a/package/glm/glm.hash b/package/glm/glm.hash index 0084bd0930..a9f4c9ee7f 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz +sha256 9f3174561fd26904b23f0db5e560971cbf9b3cbda0b280f04d5c379d03bf234c glm-1.0.1.tar.gz sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index ce8efc11a7..b2e13f09bb 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLM_VERSION = 1.0.0 +GLM_VERSION = 1.0.1 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT GLM_LICENSE_FILES = copying.txt diff --git a/package/gmp/0001-Complete-function-prototype-in-acinclude.m4-for-C23-.patch b/package/gmp/0001-Complete-function-prototype-in-acinclude.m4-for-C23-.patch new file mode 100644 index 0000000000..129a4a88e0 --- /dev/null +++ b/package/gmp/0001-Complete-function-prototype-in-acinclude.m4-for-C23-.patch @@ -0,0 +1,51 @@ +From 9cd0c36d0110191a5f42e268d7bd21a95a2aa883 Mon Sep 17 00:00:00 2001 +From: Marc Glisse +Date: Wed, 29 Jan 2025 22:38:02 +0100 +Subject: [PATCH] Complete function prototype in acinclude.m4 for C23 + compatibility + +Add parameter names to function prototype + +Upstream: https://gmplib.org/repo/gmp/rev/d66d66d82dbb +Upstream: https://gmplib.org/repo/gmp/rev/8e7bb4ae7a18 +Signed-off-by: Marc Glisse +[Julien: git patch adapted from two upstream mercurial changesets] +Signed-off-by: Julien Olivain +--- + ChangeLog | 9 +++++++++ + acinclude.m4 | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index 2902cd2..d808a8b 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,12 @@ ++2025-03-15 Khem Raj ++ ++ * acinclude.m4: Add parameter names to function prototype. ++ ++2025-01-29 Rudi Heitbaum ++ Marc Glisse ++ ++ * acinclude.m4: Complete function prototype. ++ + 2023-07-29 Torbjörn Granlund + + * Version 6.3.0 released. +diff --git a/acinclude.m4 b/acinclude.m4 +index 9cf9483..b79a431 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1], + + #if defined (__GNUC__) && ! defined (__cplusplus) + typedef unsigned long long t1;typedef t1*t2; +-void g(){} ++void g(int a,t1 const*b,t1 c,t2 d,t1 const*e,int f){} + void h(){} + static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) + {t1 c,x,r;int i;if(v0){c=1;for(i=1;i Date: Sun, 20 Jan 2019 21:07:11 +0100 Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling @@ -15,10 +15,10 @@ Signed-off-by: Fabrice Fontaine 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.defaults b/Make.defaults -index 47ed361..7420344 100755 +index 1347aca..bb21874 100755 --- a/Make.defaults +++ b/Make.defaults -@@ -67,7 +67,7 @@ ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678 +@@ -99,7 +99,7 @@ ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[34567 # Get ARCH from the compiler if cross compiling ifneq ($(CROSS_COMPILE),) @@ -28,5 +28,5 @@ index 47ed361..7420344 100755 # FreeBSD (and possibly others) reports amd64 instead of x86_64 -- -2.36.1 +2.47.1 diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index 35446876f6..1177e9d9ba 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -15,4 +15,4 @@ config BR2_PACKAGE_GNU_EFI (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain and the EFI development environment. - http://gnu-efi.sourceforge.net/ + https://github.com/ncroxon/gnu-efi diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index e059da867e..5a2f47cfae 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,5 @@ -# From http://sourceforge.net/projects/gnu-efi/files -md5 0b93ad70dff96991dd87978fc4275bd1 gnu-efi-3.0.18.tar.bz2 -sha1 4f12dc4ab3e7940070c87affea17bf8a6209957a gnu-efi-3.0.18.tar.bz2 # Locally computed -sha256 7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c gnu-efi-3.0.18.tar.bz2 -sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib +sha256 a2e5dfd25e7fc0cd2027d75dc2517b4c74d94f801ff4784eca557ac1b9835899 gnu-efi-4.0.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 licenses/LICENSE.efilib +sha256 7aa278b6f1a2125d0a0c596fa537caca5a41e7b03f7d2dd0489905f65ffdb984 licenses/LICENSE.edk2 diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 2eed4e40d2..268e5350cf 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,12 +4,11 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.18 -GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 -GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi +GNU_EFI_VERSION = 4.0.0 +GNU_EFI_SITE = $(call github,ncroxon,gnu-efi,$(GNU_EFI_VERSION)) GNU_EFI_INSTALL_STAGING = YES -GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib) -GNU_EFI_LICENSE_FILES = README.efilib +GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib), BSD-2-Clause-Patent (EDK2 routines) +GNU_EFI_LICENSE_FILES = LICENSE licenses/LICENSE.edk2 licenses/LICENSE.efilib # gnu-efi is a set of library and header files used to build # standalone EFI applications such as bootloaders. There is no point diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index 0248abcf71..f307ec249e 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890 gnuchess-6.2.9.tar.gz +sha256 0b37bec2098c2ad695b7443e5d7944dc6dc8284f8d01fcc30bdb94dd033ca23a gnuchess-6.3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 630b3aefa7..1b343acc99 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.9 +GNUCHESS_VERSION = 6.3.0 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index e16a3f4910..01060f897b 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 2d8aa2662c398d60f1f8e0bf46fd163eae703189 gnupg-2.4.6.tar.bz2 -sha256 95acfafda7004924a6f5c901677f15ac1bda2754511d973bb4523e8dd840e17a gnupg-2.4.6.tar.bz2 +sha1 c704085aa7cc131a67edd0b7c0c90e5c35ee4adb gnupg-2.4.8.tar.bz2 +sha256 b58c80d79b04d3243ff49c1c3fc6b5f83138eb3784689563bcdd060595318616 gnupg-2.4.8.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index f1a8e9917c..debf15ef63 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.6 +GNUPG2_VERSION = 2.4.8 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 4072338885..bac1cb9d2d 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/6.0.1/ -md5 744fde2362fb20db6cfc58de73f96e9c gnuplot-6.0.1.tar.gz -sha1 ce1aaeff632c78cba2b3ca8142cf130bfd411478 gnuplot-6.0.1.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/6.0.3/ +md5 c897ca69062010e2cf5f7483e39e5acc gnuplot-6.0.3.tar.gz +sha1 b31779d6760f432f57136600fc0c2bf65f4d4013 gnuplot-6.0.3.tar.gz +sha256 ec52e3af8c4083d4538152b3f13db47f6d29929a3f6ecec5365c834e77f251ab gnuplot-6.0.3.tar.gz # Locally computed -sha256 e85a660c1a2a1808ff24f7e69981ffcbac66a45c9dcf711b65610b26ea71379a gnuplot-6.0.1.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index adb9ce6ad1..efdc08deae 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,11 +4,11 @@ # ################################################################################ -GNUPLOT_VERSION = 6.0.1 +GNUPLOT_VERSION = 6.0.3 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -GNUPLOT_CPE_ID_VALID = YES +GNUPLOT_CPE_ID_VENDOR = gnuplot GNUPLOT_AUTORECONF = YES diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index d9ad650672..98d87aed56 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -91,6 +91,12 @@ comment "python support needs a glibc or musl toolchain w/ host gcc >= 9" depends on !BR2_HOST_GCC_AT_LEAST_9 || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +config BR2_PACKAGE_GNURADIO_SOAPY + bool "gr-soapy support" + select BR2_PACKAGE_SOAPY_SDR + help + Soapy SDR support + config BR2_PACKAGE_GNURADIO_UTILS bool "gr-utils support" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index 855fca7ba4..2fa84d00c9 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29 gnuradio-3.10.11.0.tar.gz +sha256 fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958 gnuradio-3.10.12.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index d844688ff6..5d69201db1 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNURADIO_VERSION = 3.10.11.0 +GNURADIO_VERSION = 3.10.12.0 GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION)) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING @@ -145,6 +145,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_SOAPY),y) +GNURADIO_DEPENDENCIES += soapy-sdr +GNURADIO_CONF_OPTS += -DENABLE_GR_SOAPY=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_SOAPY=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON else diff --git a/package/gnutls/0001-audit-crau-fix-compilation-with-gcc-11.patch b/package/gnutls/0001-audit-crau-fix-compilation-with-gcc-11.patch new file mode 100644 index 0000000000..0551d5c4fd --- /dev/null +++ b/package/gnutls/0001-audit-crau-fix-compilation-with-gcc-11.patch @@ -0,0 +1,67 @@ +From 2bbae7644a2292410b53f98fd0035c40bf8750a5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 23 Nov 2025 18:17:19 +0100 +Subject: [PATCH] audit: crau: fix compilation with gcc < 11 + +If the CRAU_MAYBE_UNUSED macro is unset, the crau.h file tries to +automatically detect an appropriate value for it. + +This autodetection is using the cpp special operator +`__has_c_attribute` [1], introduced in gcc 11 [2]. + +When compiling with a gcc older than version 11, the compilation fails +with the error: + + In file included from audit.h:22, + from audit.c:26: + crau/crau.h:255:23: error: missing binary operator before token "(" + __has_c_attribute (__maybe_unused__) + ^ + +This has been observed, for example, in Rocky Linux 8.10, which +contains a gcc v8.5.0. + +The issue happens because the test for the `__has_c_attribute` +availability and the test for the `__maybe_unused__` attribute +are in the same directive. Those tests should be separated in +two different directives, following the same logic described in +the `__has_builtin` documentation [3]. + +This issue was found in Buildroot, after updating gnutls to +version 3.8.11 in [4]. + +This commit fixes the issue by splitting the test in two. + +[1] https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fc_005fattribute.html +[2] https://gcc.gnu.org/gcc-11/changes.html#c +[3] https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fbuiltin.html +[4] https://gitlab.com/buildroot.org/buildroot/-/commit/81dbfe1c2ae848b4eb1f896198d13455df50e548 + +Upstream: https://gitlab.com/gnutls/gnutls/-/merge_requests/2045 +Reported-by: Neal Frager +Signed-off-by: Julien Olivain +--- + lib/crau/crau.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/lib/crau/crau.h b/lib/crau/crau.h +index 0d4f9f13e..53d33555b 100644 +--- a/lib/crau/crau.h ++++ b/lib/crau/crau.h +@@ -251,9 +251,10 @@ void crau_data(struct crau_context_stack_st *stack, ...) + # else + + # ifndef CRAU_MAYBE_UNUSED +-# if defined(__has_c_attribute) && \ +- __has_c_attribute (__maybe_unused__) +-# define CRAU_MAYBE_UNUSED [[__maybe_unused__]] ++# if defined(__has_c_attribute) ++# if __has_c_attribute (__maybe_unused__) ++# define CRAU_MAYBE_UNUSED [[__maybe_unused__]] ++# endif + # elif defined(__GNUC__) + # define CRAU_MAYBE_UNUSED __attribute__((__unused__)) + # endif +-- +2.51.1 + diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 6712d1f6ef..03297c3321 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,7 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.8.tar.xz.sig -sha256 ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb gnutls-3.8.8.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.11.tar.xz.sig +sha256 91bd23c4a86ebc6152e81303d20cf6ceaeb97bc8f84266d0faec6e29f17baa20 gnutls-3.8.11.tar.xz # Locally calculated -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 COPYING.LESSERv2 +sha256 5e4aca90e8e08e47558dfd21e2a42251a139242b0016a06708739eeb8f0da60c README.md diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index a977093bd5..9eef594cc9 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,11 +6,11 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).11 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) -GNUTLS_LICENSE_FILES = doc/COPYING.LESSER +GNUTLS_LICENSE_FILES = COPYING.LESSERv2 README.md GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu @@ -70,7 +70,7 @@ HOST_GNUTLS_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) -GNUTLS_LICENSE_FILES += doc/COPYING +GNUTLS_LICENSE_FILES += COPYING GNUTLS_CONF_OPTS += --enable-openssl-compatibility else GNUTLS_CONF_OPTS += --disable-openssl-compatibility diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 7e354b3298..7ba70c9843 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,7 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS || BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS # See https://go.dev/doc/install/source#environment # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ @@ -34,7 +34,7 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS || BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS || BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS # CGO linking for the host. Since we use the same compiler for target # and host, if the target can't do CGO linking, then the host can't. @@ -57,7 +57,7 @@ if BR2_PACKAGE_HOST_GO choice prompt "Go compiler variant" - default BR2_PACKAGE_HOST_GO_SRC if BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + default BR2_PACKAGE_HOST_GO_SRC if BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS default BR2_PACKAGE_HOST_GO_BIN if BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS help Select a Go compiler variant. @@ -66,7 +66,7 @@ choice config BR2_PACKAGE_HOST_GO_SRC bool "host go (source)" - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS help This package will build the go compiler for the host. @@ -90,3 +90,4 @@ source "package/go/go-bin/Config.in.host" source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" source "package/go/go-bootstrap-stage3/Config.in.host" +source "package/go/go-bootstrap-stage4/Config.in.host" diff --git a/package/go/go-bin/go-bin.hash b/package/go/go-bin/go-bin.hash deleted file mode 100644 index cc87cac3a6..0000000000 --- a/package/go/go-bin/go-bin.hash +++ /dev/null @@ -1,9 +0,0 @@ -# sha256 checksum from https://go.dev/dl/ -sha256 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f go1.23.2.src.tar.gz -sha256 cb1ed4410f68d8be1156cee0a74fcfbdcd9bca377c83db3a9e1b07eebc6d71ef go1.23.2.linux-386.tar.gz -sha256 542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e go1.23.2.linux-amd64.tar.gz -sha256 f626cdd92fc21a88b31c1251f419c17782933a42903db87a174ce74eeecc66a9 go1.23.2.linux-arm64.tar.gz -sha256 e3286bdde186077e65e961cbe18874d42a461e5b9c472c26572b8d4a98d15c40 go1.23.2.linux-armv6l.tar.gz -sha256 c164ce7d894b10fd861d7d7b96f1dbea3f993663d9f0c30bc4f8ae3915db8b0c go1.23.2.linux-ppc64le.tar.gz -sha256 de1f94d7dd3548ba3036de1ea97eb8243881c22a88fcc04cc08c704ded769e02 go1.23.2.linux-s390x.tar.gz -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go-bin/go-bin.hash b/package/go/go-bin/go-bin.hash new file mode 120000 index 0000000000..0531a32c5c --- /dev/null +++ b/package/go/go-bin/go-bin.hash @@ -0,0 +1 @@ +../go.hash \ No newline at end of file diff --git a/package/go/go-bin/go-bin.mk b/package/go/go-bin/go-bin.mk index a0f1e26e8f..ac42e4cbf3 100644 --- a/package/go/go-bin/go-bin.mk +++ b/package/go/go-bin/go-bin.mk @@ -4,12 +4,15 @@ # ################################################################################ +GO_BIN_VERSION = $(GO_VERSION) GO_BIN_SITE = https://go.dev/dl GO_BIN_SOURCE = go$(GO_VERSION).linux-$(call qstrip, $(BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH)).tar.gz GO_BIN_DL_SUBDIR = go HOST_GO_BIN_ACTUAL_SOURCE_TARBALL = go$(GO_VERSION).src.tar.gz GO_BIN_LICENSE = BSD-3-Clause GO_BIN_LICENSE_FILES = LICENSE +GO_BIN_CPE_ID_VENDOR = golang +GO_BIN_CPE_ID_PRODUCT = go HOST_GO_BIN_PROVIDES = host-go diff --git a/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk index 3e4ee57432..83cb278f68 100644 --- a/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk +++ b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -17,12 +17,13 @@ HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# CFLAGS and GO_CCFLAGS have no effect, so overwrite CC directly. HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ GOOS=linux \ GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ + CC="$(HOSTCC_NOCCACHE) -std=gnu99" \ CGO_ENABLED=0 define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS diff --git a/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk index 98bf624b57..47e4d157eb 100644 --- a/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -7,7 +7,7 @@ # Use last Go version that go-bootstrap-stage1 can build: v1.19.x # See https://golang.org/doc/install/source#bootstrapFromSource GO_BOOTSTRAP_STAGE2_VERSION = 1.19.13 -GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SITE = https://go.dev/dl GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause diff --git a/package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk b/package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk index bdc8459595..732888d305 100644 --- a/package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk +++ b/package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk @@ -7,7 +7,7 @@ # Use last Go version that go-bootstrap-stage2 can build: v1.21.x # See https://go.dev/doc/go1.22#bootstrap GO_BOOTSTRAP_STAGE3_VERSION = 1.21.8 -GO_BOOTSTRAP_STAGE3_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE3_SITE = https://go.dev/dl GO_BOOTSTRAP_STAGE3_SOURCE = go$(GO_BOOTSTRAP_STAGE3_VERSION).src.tar.gz GO_BOOTSTRAP_STAGE3_LICENSE = BSD-3-Clause diff --git a/package/go/go-bootstrap-stage4/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go-bootstrap-stage4/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch new file mode 100644 index 0000000000..58f4581b02 --- /dev/null +++ b/package/go/go-bootstrap-stage4/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch @@ -0,0 +1,71 @@ +From 6b05378097c6a386ed9912d2471976dc39504e86 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Thu, 27 Jul 2023 21:28:47 -0700 +Subject: [PATCH] cmd/dist: set buildvcs=false when building go-bootstrap + +When building go-bootstrap as part of the make.bash process, the cmd/dist +invokes the bootstrap Go compiler to build the go_bootstrap tool: + +${GOROOT_BOOTSTRAP}/bin/go install -tags=math_big_pure_go compiler_bootstrap purego bootstrap/cmd/... + +If there is an invalid .git directory in a parent of ${GOROOT_BOOTSTRAP}, +make.bash will fail. Reproduction of the issue: + + mkdir go-issue-61620 + cd ./go-issue-61620 + wget https://go.dev/dl/go1.19.11.src.tar.gz + mkdir go-bootstrap + tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 + cd ./go-bootstrap/src/ + bash make.bash + cd ../../ + wget https://go.dev/dl/go1.20.6.src.tar.gz + mkdir go + tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 + printf "gitdir: ../../does/not/exist/.git" > ./.git + cd ./go/src/ + GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash + +The build fails with the following error: + + Building Go toolchain1 using [snip]/go-1.19.10. + error obtaining VCS status: exit status 128 + Use -buildvcs=false to disable VCS stamping. + go tool dist: FAILED: [snip]/go-1.19.10/bin/go install -tags=math_big_pure_go \ + compiler_bootstrap purego bootstrap/cmd/...: exit status 1 + +This change unconditionally sets -buildvcs=false when compiling go-bootstrap. We +don't need the revision information in those binaries anyway. Setting this flag +was previously not done as we were unsure if the go-bootstrap compiler would be +new enough to support the buildvcs build flag. Since Go 1.20.x, Go 1.19.x is the +minimum version for go-bootstrap, and supports -buildvcs=false. We can now set +-buildvcs=false without worrying about compatibility. + +Related: https://github.com/golang/go/issues/54852 +Fixes: https://github.com/golang/go/issues/61620 + +Upstream: https://github.com/golang/go/pull/61621 + +Signed-off-by: Christian Stewart +Signed-off-by: Romain Naour +--- + src/cmd/dist/buildtool.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go +index a528d7aa76..3b411d6ebb 100644 +--- a/src/cmd/dist/buildtool.go ++++ b/src/cmd/dist/buildtool.go +@@ -221,6 +221,9 @@ func bootstrapBuildTools() { + cmd := []string{ + pathf("%s/bin/go", goroot_bootstrap), + "install", ++ // Fixes cases where an invalid .git is present in a parent of GOROOT_BOOTSTRAP. ++ // See: https://github.com/golang/go/issues/61620 ++ "-buildvcs=false", + "-tags=math_big_pure_go compiler_bootstrap purego", + } + if vflag > 0 { +-- +2.41.0 + diff --git a/package/go/go-bootstrap-stage4/Config.in.host b/package/go/go-bootstrap-stage4/Config.in.host new file mode 100644 index 0000000000..292486582c --- /dev/null +++ b/package/go/go-bootstrap-stage4/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS diff --git a/package/go/go-bootstrap-stage4/go-bootstrap-stage4.hash b/package/go/go-bootstrap-stage4/go-bootstrap-stage4.hash new file mode 100644 index 0000000000..eb10323ece --- /dev/null +++ b/package/go/go-bootstrap-stage4/go-bootstrap-stage4.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 e1cce9379a24e895714a412c7ddd157d2614d9edbe83a84449b6e1840b4f1226 go1.23.12.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go-bootstrap-stage4/go-bootstrap-stage4.mk b/package/go/go-bootstrap-stage4/go-bootstrap-stage4.mk new file mode 100644 index 0000000000..7c5beb1c9d --- /dev/null +++ b/package/go/go-bootstrap-stage4/go-bootstrap-stage4.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# go-bootstrap-stage4 +# +################################################################################ + +# Use last Go version that go-bootstrap-stage3 can build: v1.23.x +# See https://go.dev/doc/go1.24#bootstrap +GO_BOOTSTRAP_STAGE4_VERSION = 1.23.12 +GO_BOOTSTRAP_STAGE4_SITE = https://go.dev/dl +GO_BOOTSTRAP_STAGE4_SOURCE = go$(GO_BOOTSTRAP_STAGE4_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE4_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE4_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage3 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE4_DEPENDENCIES = host-go-bootstrap-stage3 + +HOST_GO_BOOTSTRAP_STAGE4_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE4_VERSION) + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE4_MAKE_ENV = \ + GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE4_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE4_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE4_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE4_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/pkg + cp -a $(@D)/pkg/include $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/pkg/ + + # The Go sources must be installed to the host/ tree for the Go stdlib. + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE4_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go/go-src/go-src.hash b/package/go/go-src/go-src.hash deleted file mode 100644 index b475ec4a46..0000000000 --- a/package/go/go-src/go-src.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://go.dev/dl -sha256 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f go1.23.2.src.tar.gz -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go-src/go-src.hash b/package/go/go-src/go-src.hash new file mode 120000 index 0000000000..0531a32c5c --- /dev/null +++ b/package/go/go-src/go-src.hash @@ -0,0 +1 @@ +../go.hash \ No newline at end of file diff --git a/package/go/go-src/go-src.mk b/package/go/go-src/go-src.mk index 340aada94c..ead535f4e0 100644 --- a/package/go/go-src/go-src.mk +++ b/package/go/go-src/go-src.mk @@ -4,17 +4,19 @@ # ################################################################################ -GO_SRC_SITE = https://storage.googleapis.com/golang +GO_SRC_VERSION = $(GO_VERSION) +GO_SRC_SITE = https://go.dev/dl GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz GO_SRC_DL_SUBDIR = go GO_SRC_LICENSE = BSD-3-Clause GO_SRC_LICENSE_FILES = LICENSE GO_SRC_CPE_ID_VENDOR = golang +GO_SRC_CPE_ID_PRODUCT = go HOST_GO_SRC_PROVIDES = host-go HOST_GO_SRC_DEPENDENCIES = \ - host-go-bootstrap-stage3 \ + host-go-bootstrap-stage4 \ $(HOST_GO_DEPENDENCIES_CGO) ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) @@ -35,7 +37,7 @@ endif HOST_GO_SRC_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE4_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ diff --git a/package/go/go.hash b/package/go/go.hash new file mode 100644 index 0000000000..7c689f9144 --- /dev/null +++ b/package/go/go.hash @@ -0,0 +1,9 @@ +# sha256 checksum from https://go.dev/dl/ +sha256 22a5fd0a91efcd28a1b0537106b9959b2804b61f59c3758b51e8e5429c1a954f go1.25.5.src.tar.gz +sha256 db908a86e888574ed3432355ba5372ad3ef2c0821ba9b91ceaa0f6634620c40c go1.25.5.linux-386.tar.gz +sha256 9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b go1.25.5.linux-amd64.tar.gz +sha256 b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9 go1.25.5.linux-arm64.tar.gz +sha256 0b27e3dec8d04899d6941586d2aa2721c3dee67c739c1fc1b528188f3f6e8ab5 go1.25.5.linux-armv6l.tar.gz +sha256 f0904b647b5b8561efc5d48bb59a34f2b7996afab83ccd41c93b1aeb2c0067e4 go1.25.5.linux-ppc64le.tar.gz +sha256 a5d0a72b0dfd57f9c2c0cdd8b7e0f401e0afb9e8c304d3410f9b0982ce0953da go1.25.5.linux-s390x.tar.gz +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 33dc681358..c932baf018 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.23.2 +GO_VERSION = 1.25.5 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache diff --git a/package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch new file mode 100644 index 0000000000..a8cf332f21 --- /dev/null +++ b/package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch @@ -0,0 +1,29 @@ +From 952e2e2bb6a22ec8824223b03b65cb28361c6e34 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 14 Mar 2018 12:07:10 -0400 +Subject: [PATCH] Add rpath links to ccompiler + +This patch allows gobject-introspection to process extra paths passed to the +compiler via the GIR_EXTRA_LIBS_PATH variable. + +Signed-off-by: Adam Duskett +--- + giscanner/ccompiler.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index cb97e76f..d29b28c8 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -266,6 +266,8 @@ class CCompiler(object): + + for envvar in runtime_path_envvar: + if envvar in os.environ: ++ for envvar_path in os.environ[envvar].split(':'): ++ args.append("-Wl,-rpath-link," + envvar_path) + os.environ[envvar] = \ + os.pathsep.join(runtime_paths + [os.environ[envvar]]) + else: +-- +2.25.1 + diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in index 345118745f..54a33d8666 100644 --- a/package/gobject-introspection/Config.in +++ b/package/gobject-introspection/Config.in @@ -2,6 +2,11 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + # gobject-introspection programs cause a hang of Qemu on + # Microblaze, and supporting GOI on Microblaze is not very + # relevant. + depends on !BR2_microblazeel + depends on !BR2_microblazebe config BR2_PACKAGE_GOBJECT_INTROSPECTION bool "gobject-introspection" @@ -14,7 +19,7 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION # can be verified. depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_HOST_GCC_AT_LEAST_8 # host-qemu - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # gobject-introspection does not require python3 to run on the # target; however, because the tools run in a qemu wrapper, a # cross-compiled python3 must be installed to staging. As there @@ -23,10 +28,11 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION # unconditionally to the target when building # gobject-introspection. depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_HOST_GOBJECT_INTROSPECTION select BR2_PACKAGE_HOST_QEMU select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGLIB2_BOOTSTRAP select BR2_PACKAGE_ZLIB help GObject introspection is a middleware layer between C @@ -42,9 +48,9 @@ comment "gobject-introspection needs python3" depends on !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS -comment "gobject-introspection needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" +comment "gobject-introspection needs a glibc or musl toolchain, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_HOST_GCC_AT_LEAST_8 diff --git a/package/gobject-introspection/Config.in.host b/package/gobject-introspection/Config.in.host new file mode 100644 index 0000000000..df77338b52 --- /dev/null +++ b/package/gobject-introspection/Config.in.host @@ -0,0 +1,2 @@ +config BR2_PACKAGE_HOST_GOBJECT_INTROSPECTION + bool diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index 063b96275d..044216c65f 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gobject-introspection/1.76/gobject-introspection-1.76.1.sha256sum -sha256 196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf gobject-introspection-1.76.1.tar.xz +# From https://download.gnome.org/sources/gobject-introspection/1.84/gobject-introspection-1.84.0.sha256sum +sha256 945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794a84779 gobject-introspection-1.84.0.tar.xz sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL -sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l +sha256 60cf20b6532aa2f5622f753a55672630b789c04174acca361033e6f1ad29f8ab giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index b1b44d0b4f..dbf0ee3fa8 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,27 +4,32 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.76 -GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.84 +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = https://download.gnome.org/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l +# gobject-introspection depends on the bootstrap version of libglib2 +# during the build because the full version depends on +# gobject-introspection (applies to target and host packages +# alike). "select BR2_PACKAGE_LIBGLIB2" in Config.in ensures the full +# libglib2 gets installed together with gobject-introspection. GOBJECT_INTROSPECTION_DEPENDENCIES = \ host-autoconf-archive \ host-gobject-introspection \ host-qemu \ libffi \ - libglib2 \ + libglib2-bootstrap \ python3 \ zlib HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \ host-bison \ host-flex \ - host-libglib2 \ + host-libglib2-bootstrap \ host-python3 # g-ir-scanner will default to /usr/bin/ld for linking if this is not set. @@ -35,7 +40,9 @@ GOBJECT_INTROSPECTION_NINJA_ENV += \ # .gir and .typelib files. g-ir-scanner does not use LDFLAGS, and by default, # links to the system-installed libglib2 path. To remedy this issue, defining # LD_LIBRARY_PATH forces g-ir-scanner to use our host installed libglib2 files. -HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ +# As of gobject-introspection version 1.84.0, Meson records the +# LD_LIBRARY_PATH set during config and passes it to g-ir-scanner. +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ LD_LIBRARY_PATH="$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(HOST_DIR)/lib" # Use the host gi-scanner to prevent the scanner from generating incorrect @@ -46,13 +53,16 @@ GOBJECT_INTROSPECTION_CONF_OPTS = \ -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ -Dbuild_introspection_data=true \ -Ddoctool=disabled \ - -Dcairo=disabled + -Dcairo=disabled \ + -Dtests=false + +HOST_GOBJECT_INTROSPECTION_CONF_OPTS = -Dtests=false # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME} GOBJECT_INTROSPECTION_CONF_ENV = \ GI_SCANNER_DISABLE_CACHE=1 -HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ +HOST_GOBJECT_INTROSPECTION_CONF_ENV += \ GI_SCANNER_DISABLE_CACHE=1 # Make sure g-ir-tool-template uses the host python. @@ -117,7 +127,9 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS # causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share. # Change datadir to $(libdir)/../share which will prefix $(STAGING_DIR) # to the correct location. - $(SED) "s%^datadir=.*%datadir=\$${libdir}/../share%g" \ + # Since we use libdir to define datadir, we must define datadir after + # libdir is defined. + $(SED) "\%^datadir=%d; s%^\(libdir=.*\)$$%\1\ndatadir=\$${libdir}/../share%" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc # By default, girdir and typelibdir use datadir and libdir as their prefix, diff --git a/package/gperf/gperf.hash b/package/gperf/gperf.hash index 1ea48c454b..9615c4e62b 100644 --- a/package/gperf/gperf.hash +++ b/package/gperf/gperf.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz.sig +# https://ftp.gnu.org/pub/gnu/gperf/gperf-3.3.tar.gz.sig # with key 93C08C88471097CD -sha256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz +sha256 fd87e0aba7e43ae054837afd6cd4db03a3f2693deb3619085e6ed9d8d9604ad8 gperf-3.3.tar.gz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index 4b928a0ebd..cf0694f9f8 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPERF_VERSION = 3.1 +GPERF_VERSION = 3.3 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING diff --git a/package/gpm/0008-Avoid-shadowing-ncurses-functions.-This-fails-with-G.patch b/package/gpm/0008-Avoid-shadowing-ncurses-functions.-This-fails-with-G.patch new file mode 100644 index 0000000000..d7b984d0da --- /dev/null +++ b/package/gpm/0008-Avoid-shadowing-ncurses-functions.-This-fails-with-G.patch @@ -0,0 +1,236 @@ +From 436f3f0a75a42dc9e07f2fe85b73eeb4c95e0515 Mon Sep 17 00:00:00 2001 +From: NHOrus +Date: Tue, 11 Feb 2025 18:42:47 +0400 +Subject: [PATCH] Avoid shadowing ncurses functions. This fails with GCC-15 and + other compilers implementing C23 Added prefix gpm_ to raw() and noraw() used + in two files because they are implemented in same two files, and are static. + Same with scr_dump() and src_restore() in yacc source file + +Upstream: https://github.com/telmich/gpm/pull/49 +Signed-off-by: Thomas Petazzoni +--- + src/prog/gpm-root.y | 10 +++++----- + src/prog/hltest.c | 11 +++++------ + src/prog/mouse-test.c | 24 ++++++++++++------------ + 3 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y +index d3d064c..7001d6e 100644 +--- a/src/prog/gpm-root.y ++++ b/src/prog/gpm-root.y +@@ -939,7 +939,7 @@ static unsigned short clear_sel_args[6]={0, 0,0, 0,0, 4}; + static unsigned char *clear_sel_arg= (unsigned char *)clear_sel_args+1; + + /*------------*/ +-static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc) ++static inline void gpm_scr_dump(int fd, FILE *f, unsigned char *buffer, int vc) + { + int dumpfd; + char dumpname[20]; +@@ -958,7 +958,7 @@ static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc) + } + + /*------------*/ +-static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc) ++static inline void gpm_scr_restore(int fd, FILE *f, unsigned char *buffer, int vc) + { + int x,y, dumpfd; + char dumpname[20]; +@@ -1002,7 +1002,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console) + if (!new) return NULL; + new->draw=draw; + new->dump=dump=malloc(opt_buf); +- scr_dump(fd,f,dump,console); ++ gpm_scr_dump(fd,f,dump,console); + lines=dump[0]; columns=dump[1]; + i=(columns*dump[3]+dump[2])*2+1; /* where to get it */ + if (i<0) i=1; +@@ -1060,7 +1060,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console) + for (i=0; iwidth; i++) PUTC(HORLINE,draw->bord,draw->back); + PUTC(LRCORNER,draw->bord,draw->back); + +- scr_restore(fd,f,dump,console); ++ gpm_scr_restore(fd,f,dump,console); + free(dump); + + #undef PUTC +@@ -1077,7 +1077,7 @@ Posted *unpostmenu(int fd, FILE *f, Posted *which, int vc) + { + Posted *prev=which->prev; + +- scr_restore(fd,f,which->dump, vc); ++ gpm_scr_restore(fd,f,which->dump, vc); + ioctl(fd,TCXONC,TCOON); /* activate the console */ + free(which->dump); + free(which); +diff --git a/src/prog/hltest.c b/src/prog/hltest.c +index cce0abc..a916873 100644 +--- a/src/prog/hltest.c ++++ b/src/prog/hltest.c +@@ -80,7 +80,6 @@ int wid,hei,vcsize; + unsigned short clear_sel_args[6]={0, 0,0, 0,0, 4}; + unsigned char *clear_sel_arg= (unsigned char *)clear_sel_args+1; + +- + static inline int scrdump(char *buf) + { + clear_sel_arg[0]=2; /* clear_selection */ +@@ -99,7 +98,7 @@ static inline int scrrestore(char *buf) + + + /* I don't like curses, so I'm doing low level stuff here */ +-static void raw(void) ++static void gpm_raw(void) + { + struct termios it; + +@@ -115,7 +114,7 @@ tcsetattr(fileno(stdin),TCSANOW,&it); + + } + +-static void noraw(void) ++static void gpm_noraw(void) + { + struct termios it; + +@@ -136,7 +135,7 @@ void killed(int signo) + { + CLEAR; + fprintf(stderr,"hltest: killed by signal %i\r\n",signo); +- noraw(); ++ gpm_noraw(); + exit(0); + } + +@@ -525,7 +524,7 @@ int main(int argc, char **argv) + gpm_roi_handler=xhandler; + gpm_roi_data=NULL; + +- raw(); ++ gpm_raw(); + newmsg(0,NULL); /* init data structures */ + while((c=Gpm_Getchar())!=EOF) { + char s[32]; +@@ -538,6 +537,6 @@ int main(int argc, char **argv) + newmsg(roi ? ((WinInfo *)roi->clientdata)->number : 0,s); + } + +- noraw(); ++ gpm_noraw(); + exit(0); + } +diff --git a/src/prog/mouse-test.c b/src/prog/mouse-test.c +index 0bb1982..7235bba 100644 +--- a/src/prog/mouse-test.c ++++ b/src/prog/mouse-test.c +@@ -106,7 +106,7 @@ return 0; + /*----------------------------------------------------------------------------- + Place the description here. + -----------------------------------------------------------------------------*/ +-static void raw(void) ++static void gpm_raw(void) + { + struct termios it; + +@@ -125,7 +125,7 @@ static void raw(void) + /*----------------------------------------------------------------------------- + Place the description here. + -----------------------------------------------------------------------------*/ +-static void noraw(void) ++static void gpm_noraw(void) + { + struct termios it; + +@@ -144,7 +144,7 @@ static void noraw(void) + void killed(int signo) + { + fprintf(stderr,"mouse-test: killed by signal %i\r\n",signo); +- noraw(); ++ gpm_noraw(); + exit(0); + } + +@@ -196,7 +196,7 @@ int mousereopen(int oldfd, char *name, Gpm_Type *type) + + int noneofthem(void) + { +- noraw(); ++ gpm_noraw(); + printf("\n\nSomething went wrong, I didn't manage to detect your" + "protocol\n\nFeel free to report your problems to the author\n"); + exit(1); +@@ -336,7 +336,7 @@ int main(int argc, char **argv) + I_serial=mice->init; /* the first one has I_serial */ + + signal(SIGINT,killed); /* control-C kills us */ +- raw(); ++ gpm_raw(); + + /*====================================== First of all, detect the device */ + +@@ -568,7 +568,7 @@ int main(int argc, char **argv) + /* why checking and not using return value ??? */ + CHECKFAIL(typecount); + if (typecount==1) { +- noraw(); ++ gpm_noraw(); + printf("\n\n\nWell, it seems like your mouse is already detected:\n" + "it is on the device \"%s\", and speaks the protocol \"%s\"\n", + mousename,list->this->name); +@@ -587,7 +587,7 @@ int main(int argc, char **argv) + } while(i!='y' && i!='n'); + + if (i=='n') { +- noraw(); ++ gpm_noraw(); + printf("\nThen, you should use the \"bare\" protocol on \"%s\"\n", + mousename); + exit(0); +@@ -634,7 +634,7 @@ int main(int argc, char **argv) + for (pending=0,i=0;i 3) { +- noraw(); ++ gpm_noraw(); + printf("\nYour mouse seems to be a 'mman' one on \"%s\" (%i matches)\n", + mousename,pending); + exit(0); +@@ -660,7 +660,7 @@ int main(int argc, char **argv) + continue; + } + if (pending>3) { +- noraw(); ++ gpm_noraw(); + printf("\nYour mouse seems to be a '%s' one on \"%s\" (%i matches)\n", + cur->this->name,mousename,pending); + exit(0); +@@ -695,7 +695,7 @@ int main(int argc, char **argv) + for (pending=0,i=0;i3) { +- noraw(); ++ gpm_noraw(); + printf("\nYour mouse becomes a 3-buttons ('-t msc') one when\n" + "gpm gets '-o %s' on it command line, and X gets\n" + "%s in XF86Config\nThe device is \"%s\"", +@@ -726,7 +726,7 @@ int main(int argc, char **argv) + for (pending=0,i=0;i3) { +- noraw(); ++ gpm_noraw(); + printf("\nWorked. You should keep the button pressed every time the\n" + "computer boots, and run gpm in '-R' mode in order to ignore\n" + "such hassle when starting X\n\nStill better, but a better mouse\n" +@@ -734,7 +734,7 @@ int main(int argc, char **argv) + + exit(0); + } +- noraw(); ++ gpm_noraw(); + printf("\nI'm lost. Can't tell you how to use your middle button\n"); + return 0; + } +-- +2.50.1 + diff --git a/package/gpm/0009-Fix-function-definition-in-yacc-source-file-until-va.patch b/package/gpm/0009-Fix-function-definition-in-yacc-source-file-until-va.patch new file mode 100644 index 0000000000..b12f409c39 --- /dev/null +++ b/package/gpm/0009-Fix-function-definition-in-yacc-source-file-until-va.patch @@ -0,0 +1,83 @@ +From 4e3d358da1c6066d7a320ffc157ca9e35ed34e49 Mon Sep 17 00:00:00 2001 +From: NHOrus +Date: Tue, 11 Feb 2025 19:01:48 +0400 +Subject: [PATCH] Fix function definition in yacc source file until valid C23. + Fill empty argument lists with values. Add 0 as third argument for + two-argument function, it will be ignored at call site. + +Upstream: https://github.com/telmich/gpm/pull/49 +Signed-off-by: Thomas Petazzoni +--- + src/prog/gpm-root.y | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y +index 7001d6e..56072ac 100644 +--- a/src/prog/gpm-root.y ++++ b/src/prog/gpm-root.y +@@ -128,7 +128,7 @@ typedef struct DrawItem { + char *name; + char *arg; /* a cmd string */ + void *clientdata; /* a (Draw *) for menus or whatever */ +- int (*fun)(); ++ int (*fun)(int, struct DrawItem *, int); + struct DrawItem *next; + } DrawItem; + +@@ -159,7 +159,7 @@ int yyerror(char *s); + int yylex(void); + + DrawItem *cfg_cat(DrawItem *, DrawItem *); +-DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail); ++DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(int, DrawItem *, int), void *detail); + + + /*===================================================================* +@@ -195,7 +195,7 @@ int f_pipe(int mode, DrawItem *self, int uid); + char *string; + Draw *draw; + DrawItem *item; +- int (*fun)(); ++ int (*fun)(int, DrawItem *, int); + } + + %token T_STRING +@@ -284,7 +284,7 @@ struct tokenName tokenList[] = { + struct funcName { + char *name; + int token; +- int (*fun)(); ++ int (*fun)(int, DrawItem *, int); + }; + struct funcName funcList[] = { + {"f.debug",T_FUNC,f_debug}, +@@ -390,7 +390,7 @@ Draw *cfg_alloc(void) + + /*---------------------------------------------------------------------*/ + /* malloc an empty DrawItem and fill it */ +-DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail) ++DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(int, DrawItem *, int), void *detail) + { + DrawItem *new=calloc(1,sizeof(DrawItem)); + +@@ -405,7 +405,7 @@ DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail) + + case 'F': /* a function without args */ + new->fun=fun; +- if (fun) fun(F_CREATE,new); ++ if (fun) fun(F_CREATE,new,0); + break; + + case 'M': +@@ -1047,7 +1047,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console) + } + /* sides and items */ + for (item=draw->menu; y++, item; item=item->next) { +- if (item->fun) (*(item->fun))(F_POST,item); ++ if (item->fun) (*(item->fun))(F_POST,item,0); + GOTO(x,y); PUTC(VERLINE,draw->bord,draw->back); + for (i=0;ipad;i++) PUTC(' ',draw->fore,draw->back); + PUTS(item->name,draw->fore,draw->back); i+=strlen(item->name); +-- +2.50.1 + diff --git a/package/gpm/0010-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch b/package/gpm/0010-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch new file mode 100644 index 0000000000..c22eac6f47 --- /dev/null +++ b/package/gpm/0010-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch @@ -0,0 +1,39 @@ +From d6d5168713b1513dc2a780d21bb33dcf16a7a518 Mon Sep 17 00:00:00 2001 +From: NHOrus +Date: Sat, 22 Feb 2025 01:12:32 +0400 +Subject: [PATCH] Add incomplete type definition for WINDOW in Gpm_Wgetch() + +Window handle is an opaque pointer that Gpm_Wgetch() passes +through straight to ncurses if it's not null and calls getch +if it's null. Code doesn't care what's inside the handle +as long as it agrees with curses definition. + +Upstream: https://github.com/telmich/gpm/pull/49 +Signed-off-by: Thomas Petazzoni +--- + src/headers/gpm.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/headers/gpm.h b/src/headers/gpm.h +index 57dc618..6c53fbf 100644 +--- a/src/headers/gpm.h ++++ b/src/headers/gpm.h +@@ -268,7 +268,14 @@ Gpm_Roi * Gpm_LowerRoi(Gpm_Roi *which, Gpm_Roi *after); + /* libcurses.c */ + /* #include Hmm... seems risky */ + +-extern int Gpm_Wgetch(); ++/* Window handle is an opaque pointer that Gpm_Wgetch() ++ * passes through to ncurses if it's not null and calls getch ++ * if it's null. Code doesn't care what's inside the handle ++ * as long as it agrees with curses definition. ++*/ ++typedef struct _win_st WINDOW; ++ ++extern int Gpm_Wgetch(WINDOW *); + #define Gpm_Getch() (Gpm_Wgetch(NULL)) + + /* libxtra.c */ +-- +2.50.1 + diff --git a/package/gpsd/0001-Fix-the-logfile-and-dumpfile-options-for-gpsprof.patch b/package/gpsd/0001-Fix-the-logfile-and-dumpfile-options-for-gpsprof.patch new file mode 100644 index 0000000000..d466c9fc58 --- /dev/null +++ b/package/gpsd/0001-Fix-the-logfile-and-dumpfile-options-for-gpsprof.patch @@ -0,0 +1,40 @@ +From f18e52dad4eeba2434a988bc899f6c7fe973f4ba Mon Sep 17 00:00:00 2001 +Message-Id: +From: Richard Lindsley +Date: Fri, 23 May 2025 18:48:57 -0700 +Subject: [PATCH] Fix the --logfile and --dumpfile options for gpsprof + +The open() function requires that the "encoding" argument is a str or +None. + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/bad9973b8e73e9e2cc0af2555edc9c8a0855d203 +Signed-off-by: Yann E. MORIN +--- + clients/gpsprof.py.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/clients/gpsprof.py.in b/clients/gpsprof.py.in +index 8b1a5234b..e5e448a53 100644 +--- a/clients/gpsprof.py.in ++++ b/clients/gpsprof.py.in +@@ -1208,7 +1208,7 @@ if __name__ == '__main__': + options = parser.parse_args() + + if options.logfile: +- options.logfp = open(options.logfile, "w", encoding=ascii) ++ options.logfp = open(options.logfile, "w", encoding="ascii") + else: + options.logfp = None + +@@ -1255,7 +1255,7 @@ if __name__ == '__main__': + plot.postprocess() + # Save the timing data (only) for post-analysis if required. + if options.dumpfile: +- with open(options.dumpfile, "w", encoding=ascii) as fp: ++ with open(options.dumpfile, "w", encoding="ascii") as fp: + fp.write(plot.dump()) + if options.logfp: + options.logfp.close() +-- +2.34.1 + diff --git a/package/gpsd/0002-gpsd-gpsd.c-Fix-empty-gst-in-POLL.patch b/package/gpsd/0002-gpsd-gpsd.c-Fix-empty-gst-in-POLL.patch new file mode 100644 index 0000000000..d07a8970f4 --- /dev/null +++ b/package/gpsd/0002-gpsd-gpsd.c-Fix-empty-gst-in-POLL.patch @@ -0,0 +1,78 @@ +From 98e61729d84b3e3698cde4ec7fe446b932d333fc Mon Sep 17 00:00:00 2001 +Message-Id: <98e61729d84b3e3698cde4ec7fe446b932d333fc.1749533625.git.yann.morin@orange.com> +In-Reply-To: +References: +From: "Gary E. Miller" +Date: Thu, 5 Jun 2025 17:40:56 -0700 +Subject: [PATCH] gpsd/gpsd.c: Fix empty gst[,] in POLL. + +Fix issue 336. + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/3185c5790c3e7e31c6cc80174940f0385cba2617 +Signed-off-by: Yann E. MORIN +--- + gpsd/gpsd.c | 30 ++++++++++++++++++++++-------- + 1 file changed, 22 insertions(+), 8 deletions(-) + +diff --git a/gpsd/gpsd.c b/gpsd/gpsd.c +index 5a98a4470..3797ace13 100644 +--- a/gpsd/gpsd.c ++++ b/gpsd/gpsd.c +@@ -1555,10 +1555,15 @@ static void handle_request(struct subscriber_t *sub, const char *buf, + for (devp = devices; devp < devices + MAX_DEVICES; devp++) { + if (allocated_device(devp) && subscribed(sub, devp)) { + if (0 != (devp->observed & GPS_TYPEMASK)) { ++ size_t rlen = strnlen(reply, replylen); ++ + json_tpv_dump(NAVDATA_SET, devp, &sub->policy, +- reply + strnlen(reply, replylen), +- replylen - strnlen(reply, replylen)); ++ reply + rlen, replylen - rlen); + rstrip(reply, replylen); ++ if (strnlen(reply, replylen) == rlen) { ++ // no data ++ continue; ++ } + (void)strlcat(reply, ",", replylen); + } + } +@@ -1568,10 +1573,15 @@ static void handle_request(struct subscriber_t *sub, const char *buf, + for (devp = devices; devp < devices + MAX_DEVICES; devp++) { + if (allocated_device(devp) && subscribed(sub, devp)) { + if (0 != (devp->observed & GPS_TYPEMASK)) { +- json_noise_dump(&devp->gpsdata, +- reply + strnlen(reply, replylen), +- replylen - strnlen(reply, replylen)); ++ size_t rlen = strnlen(reply, replylen); ++ ++ json_noise_dump(&devp->gpsdata, reply + rlen, ++ replylen - rlen); + rstrip(reply, replylen); ++ if (strnlen(reply, replylen) == rlen) { ++ // no data ++ continue; ++ } + (void)strlcat(reply, ",", replylen); + } + } +@@ -1581,10 +1591,14 @@ static void handle_request(struct subscriber_t *sub, const char *buf, + for (devp = devices; devp < devices + MAX_DEVICES; devp++) { + if (allocated_device(devp) && subscribed(sub, devp)) { + if (0 != (devp->observed & GPS_TYPEMASK)) { +- json_sky_dump(devp, +- reply + strnlen(reply, replylen), +- replylen - strnlen(reply, replylen)); ++ size_t rlen = strnlen(reply, replylen); ++ ++ json_sky_dump(devp, reply + rlen, replylen - rlen); + rstrip(reply, replylen); ++ if (strnlen(reply, replylen) == rlen) { ++ // no data ++ continue; ++ } + (void)strlcat(reply, ",", replylen); + } + } +-- +2.34.1 + diff --git a/package/gpsd/0003-SConscript-Do-not-force-_TIME_BITS-on-a-32-bit-syste.patch b/package/gpsd/0003-SConscript-Do-not-force-_TIME_BITS-on-a-32-bit-syste.patch new file mode 100644 index 0000000000..16a0ca6f88 --- /dev/null +++ b/package/gpsd/0003-SConscript-Do-not-force-_TIME_BITS-on-a-32-bit-syste.patch @@ -0,0 +1,49 @@ +From a1f36cf216861ac6499654b4e6e4d54107142cfc Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: +From: "Gary E. Miller" +Date: Thu, 5 Jun 2025 18:14:55 -0700 +Subject: [PATCH] SConscript: Do not force _TIME_BITS on a 32 bit system. + +The build assumed that if _TIME_BITS existed on a system then it was OK +to set it. Turns out that is a bad assumption. + +Leave it to the builds to decide when _TIME_BITS should be used. + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/95814d22276c34abe72a35b89065b1190d34f9bf +Signed-off-by: Yann E. MORIN +--- + SConscript | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +diff --git a/SConscript b/SConscript +index 28105fa7b..357c53f2b 100644 +--- a/SConscript ++++ b/SConscript +@@ -1335,19 +1335,9 @@ if not cleaning and not helping: + # check for 64 bit time_t. Needed for 2038. + sizeof_time_t = config.CheckTypeSize("time_t", "#include ", + expect=8) +- if 0 == sizeof_time_t: +- # see if we can force time64_t +- # this needs glibc 2.34 or later, and a compatible kernel +- sizeof_time_t = config.CheckTypeSize("time_t", +- "#define _TIME_BITS 64\n" +- "#define _FILE_OFFSET_BITS 64\n" +- "#include ", +- expect=8) +- if 0 != sizeof_time_t: +- # force time64_t +- confdefs.append("// Forcing 64-bit time_t\n" +- "#define _TIME_BITS 64\n" +- "#define _FILE_OFFSET_BITS 64\n") ++ # do not try to force time64_t, that is a distro decision. ++ # it needs glibc 2.34 or later, and a compatible kernel ++ # CFLAGS += "-D_TIME_BITS 64 -D_FILE_OFFSET_BITS 64" + + if 0 == sizeof_time_t: + announce("WARNING: time_t is too small. It will fail in 2038") +-- +2.34.1 + diff --git a/package/gpsd/0004-gpsd-libgpsd_core.c-Make-client-UDP-socket-non-block.patch b/package/gpsd/0004-gpsd-libgpsd_core.c-Make-client-UDP-socket-non-block.patch new file mode 100644 index 0000000000..73ecce5b8b --- /dev/null +++ b/package/gpsd/0004-gpsd-libgpsd_core.c-Make-client-UDP-socket-non-block.patch @@ -0,0 +1,32 @@ +From 0b1769a3abe386c139a8b4d4967b57a00f0f286a Mon Sep 17 00:00:00 2001 +Message-Id: <0b1769a3abe386c139a8b4d4967b57a00f0f286a.1749533625.git.yann.morin@orange.com> +In-Reply-To: +References: +From: Miroslav Lichvar +Date: Tue, 10 Jun 2025 00:21:52 +0200 +Subject: [PATCH] gpsd/libgpsd_core.c: Make client UDP socket non-blocking. + +Resolving issue #337 + +Upstream: https://gitlab.com/gpsd/gpsd/-/commit/992a90e6a50b4d3dcb091fff4658e7892c985c7f +Signed-off-by: Yann E. MORIN +--- + gpsd/libgpsd_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gpsd/libgpsd_core.c b/gpsd/libgpsd_core.c +index f328648f7..6b77e2b97 100644 +--- a/gpsd/libgpsd_core.c ++++ b/gpsd/libgpsd_core.c +@@ -614,7 +614,7 @@ int gpsd_open(struct gps_device_t *session) + "CORE: opening UDP feed at %s, port %s.\n", host, + port); + if (0 > (dsock = netlib_connectsock1(AF_UNSPEC, host, port, "udp", +- 0, true, NULL, 0))) { ++ 1, true, NULL, 0))) { + // cast for 32-bit ints. + GPSD_LOG(LOG_ERROR, &session->context->errout, + "CORE: UDP device open error %s(%ld).\n", +-- +2.34.1 + diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 92a124b8ac..0848f8181a 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -166,26 +166,11 @@ config BR2_PACKAGE_GPSD_NMEA2000 help NMEA2000/CAN support -config BR2_PACKAGE_GPSD_OCEANSERVER - bool "OceanServer" - help - OceanServer Digital Compass support - config BR2_PACKAGE_GPSD_ONCORE bool "OnCore" help OnCore support -config BR2_PACKAGE_GPSD_RTCM104V2 - bool "RTCM104 v2" - help - RTCM104 v2 support - -config BR2_PACKAGE_GPSD_RTCM104V3 - bool "RTCM104 v3" - help - RTCM104 v3 support - config BR2_PACKAGE_GPSD_SIRF bool "SiRF" help @@ -216,11 +201,6 @@ config BR2_PACKAGE_GPSD_TRUE_NORTH help True North Technologies support -config BR2_PACKAGE_GPSD_UBX - bool "UBX" - help - uBlox UBX binary support - endif # GPSD_DAEMON config BR2_PACKAGE_GPSD_CLIENTS @@ -238,6 +218,7 @@ config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" depends on BR2_USE_WCHAR # python3 select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SERIAL # runtime help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index 15e1181ed9..984ddab125 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz +sha256 dc7e465968c1540e61bc57c7586d6a57a0047212a014efdad348f907bc2e0990 gpsd-3.26.1.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 8f87766dcc..c5c4dad296 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.25 +GPSD_VERSION = 3.26.1 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING @@ -37,7 +37,6 @@ endif # Build libgpsmm if we've got C++ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GPSD_LDFLAGS += -lstdc++ -GPSD_CFLAGS += -std=gnu++98 GPSD_CXXFLAGS += -std=gnu++98 GPSD_SCONS_OPTS += libgpsmm=yes else @@ -120,18 +119,9 @@ endif ifneq ($(BR2_PACKAGE_GPSD_NMEA2000),y) GPSD_SCONS_OPTS += nmea2000=no endif -ifneq ($(BR2_PACKAGE_GPSD_OCEANSERVER),y) -GPSD_SCONS_OPTS += oceanserver=no -endif ifneq ($(BR2_PACKAGE_GPSD_ONCORE),y) GPSD_SCONS_OPTS += oncore=no endif -ifneq ($(BR2_PACKAGE_GPSD_RTCM104V2),y) -GPSD_SCONS_OPTS += rtcm104v2=no -endif -ifneq ($(BR2_PACKAGE_GPSD_RTCM104V3),y) -GPSD_SCONS_OPTS += rtcm104v3=no -endif ifneq ($(BR2_PACKAGE_GPSD_SIRF),y) GPSD_SCONS_OPTS += sirf=no endif @@ -150,9 +140,6 @@ endif ifneq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y) GPSD_SCONS_OPTS += tnt=no endif -ifneq ($(BR2_PACKAGE_GPSD_UBX),y) -GPSD_SCONS_OPTS += ublox=no -endif # Features ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 97f0b7de07..25a8a77d2f 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -25,7 +25,6 @@ config BR2_PACKAGE_GQRX depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # gnuradio depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 # gnuradio select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_GNURADIO select BR2_PACKAGE_GNURADIO_ANALOG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 567ff947f9..92432bb3e3 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz +sha256 4aaab8a3c185cd99d6dda56d95b8f1b20128a6acfd2e86e0349d432a5fdcbce4 gqrx-2.17.7.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK +sha256 2be14537abf3b54a93c7a78b8a8abee377f48106f9d3bc8f82ad061dc3fe67bf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index d2518213b8..745edad959 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,13 +4,15 @@ # ################################################################################ -GQRX_VERSION = 2.15.9 +GQRX_VERSION = 2.17.7 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg -GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio +GQRX_CONF_OPTS = \ + -DFORCE_QT5=ON \ + -DLINUX_AUDIO_BACKEND=Gr-audio # gqrx can use __atomic builtins, so we need to link with # libatomic when available diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash index b5ac50c4ed..1168616898 100644 --- a/package/gr-osmosdr/gr-osmosdr.hash +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63 gr-osmosdr-0.2.4.tar.gz +sha256 c50514d42be5a56a5b6b26fc12a8539ea9a433c28a3b96506084bd646879f91f gr-osmosdr-0.2.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 0d1e4edb30..6194021e06 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 0.2.4 +GR_OSMOSDR_VERSION = 0.2.6 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING diff --git a/package/graphicsmagick/0001-ReadJXLImage-Apply-image-dimension-resource-limits.patch b/package/graphicsmagick/0001-ReadJXLImage-Apply-image-dimension-resource-limits.patch new file mode 100644 index 0000000000..275738a71a --- /dev/null +++ b/package/graphicsmagick/0001-ReadJXLImage-Apply-image-dimension-resource-limits.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# User Bob Friesenhahn +# Date 1725886903 18000 +# Mon Sep 09 08:01:43 2024 -0500 +# Node ID 9bbae7314e3c3b19b830591010ed90bb136b9c42 +# Parent db3ff8d00c28c38895e1600a28706ce251dac570 +ReadJXLImage(): Apply image dimension resource limits. Addresses oss-fuzz Issue 69728 + +Upstream: https://foss.heptapod.net/graphicsmagick/graphicsmagick/-/commit/9bbae7314e3c3b19b830591010ed90bb136b9c42 +Signed-off-by: Peter Korsgaard +[Peter: drop ChangeLog/version changes] +diff --git a/coders/jxl.c b/coders/jxl.c +--- a/coders/jxl.c ++++ b/coders/jxl.c +@@ -571,6 +571,7 @@ + basic_info.alpha_bits, basic_info.num_color_channels, + basic_info.have_animation == JXL_FALSE ? "False" : "True"); + } ++ + if (basic_info.num_extra_channels) + { + size_t index; +@@ -637,6 +638,9 @@ + + image->orientation=convert_orientation(basic_info.orientation); + ++ if (CheckImagePixelLimits(image, exception) != MagickPass) ++ ThrowJXLReaderException(ResourceLimitError,ImagePixelLimitExceeded,image); ++ + pixel_format.endianness=JXL_NATIVE_ENDIAN; + pixel_format.align=0; + if (basic_info.num_color_channels == 1) diff --git a/package/graphicsmagick/0002-ReadJXLImage-pixel_format-num_channels-needs-to-be.patch b/package/graphicsmagick/0002-ReadJXLImage-pixel_format-num_channels-needs-to-be.patch new file mode 100644 index 0000000000..d1cc795b4c --- /dev/null +++ b/package/graphicsmagick/0002-ReadJXLImage-pixel_format-num_channels-needs-to-be.patch @@ -0,0 +1,60 @@ +# HG changeset patch +# User Bob Friesenhahn +# Date 1743004970 18000 +# Wed Mar 26 11:02:50 2025 -0500 +# Node ID 8e56520435df50f618a03f2721a39a70a515f1cb +# Parent 036a1376a2a6dc9504c5148249cbd8feaef72de6 +ReadJXLImage(): pixel_format.num_channels needs to be 2 for grayscale matte. + +Upstream: https://foss.heptapod.net/graphicsmagick/graphicsmagick/-/commit/8e56520435df50f618a03f2721a39a70a515f1cb +Signed-off-by: Peter Korsgaard +[Peter: drop ChangeLog/version changes] + +diff --git a/coders/jxl.c b/coders/jxl.c +--- a/coders/jxl.c ++++ b/coders/jxl.c +@@ -658,7 +658,7 @@ + ThrowJXLReaderException(ResourceLimitError,MemoryAllocationFailed,image); + } + grayscale=MagickTrue; +- pixel_format.num_channels=1; ++ pixel_format.num_channels=image->matte ? 2 : 1; + pixel_format.data_type=(basic_info.bits_per_sample <= 8 ? JXL_TYPE_UINT8 : + (basic_info.bits_per_sample <= 16 ? JXL_TYPE_UINT16 : + JXL_TYPE_FLOAT)); +@@ -843,6 +843,24 @@ + size_t + out_len; + ++ if (image->logging) ++ (void) LogMagickEvent(CoderEvent,GetMagickModule(), ++ "JxlPixelFormat:\n" ++ " num_channels: %u\n" ++ " data_type: %s\n" ++ " endianness: %s\n" ++ " align: %" MAGICK_SIZE_T_F "u", ++ pixel_format.num_channels, ++ pixel_format.data_type == JXL_TYPE_FLOAT ? "float" : ++ (pixel_format.data_type == JXL_TYPE_UINT8 ? "uint8" : ++ (pixel_format.data_type == JXL_TYPE_UINT16 ? "uint16" : ++ (pixel_format.data_type == JXL_TYPE_FLOAT16 ? "float16" : ++ "unknown"))) , ++ pixel_format.endianness == JXL_NATIVE_ENDIAN ? "native" : ++ (pixel_format.endianness == JXL_LITTLE_ENDIAN ? "little" : ++ (pixel_format.endianness == JXL_BIG_ENDIAN ? "big" : "unknown")), ++ pixel_format.align); ++ + status=JxlDecoderImageOutBufferSize(jxl_decoder,&pixel_format,&out_len); + if (status != JXL_DEC_SUCCESS) + { +@@ -852,6 +870,10 @@ + break; + } + ++ if (image->logging) ++ (void) LogMagickEvent(CoderEvent,GetMagickModule(), ++ "JxlDecoderImageOutBufferSize() returns %" MAGICK_SIZE_T_F "u", ++ (MAGICK_SIZE_T) out_len); + out_buf=MagickAllocateResourceLimitedArray(unsigned char *,out_len,sizeof(*out_buf)); + if (out_buf == (unsigned char *) NULL) + ThrowJXLReaderException(ResourceLimitError,MemoryAllocationFailed,image); diff --git a/package/graphicsmagick/graphicsmagick.hash b/package/graphicsmagick/graphicsmagick.hash index a894aedf11..044214c8fc 100644 --- a/package/graphicsmagick/graphicsmagick.hash +++ b/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 97dc1a9d4e89c77b25a3b24505e7ff1653b88f9bfe31f189ce10804b8efa7746 GraphicsMagick-1.3.40.tar.xz -sha256 0a20e661de942ebe115a354d0ec6d1d42b93856ea765f813f350a5ce5024cdb7 Copyright.txt +sha256 dcea5167414f7c805557de2d7a47a9b3147bcbf617b91f5f0f4afe5e6543026b GraphicsMagick-1.3.45.tar.xz +sha256 27d121f97ad71ff506ac5a6a9539e969154f3a66f3da24fd5b6f268acd106295 Copyright.txt diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index 76b826ceef..4b9f3bd23c 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -4,13 +4,19 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.40 +GRAPHICSMAGICK_VERSION = 1.3.45 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT GRAPHICSMAGICK_LICENSE_FILES = Copyright.txt GRAPHICSMAGICK_CPE_ID_VENDOR = graphicsmagick +# 0001-ReadJXLImage-Apply-image-dimension-resource-limits.patch +GRAPHICSMAGICK_IGNORE_CVES += CVE-2025-27795 + +# 0002-ReadJXLImage-pixel_format-num_channels-needs-to-be.patch +GRAPHICSMAGICK_IGNORE_CVES += CVE-2025-32460 + GRAPHICSMAGICK_INSTALL_STAGING = YES GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config diff --git a/package/grep/grep.hash b/package/grep/grep.hash index a0028a4e2f..fdc1505e36 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# https://ftp.gnu.org/gnu/grep/grep-3.11.tar.xz.sig +# https://ftp.gnu.org/gnu/grep/grep-3.12.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab grep-3.11.tar.xz +sha256 2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9 grep-3.12.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 61900bb957..9dff26bafa 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 3.11 +GREP_VERSION = 3.12 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ diff --git a/package/grout/Config.in b/package/grout/Config.in new file mode 100644 index 0000000000..7e6e34e07f --- /dev/null +++ b/package/grout/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_GROUT + bool "grout" + depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS # dpdk + depends on BR2_TOOLCHAIN_HAS_THREADS # dpdk + depends on BR2_USE_MMU # dpdk, numactl, libecoli, util-linux-smartcols + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # dpdk + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 # dpdk + depends on BR2_TOOLCHAIN_USES_GLIBC # dpdk + depends on BR2_TOOLCHAIN_HAS_ATOMIC # numactl + depends on !BR2_STATIC_LIBS # libecoli + depends on BR2_USE_WCHAR # libecoli + select BR2_PACKAGE_DPDK + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_NUMACTL + select BR2_PACKAGE_LIBECOLI + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + Graph router based on DPDK + +comment "grout needs a glibc toolchain w/ dynamic library, threads, wchar, gcc >= 4.9, headers >= 4.19" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 diff --git a/package/grout/grout.hash b/package/grout/grout.hash new file mode 100644 index 0000000000..248c375710 --- /dev/null +++ b/package/grout/grout.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 6d1ba4fda3fec6cbc5d4f4d48fe2435fabd36b27540a439a01a44361f6998971 grout-0.13.0.tar.gz +sha256 1e412aae8da58b718c78b3d7a52eb547004384d4347e4746a22ca6af7522930c licenses/BSD-3-clause.txt diff --git a/package/grout/grout.mk b/package/grout/grout.mk new file mode 100644 index 0000000000..07ea585a01 --- /dev/null +++ b/package/grout/grout.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# grout +# +################################################################################ + +GROUT_VERSION = 0.13.0 +GROUT_SITE = $(call github,DPDK,grout,v$(GROUT_VERSION)) +GROUT_LICENSE = BSD-3-Clause +GROUT_LICENSE_FILES = licenses/BSD-3-clause.txt + +# Avoid using buildroot commit hash +GROUT_CONF_ENV = GROUT_VERSION=$(GROUT_VERSION) + +GROUT_DEPENDENCIES = \ + host-pkgconf \ + dpdk \ + libevent \ + numactl \ + libecoli \ + util-linux + +define GROUT_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) +endef + +$(eval $(meson-package)) diff --git a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch index 92dc5a6c45..e8e211758a 100644 --- a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 +From dfec50b899c449bc964514f16e94869de7a68896 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -20,15 +20,15 @@ Signed-off-by: Thomas Petazzoni ] Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 6 ++++++ - include/grpc/impl/codegen/port_platform.h | 2 ++ + CMakeLists.txt | 6 ++++++ + include/grpc/support/port_platform.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2fcb..0b2be4f 100644 +index 053b9e3784..2565dc5c84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -291,6 +291,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") @@ -41,11 +41,11 @@ index 45c2fcb..0b2be4f 100644 if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 4f213ff..55ecd9d 100644 ---- a/include/grpc/impl/codegen/port_platform.h -+++ b/include/grpc/impl/codegen/port_platform.h -@@ -186,6 +186,7 @@ +diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h +index 5fb7426af2..24d438d702 100644 +--- a/include/grpc/support/port_platform.h ++++ b/include/grpc/support/port_platform.h +@@ -228,6 +228,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -53,7 +53,7 @@ index 4f213ff..55ecd9d 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -194,6 +195,7 @@ +@@ -236,6 +237,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif @@ -61,6 +61,6 @@ index 4f213ff..55ecd9d 100644 #include #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 - -- -2.26.63 +2.34.1 + diff --git a/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch new file mode 100644 index 0000000000..82705d8a1e --- /dev/null +++ b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch @@ -0,0 +1,193 @@ +From 6aab068a6bd92e215b61eaab61062bf1d97bc065 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Tue, 25 May 2021 14:55:23 +0200 +Subject: [PATCH] Add option to restrict building of (host-)grpc to + grpc_cpp_plugin only. + +This avoids unnecessary dependencies on big packages like libabseil-cpp and +others. + +Upstream: not accepted (see https://github.com/grpc/grpc/issues/25322) + +Signed-off-by: Thomas De Schampheleire +Signed-off-by: Fabrice Fontaine + +Updated for 1.48.0: +Signed-off-by: Michael Nosthoff +--- + CMakeLists.txt | 36 +++++++++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2565dc5c84..94f8fd3e93 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,12 +50,16 @@ set(gRPC_BUILD_MSVC_MP_COUNT 0 CACHE STRING "The maximum number of processes for + option(gRPC_BUILD_TESTS "Build tests" OFF) + option(gRPC_BUILD_CODEGEN "Build codegen" ON) + option(gRPC_DOWNLOAD_ARCHIVES "Download archives for empty 3rd party directories" ON) ++option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) + + set(gRPC_INSTALL_default ON) + if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + # Disable gRPC_INSTALL by default if building as a submodule + set(gRPC_INSTALL_default OFF) + endif() ++if(gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ set(gRPC_INSTALL_default OFF) ++endif() + set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL + "Generate installation target") + +@@ -662,6 +666,8 @@ add_custom_target(plugins + DEPENDS ${_gRPC_PLUGIN_LIST} + ) + ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_custom_target(tools_c + DEPENDS + ) +@@ -673,6 +679,8 @@ add_custom_target(tools_cxx + add_custom_target(tools + DEPENDS tools_c tools_cxx) + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + protobuf_generate_grpc_cpp_with_import_path_correction( + src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto + ) +@@ -1660,7 +1668,7 @@ if(gRPC_BUILD_TESTS) + DEPENDS buildtests_c buildtests_cxx) + endif() + +- ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + + add_library(address_sorting + third_party/address_sorting/address_sorting.c +@@ -2855,6 +2863,8 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + if(gRPC_BUILD_TESTS) + + add_library(grpc_test_util +@@ -2987,6 +2997,8 @@ endif() + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(grpc_unsecure + src/core/channelz/channel_trace.cc + src/core/channelz/channelz.cc +@@ -3547,6 +3559,8 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + if(gRPC_BUILD_TESTS) + + add_library(gtest +@@ -3621,6 +3635,8 @@ target_link_libraries(gtest + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(upb_base_lib + third_party/upb/upb/base/status.c + ) +@@ -4108,6 +4124,8 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + if(gRPC_BUILD_TESTS) + + if(gRPC_BUILD_CODEGEN) +@@ -4193,6 +4211,8 @@ endif() + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(grpc++ + src/core/ext/transport/binder/client/binder_connector.cc + src/core/ext/transport/binder/client/channel_create.cc +@@ -4684,6 +4704,7 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + if(gRPC_BUILD_CODEGEN) + add_library(grpc++_reflection ${_gRPC_STATIC_WIN32} +@@ -4967,6 +4988,8 @@ target_link_libraries(grpc++_test_util + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(grpc++_unsecure + src/cpp/client/call_credentials.cc + src/cpp/client/channel_cc.cc +@@ -5707,6 +5730,7 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + add_library(grpc_plugin_support + src/compiler/cpp_generator.cc +@@ -5769,7 +5793,7 @@ foreach(_hdr + endforeach() + + +-if(gRPC_INSTALL) ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + install(TARGETS grpc_plugin_support EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} +@@ -16520,7 +16544,7 @@ target_link_libraries(grpc_completion_queue_test + + + endif() +-if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) ++if(gRPC_BUILD_GRPC_CPP_PLUGIN) + + add_executable(grpc_cpp_plugin + src/compiler/cpp_plugin.cc +@@ -16548,7 +16572,7 @@ target_link_libraries(grpc_cpp_plugin + + + +-if(gRPC_INSTALL) ++if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} +@@ -37968,7 +37992,7 @@ endif() + + + +- ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + + if(gRPC_INSTALL) + install(EXPORT gRPCTargets +@@ -38089,3 +38113,5 @@ generate_pkgconfig( + "-lgrpcpp_otel_plugin" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib" + "grpcpp_otel_plugin.pc") ++ ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY +\ No newline at end of file +-- +2.34.1 + diff --git a/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch new file mode 100644 index 0000000000..0cd5012b26 --- /dev/null +++ b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch @@ -0,0 +1,38 @@ +From 2a73f6439b6d745b2cbfff120dc7adc555400247 Mon Sep 17 00:00:00 2001 +From: Michael Nosthoff +Date: Fri, 22 Jul 2022 08:49:48 +0200 +Subject: [PATCH] disable unconditionally downloading api repos + +The Buildroot build doesn't need those submodules, so disable them hard +for now. + +See https://github.com/grpc/grpc/issues/30385 + +Signed-off-by: Michael Nosthoff +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94f8fd3e93..df43d2e193 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -402,6 +402,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) + include(cmake/opentelemetry-cpp.cmake) + endif() + ++if(FALSE) + # Setup external proto library at third_party/envoy-api with 2 download URLs + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api AND gRPC_DOWNLOAD_ARCHIVES) + # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. +@@ -478,6 +479,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds AND gRPC_DOWNLOAD_ARC + xds-3a472e524827f72d1ad621c4983dd5af54c46776 + ) + endif() ++endif() + + if(WIN32) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) +-- +2.34.1 + diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index e6b76dcb5e..08aada1454 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 79ed4ab72fa9589b20f8b0b76c16e353e4cfec1d773d33afad605d97b5682c61 grpc-1.66.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9125b1f9f6..39be4f583f 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.51.1 +GRPC_VERSION = 1.66.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE @@ -29,6 +29,7 @@ GRPC_CONF_OPTS = \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_BUILD_CODEGEN=OFF \ -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ @@ -58,11 +59,6 @@ GRPC_CFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY GRPC_CXXFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY endif -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -GRPC_CFLAGS += -O0 -GRPC_CXXFLAGS += -O0 -endif - GRPC_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" diff --git a/package/gsl/gsl.hash b/package/gsl/gsl.hash index 153ae4131d..d6a3307e43 100644 --- a/package/gsl/gsl.hash +++ b/package/gsl/gsl.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b gsl-2.7.1.tar.gz +sha256 6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190 gsl-2.8.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 575cb75462..f5d22caccf 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSL_VERSION = 2.7.1 +GSL_VERSION = 2.8 GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index 06bf51090f..eabbf6e7c7 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gssdp/1.6/gssdp-1.6.3.sha256sum: -sha256 2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446 gssdp-1.6.3.tar.xz +# Hash from: https://download.gnome.org/sources/gssdp/1.6/gssdp-1.6.4.sha256sum: +sha256 ff97fdfb7f561d3e6813b4f6a2145259e7c2eff43cc0e63f3fd031d0b6266032 gssdp-1.6.4.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index 3b446496ea..d8c34760d3 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -5,7 +5,7 @@ ################################################################################ GSSDP_VERSION_MAJOR = 1.6 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).4 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = https://download.gnome.org/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index 8fe8a34395..67c33e5d4e 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -15,7 +15,6 @@ source "package/gstreamer1/gst1-python/Config.in" source "package/gstreamer1/gst1-rtsp-server/Config.in" source "package/gstreamer1/gst1-shark/Config.in" source "package/gstreamer1/gst1-vaapi/Config.in" -source "package/gstreamer1/gst-omx/Config.in" source "package/gstreamer1/gstd/Config.in" source "package/gstreamer1/gstreamer1-editing-services/Config.in" endif diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 6cf7c9597f..9009b96935 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum -sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.24.13.tar.xz.sha256sum +sha256 2485b30dfb94b65e2e4befb0b9367fbecbfcf2102b24fa9138df4403497e7b73 gst-devtools-1.24.13.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 0c085b8b42..d56d99495c 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.9 +GST1_DEVTOOLS_VERSION = 1.24.13 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index b5bc84d672..57416e4ccb 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum -sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.24.13.tar.xz.sha256sum +sha256 150e2b70588fa32a1294f42665756f2175417ce4b5988e2c2081b683719aa6c1 gst-libav-1.24.13.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 1b872b7fa9..f01ca0de45 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.9 +GST1_LIBAV_VERSION = 1.24.13 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index e85ec16784..4a78e9b694 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -396,11 +396,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK comment "decklink needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB - bool "directfb" - default y - depends on BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB bool "dvb" # FEC_2_5 / QAM_4_NR definitions @@ -525,16 +520,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL bool "openal" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS select BR2_PACKAGE_OPENAL -comment "openal plugin needs a toolchain w/ NPTL, C++, gcc >= 4.9" +comment "openal plugin needs a toolchain w/ NPTL, C++, gcc >= 9" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 bool "openh264" @@ -657,19 +652,25 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP bool "webp" select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_MUX help Webp image format plugin config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC bool "webrtc" depends on !BR2_STATIC_LIBS # libnice -> gnutls + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # gst1-plugins-bad sctp select BR2_PACKAGE_GST1_PLUGINS_BASE # libgstsdp select BR2_PACKAGE_LIBNICE + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP help WebRTC plugins (webrtcbin - a bin for webrtc connections) comment "webrtc needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP bool "webrtcdsp" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 174c4ad572..8d173ad38d 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum -sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.13.tar.xz.sha256sum +sha256 3cbe7d7cec5db958781f7ab66caa5afd67b133c223fde71f0403277731f0cc4d gst-plugins-bad-1.24.13.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index a61038376f..99aa258786 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.9 +GST1_PLUGINS_BAD_VERSION = 1.24.13 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ + -Daja=disabled \ -Dasio=disabled \ -Davtp=disabled \ -Dopensles=disabled \ @@ -42,18 +43,22 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dbs2b=disabled \ -Dchromaprint=disabled \ -Dd3d11=disabled \ + -Dd3d12=disabled \ -Ddc1394=disabled \ -Ddts=disabled \ + -Ddwrite=disabled \ -Dresindvd=disabled \ -Dfaac=disabled \ -Dflite=disabled \ -Dgs=disabled \ -Dgsm=disabled \ - -Dkate=disabled \ + -Dinsertbin=disabled \ -Dladspa=disabled \ + -Dlc3=disabled \ -Dldac=disabled \ -Dlv2=disabled \ -Dmediafoundation=disabled \ + -Dmse=disabled \ -Dmicrodns=disabled \ -Dlibde265=disabled \ -Dmodplug=disabled \ @@ -65,15 +70,22 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dwildmidi=disabled \ -Dsmoothstreaming=disabled \ -Dsoundtouch=disabled \ + -Dsvtav1=disabled \ -Dgme=disabled \ -Dspandsp=disabled \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ + -Dunixfd=disabled \ + -Dudev=disabled \ + -Duvcgadget=disabled \ + -Dvulkan=disabled \ + -Dx11=disabled \ -Dwasapi2=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ - -Dopencv=disabled + -Dopencv=disabled \ + -Ddirectfb=disabled GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 @@ -547,13 +559,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += directfb -else -GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables @@ -748,10 +753,13 @@ ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dva=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libva ifeq ($(BR2_PACKAGE_LIBDRM),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Ddrm=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libdrm endif else -GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled +GST1_PLUGINS_BAD_CONF_OPTS += \ + -Ddrm=disabled \ + -Dva=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 060a871b95..cbe3a00566 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum -sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.24.13.tar.xz.sha256sum +sha256 31a4a34e02df0471274fd0e8016495475b670320d20a3349faf0634340166c42 gst-plugins-base-1.24.13.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 512e3fdee2..456cd205bb 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.9 +GST1_PLUGINS_BASE_VERSION = 1.24.13 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash index 1efaf6421d..7a9a009a5d 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6ae89adf1979edf5760bbf2fb589dcaa905cff55bb828e6b271bc3d1e403a130 gst1-plugins-bayer2rgb-neon-b630798efcd611879e7cb1c246052e5ba1acc41d-git4.tar.gz +sha256 e44fbe895310fd3fd0e43d02fadda3ad33bd00ec79159bf305c44f2919c68612 gst1-plugins-bayer2rgb-neon-v0.6.0-11-g7e06aa310805b1600d12f1d3bb0058aa02ab8f83-git4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk index 0d4aeac7f5..de9a8b4bad 100644 --- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk +++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAYER2RGB_NEON_VERSION = b630798efcd611879e7cb1c246052e5ba1acc41d +GST1_PLUGINS_BAYER2RGB_NEON_VERSION = v0.6.0-11-g7e06aa310805b1600d12f1d3bb0058aa02ab8f83 GST1_PLUGINS_BAYER2RGB_NEON_SITE = https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon.git GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 3cf227b78d..6a738faa00 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -419,7 +419,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX bool "vpx (webm)" - depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libvpx select BR2_PACKAGE_LIBVPX help VP8 plugin diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 4410da6ef4..a8b17f3d0d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum -sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.24.13.tar.xz.sha256sum +sha256 574ac6f9fd84b32eb04e80572391d6762df6f9802a47bc0386cd6cc48c14d08b gst-plugins-good-1.24.13.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 2bb826d807..cd1b9f45b9 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.9 +GST1_PLUGINS_GOOD_VERSION = 1.24.13 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING @@ -27,6 +27,10 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \ -Dosxvideo=disabled \ -Daalib=disabled \ -Dlibcaca=disabled \ + -Damrnb=disabled \ + -Damrwbdec=disabled \ + -Dsoup=disabled \ + -Dximagesrc-navigation=disabled \ -Ddoc=disabled # Options which require currently unpackaged libraries diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 20394619b0..322c61790f 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum -sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.24.13.tar.xz.sha256sum +sha256 dc08bb11dce0a43453466fb9034e4fe06709fb5af68475bcf6d288693b661a5d gst-plugins-ugly-1.24.13.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 7bb95dd1d0..02b6e59e3c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.9 +GST1_PLUGINS_UGLY_VERSION = 1.24.13 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING @@ -19,8 +19,6 @@ GST1_PLUGINS_UGLY_CONF_OPTS += \ GST1_PLUGINS_UGLY_CONF_OPTS += \ -Da52dec=disabled \ - -Damrnb=disabled \ - -Damrwbdec=disabled \ -Dcdio=disabled \ -Dsidplay=disabled diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2f352df92e..917ec1e6dc 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum -sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.24.13.tar.xz.sha256sum +sha256 abb9a1edc11d67a463b6cef7b74a8b10ea6c342760c012d597102a7bfb7e09da gst-python-1.24.13.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 501ca5e02b..87120fbc74 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.9 +GST1_PYTHON_VERSION = 1.24.13 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 21f380378c..9fc7a0f9ea 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum -sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.24.13.tar.xz.sha256sum +sha256 e8dd102a3d1026414f0048daed91078e7958012b56efea7e45fe2b3448b42d6f gst-rtsp-server-1.24.13.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 87e6413d00..2b54692b4a 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.9 +GST1_RTSP_SERVER_VERSION = 1.24.13 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index ec23ae7c6b..b01ff938af 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum -sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.24.13.tar.xz.sha256sum +sha256 b92c008841387043aec83b08b1fa8cf41e7866a106311a7d99e274e7d24ddc47 gstreamer-vaapi-1.24.13.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index d934bab233..418369c38e 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.9 +GST1_VAAPI_VERSION = 1.24.13 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 632f83f8e8..bdbc137287 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f4a83765d2cf2948c38abc5107ab07d49a01b4101047f188fed7204f1d4e49c7 gstd-0.15.0.tar.gz +sha256 d9d3205551482acd6b7ec2a865407b60efce252e8f747553628401c84f88c556 gstd-0.15.2.tar.gz sha256 10162be9f7ddb9e98c22c3edd0f78d62ab88f0ca8b1cc968bd85d5d665489d90 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 965ede7949..d855fc52f0 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTD_VERSION = 0.15.0 +GSTD_VERSION = 0.15.2 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING GSTD_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 2ea29dae61..4c94cbbf07 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,6 +1,6 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.9.tar.xz.sha256sum -sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.24.13.tar.xz.sha256sum +sha256 e9792ecff0df0b1dbbf90cfb271b9ce840bc048148c2d9d49fb6c6062bd18f4d gst-editing-services-1.24.13.tar.xz # Hashes for license files: -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING +sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index e2c0f1ccf8..c59315fbc2 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.24.13 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index b6ed001eb3..edfd60d9d3 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum -sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.24.13.tar.xz.sha256sum +sha256 ed4678e1d0708db01a469ae5dd31c10cac73c0fb3f7c2c471b0d3cab0affc7d1 gstreamer-1.24.13.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 5b9125e62a..e9299e9e93 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.9 +GSTREAMER1_VERSION = 1.24.13 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES diff --git a/package/gtest/Config.in b/package/gtest/Config.in index 25d756f72c..695e504aa2 100644 --- a/package/gtest/Config.in +++ b/package/gtest/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GTEST depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_MMU # fork() help Google's framework for writing C++ tests on a variety of @@ -44,7 +44,7 @@ config BR2_PACKAGE_GTEST_GMOCK endif # BR2_PACKAGE_GTEST -comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5" +comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 7" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index e256c4dbfc..95cd4adc85 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926 gtest-1.15.2.tar.gz +sha256 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c gtest-1.17.0.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index c435fd1286..1eab9371a1 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.15.2 +GTEST_VERSION = 1.17.0 GTEST_SITE = $(call github,google,googletest,v$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO diff --git a/package/gtk2-engines/Config.in b/package/gtk2-engines/Config.in deleted file mode 100644 index 756a7d00f1..0000000000 --- a/package/gtk2-engines/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_GTK2_ENGINES - bool "gtk engines" - depends on BR2_PACKAGE_LIBGTK2 - help - A collection of basic theme engines for GTK+. diff --git a/package/gtk2-engines/gtk2-engines.hash b/package/gtk2-engines/gtk2-engines.hash deleted file mode 100644 index 71a0ecd213..0000000000 --- a/package/gtk2-engines/gtk2-engines.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://download.gnome.org/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum -sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2 -# Locally computed -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk deleted file mode 100644 index ea41bccaea..0000000000 --- a/package/gtk2-engines/gtk2-engines.mk +++ /dev/null @@ -1,88 +0,0 @@ -################################################################################ -# -# gtk2-engines -# -################################################################################ - -GTK2_ENGINES_VERSION_MAJOR = 2.20 -GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2 -GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2 -GTK2_ENGINES_SITE = https://download.gnome.org/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) -GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool -GTK2_ENGINES_LICENSE = LGPL-2.1+ -GTK2_ENGINES_LICENSE_FILES = COPYING - -GTK2_ENGINES_CONF_ENV = \ - ac_cv_func_posix_getpwuid_r=yes \ - glib_cv_stack_grows=no \ - glib_cv_uscore=no \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ - gl_cv_c_restrict=no \ - ac_cv_path_CUPS_CONFIG=no - -GTK2_ENGINES_CONF_OPTS = \ - --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --enable-explicit-deps=no \ - --enable-clearlooks \ - --disable-crux \ - --disable-hc \ - --disable-industrial \ - --disable-mist \ - --disable-redmond \ - --disable-smooth \ - --disable-glide \ - --disable-thinice \ - --enable-animation \ - --disable-development \ - --disable-paranoia \ - --disable-deprecated - -$(eval $(autotools-package)) diff --git a/package/gtkiostream/gtkiostream.mk b/package/gtkiostream/gtkiostream.mk index bc3d859d4e..c748c7a000 100644 --- a/package/gtkiostream/gtkiostream.mk +++ b/package/gtkiostream/gtkiostream.mk @@ -39,10 +39,6 @@ ifeq ($(BR2_PACKAGE_LIBGLIB2),y) GTKIOSTREAM_DEPENDENCIES += libglib2 endif -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -GTKIOSTREAM_DEPENDENCIES += libgtk2 -endif - ifeq ($(BR2_PACKAGE_LIBGTK3),y) GTKIOSTREAM_DEPENDENCIES += libgtk3 endif diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in index 6b924c856b..ac38ba06fc 100644 --- a/package/gtkmm3/Config.in +++ b/package/gtkmm3/Config.in @@ -1,17 +1,13 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS config BR2_PACKAGE_GTKMM3 bool "gtkmm3" - # Broken on existing external/internal nios2 toolchains, - # revisit when they are upgraded with at least Binutils >= 2.26 - # and GCC >= 5.3. - # https://sourceware.org/bugzilla/show_bug.cgi?id=19405 - depends on !BR2_nios2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 @@ -19,6 +15,7 @@ config BR2_PACKAGE_GTKMM3 depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 depends on BR2_PACKAGE_LIBGTK3 + depends on !BR2_STATIC_LIBS # atkmm select BR2_PACKAGE_ATKMM2_28 select BR2_PACKAGE_CAIROMM1_14 select BR2_PACKAGE_GLIBMM2_66 diff --git a/package/gtkmm3/gtkmm3.hash b/package/gtkmm3/gtkmm3.hash index 9bfd68e027..3671a1d001 100644 --- a/package/gtkmm3/gtkmm3.hash +++ b/package/gtkmm3/gtkmm3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtkmm/3.24/gtkmm-3.24.8.sha256sum -sha256 d2940c64922e5b958554b23d4c41d1839ea9e43e0d2e5b3819cfb46824a098c4 gtkmm-3.24.8.tar.xz +# From https://download.gnome.org/sources/gtkmm/3.24/gtkmm-3.24.10.sha256sum +sha256 7ab7e2266808716e26c39924ace1fb46da86c17ef39d989624c42314b32b5a76 gtkmm-3.24.10.tar.xz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index f4fc54849c..5a7e494bf7 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -5,7 +5,7 @@ ################################################################################ GTKMM3_VERSION_MAJOR = 3.24 -GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).8 +GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).10 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) diff --git a/package/gtkperf/Config.in b/package/gtkperf/Config.in deleted file mode 100644 index a763e305c7..0000000000 --- a/package/gtkperf/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_GTKPERF - bool "gtkperf (performance test for GTK2)" - depends on BR2_PACKAGE_LIBGTK2 - help - GtkPerf is an application designed to test GTK+ performance. - The point is to create common testing platform to run - predefined GTK+ widgets - e.g. (opening comboboxes, toggling buttons, scrolling text - yms.) and this way define the speed of device/platform. - - http://gtkperf.sourceforge.net/ diff --git a/package/gtkperf/gtkperf.hash b/package/gtkperf/gtkperf.hash deleted file mode 100644 index 72f35a26f2..0000000000 --- a/package/gtkperf/gtkperf.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b gtkperf_0.40.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk deleted file mode 100644 index cc0433984c..0000000000 --- a/package/gtkperf/gtkperf.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# gtkperf -# -################################################################################ - -GTKPERF_VERSION = 0.40 -GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz -GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION) -GTKPERF_DEPENDENCIES = libgtk2 $(TARGET_NLS_DEPENDENCIES) -GTKPERF_LICENSE = GPL-2.0 -GTKPERF_LICENSE_FILES = COPYING -GTKPERF_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) - -$(eval $(autotools-package)) diff --git a/package/gumbo-parser/Config.in b/package/gumbo-parser/Config.in index 04bb2294bb..7ebc439413 100644 --- a/package/gumbo-parser/Config.in +++ b/package/gumbo-parser/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_GUMBO_PARSER other tools and libraries such as linters, validators, templating languages, and refactoring and analysis tools. - https://github.com/google/gumbo-parser + https://codeberg.org/gumbo-parser/gumbo-parser/ diff --git a/package/gumbo-parser/gumbo-parser.hash b/package/gumbo-parser/gumbo-parser.hash index c4af33072c..b8809d4db9 100644 --- a/package/gumbo-parser/gumbo-parser.hash +++ b/package/gumbo-parser/gumbo-parser.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad gumbo-parser-0.10.1.tar.gz +sha256 dbdc159dc8e5c6f3f254e50bce689dd9e439064ff06c165d5653410a5714ab66 0.13.2.tar.gz # Hash for license files: -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 doc/COPYING diff --git a/package/gumbo-parser/gumbo-parser.mk b/package/gumbo-parser/gumbo-parser.mk index 8c9330ae70..6abd24415a 100644 --- a/package/gumbo-parser/gumbo-parser.mk +++ b/package/gumbo-parser/gumbo-parser.mk @@ -4,10 +4,11 @@ # ################################################################################ -GUMBO_PARSER_VERSION = 0.10.1 -GUMBO_PARSER_SITE = $(call github,google,gumbo-parser,v$(GUMBO_PARSER_VERSION)) +GUMBO_PARSER_VERSION = 0.13.2 +GUMBO_PARSER_SITE = https://codeberg.org/gumbo-parser/gumbo-parser/archive +GUMBO_PARSER_SOURCE = $(GUMBO_PARSER_VERSION).tar.gz GUMBO_PARSER_LICENSE = Apache-2.0 -GUMBO_PARSER_LICENSE_FILES = COPYING +GUMBO_PARSER_LICENSE_FILES = doc/COPYING GUMBO_PARSER_INSTALL_STAGING = YES GUMBO_PARSER_AUTORECONF = YES GUMBO_PARSER_CONF_OPTS = --disable-examples diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index c8ed0db2a4..27f974165a 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.1.sha256sum: -sha256 b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f gupnp-av-0.14.1.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.4.sha256sum: +sha256 21d974b3275cb5dcf5b8aa1d9a3fc80e7edca706935f6fbd004c79787138f8c7 gupnp-av-0.14.4.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 3821c4e170..fdc4d70343 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_AV_VERSION_MAJOR = 0.14 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).1 +GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).4 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = https://download.gnome.org/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPL-2.1+ diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index b8a3fa082e..61cdd19e5f 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp/1.6/gupnp-1.6.6.sha256sum: -sha256 c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f gupnp-1.6.6.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp/1.6/gupnp-1.6.9.sha256sum: +sha256 2edb6ee3613558e62f538735368aee27151b7e09d4e2e2c51606833da801869b gupnp-1.6.9.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index cfcc114189..7ace1dc25b 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.6 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).6 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).9 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in index 68ad291436..720b8e6c20 100644 --- a/package/gvfs/Config.in +++ b/package/gvfs/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_GVFS all applications using the gio API. It also supports exposing the gvfs mounts to non-gio applications using fuse. - https://wiki.gnome.org/action/show/Projects/gvfs + https://wiki.gnome.org/Projects/gvfs comment "gvfs needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index fc068ddb94..4f81421af6 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gvfs/1.48/gvfs-1.48.1.sha256sum -sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz +# From https://download.gnome.org/sources/gvfs/1.57/gvfs-1.57.2.sha256sum +sha256 f16bef8eca1fd6c117e85db011d21e915669790d55867349c5f1b291299e9585 gvfs-1.57.2.tar.xz # Hash for license file sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 50efed1abb..b46b438dc6 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.48 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 +GVFS_VERSION_MAJOR = 1.57 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).2 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES @@ -28,6 +28,7 @@ GVFS_CONF_OPTS = \ -Dafc=false \ -Dgoa=false \ -Dgoogle=false \ + -Donedrive=false \ -Dmtp=false \ -Dsftp=false \ -Dudisks2=false @@ -125,8 +126,8 @@ else GVFS_CONF_OPTS += -Dkeyring=false endif -ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy) -GVFS_DEPENDENCIES += libsoup libxml2 +ifeq ($(BR2_PACKAGE_LIBSOUP3)$(BR2_PACKAGE_LIBXML2),yy) +GVFS_DEPENDENCIES += libsoup3 libxml2 GVFS_CONF_OPTS += -Dhttp=true else GVFS_CONF_OPTS += -Dhttp=false diff --git a/package/gzip/gzip.hash b/package/gzip/gzip.hash index 4d9d0c721b..90c9be4e6e 100644 --- a/package/gzip/gzip.hash +++ b/package/gzip/gzip.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gzip/gzip-1.13.tar.xz.sig +# https://ftp.gnu.org/gnu/gzip/gzip-1.14.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057 gzip-1.13.tar.xz +sha256 01a7b881bd220bfdf615f97b8718f80bdfd3f6add385b993dcf6efd14e8c0ac6 gzip-1.14.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 330321352c..e79de4c99e 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -GZIP_VERSION = 1.13 +GZIP_VERSION = 1.14 GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz GZIP_SITE = $(BR2_GNU_MIRROR)/gzip # Some other tools expect it to be in /bin diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in index b348eb9d8a..320508f7ee 100644 --- a/package/haproxy/Config.in +++ b/package/haproxy/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS bool default y - # src/proto_http.c:6330:1: internal compiler error: Segmentation fault - depends on !BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040 depends on !(BR2_sh4 && !BR2_TOOLCHAIN_GCC_AT_LEAST_7) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 74390c2ff5..42f340fa80 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz.sha256 -sha256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd haproxy-2.6.15.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.22.tar.gz.sha256 +sha256 4c0797f450f997dc287d2c7aafa7a0e5b7a2d71593a2cd58e664e8f3aea614fa haproxy-2.6.22.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 61a9ebebe4..77195d966b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).15 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).22 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 562727d3df..dbe10255ec 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b2cb13bd351904cb9038f907dc0dee0ae07127061242fe3556b2795c4e9748fc harfbuzz-10.0.1.tar.xz +sha256 ecb603aa426a8b24665718667bda64a84c1504db7454ee4cadbd362eea64e545 harfbuzz-12.2.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 510c0a946c..268e4ac5d0 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 10.0.1 +HARFBUZZ_VERSION = 12.2.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) diff --git a/package/haveged/haveged.hash b/package/haveged/haveged.hash index 61bf6cc9a1..066e21c132 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7 haveged-1.9.18.tar.gz +sha256 acbb05776668657012273be9bb3310e3140b79959aa4538e4cca8d30d40c0b8f haveged-1.9.19.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index fbf72a96ad..0e377d36ce 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.18 +HAVEGED_VERSION = 1.9.19 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING diff --git a/package/hddtemp/0001-fix-build-without-nls.patch b/package/hddtemp/0001-fix-build-without-nls.patch new file mode 100644 index 0000000000..356b94b010 --- /dev/null +++ b/package/hddtemp/0001-fix-build-without-nls.patch @@ -0,0 +1,40 @@ +From c9d0d249ff013d33cf1fd5a586c16ee30095cc90 Mon Sep 17 00:00:00 2001 +From: Nicolas PARLANT +Date: Fri, 14 Feb 2025 10:08:43 +0100 +Subject: [PATCH] fix build without nls +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +> hddtemp.c: In function ‘main’: +> hddtemp.c:274:3: error: implicit declaration of function ‘bindtextdomain’ [-Wimplicit-function-declaration] +> 274 | bindtextdomain (PACKAGE, LOCALEDIR); +> | ^~~~~~~~~~~~~~ +> hddtemp.c:275:3: error: implicit declaration of function ‘textdomain’ [-Wimplicit-function-declaration] +> 275 | textdomain (PACKAGE); +> | ^~~~~~~~~~ +> make[2]: *** [Makefile:496: hddtemp-hddtemp.o] Error 1 + +Upstream: https://github.com/vitlav/hddtemp/pull/16 + +Signed-off-by: Bernd Kuhls +--- + src/hddtemp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/hddtemp.c b/src/hddtemp.c +index 64d000e..bfea556 100644 +--- a/src/hddtemp.c ++++ b/src/hddtemp.c +@@ -270,9 +270,11 @@ int main(int argc, char* argv[]) { + backtrace_sigill(); + backtrace_sigbus(); + ++#if ENABLE_NLS + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); ++#endif + + show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0; + unit = DEFAULT; diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index 250ddbbd4d..5575b52f86 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17.tar.gz +sha256 aa679a6ad0349e266ec8a886b6be8085564f959183e948551a8e7d782ffaf623 heimdal-8c3c97bdf6c06200418f1a85aa22beaa441c6b23.tar.gz sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 786d94a1aa..6bba641e2c 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,15 +4,12 @@ # ################################################################################ -HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 +HEIMDAL_VERSION = 8c3c97bdf6c06200418f1a85aa22beaa441c6b23 HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) -HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_DEPENDENCIES = host-ncurses host-pkgconf host-libxcrypt host-flex host-bison HOST_HEIMDAL_AUTORECONF = YES -HEIMDAL_INSTALL_STAGING = YES -# static because of -fPIC issues with e2fsprogs on x86_64 host + HOST_HEIMDAL_CONF_OPTS = \ - --disable-shared \ - --enable-static \ --without-openldap \ --without-capng \ --with-db-type-preference= \ @@ -29,18 +26,19 @@ HOST_HEIMDAL_CONF_OPTS = \ --disable-heimdal-documentation # Don't use compile_et from e2fsprogs as it raises a build failure with samba4 -HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true +HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true LIBS=-lcrypt HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE HEIMDAL_CPE_ID_VALID = YES -# We need compile_et for samba4 -define HOST_HEIMDAL_INSTALL_COMPILE_ET - $(INSTALL) -m 0755 $(@D)/lib/com_err/compile_et \ - $(HOST_DIR)/bin/compile_et +# We need compile_et for samba4 and slc for target version of heimdal +# By default compile_et is not installed so we install it to bin +# By default slc is installed in libexec directory so we just link it +define HOST_HEIMDAL_INSTALL_BINARIES + $(INSTALL) -m 0755 $(@D)/lib/com_err/compile_et $(HOST_DIR)/bin/compile_et + ln -sf $(HOST_DIR)/libexec/heimdal/slc $(HOST_DIR)/bin/slc endef -HOST_HEIMDAL_POST_INSTALL_HOOKS += \ - HOST_HEIMDAL_INSTALL_COMPILE_ET +HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_INSTALL_BINARIES $(eval $(host-autotools-package)) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in deleted file mode 100644 index 8bcee3f098..0000000000 --- a/package/hiawatha/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -comment "hiawatha needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_HIAWATHA - bool "hiawatha" - # needs fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_ZLIB - help - Hiawatha is a webserver for Unix and has been built with - security in mind. This resulted in a highly secure - webserver, in both code and features. - - This webserver runs on Linux, BSD, MacOS X and - Windows. Although it can run any kind of CGI / FastCGI - application, it has been optimized for usage with PHP. Most - well known PHP frameworks and CMS applications have been - tested with Hiawatha and ran without a problem. Hiawatha - supports many web and HTTP features such as CGI/FastCGI, - HTTP authentication, virtual host support, request - pipelining, keep alive connections, URL rewriting and many - more. - - https://hiawatha.leisink.net/ - -if BR2_PACKAGE_HIAWATHA - -config BR2_PACKAGE_HIAWATHA_SSL - bool "hiawatha TLS support" - -endif diff --git a/package/hiawatha/hiawatha.hash b/package/hiawatha/hiawatha.hash deleted file mode 100644 index 1ee94ee69a..0000000000 --- a/package/hiawatha/hiawatha.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 99c64f76927f93469f062ab76b74eb79a397ea4be12da86bf746b2bb57cf1bc5 hiawatha-11.2.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk deleted file mode 100644 index 4c94f0067e..0000000000 --- a/package/hiawatha/hiawatha.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# hiawatha -# -################################################################################ - -HIAWATHA_VERSION = 11.2 -HIAWATHA_SITE = https://hiawatha.leisink.net/files -HIAWATHA_DEPENDENCIES = zlib -HIAWATHA_LICENSE = GPL-2.0 -HIAWATHA_LICENSE_FILES = LICENSE -HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver - -# Disable system mbedtls as hiawatha needs mbedtls 3.x -HIAWATHA_CONF_OPTS = \ - -DINSTALL_MBEDTLS_HEADERS=OFF \ - -DUSE_SYSTEM_MBEDTLS=OFF \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ - -DENABLE_TOOLKIT=OFF \ - -DCONFIG_DIR=/etc/hiawatha \ - -DLOG_DIR=/var/log \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha - -define HIAWATHA_MBEDTLS_DISABLE_ASM - $(SED) '/^#define MBEDTLS_AESNI_C/d' \ - $(@D)/mbedtls/include/mbedtls/mbedtls_config.h - $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ - $(@D)/mbedtls/include/mbedtls/mbedtls_config.h - $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ - $(@D)/mbedtls/include/mbedtls/mbedtls_config.h -endef - -# ARM in thumb mode breaks debugging with asm optimizations -# Microblaze asm optimizations are broken in general -# MIPS R6 asm is not yet supported -ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) -HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM -else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM -endif - -ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON -else -HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) -HIAWATHA_DEPENDENCIES += libxcrypt -endif - -ifeq ($(BR2_PACKAGE_LIBXSLT),y) -HIAWATHA_CONF_OPTS += -DENABLE_XSLT=ON -HIAWATHA_DEPENDENCIES += libxslt -else -HIAWATHA_CONF_OPTS += -DENABLE_XSLT=OFF -endif - -$(eval $(cmake-package)) diff --git a/package/hidapi/hidapi.hash b/package/hidapi/hidapi.hash index cc2d13214d..7344d55397 100644 --- a/package/hidapi/hidapi.hash +++ b/package/hidapi/hidapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd hidapi-0.14.0.tar.gz +sha256 5d84dec684c27b97b921d2f3b73218cb773cf4ea915caee317ac8fc73cef8136 hidapi-0.15.0.tar.gz sha256 7d3b087c34f35d4d538e3bcddd1ff8f66e92f9ef336881999482800ddf840913 LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-gpl3.txt sha256 30eb1bef29b46f8ba7ab8b416035dbd93cb034a45481dd97815b944284582cd2 LICENSE-bsd.txt diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk index 9f5c0a3df2..c4daf934ee 100644 --- a/package/hidapi/hidapi.mk +++ b/package/hidapi/hidapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIDAPI_VERSION = 0.14.0 +HIDAPI_VERSION = 0.15.0 HIDAPI_SITE = $(call github,libusb,hidapi,hidapi-$(HIDAPI_VERSION)) HIDAPI_INSTALL_STAGING = YES # No configure provided, so we need to autoreconf. diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 5addf50eee..78c0dea580 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 7e0be78b8318e8bdbf6fa545d2ecb4c90f947df03f7aadc42c1967f019e63343 highway-1.2.0.tar.gz +sha256 07b3c1ba2c1096878a85a31a5b9b3757427af963b1141ca904db2f9f4afe0bc2 highway-1.3.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index a74bc90dd3..2644201722 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.2.0 +HIGHWAY_VERSION = 1.3.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 diff --git a/package/hiredis/hiredis.hash b/package/hiredis/hiredis.hash index 16ee442d93..b9b4fe556e 100644 --- a/package/hiredis/hiredis.hash +++ b/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 82ad632d31ee05da13b537c124f819eb88e18851d9cb0c30ae0552084811588c hiredis-1.2.0.tar.gz +sha256 25cee4500f359cf5cad3b51ed62059aadfc0939b05150c1f19c7e2829123631c hiredis-1.3.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index 86f35bd4cd..f7acb2f131 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 1.2 +HIREDIS_VERSION_MAJOR = 1.3 HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause diff --git a/package/hostapd/0001-RADIUS-Drop-pending-request-only-when-accepting-the-response.patch b/package/hostapd/0001-RADIUS-Drop-pending-request-only-when-accepting-the-response.patch new file mode 100644 index 0000000000..fb86d1303d --- /dev/null +++ b/package/hostapd/0001-RADIUS-Drop-pending-request-only-when-accepting-the-response.patch @@ -0,0 +1,82 @@ +From 726432d7622cc0088ac353d073b59628b590ea44 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 25 Jan 2025 11:21:16 +0200 +Subject: RADIUS: Drop pending request only when accepting the response + +The case of an invalid authenticator in a RADIUS response could imply +that the response is not from the correct RADIUS server and as such, +such a response should be discarded without changing internal state for +the pending request. The case of an unknown response (RADIUS_RX_UNKNOWN) +is somewhat more complex since it could have been indicated before +validating the authenticator. In any case, it seems better to change the +state for the pending request only when we have fully accepted the +response. + +Allowing the internal state of pending RADIUS request to change based on +responses that are not fully validation could have allow at least a +theoretical DoS attack if an attacker were to have means for injecting +RADIUS messages to the network using the IP address of the real RADIUS +server and being able to do so more quickly than the real server and +with the matching identifier from the request header (i.e., either by +flooding 256 responses quickly or by having means to capture the RADIUS +request). These should not really be realistic options in a properly +protected deployment, but nevertheless it is good to be more careful in +processing RADIUS responses. + +Remove a pending RADIUS request from the internal list only when having +fully accepted a matching RADIUS response, i.e., after one of the +registered handlers has confirmed that the authenticator is valid and +processing of the response has succeeded. + +Upstream: https://git.w1.fi/cgit/hostap/commit/?id=726432d7622cc0088ac353d073b59628b590ea44 +CVE: CVE-2025-24912 + +Signed-off-by: Jouni Malinen +Signed-off-by: Titouan Christophe +--- + src/radius/radius_client.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c +index 2a7f36170..7909b29a7 100644 +--- a/src/radius/radius_client.c ++++ b/src/radius/radius_client.c +@@ -1259,13 +1259,6 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + roundtrip / 100, roundtrip % 100); + rconf->round_trip_time = roundtrip; + +- /* Remove ACKed RADIUS packet from retransmit list */ +- if (prev_req) +- prev_req->next = req->next; +- else +- radius->msgs = req->next; +- radius->num_msgs--; +- + for (i = 0; i < num_handlers; i++) { + RadiusRxResult res; + res = handlers[i].handler(msg, req->msg, req->shared_secret, +@@ -1276,6 +1269,13 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + radius_msg_free(msg); + /* fall through */ + case RADIUS_RX_QUEUED: ++ /* Remove ACKed RADIUS packet from retransmit list */ ++ if (prev_req) ++ prev_req->next = req->next; ++ else ++ radius->msgs = req->next; ++ radius->num_msgs--; ++ + radius_client_msg_free(req); + return; + case RADIUS_RX_INVALID_AUTHENTICATOR: +@@ -1297,7 +1297,6 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + msg_type, hdr->code, hdr->identifier, + invalid_authenticator ? " [INVALID AUTHENTICATOR]" : + ""); +- radius_client_msg_free(req); + + fail: + radius_msg_free(msg); +-- +cgit v1.2.3 + diff --git a/package/hostapd/0002-RADIUS-Fix-pending-request-dropping.patch b/package/hostapd/0002-RADIUS-Fix-pending-request-dropping.patch new file mode 100644 index 0000000000..474f40da0c --- /dev/null +++ b/package/hostapd/0002-RADIUS-Fix-pending-request-dropping.patch @@ -0,0 +1,74 @@ +From 339a334551ca911187cc870f4f97ef08e11db109 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Wed, 5 Feb 2025 19:23:39 +0200 +Subject: RADIUS: Fix pending request dropping + +A recent change to this moved the place where the processed RADIUS +request was removed from the pending list to happen after the message +handler had been called. This did not take into account possibility of +the handler adding a new pending request in the list and the prev_req +pointer not necessarily pointing to the correct entry anymore. As such, +some of the pending requests could have been lost and that would result +in not being able to process responses to those requests and also, to a +memory leak. + +Fix this by determining prev_req at the point when the pending request +is being removed, i.e., after the handler function has already added a +new entry. + +Fixes: 726432d7622c ("RADIUS: Drop pending request only when accepting the response") + +Upstream: https://git.w1.fi/cgit/hostap/commit/?id=339a334551ca911187cc870f4f97ef08e11db109 +CVE: CVE-2025-24912 + +Signed-off-by: Jouni Malinen +Signed-off-by: Titouan Christophe +--- + src/radius/radius_client.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/radius/radius_client.c b/src/radius/radius_client.c +index 7909b29a7..d4faa7936 100644 +--- a/src/radius/radius_client.c ++++ b/src/radius/radius_client.c +@@ -1099,7 +1099,7 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + struct radius_hdr *hdr; + struct radius_rx_handler *handlers; + size_t num_handlers, i; +- struct radius_msg_list *req, *prev_req; ++ struct radius_msg_list *req, *prev_req, *r; + struct os_reltime now; + struct hostapd_radius_server *rconf; + int invalid_authenticator = 0; +@@ -1224,7 +1224,6 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + break; + } + +- prev_req = NULL; + req = radius->msgs; + while (req) { + /* TODO: also match by src addr:port of the packet when using +@@ -1236,7 +1235,6 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + hdr->identifier) + break; + +- prev_req = req; + req = req->next; + } + +@@ -1270,6 +1268,12 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx) + /* fall through */ + case RADIUS_RX_QUEUED: + /* Remove ACKed RADIUS packet from retransmit list */ ++ prev_req = NULL; ++ for (r = radius->msgs; r; r = r->next) { ++ if (r == req) ++ break; ++ prev_req = r; ++ } + if (prev_req) + prev_req->next = req->next; + else +-- +cgit v1.2.3 + diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 3eda1c7e83..d83b574fad 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -16,6 +16,10 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd +# 0001-RADIUS-Drop-pending-request-only-when-accepting-the-response.patch +# 0002-RADIUS-Fix-pending-request-dropping.patch +HOSTAPD_IGNORE_CVES += CVE-2025-24912 + HOSTAPD_CONFIG_ENABLE = \ CONFIG_INTERNAL_LIBTOMMATH \ CONFIG_DEBUG_FILE \ diff --git a/package/htop/htop.hash b/package/htop/htop.hash index 3e45e1a21a..0750ab0098 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,5 +1,5 @@ -# From https://github.com/htop-dev/htop/releases/download/3.3.0/htop-3.3.0.tar.xz.sha256 -sha256 a69acf9b42ff592c4861010fce7d8006805f0d6ef0e8ee647a6ee6e59b743d5c htop-3.3.0.tar.xz +# From https://github.com/htop-dev/htop/releases/download/3.4.1/htop-3.4.1.tar.xz.sha256 +sha256 904f7d4580fc11cffc7e0f06895a4789e0c1c054435752c151e812fead9f6220 htop-3.4.1.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 4fa8e4fb5f..55e3b9d57c 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 3.3.0 +HTOP_VERSION = 3.4.1 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses diff --git a/package/htpdate/S43htpdate b/package/htpdate/S43htpdate index 5971d70639..22e5e6c803 100644 --- a/package/htpdate/S43htpdate +++ b/package/htpdate/S43htpdate @@ -4,6 +4,8 @@ DAEMON="htpdate" PIDFILE="/var/run/$DAEMON.pid" HTPDATE_ARGS="-a -s -t https://google.com" + +# shellcheck source=/dev/null test -r "/etc/default/$DAEMON" && . "/etc/default/$DAEMON" start() { diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index b711773af5..44d73fbe2f 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 88c52fe475308ee95f560fd7cf68c75bc6e9a6abf56be7fed203a7f762fe7ab2 htpdate-1.3.7.tar.gz -sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE +sha256 4c771fe3fc5c4ab5f9393dd501bdc51e4c067297cf304ad1e74e1965ac1c066f htpdate-2.0.1.tar.gz +sha256 74096c67e102bb6545b84487b5e7f18edd038fd5fc0199c8a0b25efb3c522f06 LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 20be904d3d..8d4b1e073c 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.3.7 +HTPDATE_VERSION = 2.0.1 HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE diff --git a/package/httping/httping.hash b/package/httping/httping.hash index e07f3e32e0..cfdd7670b3 100644 --- a/package/httping/httping.hash +++ b/package/httping/httping.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bf8641ebc44a6fa52086f82c60a29051e094424996d972263155d267c96d305 httping-0e26c53d5fe504eb7204d64b23513729aa4a5bb0-git4.tar.gz +sha256 07b6b36e88506810ef19eb987a7ca477a88fb15fa6beccc509ed8f4a06bd64c1 httping-a1c5fdcf289cf7d1d8245579150bcf670f90d248-git4.tar.gz sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE diff --git a/package/httping/httping.mk b/package/httping/httping.mk index 8cb4f7f2f9..8ba124f673 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -4,19 +4,31 @@ # ################################################################################ -HTTPING_VERSION = 0e26c53d5fe504eb7204d64b23513729aa4a5bb0 +HTTPING_VERSION = a1c5fdcf289cf7d1d8245579150bcf670f90d248 HTTPING_SITE = https://github.com/folkertvanheusden/HTTPing HTTPING_SITE_METHOD = git HTTPING_LICENSE = AGPL-3.0 HTTPING_LICENSE_FILES = LICENSE +HTTPING_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_HTTPING_TUI),y) HTTPING_DEPENDENCIES += ncurses fftw-double -HTTPING_CONF_OPTS += -DUSE_TUI=1 +HTTPING_CONF_OPTS += -DUSE_TUI=ON -DUSE_FFTW3=ON +else +HTTPING_CONF_OPTS += -DUSE_TUI=OFF -DUSE_FFTW3=OFF endif ifeq ($(BR2_PACKAGE_HTTPING_SSL),y) HTTPING_DEPENDENCIES += openssl +HTTPING_CONF_OPTS += -DUSE_SSL=ON +else +HTTPING_CONF_OPTS += -DUSE_SSL=OFF +endif + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +HTTPING_CONF_OPTS += -DUSE_GETTEXT=ON +else +HTTPING_CONF_OPTS += -DUSE_GETTEXT=OFF endif $(eval $(cmake-package)) diff --git a/package/hwclock-initscript/Config.in b/package/hwclock-initscript/Config.in new file mode 100644 index 0000000000..a660a26eaa --- /dev/null +++ b/package/hwclock-initscript/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HWCLOCK_INITSCRIPT + bool "hwclock-initscript" + depends on !BR2_PACKAGE_SYSTEMD + depends on BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_UTIL_LINUX_HWCLOCK + help + Initscript to save the date and time to the hardware clock on + shutdown. + + Note that the kernel already loads the time from the hwclock + at boot time, no init script is needed for that. diff --git a/package/hwclock-initscript/S20hwclock b/package/hwclock-initscript/S20hwclock new file mode 100644 index 0000000000..c9f55cff1c --- /dev/null +++ b/package/hwclock-initscript/S20hwclock @@ -0,0 +1,39 @@ +#! /bin/sh +# +# hwclock This writes the system time to the RTC on shutdown +# + +RTC_DEVICE=rtc0 +DAEMON=hwclock + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +# Quietly do nothing if /dev/rtc0 does not exist +[ -c /dev/$RTC_DEVICE ] || exit 0 + +start(){ + : # Nothing to do on startup +} + +stop(){ + printf "Saving the system clock to /dev/%s\n" "${RTC_DEVICE}" + /sbin/$DAEMON -f "/dev/${RTC_DEVICE}" -w +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac diff --git a/package/fbtft/fbtft.mk b/package/hwclock-initscript/hwclock-initscript.mk similarity index 51% rename from package/fbtft/fbtft.mk rename to package/hwclock-initscript/hwclock-initscript.mk index cc11d867fc..a5d42ef55f 100644 --- a/package/fbtft/fbtft.mk +++ b/package/hwclock-initscript/hwclock-initscript.mk @@ -1,12 +1,12 @@ ################################################################################ # -# fbtft +# hwclock-initscript # ################################################################################ -FBTFT_VERSION = 274035404701245e7491c0c6471c5b72ade4d491 -FBTFT_SITE = $(call github,notro,fbtft,$(FBTFT_VERSION)) -FBTFT_LICENSE = GPL-2.0 -FBTFT_LICENSE_FILES = fbtft-core.c +define HWCLOCK_INITSCRIPT_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(HWCLOCK_INITSCRIPT_PKGDIR)/S20hwclock \ + $(TARGET_DIR)/etc/init.d/S20hwclock +endef $(eval $(generic-package)) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index db30db66af..b96c36648e 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 577219d44d9686e8177f6291adbff7bacdd785ad4e8a8d0c4b2a14dbf850d6ac hwdata-0.385.tar.gz +sha256 e9ff93b9807cc014ed8f7f5cb5dc2c31e714058c82ddc59b7355f5c57c9b759e hwdata-0.401.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 294afdc061..f826faf94e 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.385 +HWDATA_VERSION = 0.401 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index f85508b7a6..0e5da51112 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,5 +1,5 @@ -# From https://www.open-mpi.org/software/hwloc/v2.11/ -sha1 8c15d9707c2390bcdc564df11395a36c8fc775be hwloc-2.11.2.tar.bz2 -sha256 f7f88fecae067100f1a1a915b658add0f4f71561259482910a69baea22fe8409 hwloc-2.11.2.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.12/ +sha1 be96a4b54da92fce34e5c7f68c719ab778e058fa hwloc-2.12.2.tar.bz2 +sha256 563e61d70febb514138af0fac36b97621e01a4aacbca07b86e7bd95b85055ba0 hwloc-2.12.2.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 0d03757d83..fc999b3750 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.11 +HWLOC_VERSION_MAJOR = 2.12 HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).2 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) diff --git a/package/hyperfine/hyperfine.hash b/package/hyperfine/hyperfine.hash index 88b8710125..ca3bb41a89 100644 --- a/package/hyperfine/hyperfine.hash +++ b/package/hyperfine/hyperfine.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6cbe5673729ba7fd7a1b0b19a54630f93f4fcc29ea7878845f17931d31cd16fb hyperfine-1.18.0-cargo2.tar.gz +sha256 9fb27f85472255c40f0ac24a932fae3cb5836cc99558d1f7a36a66e937be45a6 hyperfine-1.19.0-cargo4.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE sha256 1dfee18c2ff07ce551de4d6a1d2db158c0380746b488a7f0d08c8e0d3568b7c3 LICENSE-MIT diff --git a/package/hyperfine/hyperfine.mk b/package/hyperfine/hyperfine.mk index b9f09a2820..7ab25fd4f1 100644 --- a/package/hyperfine/hyperfine.mk +++ b/package/hyperfine/hyperfine.mk @@ -4,7 +4,7 @@ # ################################################################################ -HYPERFINE_VERSION = 1.18.0 +HYPERFINE_VERSION = 1.19.0 HYPERFINE_SITE = $(call github,sharkdp,hyperfine,v$(HYPERFINE_VERSION)) HYPERFINE_LICENSE = Apache-2.0 or MIT HYPERFINE_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash index cc099a94ff..a539a4dd1a 100644 --- a/package/i2pd/i2pd.hash +++ b/package/i2pd/i2pd.hash @@ -1,4 +1,4 @@ -# From https://github.com/PurpleI2P/i2pd/releases/download/2.50.2/SHA512SUMS -sha512 7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de i2pd-2.50.2.tar.gz +# From https://github.com/PurpleI2P/i2pd/releases/download/2.58.0/SHA512SUMS +sha512 d5d87a04ff5f8481516c00b07dd46726dfb3f0de67f4932874a0655b4adfa448a434056a131d727dd79a2f3ee1f6cc9aef5dc176a0b5ab546d8e94b6c0b38ee5 i2pd-2.58.0.tar.gz # Locally computed: -sha256 e32cc0171ce3301afa67d83f61598f29af7efdf8218dfb66cc1a72224474ec2c LICENSE +sha256 5ec428c65b0bc8680e08daa75aa060fe72b5b3c3b89082ac02031e0f2d3d0039 LICENSE diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index 402931c655..3681e6006e 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.50.2 +I2PD_VERSION = 2.58.0 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE diff --git a/package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch b/package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch new file mode 100644 index 0000000000..36a9cb97dc --- /dev/null +++ b/package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch @@ -0,0 +1,39 @@ +From 720ed4b8c74c3b517a46b442be9482319ed027dd Mon Sep 17 00:00:00 2001 +From: Ken Goldman +Date: Fri, 18 Apr 2025 13:41:59 -0400 +Subject: [PATCH] tpm: Update to OpenSSL 3.5 + +Accept 3.5 as a supported version + +Signed-off-by: Ken Goldman +Signed-off-by: Peter Korsgaard +Upstream: https://github.com/kgoldman/ibmswtpm2/commit/720ed4b8c74c3b517a46b442be9482319ed027dd +--- + src/BnToOsslMath.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h +index 165304d..5fd5323 100644 +--- a/src/BnToOsslMath.h ++++ b/src/BnToOsslMath.h +@@ -54,7 +54,7 @@ + /* arising in any way out of use or reliance upon this specification or any */ + /* information herein. */ + /* */ +-/* (c) Copyright IBM Corp. and others, 2023 */ ++/* (c) Copyright IBM Corp. and others, 2023 - 2025 */ + /* */ + /********************************************************************************/ + +@@ -77,7 +77,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x30400ff0L ++#if OPENSSL_VERSION_NUMBER >= 0x30500ff0L + // Check the bignum_st definition against the one below and either update the + // version check or provide the new definition for this version. + # error Untested OpenSSL version +-- +2.39.5 + diff --git a/package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch b/package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch new file mode 100644 index 0000000000..a2a54717e2 --- /dev/null +++ b/package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch @@ -0,0 +1,25 @@ +From 7f727710326bc0a6d6f28397253ec3a89000300e Mon Sep 17 00:00:00 2001 +From: Pedro Monreal +Date: Fri, 3 Oct 2025 10:35:46 +0200 +Subject: [PATCH] tpm: Update to OpenSSL 3.6 + +Upstream: https://github.com/kgoldman/ibmswtpm2/pull/22 + +Signed-off-by: Bernd Kuhls +--- + src/BnToOsslMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h +index 26828d0..731957e 100644 +--- a/src/BnToOsslMath.h ++++ b/src/BnToOsslMath.h +@@ -77,7 +77,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x30500ff0L ++#if OPENSSL_VERSION_NUMBER >= 0x30600ff0L + // Check the bignum_st definition against the one below and either update the + // version check or provide the new definition for this version. + # error Untested OpenSSL version diff --git a/package/icu/0002-link-icudata-as-data-only.patch b/package/icu/0002-link-icudata-as-data-only.patch new file mode 100644 index 0000000000..d970e8d30d --- /dev/null +++ b/package/icu/0002-link-icudata-as-data-only.patch @@ -0,0 +1,35 @@ +From d5d0c4bb7cc9aa4a132ec0bea13255aee50c1cf9 Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Fri, 6 Jun 2014 14:55:58 +0200 +Subject: [PATCH] Don't link icudata as a data only library + +This patch cames straight from Debian. It fixes an issue when +libicudata would not have some flags indicating it's EABIhf, causing +applications linked against libicudata to not start on EABIhf +systems. Getting rid of the -nodefaultlibs -nostdlib flags solves the +problem, and is the solution that is used by Debian, see +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457. + +Signed-off-by: Maxime Hadjinlian +--- + source/config/mh-linux | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/source/config/mh-linux b/source/config/mh-linux +index 531a3b2..5a2a7c4 100644 +--- a/source/config/mh-linux ++++ b/source/config/mh-linux +@@ -21,7 +21,9 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH_PRE = -Wl,-rpath, + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++#LDFLAGSICUDT=-nodefaultlibs -nostdlib ++# Debian change: linking icudata as data only causes too many problems. ++LDFLAGSICUDT= + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +-- +2.0.0.rc2 + diff --git a/package/icu/0003-fix-static-linking-with-icu-uc.patch b/package/icu/0003-fix-static-linking-with-icu-uc.patch new file mode 100644 index 0000000000..36a3d1f696 --- /dev/null +++ b/package/icu/0003-fix-static-linking-with-icu-uc.patch @@ -0,0 +1,30 @@ +From ffff12fd321c7a056e796e74cc508726b0626ae0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 22 Jul 2015 22:43:25 +0200 +Subject: [PATCH] fix static linking with icu-uc + +During static linking with a C application and libicuuc.a, +-lstdc++ is required. + +Add -lstdc++ in Libs.private of icu-uc.pc. + +Fixes: +http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/ + +Signed-off-by: Romain Naour +--- + source/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff -git icu.orig/source/Makefile.in icu/source/Makefile.in +--- icu.orig/source/Makefile.in 2025-03-13 19:31:23.000000000 +0100 ++++ icu/source/Makefile.in 2025-09-22 08:56:36.791792784 +0200 +@@ -279,7 +279,7 @@ + @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" '$${baselibs}' >> $@ + else + @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" >> $@ +- @echo "Libs.private:" "${ICULIBS_DT}" '$${baselibs}' >> $@ ++ @echo "Libs.private:" "${ICULIBS_DT}" '$${baselibs}' -lstdc++ >> $@ + endif + @echo $@ updated. + diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 0948bf495e..bf9451db8e 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 icu4c-73_2-src.tgz -sha256 f3005e195ff74d8812cc1f182a1c446fab678d70a10e3dada497585befee5416 LICENSE +sha256 588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061 icu4c-77_1-src.tgz +sha256 451167c55c0fa447cc2d5632714f5e3c567fe4f1e1badefab2c1333852198aca LICENSE diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 73547a7537..4789edf0e2 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 73-2 +ICU_VERSION = 77-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) diff --git a/package/iftop/0003-iftop-function-args.patch b/package/iftop/0003-iftop-function-args.patch new file mode 100644 index 0000000000..7ef38bf0bb --- /dev/null +++ b/package/iftop/0003-iftop-function-args.patch @@ -0,0 +1,18 @@ +Fix gcc-15.x build + +Upstream: https://src.fedoraproject.org/rpms/iftop/c/d098f91f0f590c1cab264bf77851d4018c430d9f?branch=rawhide + +Signed-off-by: Bernd Kuhls + +diff -up iftop-1.0pre4/cfgfile.h.fargs iftop-1.0pre4/cfgfile.h +--- iftop-1.0pre4/cfgfile.h.fargs 2014-01-05 19:47:53.000000000 +0100 ++++ iftop-1.0pre4/cfgfile.h 2025-05-15 18:09:05.849754901 +0200 +@@ -13,7 +13,7 @@ typedef struct { + int value; + } config_enumeration_type; + +-int read_config(); ++int read_config(char *f, int whinge); + + char *config_get_string(const char *directive); + int config_get_bool(const char *directive); diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index f5c2d2d34c..6412cf9d90 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,4 +1,4 @@ -# From http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown/ifupdown_0.8.41.dsc -sha256 222c5bef313a9e71d9be4b946c73c8606c98f9e0229153191d9c6d8fb9b3599c ifupdown_0.8.41.tar.xz +# From http://snapshot.debian.org/archive/debian/20240917T144520Z/pool/main/i/ifupdown/ifupdown_0.8.44.dsc +sha256 6121a19702e2e86b8f3aaac90d486ae8d557477f769718f3eb838945b697bcad ifupdown_0.8.44.tar.xz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index 14c36db0db..395e462082 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,16 +4,16 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.41 +IFUPDOWN_VERSION = 0.8.44 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20240917T144520Z/pool/main/i/ifupdown IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING IFUPDOWN_CPE_ID_VENDOR = debian define IFUPDOWN_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'PKGLIBDIR=\"/lib/ifupdown\"' -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ ARCH=linux \ -C $(@D) endef diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in index e600ef5fcd..49be9d13bc 100644 --- a/package/igh-ethercat/Config.in +++ b/package/igh-ethercat/Config.in @@ -11,19 +11,86 @@ config BR2_PACKAGE_IGH_ETHERCAT if BR2_PACKAGE_IGH_ETHERCAT +config BR2_PACKAGE_IGH_ETHERCAT_CLITOOL + bool "Enable CLI Tool" + depends on BR2_INSTALL_LIBSTDCPP + help + Enable the EtherCAT CLI tool for testing and diagnostics. + +config BR2_PACKAGE_IGH_ETHERCAT_USERLIB + bool "Enable User Space Library" + help + Install the EtherCAT user space library. + +config BR2_PACKAGE_IGH_ETHERCAT_TTY + bool "Enable TTY Driver" + help + Enable the EtherCAT TTY driver for serial communication + support. + +config BR2_PACKAGE_IGH_ETHERCAT_GENERIC + bool "Enable Generic Driver" + help + Enable the generic EtherCAT master driver. + config BR2_PACKAGE_IGH_ETHERCAT_8139TOO - bool "8139too driver" + bool "8139too Driver" + help + Enable Realtek 8139too-based EtherCAT driver. config BR2_PACKAGE_IGH_ETHERCAT_E100 - bool "e100 driver" + bool "e100 Driver" + help + Enable Intel e100-based EtherCAT driver. config BR2_PACKAGE_IGH_ETHERCAT_E1000 - bool "e1000 driver" + bool "e1000 Driver" + help + Enable Intel e1000-based EtherCAT driver. config BR2_PACKAGE_IGH_ETHERCAT_E1000E - bool "e1000e driver" + bool "e1000e Driver" + help + Enable Intel e1000e-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_GENET + bool "genet Driver" + help + Enable Broadcom GENET-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_IGB + bool "igb Driver" + help + Enable Intel igb-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_IGC + bool "igc Driver" + help + Enable Intel igc-based EtherCAT driver. config BR2_PACKAGE_IGH_ETHERCAT_R8169 - bool "r8169 driver" + bool "r8169 Driver" + help + Enable Realtek r8169-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_STMMAC_PCI + bool "stmmac-pci Driver" + help + Enable Synopsys STMMAC PCI-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_STMMAC + bool "stmmac Driver" + help + Enable Synopsys STMMAC-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_DWMAC_INTEL + bool "dwmac-intel Driver" + help + Enable Intel DesignWare MAC-based EtherCAT driver. + +config BR2_PACKAGE_IGH_ETHERCAT_CCAT + bool "ccat Driver" + help + Enable CCAT-based EtherCAT driver. endif diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index 67a152c6ae..daa9aca8d0 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 7e4d8f3497c0bc0b64a151c0d074349fe7614767563642d6fedb19567eafa1e1 igh-ethercat-f5dc109176400f540a8682a2c9ee20d411d14d61.tar.gz +sha256 3fa09d623c2a9488bc6c40072b080ef719a4e78d89e30cc0ddbaabacd4875e37 igh-ethercat-1.6.3.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 5b618ab54a..1d93d473da 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = f5dc109176400f540a8682a2c9ee20d411d14d61 +IGH_ETHERCAT_VERSION = 1.6.3 IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION)) IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER @@ -15,12 +15,22 @@ IGH_ETHERCAT_INSTALL_STAGING = YES IGH_ETHERCAT_CONF_OPTS = \ --with-linux-dir=$(LINUX_DIR) \ - $(if $(BR2_INSTALL_LIBSTDCPP),--enable-tool,--disable-tool) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_USERLIB),--enable-userlib,--disable-userlib) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_CLITOOL),--enable-tool,--disable-tool) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_TTY),--enable-tty,--disable-tty) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_GENERIC),--enable-generic,--disable-generic) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000) \ $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) \ - $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) + $(if $(BR2_PACKAGE_IGH_ETHERCAT_GENET),--enable-genet,--disable-genet) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_IGB),--enable-igb,--disable-igb) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_IGC),--enable-igc,--disable-igc) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_STMMAC_PCI),--enable-stmmac-pci,--disable-stmmac-pci) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_STMMAC),--enable-stmmac,--disable-stmmac) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_DWMAC_INTEL),--enable-dwmac-intel,--disable-dwmac-intel) \ + $(if $(BR2_PACKAGE_IGH_ETHERCAT_CCAT),--enable-ccat,--disable-ccat) $(eval $(kernel-module)) $(eval $(autotools-package)) diff --git a/package/igt-gpu-tools/Config.in b/package/igt-gpu-tools/Config.in index 809c8e28ac..184acb4cf1 100644 --- a/package/igt-gpu-tools/Config.in +++ b/package/igt-gpu-tools/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_IGT_GPU_TOOLS depends on BR2_USE_MMU # fork() depends on BR2_ENABLE_LOCALE depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # elfutils + depends on BR2_USE_WCHAR # elfutils, procps-ng depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng select BR2_PACKAGE_CAIRO @@ -24,9 +24,19 @@ config BR2_PACKAGE_IGT_GPU_TOOLS https://gitlab.freedesktop.org/drm/igt-gpu-tools -comment "igt-gpu-tools needs udev /dev management and toolchain w/ threads, wchar, dynamic library, locale, headers >= 4.11" +if BR2_PACKAGE_IGT_GPU_TOOLS + +config BR2_PACKAGE_IGT_GPU_TOOLS_TESTS + bool "enable tests" + help + Enable IGT tests, resulting in individual executables + for GPU testing under /usr/libexec/igt-gpu-tools. + +endif + +comment "igt-gpu-tools needs udev /dev management and toolchain w/ NPTL, wchar, dynamic library, locale, headers >= 4.11" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 diff --git a/package/igt-gpu-tools/igt-gpu-tools.hash b/package/igt-gpu-tools/igt-gpu-tools.hash index bf760b91d7..fb4b702549 100644 --- a/package/igt-gpu-tools/igt-gpu-tools.hash +++ b/package/igt-gpu-tools/igt-gpu-tools.hash @@ -1,5 +1,6 @@ -# Locally calculated from download -sha256 de6e9443d569e76333ec6c8ffc53937b6831224161fe69bf2f07efad3bd0e04a igt-gpu-tools-0ee4074685c1e184f2d3612ea6eb4d126f9a2e23.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2025-September/003631.html +sha256 88178558b352a5e8a287954cb2eef05d775aedfacf43b88251509ea014b6182d igt-gpu-tools-2.2.tar.xz +sha512 20032b90e397ca73f9f8f5b453034fffc09e28372adddebd1a71b1323235e3e379bf452d5a4dd76b895e4c47df67595051c16b8a1488249e5aae946f6a35258c igt-gpu-tools-2.2.tar.xz # Hash for license file: sha256 1b7e266857b05808660f42369a4a797459d7b7bec7245e378aa28a8db2f213da COPYING diff --git a/package/igt-gpu-tools/igt-gpu-tools.mk b/package/igt-gpu-tools/igt-gpu-tools.mk index e3e7d4a896..bb43f8fe9b 100644 --- a/package/igt-gpu-tools/igt-gpu-tools.mk +++ b/package/igt-gpu-tools/igt-gpu-tools.mk @@ -4,9 +4,9 @@ # ################################################################################ -IGT_GPU_TOOLS_VERSION = 0ee4074685c1e184f2d3612ea6eb4d126f9a2e23 -IGT_GPU_TOOLS_SOURCE = igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION).tar.bz2 -IGT_GPU_TOOLS_SITE = https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/$(IGT_GPU_TOOLS_VERSION) +IGT_GPU_TOOLS_VERSION = 2.2 +IGT_GPU_TOOLS_SOURCE = igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION).tar.xz +IGT_GPU_TOOLS_SITE = https://www.x.org/releases/individual/app IGT_GPU_TOOLS_LICENSE = MIT IGT_GPU_TOOLS_LICENSE_FILES = COPYING IGT_GPU_TOOLS_INSTALL_STAGING = YES @@ -24,8 +24,13 @@ IGT_GPU_TOOLS_DEPENDENCIES = \ zlib IGT_GPU_TOOLS_CONF_OPTS = \ - -Dchamelium=disabled \ - -Dtests=disabled + -Dchamelium=disabled + +ifeq ($(BR2_PACKAGE_IGT_GPU_TOOLS_TESTS),y) +IGT_GPU_TOOLS_CONF_OPTS += -Dtests=enabled +else +IGT_GPU_TOOLS_CONF_OPTS += -Dtests=disabled +endif # On x86 systems, libigt resolves igt_half_to_float and igt_float_to_half as # indirect functions at runtime by checking CPU features with igt_x86_features. diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 30a12220dd..3dbea6d8bc 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c82210ea3fdbd044b656ba3d5b42df1da9a18e78fc0e500169bad70d3b0d9ba3 imagemagick-7.1.1-31.tar.gz +sha256 acf76a9dafbd18f4dd7b24c45ca10c77e31289fc28e4da0ce5cc3929fd0aef16 imagemagick-7.1.2-8.tar.gz sha256 a556c5292c87c9a6ac795c80669b0c3660f9f729de8c476bf2b10f83ab1b34ec LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index b2d3e755a6..4e6a810631 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.1.1-31 +IMAGEMAGICK_VERSION = 7.1.2-8 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE diff --git a/package/inih/inih.hash b/package/inih/inih.hash index f20d7ac0b6..78366d64c1 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e79216260d5dffe809bda840be48ab0eec7737b2bb9f02d2275c1b46344ea7b7 inih-58.tar.gz +sha256 9c15fa751bb8093d042dae1b9f125eb45198c32c6704cd5481ccde460d4f8151 inih-62.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index 80cde0942b..4d9a8c03ab 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 58 +INIH_VERSION = 62 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause diff --git a/package/initscripts/init.d/S11modules b/package/initscripts/init.d/S11modules new file mode 100644 index 0000000000..ab9b93dae3 --- /dev/null +++ b/package/initscripts/init.d/S11modules @@ -0,0 +1,62 @@ +#!/bin/sh + +MODULES_DIR="/etc/modules-load.d/" + +[ -z "$(ls -A ${MODULES_DIR} 2> /dev/null)" ] && exit 0 + +load_unload() { + for module_file in "${MODULES_DIR}"/*.conf; do + while read -r module args; do + + case "$module" in + ""|"#"*) continue ;; + esac + + if [ "$1" = "load" ]; then + # shellcheck disable=SC2086 # We need word splitting for args + modprobe -q "${module}" ${args} >/dev/null && \ + printf '%s ' "$module" || RET='FAIL' + else + rmmod "${module}" >/dev/null + fi + + done < "${module_file}" + done + + RET='OK' +} + +start() { + printf 'Starting modules: ' + + load_unload load + + echo $RET +} + +stop() { + printf 'Stopping modules: ' + + load_unload unload + + echo $RET +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +# check-package Ignore missing DAEMON Variables diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk index 37fe2241d0..17a25082a2 100644 --- a/package/input-event-daemon/input-event-daemon.mk +++ b/package/input-event-daemon/input-event-daemon.mk @@ -11,7 +11,7 @@ INPUT_EVENT_DAEMON_LICENSE_FILES = README define INPUT_EVENT_DAEMON_BUILD_CMDS touch $(@D)/input-event-table.h - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) endef diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 1accd2e205..aef463783c 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dbf7cc401de7ff386306a23c1c61b3cf7bd86a4d9001b3a1d16a81e6b0e3ab2b intel-gmmlib-22.5.2.tar.gz +sha256 2e43e538a002574f45d480a24e02297c960963dc7914b7328791d9836832ff43 intel-gmmlib-22.8.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 3698d2fff0..92569a106e 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.5.2 +INTEL_GMMLIB_VERSION = 22.8.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md diff --git a/package/intel-mediadriver/0001-Media-Common-Update-cmake_minimum_required-to-3.5-co.patch b/package/intel-mediadriver/0001-Media-Common-Update-cmake_minimum_required-to-3.5-co.patch new file mode 100644 index 0000000000..6d0d972be0 --- /dev/null +++ b/package/intel-mediadriver/0001-Media-Common-Update-cmake_minimum_required-to-3.5-co.patch @@ -0,0 +1,187 @@ +From c8a2c037e25498e366467860b461b8681cea5356 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 28 Mar 2025 05:06:53 +0000 +Subject: [PATCH] [Media Common] Update cmake_minimum_required to 3.5 + consisently across CMakeLists + +Some of the CMakeLists.txt are already requiring CMake 3.5. +Update remaining files to 3.5. +This supports the compilation with cmake-4.0.0 + +Signed-off-by: Rudi Heitbaum +Signed-off-by: James Hilliard +Upstream: https://github.com/intel/media-driver/pull/1919 +--- + Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt | 2 +- + Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt | 2 +- + Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt | 2 +- + Tools/MediaDriverTools/KrnToHex/CMakeLists.txt | 2 +- + Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt | 2 +- + cmrtlib/CMakeLists.txt | 2 +- + cmrtlib/linux/CMakeLists.txt | 2 +- + media_driver/linux/ult/CMakeLists.txt | 2 +- + media_driver/linux/ult/libdrm_mock/CMakeLists.txt | 2 +- + media_driver/linux/ult/ult_app/CMakeLists.txt | 2 +- + media_driver/linux/ult/ult_app/googletest/CMakeLists.txt | 2 +- + os_release_info.cmake | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt +index 2c72d282d..025b93542 100644 +--- a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt ++++ b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(IntelGenDmyHexTool) + add_compile_options(-std=c++11) + +diff --git a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt +index cc586ba76..519ca954d 100644 +--- a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt ++++ b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + project(GenKrnBin) + +diff --git a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt +index 713d08600..91eacf15d 100644 +--- a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt ++++ b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(IntelKernelBinToSourceTool) + add_compile_options(-std=c++11) + +diff --git a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt +index a3cb7341c..e2bfde5e8 100644 +--- a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt ++++ b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(KrnToHexTool) + add_compile_options(-std=c++11) + +diff --git a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt +index af622be19..40e4eba17 100644 +--- a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt ++++ b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + project(KrnToHex_IGA) + +diff --git a/cmrtlib/CMakeLists.txt b/cmrtlib/CMakeLists.txt +index 9ecb1e4e1..54f907b37 100644 +--- a/cmrtlib/CMakeLists.txt ++++ b/cmrtlib/CMakeLists.txt +@@ -19,7 +19,7 @@ + # OTHER DEALINGS IN THE SOFTWARE. + + set(BUILD_ALL $ENV{BUILD_ALL}) +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(CM_RT) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/linux) + +diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt +index b066138d9..df02bab2a 100644 +--- a/cmrtlib/linux/CMakeLists.txt ++++ b/cmrtlib/linux/CMakeLists.txt +@@ -18,7 +18,7 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + include (${CMAKE_CURRENT_LIST_DIR}/cmrt_utils.cmake) + + +diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt +index 9fb5b39ee..f06b49011 100644 +--- a/media_driver/linux/ult/CMakeLists.txt ++++ b/media_driver/linux/ult/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + if ("${BUILD_TYPE}" STREQUAL "debug") + set(CMAKE_BUILD_TYPE "Debug") +diff --git a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt +index 438715a91..e5d2c88ed 100644 +--- a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt ++++ b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + + project(libdrm_mock) + +diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt +index 1b24fed7f..64217b9fe 100644 +--- a/media_driver/linux/ult/ult_app/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + project(devult) + +diff --git a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt +index 6b1f74335..bba044a97 100644 +--- a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt +@@ -17,7 +17,7 @@ + # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + + project(devult) + +diff --git a/os_release_info.cmake b/os_release_info.cmake +index b4a84e2c5..a3b879d85 100644 +--- a/os_release_info.cmake ++++ b/os_release_info.cmake +@@ -29,7 +29,7 @@ set(_os_release_info TRUE) + # of the local cmake environment. + + # Set cmake policies for at least this level: +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.5) + + + # Function get_os_release_info - Determine and return OS name and version +-- +2.34.1 + diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 565dd4ee68..af27309bab 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cbc2ccdae2cf84bd1e36a9d5acec4861922ae68f849e89ddcc2f2c5579bd6022 intel-media-24.4.1.tar.gz +sha256 7ba3b1d72286053e0785b7975e7ed2001ba3f6e00a8541aff0c61a6495ef5138 intel-media-25.4.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index d4d9e53427..59cc4b2f89 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.4.1 +INTEL_MEDIADRIVER_VERSION = 25.4.5 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 81a4573110..4c6676dfb0 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 37246208ef68039be752438c72400a688a2238df13a7f5282497c80be2d8366d intel-microcode-20241112.tar.gz +sha256 5a9a0d17240f486461bc101ef74f2b8c10675cdd02d0ba0bd6168b061c62e970 intel-microcode-20251111.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 17f25edc83..e8bbf15a81 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20241112 +INTEL_MICROCODE_VERSION = 20251111 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index 381e8e6487..89c7099b45 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ec11fbe64a84b15e98ef376a7e6de5fe15f5afda59711a7e1c145ee2268af41d intel-vpl-gpu-rt-24.4.1.tar.gz +sha256 c1c779e86f147495e50a83feeeee290526d0cd46329f05772fae97eb271a8ef6 intel-vpl-gpu-rt-25.4.5.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk index 735bc910d0..d149d58a77 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_VPL_GPU_RT_VERSION = 24.4.1 +INTEL_VPL_GPU_RT_VERSION = 25.4.5 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) INTEL_VPL_GPU_RT_LICENSE = MIT INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE diff --git a/package/iozone/0001-Add-new-targets-for-iozone.patch b/package/iozone/0001-Add-new-targets-for-iozone.patch index 3cc184ec8f..585f128724 100644 --- a/package/iozone/0001-Add-new-targets-for-iozone.patch +++ b/package/iozone/0001-Add-new-targets-for-iozone.patch @@ -1,4 +1,4 @@ -From 5b1e973b2333e838624abf195b3ba9716591f304 Mon Sep 17 00:00:00 2001 +From 015b6fa0c4a503ae822e6cf787de82e09bc44511 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 10 Oct 2021 10:15:26 +0200 Subject: [PATCH] Add new targets for iozone: @@ -10,12 +10,14 @@ And make largefile support optional via CFLAGS. Signed-off-by: Gustavo Zacarias Signed-off-by: Gilles Talis +[Romain: rebase on 3.508] +Signed-off-by: Romain Naour --- src/current/makefile | 56 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/src/current/makefile b/src/current/makefile -index 3a54701..3b17b1b 100644 +index 24a391e..bd66a4e 100755 --- a/src/current/makefile +++ b/src/current/makefile @@ -172,10 +172,28 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o @@ -54,15 +56,15 @@ index 3a54701..3b17b1b 100644 @echo "" @echo "Building iozone for Linux" @echo "" -- $(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ +- $(CC) -Wmissing-prototypes -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ - -DSHARED_MEM -Dlinux -D_LARGEFILE64_SOURCE $(CFLAGS) iozone.c \ -+ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ ++ $(CC) -Wmissing-prototypes -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ + -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ -DNAME='"linux"' -o iozone_linux.o -- $(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \ -+ $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ +- $(CC) -Wmissing-prototypes -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \ ++ $(CC) -Wmissing-prototypes -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ + -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -+ $(CC) -Wmissing-prototypes -Wall -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ ++ $(CC) -Wmissing-prototypes -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ + $(CFLAGS) libasync.c -o libasync.o + +iozone_linux-noaio.o: iozone.c libbif.c @@ -84,7 +86,7 @@ index 3a54701..3b17b1b 100644 + -DNAME='"linux"' -o iozone_linux-noth.o + $(CC) -Wmissing-prototypes -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS \ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -- $(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ +- $(CC) -Wmissing-prototypes -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ - -D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c -o libasync.o fileop_AIX.o: fileop.c @@ -93,11 +95,11 @@ index 3a54701..3b17b1b 100644 @echo "" @echo "Building fileop for Linux" @echo "" -- $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o -+ $(CC) -Wall -c $(CFLAGS) fileop.c -o fileop_linux.o +- $(CC) -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o ++ $(CC) -c $(CFLAGS) fileop.c -o fileop_linux.o fileop_openbsd.o: fileop.c @echo "" -- -2.27.0 +2.51.0 diff --git a/package/iozone/0002-Fix-build-without-ASYNC_IO.patch b/package/iozone/0002-Fix-build-without-ASYNC_IO.patch new file mode 100644 index 0000000000..92621e5242 --- /dev/null +++ b/package/iozone/0002-Fix-build-without-ASYNC_IO.patch @@ -0,0 +1,191 @@ +From cdd5e78a275c8cda5d48d15acc96c3be5170bf2f Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 6 Sep 2025 00:26:00 +0200 +Subject: [PATCH] Fix build without ASYNC_IO + +Fix the following build failure without ASYNC_IO: + +/home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/12.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: iozone_linux-noaio.o: in function `read_perf_test': +iozone.c:(.text+0x11a74): undefined reference to `end_async' + +Fixes: + - http://autobuild.buildroot.org/results/31a4f0ac9eeb71df5d2f40ffe9f1f256cb58e399 + +Signed-off-by: Fabrice Fontaine +Upstream: sent to capps@iozone.org +[Romain: + rebase on 3.508 + convert to git format +] +Signed-off-by: Romain Naour +--- + src/current/iozone.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/current/iozone.c b/src/current/iozone.c +index 6657a9b..8de26cf 100755 +--- a/src/current/iozone.c ++++ b/src/current/iozone.c +@@ -9196,6 +9196,7 @@ long long *data1,*data2; + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -9203,6 +9204,7 @@ long long *data1,*data2; + end_async(gc); + gc=0; + } ++#endif + buffer1=0; + if(hist_summary) + { +@@ -9677,6 +9679,7 @@ long long *data1, *data2; + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -9684,6 +9687,7 @@ long long *data1, *data2; + end_async(gc); + gc=0; + } ++#endif + if(rlocking) + { + lock_offset=I_LSEEK(fd,0,SEEK_CUR); +@@ -10140,6 +10144,7 @@ long long *data1,*data2; + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -10147,6 +10152,7 @@ long long *data1,*data2; + end_async(gc); + gc=0; + } ++#endif + if(rlocking) + { + mylockr((int) fd, (int) 0, (int)1, +@@ -10792,6 +10798,7 @@ printf("Read_Stride\n"); + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -10799,6 +10806,7 @@ printf("Read_Stride\n"); + end_async(gc); + gc=0; + } ++#endif + + /* This is a bit tricky. The goal is to read with a stride through + the file. The problem is that you need to touch all of the file +@@ -15528,6 +15536,7 @@ thread_read_test(x) + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -15535,6 +15544,7 @@ thread_read_test(x) + end_async(gc); + gc=0; + } ++#endif + read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -16093,6 +16103,7 @@ thread_pread_test(x) + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -16100,6 +16111,7 @@ thread_pread_test(x) + end_async(gc); + gc=0; + } ++#endif + read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -16708,6 +16720,7 @@ thread_rread_test(x) + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -16715,6 +16728,7 @@ thread_rread_test(x) + end_async(gc); + gc=0; + } ++#endif + re_read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -17287,6 +17301,7 @@ thread_reverse_read_test(x) + lock_offset, reclen); + } + current_position+=reclen; ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -17294,6 +17309,7 @@ thread_reverse_read_test(x) + end_async(gc); + gc=0; + } ++#endif + t_offset = (off64_t)reclen*2; + if (!(h_flag || k_flag || mmapflag)) + { +@@ -17821,6 +17837,7 @@ thread_stride_read_test(x) + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -17828,6 +17845,7 @@ thread_stride_read_test(x) + end_async(gc); + gc=0; + } ++#endif + if(current_position + (stride * reclen) >= (numrecs64 * reclen)-reclen) + { + current_position=0; +@@ -18571,6 +18589,7 @@ void *x; + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -18578,6 +18597,7 @@ void *x; + end_async(gc); + gc=0; + } ++#endif + ranread_so_far+=reclen/1024; + if(*stop_flag) + { +-- +2.51.0 + diff --git a/package/iozone/0003-remove-libasync.o-and-libbif.o-from-deps.patch b/package/iozone/0003-remove-libasync.o-and-libbif.o-from-deps.patch new file mode 100644 index 0000000000..ea4c9c97b3 --- /dev/null +++ b/package/iozone/0003-remove-libasync.o-and-libbif.o-from-deps.patch @@ -0,0 +1,114 @@ +From 34c25d67c33050f42f0f243c0fb6674c28ff44b5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 6 Sep 2025 00:31:48 +0200 +Subject: [PATCH] remove libasync.o and libbif.o from deps + +there are no implicit rules to build them and they get wrong CFLAGS +when compiled with implicit rule. + +They are built as part of iozone_linux.o target anyway + +Only fixed linux targets for now + +Signed-off-by: Khem Raj +Upstream: Pending +[Romain: + rebase on 3.508 + convert to git format +] +Signed-off-by: Romain Naour +--- +Patch from Yocto: +https://github.com/openembedded/meta-openembedded/blob/walnascar/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch +--- + src/current/makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/current/makefile b/src/current/makefile +index bd66a4e..ba5759f 100755 +--- a/src/current/makefile ++++ b/src/current/makefile +@@ -171,7 +171,7 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o + # + # GNU 'C' compiler Linux build with threads, largefiles, async I/O + # +-linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o ++linux: iozone_linux.o fileop_linux.o pit_server.o + $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \ + -lpthread -lrt -o iozone + $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop +@@ -198,7 +198,7 @@ linux-noth: iozone_linux-noth.o libbif.o fileop_linux.o pit_server.o + # + # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O + # +-linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pit_server.o ++linux-powerpc: iozone_linux-powerpc.o fileop_linux-ppc.o pit_server.o + $(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \ + libbif.o -lpthread -lrt -o iozone + $(CC) -O3 -Dlinux fileop_linux-ppc.o -o fileop +@@ -206,7 +206,7 @@ linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pi + # + # GNU 'C' compiler Linux build for sparc chip with threads, largefiles, async I/O + # +-linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server.o ++linux-sparc: iozone_linux-sparc.o fileop_linux.o pit_server.o + $(CC) -O3 $(LDFLAGS) iozone_linux-sparc.o libasync.o libbif.o \ + -lpthread -lrt -o iozone + $(CC) -O3 -Dlinux fileop_linux.o -o fileop +@@ -215,7 +215,7 @@ linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server + # + # GNU 'C' compiler Linux build with threads, largefiles, async I/O + # +-linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_server.o ++linux-ia64: iozone_linux-ia64.o fileop_linux-ia64.o pit_server.o + $(CC) -O3 $(LDFLAGS) iozone_linux-ia64.o libbif.o libasync.o \ + -lrt -lpthread -o iozone + $(CC) -O3 -Dlinux fileop_linux-ia64.o -o fileop +@@ -224,7 +224,7 @@ linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_ser + # + # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O + # +-linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc64.o pit_server-linux-powerpc64.o ++linux-powerpc64: iozone_linux-powerpc64.o fileop_linux-ppc64.o pit_server-linux-powerpc64.o + $(CC) -O3 -Dunix -DHAVE_ANSIC_C -DSHARED_MEM -DASYNC_IO \ + -D_LARGEFILE64_SOURCE -Dlinux \ + iozone_linux-powerpc64.o libasync.o libbif.o -lpthread \ +@@ -235,7 +235,7 @@ linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc6 + # + # GNU 'C' compiler Linux build with threads, largefiles, async I/O + # +-linux-arm: iozone_linux-arm.o libbif.o libasync.o fileop_linux-arm.o pit_server.o ++linux-arm: iozone_linux-arm.o fileop_linux-arm.o pit_server.o + $(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \ + -lrt -lpthread -o iozone + $(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop +@@ -267,7 +267,7 @@ endif + # + # GNU 'C' compiler Linux build with threads, largefiles, async I/O + # +-linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_server.o ++linux-AMD64: iozone_linux-AMD64.o fileop_linux-AMD64.o pit_server.o + $(CC) -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \ + -lrt -lpthread -o iozone + $(CC) -O3 -Dlinux fileop_linux-AMD64.o -o fileop +@@ -276,7 +276,7 @@ linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_ + # + # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O + # +-linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_server.o ++linux-S390: iozone_linux-s390.o fileop_linux-s390.o pit_server.o + $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390.o \ + libbif.o libasync.o -o iozone + $(CC) -O3 -Dlinux fileop_linux-s390.o -o fileop +@@ -285,7 +285,7 @@ linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_serv + # + # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O + # +-linux-S390X: iozone_linux-s390x.o libbif.o libasync.o fileop_linux-s390x.o pit_server.o ++linux-S390X: iozone_linux-s390x.o fileop_linux-s390x.o pit_server.o + $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390x.o \ + libbif.o libasync.o -o iozone + $(CC) -O3 -Dlinux fileop_linux-s390x.o -o fileop +-- +2.51.0 + diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 936ab5a646..1f41483b4a 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 iozone3_506.tar +sha256 ee55af310a65ec97e1db214aebd75ee87f458b529cea3da37081a63974e8ace3 iozone3_508.tar sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 docs/License.txt diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index b1b29d1098..07034cd96f 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3.506 +IOZONE_VERSION = 3.508 IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) diff --git a/package/iperf3/0001-Fix-a-compilation-issue-with-uClibc-due-to-a-missing.patch b/package/iperf3/0001-Fix-a-compilation-issue-with-uClibc-due-to-a-missing.patch new file mode 100644 index 0000000000..cc2f4bd595 --- /dev/null +++ b/package/iperf3/0001-Fix-a-compilation-issue-with-uClibc-due-to-a-missing.patch @@ -0,0 +1,51 @@ +From e5c4263c6b2c5b84a6edeb1cf3c95bddd73d4d7c Mon Sep 17 00:00:00 2001 +From: Kadambini Nema +Date: Sat, 17 May 2025 16:20:07 -0700 +Subject: [PATCH] Fix a compilation issue with uClibc due to a missing include + file. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +------ +In file included from t_auth.c:35: +iperf_api.h:395:77: error: unknown type name ‘va_list’ + 395 | void iperf_exit(struct iperf_test *test, int exit_code, const char *format, va_list argp) __attribute__ ((noreturn)); + | ^~~~~~~ +iperf_api.h:33:1: note: ‘va_list’ is defined in header ‘’; did you forget to ‘#include ’? + 32 | #include + +++ |+#include + 33 | #include +----- + +Signed-off-by: Kadambini Nema +Upstream: https://github.com/esnet/iperf/pull/1888 +--- + src/iperf_api.c | 1 - + src/iperf_api.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/iperf_api.c b/src/iperf_api.c +index aeec91dd3..d4a06bec9 100644 +--- a/src/iperf_api.c ++++ b/src/iperf_api.c +@@ -53,7 +53,6 @@ + #include + #include + #include +-#include + #include + + #if defined(HAVE_CPUSET_SETAFFINITY) +diff --git a/src/iperf_api.h b/src/iperf_api.h +index 03d273e8c..cd82e6f9b 100644 +--- a/src/iperf_api.h ++++ b/src/iperf_api.h +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef __cplusplus diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index ee0149daed..3d9ff0cf5d 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.17.1.tar.gz.sha256 -sha256 84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa iperf-3.17.1.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.19.1.tar.gz.sha256 +sha256 dc63f89ec581ea99f8b558d8eb35109de06383010db5a1906c208a562ba0c270 iperf-3.19.1.tar.gz # Locally computed -sha256 3dc3e2076dd9cdea2b66d8fe213997ff25fb6171594f055b59fe25321b438f6f LICENSE +sha256 7c9ba0385fcf35c4c9e08ad0c0cba72d4315f36f0f742fef4de826a28cc33a97 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 1d2b57208a..df6b32abc1 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.17.1 +IPERF3_VERSION = 3.19.1 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index dd2b0e6b6d..f759caa08f 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_IPMITOOL it can be provided by the iana-assignment package or by a rootfs overlay. - https://github.com/ipmitool/ipmitool/ + https://codeberg.org/IPMITool/ipmitool/ if BR2_PACKAGE_IPMITOOL diff --git a/package/ipmitool/ipmitool.hash b/package/ipmitool/ipmitool.hash index c3b298e3ba..c65fdb0342 100644 --- a/package/ipmitool/ipmitool.hash +++ b/package/ipmitool/ipmitool.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c ipmitool-1_8_19.tar.gz +sha256 78bc6fdbb0487652a3d0220072b9428d4ab6dfc198de2f28e8493932e6b893af ipmitool-IPMITOOL_1_8_19-git4.tar.gz sha256 b7e2382a8be43b5f6cb092f2d2bda163bf1a1938be9300f821a845cbcd535f56 COPYING diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 159bb7c8b6..15765ed63f 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -4,11 +4,13 @@ # ################################################################################ -IPMITOOL_VERSION = 1_8_19 -IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) +IPMITOOL_VERSION_UPSTREAM = 1.8.19 +IPMITOOL_VERSION = IPMITOOL_$(subst .,_,$(IPMITOOL_VERSION_UPSTREAM)) +IPMITOOL_SITE = https://codeberg.org/IPMITool/ipmitool.git +IPMITOOL_SITE_METHOD = git IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING -IPMITOOL_CPE_ID_VALID = YES +IPMITOOL_CPE_ID_VERSION = $(IPMITOOL_VERSION_UPSTREAM) # From git IPMITOOL_AUTORECONF = YES IPMITOOL_DEPENDENCIES = host-pkgconf diff --git a/package/iproute2/0001-lib-bridge-avoid-redefinition-of-in6_addr.patch b/package/iproute2/0001-lib-bridge-avoid-redefinition-of-in6_addr.patch new file mode 100644 index 0000000000..c684b030a8 --- /dev/null +++ b/package/iproute2/0001-lib-bridge-avoid-redefinition-of-in6_addr.patch @@ -0,0 +1,36 @@ +From 7119f3736f689ab396ca4193ac593938affd55fa Mon Sep 17 00:00:00 2001 +From: Yureka +Date: Sun, 12 Oct 2025 14:39:47 +0200 +Subject: lib: bridge: avoid redefinition of in6_addr + +On musl libc, which does not use the kernel definitions of in6_addr, including +the libc headers after the kernel (UAPI) headers would cause a redefinition +error. The opposite order avoids the redefinition. + +Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a +Signed-off-by: Yureka + +Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=7119f3736f689ab396ca4193ac593938affd55fa + +Signed-off-by: Bernd Kuhls +--- + lib/bridge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/bridge.c b/lib/bridge.c +index 5386aa017..104f5858b 100644 +--- a/lib/bridge.c ++++ b/lib/bridge.c +@@ -2,8 +2,8 @@ + + #include + +-#include "bridge.h" + #include "utils.h" ++#include "bridge.h" + + void bridge_print_vlan_flags(__u16 flags) + { +-- +cgit 1.2.3-korg + diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 028a324396..e743b4fa0d 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3 iproute2-6.11.0.tar.xz +sha256 9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec iproute2-6.17.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index c452b64cde..6d69a20126 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.11.0 +IPROUTE2_VERSION = 6.17.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index fb9b8c40d2..e5b91b2d80 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,4 +1,4 @@ -# From https://ipset.netfilter.org/ipset-7.16.tar.bz2.sha512sum.txt -sha512 e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307 ipset-7.16.tar.bz2 +# From https://ipset.netfilter.org/ipset-7.24.tar.bz2.sha512sum.txt +sha512 18ccb49bd38083f0556b11e1d17f43791c52a2b094c9a500b6f770796b17e8e70c3860a628eac2252eb672b1fc9de734d3a0e0823d61dd9be7b4188adc6dd214 ipset-7.24.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 9832d8fd30..861a8684f4 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 7.16 +IPSET_VERSION = 7.24 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf diff --git a/package/iptables/0001-nft-fix-interface-comparisons-in-C-commands.patch b/package/iptables/0001-nft-fix-interface-comparisons-in-C-commands.patch new file mode 100644 index 0000000000..308f75bbd8 --- /dev/null +++ b/package/iptables/0001-nft-fix-interface-comparisons-in-C-commands.patch @@ -0,0 +1,175 @@ +From 1f11d1004923eb941c9b4b33c8021dd9c4a2f3da Mon Sep 17 00:00:00 2001 +From: Jeremy Sowden +Date: Mon, 18 Nov 2024 13:56:50 +0000 +Subject: [PATCH] nft: fix interface comparisons in `-C` commands +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 9ccae6397475 ("nft: Leave interface masks alone when parsing from +kernel") removed code which explicitly set interface masks to all ones. The +result of this is that they are zero. However, they are used to mask interfaces +in `is_same_interfaces`. Consequently, the masked values are alway zero, the +comparisons are always true, and check commands which ought to fail succeed: + + # iptables -N test + # iptables -A test -i lo \! -o lo -j REJECT + # iptables -v -L test + Chain test (0 references) + pkts bytes target prot opt in out source destination + 0 0 REJECT all -- lo !lo anywhere anywhere reject-with icmp-port-unreachable + # iptables -v -C test -i abcdefgh \! -o abcdefgh -j REJECT + REJECT all opt -- in lo out !lo 0.0.0.0/0 -> 0.0.0.0/0 reject-with icmp-port-unreachable + +Remove the mask parameters from `is_same_interfaces`. Add a test-case. + +Fixes: 9ccae6397475 ("nft: Leave interface masks alone when parsing from kernel") +Signed-off-by: Jeremy Sowden +Signed-off-by: Phil Sutter + +Upstream: https://git.netfilter.org/iptables/commit/?id=40406dbfaefbc204134452b2747bae4f6a122848 +Signed-off-by: Jan Čermák +--- + iptables/nft-arp.c | 10 ++---- + iptables/nft-ipv4.c | 4 +-- + iptables/nft-ipv6.c | 6 +--- + iptables/nft-shared.c | 36 +++++-------------- + iptables/nft-shared.h | 6 +--- + .../nft-only/0020-compare-interfaces_0 | 9 +++++ + 6 files changed, 22 insertions(+), 49 deletions(-) + create mode 100755 iptables/tests/shell/testcases/nft-only/0020-compare-interfaces_0 + +diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c +index 264864c3..c11d64c3 100644 +--- a/iptables/nft-arp.c ++++ b/iptables/nft-arp.c +@@ -385,14 +385,8 @@ static bool nft_arp_is_same(const struct iptables_command_state *cs_a, + return false; + } + +- return is_same_interfaces(a->arp.iniface, +- a->arp.outiface, +- (unsigned char *)a->arp.iniface_mask, +- (unsigned char *)a->arp.outiface_mask, +- b->arp.iniface, +- b->arp.outiface, +- (unsigned char *)b->arp.iniface_mask, +- (unsigned char *)b->arp.outiface_mask); ++ return is_same_interfaces(a->arp.iniface, a->arp.outiface, ++ b->arp.iniface, b->arp.outiface); + } + + static void nft_arp_save_chain(const struct nftnl_chain *c, const char *policy) +diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c +index 74092875..0c8bd291 100644 +--- a/iptables/nft-ipv4.c ++++ b/iptables/nft-ipv4.c +@@ -113,9 +113,7 @@ static bool nft_ipv4_is_same(const struct iptables_command_state *a, + } + + return is_same_interfaces(a->fw.ip.iniface, a->fw.ip.outiface, +- a->fw.ip.iniface_mask, a->fw.ip.outiface_mask, +- b->fw.ip.iniface, b->fw.ip.outiface, +- b->fw.ip.iniface_mask, b->fw.ip.outiface_mask); ++ b->fw.ip.iniface, b->fw.ip.outiface); + } + + static void nft_ipv4_set_goto_flag(struct iptables_command_state *cs) +diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c +index b184f8af..4dbb2af2 100644 +--- a/iptables/nft-ipv6.c ++++ b/iptables/nft-ipv6.c +@@ -99,11 +99,7 @@ static bool nft_ipv6_is_same(const struct iptables_command_state *a, + } + + return is_same_interfaces(a->fw6.ipv6.iniface, a->fw6.ipv6.outiface, +- a->fw6.ipv6.iniface_mask, +- a->fw6.ipv6.outiface_mask, +- b->fw6.ipv6.iniface, b->fw6.ipv6.outiface, +- b->fw6.ipv6.iniface_mask, +- b->fw6.ipv6.outiface_mask); ++ b->fw6.ipv6.iniface, b->fw6.ipv6.outiface); + } + + static void nft_ipv6_set_goto_flag(struct iptables_command_state *cs) +diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c +index 6775578b..2c29e68f 100644 +--- a/iptables/nft-shared.c ++++ b/iptables/nft-shared.c +@@ -220,36 +220,16 @@ void add_l4proto(struct nft_handle *h, struct nftnl_rule *r, + } + + bool is_same_interfaces(const char *a_iniface, const char *a_outiface, +- unsigned const char *a_iniface_mask, +- unsigned const char *a_outiface_mask, +- const char *b_iniface, const char *b_outiface, +- unsigned const char *b_iniface_mask, +- unsigned const char *b_outiface_mask) ++ const char *b_iniface, const char *b_outiface) + { +- int i; +- +- for (i = 0; i < IFNAMSIZ; i++) { +- if (a_iniface_mask[i] != b_iniface_mask[i]) { +- DEBUGP("different iniface mask %x, %x (%d)\n", +- a_iniface_mask[i] & 0xff, b_iniface_mask[i] & 0xff, i); +- return false; +- } +- if ((a_iniface[i] & a_iniface_mask[i]) +- != (b_iniface[i] & b_iniface_mask[i])) { +- DEBUGP("different iniface\n"); +- return false; +- } +- if (a_outiface_mask[i] != b_outiface_mask[i]) { +- DEBUGP("different outiface mask\n"); +- return false; +- } +- if ((a_outiface[i] & a_outiface_mask[i]) +- != (b_outiface[i] & b_outiface_mask[i])) { +- DEBUGP("different outiface\n"); +- return false; +- } ++ if (strncmp(a_iniface, b_iniface, IFNAMSIZ)) { ++ DEBUGP("different iniface\n"); ++ return false; ++ } ++ if (strncmp(a_outiface, b_outiface, IFNAMSIZ)) { ++ DEBUGP("different outiface\n"); ++ return false; + } +- + return true; + } + +diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h +index 51d1e460..b57aee1f 100644 +--- a/iptables/nft-shared.h ++++ b/iptables/nft-shared.h +@@ -105,11 +105,7 @@ void add_l4proto(struct nft_handle *h, struct nftnl_rule *r, uint8_t proto, uint + void add_compat(struct nftnl_rule *r, uint32_t proto, bool inv); + + bool is_same_interfaces(const char *a_iniface, const char *a_outiface, +- unsigned const char *a_iniface_mask, +- unsigned const char *a_outiface_mask, +- const char *b_iniface, const char *b_outiface, +- unsigned const char *b_iniface_mask, +- unsigned const char *b_outiface_mask); ++ const char *b_iniface, const char *b_outiface); + + void __get_cmp_data(struct nftnl_expr *e, void *data, size_t dlen, uint8_t *op); + void get_cmp_data(struct nftnl_expr *e, void *data, size_t dlen, bool *inv); +diff --git a/iptables/tests/shell/testcases/nft-only/0020-compare-interfaces_0 b/iptables/tests/shell/testcases/nft-only/0020-compare-interfaces_0 +new file mode 100755 +index 00000000..278cd648 +--- /dev/null ++++ b/iptables/tests/shell/testcases/nft-only/0020-compare-interfaces_0 +@@ -0,0 +1,9 @@ ++#!/bin/bash ++ ++[[ $XT_MULTI == *xtables-nft-multi ]] || { echo "skip $XT_MULTI"; exit 0; } ++ ++$XT_MULTI iptables -N test ++$XT_MULTI iptables -A test -i lo \! -o lo -j REJECT ++$XT_MULTI iptables -C test -i abcdefgh \! -o abcdefgh -j REJECT 2>/dev/null && exit 1 ++ ++exit 0 diff --git a/package/iptables/Config.in b/package/iptables/Config.in index e6b12603e0..ef02c26242 100644 --- a/package/iptables/Config.in +++ b/package/iptables/Config.in @@ -24,6 +24,18 @@ config BR2_PACKAGE_IPTABLES_NFTABLES help Build nftables compat utilities. +if BR2_PACKAGE_IPTABLES_NFTABLES + +config BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT + bool "use nftables compat by default" + help + Make the nftables compat variant of iptables, iptables-save, + and iptables-restore the default. This only adjusts symlinks + in /usr/sbin, the legacy variants can still be called + directly. + +endif + comment "nftables compat needs a toolchain w/ wchar, dynamic library, headers >= 3.12" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package/iptables/S35iptables b/package/iptables/S35iptables index a2de29d222..fc42fc9a8c 100644 --- a/package/iptables/S35iptables +++ b/package/iptables/S35iptables @@ -2,11 +2,18 @@ DAEMON="iptables" -IPTABLES_ARGS="" +IPTABLES_CONF="/etc/iptables.conf" + +# Run only if IPTABLES_CONF exists, except when the action is "save" +# (which creates it). +if [ ! -f "${IPTABLES_CONF}" ] && [ "$1" != "save" ]; then + echo "${IPTABLES_CONF} does not exist, nothing to do." + exit 0 +fi start() { printf 'Starting %s: ' "$DAEMON" - iptables-restore /etc/iptables.conf + iptables-restore "$IPTABLES_CONF" status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -18,7 +25,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - iptables -F + iptables --flush status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -30,13 +37,12 @@ stop() { restart() { stop - sleep 1 start } save() { printf 'Saving %s: ' "$DAEMON" - iptables-save -f /etc/iptables.conf + iptables-save --file "$IPTABLES_CONF" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index be8b0df3d6..727fb709b1 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c iptables-1.8.10.tar.xz +sha256 d87303d55ef8c92bcad4dd3f978b26d272013642b029425775f5bad1009fe7b2 iptables-1.8.11.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 6712136962..a9d912f6cc 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.10 +IPTABLES_VERSION = 1.8.11 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES @@ -59,7 +59,18 @@ endef define IPTABLES_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/iptables/S35iptables \ $(TARGET_DIR)/etc/init.d/S35iptables - touch $(TARGET_DIR)/etc/iptables.conf endef +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT),y) +define IPTABLES_MAKE_NFTABLES_DEFAULT + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables-restore + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/iptables-save + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore + ln -sf xtables-nft-multi $(TARGET_DIR)/usr/sbin/ip6tables-save +endef +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_MAKE_NFTABLES_DEFAULT +endif + $(eval $(autotools-package)) diff --git a/package/iptraf-ng/iptraf-ng.hash b/package/iptraf-ng/iptraf-ng.hash index 314d5cee29..cadb436de1 100644 --- a/package/iptraf-ng/iptraf-ng.hash +++ b/package/iptraf-ng/iptraf-ng.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870 iptraf-ng-1.2.1.tar.gz +sha256 75fd653745ea0705995c25e6c07b34252ecc2563c6a91b007a3a8c26f29cc252 iptraf-ng-1.2.2.tar.gz sha256 4e49bef38f621aac4a870da4b30011c7b7abc7256b218daec1c425b08448ae1e LICENSE diff --git a/package/iptraf-ng/iptraf-ng.mk b/package/iptraf-ng/iptraf-ng.mk index 044630be41..1558bd1cd6 100644 --- a/package/iptraf-ng/iptraf-ng.mk +++ b/package/iptraf-ng/iptraf-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTRAF_NG_VERSION = 1.2.1 +IPTRAF_NG_VERSION = 1.2.2 IPTRAF_NG_SITE = $(call github,iptraf-ng,iptraf-ng,v$(IPTRAF_NG_VERSION)) IPTRAF_NG_LICENSE = GPL-2.0+ IPTRAF_NG_LICENSE_FILES = LICENSE diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index 6baf433dcb..2f83d397ce 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/20240905/sha256sums.asc -sha256 599cda8e3f5f7ce4c612456ab1101369da8f79aa0f83c8e877290a1c7bb56010 iputils-20240905.tar.gz +# https://github.com/iputils/iputils/releases/download/20250605/sha256sums.asc +sha256 475c643e5f55b302286267b97d3ce0f47ca3489ced8aa0401b1eeb1e68228d6b iputils-20250605.tar.gz # Locally computed sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index ec8c24e4e0..1a5d3e3678 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -4,11 +4,11 @@ # ################################################################################ -IPUTILS_VERSION = 20240905 +IPUTILS_VERSION = 20250605 IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 -IPUTILS_CPE_ID_VALID = YES +IPUTILS_CPE_ID_VENDOR = iputils IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries @@ -32,10 +32,12 @@ IPUTILS_CONF_OPTS += -DBUILD_ARPING=true # move some binaries to the same location as where Busybox installs # the corresponding applets, so that we have a single version of the # tools (from iputils) +ifeq ($(BR2_ROOTFS_MERGED_BIN),) define IPUTILS_MOVE_ARPING_BINARY mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping endef IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_ARPING_BINARY +endif else IPUTILS_CONF_OPTS += -DBUILD_ARPING=false diff --git a/package/irqbalance/irqbalance.hash b/package/irqbalance/irqbalance.hash index bf33e71e48..c9d1acade8 100644 --- a/package/irqbalance/irqbalance.hash +++ b/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8d698799251ea8518f342f36be26f2f092df51189f6777db33116d40cf0dae6c irqbalance-1.9.3.tar.gz +sha256 f37bb2e27c2e9ec609131d0ee3f770185d3845f79ee6ef11477ea0ffb600a561 irqbalance-1.9.4.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index 5d1bd48002..173c7d8df0 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRQBALANCE_VERSION = 1.9.3 +IRQBALANCE_VERSION = 1.9.4 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING diff --git a/package/isl/isl.hash b/package/isl/isl.hash index 1f8c998235..abffd78831 100644 --- a/package/isl/isl.hash +++ b/package/isl/isl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a0b5cb06d24f9fa9e77b55fabbe9a3c94a336190345c2555f9915bb38e976504 isl-0.26.tar.xz +sha256 6d8babb59e7b672e8cb7870e874f3f7b813b6e00e6af3f8b04f7579965643d5c isl-0.27.tar.xz sha256 3a2c398103f6bca0f50a9a9465deca9230b370b0212af5fdf31ed88a36215c30 LICENSE diff --git a/package/isl/isl.mk b/package/isl/isl.mk index 42830a2689..122367e665 100644 --- a/package/isl/isl.mk +++ b/package/isl/isl.mk @@ -4,7 +4,7 @@ # ################################################################################ -ISL_VERSION = 0.26 +ISL_VERSION = 0.27 ISL_SOURCE = isl-$(ISL_VERSION).tar.xz ISL_SITE = https://libisl.sourceforge.io ISL_LICENSE = MIT diff --git a/package/ivi-homescreen/ivi-homescreen.hash b/package/ivi-homescreen/ivi-homescreen.hash index 60b9281abc..484ecfb128 100644 --- a/package/ivi-homescreen/ivi-homescreen.hash +++ b/package/ivi-homescreen/ivi-homescreen.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 733a95a9b50875e8b45b0b69118656edba3ba88ecc65e3c0d76ea5df9761c433 ivi-homescreen-5ab78a19e95c88cc5d6b173ab1260a211e78cf0a-git4.tar.gz +sha256 aba31437dd90eca1fc5723619c269394e475b3000309eda86efcfd252452a85e ivi-homescreen-a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e-git4.tar.gz # Apache-2.0 sha256 6b96fa0a3def85caaf466caa2bd82d4ca4f22d106ff88f97a00c537c00cc714b LICENSE diff --git a/package/ivi-homescreen/ivi-homescreen.mk b/package/ivi-homescreen/ivi-homescreen.mk index 4293b2bc35..525fb4e11b 100644 --- a/package/ivi-homescreen/ivi-homescreen.mk +++ b/package/ivi-homescreen/ivi-homescreen.mk @@ -4,7 +4,7 @@ # ################################################################################ -IVI_HOMESCREEN_VERSION = 5ab78a19e95c88cc5d6b173ab1260a211e78cf0a +IVI_HOMESCREEN_VERSION = a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e IVI_HOMESCREEN_SITE = https://github.com/toyota-connected/ivi-homescreen.git IVI_HOMESCREEN_SITE_METHOD = git IVI_HOMESCREEN_LICENSE = Apache-2.0, BSD-3-Clause, BSD-Style, BSL-1.0, MIT diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 376dc3b499..1612bf68bc 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e iw-5.19.tar.xz +sha256 7d182e498289ab39b257da6780d562e415377107f50358ee5b55b8cfe40b1e33 iw-6.17.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 60ada9d57f..3cf7d294e4 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 5.19 +IW_VERSION = 6.17 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC diff --git a/package/iwd/Config.in b/package/iwd/Config.in index 59d4422305..e4b0ead882 100644 --- a/package/iwd/Config.in +++ b/package/iwd/Config.in @@ -10,9 +10,19 @@ config BR2_PACKAGE_IWD select BR2_PACKAGE_OPENRESOLV if !BR2_PACKAGE_SYSTEMD_RESOLVED help iNet Wireless daemon (iwd) + Enable the readline package to enable the iwctl tool. https://iwd.wiki.kernel.org/ +if BR2_PACKAGE_IWD + +config BR2_PACKAGE_IWD_IWMON + bool "iwmon" + help + iwmon - Internet wireless monitor utility + +endif + comment "iwd needs a toolchain w/ threads, wchar, headers >= 4.12" depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell diff --git a/package/iwd/S40iwd b/package/iwd/S40iwd index 6714ca9956..7858ff3e42 100644 --- a/package/iwd/S40iwd +++ b/package/iwd/S40iwd @@ -1,16 +1,16 @@ #!/bin/sh -DAEMON="/usr/libexec/iwd" -PIDFILE="/var/run/iwd.pid" +DAEMON="iwd" +PIDFILE="/var/run/$DAEMON.pid" IWD_ARGS="" -[ -r "/etc/default/iwd" ] && . "/etc/default/iwd" +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf "Starting iwd:" + printf 'Starting %s: ' "$DAEMON" mkdir -p /tmp/iwd/hotspot - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" \ + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/libexec/$DAEMON" \ -- $IWD_ARGS status=$? if [ "$status" -eq 0 ]; then @@ -22,7 +22,7 @@ start() { } stop() { - printf "Stopping iwd:" + printf 'Stopping %s: ' "$DAEMON" start-stop-daemon -K -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index b0a72efd7a..7ad2fb382d 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 bd167ab368b6ba302b6c948a4f41f02d233a12e20d5094b1c0393325309f8a60 iwd-3.0.tar.xz +sha256 640bff22540e1714f71772a83123aff6f810b7eb9d7d6df1e10fb2695beb5115 iwd-3.10.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 3a178795da..a150a3048b 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 3.0 +IWD_VERSION = 3.10 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ @@ -41,6 +41,15 @@ else IWD_RESOLV_SERVICE = resolvconf endif +ifeq ($(BR2_PACKAGE_IWD_IWMON),y) +IWD_CONF_OPTS += --enable-monitor +define IWD_LINUX_CONFIG_FIXUP_MONITOR + $(call KCONFIG_ENABLE_OPT,CONFIG_NLMON) +endef +else +IWD_CONF_OPTS += --disable-monitor +endif + define IWD_INSTALL_CONFIG_FILE $(INSTALL) -D -m 644 package/iwd/main.conf $(TARGET_DIR)/etc/iwd/main.conf $(SED) 's,__RESOLV_SERVICE__,$(IWD_RESOLV_SERVICE),' $(TARGET_DIR)/etc/iwd/main.conf @@ -76,6 +85,7 @@ define IWD_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_PKCS7_MESSAGE_PARSER) $(call KCONFIG_ENABLE_OPT,CONFIG_PKCS8_PRIVATE_KEY_PARSER) $(call KCONFIG_ENABLE_OPT,CONFIG_X509_CERTIFICATE_PARSER) + $(IWD_LINUX_CONFIG_FIXUP_MONITOR) endef $(eval $(autotools-package)) diff --git a/package/janet/janet.hash b/package/janet/janet.hash index a35835a54e..15516a4cdc 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 947dfdab6c1417c7c43efef2ecb7a92a3c339ce2135233fe88323740e6e7fab1 janet-1.35.2.tar.gz +sha256 a43489328b88846e5cddbdad9274f25ee9854e337e52490a74bb7955de03c650 janet-1.39.1.tar.gz # Locally calculated -sha256 95fca700e8dce9699248e7cc80ac88ce2357874c8352cd2be4d18f183dc9710b LICENSE +sha256 805858acec1df54018879efc78ee3ff7bab5e69908c58e46bbc2d94520f29023 LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index 9bf5322d16..cf4113fb17 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,13 +4,16 @@ # ################################################################################ -JANET_VERSION = 1.35.2 +JANET_VERSION = 1.39.1 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE JANET_INSTALL_STAGING = YES +# don't use posix_spawn_file_actions_addchdir[_np] (in src/core/os.c since 1.39.0) +JANET_CFLAGS = "-DJANET_SPAWN_NO_CHDIR $(TARGET_CFLAGS)" + ifeq ($(BR2_STATIC_LIBS),y) JANET_CONF_OPTS += -Ddynamic_modules=false endif diff --git a/package/jasper/0001-Fixes-367.patch b/package/jasper/0001-Fixes-367.patch new file mode 100644 index 0000000000..11dfb5672f --- /dev/null +++ b/package/jasper/0001-Fixes-367.patch @@ -0,0 +1,46 @@ +From aeef5293c978158255ad4f127089644745602f2a Mon Sep 17 00:00:00 2001 +From: Michael Adams +Date: Thu, 14 Dec 2023 19:04:19 -0800 +Subject: [PATCH] Fixes #367. + +Fixed an integer-overflow bug in the ICC profile parsing code. +Added another invalid image to the test set. + +CVE: CVE-2023-51257 +Upstream: https://github.com/jasper-software/jasper/commit/aeef5293c978158255ad4f127089644745602f2a +Signed-off-by: Thomas Perale +--- + src/libjasper/base/jas_icc.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/libjasper/base/jas_icc.c b/src/libjasper/base/jas_icc.c +index 905b823..2d1e91e 100644 +--- a/src/libjasper/base/jas_icc.c ++++ b/src/libjasper/base/jas_icc.c +@@ -1295,10 +1295,22 @@ static int jas_icctxt_input(jas_iccattrval_t *attrval, jas_stream_t *in, + { + jas_icctxt_t *txt = &attrval->data.txt; + txt->string = 0; +- if (!(txt->string = jas_malloc(cnt))) ++ /* The string must at least contain a single null character. */ ++ if (cnt < 1) { + goto error; +- if (jas_stream_read(in, txt->string, cnt) != cnt) ++ } ++ if (!(txt->string = jas_malloc(cnt))) { ++ goto error; ++ } ++ if (jas_stream_read(in, txt->string, cnt) != cnt) { + goto error; ++ } ++ /* Ensure that the string is null terminated. */ ++ if (txt->string[cnt - 1] != '\0') { ++ goto error; ++ } ++ /* The following line is redundant, unless we do not enforce that ++ the last character must be null. */ + txt->string[cnt - 1] = '\0'; + if (strlen(txt->string) + 1 != cnt) + goto error; +-- +2.39.5 diff --git a/package/jasper/0002-Fixes-400.patch b/package/jasper/0002-Fixes-400.patch new file mode 100644 index 0000000000..b663f1e72e --- /dev/null +++ b/package/jasper/0002-Fixes-400.patch @@ -0,0 +1,169 @@ +From bb7d62bd0a2a8e0e1fdb4d603f3305f955158c52 Mon Sep 17 00:00:00 2001 +From: Michael Adams +Date: Tue, 29 Jul 2025 20:16:35 -0700 +Subject: [PATCH] Fixes #400. + +Added a check for a missing color component in the jas_image_chclrspc +function. + +CVE: CVE-2025-8835 +Upstream: https://github.com/jasper-software/jasper/commit/bb7d62bd0a2a8e0e1fdb4d603f3305f955158c52 +[thomas: backport to v2.0.33] +Signed-off-by: Thomas Perale +--- + src/libjasper/base/jas_image.c | 71 ++++++++++++++++++++++++++++------ + 1 file changed, 59 insertions(+), 12 deletions(-) + +diff --git a/src/libjasper/base/jas_image.c b/src/libjasper/base/jas_image.c +index 68a94e1..cd99ba2 100644 +--- a/src/libjasper/base/jas_image.c ++++ b/src/libjasper/base/jas_image.c +@@ -112,6 +112,8 @@ static long convert(long val, bool oldsgnd, unsigned oldprec, bool newsgnd, + unsigned newprec); + static void jas_image_calcbbox2(const jas_image_t *image, jas_image_coord_t *tlx, + jas_image_coord_t *tly, jas_image_coord_t *brx, jas_image_coord_t *bry); ++static jas_cmcmptfmt_t* jas_cmcmptfmt_array_create(int n); ++static void jas_cmcmptfmt_array_destroy(jas_cmcmptfmt_t* cmptfmts, int n); + + /******************************************************************************\ + * Global data. +@@ -409,6 +411,31 @@ static void jas_image_cmpt_destroy(jas_image_cmpt_t *cmpt) + jas_free(cmpt); + } + ++static jas_cmcmptfmt_t* jas_cmcmptfmt_array_create(int n) ++{ ++ jas_cmcmptfmt_t* cmptfmts; ++ if (!(cmptfmts = jas_alloc2(n, sizeof(jas_cmcmptfmt_t)))) { ++ return 0; ++ } ++ for (int i = 0; i < n; ++i) { ++ cmptfmts[i].buf = 0; ++ } ++ return cmptfmts; ++} ++ ++static void jas_cmcmptfmt_array_destroy(jas_cmcmptfmt_t* cmptfmts, int n) ++{ ++ assert(cmptfmts); ++ assert(n > 0); ++ for (int i = 0; i < n; ++i) { ++ if (cmptfmts[i].buf) { ++ jas_free(cmptfmts[i].buf); ++ } ++ cmptfmts[i].buf = 0; ++ } ++ jas_free(cmptfmts); ++} ++ + /******************************************************************************\ + * Load and save operations. + \******************************************************************************/ +@@ -1470,19 +1497,25 @@ jas_image_t *jas_image_chclrspc(jas_image_t *image, const jas_cmprof_t *outprof, + jas_cmcmptfmt_t *incmptfmts; + jas_cmcmptfmt_t *outcmptfmts; + ++ assert(image); ++ assert(outprof); ++ + #if 0 + jas_eprintf("IMAGE\n"); + jas_image_dump(image, stderr); + #endif + +- if (image->numcmpts_ == 0) ++ if (!jas_image_numcmpts(image)) { + /* can't work with a file with no components; + continuing would crash because we'd attempt to + obtain information about the first component */ + return NULL; ++ } + + outimage = 0; + xform = 0; ++ incmptfmts = 0; ++ outcmptfmts = 0; + if (!(inimage = jas_image_copy(image))) + goto error; + image = 0; +@@ -1565,15 +1598,21 @@ jas_image_dump(image, stderr); + } + + inpixmap.numcmpts = numinclrchans; +- if (!(incmptfmts = jas_alloc2(numinclrchans, sizeof(jas_cmcmptfmt_t)))) { ++ assert(numinclrchans != 0); ++ if (!(incmptfmts = jas_cmcmptfmt_array_create(numinclrchans))) { + abort(); + } + inpixmap.cmptfmts = incmptfmts; + for (unsigned i = 0; i < numinclrchans; ++i) { + const int j = jas_image_getcmptbytype(inimage, JAS_IMAGE_CT_COLOR(i)); ++ if (j < 0) { ++ jas_eprintf("missing color component %d\n", i); ++ goto error; ++ } + if (!(incmptfmts[i].buf = jas_alloc2(width, sizeof(long)))) { + goto error; + } ++ assert(j >= 0 && j < jas_image_numcmpts(inimage)); + incmptfmts[i].prec = jas_image_cmptprec(inimage, j); + incmptfmts[i].sgnd = jas_image_cmptsgnd(inimage, j); + incmptfmts[i].width = width; +@@ -1581,15 +1620,21 @@ jas_image_dump(image, stderr); + } + + outpixmap.numcmpts = numoutclrchans; +- if (!(outcmptfmts = jas_alloc2(numoutclrchans, sizeof(jas_cmcmptfmt_t)))) { ++ if (!(outcmptfmts = jas_cmcmptfmt_array_create(numoutclrchans))) { + abort(); + } + outpixmap.cmptfmts = outcmptfmts; + + for (unsigned i = 0; i < numoutclrchans; ++i) { + const int j = jas_image_getcmptbytype(outimage, JAS_IMAGE_CT_COLOR(i)); +- if (!(outcmptfmts[i].buf = jas_alloc2(width, sizeof(long)))) ++ if (j < 0) { ++ jas_eprintf("missing color component %d\n", i); + goto error; ++ } ++ if (!(outcmptfmts[i].buf = jas_alloc2(width, sizeof(long)))) { ++ goto error; ++ } ++ assert(j >= 0 && j < jas_image_numcmpts(outimage)); + outcmptfmts[i].prec = jas_image_cmptprec(outimage, j); + outcmptfmts[i].sgnd = jas_image_cmptsgnd(outimage, j); + outcmptfmts[i].width = width; +@@ -1612,14 +1657,8 @@ jas_image_dump(image, stderr); + } + } + +- for (unsigned i = 0; i < numoutclrchans; ++i) { +- jas_free(outcmptfmts[i].buf); +- } +- jas_free(outcmptfmts); +- for (unsigned i = 0; i < numinclrchans; ++i) { +- jas_free(incmptfmts[i].buf); +- } +- jas_free(incmptfmts); ++ jas_cmcmptfmt_array_destroy(outcmptfmts, numoutclrchans); ++ jas_cmcmptfmt_array_destroy(incmptfmts, numinclrchans); + jas_cmxform_destroy(xform); + jas_image_destroy(inimage); + +@@ -1631,6 +1670,14 @@ jas_image_dump(outimage, stderr); + #endif + return outimage; + error: ++ if (incmptfmts) { ++ assert(numinclrchans); ++ jas_cmcmptfmt_array_destroy(incmptfmts, numinclrchans); ++ } ++ if (outcmptfmts) { ++ assert(numoutclrchans); ++ jas_cmcmptfmt_array_destroy(outcmptfmts, numoutclrchans); ++ } + if (xform) + jas_cmxform_destroy(xform); + if (inimage) +-- +2.39.5 diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 45b9c49558..527ad6fa8c 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -15,6 +15,12 @@ JASPER_CONF_OPTS = \ -DJAS_ENABLE_DOC=OFF \ -DJAS_ENABLE_PROGRAMS=OFF +# 0001-Fixes-367.patch +JASPER_IGNORE_CVES += CVE-2023-51257 + +# 0002-Fixes-400.patch +JASPER_IGNORE_CVES += CVE-2025-8835 + ifeq ($(BR2_STATIC_LIBS),y) JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF endif diff --git a/package/jbig2dec/0001-Bug-705041-jbig2dec-Avoid-uninitialized-allocator-in.patch b/package/jbig2dec/0001-Bug-705041-jbig2dec-Avoid-uninitialized-allocator-in.patch new file mode 100644 index 0000000000..8331d5f2a4 --- /dev/null +++ b/package/jbig2dec/0001-Bug-705041-jbig2dec-Avoid-uninitialized-allocator-in.patch @@ -0,0 +1,28 @@ +From e60a9f388bd5655cb514491ef8d55d403aef0773 Mon Sep 17 00:00:00 2001 +From: Sebastian Rasmussen +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 +--- + 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 + diff --git a/package/jbig2dec/jbig2dec.hash b/package/jbig2dec/jbig2dec.hash index 5a34af37f6..a93e8d8a6d 100644 --- a/package/jbig2dec/jbig2dec.hash +++ b/package/jbig2dec/jbig2dec.hash @@ -1,7 +1,5 @@ -# https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530/MD5SUMS -# and SHA512SUMS are missing the hashes for this file. # Locally computed: -sha256 279476695b38f04939aa59d041be56f6bade3422003a406a85e9792c27118a37 jbig2dec-0.19.tar.gz +sha256 7b63ff6470289547e7a3a0f145cb8ea6c2afffdd65645b7d87d3b7febc96fb3a jbig2dec-0.20.tar.gz # Hash for license files: sha256 1bf5258afe453934484fd0cea97508b72301633a6a78b0ae8a9ee44ac78f26d9 LICENSE diff --git a/package/jbig2dec/jbig2dec.mk b/package/jbig2dec/jbig2dec.mk index 8d881136ad..6b5d18785a 100644 --- a/package/jbig2dec/jbig2dec.mk +++ b/package/jbig2dec/jbig2dec.mk @@ -4,14 +4,15 @@ # ################################################################################ -JBIG2DEC_VERSION = 0.19 +JBIG2DEC_VERSION = 0.20 JBIG2DEC_SITE = \ - https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530 + https://github.com/ArtifexSoftware/jbig2dec/releases/download/$(JBIG2DEC_VERSION) JBIG2DEC_LICENSE = AGPL-3.0+ JBIG2DEC_LICENSE_FILES = LICENSE JBIG2DEC_CPE_ID_VENDOR = artifex JBIG2DEC_INSTALL_STAGING = YES -# tarball is missing install-sh, install.sh, or shtool -JBIG2DEC_AUTORECONF = YES + +# 0001-Bug-705041-jbig2dec-Avoid-uninitialized-allocator-in.patch +JBIG2DEC_IGNORE_CVES += CVE-2023-46361 $(eval $(autotools-package)) diff --git a/package/jemalloc/Config.in b/package/jemalloc/Config.in index c272d4522c..a128b8b376 100644 --- a/package/jemalloc/Config.in +++ b/package/jemalloc/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS default y if BR2_i386 || BR2_x86_64 default y if BR2_m68k default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - default y if BR2_nios2 default y if BR2_or1k default y if BR2_powerpc default y if BR2_riscv diff --git a/package/jimtcl/jimtcl.hash b/package/jimtcl/jimtcl.hash index d4174a3da6..906d2ccc23 100644 --- a/package/jimtcl/jimtcl.hash +++ b/package/jimtcl/jimtcl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985 jimtcl-0.81.tar.gz +sha256 6f2df00009f5ac4ad654c1ae1d2f8ed18191de38d1f5a88a54ea99cc16936686 jimtcl-0.83.tar.gz sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 3d68ca8f64..f2d59265ad 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -4,7 +4,7 @@ # ################################################################################ -JIMTCL_VERSION = 0.81 +JIMTCL_VERSION = 0.83 JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause diff --git a/package/jitterentropy-library/jitterentropy-library.hash b/package/jitterentropy-library/jitterentropy-library.hash index c7833f1428..91ce4d98fc 100644 --- a/package/jitterentropy-library/jitterentropy-library.hash +++ b/package/jitterentropy-library/jitterentropy-library.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 802f025f766c38abf663fd5a21482b8313b6d6e2c68c36a4ffd6bc105fe975ab jitterentropy-library-3.4.1.tar.xz -sha256 7a89069066f6c0b8767d3256e5ec5d765b2c7f3354a5a06fc8d5bd7b8103d8a3 LICENSE +sha256 9dd50f94387efadd05a10f25f3224fb959b125cb8e9c188356a74944034f0ee5 jitterentropy-library-3.6.3.tar.xz +sha256 088d208b9d22530691f1e9406a85dd7f6f5a42e3cf23d3d6df6582408e3840f7 LICENSE sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 LICENSE.bsd sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE.gplv2 diff --git a/package/jitterentropy-library/jitterentropy-library.mk b/package/jitterentropy-library/jitterentropy-library.mk index f405082d08..f1ef36d3b3 100644 --- a/package/jitterentropy-library/jitterentropy-library.mk +++ b/package/jitterentropy-library/jitterentropy-library.mk @@ -4,10 +4,10 @@ # ################################################################################ -JITTERENTROPY_LIBRARY_VERSION = 3.4.1 +JITTERENTROPY_LIBRARY_VERSION = 3.6.3 JITTERENTROPY_LIBRARY_SOURCE = \ jitterentropy-library-$(JITTERENTROPY_LIBRARY_VERSION).tar.xz -JITTERENTROPY_LIBRARY_SITE = http://www.chronox.de/jent +JITTERENTROPY_LIBRARY_SITE = http://www.chronox.de/jent/releases/$(JITTERENTROPY_LIBRARY_VERSION) JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause JITTERENTROPY_LIBRARY_LICENSE_FILES = LICENSE LICENSE.bsd LICENSE.gplv2 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES diff --git a/package/jo/jo.hash b/package/jo/jo.hash index efad8228a7..82cb212a83 100644 --- a/package/jo/jo.hash +++ b/package/jo/jo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb15592f1ba6d5a77468a1438a20e3d21c3d63bb7d045fb3544f223340fcd1a1 jo-1.6.tar.gz +sha256 0195cd6f2a41103c21544e99cd9517b0bce2d2dc8cde31a34867977f8a19c79f jo-1.9.tar.gz sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/package/jo/jo.mk b/package/jo/jo.mk index dd5dd03ddb..911d3e5f3d 100644 --- a/package/jo/jo.mk +++ b/package/jo/jo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JO_VERSION = 1.6 +JO_VERSION = 1.9 JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING diff --git a/package/jose/Config.in b/package/jose/Config.in index 4a9ed8da65..32e17276b6 100644 --- a/package/jose/Config.in +++ b/package/jose/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_JOSE bool "jose" + depends on BR2_SHARED_LIBS # builds .so depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JANSSON @@ -10,5 +11,5 @@ config BR2_PACKAGE_JOSE https://github.com/latchset/jose -comment "jose needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "jose needs a toolchain w/ shared libraries, threads" + depends on !BR2_SHARED_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/jose/jose.hash b/package/jose/jose.hash index 128d26d163..0bee7f46e8 100644 --- a/package/jose/jose.hash +++ b/package/jose/jose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz +sha256 cee329ef9fce97c4c025604a8d237092f619aaa9f6d35fdf9d8c9052bc1ff95b jose-14.tar.xz sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 723ebe8bb9..88050be5ed 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -4,13 +4,14 @@ # ################################################################################ -JOSE_VERSION = 11 +JOSE_VERSION = 14 JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl -JOSE_CONF_OPTS = -Dskip_manpages=true +JOSE_CONF_OPTS = -Ddocs=disabled +JOSE_CPE_ID_VENDOR = latchset $(eval $(meson-package)) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index a929ae4dcb..d6373f4998 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,4 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.5/ -sha1 edab071e7c5bc12f98a2a7ae499bd6b312770849 libjpeg-turbo-2.1.5.tar.gz -md5 1c6e9f8550a82c6d4cd30b370c22a5fd libjpeg-turbo-2.1.5.tar.gz # Locally computed -sha256 bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf libjpeg-turbo-2.1.5.tar.gz -sha256 60c756742db3ad1913304e8b13f0e86e22e51adb50cc0b3333c163f7e45ceec1 LICENSE.md -sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg +sha256 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf libjpeg-turbo-3.1.2.tar.gz +sha256 2189dc45a8fe96204069f8124caa53a148dfdc193f50f584c6ca7849a6072872 LICENSE.md +sha256 75815e3bf6484201a3c3d17a1bbf10f2e8e3237f84df10a2357ea896db2a81d6 README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 5e806156e8..a25f9e3f38 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,9 +4,9 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.1.5 +JPEG_TURBO_VERSION = 3.1.2 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz -JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) +JPEG_TURBO_SITE = https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) JPEG_TURBO_LICENSE_FILES = LICENSE.md README.ijg JPEG_TURBO_CPE_ID_VENDOR = libjpeg-turbo diff --git a/package/jq/jq.hash b/package/jq/jq.hash index d4d8656ea0..4596134620 100644 --- a/package/jq/jq.hash +++ b/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2 jq-1.7.1.tar.gz -sha256 10e974638a41fadfd72357f2f3a4325e20b856c563365128f72feaa406f8c92d COPYING +sha256 2be64e7129cecb11d5906290eba10af694fb9e3e7f9fc208a311dc33ca837eb0 jq-1.8.1.tar.gz +sha256 ad2b4a266b2268939c1446979759706077421cf906a203aa188c6f396e8cfd74 COPYING diff --git a/package/jq/jq.mk b/package/jq/jq.mk index ba27e22f7f..b0776021fc 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -4,9 +4,10 @@ # ################################################################################ -JQ_VERSION = 1.7.1 +JQ_VERSION = 1.8.1 JQ_SITE = https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION) -JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) +JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation), \ + BSD-2-Clause (strptime) JQ_LICENSE_FILES = COPYING JQ_CPE_ID_VALID = YES JQ_INSTALL_STAGING = YES diff --git a/package/json-c/json-c.hash b/package/json-c/json-c.hash index c9bb8c708b..88bb49cb9d 100644 --- a/package/json-c/json-c.hash +++ b/package/json-c/json-c.hash @@ -1,4 +1,4 @@ # From https://github.com/json-c/json-c/wiki -sha256 7550914d58fb63b2c3546f3ccfbe11f1c094147bd31a69dcd23714d7956159e6 json-c-0.17.tar.gz +sha256 876ab046479166b869afc6896d288183bbc0e5843f141200c677b3e8dfb11724 json-c-0.18.tar.gz # Locally calculated sha256 74c1e6ca5eba76b54d0ad00d4815c8315c1b3bc45ff99de61d103dc92486284c COPYING diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 68401433b4..254b6fd838 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_C_VERSION = 0.17 +JSON_C_VERSION = 0.18 JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 1f0e5efdb8..d3c8f2501e 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406 json-3.11.3.tar.gz -sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT +sha256 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187 json-3.12.0.tar.gz +sha256 46a65cffd1ea955132d95a8dd921640714a8d6b537d2e4e482d31145ae95b603 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 345280b346..7935e1bad3 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.11.3 +JSON_FOR_MODERN_CPP_VERSION = 3.12.0 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index b78d708391..6ac9814c10 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,9 @@ -# From https://download.gnome.org/sources/json-glib/1.8/json-glib-1.8.0.sha256sum -sha256 97ef5eb92ca811039ad50a65f06633f1aae64792789307be7170795d8b319454 json-glib-1.8.0.tar.xz +# From https://download.gnome.org/sources/json-glib/1.10/json-glib-1.10.8.sha256sum +sha256 55c5c141a564245b8f8fbe7698663c87a45a7333c2a2c56f06f811ab73b212dd json-glib-1.10.8.tar.xz -# Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +# Hashes for license files +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSES/CC0-1.0.txt +sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb LICENSES/LGPL-2.1-or-later.txt +sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt +# symlink to LICENSES/LGPL-2.1-or-later.txt +sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index e216af20b1..c99a3e666d 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,12 +4,15 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.8 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).0 +JSON_GLIB_VERSION_MAJOR = 1.10 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).8 JSON_GLIB_SITE = https://download.gnome.org/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz -JSON_GLIB_LICENSE = LGPL-2.1+ -JSON_GLIB_LICENSE_FILES = COPYING +JSON_GLIB_LICENSE = LGPL-2.1+, MIT (conformance test data), CC0-1.0 (parts of build system, metadata, translations) +JSON_GLIB_LICENSE_FILES = LICENSES/CC0-1.0.txt \ + LICENSES/LGPL-2.1-or-later.txt \ + LICENSES/MIT.txt \ + COPYING JSON_GLIB_INSTALL_STAGING = YES JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false diff --git a/package/kbd/0001-libkbdfile-fix-zlib-build.patch b/package/kbd/0001-libkbdfile-fix-zlib-build.patch new file mode 100644 index 0000000000..1324d0b53e --- /dev/null +++ b/package/kbd/0001-libkbdfile-fix-zlib-build.patch @@ -0,0 +1,35 @@ +From 488872421ef38215d2797f78497eb559d8eec32a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= +Date: Fri, 5 Dec 2025 16:45:36 +0100 +Subject: [PATCH] libkbdfile: fix zlib build + +Upstream: https://github.com/legionus/kbd/commit/2f9a4e56c2ef245fbe840677aad9d5932e17f50d + +Signed-off-by: Bernd Kuhls +--- + src/libkbdfile/elf-note.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/libkbdfile/elf-note.h b/src/libkbdfile/elf-note.h +index a0fd9e2..d3b8d5c 100644 +--- a/src/libkbdfile/elf-note.h ++++ b/src/libkbdfile/elf-note.h +@@ -26,14 +26,11 @@ int dlsym_many(void **dlp, const char *filename, ...); + */ + #define DLSYM_ARG(symbol__) &sym_##symbol__, STRINGIFY(symbol__), + +-/* For symbols being dynamically loaded */ +-#define DECLARE_DLSYM(symbol) static typeof(symbol) *sym_##symbol +- + /* + * Helper defines, to be done locally before including this header to switch between + * implementations + */ +-#define DECLARE_SYM(sym__) DECLARE_DLSYM(sym__); ++#define DECLARE_SYM(sym__) static typeof(sym__) *sym_##sym__; + + /* + * Originally from systemd codebase. +-- +2.47.3 + diff --git a/package/kbd/kbd.hash b/package/kbd/kbd.hash index 25866751f4..d46a60a80c 100644 --- a/package/kbd/kbd.hash +++ b/package/kbd/kbd.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc -sha256 519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926 kbd-2.6.4.tar.xz +sha256 fb3197f17a99eb44d22a3a1a71f755f9622dd963e66acfdea1a45120951b02ed kbd-2.9.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f CREDITS diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk index 953adccd0b..34401075ce 100644 --- a/package/kbd/kbd.mk +++ b/package/kbd/kbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -KBD_VERSION = 2.6.4 +KBD_VERSION = 2.9.0 KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd KBD_CONF_OPTS = \ @@ -13,6 +13,35 @@ KBD_CONF_OPTS = \ KBD_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf + +ifeq ($(BR2_PACKAGE_BZIP2),y) +KBD_CONF_OPTS += --with-bzip2 +KBD_DEPENDENCIES += bzip2 +else +KBD_CONF_OPTS += --without-bzip2 +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +KBD_CONF_OPTS += --with-lzma +KBD_DEPENDENCIES += xz +else +KBD_CONF_OPTS += --without-lzma +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +KBD_CONF_OPTS += --with-zlib +KBD_DEPENDENCIES += zlib +else +KBD_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +KBD_CONF_OPTS += --with-zstd +KBD_DEPENDENCIES += zstd +else +KBD_CONF_OPTS += --without-zstd +endif + KBD_LICENSE = GPL-2.0+ KBD_LICENSE_FILES = COPYING CREDITS diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 707f8663a4..dce0831bf2 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -2,9 +2,11 @@ config BR2_PACKAGE_KEXEC_ARCH_SUPPORTS bool default y depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ + BR2_loongarch64 || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k + BR2_sh4 || BR2_sh4a || BR2_aarch64 || BR2_s390x || BR2_m68k || \ + BR2_riscv config BR2_PACKAGE_KEXEC bool "kexec" diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 91496c06fc..f1f6356b68 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc # After checking pgp signature with key: -# B8868C80BA62A1FFFAF5FDA9632D3A06589DA6B1 -sha256 67b1ac503aade45a54db0bc79228a8830a35d5d4f83cee932cff3e7a81a4a9ec kexec-tools-2.0.29.tar.xz +# E27CD9A1F5ACC2FF4BFE7285D7CF64696A374FBE +sha256 8f81422a5fd2362cf6cb001b511e535565ed0f32c2f4451fb5eb68fed6710a5d kexec-tools-2.0.32.tar.xz # locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 5f798b6a3f..240c219a9d 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.29 +KEXEC_VERSION = 2.0.32 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 2e1e0cfbd0..65c17baeaf 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -35,6 +35,7 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS bool "Install python tools" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on BR2_PACKAGE_PYTHON3 depends on !BR2_STATIC_LIBS # protobuf depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy @@ -42,7 +43,6 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB select BR2_PACKAGE_PYTHON_PROTOBUF # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee - select BR2_PACKAGE_PYTHON_SETUPTOOLS help Enable Python and Python-related tools (RTL_433, RTLAMR, RTLADSB and Freaklabs Zigbee) @@ -52,26 +52,29 @@ comment "python tools needs python3" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS -comment "python tools needs a glibc or musl toolchain w/ dynamic library" +comment "python tools needs a glibc or musl toolchain w/ dynamic library, gcc >= 8" depends on BR2_STATIC_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_KISMET_SERVER bool "Install server" default y depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PROTOBUF -comment "server needs a toolchain w/ dynamic library, wchar" +comment "server needs a toolchain w/ dynamic library, wchar, gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 comment "server needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 543515858e..2d05a6791b 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7 kismet-2023-07-R1.tar.xz +sha256 2dccf9b5bbf5f4e6b04a44bf8cfecf80db8dcfa52a8183dd1166396c3ca04660 kismet-52bcb902e36b2df1562cfbe644b113362248d029.tar.gz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index c448233d60..f182fbe328 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,9 +4,8 @@ # ################################################################################ -KISMET_VERSION = 2023-07-R1 -KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz -KISMET_SITE = http://www.kismetwireless.net/code +KISMET_VERSION = 52bcb902e36b2df1562cfbe644b113362248d029 +KISMET_SITE = $(call github,kismetwireless,kismet,$(KISMET_VERSION)) KISMET_DEPENDENCIES = \ host-pkgconf \ libpcap \ @@ -37,6 +36,13 @@ else KISMET_CONF_OPTS += --disable-libcap endif +ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) +KISMET_DEPENDENCIES += librtlsdr +KISMET_CONF_OPTS += --enable-librtlsdr +else +KISMET_CONF_OPTS += --disable-librtlsdr +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) KISMET_DEPENDENCIES += libusb KISMET_CONF_OPTS += --enable-libusb @@ -58,6 +64,13 @@ else KISMET_CONF_OPTS += --disable-lmsensors endif +ifeq ($(BR2_PACKAGE_MOSQUITTO),y) +KISMET_DEPENDENCIES += mosquitto +KISMET_CONF_OPTS += --enable-mosquitto +else +KISMET_CONF_OPTS += --disable-mosquitto +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) KISMET_DEPENDENCIES += pcre2 KISMET_CONF_OPTS += --enable-pcre --enable-require-pcre2 @@ -69,7 +82,7 @@ KISMET_CONF_OPTS += --disable-pcre endif ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) -KISMET_DEPENDENCIES += python3 python-setuptools +KISMET_DEPENDENCIES += python3 host-python-setuptools KISMET_CONF_OPTS += \ --enable-python-tools \ --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) diff --git a/package/kmod/0002-Use-portable-implementation-for-basename-API.patch b/package/kmod/0002-Use-portable-implementation-for-basename-API.patch deleted file mode 100644 index 26f108d66e..0000000000 --- a/package/kmod/0002-Use-portable-implementation-for-basename-API.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 9 Dec 2023 17:35:59 -0800 -Subject: [PATCH] Use portable implementation for basename API - -musl has removed the non-prototype declaration of basename from -string.h [1] which now results in build errors with clang-17+ compiler - -Implement GNU basename behavior using strchr which is portable across libcs - -Fixes -../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] -71 | "Commands:\n", basename(argv[0])); -| ^ - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Suggested-by: Rich Felker - -Signed-off-by: Khem Raj - -Upstream: https://github.com/kmod-project/kmod/pull/32 -Signed-off-by: Fiona Klute ---- - libkmod/libkmod-config.c | 2 +- - shared/util.c | 4 ++-- - shared/util.h | 7 +++++++ - testsuite/testsuite.c | 2 +- - tools/depmod.c | 2 +- - tools/kmod.c | 4 ++-- - 6 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c -index e83621b3..8aa555a4 100644 ---- a/libkmod/libkmod-config.c -+++ b/libkmod/libkmod-config.c -@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, - bool is_single = false; - - if (name == NULL) { -- name = basename(path); -+ name = gnu_basename(path); - is_single = true; - } - -diff --git a/shared/util.c b/shared/util.c -index e2bab83a..0e16670e 100644 ---- a/shared/util.c -+++ b/shared/util.c -@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * - - char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) - { -- char *modname; -+ const char *modname; - -- modname = basename(path); -+ modname = gnu_basename(path); - if (modname == NULL || modname[0] == '\0') - return NULL; - -diff --git a/shared/util.h b/shared/util.h -index c4a3916b..073dc5a7 100644 ---- a/shared/util.h -+++ b/shared/util.h -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -76,6 +77,12 @@ do { \ - __p->__v = (val); \ - } while(0) - -+static _always_inline_ const char *gnu_basename(const char *s) -+{ -+ const char *p = strrchr(s, '/'); -+ return p ? p+1 : s; -+} -+ - static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) - { - return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); -diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c -index 318343ac..aafc9873 100644 ---- a/testsuite/testsuite.c -+++ b/testsuite/testsuite.c -@@ -70,7 +70,7 @@ static void help(void) - - printf("Usage:\n" - "\t%s [options] \n" -- "Options:\n", basename(progname)); -+ "Options:\n", gnu_basename(progname)); - - for (itr = options, itr_short = options_short; - itr->name != NULL; itr++, itr_short++) -diff --git a/tools/depmod.c b/tools/depmod.c -index 43fc354a..cfb15b11 100644 ---- a/tools/depmod.c -+++ b/tools/depmod.c -@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files - if (name != NULL) - namelen = strlen(name); - else { -- name = basename(dir); -+ name = gnu_basename(dir); - namelen = strlen(name); - dirlen -= namelen + 1; - } -diff --git a/tools/kmod.c b/tools/kmod.c -index 55689c07..df91e5c6 100644 ---- a/tools/kmod.c -+++ b/tools/kmod.c -@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) - "Options:\n" - "\t-V, --version show version\n" - "\t-h, --help show this help\n\n" -- "Commands:\n", basename(argv[0])); -+ "Commands:\n", gnu_basename(argv[0])); - - for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { - if (kmod_cmds[i]->help != NULL) { -@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) - const char *cmd; - size_t i; - -- cmd = basename(argv[0]); -+ cmd = gnu_basename(argv[0]); - - for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { - if (streq(kmod_compat_cmds[i]->name, cmd)) diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index f4b01b20a2..46a2d538ad 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 f5a6949043cc72c001b728d8c218609c5a15f3c33d75614b78c79418fcf00d80 kmod-31.tar.xz +sha256 dc768b3155172091f56dc69430b5481f2d76ecd9ccb54ead8c2540dbcf5ea9bc kmod-33.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index d83fb85a3e..cbf89bca9d 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 31 +KMOD_VERSION = 33 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES @@ -68,16 +68,24 @@ ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) KMOD_LICENSE += , GPL-2.0+ (tools) KMOD_LICENSE_FILES += COPYING -# /sbin is really /usr/sbin with merged /usr, so adjust relative symlink +# /sbin is really /usr/sbin with merged /usr, and /usr/sbin is +# really /usr/bin with merged-bin, so adjust relative symlink ifeq ($(BR2_ROOTFS_MERGED_USR),y) +ifeq ($(BR2_ROOTFS_MERGED_BIN),y) +KMOD_BIN_PATH = kmod +KMOD_SBIN_DIR = bin +else KMOD_BIN_PATH = ../bin/kmod +KMOD_SBIN_DIR = sbin +endif else KMOD_BIN_PATH = ../usr/bin/kmod +KMOD_SBIN_DIR = sbin endif define KMOD_INSTALL_TOOLS for i in depmod insmod lsmod modinfo modprobe rmmod; do \ - ln -sf $(KMOD_BIN_PATH) $(TARGET_DIR)/sbin/$$i; \ + ln -sf $(KMOD_BIN_PATH) $(TARGET_DIR)/$(KMOD_SBIN_DIR)/$$i; \ done endef diff --git a/package/kmon/kmon.hash b/package/kmon/kmon.hash index 96400977b8..c9c129648b 100644 --- a/package/kmon/kmon.hash +++ b/package/kmon/kmon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4723d733a2b6ad5f318a6bea77f973f3a9dbfdb727ba00352a13b9db0522194 kmon-1.6.5-cargo2.tar.gz +sha256 7b66ef3d20951dfdbe6a62c82ee6de4bb6db23135e65cf535df5d934a7d462d4 kmon-1.7.1-cargo4.tar.gz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/package/kmon/kmon.mk b/package/kmon/kmon.mk index afd996f376..a29282df98 100644 --- a/package/kmon/kmon.mk +++ b/package/kmon/kmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMON_VERSION = 1.6.5 +KMON_VERSION = 1.7.1 KMON_SITE = $(call github,orhun,kmon,v$(KMON_VERSION)) KMON_LICENSE = GPL-3.0 KMON_LICENSE_FILES = LICENSE diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk index 8ebdffaad1..f65cc668d4 100644 --- a/package/kmsxx/kmsxx.mk +++ b/package/kmsxx/kmsxx.mk @@ -30,7 +30,7 @@ KMSXX_EXTRA_UTILS += kmstouch endif define KMSXX_INSTALL_EXTRA_UTILS $(foreach t,$(KMSXX_EXTRA_UTILS),\ - $(INSTALL) -D -m 0755 $(@D)/build/utils/$(t) \ + $(INSTALL) -D -m 0755 $(@D)/buildroot-build/utils/$(t) \ $(TARGET_DIR)/usr/bin/$(t) ) endef diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 054e7581cc..d011e38fe9 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7c637f4e012e7e26a3431244a8444331f9bfeaf9c6af73cac799b58b9a0eefdf kodi-audiodecoder-modplug-e697156054ea3eb5974fb9727e046287220985e5.tar.gz +sha256 b2828685f1c353bf7123d0f9e88b28f53064388f6ea3ee357b8fb22d5c237ac8 kodi-audiodecoder-modplug-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index e435591cbf..15a1d96635 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = e697156054ea3eb5974fb9727e046287220985e5 +KODI_AUDIODECODER_MODPLUG_VERSION = 21.0.2-Omega KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index b2e3a36a0d..d743433027 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fd0d12af9d3d59fbcf41e67d1f8ac9e1339c702219da4a3393688e89ff911ebb kodi-audiodecoder-nosefart-92c6daeb278b02cd63fee724c96051421c9149f3.tar.gz +sha256 4c82bf0ffab2d09f26b84d382fd00f70695d5f6a6d781be2818f9f5e10bc675a kodi-audiodecoder-nosefart-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 7425447115..ca45739a02 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 92c6daeb278b02cd63fee724c96051421c9149f3 +KODI_AUDIODECODER_NOSEFART_VERSION = 21.0.2-Omega KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 1f0da25fc3..87cf151859 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 63090c74af51db7a859f8a2aa317ea2c4f2125be3306190502efc5522f00ec93 kodi-audiodecoder-sidplay-0ba1bc70faced93352cdd9ec1a5ec84e22a2e0f5.tar.gz +sha256 c7d10dd65baed2db1272ff57fde76f0b268a4a434d57022539c4dc5bf6f8b54e kodi-audiodecoder-sidplay-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index a08901328f..d98fc4a7f5 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 0ba1bc70faced93352cdd9ec1a5ec84e22a2e0f5 +KODI_AUDIODECODER_SIDPLAY_VERSION = 21.0.2-Omega KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index db8b33cb4b..0ebd6cf128 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4932d6d00c3b8662bc6e1600757bd85856c79028c5ecb920fa0d257bab30b7a2 kodi-audiodecoder-snesapu-532186702c49ba7fe007badc74fa6a6e9cac48fe.tar.gz +sha256 98afd81a9653efd9c6fe69dd7918755c75a4671322b793a35bce610acac0d128 kodi-audiodecoder-snesapu-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 5b6cafcc0f..aa8178c55a 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 532186702c49ba7fe007badc74fa6a6e9cac48fe +KODI_AUDIODECODER_SNESAPU_VERSION = 21.0.2-Omega KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index daa3f537fd..560c93b74f 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bf292e364bd9bbc0286fb49815cd4c2f86e5952d9bd1c878f6d1952d081d87de kodi-audiodecoder-stsound-b72c793e2ada7ab2358568ec5b01fd71ddf7cdb3.tar.gz +sha256 089ddd6c890e571f69eda0a85077d8ffe91c4b31fd0f9e20f47d4053c1e984a8 kodi-audiodecoder-stsound-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index 36535cde60..2bd37a8e04 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = b72c793e2ada7ab2358568ec5b01fd71ddf7cdb3 +KODI_AUDIODECODER_STSOUND_VERSION = 21.0.2-Omega KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+ KODI_AUDIODECODER_STSOUND_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index 8714ebbdac..22e7015ff8 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6f8e72ab3c63db04fd863893bbc5afe2c8cfcc7a71d86b68ed5bfe26ea5bf066 kodi-audiodecoder-timidity-00bee97ded3bc824dc454104bd53d0f431404571.tar.gz +sha256 eb7bee9453825f86275ae05c4561fb52ee7fd9fa21857e303933cb57d28ccc4b kodi-audiodecoder-timidity-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index bef0d67214..c165492416 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = 00bee97ded3bc824dc454104bd53d0f431404571 +KODI_AUDIODECODER_TIMIDITY_VERSION = 21.0.2-Omega KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index a39c49bbb2..010315db59 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c198151522b082feef1855e8a94d45ee498388c6764d58b92af9de20c72896c0 kodi-audiodecoder-vgmstream-56bedfc90ca600401e6dda407a5b933da0976664.tar.gz +sha256 6f5dddc0e6161426b8c40bfd1136ca555588db27ae78c02178b6ac5da93b377c kodi-audiodecoder-vgmstream-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 62d956892b..66beec0a37 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = 56bedfc90ca600401e6dda407a5b933da0976664 +KODI_AUDIODECODER_VGMSTREAM_VERSION = 21.0.2-Omega KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+ KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 8910a6e499..de326bc619 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 37bf7e8b6bff74f7609df7c7d0672b2c847ac6bc8d0a586a7a8c136712d57cbd kodi-audioencoder-flac-de8f0937d8f3ddda987599041b82b7f1c32beec7.tar.gz +sha256 2e7f21f4c42ac2c627ed381436d430a83f18ebc07cb92e91b6c98c4ff9528cc5 kodi-audioencoder-flac-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index 6d7920b108..5fccb82313 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = de8f0937d8f3ddda987599041b82b7f1c32beec7 +KODI_AUDIOENCODER_FLAC_VERSION = 21.0.2-Omega KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_FLAC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index 17a2524756..6c9439ec5d 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4241e4d4a5b6619de684d67b79b8e7b18003cee6dcc6d8f87e5c429899f48146 kodi-audioencoder-lame-f272aeb7aeb94e9d8bf1454e23f0232790bf0ef6.tar.gz +sha256 cf593053e7413f6790352ab3c2fcf227763a23c8e7a90381b46afdde3d92df7f kodi-audioencoder-lame-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index b0a870995d..a1fa2c51dd 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = f272aeb7aeb94e9d8bf1454e23f0232790bf0ef6 +KODI_AUDIOENCODER_LAME_VERSION = 21.0.2-Omega KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 6a5617717c..91f51421c2 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b05ece93cb843a84facd1240141b6f1ea0653b07e95939f9837310bc3ecdda7 kodi-audioencoder-vorbis-88c1a68efa644aaf2bb91378e26a3f054dcf025c.tar.gz +sha256 5acd05c5e90459c1f07abe60c1df40f72ebcb3519287f104968c7cad17aca07d kodi-audioencoder-vorbis-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index 11c1a863f1..85a320c55c 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = 88c1a68efa644aaf2bb91378e26a3f054dcf025c +KODI_AUDIOENCODER_VORBIS_VERSION = 21.0.2-Omega KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index 56f16824ab..34370b536b 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e2f9d7bf7be9b4d521a103115e204150fd029c50fb55e6fd700d32945a8d8551 kodi-audioencoder-wav-d4449bb3f2066893649cdbcc72375a628e610289.tar.gz +sha256 2bbc3e15706e02bbd3e6be3c232522e2091509a6fdf88d8af5db4cd6bf7b3476 kodi-audioencoder-wav-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index 8dbc84038b..76f092302b 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = d4449bb3f2066893649cdbcc72375a628e610289 +KODI_AUDIOENCODER_WAV_VERSION = 21.0.2-Omega KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_WAV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-imagedecoder-heif/Config.in b/package/kodi-imagedecoder-heif/Config.in index d0950385a0..f41b164ff4 100644 --- a/package/kodi-imagedecoder-heif/Config.in +++ b/package/kodi-imagedecoder-heif/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF bool "kodi-imagedecoder-heif" depends on BR2_INSTALL_LIBSTDCPP # libde265, libheif, tinyxml2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libde265 + depends on BR2_TOOLCHAIN_HAS_THREADS # libde265, libheif depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libheif select BR2_PACKAGE_LIBDE265 diff --git a/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.hash b/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.hash index c68a26808e..f8bd74d0b2 100644 --- a/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.hash +++ b/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 12578bc027871dce331ea82070dd8f3e59bf89e72ae43b9178b8083a36be9c23 kodi-imagedecoder-heif-bf9771060dddc753ac7cf1dbf561059cad54dfb0.tar.gz +sha256 4502522c6e71439114a57cf51f444e38b32c7f786636ca6c361c94aaf5ffe066 kodi-imagedecoder-heif-21.0.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.mk b/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.mk index 600f3fa7d2..5114dad72b 100644 --- a/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.mk +++ b/package/kodi-imagedecoder-heif/kodi-imagedecoder-heif.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_IMAGEDECODER_HEIF_VERSION = bf9771060dddc753ac7cf1dbf561059cad54dfb0 +KODI_IMAGEDECODER_HEIF_VERSION = 21.0.3-Omega KODI_IMAGEDECODER_HEIF_SITE = $(call github,xbmc,imagedecoder.heif,$(KODI_IMAGEDECODER_HEIF_VERSION)) KODI_IMAGEDECODER_HEIF_LICENSE = GPL-2.0+ KODI_IMAGEDECODER_HEIF_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.hash b/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.hash index 8f9451048c..98adf46a9b 100644 --- a/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.hash +++ b/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 451ce58acf377dd4758d78baf46f3e8c35d1e76b1a073744963f7a837f336707 kodi-imagedecoder-raw-7be9cf4d985c277f3a059f64873d81b24e6edd70.tar.gz +sha256 421812f6ca8d70e6736c920935461b43f1338ee04a919dcf7e5f7ce1879b54e2 kodi-imagedecoder-raw-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.mk b/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.mk index 87699ffaca..989742a901 100644 --- a/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.mk +++ b/package/kodi-imagedecoder-raw/kodi-imagedecoder-raw.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_IMAGEDECODER_RAW_VERSION = 7be9cf4d985c277f3a059f64873d81b24e6edd70 +KODI_IMAGEDECODER_RAW_VERSION = 21.0.2-Omega KODI_IMAGEDECODER_RAW_SITE = $(call github,xbmc,imagedecoder.raw,$(KODI_IMAGEDECODER_RAW_VERSION)) KODI_IMAGEDECODER_RAW_LICENSE = GPL-2.0+ KODI_IMAGEDECODER_RAW_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-inputstream-adaptive/0001-Fix-build-with-gcc-15.patch b/package/kodi-inputstream-adaptive/0001-Fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..79daea00bc --- /dev/null +++ b/package/kodi-inputstream-adaptive/0001-Fix-build-with-gcc-15.patch @@ -0,0 +1,31 @@ +From 8ee42c56f1f5f959ce1c66ad4b33235a0b69c774 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 17 May 2025 12:19:09 +0200 +Subject: [PATCH] Fix build with gcc-15 + +Upstream: not applicable + +The code which included uint16_t was removed in the to-be-released +Piers branch: +https://github.com/xbmc/inputstream.adaptive/commit/2afe7b8801d2da3059bfb2df0e5a6981fb9e46e9#diff-3dcaf13e4dbb2a79fa703382b7469e3c4ab1f0994928a5c0fca2627b8a9c8eac + +Signed-off-by: Bernd Kuhls +--- + src/common/AdaptiveUtils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/AdaptiveUtils.h b/src/common/AdaptiveUtils.h +index 7563cb86..89812532 100644 +--- a/src/common/AdaptiveUtils.h ++++ b/src/common/AdaptiveUtils.h +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + // forwards + class AP4_Movie; +-- +2.39.5 + diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index a80c87124b..b3bbd1b06c 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 8bd781ba3012966f6ef45a085d6e09d7feee1cefe582d96563c7661affb68551 kodi-inputstream-adaptive-21.5.6-Omega.tar.gz +sha256 f07c72cc0aa4b379a41c991adae7ccbb31ba5f94da13e986d84e53b67e332bdc kodi-inputstream-adaptive-21.5.17-Omega.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 96ae071745..a886960721 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 21.5.6-Omega +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 21.5.17-Omega KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 536bdc7031..8059858c4d 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b28ccbd489d9b69779fd818ee158f69ebd6fd85b1f0410ffc8098ff0c8665bdc kodi-inputstream-ffmpegdirect-21.3.5-Omega.tar.gz +sha256 0648c6bbb2143cec0c3f48ad476f2c213f20c809caaf5ac74c8ceb4e53635f4e kodi-inputstream-ffmpegdirect-21.3.8-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk index d9d46ed768..9fb9c95e13 100644 --- a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 21.3.5-Omega +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 21.3.8-Omega KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index 7a86e54048..497efef7cf 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 193fabb14cd9d92baecf7319c50ba183bc6254385bf187fe2a726159134df2a9 kodi-inputstream-rtmp-21.1.0-Omega.tar.gz +sha256 b7223a30d2774e4c7cbd6c4f8a266bf4d186d160590077be627bd0490d80645c kodi-inputstream-rtmp-21.1.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index 5c09144e71..7aef9c815d 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = 21.1.0-Omega +KODI_INPUTSTREAM_RTMP_VERSION = 21.1.2-Omega KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_RTMP_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 774c7e8e66..3e61e1af9f 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 21.1-Omega +KODI_JSONSCHEMABUILDER_VERSION = 21.3-Omega KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index a9d27bd70d..3be4eef39b 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 226366b69536579d1adccb8548ba20c1b094876ce481bab81f744affa71bb305 kodi-peripheral-joystick-21.1.18-Omega.tar.gz +sha256 7392c30a9e49b0cd219cdca14f5b20ffce9f4a52c349c2cdf37cb603dd21f516 kodi-peripheral-joystick-21.1.23-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index aceefba55a..698b918266 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 21.1.18-Omega +KODI_PERIPHERAL_JOYSTICK_VERSION = 21.1.23-Omega KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 3ead10c479..833905b9a3 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 50e363e3bc02a1e0585294b08f920e077af5290203cd76aae02ac363ee98f3e5 kodi-peripheral-xarcade-21.0.1-Omega.tar.gz +sha256 5f74b0493e0f17e297f271b0befd01406dcaae121305bc7cb9d0ece6200cc675 kodi-peripheral-xarcade-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index f3364e3520..a46c616323 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 21.0.1-Omega +KODI_PERIPHERAL_XARCADE_VERSION = 21.0.2-Omega KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index df9b9242d4..a778272054 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2fc9a21411f2015ef5d07fc4aad1411588860b2036a5677bde88b2429839192b kodi-pvr-argustv-21.0.2-Omega.tar.gz +sha256 8ec41a956a4348ded0ee650aaa20eb5ec746102b77da46515dcdfd5fa724c157 kodi-pvr-argustv-21.1.1-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index d1f05cadf7..71830f4413 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 21.0.2-Omega +KODI_PVR_ARGUSTV_VERSION = 21.1.1-Omega KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index 286a30abc3..8ff9d652a3 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a532955c0993f0d30ce85a04c80e62e80312089435b32f7dd28e1882b52dbf33 kodi-pvr-dvblink-21.1.2-Omega.tar.gz +sha256 7c436b7a9a4e991f99c01e1fbe69761a1792e4aa703ec95e29ecdb9b7f251ae6 kodi-pvr-dvblink-21.1.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index 652052152e..8f1b4c71b2 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBLINK_VERSION = 21.1.2-Omega +KODI_PVR_DVBLINK_VERSION = 21.1.3-Omega KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ KODI_PVR_DVBLINK_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index 8aadcfdbb5..18107198f8 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bde3ff8e2416d6b47478702ec0731a3a31392422f4cd0ec41669bb797277c31a kodi-pvr-dvbviewer-21.1.2-Omega.tar.gz +sha256 9e567eb074b885621266d2eb1e67e79a19f47ef503aad110d9bf92ba2bd75084 kodi-pvr-dvbviewer-21.1.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index a68bc23c2e..ec3cae5303 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_DVBVIEWER_VERSION = 21.1.2-Omega +KODI_PVR_DVBVIEWER_VERSION = 21.1.3-Omega KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ KODI_PVR_DVBVIEWER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index 058788d1af..ed2de1e5e0 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 62e7426d654e33c95c2c9940fce48f9549f73eae510258448fd6ed606499eac6 kodi-pvr-filmon-21.0.2-Omega.tar.gz +sha256 323702037d65d2820dbe7c589f395d1d1321a4fec61738745dd104ae569088df kodi-pvr-filmon-21.0.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index db7ca75214..7cb602a658 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 21.0.2-Omega +KODI_PVR_FILMON_VERSION = 21.0.3-Omega KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ KODI_PVR_FILMON_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index c1635b5582..88bd915f1d 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5c59d1ca40846b733175ba0f5360b86ea676a64d1a162bdc0faf8e16a8f2dea0 kodi-pvr-hdhomerun-21.0.1-Omega.tar.gz +sha256 3033a3bdb8ac4cc5fdb1a85ec9ac8307a37dfa894472283ac589ae8c1f339dc7 kodi-pvr-hdhomerun-21.0.4-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 5f69f606ef..1d3338d5f7 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 21.0.1-Omega +KODI_PVR_HDHOMERUN_VERSION = 21.0.4-Omega KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-hts/0001-gcc15.patch b/package/kodi-pvr-hts/0001-gcc15.patch new file mode 100644 index 0000000000..a62c5f836b --- /dev/null +++ b/package/kodi-pvr-hts/0001-gcc15.patch @@ -0,0 +1,26 @@ +From b8fb7f6cbe9e3e9ea2737dc465a70fb4bb0951eb Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 9 Dec 2024 00:19:15 +1100 +Subject: [PATCH] Fix build with gcc-15 + +Backport upstream commit to fix build error with gcc-15. + +Upstream: https://github.com/kodi-pvr/pvr.hts/commit/b8fb7f6cbe9e3e9ea2737dc465a70fb4bb0951eb + +Signed-off-by: Bernd Kuhls +--- + src/tvheadend/HTSPVFS.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tvheadend/HTSPVFS.h b/src/tvheadend/HTSPVFS.h +index 1fbf9d18..80f9fea3 100644 +--- a/src/tvheadend/HTSPVFS.h ++++ b/src/tvheadend/HTSPVFS.h +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + namespace kodi + { diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 15b790c80c..db2c69e67f 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c54c249a4c91091e47245b406210224aa4e3c5468497eb9cdeb09cd336cab4b2 kodi-pvr-hts-21.2.5-Omega.tar.gz +sha256 c98e29433bf4a007662b20279748dccd95da7817ab73b7e78c0b45fbe31c22b1 kodi-pvr-hts-21.2.6-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 68c4d04bd0..0e34a4bb09 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 21.2.5-Omega +KODI_PVR_HTS_VERSION = 21.2.6-Omega KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 60e1c4ece8..56598d88f7 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22a76504872b20703c5f77e5025dea4cecd777985c0584f2b6f5e0b64e268142 kodi-pvr-iptvsimple-21.10.0-Omega.tar.gz +sha256 377fb3c69d39866c0b3b8a3a7d4c790241b15997b140f45443209c4e44e62418 kodi-pvr-iptvsimple-21.11.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 7c63cf06ab..0a4d9f5f1a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 21.10.0-Omega +KODI_PVR_IPTVSIMPLE_VERSION = 21.11.0-Omega KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 568ec564cd..6fb3ce9b0e 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8193889ef3033e2df471660bae77a02e7c12d519928eed19b19142c548070b1c kodi-pvr-mediaportal-tvserver-21.0.4-Omega.tar.gz +sha256 38727f8ea1ac350ced769b21919eb4b1409479f82ceeadf5140dbbdb7d5af415 kodi-pvr-mediaportal-tvserver-21.0.5-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index ec01821411..bdad9ec36a 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 21.0.4-Omega +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 21.0.5-Omega KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index d445d9cb2c..a63d5df793 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d3a54798f38befeaeaf57dec7ea85e3c8846591298ced3f686ac03d62edeb0f9 kodi-pvr-mythtv-21.1.9-Omega.tar.gz +sha256 15c772adbf79fd92bd6b7d597fd85a23df00b26bd433531c997101ee8ddde86c kodi-pvr-mythtv-21.1.11-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 0b54002aba..ffb87660b4 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 21.1.9-Omega +KODI_PVR_MYTHTV_VERSION = 21.1.11-Omega KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 130bcbe5b2..95d487bdab 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3df0ed9a1f7dd61feba1fd8281cdd5b6e3ee153f78eba3e645e5d2213f7c5793 kodi-pvr-nextpvr-21.2.0-Omega.tar.gz +sha256 6315a7bfe038b02c80efe4fe3ee33f92ee2454af8668ce3847e9bcaca38d2147 kodi-pvr-nextpvr-21.3.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index cd0378bff8..56c8830606 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 21.2.0-Omega +KODI_PVR_NEXTPVR_VERSION = 21.3.2-Omega KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index c99e92bb9d..b5933657c4 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e9768f87857374476766ba8d791793b4e8d1e9d3239149b2142a7b5b3f24b439 kodi-pvr-njoy-21.0.1-Omega.tar.gz +sha256 62d856e14b76aa6900c28d4679b13d79d891dc040c4ea87331b0eee373542644 kodi-pvr-njoy-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index ab0d371c21..da74a31de0 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 21.0.1-Omega +KODI_PVR_NJOY_VERSION = 21.0.2-Omega KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index bc79a194de..2d9f739ad9 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d695032343a096c214a767f8c13d072035dc38cbda2a3305a91bc40ee7cb7770 kodi-pvr-pctv-21.0.1-Omega.tar.gz +sha256 d3527b88d3956fecf8dda40928bc01bd340a22c25a6c38f758af8d6d85153354 kodi-pvr-pctv-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index d7b7b59b4c..52465471a4 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 21.0.1-Omega +KODI_PVR_PCTV_VERSION = 21.0.2-Omega KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index 871d64c191..7381749ea2 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cacdae70fa5b35f2913b036bf6e1915c7aff45c6bfae782f27e184a5b9a77d5f kodi-pvr-plutotv-21.3.2-Omega.tar.gz +sha256 9b65a30f4a5c0cfbf1ab669f06a3afb0cc7b2732ed6d6d4e768d16fd10a0da02 kodi-pvr-plutotv-21.3.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index 1227e5910c..898b0aad0c 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 21.3.2-Omega +KODI_PVR_PLUTOTV_VERSION = 21.3.3-Omega KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 4232af0deb..0cf4b7d9b1 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dd461f59d37cd5e4a199ea2547aeef42861d9f7a57b5d92d3253f686164474a6 kodi-pvr-stalker-21.1.2-Omega.tar.gz +sha256 567b0d8bc7d79a166a65e3c47ecb3f73e3aa57db840465ea2e6c70c74421c162 kodi-pvr-stalker-21.1.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index a703323cdc..cd910857a8 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 21.1.2-Omega +KODI_PVR_STALKER_VERSION = 21.1.3-Omega KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index e35d518baa..fb7ba291fd 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 241aad6926579835d5d0513ad588f39ee9e99de5858655c38a25454c69372746 kodi-pvr-vbox-21.1.4-Omega.tar.gz +sha256 6550fa41f1d7312619dd9f4620a4b5b6c47240d71273df34a4300e580f617635 kodi-pvr-vbox-21.1.5-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index 4b16c70ea8..f4e069933f 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VBOX_VERSION = 21.1.4-Omega +KODI_PVR_VBOX_VERSION = 21.1.5-Omega KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 79475062e8..5b139bedb2 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c66868a97c4860442cf02acfeacedc929da372bf1b71971410700e8e9689a12 kodi-pvr-vdr-vnsi-21.1.2-Omega.tar.gz +sha256 4608cfd2339cfc52470575f7caf153a97502cb360b44fcef2921c0623a931ef8 kodi-pvr-vdr-vnsi-21.1.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index c35594eba1..9ab5c9de03 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 21.1.2-Omega +KODI_PVR_VDR_VNSI_VERSION = 21.1.3-Omega KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index f0bb4df7df..abbffd0f17 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b807baf970b034762d6bccb8be63c16a4a50508f3fc5b87d53d0804f4e94ac4d kodi-pvr-vuplus-21.3.0-Omega.tar.gz +sha256 5d83bb04fdf6f41f3ebb63df19d9f5e21631de4726475df731fc665af789072c kodi-pvr-vuplus-21.3.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 21ccec410d..57798af420 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 21.3.0-Omega +KODI_PVR_VUPLUS_VERSION = 21.3.2-Omega KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 2214674bf2..d97f9ca7a9 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1fd3a101f09c471deaa83ac5b673be71df97957060e4aedb4d7a890e355608f2 kodi-pvr-waipu-21.8.7-Omega.tar.gz +sha256 28750b8513ca2df69d2d661a1d832689a1571b6793e98243eb29e3aed03c7f26 kodi-pvr-waipu-21.12.5-Omega.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 97a830115e..03525b295b 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 21.8.7-Omega +KODI_PVR_WAIPU_VERSION = 21.12.5-Omega KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index f274aa92c2..ae4de33649 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 690de222455f4ec02480e3cc0eb524e64448ca95486394f562c48492a614e17c kodi-pvr-wmc-21.0.2-Omega.tar.gz +sha256 bee42bd2a55d00ab589db9ebcddfa75d9211571fda63d641ba484f5582934364 kodi-pvr-wmc-21.0.3-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index 04097ba151..f0284ab8a5 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 21.0.2-Omega +KODI_PVR_WMC_VERSION = 21.0.3-Omega KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index 21e1617412..0210157d2a 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 41c20f2fec17b60a3baa98edff80ba01053a80ada0ffd056459c2f4ae6588867 kodi-screensaver-asteroids-9cdcb84a4464fee5ae4b6ab3b300e6a3824ec084.tar.gz +sha256 468527220845a411af4dd021a907c6449327015fb848e61adfb46b47edde331a kodi-screensaver-asteroids-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index 53c71f73d2..878ab22c3b 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 9cdcb84a4464fee5ae4b6ab3b300e6a3824ec084 +KODI_SCREENSAVER_ASTEROIDS_VERSION = 21.0.2-Omega KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index 2825a7be83..c63d3be3e8 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cb21eed4a679bbebcc0ed4c4ec3f510f4a9319327eba8d896dd8944bb5ff0f8 kodi-screensaver-asterwave-701111a81875688f016ce62b25670608a7fcd2d2.tar.gz +sha256 de92f8773f23c77f388201d316273f1a06103965bdb9684cbda19a73180c1488 kodi-screensaver-asterwave-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index d2fffab74d..90507bf8b0 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = 701111a81875688f016ce62b25670608a7fcd2d2 +KODI_SCREENSAVER_ASTERWAVE_VERSION = 21.0.2-Omega KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) KODI_SCREENSAVER_ASTERWAVE_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index a62070430d..865f31b201 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 92491cbcb1abaa8ab2cf113a0eb4d0ad588f59c062c91e8e06b035c6eb0ea84f kodi-screensaver-biogenesis-953947d07fdf69967e2dc64b289631c57c79e800.tar.gz +sha256 fdd5a5abf98318e01e22c88f81ae3838b2f3b76f99b39e01fc94af528a200849 kodi-screensaver-biogenesis-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index bb40c7eb65..4455caedda 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = 953947d07fdf69967e2dc64b289631c57c79e800 +KODI_SCREENSAVER_BIOGENESIS_VERSION = 21.0.2-Omega KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index 0d653a272c..bb6918a03b 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 84213263bad9d5dbaadc704b28d79f4bd2603287f05f0264563cf560f23f5309 kodi-screensaver-cpblobs-cd96c71c22940014d5c79c58af99b60e0b418f71.tar.gz +sha256 f56b57dfc8535331e36527462bd820e06e287a5a48ffdb33d00bdf1a2dc62b90 kodi-screensaver-cpblobs-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index 9e010ec774..8154bda2e1 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = cd96c71c22940014d5c79c58af99b60e0b418f71 +KODI_SCREENSAVER_CPBLOBS_VERSION = 21.0.2-Omega KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0 KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index a1678be4c9..df652f3286 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0974661ce4725e685222cce04b9f43d24b4161f8af9400b6e739549368a0e1eb kodi-screensaver-greynetic-2955c4105ea1223e9901dbc804812bdb3c0412a7.tar.gz +sha256 9ed9dba2040268bfd82648856b3e07da5cf51f39909c71c2579475221477e3a6 kodi-screensaver-greynetic-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index 4789cdfcd7..e484305485 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = 2955c4105ea1223e9901dbc804812bdb3c0412a7 +KODI_SCREENSAVER_GREYNETIC_VERSION = 21.0.2-Omega KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+ KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 8bc932579f..27bba5d3ba 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6016fc31cdb489417cf3c39d13403d5d8ff332e5b3aef5bf8916e70c61d479c4 kodi-screensaver-matrixtrails-364b7275fb02edf9a5c03bd56c8010431711b249.tar.gz +sha256 cc342d201606e682fc9def894a308784b74633f981209570c87d1bd206894311 kodi-screensaver-matrixtrails-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index a00bcf85df..ab51a5bc2b 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 364b7275fb02edf9a5c03bd56c8010431711b249 +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 21.0.2-Omega KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index cd3a0315dd..867ebf865a 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 861a752aa5090817670c378cc4be05e06f27b60f3c9e30503facc28cea45312d kodi-screensaver-pingpong-a0b8b956002ddc64eb6d433e3230fa09619f2aef.tar.gz +sha256 4d7c15a0070e4792b4b56726d9a37ab6ca8c569186e0beebd256a57203d5e362 kodi-screensaver-pingpong-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index 9b90da2912..5d1854b9a2 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = a0b8b956002ddc64eb6d433e3230fa09619f2aef +KODI_SCREENSAVER_PINGPONG_VERSION = 21.0.2-Omega KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+ KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index 4a8d00de28..23d1e1b1f3 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bea100644c2e29f645f379cc51f58b5b87b745cf51d2863649a16869d514e60d kodi-screensaver-pyro-b0d14d3f8cfe7d0c71ce8df8a6b8d6f121b42908.tar.gz +sha256 4a6b5d7efd789be40226ffe337bac8f64c47335c40085d940d624d42cdaa1be0 kodi-screensaver-pyro-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index b82d2e0f32..72bbf2e913 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = b0d14d3f8cfe7d0c71ce8df8a6b8d6f121b42908 +KODI_SCREENSAVER_PYRO_VERSION = 21.0.2-Omega KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+ KODI_SCREENSAVER_PYRO_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index 021b92c143..86174991f0 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f3de3b68c4852290ad3aa2f3b77a356dbc3f26a78bec8356f04723f6d86be42 kodi-screensaver-rsxs-56bc68ef28a8d2a8cf345472df6105bc4c111a04.tar.gz +sha256 76c1df60f3b4bf4c61f827e07ac61173e3b72defe6ab54d1a1fa34f1cd6f38ab kodi-screensaver-rsxs-21.1.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk index caadbdb159..ff554a2e1a 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_RSXS_VERSION = 56bc68ef28a8d2a8cf345472df6105bc4c111a04 +KODI_SCREENSAVER_RSXS_VERSION = 21.1.2-Omega KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_RSXS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index e4bedbfc3f..6f9ca93d8d 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 84d63373984f83e04bb8990a00a5b57a95ddd595f6a2b5fdf56bbd424cd546c8 kodi-screensaver-stars-e31111555b41692fd373719a9ba74aba3e7f4790.tar.gz +sha256 86a479a4c6d0b27723a701330b83704f223566eabe7a25302ecf8f0a66e5b27e kodi-screensaver-stars-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index c9aef4dc79..cff60ae5db 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = e31111555b41692fd373719a9ba74aba3e7f4790 +KODI_SCREENSAVER_STARS_VERSION = 21.0.2-Omega KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_STARS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index 3cf17c5e13..9cde584da2 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 61bded39800f751f4285c2e5bca26d4a4064fbeb3f90c253697b5aef07b1b328 kodi-skin-confluence-34e77d0122eab8c6e3fb502c623ba29749b19031.tar.gz +sha256 ae7177ad7f06fdb38ba0e217b2ac3e4375cf29a7792f2eaa70003286410521a0 kodi-skin-confluence-b049aa8b6bab50518de72783efd219680047d6d9.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index dcff19793c..31d6b37380 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SKIN_CONFLUENCE_VERSION = 34e77d0122eab8c6e3fb502c623ba29749b19031 +KODI_SKIN_CONFLUENCE_VERSION = b049aa8b6bab50518de72783efd219680047d6d9 KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 426c8f1ed5..329a2d47f4 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 21.1-Omega +KODI_TEXTUREPACKER_VERSION = 21.3-Omega KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash index 729a569f9a..e65ba18fa5 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 23515c84f4a0cceaf845c1d6c0c39947a28be2d515cff995b384b29e93b11831 kodi-vfs-libarchive-0333aa5e189221e76282eeefb3f573e27b187551.tar.gz +sha256 aab35cb6b03191609a7e97df02f2f102659c12e414f7b95595f9bb2047554daf kodi-vfs-libarchive-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk index 257a0d04f6..ee1ca59b52 100644 --- a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_LIBARCHIVE_VERSION = 0333aa5e189221e76282eeefb3f573e27b187551 +KODI_VFS_LIBARCHIVE_VERSION = 21.0.2-Omega KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.hash b/package/kodi-vfs-rar/kodi-vfs-rar.hash index e368515a5a..c69e57758f 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.hash +++ b/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 c1da0e8aafa5419ae414857893a59c22109138ad7245071e0678b26f401a7be1 kodi-vfs-rar-2f49a0de43bc9f4e91dfec73a13dcb04df285233.tar.gz +sha256 7492cf73d52299218acc982c4b35b020ea801d36d47e40460341f4dde712de50 kodi-vfs-rar-21.0.2-Omega.tar.gz # License files sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.mk b/package/kodi-vfs-rar/kodi-vfs-rar.mk index 8dfd205c27..7cffe1274a 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.mk +++ b/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_RAR_VERSION = 2f49a0de43bc9f4e91dfec73a13dcb04df285233 +KODI_VFS_RAR_VERSION = 21.0.2-Omega KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index 12ddbae63d..3a59241d7b 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2197096f7081d140efb573e1afcee257e55bd0312e48c25e787bf10879e6bc92 kodi-vfs-sftp-9fe870e71a10a37f2d793b2261bac48b195f2705.tar.gz +sha256 01a23958331cb0cd78fd2e9367d1269d4319c20b84db5b132632f9c1acd5f3c5 kodi-vfs-sftp-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index e3298465fe..18ea2bc099 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 9fe870e71a10a37f2d793b2261bac48b195f2705 +KODI_VFS_SFTP_VERSION = 21.0.2-Omega KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index 42d6cab712..3f5f761968 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a21d1683cf648b188a39fd32b123c147ce7dad99fa1a67078652b28365ce6666 kodi-visualisation-fishbmc-daa4e6b3e952075b813768e3518ac6e6b0724f55.tar.gz +sha256 d7433e4e88e29f1dd3524d2d0b660ce529852561f14f479f4b83a9c5ac436ffc kodi-visualisation-fishbmc-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index 2e27ed69a8..b1eb305620 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = daa4e6b3e952075b813768e3518ac6e6b0724f55 +KODI_VISUALISATION_FISHBMC_VERSION = 21.0.2-Omega KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index 835fcf5685..71ce1c657e 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dcf46760c0b1e6eb90fff94684c907ca10261febae12c63d1253325452704ecc kodi-visualisation-goom-a8cb12592900fcd099d65d7760cbb113489ec884.tar.gz +sha256 f87356122f91ea40d096d559d1180571e701e39867448768d14d6c2ba3b2e264 kodi-visualisation-goom-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index 0f40b2ab23..6b35c64a87 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = a8cb12592900fcd099d65d7760cbb113489ec884 +KODI_VISUALISATION_GOOM_VERSION = 21.0.2-Omega KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+ KODI_VISUALISATION_GOOM_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash index ed3ee016cd..a924eaa6f8 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2abe39666e64bb1b3e8d3b88876524ed022d2dbeeb141cb9bd43549d8b5b403c kodi-visualisation-matrix-8a373e240e47f27f1289c1c606621403794eb0d1.tar.gz +sha256 b1d1f3da5470d657e70c4b914a77445fe1d0a0ba35007fc402982a8b1b4cf9b0 kodi-visualisation-matrix-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk index 125aee1d46..fd885712ad 100644 --- a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_MATRIX_VERSION = 8a373e240e47f27f1289c1c606621403794eb0d1 +KODI_VISUALISATION_MATRIX_VERSION = 21.0.2-Omega KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index b74b0a76f6..508820876d 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6144e32ee4c1f7e75be6b2827555b4999d251ebdd67d785cac0e8b38869ef529 kodi-visualisation-shadertoy-364132b12b6da78e281b6a1d678155d43aace83f.tar.gz +sha256 30a5081365cea1dbdf49ccbb059076d4c7abc28604a58749fcd0d025e2faa760 kodi-visualisation-shadertoy-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index 45313a3e92..32d6d6f056 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 364132b12b6da78e281b6a1d678155d43aace83f +KODI_VISUALISATION_SHADERTOY_VERSION = 21.0.2-Omega KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index a6083e55c5..6bbd7b8c9a 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ae794542e8c7de00528bf486d381134f4da8b7c35903c5f5e06a1a6015878b12 kodi-visualisation-spectrum-8f2fc2135b34740af538ade3faf310f1a188db7f.tar.gz +sha256 7b6635789d226ee4cd4e17d54d57e880731d0762835802835d0d5ac4f0084b99 kodi-visualisation-spectrum-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk index c50eae3fae..1946cf598a 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_SPECTRUM_VERSION = 8f2fc2135b34740af538ade3faf310f1a188db7f +KODI_VISUALISATION_SPECTRUM_VERSION = 21.0.2-Omega KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+ KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash index 870c5088b0..a362fbd23d 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3755544db4d633c411236ca2149f93c641c4c8d858a68f9eb4176b046fbf0ea4 kodi-visualisation-starburst-7923772cd986849531bdfee0a0bc989842b41996.tar.gz +sha256 a3f70985fee6b1014e7e7599431e646f36bd3870ead78bbc8936151b805e4241 kodi-visualisation-starburst-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk index bd61e4c770..6adb21687e 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_STARBURST_VERSION = 7923772cd986849531bdfee0a0bc989842b41996 +KODI_VISUALISATION_STARBURST_VERSION = 21.0.2-Omega KODI_VISUALISATION_STARBURST_SITE = $(call github,xbmc,visualization.starburst,$(KODI_VISUALISATION_STARBURST_VERSION)) KODI_VISUALISATION_STARBURST_LICENSE = GPL-2.0+ KODI_VISUALISATION_STARBURST_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 29bb077261..1041fd5287 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 edda37479bc38eb129a9e83c30f14f21646b17693b5679130fd644787b63dce0 kodi-visualisation-waveform-a388be3b9c4a62a5087616d3c92a26d6cbbeb24f.tar.gz +sha256 fe6d2f3990ea5f2ea2d4a0a905f451b1c2c7f1300529d8957b5d93a97421f415 kodi-visualisation-waveform-21.0.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index 925d76cbe4..819b064789 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = a388be3b9c4a62a5087616d3c92a26d6cbbeb24f +KODI_VISUALISATION_WAVEFORM_VERSION = 21.0.2-Omega KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+ KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = LICENSE.md diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 1977263db8..9661ab47bc 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -27,7 +27,6 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS - select BR2_PACKAGE_LIBDISPLAY_INFO comment "kodi needs udev support for gbm" depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS @@ -108,6 +107,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_TINYXML2 select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support + select BR2_PACKAGE_LIBDISPLAY_INFO if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM select BR2_PACKAGE_LIBINPUT if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND diff --git a/package/kodi/br-kodi b/package/kodi/br-kodi index 83d4d4e5ac..2467afed30 100755 --- a/package/kodi/br-kodi +++ b/package/kodi/br-kodi @@ -5,6 +5,8 @@ KODI="${1}" shift +# shellcheck disable=SC2329 # https://www.shellcheck.net/wiki/SC2329 +# shellcheck disable=SC2317 # shellcheck 0.9.0 "spammy" # In case someone asked we terminate, just kill # the Kodi process trap_kill() { @@ -33,4 +35,4 @@ while [ ${LOOP} -eq 1 ]; do ;; esac done -exit ${ret} +exit "${ret}" diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 5ece904a4a..aa962b15fc 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,9 +1,9 @@ # From https://github.com/xbmc/xbmc/blob/Omega/xbmc/interfaces/swig/CMakeLists.txt -sha512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0 apache-groovy-binary-4.0.16.zip -sha512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc commons-lang3-3.14.0-bin.tar.gz -sha512 2e94877000dd270b69e2e8cbf49f258a90b4c628b6b6b0814e300a2f0e9c391f0816dceb0707e596ae3b7c9532f93e7a4917df47c77f44b3a810e14042ce5f3f commons-text-1.11.0-bin.tar.gz +sha512 60d1aea85008a438a9498178dc2137385653f1ea294e7e257959e9e0f94382e160e217e1090047c2a944e328cf46e8ebcfc4b015f7d0cb9f2fcf9d880c6c1344 apache-groovy-binary-4.0.26.zip +sha512 8927a406a1bd084b548f89cf15fe4bc7567dcaa50ae8abae54e9c883c1574c648fcc8ad6c3abaa381dfbdf1801727ac5e6c4572063203a1dfac293d122282f05 commons-lang3-3.17.0-bin.tar.gz +sha512 a51667463e88b2d017c3baebb9bbe42c4e50cba96ffe19c89680e82002a4db8b9007daff75f8dbf8bf3725be13a3f03f3c2bc4e1f11e8e02dcab4408abdb44a1 commons-text-1.13.0-bin.tar.gz # Locally computed -sha256 ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef kodi-21.1-Omega.tar.gz +sha256 a60afcb556e4a00cb19fc35b7e77758107c9a8096c6ce9b66af5f92396be31aa kodi-21.3-Omega.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index ae73cdffa6..57bfcff555 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 21.1 +KODI_VERSION_MAJOR = 21.3 KODI_VERSION_NAME = Omega KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) @@ -58,22 +58,25 @@ KODI_DEPENDENCIES = \ zlib # taken from tools/depends/target/*/*-VERSION +KODI_APACHE_GROOVY_VERSION = 4.0.26 +KODI_COMMONS_LANG3_VERSION = 3.17.0 +KODI_COMMONS_TEXT_VERSION = 1.13.0 KODI_LIBDVDCSS_VERSION = 1.4.3-Next-Nexus-Alpha2-2 KODI_LIBDVDNAV_VERSION = 6.1.1-Next-Nexus-Alpha2-2 KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2 KODI_EXTRA_DOWNLOADS += \ - https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-binary-4.0.16.zip \ - https://archive.apache.org/dist/commons/lang/binaries/commons-lang3-3.14.0-bin.tar.gz \ - https://archive.apache.org/dist/commons/text/binaries/commons-text-1.11.0-bin.tar.gz \ + https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-binary-$(KODI_APACHE_GROOVY_VERSION).zip \ + https://archive.apache.org/dist/commons/lang/binaries/commons-lang3-$(KODI_COMMONS_LANG3_VERSION)-bin.tar.gz \ + https://archive.apache.org/dist/commons/text/binaries/commons-text-$(KODI_COMMONS_TEXT_VERSION)-bin.tar.gz \ $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ $(call github,xbmc,libdvdread,$(KODI_LIBDVDREAD_VERSION))/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz define KODI_PROVIDE_JAVA_TARBALLS mkdir -p $(@D)/buildroot-build/build/download - cp $(KODI_DL_DIR)/apache-groovy-binary-4.0.16.zip $(@D)/buildroot-build/build/download - cp $(KODI_DL_DIR)/commons-lang3-3.14.0-bin.tar.gz $(@D)/buildroot-build/build/download - cp $(KODI_DL_DIR)/commons-text-1.11.0-bin.tar.gz $(@D)/buildroot-build/build/download + cp $(KODI_DL_DIR)/apache-groovy-binary-$(KODI_APACHE_GROOVY_VERSION).zip $(@D)/buildroot-build/build/download + cp $(KODI_DL_DIR)/commons-lang3-$(KODI_COMMONS_LANG3_VERSION)-bin.tar.gz $(@D)/buildroot-build/build/download + cp $(KODI_DL_DIR)/commons-text-$(KODI_COMMONS_TEXT_VERSION)-bin.tar.gz $(@D)/buildroot-build/build/download endef KODI_POST_EXTRACT_HOOKS = KODI_PROVIDE_JAVA_TARBALLS diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index 02ea8dd58c..0d66a08dd7 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS BR2_cortex_a55 || BR2_cortex_a75 || \ BR2_cortex_a75_a55 || BR2_cortex_a76 || \ BR2_cortex_a76_a55) + default y if BR2_riscv default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le default y if BR2_s390x diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index d4db9f2b75..ad0922df59 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8636994e10240705f10a9150ef688ae6832d0ea0dcc8860c826c645ecfc1169f kvm-unit-tests-v2024-01-08.tar.bz2 +sha256 60015b023f34261c134d714f4670926ac81483e286a16475eb4a5cedab00eefa kvm-unit-tests-v2025-06-05.tar.bz2 sha256 b3c9ca9e257f2eaae070cf0ccdf8770764f05a947a39a835e633413750a5777b COPYRIGHT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 73d20d6b2e..1ed902b1a0 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 2024-01-08 +KVM_UNIT_TESTS_VERSION = 2025-06-05 KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = GPL-2.0, LGPL-2.0 @@ -18,6 +18,10 @@ else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 +else ifeq ($(BR2_RISCV_32),y) +KVM_UNIT_TESTS_ARCH = riscv32 +else ifeq ($(BR2_RISCV_64),y) +KVM_UNIT_TESTS_ARCH = riscv64 else ifeq ($(BR2_s390x),y) KVM_UNIT_TESTS_ARCH = s390x else ifeq ($(BR2_x86_64),y) diff --git a/package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch b/package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch new file mode 100644 index 0000000000..3128a23689 --- /dev/null +++ b/package/kvmtool/0001-remove-wordsize-h-inclusion-for-musl-compatibility.patch @@ -0,0 +1,52 @@ +From 0592f8f829c843ff5cb2d108c309e32f4f6f5379 Mon Sep 17 00:00:00 2001 +From: Andre Przywara +Date: Thu, 1 Aug 2024 12:10:54 +0100 +Subject: remove wordsize.h inclusion (for musl compatibility) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The wordsize.h header file and the __WORDSIZE definition do not seem +to be universal, the musl libc for instance has the definition in a +different header file. This breaks compilation of kvmtool against musl. + +The two leading underscores suggest a compiler-internal symbol anyway, so +let's just remove that particular macro usage entirely, and replace it +with the number we really want: the size of a "long" type. + +Reported-by: J. Neuschäfer +Signed-off-by: Andre Przywara +Reviewed-by: Alexandru Elisei +Link: https://lore.kernel.org/r/20240801111054.818765-1-andre.przywara@arm.com +Signed-off-by: Will Deacon +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/commit/?id=0592f8f829c843ff5cb2d108c309e32f4f6f5379 +Signed-off-by: Thomas Perale +--- + include/linux/bitops.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/include/linux/bitops.h b/include/linux/bitops.h +index ae33922f..ee8fd560 100644 +--- a/include/linux/bitops.h ++++ b/include/linux/bitops.h +@@ -1,15 +1,13 @@ + #ifndef _KVM_LINUX_BITOPS_H_ + #define _KVM_LINUX_BITOPS_H_ + +-#include +- + #include + #include + #include + +-#define BITS_PER_LONG __WORDSIZE + #define BITS_PER_BYTE 8 +-#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) ++#define BITS_PER_LONG (BITS_PER_BYTE * sizeof(long)) ++#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG) + + #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) + +-- +cgit 1.2.3-korg + diff --git a/package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch b/package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch new file mode 100644 index 0000000000..e75ede6af1 --- /dev/null +++ b/package/kvmtool/0002-vfio-include-libgen-h-for-musl-compatibility.patch @@ -0,0 +1,48 @@ +From ba6830eec0f5ab734b093657b16b555e0437b927 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Sun, 29 Jun 2025 22:22:21 +0200 +Subject: vfio: include libgen.h (for musl compatibility) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting GCC14 'implicit-function-declaration' are treated as errors by +default. When building kvmtool with musl libc, the following error +occurs due to missing declaration of 'basename': + +vfio/core.c:537:22: error: implicit declaration of function ‘basename’ [-Wimplicit-function-declaration] + 537 | group_name = basename(group_path); + | ^~~~~~~~ +vfio/core.c:537:22: warning: nested extern declaration of ‘basename’ [-Wnested-externs] +vfio/core.c:537:20: error: assignment to ‘char *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] + 537 | group_name = basename(group_path); + | ^ + +This patch fixes the issue by including the appropriate header, ensuring +compatibility with musl and GCC14. + +Signed-off-by: Thomas Perale +Reviewed-by: Alexandru Elisei +Link: https://lore.kernel.org/r/20250629202221.893360-1-thomas.perale@mind.be +Signed-off-by: Will Deacon +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=ba6830eec0f5ab734b093657b16b555e0437b927 +Signed-off-by: Thomas Perale +--- + vfio/core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vfio/core.c b/vfio/core.c +index 3ff2c0b0..8f884898 100644 +--- a/vfio/core.c ++++ b/vfio/core.c +@@ -3,6 +3,7 @@ + #include "kvm/ioport.h" + + #include ++#include + + #define VFIO_DEV_DIR "/dev/vfio" + #define VFIO_DEV_NODE VFIO_DEV_DIR "/vfio" +-- +cgit 1.2.3-korg + diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index 4d4d2c0596..243f6998ef 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cd005cd021f144d7d5f7f33c943942db9f03a28d110d6a3b80d718a295f7f714 lapack-3.10.1.tar.gz -sha256 44f7c08ab11e40b21d8bf8220712929ba8d0204645d2174869acf915562d0969 LICENSE +sha256 2ca6407a001a474d4d4d35f3a61550156050c48016d949f0da0529c0aa052422 lapack-3.12.1.tar.gz +sha256 978539245c405775bf347b1256c36df4daf8b69a64b099e94b1d53742201621e LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 3c1ab1fc67..e3b914a94f 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.10.1 +LAPACK_VERSION = 3.12.1 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) diff --git a/package/latencytop/0001-makefile.patch b/package/latencytop/0001-makefile.patch deleted file mode 100644 index fa8c51cfd0..0000000000 --- a/package/latencytop/0001-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -Usee $(CC) to enable cross compiling and link to the right ncurses library. - -Signed-off-by: Qais Yousef - ---- latencytop-0.5/Makefile.old 2012-04-18 11:59:39.748084334 +0100 -+++ latencytop-0.5/Makefile 2012-04-18 12:00:08.659112340 +0100 -@@ -4,7 +4,7 @@ - DESTDIR = - SBINDIR = /usr/sbin - XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare --LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw -+LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncurses - - OBJS= latencytop.o text_display.o translate.o fsync.o - -@@ -26,10 +26,10 @@ - - # We write explicity this "implicit rule" - %.o : %.c -- gcc -c $(CFLAGS) $(XCFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $(XCFLAGS) $< -o $@ - - latencytop: $(OBJS) latencytop.h Makefile -- gcc $(CFLAGS) $(OBJS) $(LDF) -o latencytop -+ $(CC) $(CFLAGS) $(OBJS) $(LDF) -o latencytop - - clean: - rm -f *~ latencytop DEADJOE *.o diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in deleted file mode 100644 index b54ef052b4..0000000000 --- a/package/latencytop/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_LATENCYTOP - bool "latencytop" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBGLIB2 - help - There are many types and causes of latency. LatencyTOP - focuses on the type of latency that causes skips in audio, - stutters in your desktop experience or that overloads your - server (while you have plenty of CPU power left). - - LatencyTOP focuses on the cases where the applications want - to run and execute useful code, but there's some resource - that's not currently available (and the kernel then blocks - the process). This is done both on a system level and on a - per process level, so that you can see what's happening to - the system, and which process is suffering and/or causing - the delays. - - http://www.latencytop.org - -comment "latencytop needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/latencytop/latencytop.hash b/package/latencytop/latencytop.hash deleted file mode 100644 index 74b8a03a23..0000000000 --- a/package/latencytop/latencytop.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef latencytop-0.5.tar.gz -sha256 34d1db30ab21eaedb2c191b2787632a960090a0c63da9f5b481d84b23b98c438 latencytop.c diff --git a/package/latencytop/latencytop.mk b/package/latencytop/latencytop.mk deleted file mode 100644 index 56afe86062..0000000000 --- a/package/latencytop/latencytop.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# latencytop -# -################################################################################ - -LATENCYTOP_VERSION = 0.5 -LATENCYTOP_SITE = http://www.latencytop.org/download -LATENCYTOP_DEPENDENCIES = libglib2 ncurses -LATENCYTOP_LICENSE = GPL-2.0 -LATENCYTOP_LICENSE_FILES = latencytop.c - -# NOTE: GTK is heavy weight, we intentionally build the text (ncurses) -# version only -define LATENCYTOP_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) HAS_GTK_GUI= -endef - -define LATENCYTOP_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) HAS_GTK_GUI= -endef - -$(eval $(generic-package)) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 362412e3c4..eef8229eef 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.16 -sha1 751d32ba11809e3591c118be9aae8ac2dbd41cb7 lcms2-2.16.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.17 +sha1 213382ca260cf761f264f185407f75bb1c6e2ce8 lcms2-2.17.tar.gz # Locally computed: -sha256 d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51 lcms2-2.16.tar.gz +sha256 d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074 lcms2-2.17.tar.gz sha256 6dbd60437f8ef91d8de1f08ad75882547fd4931bfcc3566a0735f28db1484d31 LICENSE diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 92aeff8890..5137c7ea20 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LCMS2_VERSION = 2.16 -LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) +LCMS2_VERSION = 2.17 +LCMS2_SITE = https://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = LICENSE LCMS2_CPE_ID_VENDOR = littlecms diff --git a/package/leafpad/Config.in b/package/leafpad/Config.in deleted file mode 100644 index a4408547cd..0000000000 --- a/package/leafpad/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LEAFPAD - bool "leafpad" - depends on BR2_PACKAGE_LIBGTK2 - help - GTK+ based simple text editor - - http://savannah.nongnu.org/download/leafpad diff --git a/package/leafpad/leafpad.hash b/package/leafpad/leafpad.hash deleted file mode 100644 index 4f6e68f0a2..0000000000 --- a/package/leafpad/leafpad.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 07d3f712f4dbd0a33251fd1dee14e21afdc9f92090fc768c11ab0ac556adbe97 leafpad-0.8.19.tar.gz -# Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk deleted file mode 100644 index 608fa37be4..0000000000 --- a/package/leafpad/leafpad.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# leafpad -# -################################################################################ - -LEAFPAD_VERSION = 0.8.19 -LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad -LEAFPAD_DEPENDENCIES = libgtk2 host-intltool -LEAFPAD_LICENSE = GPL-2.0+ -LEAFPAD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package/ledmon/0001-Include-libgen.h-to-fix-musl-builds.patch b/package/ledmon/0001-Include-libgen.h-to-fix-musl-builds.patch new file mode 100644 index 0000000000..713aaee020 --- /dev/null +++ b/package/ledmon/0001-Include-libgen.h-to-fix-musl-builds.patch @@ -0,0 +1,100 @@ +From 95adecd3cc8e94f9964c34fdf0354c209acce166 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 27 Nov 2025 21:17:22 +0100 +Subject: [PATCH] Include libgen.h to fix musl builds + +Fixes various build errors like + +block.c: In function 'block_set_devnode': +block.c:226:22: error: implicit declaration of function 'basename' + [-Wimplicit-function-declaration] + 226 | char *name = basename(device->sysfs_path); + +Upstream: https://github.com/md-raid-utilities/ledmon/pull/272 + +Signed-off-by: Bernd Kuhls +[Bernd: backported upstream PR to v1.1.0] +--- + src/ledctl/ledctl.c | 1 + + src/ledmon/ledmon.c | 1 + + src/lib/block.c | 1 + + src/lib/npem.c | 1 + + src/lib/slot.c | 1 + + src/lib/vmdssd.c | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/src/ledctl/ledctl.c b/src/ledctl/ledctl.c +index 30adc74..af2ea1b 100644 +--- a/src/ledctl/ledctl.c ++++ b/src/ledctl/ledctl.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/ledmon/ledmon.c b/src/ledmon/ledmon.c +index 37ef69a..4644492 100644 +--- a/src/ledmon/ledmon.c ++++ b/src/ledmon/ledmon.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/lib/block.c b/src/lib/block.c +index 23dc34f..afa7d57 100644 +--- a/src/lib/block.c ++++ b/src/lib/block.c +@@ -3,6 +3,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/lib/npem.c b/src/lib/npem.c +index bdceee3..f980ba8 100644 +--- a/src/lib/npem.c ++++ b/src/lib/npem.c +@@ -2,6 +2,7 @@ + // Copyright (C) 2022 Intel Corporation. + + #include ++#include + #include + #include + #include +diff --git a/src/lib/slot.c b/src/lib/slot.c +index 1044ddf..68e3009 100644 +--- a/src/lib/slot.c ++++ b/src/lib/slot.c +@@ -1,6 +1,7 @@ + // SPDX-License-Identifier: LGPL-2.1-or-later + // Copyright (C) 2023 Intel Corporation. + ++#include + #include + #include + +diff --git a/src/lib/vmdssd.c b/src/lib/vmdssd.c +index 8a6e846..0270a7d 100644 +--- a/src/lib/vmdssd.c ++++ b/src/lib/vmdssd.c +@@ -2,6 +2,7 @@ + // Copyright (C) 2022 Intel Corporation. + + #include ++#include + #include + #include + #include +-- +2.47.3 + diff --git a/package/ledmon/ledmon.hash b/package/ledmon/ledmon.hash index e9cfcc63cb..97f379e3a6 100644 --- a/package/ledmon/ledmon.hash +++ b/package/ledmon/ledmon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2826786cd5e7fe7d32d22e9d209b23124801fec9c3220dcd7fb45706f3818dc5 ledmon-1.0.0.tar.gz +sha256 4f626400e41ab1e4317b886db5b5df1afa517e8e4faa80fd4378fd22b0bcd055 ledmon-1.1.0.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/ledmon/ledmon.mk b/package/ledmon/ledmon.mk index 71150ad1e4..4b906b1cc7 100644 --- a/package/ledmon/ledmon.mk +++ b/package/ledmon/ledmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEDMON_VERSION = 1.0.0 +LEDMON_VERSION = 1.1.0 LEDMON_SITE = $(call github,intel,ledmon,v$(LEDMON_VERSION)) LEDMON_DEPENDENCIES = host-autoconf-archive host-pkgconf pciutils sg3_utils udev # The code base also include a COPYING.LIB file with the LGPL-2.1 text, diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 3416cfeb39..293eef4741 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6 leptonica-1.84.1.tar.gz +sha256 1fa08e40bb37fd45802d5e6e7b43927449a5c47d4608ef99d3bd3f0fa76baedc leptonica-1.86.0.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 0e902c6488..a957e05616 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEPTONICA_VERSION = 1.84.1 +LEPTONICA_VERSION = 1.86.0 LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt diff --git a/package/less/less.hash b/package/less/less.hash index b97d0fac41..881849a42b 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# https://www.greenwoodsoftware.com/less/less-661.sig -sha256 2b5f0167216e3ef0ffcb0c31c374e287eb035e4e223d5dae315c2783b6e738ed less-661.tar.gz +# https://www.greenwoodsoftware.com/less/less-685.sig +sha256 2701041e767e697ee420ce0825641cedc8f20b51576abe99d92c1666d332e9dc less-685.tar.gz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index 25bbbd6d88..afb6987e73 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,7 +4,7 @@ # ################################################################################ -LESS_VERSION = 661 +LESS_VERSION = 685 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING diff --git a/package/lesstif/Config.in b/package/lesstif/Config.in deleted file mode 100644 index 654ee6f1a0..0000000000 --- a/package/lesstif/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LESSTIF - bool "lesstif" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_FREETYPE - help - lesstif is the Hungry Programmers' version of OSF/Motif - - http://lesstif.sourceforge.net/ diff --git a/package/lesstif/lesstif.hash b/package/lesstif/lesstif.hash deleted file mode 100644 index 31a394dbbc..0000000000 --- a/package/lesstif/lesstif.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 eb4aa38858c29a4a3bcf605cfe7d91ca41f4522d78d770f69721e6e3a4ecf7e3 lesstif-0.95.2.tar.bz2 -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk deleted file mode 100644 index 378c594e3b..0000000000 --- a/package/lesstif/lesstif.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# lesstif -# -################################################################################ - -LESSTIF_VERSION = 0.95.2 -LESSTIF_SOURCE = lesstif-$(LESSTIF_VERSION).tar.bz2 -LESSTIF_SITE = http://downloads.sourceforge.net/project/lesstif/lesstif/$(LESSTIF_VERSION) -LESSTIF_INSTALL_STAGING = YES -LESSTIF_DEPENDENCIES = \ - xlib_libXt \ - xlib_libXext \ - freetype -LESSTIF_LICENSE = LGPL-2.0+ -LESSTIF_LICENSE_FILES = COPYING.LIB -LESSTIF_CONF_OPTS = \ - --with-gnu-ld \ - --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \ - --enable-production=yes \ - --enable-build-tests=no \ - --no-recursion - -# Reduces the buggy makefile to the smallest possible (and working) thing -define LESSTIF_NOMAN2HTML - echo "all:" > $(@D)/doc/Makefile - echo "" >> $(@D)/doc/Makefile - echo "install:" >> $(@D)/doc/Makefile - echo "" >> $(@D)/doc/Makefile - echo "clean:" >> $(@D)/doc/Makefile -endef - -# Prevents to copy ac_find_motif.m4 on target, it would else -# be created at $(TARGET_DIR)/$(HOST_DIR)/share/aclocal/ac_find_motif.m4 -define LESSTIF_FIXACLOCAL - sed -i -e "/install-data-am: install-aclocalDATA/d" $(@D)/scripts/autoconf/Makefile -endef - -LESSTIF_POST_CONFIGURE_HOOKS += LESSTIF_NOMAN2HTML -LESSTIF_POST_CONFIGURE_HOOKS += LESSTIF_FIXACLOCAL - -$(eval $(autotools-package)) diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 76f1bd0f32..701801a7c4 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3 libabseil-cpp-20240722.0.tar.gz +sha256 16242f394245627e508ec6bb296b433c90f8d914f73b9c026fddb905e27276e8 libabseil-cpp-20250127.0.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index a27d013476..34d62c4dd1 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20240722.0 +LIBABSEIL_CPP_VERSION = 20250127.0 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE diff --git a/package/libao/0001-pulse-fix-missing-include-warning-for-nanosleep.patch b/package/libao/0001-pulse-fix-missing-include-warning-for-nanosleep.patch new file mode 100644 index 0000000000..162eec730f --- /dev/null +++ b/package/libao/0001-pulse-fix-missing-include-warning-for-nanosleep.patch @@ -0,0 +1,27 @@ +From 1f998f5d6d77674dad01b181811638578ad68242 Mon Sep 17 00:00:00 2001 +From: Tristan Matthews +Date: Sun, 15 Jan 2017 12:15:07 -0500 +Subject: [PATCH] pulse: fix missing include warning for nanosleep + +Upstream: https://gitlab.xiph.org/xiph/libao/-/commit/1f998f5d6d77674dad01b181811638578ad68242 + +Signed-off-by: Bernd Kuhls +--- + src/plugins/pulse/ao_pulse.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/pulse/ao_pulse.c b/src/plugins/pulse/ao_pulse.c +index 9835273..2d10d57 100644 +--- a/src/plugins/pulse/ao_pulse.c ++++ b/src/plugins/pulse/ao_pulse.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +GitLab + diff --git a/package/libao/libao.hash b/package/libao/libao.hash index 91c6bd11a7..70e6b4987e 100644 --- a/package/libao/libao.hash +++ b/package/libao/libao.hash @@ -1,5 +1,3 @@ -# From http://downloads.xiph.org/releases/ao/SHA256SUMS.txt -sha256 03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf libao-1.2.0.tar.gz - -# Hash for license file: +# Locally computed +sha256 df8a6d0e238feeccb26a783e778716fb41a801536fe7b6fce068e313c0e2bf4d libao-1.2.2.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libao/libao.mk b/package/libao/libao.mk index 19a4c165c6..a9fd739ff3 100644 --- a/package/libao/libao.mk +++ b/package/libao/libao.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBAO_VERSION = 1.2.0 -LIBAO_SITE = http://downloads.xiph.org/releases/ao +LIBAO_VERSION = 1.2.2 +LIBAO_SITE = https://gitlab.xiph.org/xiph/libao/-/archive/$(LIBAO_VERSION) LIBAO_DEPENDENCIES = host-pkgconf LIBAO_INSTALL_STAGING = YES LIBAO_LICENSE = GPL-2.0+ LIBAO_LICENSE_FILES = COPYING LIBAO_CPE_ID_VENDOR = xiph +LIBAO_AUTORECONF = YES LIBAO_CONF_OPTS = \ --disable-esd \ --disable-wmm \ diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash index 68b0468ae3..d0603c0a3a 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ -# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.7 -sha256 64494bd99fa6547a9cbdb4fc6bc732451a02dd19e6eb70eab977b239632151eb apparmor-v3.1.7.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/releases/v4.1.1 +sha256 f125aae32964e4e84443fec005f37f37abd5164f30620239c42864655a1b0281 apparmor-v4.1.1.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index fa59ff2924..64442fcc16 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -5,19 +5,20 @@ ################################################################################ # When updating the version here, please also update the apparmor package -LIBAPPARMOR_VERSION_MAJOR = 3.1 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).7 +LIBAPPARMOR_VERSION_MAJOR = 4.1 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).1 LIBAPPARMOR_SOURCE = apparmor-v$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://gitlab.com/apparmor/apparmor/-/archive/v$(LIBAPPARMOR_VERSION) LIBAPPARMOR_LICENSE = LGPL-2.1 LIBAPPARMOR_LICENSE_FILES = LICENSE libraries/libapparmor/COPYING.LGPL -LIBAPPARMOR_DEPENDENCIES = host-bison host-flex host-pkgconf +LIBAPPARMOR_DEPENDENCIES = host-autoconf-archive host-bison host-flex host-pkgconf LIBAPPARMOR_SUBDIR = libraries/libapparmor LIBAPPARMOR_INSTALL_STAGING = YES -# Patch 0001 touches Makefile.am and m4 files +# no configure in tarball LIBAPPARMOR_AUTORECONF = YES +LIBAPPARMOR_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive # Most AppArmor tools will want to link to the static lib. # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index c0b04b0f4b..f31b693c67 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,5 @@ -# From https://www.libarchive.de/downloads/sha256sums -sha256 879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee libarchive-3.7.7.tar.xz +# Locally computed after verifying the signature from +# https://www.libarchive.de/downloads/libarchive-3.8.2.tar.xz.asc +sha256 db0dee91561cbd957689036a3a71281efefd131d35d1d98ebbc32720e4da58e2 libarchive-3.8.2.tar.xz # Locally computed: -sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING +sha256 30e556b3959e3985d66efefec5eaac51d4995053caa1d3cffe6eb916f146f229 COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 70123ee2b1..8568847493 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,17 +4,13 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.7 +LIBARCHIVE_VERSION = 3.8.2 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive -# We're patching configure.ac -LIBARCHIVE_AUTORECONF = YES -# needed for autoreconf -LIBARCHIVE_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) diff --git a/package/libargtable2/Config.in b/package/libargtable2/Config.in deleted file mode 100644 index 42d067becd..0000000000 --- a/package/libargtable2/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBARGTABLE2 - bool "libargtable2" - help - A greatly simplified and yet quite robust argument parsing - set of library calls. - - http://argtable.sourceforge.net/ diff --git a/package/libargtable2/libargtable2.hash b/package/libargtable2/libargtable2.hash deleted file mode 100644 index 7df3a18041..0000000000 --- a/package/libargtable2/libargtable2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf argtable2-13.tar.gz -sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk deleted file mode 100644 index d033e28f40..0000000000 --- a/package/libargtable2/libargtable2.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libargtable2 -# -################################################################################ - -LIBARGTABLE2_MAJOR_VERSION = 2 -LIBARGTABLE2_MINOR_VERSION = 13 -LIBARGTABLE2_VERSION = $(LIBARGTABLE2_MAJOR_VERSION).$(LIBARGTABLE2_MINOR_VERSION) -LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_MINOR_VERSION).tar.gz -LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-$(LIBARGTABLE2_VERSION) -LIBARGTABLE2_INSTALL_STAGING = YES -LIBARGTABLE2_CONF_OPTS = \ - --disable-example \ - --disable-kernel-module \ - --enable-lib \ - --enable-util -LIBARGTABLE2_LICENSE = LGPL-2.0+ -LIBARGTABLE2_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index 2f6b554e3d..2f4f718813 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eae425da50f0015c21f7b3a9c7262a910f0218af469e22e2931462fed3c50959 libass-0.17.3.tar.xz +sha256 78f1179b838d025e9c26e8fef33f8092f65611444ffa1bfc0cfac6a33511a05a libass-0.17.4.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index f198ee89f0..ff42c6d621 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.17.3 +LIBASS_VERSION = 0.17.4 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. diff --git a/package/libassuan/libassuan.hash b/package/libassuan/libassuan.hash index 6bb5022d13..f41115cf3a 100644 --- a/package/libassuan/libassuan.hash +++ b/package/libassuan/libassuan.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 b6ccd955085dac902a09871f94a3d41a7667d0c8 libassuan-2.5.7.tar.bz2 -sha256 0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76 libassuan-2.5.7.tar.bz2 +sha1 57fb6f59b1a07e5125115454f5ad4cb0665e0eef libassuan-3.0.2.tar.bz2 +sha256 d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6 libassuan-3.0.2.tar.bz2 # Locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index 9cdc34bda2..f08c74ee4c 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.7 +LIBASSUAN_VERSION = 3.0.2 LIBASSUAN_SITE = https://gnupg.org/ftp/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) diff --git a/package/libatomic_ops/Config.in b/package/libatomic_ops/Config.in index 8287c6522d..834f7cb134 100644 --- a/package/libatomic_ops/Config.in +++ b/package/libatomic_ops/Config.in @@ -15,4 +15,4 @@ config BR2_PACKAGE_LIBATOMIC_OPS help Atomic operations library - https://github.com/ivmai/libatomic_ops + https://github.com/bdwgc/libatomic_ops diff --git a/package/libatomic_ops/libatomic_ops.hash b/package/libatomic_ops/libatomic_ops.hash index 1710fd3a47..64de98954d 100644 --- a/package/libatomic_ops/libatomic_ops.hash +++ b/package/libatomic_ops/libatomic_ops.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ad8428a40e01d41bc4ddad3166afa1fc175c9e58d8ef7ddbd7ef3298e32ac37b libatomic_ops-7.8.2.tar.gz +sha256 ea8295ac627646e37fd194d31535bbc02da60b908c8166c5e04d2461a53cb059 libatomic_ops-7.8.4.tar.gz sha256 969294c9324b2d360ae2a08edd5ca6f9cd754cb71b71e56bee15d2f10bb10496 LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index 555ba678fe..bbd7f36db8 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = 7.8.2 -LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,v$(LIBATOMIC_OPS_VERSION)) +LIBATOMIC_OPS_VERSION = 7.8.4 +LIBATOMIC_OPS_SITE = $(call github,bdwgc,libatomic_ops,v$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES # From doc/LICENSING.txt: "Our intent is to make it easy to use diff --git a/package/libavif/libavif.hash b/package/libavif/libavif.hash index b26e678abf..c53e0c9f50 100644 --- a/package/libavif/libavif.hash +++ b/package/libavif/libavif.hash @@ -1,3 +1,3 @@ -sha256 914662e16245e062ed73f90112fbb4548241300843a7772d8d441bb6859de45b libavif-1.1.1.tar.gz +sha256 0a545e953cc049bf5bcf4ee467306a2f113a75110edf59e61248873101cd26c1 libavif-1.3.0.tar.gz sha256 165abf92cc04b39e80d29cadea7a6a7e8fddf59407d4ad2616507a7ebe8216f9 LICENSE diff --git a/package/libavif/libavif.mk b/package/libavif/libavif.mk index 0c2a8e4dae..4357566ed1 100644 --- a/package/libavif/libavif.mk +++ b/package/libavif/libavif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAVIF_VERSION = 1.1.1 +LIBAVIF_VERSION = 1.3.0 LIBAVIF_SITE = $(call github,AOMediaCodec,libavif,v$(LIBAVIF_VERSION)) LIBAVIF_LICENSE = BSD-2-Clause, IJG, Apache-2.0 LIBAVIF_LICENSE_FILES = LICENSE diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 1466c88451..ad0dce77ff 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 318b9e2cedfdfe88161f28079fcb63239aeb5592223f4485b861cfc6ef11189a libblockdev-3.2.1.tar.gz +sha256 65ef9a37babd44b85b8ff9b273f90f9f7d5f8ff7b0c76a8edb69240325fd83f4 libblockdev-3.4.0.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 4cac905666..b8f5a6cffc 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 3.2.1 +LIBBLOCKDEV_VERSION = 3.4.0 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION) LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index a631722bb0..cc5bb2f753 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2.sha512 -sha512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1 libbluray-1.3.4.tar.bz2 +# From https://download.videolan.org/pub/videolan/libbluray/1.4.0/libbluray-1.4.0.tar.xz.sha512 +sha512 7284169b32624e5ca4fd71b260a4cc2921efafb1f63143a562568be45e373bfcbfeac63895d5659ccdcb11d7dbd0236cc46ccb15c12eff855703010e46991f27 libbluray-1.4.0.tar.xz # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 54f4caa368..4b20dd404a 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,46 +4,47 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.4 -LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) -LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 +LIBBLURAY_VERSION = 1.4.0 +LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.xz +LIBBLURAY_SITE = https://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_INSTALL_STAGING = YES LIBBLURAY_LICENSE = LGPL-2.1+ LIBBLURAY_LICENSE_FILES = COPYING LIBBLURAY_CPE_ID_VENDOR = videolan LIBBLURAY_DEPENDENCIES = host-pkgconf -LIBBLURAY_CONF_OPTS = --disable-bdjava-jar +LIBBLURAY_CONF_OPTS = -Dbdj_jar=disabled ifeq ($(BR2_PACKAGE_LIBICONV),y) LIBBLURAY_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) +LIBBLURAY_CONF_OPTS += -Dembed_udfread=false LIBBLURAY_DEPENDENCIES += libudfread else -LIBBLURAY_CONF_OPTS += --without-external-libudfread +LIBBLURAY_CONF_OPTS += -Dembed_udfread=true endif ifeq ($(BR2_PACKAGE_FREETYPE),y) +LIBBLURAY_CONF_OPTS += -Dfreetype=enabled LIBBLURAY_DEPENDENCIES += freetype -LIBBLURAY_CONF_OPTS += --with-freetype else -LIBBLURAY_CONF_OPTS += --without-freetype +LIBBLURAY_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +LIBBLURAY_CONF_OPTS += -Dfontconfig=enabled LIBBLURAY_DEPENDENCIES += fontconfig -LIBBLURAY_CONF_OPTS += --with-fontconfig else -LIBBLURAY_CONF_OPTS += --without-fontconfig +LIBBLURAY_CONF_OPTS += -Dfontconfig=disabled endif ifeq ($(BR2_PACKAGE_LIBXML2),y) +LIBBLURAY_CONF_OPTS += -Dlibxml2=enabled LIBBLURAY_DEPENDENCIES += libxml2 -LIBBLURAY_CONF_OPTS += --with-libxml2 else -LIBBLURAY_CONF_OPTS += --without-libxml2 +LIBBLURAY_CONF_OPTS += -Dlibxml2=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 75f2b1695c..9a2acb2521 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8 libbpf-1.1.0.tar.gz +sha256 16f31349c70764cba8e0fad3725cc9f52f6cf952554326aa0229daaa21ef4fbd libbpf-1.6.2.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 e1638b9a0c68ca90fad3df1d6b4e430804d2fbdc15e58d02cffddfae38953bbf LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index ef33542f2d..3a728867d8 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 1.1.0 +LIBBPF_VERSION = 1.6.2 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 diff --git a/package/libbroadvoice/libbroadvoice.hash b/package/libbroadvoice/libbroadvoice.hash index 1644fb4ba1..b07bcce0c9 100644 --- a/package/libbroadvoice/libbroadvoice.hash +++ b/package/libbroadvoice/libbroadvoice.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 74b7c9bbf90d2d8d8ec9befe73066f5c0d734498f586f6c870eb24dff2edcad7 libbroadvoice-f65b0f50c8c767229fbf1758370880abc0d78564-git4.tar.gz +sha256 28a97b96ceb5e290184d8b6169fddc15fe37df34c75a87c2b0d03076e475e353 libbroadvoice-03dd05df52f093bbf7820e68707f3a3668e73507.tar.gz sha256 2550586c993ce4a8c23c8b11968ea36192116a896a2504799cc65307d769c094 COPYING diff --git a/package/libbroadvoice/libbroadvoice.mk b/package/libbroadvoice/libbroadvoice.mk index 9c6b4e292d..77bc85786c 100644 --- a/package/libbroadvoice/libbroadvoice.mk +++ b/package/libbroadvoice/libbroadvoice.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564 +LIBBROADVOICE_VERSION = 03dd05df52f093bbf7820e68707f3a3668e73507 # we use the FreeSwitch fork because (quoting README): # "This library is based on the Broadcom reference code, but has been # heavily modified so that it builds into a proper library, with a clean # usable interface, on a range of platforms." -LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git -LIBBROADVOICE_SITE_METHOD = git +LIBBROADVOICE_SITE = $(call github,freeswitch,libbroadvoice,$(LIBBROADVOICE_VERSION)) LIBBROADVOICE_LICENSE = LGPL-2.1 LIBBROADVOICE_LICENSE_FILES = COPYING LIBBROADVOICE_AUTORECONF = YES diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 9f4b30f68c..fd05a2a208 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS default y # libbsd does not support those architectures (see src/local-elf.h) depends on !BR2_microblaze - depends on !BR2_arc depends on !BR2_xtensa config BR2_PACKAGE_LIBBSD diff --git a/package/libbsd/libbsd.hash b/package/libbsd/libbsd.hash index 8b1af44758..d125c1059e 100644 --- a/package/libbsd/libbsd.hash +++ b/package/libbsd/libbsd.hash @@ -1,5 +1,5 @@ -# From https://archive.hadrons.org/software/libbsd/libbsd-0.11.7.announce -sha256 9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261 libbsd-0.11.7.tar.xz -sha512 51fda4724f41dd8a4628afd58c21236a7588d9045e337e06eeabf83805a9aaaa53705441ca901ad11f1c65f18e881523bdc97721a7d3d6a5cced27f2450d09a2 libbsd-0.11.7.tar.xz +# From https://archive.hadrons.org/software/libbsd/libbsd-0.12.2.announce +sha256 b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014 libbsd-0.12.2.tar.xz +sha512 ce43e4f0486d5f00d4a8119ee863eaaa2f968cae4aa3d622976bb31ad601dfc565afacef7ebade5eba33fff1c329b5296c6387c008d1e1805d878431038f8b21 libbsd-0.12.2.tar.xz # Locally computed -sha256 7aab3a07716d31ca72e66c1073ef8a0fa0be0daa5df7c3b2cc0c668589142336 COPYING +sha256 978426553ab7b9cfb4503d98e578a77b8c3142c099100aa9791fd21be5a95f97 COPYING diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk index 27937c4611..557b49fca6 100644 --- a/package/libbsd/libbsd.mk +++ b/package/libbsd/libbsd.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBBSD_VERSION = 0.11.7 +LIBBSD_VERSION = 0.12.2 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = https://libbsd.freedesktop.org/releases -LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ +LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-5-Clause, \ MIT, ISC, Beerware LIBBSD_LICENSE_FILES = COPYING LIBBSD_CPE_ID_VENDOR = freedesktop diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index a52a2803e5..c3962d7bbd 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1d1ce3be8ac59fd59511d0794c7327d5cf33f1e83496837b17e19ac49400cad1 libbytesize-2.10.tar.gz +sha256 1f6ce157750ed1201ce83edd3c23d997a615c7da30f9a0e5bb44635f66768d81 libbytesize-2.11.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index 7f56cbcb79..f163b9ad21 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.10 +LIBBYTESIZE_VERSION = 2.11 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE diff --git a/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch b/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch new file mode 100644 index 0000000000..1aba972d13 --- /dev/null +++ b/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch @@ -0,0 +1,52 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 21 Jun 2025 18:12:18 +0200 +Subject: [PATCH] core: Update checks for disable_rpi_features option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on the original commit that added the sync feature there +were a few more options that needed the disable_rpi_features +code conditionals to ensure compilation against upstream +libcamera so add them in to ensure this works. + +Fixes: +../core/rpicam_app.cpp: In member function ‘void RPiCamApp::StartCamera()’: +../core/rpicam_app.cpp:642:78: error: ‘controls::rpi’ has not been declared + 642 | if (!controls_.get(controls::ScalerCrop) && !controls_.get(controls::rpi::ScalerCrops)) + | ^~~ +../core/rpicam_app.cpp:673:49: error: ‘controls::rpi’ has not been declared + 673 | controls_.set(controls::rpi::ScalerCrops, libcamera::Span(crops.data(), crops.size())); + | ^~~ + +Upstream: https://github.com/raspberrypi/rpicam-apps/pull/827 + +Signed-off-by: Bernd Kuhls +--- + core/rpicam_app.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/core/rpicam_app.cpp b/core/rpicam_app.cpp +index bed69c0..1db784f 100644 +--- a/core/rpicam_app.cpp ++++ b/core/rpicam_app.cpp +@@ -637,6 +637,7 @@ void RPiCamApp::StartCamera() + // This makes all the Request objects that we shall need. + makeRequests(); + ++#ifndef DISABLE_RPI_FEATURES + // Build a list of initial controls that we must set in the camera before starting it. + // We don't overwrite anything the application may have set before calling us. + if (!controls_.get(controls::ScalerCrop) && !controls_.get(controls::rpi::ScalerCrops)) +@@ -672,6 +673,7 @@ void RPiCamApp::StartCamera() + else + controls_.set(controls::rpi::ScalerCrops, libcamera::Span(crops.data(), crops.size())); + } ++#endif + + if (!controls_.get(controls::AfWindows) && !controls_.get(controls::AfMetering) && + options_->Get().afWindow_width != 0 && options_->Get().afWindow_height != 0) +-- +2.39.5 + diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index f169d8c52e..fa41d1be2d 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libcamera + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # libcamera depends on !BR2_STATIC_LIBS # gnutls/libcamera depends on BR2_USE_WCHAR # gnutls/libcamera/boost depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 00b499d247..b11ea7fe67 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 576bcd585f1c8d8bc80e37fa3c8a172e9d1c8406490438cf6d0fbc7ba4996ec1 rpicam-apps-1.5.0.tar.xz +sha256 b5535933ebc398616fd1b261fa9e3755dfb419e10ee7866078a8a8d99f54a59a libcamera-apps-v1.7.0-10-ge9645231008146fa0e75c2b3e0ff8c48ad70511a.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 17983bb8ca..06efb9a960 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.5.0 -LIBCAMERA_APPS_SOURCE = rpicam-apps-$(LIBCAMERA_APPS_VERSION).tar.xz -LIBCAMERA_APPS_SITE = https://github.com/raspberrypi/rpicam-apps/releases/download/v$(LIBCAMERA_APPS_VERSION) +LIBCAMERA_APPS_VERSION = v1.7.0-10-ge9645231008146fa0e75c2b3e0ff8c48ad70511a +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,rpicam-apps,$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt LIBCAMERA_APPS_DEPENDENCIES = \ @@ -36,6 +35,12 @@ else LIBCAMERA_APPS_CONF_OPTS += -Denable_libav=disabled endif +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBCAMERA_APPS_CONF_OPTS += -Ddisable_rpi_features=false +else +LIBCAMERA_APPS_CONF_OPTS += -Ddisable_rpi_features=true +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 4699e382c7..92361bbade 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -9,7 +9,7 @@ menuconfig BR2_PACKAGE_LIBCAMERA depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_WCHAR # gnutls select BR2_PACKAGE_GNUTLS @@ -60,11 +60,16 @@ config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1 help Pipeline for Rockchip ISP1. +config BR2_PACKAGE_LIBCAMERA_PIPELINE_MALI_C55 + bool "mali-c55 pipeline" + depends on BR2_arm || BR2_aarch64 + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for Arm Mali-C55 ISP. + config BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 bool "rpi/vc4 pipeline" depends on BR2_arm || BR2_aarch64 - depends on BR2_USE_WCHAR # boost (already enforced for gnutls) - select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE help Pipeline for Raspberry Pi devices. diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index d4554af190..bbec9c517d 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,5 @@ -sha256 d396bebe49aa7f605403594be3a9e970173d4c98061033c75f816946ff907eb8 libcamera-v0.3.2-git4.tar.gz +# Locally computed +sha256 ee2c7086b3c08133bba44856fb9b2ffd1132532150d14da7daecd99ab8a566c2 libcamera-v0.5.1-git4.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 3367eb60b2..a2ff3284d7 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.3.2 +LIBCAMERA_VERSION = v0.5.1 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ @@ -16,6 +16,7 @@ LIBCAMERA_DEPENDENCIES = \ libyaml \ gnutls LIBCAMERA_CONF_OPTS = \ + -Dauto_features=disabled \ -Dandroid=disabled \ -Ddocumentation=disabled \ -Dtest=false \ @@ -47,23 +48,17 @@ endif ifeq ($(BR2_PACKAGE_LIBCAMERA_PYTHON),y) LIBCAMERA_DEPENDENCIES += python3 python-pybind LIBCAMERA_CONF_OPTS += -Dpycamera=enabled -else -LIBCAMERA_CONF_OPTS += -Dpycamera=disabled endif ifeq ($(BR2_PACKAGE_LIBCAMERA_V4L2),y) -LIBCAMERA_CONF_OPTS += -Dv4l2=true -else -LIBCAMERA_CONF_OPTS += -Dv4l2=false +LIBCAMERA_CONF_OPTS += -Dv4l2=enabled endif LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IMX8_ISI) += imx8-isi LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_MALI_C55) += mali-c55 LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 -ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4),y) -LIBCAMERA_PIPELINES-y += rpi/vc4 -LIBCAMERA_DEPENDENCIES += boost -endif +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4) += rpi/vc4 LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc @@ -73,8 +68,6 @@ LIBCAMERA_CONF_OPTS += -Dpipelines=$(subst $(space),$(comma),$(LIBCAMERA_PIPELIN ifeq ($(BR2_PACKAGE_LIBCAMERA_COMPLIANCE),y) LIBCAMERA_DEPENDENCIES += gtest libevent LIBCAMERA_CONF_OPTS += -Dlc-compliance=enabled -else -LIBCAMERA_CONF_OPTS += -Dlc-compliance=disabled endif # gstreamer-video-1.0, gstreamer-allocators-1.0 @@ -83,21 +76,30 @@ 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 -else -LIBCAMERA_CONF_OPTS += -Dcam=disabled +endif + +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +# Optional dependency on libdw +LIBCAMERA_DEPENDENCIES += elfutils +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LIBCAMERA_DEPENDENCIES += jpeg +endif + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +LIBCAMERA_DEPENDENCIES += libdrm +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +LIBCAMERA_DEPENDENCIES += libunwind +endif + +ifeq ($(BR2_PACKAGE_SDL2),y) +LIBCAMERA_DEPENDENCIES += sdl2 endif ifeq ($(BR2_PACKAGE_TIFF),y) @@ -107,15 +109,11 @@ endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCAMERA_CONF_OPTS += -Dudev=enabled LIBCAMERA_DEPENDENCIES += udev -else -LIBCAMERA_CONF_OPTS += -Dudev=disabled endif ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) LIBCAMERA_CONF_OPTS += -Dtracing=enabled LIBCAMERA_DEPENDENCIES += lttng-libust -else -LIBCAMERA_CONF_OPTS += -Dtracing=disabled endif ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) @@ -132,7 +130,7 @@ endif # otherwise the signature won't match the shlib on the rootfs. Since meson # install target is signing the shlibs, we need to strip them before. LIBCAMERA_STRIP_FIND_CMD = \ - find $(@D)/build/src/ipa \ + find $(@D)/buildroot-build/src/ipa \ $(if $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES)), \ -not \( $(call findfileclauses,$(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) ) \ -type f -name 'ipa_*.so' -print0 diff --git a/package/libcanberra/libcanberra.mk b/package/libcanberra/libcanberra.mk index 2505e58eb0..456d08563b 100644 --- a/package/libcanberra/libcanberra.mk +++ b/package/libcanberra/libcanberra.mk @@ -12,7 +12,12 @@ LIBCANBERRA_LICENSE_FILES = LGPL LIBCANBERRA_INSTALL_STAGING = YES LIBCANBERRA_DEPENDENCIES = host-pkgconf libtool libvorbis -LIBCANBERRA_CONF_OPTS = --disable-oss --disable-null --disable-tdb --disable-lynx +LIBCANBERRA_CONF_OPTS = \ + --disable-oss \ + --disable-null \ + --disable-tdb \ + --disable-lynx \ + --disable-gtk ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCANBERRA_CONF_OPTS += --enable-udev @@ -42,13 +47,6 @@ else LIBCANBERRA_CONF_OPTS += --disable-gstreamer endif -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -LIBCANBERRA_CONF_OPTS += --enable-gtk -LIBCANBERRA_DEPENDENCIES += libgtk2 -else -LIBCANBERRA_CONF_OPTS += --disable-gtk -endif - ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) LIBCANBERRA_CONF_OPTS += --enable-gtk3 LIBCANBERRA_DEPENDENCIES += libgtk3 diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 9c8012b238..e544e27696 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -14,6 +14,11 @@ LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no LIBCAP_NG_CONF_OPTS = --without-python3 +# pthread support uses pthread_atfork, which is not available on nommu +ifneq ($(BR2_USE_MMU),y) +LIBCAP_NG_CONF_ENV += ac_cv_header_pthread_h=no +endif + HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no HOST_LIBCAP_NG_CONF_OPTS = --without-python3 diff --git a/package/libcap/0001-Revert-libcap-Add-build-ldflags-to-_makenames-rule.patch b/package/libcap/0001-Revert-libcap-Add-build-ldflags-to-_makenames-rule.patch new file mode 100644 index 0000000000..ae9655fd57 --- /dev/null +++ b/package/libcap/0001-Revert-libcap-Add-build-ldflags-to-_makenames-rule.patch @@ -0,0 +1,34 @@ +From 542d7d86ecd2129dd5fe7e5b31ba307304f5b319 Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" +Date: Mon, 10 Nov 2025 18:26:34 -0800 +Subject: [PATCH] Revert "libcap: Add build ldflags to _makenames rule" + +This reverts commit c3ddf45d9afaab85d3b7db0dc7bfd1aafb8fde50. + +The details of what this broke are here: + + https://bugzilla.kernel.org/show_bug.cgi?id=220691#c2 + +Signed-off-by: Andrew G. Morgan +Upstream: 542d7d86ecd2129dd5fe7e5b31ba307304f5b319 +Signed-off-by: Thomas Petazzoni +--- + libcap/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libcap/Makefile b/libcap/Makefile +index f0eb87e..e90a950 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -80,7 +80,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in + $< >$@ + + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ $(BUILD_LDFLAGS) ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h +-- +2.51.1 + diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index dd9bc75a02..1925060235 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f libcap-2.70.tar.xz +sha256 897bc18b44afc26c70e78cead3dbb31e154acc24bee085a5a09079a88dbf6f52 libcap-2.77.tar.xz # Hash for license file: sha256 68467e731f4744bd6e0bb69e8df9c3a994e09cd6b203d0c41327ac6d079c581d License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index a1b2636c5d..37ccdc22b4 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.70 +LIBCAP_VERSION = 2.77 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause @@ -64,8 +64,11 @@ define HOST_LIBCAP_BUILD_CMDS $(HOST_LIBCAP_MAKE_FLAGS) endef +# Set DESTDIR to a non-empty path, so that libcap's Makefile +# does not trigger calls to ldconfig define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBCAP_MAKE_FLAGS) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBCAP_MAKE_FLAGS) \ + DESTDIR=/ install endef $(eval $(generic-package)) diff --git a/package/libcdaudio/Config.in b/package/libcdaudio/Config.in index 3eca607fc1..02df01e4fc 100644 --- a/package/libcdaudio/Config.in +++ b/package/libcdaudio/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBCDAUDIO bool "libcdaudio" - # binutils assertion failure - depends on !BR2_nios2 help libcdaudio is a library designed to provide functions to control operation of a CD-ROM when playing audio CDs. It diff --git a/package/libcddb/0001-gcc15.patch b/package/libcddb/0001-gcc15.patch new file mode 100644 index 0000000000..379e654951 --- /dev/null +++ b/package/libcddb/0001-gcc15.patch @@ -0,0 +1,17 @@ +Fix incorrect type. + +Upstream: https://sourceforge.net/p/libcddb/patches/9/#b9ea + +Signed-off-by: Bernd Kuhls + +--- libcddb-1.3.2/lib/cddb_net.c 2009-03-01 03:28:07.000000000 +0000 ++++ libcddb-1.3.2/lib/cddb_net.c 2025-07-03 17:58:30.064232649 +0100 +@@ -305,7 +305,7 @@ + int rv; + fd_set wfds; + struct timeval tv; +- size_t l; ++ socklen_t l; + + /* set up select time out */ + tv.tv_sec = timeout; diff --git a/package/libcdio/libcdio.hash b/package/libcdio/libcdio.hash index 1b157992b2..52d923a3d0 100644 --- a/package/libcdio/libcdio.hash +++ b/package/libcdio/libcdio.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -sha256 8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b libcdio-2.1.0.tar.bz2 +sha256 6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539 libcdio-2.2.0.tar.bz2 # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk index df26d9a7ac..d4b277a15b 100644 --- a/package/libcdio/libcdio.mk +++ b/package/libcdio/libcdio.mk @@ -4,14 +4,15 @@ # ################################################################################ -LIBCDIO_VERSION = 2.1.0 +LIBCDIO_VERSION = 2.2.0 LIBCDIO_SOURCE = libcdio-$(LIBCDIO_VERSION).tar.bz2 -LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio +LIBCDIO_SITE = https://github.com/libcdio/libcdio/releases/download/$(LIBCDIO_VERSION) LIBCDIO_INSTALL_STAGING = YES 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 diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash index 3e5a443057..b04c724668 100644 --- a/package/libcec/libcec.hash +++ b/package/libcec/libcec.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 libcec-6.0.2.tar.gz -sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a COPYING +sha256 7f7da95a4c1e7160d42ca37a3ac80cf6f389b317e14816949e0fa5e2edf4cc64 libcec-7.1.1.tar.gz +sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a LICENSE.md diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 33e0463eb8..312e8b5acc 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBCEC_VERSION = 6.0.2 +LIBCEC_VERSION = 7.1.1 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPL-2.0+ -LIBCEC_LICENSE_FILES = COPYING +LIBCEC_LICENSE_FILES = LICENSE.md LIBCEC_INSTALL_STAGING = YES LIBCEC_DEPENDENCIES = host-pkgconf libplatform diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 20abb94f8f..fc618fef52 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ae61a48c21f7b40e1442c9e1da9aab9e6f2cf0deccb02f3fed4de232a0b0522e libcoap-4.3.4.tar.gz +sha256 a417ed26ec6c95c041b42353b5b6fad1602e2bf42a6e26c09863450e227b7b5f libcoap-4.3.5.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 bdd94ddd8e75010aebd045ead1c951110788003395c708811d6960248acb3891 LICENSE +sha256 ecff7aa3af994b008dbb57c180753bd2a6c53fa6f8265a2486740f4cfd45280c LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 29161142f6..d7c2a78944 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCOAP_VERSION = 4.3.4 +LIBCOAP_VERSION = 4.3.5 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause @@ -15,9 +15,6 @@ LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES -# 0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch -LIBCOAP_IGNORE_CVES += CVE-2024-0962 - ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls LIBCOAP_CONF_OPTS += \ @@ -34,4 +31,10 @@ else LIBCOAP_CONF_OPTS += --disable-dtls endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBCOAP_CONF_OPTS += --enable-thread-safe +else +LIBCOAP_CONF_OPTS += --disable-thread-safe +endif + $(eval $(autotools-package)) diff --git a/package/libconfig/libconfig.hash b/package/libconfig/libconfig.hash index d359301d6f..2b10dfc125 100644 --- a/package/libconfig/libconfig.hash +++ b/package/libconfig/libconfig.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7 libconfig-1.7.3.tar.gz -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING.LIB +sha256 87c6f382994b245f9213be34a2bf19c8ee7d033d7abaa51e88fbb7bad79e2dc6 libconfig-1.8.1.tar.gz +sha256 cbbad55f94feadb16061c4f782910bac254460a44f1c8abd2b91452eff085f55 COPYING.LIB diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk index 6cdf603185..3fa2be3563 100644 --- a/package/libconfig/libconfig.mk +++ b/package/libconfig/libconfig.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCONFIG_VERSION = 1.7.3 -LIBCONFIG_SITE = https://github.com/hyperrealm/libconfig/releases/download/v$(LIBCONFIG_VERSION) +LIBCONFIG_VERSION = 1.8.1 +LIBCONFIG_SITE = https://hyperrealm.github.io/libconfig/dist LIBCONFIG_LICENSE = LGPL-2.1+ LIBCONFIG_LICENSE_FILES = COPYING.LIB LIBCONFIG_INSTALL_STAGING = YES diff --git a/package/libconfuse/Config.in b/package/libconfuse/Config.in index b96b8f2811..ee55409010 100644 --- a/package/libconfuse/Config.in +++ b/package/libconfuse/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCONFUSE environment variable expansion, functions and nested include statements. - https://github.com/martinh/libconfuse/ + https://github.com/libconfuse/libconfuse diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 76123a7e6b..fff684a55b 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -6,7 +6,7 @@ LIBCONFUSE_VERSION = 3.3 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz -LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) +LIBCONFUSE_SITE = https://github.com/libconfuse/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath LIBCONFUSE_LICENSE = ISC diff --git a/package/libcrossguid/0001-pr67-include-missing-cstdint.patch b/package/libcrossguid/0001-pr67-include-missing-cstdint.patch new file mode 100644 index 0000000000..0986f4e9e5 --- /dev/null +++ b/package/libcrossguid/0001-pr67-include-missing-cstdint.patch @@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include missing + +gcc 13 moved some includes around and as a result is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj + +Upstream: https://github.com/graeme-hill/crossguid/pull/67 + +Signed-off-by: Bernd Kuhls +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include + #endif + ++#include + #include + #include + #include diff --git a/package/libcrossguid/libcrossguid.hash b/package/libcrossguid/libcrossguid.hash index 17dbe35c71..f65c25732d 100644 --- a/package/libcrossguid/libcrossguid.hash +++ b/package/libcrossguid/libcrossguid.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 libcrossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz +sha256 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4 libcrossguid-v0.2.2-52-gca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz sha256 779e58787f966a1552f68d5ec041513cef68785dae4a519dbda7bc0b86eda20e LICENSE diff --git a/package/libcrossguid/libcrossguid.mk b/package/libcrossguid/libcrossguid.mk index 46d9a9dcc6..c77f21ab26 100644 --- a/package/libcrossguid/libcrossguid.mk +++ b/package/libcrossguid/libcrossguid.mk @@ -4,25 +4,12 @@ # ################################################################################ -LIBCROSSGUID_VERSION = 8f399e8bd4252be9952f3dfa8199924cc8487ca4 +LIBCROSSGUID_VERSION = v0.2.2-52-gca1bf4b810e2d188d04cb6286f957008ee1b7681 LIBCROSSGUID_SITE = $(call github,graeme-hill,crossguid,$(LIBCROSSGUID_VERSION)) LIBCROSSGUID_LICENSE = MIT LIBCROSSGUID_LICENSE_FILES = LICENSE LIBCROSSGUID_INSTALL_STAGING = YES -# only a static library -LIBCROSSGUID_INSTALL_TARGET = NO LIBCROSSGUID_DEPENDENCIES = util-linux +LIBCROSSGUID_CONF_OPTS = -DCROSSGUID_TESTS=OFF -define LIBCROSSGUID_BUILD_CMDS - (cd $(@D); $(TARGET_CXX) $(TARGET_CXXFLAGS) -std=c++11 -DGUID_LIBUUID \ - -c guid.cpp -o guid.o) - (cd $(@D); $(TARGET_AR) rvs libcrossguid.a guid.o) -endef - -define LIBCROSSGUID_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/libcrossguid.a \ - $(STAGING_DIR)/usr/lib/libcrossguid.a - $(INSTALL) -D -m 644 $(@D)/guid.h $(STAGING_DIR)/usr/include/guid.h -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk index 7ef27f5a17..8eac4725c9 100644 --- a/package/libcue/libcue.mk +++ b/package/libcue/libcue.mk @@ -10,5 +10,6 @@ LIBCUE_LICENSE = GPL-2.0, BSD-2-Clause (rem.c) LIBCUE_LICENSE_FILES = LICENSE LIBCUE_DEPENDENCIES = host-bison host-flex flex LIBCUE_INSTALL_STAGING = YES +LIBCUE_CPE_ID_VENDOR = lipnitsk $(eval $(cmake-package)) diff --git a/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch b/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch deleted file mode 100644 index ffa44b87b6..0000000000 --- a/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 58d490091d097ba2ad108cc66c97e242e5aacb9c Mon Sep 17 00:00:00 2001 -Message-ID: <58d490091d097ba2ad108cc66c97e242e5aacb9c.1727153835.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Tue, 24 Sep 2024 07:52:13 +0300 -Subject: [PATCH] curl_trc: fix build with verbose messages disabled - -Add empty definition of Curl_trc_ws() to fix this following build error: - -In file included from sendf.h:29, - from ws.c:35: -ws.c: In function 'Curl_ws_accept': -curl_trc.h:100:10: error: implicit declaration of function 'Curl_trc_ws'; did you mean 'Curl_trc_ftp'? [-Wimplicit-function-declaration] - 100 | Curl_trc_ws(data, __VA_ARGS__); } while(0) - | ^~~~~~~~~~~ -ws.c:779:5: note: in expansion of macro 'CURL_TRC_WS' - 779 | CURL_TRC_WS(data, "WS, using chunk size %zu", chunk_size); - | ^~~~~~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/pull/15026 ---- - lib/curl_trc.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/lib/curl_trc.h b/lib/curl_trc.h -index 5f675b453fd3..1801d33cea7c 100644 ---- a/lib/curl_trc.h -+++ b/lib/curl_trc.h -@@ -226,6 +226,12 @@ static void Curl_trc_smtp(struct Curl_easy *data, const char *fmt, ...) - (void)data; (void)fmt; - } - #endif -+#if defined(USE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP) -+static void Curl_trc_ws(struct Curl_easy *data, const char *fmt, ...) -+{ -+ (void)data; (void)fmt; -+} -+#endif - - #endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */ - --- -2.45.2 - diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 0e52bc69c2..b86f98262c 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -63,10 +63,6 @@ config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL -config BR2_PACKAGE_LIBCURL_BEARSSL - bool "BearSSL" - depends on BR2_PACKAGE_BEARSSL - config BR2_PACKAGE_LIBCURL_GNUTLS bool "GnuTLS" depends on BR2_PACKAGE_GNUTLS diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 93a0f85dee..786d030171 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.11.0.tar.xz.asc +# https://curl.se/download/curl-8.17.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb curl-8.11.0.tar.xz -sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING +sha256 955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992 curl-8.17.0.tar.xz +sha256 e18f1989333b70044b2adfb7dc2f905d0119dbdcac3bc9f4bc9d540e3a29de5b COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 1022abac85..9e32c38d97 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.11.0 +LIBCURL_VERSION = 8.17.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -15,18 +15,11 @@ LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES -# We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') -# support because it uses fork(), which doesn't work on non-MMU platforms. -# Moreover, this authentication method is probably almost never used (see -# https://curl.se/docs/manpage.html#--ntlm), so disable NTLM support overall. -# # Likewise, there is no compiler on the target, so libcurl-option (to # generate C code) isn't very useful LIBCURL_CONF_OPTS = \ --disable-manual \ --disable-ntlm \ - --disable-ntlm-wb \ - --with-random=/dev/urandom \ --disable-curldebug \ --disable-libcurl-option \ --disable-ldap \ @@ -36,7 +29,9 @@ LIBCURL_CONF_OPTS = \ # https://nvd.nist.gov/vuln/detail/CVE-2024-32928 LIBCURL_IGNORE_CVES += CVE-2024-32928 -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +# threaded resolver cannot be used with c-ares +# https://github.com/curl/curl/commit/d364f1347f05c53eea5d25a15b4ad8a62ecc85b8 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)x$(BR2_PACKAGE_C_ARES),yx) LIBCURL_CONF_OPTS += --enable-threaded-resolver else LIBCURL_CONF_OPTS += --disable-threaded-resolver @@ -72,16 +67,8 @@ else LIBCURL_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_LIBCURL_BEARSSL),y) -LIBCURL_CONF_OPTS += --with-bearssl=$(STAGING_DIR)/usr -LIBCURL_DEPENDENCIES += bearssl -else -LIBCURL_CONF_OPTS += --without-bearssl -endif - ifeq ($(BR2_PACKAGE_LIBCURL_GNUTLS),y) -LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr \ - --with-ca-fallback +LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr LIBCURL_DEPENDENCIES += gnutls else LIBCURL_CONF_OPTS += --without-gnutls diff --git a/package/libdbi-drivers/0001-libdbi-drivers-c99.patch b/package/libdbi-drivers/0001-libdbi-drivers-c99.patch new file mode 100644 index 0000000000..46b43c8653 --- /dev/null +++ b/package/libdbi-drivers/0001-libdbi-drivers-c99.patch @@ -0,0 +1,45 @@ +Fix type errors in the cgreen with constraints facility. + +Upstream: https://sourceforge.net/p/libdbi-drivers/bugs/28/ + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for git tree used by buildroot] + +diff --git a/tests/cgreen/src/constraint.c b/tests/cgreen/src/constraint.c +index c19c0ddd41a7bfa7..95673dd3e222a3cf 100644 +--- a/tests/cgreen/src/constraint.c ++++ b/tests/cgreen/src/constraint.c +@@ -22,8 +22,7 @@ static double unbox_double(intptr_t box); + static double as_double(intptr_t box); + + static int compare_using_matcher(Constraint *constraint, intptr_t actual); +-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t actual, const char *test_file, int test_line, TestReporter *reporter); +- ++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter); + + void destroy_constraint(void *abstract) { + Constraint *constraint = (Constraint *)abstract; +@@ -164,11 +163,11 @@ + } + + static int compare_using_matcher(Constraint *constraint, intptr_t actual) { +- int (*matches)(const void*) = (void *)(intptr_t)constraint->expected; +- return matches((void *)actual); ++ int (*matches)(const void*) = (int (*)(const void*)) constraint->expected; ++ return matches((const void *)actual); + } + +-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) { ++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) { + (*reporter->assert_true)( + reporter, + test_file, +@@ -176,7 +175,7 @@ static void test_with_matcher(Constraint *constraint, const char *function, cons + (*constraint->compare)(constraint, matcher_function), + "Wanted parameter [%s] to match [%s] in function [%s]", + constraint->parameter, +- matcher_name, ++ constraint->name, + function); + } + diff --git a/package/libdbi/Config.in b/package/libdbi/Config.in index 13ac344f82..d9a1316311 100644 --- a/package/libdbi/Config.in +++ b/package/libdbi/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_LIBDBI - bool "lidbi" + bool "libdbi" depends on !BR2_STATIC_LIBS help libdbi implements a database-independent abstraction layer diff --git a/package/libde265/libde265.hash b/package/libde265/libde265.hash index a21a8a1265..efd48d13aa 100644 --- a/package/libde265/libde265.hash +++ b/package/libde265/libde265.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00251986c29d34d3af7117ed05874950c875dd9292d016be29d3b3762666511d libde265-1.0.15.tar.gz +sha256 b92beb6b53c346db9a8fae968d686ab706240099cdd5aff87777362d668b0de7 libde265-1.0.16.tar.gz sha256 02cc1585a20677992e0ba578fa692635dc193735f2691dc81de924b51c4e8020 COPYING diff --git a/package/libde265/libde265.mk b/package/libde265/libde265.mk index 62c22246aa..3d9b96134f 100644 --- a/package/libde265/libde265.mk +++ b/package/libde265/libde265.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDE265_VERSION = 1.0.15 +LIBDE265_VERSION = 1.0.16 LIBDE265_SITE = https://github.com/strukturag/libde265/releases/download/v$(LIBDE265_VERSION) LIBDE265_LICENSE = LGPL-3.0+ LIBDE265_LICENSE_FILES = COPYING diff --git a/package/libdecor/libdecor.hash b/package/libdecor/libdecor.hash index 9e51e90593..69163f3227 100644 --- a/package/libdecor/libdecor.hash +++ b/package/libdecor/libdecor.hash @@ -1,3 +1,4 @@ +# From https://gitlab.freedesktop.org/libdecor/libdecor/-/releases/0.2.4/downloads/libdecor-0.2.4.tar.xz.sha256sum +sha256 b17cf420e8dcb526bf82da5d36f8443a91fad0777083fa4ec5c1df8ee877416f libdecor-0.2.4.tar.xz # Locally calculated -sha256 82adece5baeb6194292b0d1a91b4b3d10da41115f352a5e6c5844b20b88a0512 libdecor-0.1.1.tar.gz sha256 508a77d2e7b51d98adeed32648ad124b7b30241a8e70b2e72c99f92d8e5874d1 LICENSE diff --git a/package/libdecor/libdecor.mk b/package/libdecor/libdecor.mk index b965726292..26f4be40a6 100644 --- a/package/libdecor/libdecor.mk +++ b/package/libdecor/libdecor.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBDECOR_VERSION = 0.1.1 -LIBDECOR_SITE = https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/$(LIBDECOR_VERSION) +LIBDECOR_VERSION = 0.2.4 +LIBDECOR_SOURCE = libdecor-$(LIBDECOR_VERSION).tar.xz +LIBDECOR_SITE = https://gitlab.freedesktop.org/libdecor/libdecor/-/releases/$(LIBDECOR_VERSION)/downloads LIBDECOR_LICENSE = MIT LIBDECOR_LICENSE_FILES = LICENSE LIBDECOR_INSTALL_STAGING = YES @@ -19,4 +20,11 @@ else LIBDECOR_CONF_OPTS += -Ddbus=disabled endif +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +LIBDECOR_CONF_OPTS += -Dgtk=enabled +LIBDECOR_DEPENDENCIES += libgtk3 +else +LIBDECOR_CONF_OPTS += -Dgtk=disabled +endif + $(eval $(meson-package)) diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash index 46afa96635..24aad4a799 100644 --- a/package/libdeflate/libdeflate.hash +++ b/package/libdeflate/libdeflate.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed1454166ced78913ff3809870a4005b7170a6fd30767dc478a09b96847b9c2a libdeflate-1.20.tar.gz -sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING +sha256 fed5cd22f00f30cc4c2e5329f94e2b8a901df9fa45ee255cb70e2b0b42344477 libdeflate-1.25.tar.gz +sha256 4ad69099cb4374836fd27583d9991e2838cd86b6e4666ab26b2d32582c91e73a COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 4597dc5a8c..889e04c97b 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBDEFLATE_VERSION = 1.20 -LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) +LIBDEFLATE_VERSION = 1.25 +LIBDEFLATE_SITE = https://github.com/ebiggers/libdeflate/releases/download/v$(LIBDEFLATE_VERSION) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES diff --git a/package/libdex/libdex.hash b/package/libdex/libdex.hash index 7e08676fe4..2a2a7b62cc 100644 --- a/package/libdex/libdex.hash +++ b/package/libdex/libdex.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libdex/0.8/libdex-0.8.0.sha256sum -sha256 659ab5d0eb7f10bd36af0cde08055158987690b9714e7f5b001c788ec1d01a25 libdex-0.8.0.tar.xz +# From https://download.gnome.org/sources/libdex/1.0/libdex-1.0.0.sha256sum +sha256 7b8f5c5db3796e14e12e10422e2356766ba830b92815fee70bbc867b5b207f5d libdex-1.0.0.tar.xz # License files sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libdex/libdex.mk b/package/libdex/libdex.mk index 0d27b35675..839b0006f6 100644 --- a/package/libdex/libdex.mk +++ b/package/libdex/libdex.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -LIBDEX_VERSION_MAJOR = 0.8 +LIBDEX_VERSION_MAJOR = 1.0 LIBDEX_VERSION = $(LIBDEX_VERSION_MAJOR).0 LIBDEX_SOURCE = libdex-$(LIBDEX_VERSION).tar.xz LIBDEX_SITE = https://download.gnome.org/sources/libdex/$(LIBDEX_VERSION_MAJOR) diff --git a/package/libdisplay-info/0001-cta-include-sys-types.h.patch b/package/libdisplay-info/0001-cta-include-sys-types.h.patch new file mode 100644 index 0000000000..59049b0a94 --- /dev/null +++ b/package/libdisplay-info/0001-cta-include-sys-types.h.patch @@ -0,0 +1,35 @@ +From e569a92539c96acd2a618729827c8fbf3659d803 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 7 Oct 2025 22:44:01 +0200 +Subject: [PATCH] cta: include sys/types.h + +Fixes build error with uClibc-based toolchain and gcc 15.2.0 found by +Buildroot autobuilders[1]: + +../cta.c: In function 'parse_vendor_hdmi_block': +../cta.c:168:15: error: unknown type name 'ssize_t'; did you mean 'size_t'? + +[1] https://autobuild.buildroot.org/results/2d72feabdd0c9e1c9aa89e6d683d5f5ae0bb942d/ + +Upstream: https://gitlab.freedesktop.org/emersion/libdisplay-info/-/commit/84e8da3de9a89a95c4305abf6f578feae66dfa69 + +Signed-off-by: Bernd Kuhls +--- + cta.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cta.c b/cta.c +index 12187cc..53edfca 100644 +--- a/cta.c ++++ b/cta.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + #include "bits.h" + #include "cta.h" +-- +2.47.3 + diff --git a/package/libdisplay-info/libdisplay-info.hash b/package/libdisplay-info/libdisplay-info.hash index cc93a0cf32..8c6f077679 100644 --- a/package/libdisplay-info/libdisplay-info.hash +++ b/package/libdisplay-info/libdisplay-info.hash @@ -1,4 +1,6 @@ -# From https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.2.0/downloads/libdisplay-info-0.2.0.tar.xz.sha256sum -sha256 5a2f002a16f42dd3540c8846f80a90b8f4bdcd067a94b9d2087bc2feae974176 libdisplay-info-0.2.0.tar.xz +# From https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.3.0/downloads/libdisplay-info-0.3.0.tar.xz.sha256sum +sha256 6ae77cd937f9cf7d1321d35c116062c4911e8447010a6a713ac4286f7a9d5987 libdisplay-info-0.3.0.tar.xz +# From https://lore.freedesktop.org/wayland-devel/47m6wyRq0q-sgX6zWXuZfexFdml2vTqsHKkdCBXBWywBql7gG9F9or9JsCm690MBXEmnnUEML0JnCIbUNma_a7tFKUPZ6bHPYa86b0gjYB0=@emersion.fr/ +sha512 3266633d75ccd345dda5a8aad75f310e55a77654b48f17a247b35e18060b6db1047a69083cd286b43ec893125a36c4c43659af8f74a04da3278eea9fdd91efe9 libdisplay-info-0.3.0.tar.xz # Locally computed sha256 15b396244e58830c5614b9394f4deccfe684970cd507f299383ab57ad339eedd LICENSE diff --git a/package/libdisplay-info/libdisplay-info.mk b/package/libdisplay-info/libdisplay-info.mk index b88463849e..ea5cf1af2d 100644 --- a/package/libdisplay-info/libdisplay-info.mk +++ b/package/libdisplay-info/libdisplay-info.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDISPLAY_INFO_VERSION = 0.2.0 +LIBDISPLAY_INFO_VERSION = 0.3.0 LIBDISPLAY_INFO_SOURCE = libdisplay-info-$(LIBDISPLAY_INFO_VERSION).tar.xz LIBDISPLAY_INFO_SITE = https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(LIBDISPLAY_INFO_VERSION)/downloads LIBDISPLAY_INFO_LICENSE = MIT diff --git a/package/libdmtx/libdmtx.hash b/package/libdmtx/libdmtx.hash index 8b176d737a..5ae4557db0 100644 --- a/package/libdmtx/libdmtx.hash +++ b/package/libdmtx/libdmtx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7aa62adcefdd6e24bdabeb82b3ce41a8d35f4a0c95ab0c4438206aecafd6e1a1 libdmtx-0.7.7.tar.gz +sha256 2394bf1d1d693a5a4ca3cfcc1bb28a4d878bdb831ea9ca8f3d5c995d274bdc39 libdmtx-0.7.8.tar.gz sha256 fcc277b7302645322c63de22b9b0bdae2df3dfa7d6cbc0d5bed7a4d3f1a9af79 LICENSE diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk index 00d37fb94e..dd691a4af5 100644 --- a/package/libdmtx/libdmtx.mk +++ b/package/libdmtx/libdmtx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDMTX_VERSION = 0.7.7 +LIBDMTX_VERSION = 0.7.8 LIBDMTX_SITE = $(call github,dmtx,libdmtx,v$(LIBDMTX_VERSION)) LIBDMTX_LICENSE = BSD-2-Clause or Special Permission LIBDMTX_LICENSE_FILES = LICENSE diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index aec9f58749..e2dbbf18ee 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2024-August/003528.html -sha256 a2b98567a149a74b0f50e91e825f9c0315d86e7be9b74394dae8b298caadb79e libdrm-2.4.123.tar.xz -sha512 d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d libdrm-2.4.123.tar.xz +# From https://lists.x.org/archives/xorg-announce/2025-November/003642.html +sha256 5978183f978d697e26a50ba066174964efb0ab97caa1ecaa1b861fbe5ddf77dc libdrm-2.4.129.tar.xz +sha512 3ee702cc4a578e9ab231caf8a84700e4dff6f3da70731610121ac2c3390f42e42ad144ea61c53582e3a8adfb1d6bf8254993c5c6eaf85a51421e26d51d341cd4 libdrm-2.4.129.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index fcf7f17e78..c499632f6c 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.123 +LIBDRM_VERSION = 2.4.129 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT @@ -116,4 +116,25 @@ else LIBDRM_CONF_OPTS += -Dtests=false endif +HOST_LIBDRM_CONF_OPTS = \ + -Damdgpu=disabled \ + -Dcairo-tests=disabled \ + -Detnaviv=disabled \ + -Dexynos=disabled \ + -Dfreedreno=disabled \ + -Dfreedreno-kgsl=false \ + -Dinstall-test-programs=false \ + -Dintel=disabled \ + -Dman-pages=disabled \ + -Dnouveau=disabled \ + -Domap=disabled \ + -Dradeon=disabled \ + -Dtegra=disabled \ + -Dvc4=disabled \ + -Dvmwgfx=disabled \ + -Dtests=false \ + -Dudev=false \ + -Dvalgrind=disabled + $(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libdvdcss/0001-Fixed-compilation-problems-with-PATH_MAX.patch b/package/libdvdcss/0001-Fixed-compilation-problems-with-PATH_MAX.patch new file mode 100644 index 0000000000..35ebf4f4d1 --- /dev/null +++ b/package/libdvdcss/0001-Fixed-compilation-problems-with-PATH_MAX.patch @@ -0,0 +1,46 @@ +From be34d026f44389745e29a7da977f84712066d3d0 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 15 Nov 2025 19:41:09 +0100 +Subject: [PATCH] Fixed compilation problems with PATH_MAX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In file included from ../src/cpxm.c:38: +../src/libdvdcss.h:65:26: error: ‘PATH_MAX’ undeclared here (not in a function) + 65 | char psz_cachefile[PATH_MAX]; + +In file included from ../src/error.c:26: +../src/libdvdcss.h:65:26: error: ‘PATH_MAX’ undeclared here (not in a function) + 65 | char psz_cachefile[PATH_MAX]; + +In file included from ../src/libdvdcpxm.c:47: +../src/libdvdcss.h:65:26: error: ‘PATH_MAX’ undeclared here (not in a function) + 65 | char psz_cachefile[PATH_MAX]; + +Upstream: https://code.videolan.org/videolan/libdvdcss/-/merge_requests/24 + +Signed-off-by: Bernd Kuhls +--- + src/libdvdcss.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/libdvdcss.h b/src/libdvdcss.h +index f9d36ba..997af34 100644 +--- a/src/libdvdcss.h ++++ b/src/libdvdcss.h +@@ -26,6 +26,11 @@ + + #include + ++#include ++#ifdef HAVE_SYS_PARAM_H ++# include ++#endif ++ + #include "dvdcss/dvdcss.h" + #include "cpxm.h" + #include "css.h" +-- +2.47.3 + diff --git a/package/libdvdcss/libdvdcss.hash b/package/libdvdcss/libdvdcss.hash index 4d20f19efc..835155be80 100644 --- a/package/libdvdcss/libdvdcss.hash +++ b/package/libdvdcss/libdvdcss.hash @@ -1,7 +1,7 @@ -# From http://download.videolan.org/pub/videolan/libdvdcss/1.4.3/libdvdcss-1.4.3.tar.bz2.sha1 -sha1 fcea8b2749ead8183636e48300bea8791abc79ee libdvdcss-1.4.3.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdcss/1.4.3/libdvdcss-1.4.3.tar.bz2.sha256 -sha256 233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079 libdvdcss-1.4.3.tar.bz2 +# From https://download.videolan.org/pub/videolan/libdvdcss/1.5.0/libdvdcss-1.5.0.tar.xz.sha1 +sha1 bb21a27a32fa2a1d1e81448722fdc62c521a8803 libdvdcss-1.5.0.tar.xz +# From https://download.videolan.org/pub/videolan/libdvdcss/1.5.0/libdvdcss-1.5.0.tar.xz.sha256 +sha256 529463e4d1befef82e5c6e470db7661a2db0343e092a2fb0d6c037cab8a5c399 libdvdcss-1.5.0.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libdvdcss/libdvdcss.mk b/package/libdvdcss/libdvdcss.mk index f4d721771f..dae62fb592 100644 --- a/package/libdvdcss/libdvdcss.mk +++ b/package/libdvdcss/libdvdcss.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBDVDCSS_VERSION = 1.4.3 -LIBDVDCSS_SOURCE = libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2 -LIBDVDCSS_SITE = http://www.videolan.org/pub/videolan/libdvdcss/$(LIBDVDCSS_VERSION) +LIBDVDCSS_VERSION = 1.5.0 +LIBDVDCSS_SOURCE = libdvdcss-$(LIBDVDCSS_VERSION).tar.xz +LIBDVDCSS_SITE = https://download.videolan.org/pub/videolan/libdvdcss/$(LIBDVDCSS_VERSION) LIBDVDCSS_INSTALL_STAGING = YES LIBDVDCSS_LICENSE = GPL-2.0+ LIBDVDCSS_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libdvdnav/libdvdnav.hash b/package/libdvdnav/libdvdnav.hash index 61d64b8ee3..e7663cd67f 100644 --- a/package/libdvdnav/libdvdnav.hash +++ b/package/libdvdnav/libdvdnav.hash @@ -1,7 +1,7 @@ -# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2.sha1 -sha1 7ac76aa95d046db715763da23b7053b65cbc7540 libdvdnav-6.1.1.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2.sha256 -sha256 c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48 libdvdnav-6.1.1.tar.bz2 +# From https://download.videolan.org/pub/videolan/libdvdnav/7.0.0/libdvdnav-7.0.0.tar.xz.sha1 +sha1 186c7846d31f474bfecc213bc483f0064d0d7cdf libdvdnav-7.0.0.tar.xz +# From https://download.videolan.org/pub/videolan/libdvdnav/7.0.0/libdvdnav-7.0.0.tar.xz.sha256 +sha256 a2a18f5ad36d133c74bf9106b6445806fa253b09141a46392550394b647b221e libdvdnav-7.0.0.tar.xz # Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk index e34c0710bc..c4325c4711 100644 --- a/package/libdvdnav/libdvdnav.mk +++ b/package/libdvdnav/libdvdnav.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBDVDNAV_VERSION = 6.1.1 -LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 -LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION) +LIBDVDNAV_VERSION = 7.0.0 +LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.xz +LIBDVDNAV_SITE = https://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION) LIBDVDNAV_INSTALL_STAGING = YES -LIBDVDNAV_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf LIBDVDNAV_LICENSE = GPL-2.0+ LIBDVDNAV_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libdvdread/libdvdread.hash b/package/libdvdread/libdvdread.hash index 7fe0210727..5fb51ff47c 100644 --- a/package/libdvdread/libdvdread.hash +++ b/package/libdvdread/libdvdread.hash @@ -1,7 +1,7 @@ -# From http://download.videolan.org/pub/videolan/libdvdread/6.1.3/libdvdread-6.1.3.tar.bz2.sha1 -sha1 5e5721ff6ed01a9af9214be0d6563303e8bf2bed libdvdread-6.1.3.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdread/6.1.3/libdvdread-6.1.3.tar.bz2.sha256 -sha256 ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369 libdvdread-6.1.3.tar.bz2 +# From https://download.videolan.org/pub/videolan/libdvdread/7.0.1/libdvdread-7.0.1.tar.xz.sha1 +sha1 aaba59e0e04fa12704fab4230344549d8ae4b2e3 libdvdread-7.0.1.tar.xz +# From https://download.videolan.org/pub/videolan/libdvdread/7.0.1/libdvdread-7.0.1.tar.xz.sha256 +sha256 2e3e04a305c15c3963aa03ae1b9a83c1d239880003fcf3dde986d3943355d407 libdvdread-7.0.1.tar.xz # Hash for license file: sha256 d6cb0e9e560f51085556949a84af12b79a00f10ab8b66c752537faf7cd665572 COPYING diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk index bc486891ce..cc515606b2 100644 --- a/package/libdvdread/libdvdread.mk +++ b/package/libdvdread/libdvdread.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBDVDREAD_VERSION = 6.1.3 -LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 -LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) +LIBDVDREAD_VERSION = 7.0.1 +LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.xz +LIBDVDREAD_SITE = https://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) LIBDVDREAD_INSTALL_STAGING = YES LIBDVDREAD_LICENSE = GPL-2.0+ LIBDVDREAD_LICENSE_FILES = COPYING -LIBDVDREAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" -LIBDVDREAD_CONF_OPTS = --with-libdvdcss +LIBDVDREAD_CONF_OPTS = -Dlibdvdcss=enabled LIBDVDREAD_DEPENDENCIES = libdvdcss host-pkgconf -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libebur128/Config.in b/package/libebur128/Config.in deleted file mode 100644 index 0d68b39d53..0000000000 --- a/package/libebur128/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBEBUR128 - bool "libebur128" - # build system has no support to disable shared linking - # leading to a build error with a static-only toolchain - depends on !BR2_STATIC_LIBS - help - libebur128 is a library that implements the EBU R 128 standard - for loudness normalization. - - https://github.com/jiixyj/libebur128 - -comment "libebur128 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package/libebur128/libebur128.hash b/package/libebur128/libebur128.hash deleted file mode 100644 index 9c8c9e0c31..0000000000 --- a/package/libebur128/libebur128.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 baa7fc293a3d4651e244d8022ad03ab797ca3c2ad8442c43199afe8059faa613 libebur128-1.2.6.tar.gz -sha256 d6b4754bb67bdd08b97d5d11b2d7434997a371585a78fe77007149df3af8d09c COPYING diff --git a/package/libebur128/libebur128.mk b/package/libebur128/libebur128.mk deleted file mode 100644 index b7272fa7e1..0000000000 --- a/package/libebur128/libebur128.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libebur128 -# -################################################################################ - -LIBEBUR128_VERSION = 1.2.6 -LIBEBUR128_SITE = $(call github,jiixyj,libebur128,v$(LIBEBUR128_VERSION)) -LIBEBUR128_LICENSE = MIT -LIBEBUR128_LICENSE_FILES = COPYING -LIBEBUR128_INSTALL_STAGING = YES - -$(eval $(cmake-package)) diff --git a/package/libecoli/Config.in b/package/libecoli/Config.in new file mode 100644 index 0000000000..af4784c3bf --- /dev/null +++ b/package/libecoli/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBECOLI + bool "libecoli" + depends on BR2_USE_MMU # libedit + depends on BR2_USE_WCHAR # libedit + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBEDIT + help + libecoli stands for Extensible COmmand LIne library. + + This library provides helpers to build interactive command + line interfaces. + + https://github.com/rjarry/libecoli/ + +comment "libecoli needs a toolchain w/ dynamic library, wchar" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/libecoli/libecoli.hash b/package/libecoli/libecoli.hash new file mode 100644 index 0000000000..e200b796bf --- /dev/null +++ b/package/libecoli/libecoli.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 ac71cd336d7e19921ed1a0ae35ab14433792c7151d23abe92b247c6e36813246 libecoli-0.8.0.tar.gz +sha256 e58bf9ec962bee9b3e37abcaa0bc0ec940b05efdc1d1a5a4d9e2fdbcc08b7bdd LICENSE diff --git a/package/libecoli/libecoli.mk b/package/libecoli/libecoli.mk new file mode 100644 index 0000000000..ad4fa62914 --- /dev/null +++ b/package/libecoli/libecoli.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# libecoli +# +################################################################################ + +LIBECOLI_VERSION = 0.8.0 +LIBECOLI_SITE = $(call github,rjarry,libecoli,v$(LIBECOLI_VERSION)) +LIBECOLI_INSTALL_STAGING = YES +LIBECOLI_LICENSE = BSD-3-Clause +LIBECOLI_LICENSE_FILES = LICENSE + +LIBECOLI_DEPENDENCIES = \ + host-pkgconf \ + libedit + +LIBECOLI_CONF_OPTS = \ + -Ddoc=disabled \ + -Deditline=enabled \ + -Dexamples=disabled \ + -Dyaml=disabled \ + -Dtests=disabled + +$(eval $(meson-package)) diff --git a/package/libedit/libedit.hash b/package/libedit/libedit.hash index c2ed7f773f..08eb889ee2 100644 --- a/package/libedit/libedit.hash +++ b/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad libedit-20230828-3.1.tar.gz +sha256 23792701694550a53720630cd1cd6167101b5773adddcb4104f7345b73a568ac libedit-20250104-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 98e29a9b1a..9b480958d3 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20230828-3.1 +LIBEDIT_VERSION = 20250104-3.1 LIBEDIT_SITE = https://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses diff --git a/package/libesmtp/libesmtp.hash b/package/libesmtp/libesmtp.hash index 596ed4eaca..e13616d8f8 100644 --- a/package/libesmtp/libesmtp.hash +++ b/package/libesmtp/libesmtp.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3 libesmtp-1.1.0.tar.gz +sha256 144aece0077db6a2bd655d3d9558c714c9defd30a2d52c6e85ed54457d712daf libesmtp-v1.1.0-14-g335ee8d2fa5cb7d30db7b818ec05563ad139ee2f.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING.GPL sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 LICENSE diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index 6456e83e10..5e0b65ce91 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBESMTP_VERSION = 1.1.0 -LIBESMTP_SITE = $(call github,libesmtp,libESMTP,v$(LIBESMTP_VERSION)) +LIBESMTP_VERSION = v1.1.0-14-g335ee8d2fa5cb7d30db7b818ec05563ad139ee2f +LIBESMTP_SITE = $(call github,libesmtp,libESMTP,$(LIBESMTP_VERSION)) LIBESMTP_INSTALL_STAGING = YES LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBESMTP_LICENSE_FILES = COPYING.GPL LICENSE -LIBESMTP_CPE_ID_VALID = YES +LIBESMTP_CPE_ID_VERSION = 1.1.0 ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBESMTP_CONF_OPTS += -Dtls=enabled diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index acaedfad56..3fe609d78a 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2023-May/001585.html -sha256 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36 libevdev-1.13.1.tar.xz -sha512 9b75bad4bc13948854c8dff7a7a46aca6c06d1410ccb000f881bf76055ccac040595c3b24fb1a574be875b5c262eb86820b9ec3383752641bc2047135e5a412f libevdev-1.13.1.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2025-October/001593.html +sha256 89918ae7b7c13936e6482604a77a2bfbbb74544c5d039fde01c3fa1bdf639987 libevdev-1.13.5.tar.xz +sha512 2ca066235c9d6729e965e2df1df192285b3d41a20aeb2bc4eb21d14dc469198d5270d1cd900dee0b6cf1bdf9efd3c47ec310bfbd9e4965b3bcc3ef440efba604 libevdev-1.13.5.tar.xz # Hash for license files: sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index b0cf6c9ba8..24bd1609da 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.13.1 +LIBEVDEV_VERSION = 1.13.5 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = MIT diff --git a/package/libexif/libexif.hash b/package/libexif/libexif.hash index 0d082aedb0..9e95e27f3e 100644 --- a/package/libexif/libexif.hash +++ b/package/libexif/libexif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae libexif-0.6.24.tar.bz2 +sha256 7c9eba99aed3e6594d8c3e85861f1c6aaf450c218621528bc989d3b3e7a26307 libexif-0.6.25.tar.bz2 sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index 858901f40e..0e50d78fbe 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEXIF_VERSION = 0.6.24 +LIBEXIF_VERSION = 0.6.25 LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2 LIBEXIF_SITE = \ https://github.com/libexif/libexif/releases/download/v$(LIBEXIF_VERSION) diff --git a/package/libfcgi/libfcgi.hash b/package/libfcgi/libfcgi.hash index 83860a4f3d..348b0b6867 100644 --- a/package/libfcgi/libfcgi.hash +++ b/package/libfcgi/libfcgi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc libfcgi-2.4.2.tar.gz -sha256 f0a8fe4513a43e8eebb24cdcf9d2e7efc52e4d8259178c6d76d3d84418397d81 LICENSE.TERMS +sha256 39af4fb21a6d695a5f0b1c4fa95776d2725f6bc6c77680943a2ab314acd505c1 libfcgi-2.4.6.tar.gz +sha256 f0a8fe4513a43e8eebb24cdcf9d2e7efc52e4d8259178c6d76d3d84418397d81 LICENSE diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk index ee61c22c45..e0ef6da55c 100644 --- a/package/libfcgi/libfcgi.mk +++ b/package/libfcgi/libfcgi.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBFCGI_VERSION = 2.4.2 +LIBFCGI_VERSION = 2.4.6 LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION)) LIBFCGI_LICENSE = OML -LIBFCGI_LICENSE_FILES = LICENSE.TERMS +LIBFCGI_LICENSE_FILES = LICENSE LIBFCGI_CPE_ID_VENDOR = fastcgi LIBFCGI_CPE_ID_PRODUCT = fcgi LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES +LIBFCGI_CONF_OPTS = --disable-examples $(eval $(autotools-package)) diff --git a/package/libffi/0002-arc-Fix-warnings.patch b/package/libffi/0002-arc-Fix-warnings.patch deleted file mode 100644 index 45a2c9dbd7..0000000000 --- a/package/libffi/0002-arc-Fix-warnings.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4f25e5be1a8a429b6925527c1cb94b6acd05642b Mon Sep 17 00:00:00 2001 -From: Yuriy Kolerov -Date: Wed, 17 Jul 2024 18:56:52 +0300 -Subject: [PATCH] arc: Fix warnings - -These warnings are fixed: - -1. A series of "unused variables". -2. Implicit conversion from a pointer to uint32_t. - -Signed-off-by: Yuriy Kolerov -Upstream: https://github.com/libffi/libffi/pull/844 -Signed-off-by: Thomas Petazzoni ---- - src/arc/ffi.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/arc/ffi.c b/src/arc/ffi.c -index d729274..0632319 100644 ---- a/src/arc/ffi.c -+++ b/src/arc/ffi.c -@@ -192,9 +192,10 @@ static void unmarshal_atom(call_builder *cb, int type, void *data) { - /* for arguments passed by reference returns the pointer, otherwise the arg is copied (up to MAXCOPYARG bytes) */ - static void *unmarshal(call_builder *cb, ffi_type *type, int var, void *data) { - size_t realign[2]; -- void *pointer; - - #if defined(__ARC64_ARCH64__) -+ void *pointer; -+ - if (type->size > 2 * __SIZEOF_POINTER__) { - /* pass by reference */ - unmarshal_atom(cb, FFI_TYPE_POINTER, (char*)&pointer); -@@ -348,7 +349,10 @@ ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif, - void *user_data, void *codeloc) - { - uint32_t *tramp = (uint32_t *) & (closure->tramp[0]); -+ -+#if defined(__ARC64_ARCH64__) - size_t address_ffi_closure = (size_t) ffi_closure_asm; -+#endif - - switch (cif->abi) - { -@@ -367,7 +371,7 @@ ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif, - FFI_ASSERT (tramp == codeloc); - tramp[0] = CODE_ENDIAN (0x200a1fc0); /* mov r8, pcl */ - tramp[1] = CODE_ENDIAN (0x20200f80); /* j [long imm] */ -- tramp[2] = CODE_ENDIAN (ffi_closure_asm); -+ tramp[2] = CODE_ENDIAN ((uint32_t) ffi_closure_asm); - break; - #endif - --- -2.46.0 - diff --git a/package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch b/package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch deleted file mode 100644 index 3577ddf19d..0000000000 --- a/package/libffi/0003-arc-Do-not-use-mov_s-and-movl_s-instructions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 97c273519e41a7ef2841cb7531c6eda01fc69dc2 Mon Sep 17 00:00:00 2001 -From: Yuriy Kolerov -Date: Wed, 17 Jul 2024 19:19:30 +0300 -Subject: [PATCH] arc: Do not use mov_s and movl_s instructions - -mov_s and movl_s instructions use a restricted set of registers. -However, a list of available registers for such instructions for -one ARC target may not match a list for another ARC targets. For -example, it is applicable to ARC700 and ARC HS3x/4x - build -fails because mov_s formats may be incompatible in some cases. - -The easiest and the most straightforward way to fix this issue -is to use mov and movl instead of mov_s and movl_s. - -Signed-off-by: Yuriy Kolerov -Upstream: https://github.com/libffi/libffi/pull/844 -Signed-off-by: Thomas Petazzoni ---- - src/arc/arcompact.S | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/arc/arcompact.S b/src/arc/arcompact.S -index 1d7f1a1..e749341 100644 ---- a/src/arc/arcompact.S -+++ b/src/arc/arcompact.S -@@ -39,14 +39,14 @@ - #define LARG ldl - #define SARG stl - #define ADDPTR addl --#define MOVPTR movl_s -+#define MOVPTR movl - #else - #define PTRS 4 - #define FLTS 4 - #define LARG ld - #define SARG st - #define ADDPTR add --#define MOVPTR mov_s -+#define MOVPTR mov - #endif - - #define FRAME_LEN (8 * PTRS + 16) --- -2.46.0 - diff --git a/package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch b/package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch deleted file mode 100644 index f3a7b29e3b..0000000000 --- a/package/libffi/0004-src-or1k-ffi.c-fix-prototype-of-ffi_call_SYSV.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4506e943289ed1363f3921bc201d5da76f750229 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 17 Aug 2024 12:56:22 +0200 -Subject: [PATCH] src/or1k/ffi.c: fix prototype of ffi_call_SYSV() - -The current code base of libffi on OpenRISC (or1k) fails to build with -GCC 14.x with the following error: - -../src/or1k/ffi.c: In function 'ffi_call': -../src/or1k/ffi.c:167:34: error: passing argument 3 of 'ffi_call_SYSV' from incompatible pointer type [-Wincompatible-pointer-types] - 167 | ffi_call_SYSV(size, &ecif, ffi_prep_args, rvalue, fn, cif->flags); - | ^~~~~~~~~~~~~ - | | - | void * (*)(char *, extended_cif *) -../src/or1k/ffi.c:113:27: note: expected 'void * (*)(int *, extended_cif *)' but argument is of type 'void * (*)(char *, extended_cif *)' - 113 | void *(*)(int *, extended_cif *), - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This is due to the fact that ffi_prep_args() is in fact defined as: - - void* ffi_prep_args(char *stack, extended_cif *ecif) - -so, let's fix the prototype of the function pointer, which anyway gets -passed to assembly code, so the typing gets lost. - -Upstream: https://github.com/libffi/libffi/pull/854 -Signed-off-by: Thomas Petazzoni ---- - src/or1k/ffi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/or1k/ffi.c b/src/or1k/ffi.c -index 9451d4e..157388e 100644 ---- a/src/or1k/ffi.c -+++ b/src/or1k/ffi.c -@@ -110,7 +110,7 @@ void* ffi_prep_args(char *stack, extended_cif *ecif) - - extern void ffi_call_SYSV(unsigned, - extended_cif *, -- void *(*)(int *, extended_cif *), -+ void *(*)(char *, extended_cif *), - unsigned *, - void (*fn)(void), - unsigned); --- -2.46.0 - diff --git a/package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch b/package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch deleted file mode 100644 index e1ff003500..0000000000 --- a/package/libffi/0005-src-or1k-ffi.c-fix-incompatible-pointer-type.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ec39b03d891a77552ad7729ff79bf21bf3591842 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 17 Aug 2024 13:52:45 +0200 -Subject: [PATCH] src/or1k/ffi.c: fix incompatible pointer type - -The current code base of libffi on OpenRISC (or1k) fails to build with -GCC 14.x with the following error: - -../src/or1k/ffi.c: In function 'ffi_closure_SYSV': -../src/or1k/ffi.c:183:22: error: initialization of 'char *' from incompatible pointer type 'int *' [-Wincompatible-pointer-types] - 183 | char *stack_args = sp; - | ^~ - -Indeed: - - register int *sp __asm__ ("r17"); - [..] - char *stack_args = sp; - -Adopt the same logic used for: - - char *ptr = (char *) register_args; - -which consists in casting to the desired pointer type. Indeed, later -in the code stack_args is assigned to ptr (so they need to be the same -pointer type), and some arithmetic is done on ptr, so changing its -pointer type would change the behavior. - -Upstream: https://github.com/libffi/libffi/pull/854 -Signed-off-by: Thomas Petazzoni ---- - src/or1k/ffi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/or1k/ffi.c b/src/or1k/ffi.c -index 157388e..7a6d28c 100644 ---- a/src/or1k/ffi.c -+++ b/src/or1k/ffi.c -@@ -180,7 +180,7 @@ void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5, - register int *r13 __asm__ ("r13"); - - ffi_closure* closure = (ffi_closure*) r13; -- char *stack_args = sp; -+ char *stack_args = (char*) sp; - - /* Lay the register arguments down in a continuous chunk of memory. */ - unsigned register_args[6] = --- -2.46.0 - diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash index c2ef588f6b..75be5bbcef 100644 --- a/package/libffi/libffi.hash +++ b/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e libffi-3.4.6.tar.gz +sha256 bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b libffi-3.4.8.tar.gz # License files, locally calculated sha256 67894089811f93fca47a76f85e017da6f8582d4ba0905963c6e0f1ad6df7a195 LICENSE diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 9c47cf3973..7ea61dac1e 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFFI_VERSION = 3.4.6 +LIBFFI_VERSION = 3.4.8 LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT diff --git a/package/libfm/Config.in b/package/libfm/Config.in index e78bc99b76..9537a723ff 100644 --- a/package/libfm/Config.in +++ b/package/libfm/Config.in @@ -1,15 +1,19 @@ config BR2_PACKAGE_LIBFM bool "libfm" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # libgtk3 + depends on BR2_USE_WCHAR # libgtk3, libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3, libglib2 + depends on BR2_USE_MMU # libgtk3, libglib2 + depends on BR2_INSTALL_LIBSTDCPP # libgtk3 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk3 + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libgtk3 + depends on BR2_PACKAGE_XORG7 # libgtk3-x11 + depends on BR2_PACKAGE_HAS_LIBGL # libgtk3-x11 select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 + select BR2_PACKAGE_LIBGTK3 + select BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_MENU_CACHE help A glib/gio-based library providing some file management @@ -22,9 +26,15 @@ config BR2_PACKAGE_LIBFM http://wiki.lxde.org/en/Libfm -comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9" +comment "libfm a toolchain w/ wchar, threads, C++, gcc >= 4.9" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +comment "libfm needs X.org with an OpenGL backend" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_HAS_LIBGL diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk index 29f6d7d56a..419fce59d8 100644 --- a/package/libfm/libfm.mk +++ b/package/libfm/libfm.mk @@ -7,12 +7,13 @@ LIBFM_VERSION = 1.3.2 LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files -LIBFM_DEPENDENCIES = menu-cache libglib2 cairo +LIBFM_DEPENDENCIES = menu-cache libglib2 cairo libgtk3 LIBFM_LICENSE = GPL-2.0+, LGPL-2.1+ LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c LIBFM_INSTALL_STAGING = YES # We're patching src/modules/Makefile.am LIBFM_AUTORECONF = YES +LIBFM_CONF_OPTS = --with-gtk=3 ifeq ($(BR2_PACKAGE_LIBEXIF),y) LIBFM_CONF_OPTS += --enable-exif @@ -21,12 +22,4 @@ else LIBFM_CONF_OPTS += --disable-exif endif -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBFM_CONF_OPTS += --with-gtk=3 -LIBFM_DEPENDENCIES += libgtk3 -else -LIBFM_CONF_OPTS += --with-gtk=2 -LIBFM_DEPENDENCIES += libgtk2 -endif - $(eval $(autotools-package)) diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index 249a780f04..1697fb1bdc 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec freeglut-3.4.0.tar.gz +sha256 674dcaff25010e09e450aec458b8870d9e98c46f99538db457ab659b321d9989 freeglut-3.8.0.tar.gz sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 09309aeceb..cf8af6f0f8 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.4.0 +LIBFREEGLUT_VERSION = 3.8.0 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz LIBFREEGLUT_SITE = https://github.com/FreeGLUTProject/freeglut/releases/download/v$(LIBFREEGLUT_VERSION) LIBFREEGLUT_LICENSE = MIT diff --git a/package/libfreeimage/0005-jxrlib-ftbfs-with-GCC-14.patch b/package/libfreeimage/0005-jxrlib-ftbfs-with-GCC-14.patch new file mode 100644 index 0000000000..1c82c6eba7 --- /dev/null +++ b/package/libfreeimage/0005-jxrlib-ftbfs-with-GCC-14.patch @@ -0,0 +1,40 @@ +From 11383a017e8d040f1376c964d2b8769108204f0b Mon Sep 17 00:00:00 2001 +From: YOKOTA Hiroshi +Date: Thu, 25 Jul 2024 15:03:31 +0900 +Subject: [PATCH] jxrlib: ftbfs with GCC-14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug-Debian: https://bugs.debian.org/1075105 + +_byteswap_ulong() is defined in image/sys/strcodec.c + +Upstream: Bug submitted at https://sourceforge.net/p/freeimage/bugs/389/ +[Thomas: patch taken from https://sources.debian.org/patches/jxrlib/1.2~git20170615.f752187-5.3/0013-jxrlib-ftbfs-with-GCC-14.patch/] +Signed-off-by: Thomas Petazzoni +---- +/usr/bin/cc -DDISABLE_PERF_MEASUREMENT -D__ANSI__ -Djpegxr_EXPORTS -I"/<>/common/include" -I"/<>/image/sys" -I"/<>/jxrgluelib" -I"/<>/jxrtestlib" -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -Wall -Wextra -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -w -MD -MT CMakeFiles/jpegxr.dir/image/encode/strenc.c.o -MF CMakeFiles/jpegxr.dir/image/encode/strenc.c.o.d -o CMakeFiles/jpegxr.dir/image/encode/strenc.c.o -c "/<>/image/encode/strenc.c" +/<>/image/decode/segdec.c: In function ‘_load4’: +/<>/image/decode/segdec.c:68:12: error: implicit declaration of function ‘_byteswap_ulong’ [-Wimplicit-function-declaration] + 68 | return _byteswap_ulong(v); + | ^~~~~~~~~~~~~~~ +--- + Source/LibJXR/image/decode/segdec.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/LibJXR/image/decode/segdec.c b/Source/LibJXR/image/decode/segdec.c +index 1299458..8050355 100644 +--- a/Source/LibJXR/image/decode/segdec.c ++++ b/Source/LibJXR/image/decode/segdec.c +@@ -63,6 +63,7 @@ static U32 _FORCEINLINE _load4(void* pv) + v |= ((U32)((U16 *) pv)[1]) << 16; + return _byteswap_ulong(v); + #else // _M_IA64 ++ U32 _byteswap_ulong(U32 bits); // from image/sys/strcodec.c + return _byteswap_ulong(*(U32*)pv); + #endif // _M_IA64 + #endif // _BIG__ENDIAN_ +-- +2.51.0 + diff --git a/package/libfreeimage/0006-FTBFS-fix-for-function-prototype-error.patch b/package/libfreeimage/0006-FTBFS-fix-for-function-prototype-error.patch new file mode 100644 index 0000000000..353631798a --- /dev/null +++ b/package/libfreeimage/0006-FTBFS-fix-for-function-prototype-error.patch @@ -0,0 +1,29 @@ +From 7b59b3757521d82406771cc47127aa70ffb26f3f Mon Sep 17 00:00:00 2001 +From: YOKOTA Hiroshi +Date: Thu, 25 Jul 2024 16:01:01 +0900 +Subject: [PATCH] FTBFS fix for function prototype error + +Bug-Debian: https://bugs.debian.org/1075105 + +Upstream: Bug submitted at https://sourceforge.net/p/freeimage/bugs/389/ +[Thomas: patch taken from https://sources.debian.org/patches/jxrlib/1.2~git20170615.f752187-5.3/0015-FTBFS-fix-for-function-prototype-error.patch/] +Signed-off-by: Thomas Petazzoni +--- + Source/LibJXR/jxrgluelib/JXRGlueJxr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/LibJXR/jxrgluelib/JXRGlueJxr.c b/Source/LibJXR/jxrgluelib/JXRGlueJxr.c +index 2bf085a..182fc7f 100644 +--- a/Source/LibJXR/jxrgluelib/JXRGlueJxr.c ++++ b/Source/LibJXR/jxrgluelib/JXRGlueJxr.c +@@ -28,6 +28,7 @@ + //*@@@---@@@@****************************************************************** + #include + #include ++#include + + + static const char szHDPhotoFormat[] = "image/vnd.ms-photo"; +-- +2.51.0 + diff --git a/package/libftdi1/libftdi1.hash b/package/libftdi1/libftdi1.hash index 6b825e8d88..e110da6b5b 100644 --- a/package/libftdi1/libftdi1.hash +++ b/package/libftdi1/libftdi1.hash @@ -1,6 +1,5 @@ -# Locally computed after checking the signature -# https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2.sig -sha256 7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049 libftdi1-1.5.tar.bz2 +# Locally computed +sha256 e85f1161d19f60b570751f3c8be334d309c710e5f77ef9afdc0eaa2c4fa73c95 libftdi1-v1.5-62-g5e67403c4fb5536a2effe2e91181dd73a2cff91b-git4.tar.gz # Hash for license files: sha256 524f46428bf72bb8c6acfeca4909551fd2e0bdbb5305406d38382f4056095c56 LICENSE diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index 66798addc4..31ffa1aca3 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBFTDI1_VERSION = 1.5 -LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 -LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download +LIBFTDI1_VERSION = v1.5-62-g5e67403c4fb5536a2effe2e91181dd73a2cff91b +LIBFTDI1_SITE = git://developer.intra2net.com/libftdi LIBFTDI1_INSTALL_STAGING = YES LIBFTDI1_DEPENDENCIES = host-pkgconf libusb LIBFTDI1_LICENSE = LGPL-2.1 (libftdi1), MIT (libftdi1) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index 6f3b3ce122..1091dbd6c1 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 1bc306be1a1f4f6c8965fbdd79c9ccca021fdc4b277d501483a711cbd7dbcd6c libfuse3-3.16.2.tar.gz +sha256 dd21d1545c05e73ada594b93fe593351b7dbf10940fd93b934b9395513108b34 libfuse3-3.17.4.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index f5c9dae8f7..6a6111a065 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.16.2 +LIBFUSE3_VERSION = 3.17.4 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE @@ -18,6 +18,11 @@ LIBFUSE3_CONF_OPTS = \ -Duseroot=false \ -Dtests=false +# Uses __atomic_fetch_sub_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBFUSE3_LDFLAGS += -latomic +endif + define LIBFUSE3_DEVICES /dev/fuse c 666 0 0 10 229 0 0 - endef diff --git a/package/libg7221/libg7221.hash b/package/libg7221/libg7221.hash index c7a7755b4d..1d3bcc2b77 100644 --- a/package/libg7221/libg7221.hash +++ b/package/libg7221/libg7221.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 65942f84219f6586abc448e387f8c904777de64b3695449ac23132e4e9bde1d5 libg7221-dbfc29d4806ecdace50379a2f4d68a992a6fec34-git4.tar.gz +sha256 44ebe717888f1c4d65dd0f6abecbccd96b642c49f2e472e6436ec530582f6103 libg7221-97d7ff5cf508fb6584a43b9e0c09220f8765cb3b.tar.gz sha256 26cc5f718279b45dbe34e25a2d29b2c8ca487bd9ab11b2d68c9318ff59d5c645 COPYING diff --git a/package/libg7221/libg7221.mk b/package/libg7221/libg7221.mk index 813af11cee..0e62a9b1f4 100644 --- a/package/libg7221/libg7221.mk +++ b/package/libg7221/libg7221.mk @@ -4,10 +4,9 @@ # ################################################################################ -LIBG7221_VERSION = dbfc29d4806ecdace50379a2f4d68a992a6fec34 +LIBG7221_VERSION = 97d7ff5cf508fb6584a43b9e0c09220f8765cb3b # we use the FreeSwitch fork because it contains pkgconf support -LIBG7221_SITE = https://freeswitch.org/stash/scm/sd/libg7221.git -LIBG7221_SITE_METHOD = git +LIBG7221_SITE = $(call github,freeswitch,libg7221,$(LIBG7221_VERSION)) LIBG7221_LICENSE = Polycom LIBG7221_LICENSE_FILES = COPYING LIBG7221_AUTORECONF = YES diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index ced8087ca9..a170a1c827 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 dd2c68e0685bb99249efeeb06046fae15b5214ba libgcrypt-1.11.0.tar.bz2 -sha256 09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c libgcrypt-1.11.0.tar.bz2 +sha1 b0d3d966894a5ee3b629e55350464f69e1c7859e libgcrypt-1.11.2.tar.bz2 +sha256 6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac libgcrypt-1.11.2.tar.bz2 # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 57eca507b3..5c38e0e2db 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.11.0 +LIBGCRYPT_VERSION = 1.11.2 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index f733bf34a8..1ece69d4af 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libgee/0.20/libgee-0.20.6.sha256sum -sha256 1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d libgee-0.20.6.tar.xz +# From https://download.gnome.org/sources/libgee/0.20/libgee-0.20.8.sha256sum +sha256 189815ac143d89867193b0c52b7dc31f3aa108a15f04d6b5dca2b6adfad0b0ee libgee-0.20.8.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 36eddef171..aad829ea06 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).6 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).8 LIBGEE_SITE = https://download.gnome.org/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 diff --git a/package/libgeos/0001-geosop-make-floating-point-exceptions-optional.patch b/package/libgeos/0001-geosop-make-floating-point-exceptions-optional.patch new file mode 100644 index 0000000000..6adcd39861 --- /dev/null +++ b/package/libgeos/0001-geosop-make-floating-point-exceptions-optional.patch @@ -0,0 +1,71 @@ +From a6bac7bd506988085fa692ff2e12727ae0e9db84 Mon Sep 17 00:00:00 2001 +From: Maxim Kochetkov +Date: Mon, 15 Sep 2025 17:16:08 +0300 +Subject: [PATCH] geosop: make floating-point exceptions optional + +commit 26292ce ("geosop: show most floating-point exceptions in verbose mode") +add fenv.h dependency. Some libc implementations (uclibc-ng )may have no fenv +support. So make floating-point exceptions optional and detetct fenv.h at +configure stage. + +Upstream: https://github.com/libgeos/geos/pull/1305 +Signed-off-by: Maxim Kochetkov +--- + CMakeLists.txt | 7 +++++++ + util/geosop/GeosOp.cpp | 6 ++++++ + 2 files changed, 13 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12411e586..a1e2f0c6e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -558,3 +558,10 @@ if(PROJECT_IS_TOP_LEVEL) + + unset(_is_multi_config_generator) + endif() # PROJECT_IS_TOP_LEVEL ++ ++include(CheckIncludeFile) ++check_include_file(fenv.h HAVE_FENV_H) ++ ++if(HAVE_FENV_H) ++ target_compile_definitions(geos_cxx_flags INTERFACE HAVE_FENV) ++endif() +diff --git a/util/geosop/GeosOp.cpp b/util/geosop/GeosOp.cpp +index 2cb17f000..05307cf30 100644 +--- a/util/geosop/GeosOp.cpp ++++ b/util/geosop/GeosOp.cpp +@@ -26,7 +26,9 @@ + #include + #include + ++#if defined(HAVE_FENV) + #include ++#endif + #include + #include + #include +@@ -394,10 +396,13 @@ void GeosOp::run(OpArguments& opArgs) { + //------------------------ + + try { ++#if defined(HAVE_FENV) + std::feclearexcept(FE_ALL_EXCEPT); // clear floating-point status flags ++#endif + + execute(op, opArgs); + ++#if defined(HAVE_FENV) + // Catch everything except for FE_INEXACT, which is usually harmless + const int fpexp = std::fetestexcept(FE_ALL_EXCEPT ^ FE_INEXACT); + if (args.isVerbose && (fpexp != 0)) { +@@ -414,6 +419,7 @@ void GeosOp::run(OpArguments& opArgs) { + std::cerr << " FE_UNDERFLOW"; + std::cerr << std::endl; + } ++#endif + } + catch (std::exception &e) { + std::cerr << "Run-time exception: " << e.what() << std::endl; +-- +2.51.0 + diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 76cbb9bdcd..ff88f7254d 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -13,7 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 7, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 36f47cd523..538933873b 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 47ec83ff334d672b9e4426695f15da6e6368244214971fabf386ff8ef6df39e4 geos-3.13.0.tar.bz2 +sha256 fe85286b1977121894794b36a7464d05049361bedabf972e70d8f9bf1e3ce928 geos-3.14.0.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index beb2c077c4..0de73e2688 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.13.0 +LIBGEOS_VERSION = 3.14.0 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash index 3165994bfd..e81f15ea0d 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba23a3a35980ed3de916e125c739251f8e3266be07540200125a307d7cf5a704 libgeotiff-1.7.3.tar.gz +sha256 c598d04fdf2ba25c4352844dafa81dde3f7fd968daa7ad131228cd91e9d3dc47 libgeotiff-1.7.4.tar.gz sha256 a822a731a7ac4ba7d8f18fa0dc29db2e68a5dcfc315b46e4a4c8956720d55d93 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index 126d61cb1a..f6f7832d60 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.7.3 +LIBGEOTIFF_VERSION = 1.7.4 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = MIT, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 536a0b7405..e8c155c994 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49d0fc50ab931816f6bfc1ac68f8d74b760450eebdb5374e803ee36550f26774 libgit2-1.8.4.tar.gz +sha256 6f097c82fc06ece4f40539fb17e9d41baf1a5a2fc26b1b8562d21b89bc355fe6 libgit2-1.9.2.tar.gz sha256 e3712465634e97cfd850822a4eb5ac7d2f8a10f753189366d5a2060046f28288 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 3bf3dbb647..34cb67929e 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.8.4 +LIBGIT2_VERSION = 1.9.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ diff --git a/package/libglade/Config.in b/package/libglade/Config.in deleted file mode 100644 index 8d0d26f159..0000000000 --- a/package/libglade/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBGLADE - bool "libglade" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBXML2 - help - Libglade allows you to load glade interface files in a program - at runtime. It doesn't require GLADE to be used, but GLADE is - by far the easiest way to create the interface files. - - https://download.gnome.org/sources/libglade/ - -comment "libglade needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_LIBGTK2 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libglade/libglade.hash b/package/libglade/libglade.hash deleted file mode 100644 index b04087e286..0000000000 --- a/package/libglade/libglade.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://download.gnome.org/sources/libglade/2.6/libglade-2.6.4.sha256sum -sha256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec libglade-2.6.4.tar.bz2 - -# Hash for license file: -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk deleted file mode 100644 index af73d8bd00..0000000000 --- a/package/libglade/libglade.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libglade -# -################################################################################ - -LIBGLADE_VERSION_MAJOR = 2.6 -LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 -LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 -LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) -LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 -LIBGLADE_LICENSE = LGPL-2.0+ -LIBGLADE_LICENSE_FILES = COPYING - -define LIBGLADE_INSTALL_FIX - rm -rf $(TARGET_DIR)/usr/share/xml/libglade \ - $(TARGET_DIR)/usr/bin/libglade-convert -endef - -LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX - -$(eval $(autotools-package)) diff --git a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch b/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch deleted file mode 100644 index 6075bacb06..0000000000 --- a/package/libglib2/0002-Fix-error-format-in-gio-gunixconnection.c-part-2.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 4ae8606b6f80f9764e1f0a82cea7e23c8af487ae Mon Sep 17 00:00:00 2001 -From: James Knight -Date: Thu, 20 Apr 2023 23:41:32 -0400 -Subject: [PATCH] Fix error format in gio/gunixconnection.c (part 2) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update a series of error messages to use `g_set_error_literal` instead -of `g_set_error`. This should prevent `format-nonliteral` compiler -issues when `-Werror` is configured: - - ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_fd’: - ../gio/gunixconnection.c:183:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] - 183 | nscm); - | ^~~~ - ../gio/gunixconnection.c:217:20: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] - 217 | nfd); - | ^~~ - ../gio/gunixconnection.c: In function ‘g_unix_connection_receive_credentials’: - ../gio/gunixconnection.c:601:24: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] - 601 | nscm); - | ^~~~ - -This is similar to a previous change [1] made to `gunixconnection.c`. - -[1]: 44b3d5d80445234041f6c59feb89645f7102c3a4 - -Signed-off-by: James Knight -Upstream: backport from upstream https://gitlab.gnome.org/GNOME/glib/-/commit/4ae8606b6f80f9764e1f0a82cea7e23c8af487ae ---- - gio/gunixconnection.c | 31 ++++++++++++++----------------- - 1 file changed, 14 insertions(+), 17 deletions(-) - -diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c -index b3f2b1c04b0abdf7136918585ae4cea8970a88bb..c012fcbfe00b69e9da609c7b626229db98e931ac 100644 ---- a/gio/gunixconnection.c -+++ b/gio/gunixconnection.c -@@ -176,11 +176,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection, - { - gint i; - -- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -- ngettext("Expecting 1 control message, got %d", -- "Expecting 1 control message, got %d", -- nscm), -- nscm); -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, -+ ngettext ("Expecting 1 control message, got %d", -+ "Expecting 1 control message, got %d", -+ nscm)); - - for (i = 0; i < nscm; i++) - g_object_unref (scms[i]); -@@ -210,11 +209,10 @@ g_unix_connection_receive_fd (GUnixConnection *connection, - { - gint i; - -- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -- ngettext("Expecting one fd, but got %d\n", -- "Expecting one fd, but got %d\n", -- nfd), -- nfd); -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, -+ ngettext ("Expecting one fd, but got %d\n", -+ "Expecting one fd, but got %d\n", -+ nfd)); - - for (i = 0; i < nfd; i++) - close (fds[i]); -@@ -592,13 +590,12 @@ g_unix_connection_receive_credentials (GUnixConnection *connection, - { - if (nscm != 1) - { -- g_set_error (error, -- G_IO_ERROR, -- G_IO_ERROR_FAILED, -- ngettext("Expecting 1 control message, got %d", -- "Expecting 1 control message, got %d", -- nscm), -- nscm); -+ g_set_error_literal (error, -+ G_IO_ERROR, -+ G_IO_ERROR_FAILED, -+ ngettext ("Expecting 1 control message, got %d", -+ "Expecting 1 control message, got %d", -+ nscm)); - goto out; - } - --- -2.39.1.windows.1 - diff --git a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch b/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch deleted file mode 100644 index 0fa15ad164..0000000000 --- a/package/libglib2/0003-meson-wrap-html-documentation-generation-with-gtk_do.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d Mon Sep 17 00:00:00 2001 -From: James Knight -Date: Thu, 27 Apr 2023 20:23:30 -0400 -Subject: [PATCH] meson: wrap html documentation generation with gtk_doc option - -By default, if a host environment has the `rst2html5` application -available, builds will automatically perform some HTML documentation -generation from the documentation's glib reference content (e.g. -creating `gvariant-specification-1.0.html`). The creation of this -documentation is not required for all use cases. - -This commit tweaks the building of the HTML-based GLIB specification -document to be guarded by `gtk_doc`. - -Signed-off-by: James Knight -Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/0fa17ec3c7152cf0e1cbf965acf1426ac203bb1d -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - docs/reference/glib/meson.build | 58 +++++++++++++++++---------------- - 1 file changed, 30 insertions(+), 28 deletions(-) - -diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build -index 114de49da..3cfff2f0b 100644 ---- a/docs/reference/glib/meson.build -+++ b/docs/reference/glib/meson.build -@@ -113,35 +113,37 @@ if get_option('man') - endforeach - endif - --# GVariant specification is currently standalone --rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) -+if get_option('gtk_doc') -+ # GVariant specification is currently standalone -+ rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) - --if rst2html5.found() -- spec_path = glib_datadir / 'doc' / 'glib-2.0' -+ if rst2html5.found() -+ spec_path = glib_datadir / 'doc' / 'glib-2.0' - -- figures = files( -- 'gvariant-byte-boundaries.svg', -- 'gvariant-integer-and-string-structure.svg', -- 'gvariant-integer-array.svg', -- 'gvariant-string-array.svg', -- ) -+ figures = files( -+ 'gvariant-byte-boundaries.svg', -+ 'gvariant-integer-and-string-structure.svg', -+ 'gvariant-integer-array.svg', -+ 'gvariant-string-array.svg', -+ ) - -- custom_target('gvariant-specification-1.0', -- input: 'gvariant-specification-1.0.rst', -- output: 'gvariant-specification-1.0.html', -- command: [ -- rst2html5, -- '@INPUT@', -- ], -- capture: true, -- install: true, -- install_dir: spec_path, -- install_tag: 'doc', -- depend_files: figures, -- ) -+ custom_target('gvariant-specification-1.0', -+ input: 'gvariant-specification-1.0.rst', -+ output: 'gvariant-specification-1.0.html', -+ command: [ -+ rst2html5, -+ '@INPUT@', -+ ], -+ capture: true, -+ install: true, -+ install_dir: spec_path, -+ install_tag: 'doc', -+ depend_files: figures, -+ ) - -- install_data(figures, -- install_dir : spec_path, -- install_tag : 'doc', -- ) --endif -\ No newline at end of file -+ install_data(figures, -+ install_dir : spec_path, -+ install_tag : 'doc', -+ ) -+ endif -+endif --- -2.25.1 - diff --git a/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch b/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch deleted file mode 100644 index 57404705d0..0000000000 --- a/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2ca9f53327308e85e376bcbef7f8259a6331a453 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Thu, 8 Sep 2022 02:36:33 +0530 -Subject: [PATCH] meson: Fix detection of a system-provided proxy-libintl - -proxy-libintl defines ngettext() as a define in the header that points -to the actual symbol in the library which is g_libintl_ngettext(). -Same with bind_textdomain_codeset(). - -Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/32249a22fc39319651e7c23442d37ec837f05764 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 0cbc9689f..de0bee5a3 100644 ---- a/meson.build -+++ b/meson.build -@@ -2089,6 +2089,7 @@ libz_dep = dependency('zlib') - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible - # implementations. This could be extended if issues are found in some platforms. - libintl_deps = [] -+libintl_prefix = '#include ' - libintl = dependency('intl', required: false, allow_fallback: false) - if libintl.found() - # libintl supports different threading APIs, which may not -@@ -2100,11 +2101,11 @@ if libintl.found() - # - # Meson's builtin dependency lookup as of 0.60.0 doesn't check for - # pthread, so we do this manually here. -- if cc.has_function('ngettext', dependencies : libintl) -+ if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) - libintl_deps += [libintl] - else - libintl_pthread = cc.find_library('pthread', required : false) -- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) -+ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) - libintl_deps += [libintl, libintl_pthread] - else - libintl = disabler() -@@ -2113,7 +2114,7 @@ if libintl.found() - endif - - if libintl.found() -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) -+ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix) - else - libintl = dependency('intl', allow_fallback: true) - assert(libintl.type_name() == 'internal') --- -2.34.1 - diff --git a/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch b/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch deleted file mode 100644 index a342ee95d6..0000000000 --- a/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch +++ /dev/null @@ -1,53 +0,0 @@ -From fe7f54d4f339b7948c961b60729f620f2eaec716 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 23 May 2023 23:42:37 +0200 -Subject: [PATCH] meson: try iconv in libintl lookup -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This was originally removed in !2734 but still appears to be required for -some MinGW setups, such as the `x86_64-w64-mingw32.static` target in -[mxe](https://github.com/mxe/mxe). - -Currently, this configuration fails the libintl internal assert on line -2128, as on this platform `ngettext()` is only found inside libiconv. - -This commit will look up iconv potentially twice, once as `libiconv` and -potentially once as `libintl_iconv`. This is what the code did before -!2734 landed, so it’s known to work reliably on a number of platforms. - -Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index de0bee5a3..653f9eddf 100644 ---- a/meson.build -+++ b/meson.build -@@ -2104,11 +2104,16 @@ if libintl.found() - if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) - libintl_deps += [libintl] - else -- libintl_pthread = cc.find_library('pthread', required : false) -- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) -- libintl_deps += [libintl, libintl_pthread] -+ libintl_iconv = cc.find_library('iconv', required : false) -+ if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv]) -+ libintl_deps += [libintl, libintl_iconv] - else -- libintl = disabler() -+ libintl_pthread = cc.find_library('pthread', required : false) -+ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) -+ libintl_deps += [libintl, libintl_pthread] -+ else -+ libintl = disabler() -+ endif - endif - endif - endif --- -2.34.1 - diff --git a/package/libglib2/0006-link-with-latomic-when-needed.patch b/package/libglib2/0006-link-with-latomic-when-needed.patch deleted file mode 100644 index 3b5a071010..0000000000 --- a/package/libglib2/0006-link-with-latomic-when-needed.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4e6dc4dee0e1c6407113597180d9616b4f275f94 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 2 May 2024 14:02:17 +0200 -Subject: [PATCH] link with -latomic when needed - -Some architecture such as sparc and some flavors of arm needs -latomic -to avoid the following build failure: - -gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' - -Signed-off-by: Fabrice Fontaine -Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/4e6dc4dee0e1c6407113597180d9616b4f275f94 ---- - glib/meson.build | 1 + - meson.build | 9 +++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/glib/meson.build b/glib/meson.build -index 24cbb664d4..b2dd569e1e 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -419,6 +419,7 @@ libglib = library('glib-2.0', - include_directories : configinc, - link_with: [charset_lib, gnulib_lib], - dependencies : [ -+ atomic_dep, - gnulib_libm_dependency, - libiconv, - libintl_deps, -diff --git a/meson.build b/meson.build -index 46c5aa200a..8b42940558 100644 ---- a/meson.build -+++ b/meson.build -@@ -2233,6 +2233,15 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') - - libz_dep = dependency('zlib') - -+libatomic_test_code = ''' -+ int main (int argc, char ** argv) { -+ return 0; -+ }''' -+atomic_dep = [] -+if cc.links(libatomic_test_code, args : '-latomic', name : 'check for -latomic') -+ atomic_dep = cc.find_library('atomic') -+endif -+ - # First check in libc, fallback to libintl, and as last chance build - # proxy-libintl subproject. - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible --- -2.44.0 - diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch similarity index 53% rename from package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch rename to package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index 8f87671167..c6135b15a1 100644 --- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/2.82.0/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -1,4 +1,4 @@ -From 03e9cae3f3a7e2bbd5110f1ce2739601571bc024 Mon Sep 17 00:00:00 2001 +From 3fcd5f431dee9909b6bcbd9b8b61d4b1fe4b5f92 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 18:01:05 +0100 Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc @@ -16,6 +16,8 @@ Fixes: Signed-off-by: Fabrice Fontaine [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi +[Fiona: refresh for glib 2.80.4] +Signed-off-by: Fiona Klute (WIWA) Upstream: Never submitted --- gio/meson.build | 1 + @@ -23,29 +25,29 @@ Upstream: Never submitted 2 files changed, 2 insertions(+) diff --git a/gio/meson.build b/gio/meson.build -index 462606f3b56c..e6b736167b8d 100644 +index 59c2b0f..5120537 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -880,6 +880,7 @@ pkg.generate(libgio, - variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), - 'schemasdir=' + join_paths('${datadir}', schemas_subdir), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), -+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), - 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), +@@ -885,6 +885,7 @@ pkg.generate(libgio, + variables : [ + 'schemasdir=' + '${datadir}' / schemas_subdir, + 'dtdsdir=' + '${datadir}' / dtds_subdir, ++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), + 'giomoduledir=' + pkgconfig_giomodulesdir, + 'gio=' + '${bindir}' / 'gio', + 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', diff --git a/glib/meson.build b/glib/meson.build -index da76fc005e46..cde2edb197c7 100644 +index d2efeba..a69532b 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -441,6 +441,7 @@ pkg.generate(libglib, +@@ -447,6 +447,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, - variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), -+ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], + variables : [ ++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), + 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', + 'gobject_query=' + '${bindir}' / 'gobject-query', + 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', -- -2.43.0 +2.45.2 diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 077d7d66e8..a875203da7 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_HOST_QEMU if BR2_PACKAGE_GOBJECT_INTROSPECTION + select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE if BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE2 @@ -10,8 +12,10 @@ config BR2_PACKAGE_LIBGLIB2 help Low-level core library that forms the basis of GTK+ and GNOME. - http://www.gtk.org/ + https://www.gtk.org/ comment "libglib2 needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +source "package/libglib2/libglib2-bootstrap/Config.in" diff --git a/package/libglib2/libglib2-bootstrap/2.82.0 b/package/libglib2/libglib2-bootstrap/2.82.0 new file mode 120000 index 0000000000..28b180f102 --- /dev/null +++ b/package/libglib2/libglib2-bootstrap/2.82.0 @@ -0,0 +1 @@ +../2.82.0 \ No newline at end of file diff --git a/package/libglib2/libglib2-bootstrap/Config.in b/package/libglib2/libglib2-bootstrap/Config.in new file mode 100644 index 0000000000..189de9a4f2 --- /dev/null +++ b/package/libglib2/libglib2-bootstrap/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBGLIB2_BOOTSTRAP + bool + depends on BR2_USE_WCHAR # gettext + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_ZLIB diff --git a/package/libglib2/libglib2-bootstrap/libglib2-bootstrap.hash b/package/libglib2/libglib2-bootstrap/libglib2-bootstrap.hash new file mode 120000 index 0000000000..f182b8b6ec --- /dev/null +++ b/package/libglib2/libglib2-bootstrap/libglib2-bootstrap.hash @@ -0,0 +1 @@ +../libglib2.hash \ No newline at end of file diff --git a/package/libglib2/libglib2-bootstrap/libglib2-bootstrap.mk b/package/libglib2/libglib2-bootstrap/libglib2-bootstrap.mk new file mode 100644 index 0000000000..72a32bd825 --- /dev/null +++ b/package/libglib2/libglib2-bootstrap/libglib2-bootstrap.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# libglib2-bootstrap +# +################################################################################ + +# Since version 2.79.0 libglib2 needs gobject-introspection to build +# with introspection support. As gobject-introspection requires +# libglib2 to build this means a bootstrap process is needed, as +# described in the NEWS entry: +# +# 1. build libglib2 without introspection (this bootstrap package) +# 2. build build gobject-introspection +# 3. build libglib2 with introspection (the main libglib2 package). +# +# The bootstrap package is an implementation detail that nothing +# except gobject-introspection should depend on. + +LIBGLIB2_BOOTSTRAP_VERSION_MAJOR = $(LIBGLIB2_VERSION_MAJOR) +LIBGLIB2_BOOTSTRAP_VERSION = $(LIBGLIB2_VERSION) +LIBGLIB2_BOOTSTRAP_SOURCE = $(LIBGLIB2_SOURCE) +LIBGLIB2_BOOTSTRAP_SITE = $(LIBGLIB2_SITE) +LIBGLIB2_BOOTSTRAP_LICENSE = $(LIBGLIB2_LICENSE) +LIBGLIB2_BOOTSTRAP_LICENSE_FILES = $(LIBGLIB2_LICENSE_FILES) +LIBGLIB2_BOOTSTRAP_CPE_ID_VENDOR = $(LIBGLIB2_CPE_ID_VENDOR) +LIBGLIB2_BOOTSTRAP_CPE_ID_PRODUCT = $(LIBGLIB2_CPE_ID_PRODUCT) +LIBGLIB2_BOOTSTRAP_INSTALL_STAGING = YES +LIBGLIB2_BOOTSTRAP_DL_SUBDIR = libglib2 + +LIBGLIB2_BOOTSTRAP_CFLAGS = $(LIBGLIB2_CFLAGS) +LIBGLIB2_BOOTSTRAP_LDFLAGS = $(LIBGLIB2_LDFLAGS) + +LIBGLIB2_BOOTSTRAP_DEPENDENCIES = \ + libffi \ + pcre2 \ + zlib \ + $(TARGET_NLS_DEPENDENCIES) + +LIBGLIB2_BOOTSTRAP_CONF_OPTS = \ + -Dglib_debug=disabled \ + -Dlibelf=disabled \ + -Dgio_module_dir=/usr/lib/gio/modules \ + -Dtests=false \ + -Doss_fuzz=disabled \ + -Dintrospection=disabled \ + -Dselinux=disabled \ + -Dxattr=false \ + -Dlibmount=disabled + +LIBGLIB2_BOOTSTRAP_MESON_EXTRA_PROPERTIES = \ + have_c99_vsnprintf=true \ + have_c99_snprintf=true \ + have_unix98_printf=true + +LIBGLIB2_BOOTSTRAP_POST_INSTALL_TARGET_HOOKS = $(LIBGLIB2_POST_INSTALL_TARGET_HOOKS) + +HOST_LIBGLIB2_BOOTSTRAP_DEPENDENCIES = \ + host-gettext \ + host-libffi \ + host-pcre2 \ + host-pkgconf \ + host-util-linux \ + host-zlib + +HOST_LIBGLIB2_BOOTSTRAP_CONF_OPTS = \ + -Ddtrace=false \ + -Dglib_debug=disabled \ + -Dintrospection=disabled \ + -Dlibelf=disabled \ + -Dselinux=disabled \ + -Dsystemtap=false \ + -Dxattr=false \ + -Dtests=false \ + -Doss_fuzz=disabled + +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libglib2/libglib2-qemu-wrapper.in b/package/libglib2/libglib2-qemu-wrapper.in new file mode 100644 index 0000000000..7bfbd2eceb --- /dev/null +++ b/package/libglib2/libglib2-qemu-wrapper.in @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +# Pass -r to qemu-user as to trick glibc into not erroring out if the host kernel +# is older than the target kernel. +exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ + @QEMU_USERMODE_ARGS@ \ + -L "${STAGING_DIR}/" \ + -E LD_LIBRARY_PATH="${STAGING_DIR}/lib:${STAGING_DIR}/usr/lib/" \ + "$@" diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 07ed7635a6..e4b9a7c5ae 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.76/glib-2.76.1.sha256sum -sha256 43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f glib-2.76.1.tar.xz +# https://download.gnome.org/sources/glib/2.86/glib-2.86.1.sha256sum +sha256 119d1708ca022556d6d2989ee90ad1b82bd9c0d1667e066944a6d0020e2d5e57 glib-2.86.1.tar.xz # License files, locally calculated sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index c33df70b25..0957d946bc 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.76 +LIBGLIB2_VERSION_MAJOR = 2.86 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR) @@ -44,6 +44,13 @@ HOST_LIBGLIB2_DEPENDENCIES = \ host-util-linux \ host-zlib +ifeq ($(BR2_PACKAGE_HOST_GOBJECT_INTROSPECTION),y) +HOST_LIBGLIB2_CONF_OPTS += -Dintrospection=enabled +HOST_LIBGLIB2_DEPENDENCIES += host-gobject-introspection +else +HOST_LIBGLIB2_CONF_OPTS += -Dintrospection=disabled +endif + # We explicitly specify a giomodule-dir to avoid having a value # containing ${libdir} in gio-2.0.pc. Indeed, a value depending on # ${libdir} would be prefixed by the sysroot by pkg-config, causing a @@ -60,6 +67,24 @@ LIBGLIB2_MESON_EXTRA_PROPERTIES = \ have_c99_snprintf=true \ have_unix98_printf=true +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBGLIB2_CONF_OPTS += -Dintrospection=enabled +LIBGLIB2_DEPENDENCIES += gobject-introspection host-qemu +LIBGLIB2_MESON_EXTRA_BINARIES = exe_wrapper='$(@D)/libglib2-qemu-wrapper' +define LIBGLIB2_INSTALL_QEMUWARPPER + $(INSTALL) -D -m 755 $(LIBGLIB2_PKGDIR)/libglib2-qemu-wrapper.in \ + $(@D)/libglib2-qemu-wrapper + $(SED) 's%@QEMU_USER@%$(QEMU_USER)%g; \ + s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g; \ + s%@QEMU_USERMODE_ARGS@%$(call qstrip,$(BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS))%g; \ + ' \ + $(@D)/libglib2-qemu-wrapper +endef +LIBGLIB2_PRE_CONFIGURE_HOOKS += LIBGLIB2_INSTALL_QEMUWARPPER +else +LIBGLIB2_CONF_OPTS += -Dintrospection=disabled +endif + ifeq ($(BR2_PACKAGE_ELFUTILS),y) LIBGLIB2_DEPENDENCIES += elfutils endif @@ -138,3 +163,5 @@ $(eval $(meson-package)) $(eval $(host-meson-package)) LIBGLIB2_HOST_BINARY = $(HOST_DIR)/bin/glib-genmarshal + +include package/libglib2/libglib2-bootstrap/libglib2-bootstrap.mk diff --git a/package/libglvnd/libglvnd.hash b/package/libglvnd/libglvnd.hash index e463a8def5..a1a3f2614a 100644 --- a/package/libglvnd/libglvnd.hash +++ b/package/libglvnd/libglvnd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 c4a884503d2412dc1fa209613aa8a77193aeb7065b823fe1775dc8b6f3e45211 libglvnd-1.4.0.tar.gz +sha256 13ae5bb99a5a2869fbe00aadb49b21fd9c13dfbf59844b0f88d521098094d44a libglvnd-1.7.0.tar.gz # Locally computed hashes for license files sha256 f84a3eca98cc5bdf5318741124c38c5e877f856df8c7e229ee5065e5c61038c2 README.md diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 95ac19dd91..6e375e2e63 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLVND_VERSION = 1.4.0 -LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/uploads/ca5bf4295beb39bb324f692c481ac8a1 +LIBGLVND_VERSION = 1.7.0 +LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/uploads/c24806c283070dc70700234ca8ffacf8 LIBGLVND_LICENSE = \ libglvnd license, \ diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index a0ee7ec531..bb0679e2f5 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || \ BR2_mips64el || BR2_m68k || \ - BR2_nios2 || BR2_or1k || \ + BR2_or1k || \ BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_RISCV_64 || \ BR2_RISCV_32 || BR2_s390x || \ @@ -40,8 +40,6 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_mips64 || BR2_mips64el default "m68k-unknown-linux-gnu" \ if BR2_m68k - default "nios2-unknown-linux-gnu" \ - if BR2_nios2 default "or1k-unknown-linux-gnu" \ if BR2_or1k default "powerpc-unknown-linux-gnu" \ diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index be5202584d..d02983d1ca 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 6790fc3d6e7bbd7576654b43971bbe15e953ccc4 libgpg-error-1.50.tar.bz2 -sha256 69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a libgpg-error-1.50.tar.bz2 +sha1 6db7c51778e424c928993e1d49ccf6ad6866b185 libgpg-error-1.56.tar.bz2 +sha256 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 libgpg-error-1.56.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 8dff6a612d..1fb1076ef3 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.50 +LIBGPG_ERROR_VERSION = 1.56 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ diff --git a/package/libgphoto2/libgphoto2.hash b/package/libgphoto2/libgphoto2.hash index af52b47dc8..c2ff672613 100644 --- a/package/libgphoto2/libgphoto2.hash +++ b/package/libgphoto2/libgphoto2.hash @@ -1,3 +1,3 @@ # Locally calculated hash -sha256 a7253bd18c6ef65352150ac36a668f883a5ad2634eb6455b3ca9aa6ac98d0073 libgphoto2-2.5.27.tar.xz -sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING +sha256 28825f767a85544cb58f6e15028f8e53a5bb37a62148b3f1708b524781c3bef2 libgphoto2-2.5.33.tar.xz +sha256 530128f45fc02d92d4dae04d9c1e1f28a078a9b0d32c0ab254c406ba8fba43ec COPYING diff --git a/package/libgphoto2/libgphoto2.mk b/package/libgphoto2/libgphoto2.mk index c1d5352c00..851eb401a1 100644 --- a/package/libgphoto2/libgphoto2.mk +++ b/package/libgphoto2/libgphoto2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPHOTO2_VERSION = 2.5.27 +LIBGPHOTO2_VERSION = 2.5.33 LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.xz LIBGPHOTO2_SITE = https://github.com/gphoto/libgphoto2/releases/download/v$(LIBGPHOTO2_VERSION) LIBGPHOTO2_LICENSE = LGPL-2.1+, GPL-2.0 (adc65), GPL-2.0+ (some camlibs), \ diff --git a/package/libgpiod2/libgpiod2.hash b/package/libgpiod2/libgpiod2.hash index f51cc80b9f..24bcfafc6c 100644 --- a/package/libgpiod2/libgpiod2.hash +++ b/package/libgpiod2/libgpiod2.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 ee29735890eb1cc0e4b494001da5163d1a9c4735343201d22485db313601ca07 libgpiod-2.2.tar.xz +sha256 7e3bff0209d75fbca2e9fcff1fd5f07cc58b543e129e08b6d4bb1e4a56cfec0d libgpiod-2.2.2.tar.xz # Hash for license file sha256 f646ad5159efb51c1130a4b43c31f0759750b1e254d2acf510f368ee2e2085c3 COPYING diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk index e73f8d699f..c5b53f631b 100644 --- a/package/libgpiod2/libgpiod2.mk +++ b/package/libgpiod2/libgpiod2.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD2_VERSION = 2.2 +LIBGPIOD2_VERSION = 2.2.2 LIBGPIOD2_SOURCE = libgpiod-$(LIBGPIOD2_VERSION).tar.xz LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD2_LICENSE = LGPL-2.1+ diff --git a/package/libgsasl/libgsasl.hash b/package/libgsasl/libgsasl.hash index 75e5a317fa..de24d73c2d 100644 --- a/package/libgsasl/libgsasl.hash +++ b/package/libgsasl/libgsasl.hash @@ -1,11 +1,11 @@ -# From https://lists.gnu.org/archive/html/help-gsasl/2021-01/msg00007.html -sha1 a16ff428bbf28fcfa681c7edd2cd2bb087bcc4e7 libgsasl-1.10.0.tar.gz -sha224 20b37757fccb6a0f8b4c6fcb28f51a3b4b8a4b1fdb4736da07707a0b libgsasl-1.10.0.tar.gz +# From https://lists.gnu.org/archive/html/help-gsasl/2025-03/msg00000.html +sha1 8a845b7ec78e5f27bf69438074ad23867c00d4fe gsasl-2.2.2.tar.gz +sha256 d45b562e13bd13b9fc20b372f4b53269740cf6279f836f09ce11b9d32bcee075 gsasl-2.2.1.tar.gz # Locally calculated after checking pgp signature -sha256 f1b553384dedbd87478449775546a358d6f5140c15cccc8fb574136fdc77329f libgsasl-1.10.0.tar.gz +sha256 41e8e442648eccaf6459d9ad93d4b18530b96c8eaf50e3f342532ef275eff3ba gsasl-2.2.2.tar.gz # Hash for license files: -sha256 26e99818ca6ce79d8b2c461fabc72dc6e03483e6b0fd9692dcb07ab1b09bbac7 README -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e3d1b8a82b97dc6083b2600a6beb0396bbefbe384fc1cd39d0e8cb04bbf2bd33 README +sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 COPYING.LESSER +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk index b1981dea3b..8670f43b6f 100644 --- a/package/libgsasl/libgsasl.mk +++ b/package/libgsasl/libgsasl.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBGSASL_VERSION = 1.10.0 +LIBGSASL_VERSION = 2.2.2 +LIBGSASL_SOURCE = gsasl-$(LIBGSASL_VERSION).tar.gz LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl LIBGSASL_LICENSE = LGPL-2.1+ (library), GPL-3.0+ (programs) -LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING +LIBGSASL_LICENSE_FILES = README COPYING.LESSER COPYING LIBGSASL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) diff --git a/package/libgsm/libgsm.hash b/package/libgsm/libgsm.hash index b3a4702152..36d90d93bd 100644 --- a/package/libgsm/libgsm.hash +++ b/package/libgsm/libgsm.hash @@ -1,3 +1,4 @@ +# From https://www.quut.com/gsm/ +sha256 8b7591a85ac9adce858f2053005e6b2eb20c23b8b8a868dffb2969645fa323c0 gsm-1.0.23.tar.gz # Locally computed -sha256 f0072e91f6bb85a878b2f6dbf4a0b7c850c4deb8049d554c65340b3bf69df0ac gsm-1.0.22.tar.gz sha256 81c68a3374937ed9b5e4929c709e81a2c4b35b5d1f450ecf8c473e2daea46ff6 COPYRIGHT diff --git a/package/libgsm/libgsm.mk b/package/libgsm/libgsm.mk index 1c7b860ece..0e5ae9da4a 100644 --- a/package/libgsm/libgsm.mk +++ b/package/libgsm/libgsm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGSM_VERSION = 1.0.22 +LIBGSM_VERSION = 1.0.23 LIBGSM_SOURCE = gsm-$(LIBGSM_VERSION).tar.gz LIBGSM_SITE = http://www.quut.com/gsm LIBGSM_LICENSE = gsm diff --git a/package/libgtk2/0001-reduce-dependencies.patch b/package/libgtk2/0001-reduce-dependencies.patch deleted file mode 100644 index 3250cae4b0..0000000000 --- a/package/libgtk2/0001-reduce-dependencies.patch +++ /dev/null @@ -1,117 +0,0 @@ -Hack the configure.in file to add a "none" gdktarget which removes -dependencies on graphic backends such as X.org or DirectFB. Gtk does -not fully build in this mode, but it builds sufficiently to build the -host tools that are needed to build the target Gtk. - -Changes: - Ported to 2.24.18 - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Spenser Gilliland ---- -Index: libgtk2-2.24.18/configure.ac -=================================================================== ---- libgtk2-2.24.18.orig/configure.ac 2013-05-13 07:02:44.000000000 -0500 -+++ libgtk2-2.24.18/configure.ac 2013-05-27 02:12:09.947030335 -0500 -@@ -258,12 +258,12 @@ - gdktarget=x11 - fi - --AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], -+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target], - gdktarget=$with_gdktarget) - - AC_SUBST(gdktarget) - case $gdktarget in -- x11|win32|quartz|directfb) ;; -+ x11|win32|quartz|directfb|none) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; - esac - -@@ -372,11 +373,15 @@ - ## annoying to construct - PKG_CHECK_MODULES(BASE_DEPENDENCIES, - [glib-2.0 >= glib_required_version dnl -- atk >= atk_required_version dnl -- pango >= pango_required_version dnl -- cairo >= cairo_required_version dnl - gdk-pixbuf-2.0 >= gdk_pixbuf_required_version]) - -+if test "x$gdktarget" != "xnone"; then -+ PKG_CHECK_MODULES(BASE_DEPENDENCIES, -+ [atk >= atk_required_version dnl -+ pango >= pango_required_version dnl -+ cairo >= cairo_required_version]) -+fi -+ - ## In addition to checking that cairo is present, we also need to - ## check that the correct cairo backend is there. E.g. if the GDK - ## target is win32 we need the cairo-win32 backend and so on. -@@ -387,8 +392,11 @@ - if test "x$cairo_backend" = "xx11"; then - cairo_backend=xlib - fi --PKG_CHECK_MODULES(CAIRO_BACKEND, -- [cairo-$cairo_backend >= cairo_required_version]) -+ -+if test "x$gdktarget" != "xnone"; then -+ PKG_CHECK_MODULES(CAIRO_BACKEND, -+ [cairo-$cairo_backend >= cairo_required_version]) -+fi - - PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) - -@@ -1279,6 +1287,7 @@ - AM_CONDITIONAL(USE_DIRECTFB, false) - fi - -+if test "x$gdktarget" != "xnone"; then - - # Check for Pango flags - -@@ -1324,6 +1333,8 @@ - GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" - fi - -+fi # gdktarget != none -+ - GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB" - GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" - # -@@ -1341,6 +1352,7 @@ - AC_SUBST(GDK_DEP_LIBS) - AC_SUBST(GDK_DEP_CFLAGS) - -+if test "x$gdktarget" != "xnone"; then - - ######################################## - # Check for Accessibility Toolkit flags -@@ -1372,6 +1384,10 @@ - fi - - GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0" -+else # gdktarget != none -+GTK_PACKAGES="gdk-pixbuf-2.0" -+fi # gdktarget != none -+ - if test "x$gdktarget" = "xx11"; then - GTK_PACKAGES="$GTK_PACKAGES pangoft2" - fi -@@ -1533,6 +1549,8 @@ - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" - -+if test "x$gdktarget" != "xnone"; then -+ - AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ - *** Can't find cairo-pdf.h. You must build Cairo with the pdf - *** backend enabled.])) -@@ -1547,6 +1565,8 @@ - *** svg backend enabled.])) - fi - -+fi # gdktarget != none -+ - CPPFLAGS="$gtk_save_cppflags" - - diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in deleted file mode 100644 index f8821ba246..0000000000 --- a/package/libgtk2/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_LIBGTK2 - bool "libgtk2" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_ZLIB - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - help - The GTK+ version 2 graphical user interface library - - http://www.gtk.org/ - -if BR2_PACKAGE_LIBGTK2 - -config BR2_PACKAGE_LIBGTK2_DEMO - bool "Install libgtk2 demo program" - help - The GTK+ source base contains a gtk-demo program. This - option allows to install this program to the target. - -endif - -comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_XORG7 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash deleted file mode 100644 index 7b9a46b697..0000000000 --- a/package/libgtk2/libgtk2.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.sha256sum -sha256 ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da gtk+-2.24.33.tar.xz - -# Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk deleted file mode 100644 index 608c263e4d..0000000000 --- a/package/libgtk2/libgtk2.mk +++ /dev/null @@ -1,139 +0,0 @@ -################################################################################ -# -# libgtk2 -# -################################################################################ - -LIBGTK2_VERSION_MAJOR = 2.24 -LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33 -LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz -LIBGTK2_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) -LIBGTK2_INSTALL_STAGING = YES -LIBGTK2_LICENSE = LGPL-2.0+ -LIBGTK2_LICENSE_FILES = COPYING -LIBGTK2_CPE_ID_VENDOR = gnome -LIBGTK2_CPE_ID_PRODUCT = gtk -# For 0001-reduce-dependencies.patch -LIBGTK2_AUTORECONF = YES - -LIBGTK2_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \ - DB2HTML=false - -LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no - -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ - gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) - -LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) - -# Xorg dependencies -LIBGTK2_CONF_OPTS += \ - --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --with-gdktarget=x11 -LIBGTK2_DEPENDENCIES += \ - fontconfig xlib_libX11 xlib_libXext xlib_libXrender - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBGTK2_CONF_OPTS += --enable-introspection -LIBGTK2_DEPENDENCIES += gobject-introspection -else -LIBGTK2_CONF_OPTS += --disable-introspection -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK2_CONF_OPTS += --enable-xinerama -LIBGTK2_DEPENDENCIES += xlib_libXinerama -else -LIBGTK2_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -LIBGTK2_CONF_OPTS += --with-xinput=yes -LIBGTK2_DEPENDENCIES += xlib_libXi -else -LIBGTK2_CONF_OPTS += --with-xinput=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK2_DEPENDENCIES += xlib_libXrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -LIBGTK2_DEPENDENCIES += xlib_libXcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK2_DEPENDENCIES += xlib_libXfixes -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK2_DEPENDENCIES += xlib_libXcomposite -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK2_DEPENDENCIES += xlib_libXdamage -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -LIBGTK2_DEPENDENCIES += libpng -else -LIBGTK2_CONF_OPTS += --without-libpng -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBGTK2_DEPENDENCIES += jpeg -else -LIBGTK2_CONF_OPTS += --without-libjpeg -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -LIBGTK2_DEPENDENCIES += tiff -else -LIBGTK2_CONF_OPTS += --without-libtiff -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK2_CONF_OPTS += CUPS_CONFIG="$(STAGING_DIR)/usr/bin/cups-config" -LIBGTK2_DEPENDENCIES += cups -else -LIBGTK2_CONF_OPTS += --disable-cups -endif - -ifeq ($(BR2_PACKAGE_LIBGTK2_DEMO),) -define LIBGTK2_POST_INSTALL_TWEAKS - rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo -endef - -LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK2_POST_INSTALL_TWEAKS -endif - -# We do not build a full version of libgtk2 for the host, because that -# requires compiling Cairo, Pango, ATK and X.org for the -# host. Therefore, we patch it to remove dependencies, and we hack the -# build to only build gdk-pixbuf-from-source and -# gtk-update-icon-cache, which are the host tools needed to build Gtk -# for the target. - -HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf -HOST_LIBGTK2_CONF_OPTS = \ - --disable-static \ - --disable-glibtest \ - --without-libtiff \ - --without-libjpeg \ - --with-gdktarget=none \ - --disable-cups - -define HOST_LIBGTK2_BUILD_CMDS - $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache -endef - -define HOST_LIBGTK2_INSTALL_CMDS - cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/bin -endef - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 6a682a7412..5394bb10cc 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.43.sha256sum -sha256 7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7 gtk+-3.24.43.tar.xz +# From https://download.gnome.org/sources/gtk/3.24/gtk-3.24.51.sha256sum +sha256 0013877c6bd23c2dbe42ad7c70a053d0e449be66736574e37867c49c5f905a4f gtk-3.24.51.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index d6d7c64a54..be24869d3d 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,9 +5,9 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).43 -LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz -LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).51 +LIBGTK3_SOURCE = gtk-$(LIBGTK3_VERSION).tar.xz +LIBGTK3_SITE = https://download.gnome.org/sources/gtk/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ LIBGTK3_LICENSE_FILES = COPYING LIBGTK3_CPE_ID_VENDOR = gnome diff --git a/package/libgtk4/Config.in b/package/libgtk4/Config.in index 99553fc44e..259226e0e4 100644 --- a/package/libgtk4/Config.in +++ b/package/libgtk4/Config.in @@ -1,4 +1,5 @@ comment "libgtk4 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ @@ -12,6 +13,7 @@ comment "libgtk4 needs an OpenGL(ES) EGL backend" config BR2_PACKAGE_LIBGTK4 bool "libgtk4" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 @@ -27,6 +29,7 @@ config BR2_PACKAGE_LIBGTK4 select BR2_PACKAGE_GRAPHENE select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_PANGO select BR2_PACKAGE_TIFF # At least one backend is required diff --git a/package/libgtk4/libgtk4.hash b/package/libgtk4/libgtk4.hash index 636b675d15..dff32c57b4 100644 --- a/package/libgtk4/libgtk4.hash +++ b/package/libgtk4/libgtk4.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk/4.14/gtk-4.14.5.sha256sum -sha256 5547f2b9f006b133993e070b87c17804e051efda3913feaca1108fa2be41e24d gtk-4.14.5.tar.xz +# From https://download.gnome.org/sources/gtk/4.21/gtk-4.21.0.sha256sum +sha256 f52475c5041dfd02cc4eed22ee94f12ec310c16a68fda9203dc54ffd5daa6e6f gtk-4.21.0.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk4/libgtk4.mk b/package/libgtk4/libgtk4.mk index b00a2facad..5d3341a95d 100644 --- a/package/libgtk4/libgtk4.mk +++ b/package/libgtk4/libgtk4.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGTK4_VERSION_MAJOR = 4.14 -LIBGTK4_VERSION = $(LIBGTK4_VERSION_MAJOR).5 +LIBGTK4_VERSION_MAJOR = 4.21 +LIBGTK4_VERSION = $(LIBGTK4_VERSION_MAJOR).0 LIBGTK4_SOURCE = gtk-$(LIBGTK4_VERSION).tar.xz LIBGTK4_SITE = https://download.gnome.org/sources/gtk/$(LIBGTK4_VERSION_MAJOR) LIBGTK4_LICENSE = LGPL-2.0+ @@ -21,6 +21,7 @@ LIBGTK4_DEPENDENCIES = \ graphene \ libepoxy \ libglib2 \ + librsvg \ pango \ $(TARGET_NLS_DEPENDENCIES) diff --git a/package/libgudev/libgudev.hash b/package/libgudev/libgudev.hash index 90f27a02fc..f037b1143f 100644 --- a/package/libgudev/libgudev.hash +++ b/package/libgudev/libgudev.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libgudev/237/libgudev-237.sha256sum -sha256 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa libgudev-237.tar.xz +# From https://download.gnome.org/sources/libgudev/238/libgudev-238.sha256sum +sha256 61266ab1afc9d73dbc60a8b2af73e99d2fdff47d99544d085760e4fa667b5dd1 libgudev-238.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk index ef0bd997fa..67d9b65150 100644 --- a/package/libgudev/libgudev.mk +++ b/package/libgudev/libgudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGUDEV_VERSION = 237 +LIBGUDEV_VERSION = 238 LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz LIBGUDEV_SITE = https://download.gnome.org/sources/libgudev/$(LIBGUDEV_VERSION) LIBGUDEV_INSTALL_STAGING = YES diff --git a/package/libheif/Config.in b/package/libheif/Config.in index 1452cf2718..0ae86a07f4 100644 --- a/package/libheif/Config.in +++ b/package/libheif/Config.in @@ -3,11 +3,13 @@ config BR2_PACKAGE_LIBHEIF depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS help libheif is an HEIF and AVIF file format decoder and encoder. https://github.com/strukturag/libheif -comment "libheif needs a toolchain w/ C++, gcc >= 4.8" +comment "libheif needs a toolchain w/ C++, threads, gcc >= 4.8" depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libheif/libheif.hash b/package/libheif/libheif.hash index 26b21e1897..da2516a583 100644 --- a/package/libheif/libheif.hash +++ b/package/libheif/libheif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf libheif-1.18.2.tar.gz -sha256 b2eb4f6588b005bebac44cfb2dfd23f6a16c5ca9b8a619a315158b0215a917a3 COPYING +sha256 68ac9084243004e0ef3633f184eeae85d615fe7e4444373a0a21cebccae9d12a libheif-1.20.2.tar.gz +sha256 fa81ce652315b013359d6e8e4744335f31a50c7c192907176d3632f78a3b4596 COPYING diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 4783ada19e..d82ec6a0ec 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHEIF_VERSION = 1.18.2 +LIBHEIF_VERSION = 1.20.2 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING @@ -72,17 +72,10 @@ else LIBHEIF_CONF_OPTS += -DWITH_X265=OFF endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBHEIF_CONF_OPTS += -DENABLE_MULTITHREADING_SUPPORT=ON ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y) LIBHEIF_CONF_OPTS += -DENABLE_PARALLEL_TILE_DECODING=OFF else LIBHEIF_CONF_OPTS += -DENABLE_PARALLEL_TILE_DECODING=ON endif -else -LIBHEIF_CONF_OPTS += \ - -DENABLE_MULTITHREADING_SUPPORT=OFF \ - -DENABLE_PARALLEL_TILE_DECODING=OFF -endif $(eval $(cmake-package)) diff --git a/package/libhid/0001-dont-fiddle-with-debug-flags.patch b/package/libhid/0001-dont-fiddle-with-debug-flags.patch deleted file mode 100644 index 44a172877a..0000000000 --- a/package/libhid/0001-dont-fiddle-with-debug-flags.patch +++ /dev/null @@ -1,19 +0,0 @@ -MD_CONF_DEBUGGING changes CFLAGS and CXXFLAGS with a horrible magic so disable -it to prevent compilation errors. - -downloaded from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch?revision=1.1&view=markup - -Signed-off-by: Bernd Kuhls - -diff -uNr libhid-0.2.16.org/configure.ac libhid-0.2.16/configure.ac ---- libhid-0.2.16.org/configure.ac 2007-04-01 22:32:10.000000000 +0200 -+++ libhid-0.2.16/configure.ac 2014-10-19 21:31:00.550091947 +0200 -@@ -78,7 +78,6 @@ - AC_C_BIGENDIAN - AC_C_STRINGIZE - --MD_CONF_DEBUGGING - MD_CONF_COMPILER - AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") - AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd") diff --git a/package/libhid/0002-no-newline-in-ldflags.patch b/package/libhid/0002-no-newline-in-ldflags.patch deleted file mode 100644 index df845ee1f5..0000000000 --- a/package/libhid/0002-no-newline-in-ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix improper usage of macro that introduces a wrong newline - -The MD_CONF_FLAGS() macro was used with a final newline that -introduces an invalid newline in the middle of the macro expansion -when defining LDFLAGS. - -Signed-off-by: Thomas Petazzoni - -Index: libhid-0.2.16/configure.ac -=================================================================== ---- libhid-0.2.16.orig/configure.ac 2007-04-01 22:32:10.000000000 +0200 -+++ libhid-0.2.16/configure.ac 2012-12-12 20:24:03.000000000 +0100 -@@ -102,8 +102,7 @@ - [], - [$OS_CFLAGS $LIBUSB_CFLAGS], - [], -- [$OS_LDFLAGS $LIBUSB_LIBS] --) -+ [$OS_LDFLAGS $LIBUSB_LIBS]) - - MD_CONF_DB2MAN - diff --git a/package/libhid/0003-uclinux.patch b/package/libhid/0003-uclinux.patch deleted file mode 100644 index 9f4502ada9..0000000000 --- a/package/libhid/0003-uclinux.patch +++ /dev/null @@ -1,29 +0,0 @@ -Good old 'uclinux is also linux' - -Signed-off-by: Gustavo Zacarias -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi - -diff -Nura libhid-0.2.16.orig/configure.ac libhid-0.2.16/configure.ac ---- libhid-0.2.16.orig/configure.ac 2014-06-22 09:35:50.277261742 -0300 -+++ libhid-0.2.16/configure.ac 2014-06-22 09:36:10.688951947 -0300 -@@ -79,6 +79,7 @@ - AC_C_STRINGIZE - - MD_CONF_COMPILER -+AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "uclinux") - AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") - AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd") - AM_CONDITIONAL(OS_SOLARIS, test "$MD_OS" = "solaris") -diff -Nura libhid-0.2.16.orig/m4/md_check_os.m4 libhid-0.2.16/m4/md_check_os.m4 ---- libhid-0.2.16.orig/m4/md_check_os.m4 2014-06-22 09:35:50.275261675 -0300 -+++ libhid-0.2.16/m4/md_check_os.m4 2014-06-22 09:46:17.651475891 -0300 -@@ -3,7 +3,7 @@ - AC_CANONICAL_HOST - AC_MSG_CHECKING(for target OS) - case $host in -- *-linux*) -+ *-linux*|*-uclinux*) - AC_DEFINE(OS_LINUX, [], [define to 1 if building for Linux]) - AC_SUBST(OS_LINUX) - MD_OS=linux diff --git a/package/libhid/Config.in b/package/libhid/Config.in deleted file mode 100644 index abf338fdc7..0000000000 --- a/package/libhid/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBHID - bool "libhid" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Userspace library for accessing USB HID devices - - https://directory.fsf.org/wiki/Libhid - -comment "libhid needs a toolchain w/ threads, gcc >= 4.9" - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libhid/libhid.hash b/package/libhid/libhid.hash deleted file mode 100644 index 933ba22a92..0000000000 --- a/package/libhid/libhid.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 f6809ab3b9c907cbb05ceba9ee6ca23a705f85fd71588518e14b3a7d9f2550e5 libhid-0.2.16.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk deleted file mode 100644 index b2e890c358..0000000000 --- a/package/libhid/libhid.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libhid -# -################################################################################ - -LIBHID_VERSION = 0.2.16 -LIBHID_SITE = http://sources.buildroot.net -LIBHID_DEPENDENCIES = libusb-compat libusb -LIBHID_INSTALL_STAGING = YES -LIBHID_AUTORECONF = YES -LIBHID_LICENSE = GPL-2.0 -LIBHID_LICENSE_FILES = COPYING -# configure runs libusb-config for cflags/ldflags. Ensure it picks up -# the target version -LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) -LIBHID_CONF_OPTS = \ - --disable-swig \ - --disable-werror \ - --without-doxygen \ - --disable-package-config - -$(eval $(autotools-package)) diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash index 1809bc93a3..11105f8586 100644 --- a/package/libhtp/libhtp.hash +++ b/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7f0719732fd0c82f9915e3df27e31548798590ad624fbad24f58b50885248ab8 libhtp-0.5.48.tar.gz +sha256 699475c2e512d5af05312e808f1f759a5d3c4cb154e73d82eaa6906ceacfaeb4 libhtp-0.5.51.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk index 8735f593d9..a986a79f1d 100644 --- a/package/libhtp/libhtp.mk +++ b/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.48 +LIBHTP_VERSION = 0.5.51 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE diff --git a/package/libical/libical.hash b/package/libical/libical.hash index 52046bd843..4c47c9347b 100644 --- a/package/libical/libical.hash +++ b/package/libical/libical.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592 libical-1.0.1.tar.gz -sha256 c393726f82e6f21df5262110215f6a4382b32046d10afdcfcc49338aa7a191f2 LICENSE +sha256 e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2 libical-3.0.20.tar.gz +sha256 3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04 LICENSE.MPL2.txt +sha256 051753f11d7bb731d178eb3a972560f65a1dbc8f207b166a1c7c090e5d85f582 LICENSE.LGPL21.txt diff --git a/package/libical/libical.mk b/package/libical/libical.mk index 992ef51375..56489b4e98 100644 --- a/package/libical/libical.mk +++ b/package/libical/libical.mk @@ -4,20 +4,25 @@ # ################################################################################ -LIBICAL_VERSION = 1.0.1 +LIBICAL_VERSION = 3.0.20 LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION) LIBICAL_INSTALL_STAGING = YES -LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1 -LIBICAL_LICENSE_FILES = LICENSE +LIBICAL_LICENSE = MPL-2.0 or LGPL-2.1 +LIBICAL_LICENSE_FILES = LICENSE.MPL2.txt LICENSE.LGPL21.txt LIBICAL_CPE_ID_VALID = YES +LIBICAL_DEPENDENCIES = host-perl -# 0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch -LIBICAL_IGNORE_CVES += CVE-2016-9584 - +LIBICAL_CONF_OPTS = \ + -DGOBJECT_INTROSPECTION=OFF \ + -DICAL_BUILD_DOCS=OFF \ + -DICAL_GLIB=OFF \ + -DLIBICAL_BUILD_EXAMPLES=OFF \ + -DLIBICAL_BUILD_TESTING=OFF \ + -DWITH_CXX_BINDINGS=OFF # building without this option is broken, it is used by # Gentoo/alpinelinux as well -LIBICAL_CONF_OPTS = -DSHARED_ONLY=true +LIBICAL_CONF_OPTS += -DSHARED_ONLY=ON # never build time zone info, always use system's tzinfo -LIBICAL_CONF_OPTS += -DUSE_BUILTIN_TZDATA=false +LIBICAL_CONF_OPTS += -DUSE_BUILTIN_TZDATA=OFF $(eval $(cmake-package)) diff --git a/package/libiconv/0001-libtool.patch b/package/libiconv/0001-libtool.patch new file mode 100644 index 0000000000..7c72781b4e --- /dev/null +++ b/package/libiconv/0001-libtool.patch @@ -0,0 +1,57 @@ +Libtool fixes for cross-compilation, many past contributors/authors. +Update based on libtool-2.4.4, useful for 2.4.3 as well but not 2.4.2. + +Upstream: Not applicable (Buildroot specific) + +Signed-off-by: Gustavo Zacarias +[Bernd: rebased for version 1.18] +Signed-off-by: Bernd Kuhls + +--- a/build-aux/ltmain.sh 2014-12-16 09:51:23.068441045 -0300 ++++ b/build-aux/ltmain.sh 2014-12-16 09:57:10.509430339 -0300 +@@ -2687,8 +2687,8 @@ + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then +- func_echo "unable to infer tagged configuration" +- func_fatal_error "specify a tag with '--tag'" ++ func_echo "defaulting to \`CC'" ++ func_echo "if this is not correct, specify a tag with \`--tag'" + # else + # func_verbose "using $tagname tagged configuration" + fi +@@ -4277,8 +4277,12 @@ + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. +- test "$inst_prefix_dir" = "$destdir" && \ +- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" ++ ++ # ++ # This breaks install into our staging area. -PB ++ # ++ #test "$inst_prefix_dir" = "$destdir" && \ ++ # func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. +@@ -8112,7 +8112,7 @@ + *) + if test no = "$installed"; then + func_append notinst_deplibs " $lib" +- need_relink=yes ++ need_relink=no + fi + ;; + esac +@@ -10710,6 +10710,10 @@ + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do ++ # Replacing uninstalled with installed can easily break crosscompilation, ++ # since the installed path is generally the wrong architecture. -CL ++ newdependency_libs="$newdependency_libs $deplib" ++ continue + case $deplib in + *.la) + func_basename "$deplib" diff --git a/package/libiconv/libiconv.hash b/package/libiconv/libiconv.hash index e3a6125e25..9fa38c567b 100644 --- a/package/libiconv/libiconv.hash +++ b/package/libiconv/libiconv.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -sha256 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 libiconv-1.15.tar.gz +sha256 3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8 libiconv-1.18.tar.gz # Hash for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB +sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 COPYING.LIB diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index 40763a92f8..a102ff18a4 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -4,12 +4,16 @@ # ################################################################################ -LIBICONV_VERSION = 1.15 +LIBICONV_VERSION = 1.18 LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv LIBICONV_INSTALL_STAGING = YES -LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library) +LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.1+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB +# libiconv uses a patched version of libtool 2.5.4 +# we use a package-specific patch instead +LIBICONV_LIBTOOL_PATCH = NO + ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y) LIBICONV_CONF_OPTS += --enable-extra-encodings endif diff --git a/package/libidn/libidn.hash b/package/libidn/libidn.hash index 65201fdfb5..9727aaf243 100644 --- a/package/libidn/libidn.hash +++ b/package/libidn/libidn.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723 libidn-1.42.tar.gz +sha256 bdc662c12d041b2539d0e638f3a6e741130cdb33a644ef3496963a443482d164 libidn-1.43.tar.gz # Hash for license files: +sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 -sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYINGv3 sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index c7b8b4941c..6fdd84fa9f 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -4,14 +4,14 @@ # ################################################################################ -LIBIDN_VERSION = 1.42 +LIBIDN_VERSION = 1.43 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no LIBIDN_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ -LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3 +LIBIDN_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 LIBIDN_CPE_ID_VENDOR = gnu define LIBIDN_REMOVE_BINARY diff --git a/package/libidn2/libidn2.hash b/package/libidn2/libidn2.hash index 3d2a41a00e..412ec8804d 100644 --- a/package/libidn2/libidn2.hash +++ b/package/libidn2/libidn2.hash @@ -1,8 +1,8 @@ # Calculated locally after checking signature -sha256 4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64 libidn2-2.3.7.tar.gz +sha256 f557911bf6171621e1f72ff35f5b1825bb35b52ed45325dcdee931e5d3c0787a libidn2-2.3.8.tar.gz # Hash for license files: -sha256 73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYINGv2 +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSERv3 sha256 01d621eef165cf4d3d3dbb737aa0699178d94c6f18cf87e9dde6db3ca7790f46 COPYING.unicode diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk index 59db3662e4..00a87d46b8 100644 --- a/package/libidn2/libidn2.mk +++ b/package/libidn2/libidn2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN2_VERSION = 2.3.7 +LIBIDN2_VERSION = 2.3.8 LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN2_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index be662bebaf..2c1870b984 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a0f396a5e2249398f2432bb9698e3aecdb9de11b28e5af68f7fb8b14bc3b2f44 libiec61850-1.5.3.tar.gz +sha256 64113483eea8aec4f18cef9f8bb3c872585b2c67566824c4373db257bcc7bf8e libiec61850-1.6.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 276acce1a8..b29285cbe2 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.3 +LIBIEC61850_VERSION = 1.6.1 LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ @@ -15,6 +15,9 @@ LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF ifeq ($(BR2_PACKAGE_MBEDTLS),y) LIBIEC61850_DEPENDENCIES += mbedtls LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=ON +LIBIEC61850_CONF_OPTS += \ + -DCONFIG_EXTERNAL_MBEDTLS_DYNLIB_PATH=$(STAGING_DIR)/usr/lib \ + -DCONFIG_EXTERNAL_MBEDTLS_INCLUDE_PATH=$(STAGING_DIR)/usr/include else LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=OFF endif diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index 0f024af78c..65b4d5e5fb 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 21972599a3c143ab1f98002ad2b3f28f4aff927fde5f677478311cd4e517730c libiio-0.25.tar.gz +sha256 fb445fb860ef1248759f45d4273a4eff360534480ec87af64c6b8db3b99be7e5 libiio-0.26.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 733a0c90ed..b85bb9786a 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.25 +LIBIIO_VERSION = 0.26 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+ diff --git a/package/libinput/Config.in b/package/libinput/Config.in index 1a8fcc7ed4..f5253dfec2 100644 --- a/package/libinput/Config.in +++ b/package/libinput/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBINPUT bool "libinput" depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBEVDEV - select BR2_PACKAGE_MTDEV help libinput is a library to handle input devices in Wayland compositors and to provide a generic X.Org input driver. diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 2ab56e4827..cd60e70c40 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 8c582b86c6865aaee2516ee96b299cef60c98e113d1391bbd2683eac08221a07 libinput-1.26.0.tar.bz2 +sha256 7160c16c409c9ea4f7da9d91923ae0a92df7f3453a292bf684bed071acd7b4ff libinput-1.29.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 3b5070c85e..93d8a51aca 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBINPUT_VERSION = 1.26.0 +LIBINPUT_VERSION = 1.29.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) -LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev +LIBINPUT_DEPENDENCIES = host-pkgconf libevdev udev LIBINPUT_INSTALL_STAGING = YES LIBINPUT_LICENSE = MIT LIBINPUT_LICENSE_FILES = COPYING @@ -31,6 +31,13 @@ else LIBINPUT_CONF_OPTS += -Ddebug-gui=false endif +ifeq ($(BR2_PACKAGE_MTDEV),y) +LIBINPUT_CONF_OPTS += -Dmtdev=true +LIBINPUT_DEPENDENCIES += mtdev +else +LIBINPUT_CONF_OPTS += -Dmtdev=false +endif + ifeq ($(BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS),) LIBINPUT_PYTHON_TOOLS = libinput-analyze-per-slot-delta \ libinput-analyze-recording \ diff --git a/package/libjcat/libjcat.hash b/package/libjcat/libjcat.hash index b6dc8d2f69..8f50f8798f 100644 --- a/package/libjcat/libjcat.hash +++ b/package/libjcat/libjcat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a6232aeca3c3fab6dbb3bed06ec3832088b49a4b278a7119558d72be60ce921f libjcat-0.2.1.tar.xz +sha256 f2f115aad8a8f16b8dde1ed55de7abacb91d0878539aa29b2b60854b499db639 libjcat-0.2.3.tar.xz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 LICENSE diff --git a/package/libjcat/libjcat.mk b/package/libjcat/libjcat.mk index c365c1914b..4a7f304c2a 100644 --- a/package/libjcat/libjcat.mk +++ b/package/libjcat/libjcat.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJCAT_VERSION = 0.2.1 +LIBJCAT_VERSION = 0.2.3 LIBJCAT_SITE = https://github.com/hughsie/libjcat/releases/download/$(LIBJCAT_VERSION) LIBJCAT_SOURCE = libjcat-$(LIBJCAT_VERSION).tar.xz LIBJCAT_LICENSE = LGPL-2.1+ diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in deleted file mode 100644 index 39d1665e0e..0000000000 --- a/package/libjwt/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBJWT - bool "libjwt" - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_JANSSON - help - JSON Web Tokens are an open, industry standard RFC 7519 - method for representing claims securely between two parties. - - https://github.com/benmcollins/libjwt diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash deleted file mode 100644 index 0049772a78..0000000000 --- a/package/libjwt/libjwt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 f11c4544f61a31f105720b8329409fea009d6f9ef41c9361f98c2de48152eeae libjwt-1.17.2.tar.bz2 -sha256 3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk deleted file mode 100644 index 9f94c8683e..0000000000 --- a/package/libjwt/libjwt.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# libjwt -# -################################################################################ - -LIBJWT_VERSION = 1.17.2 -LIBJWT_SITE = https://github.com/benmcollins/libjwt/releases/download/v$(LIBJWT_VERSION) -LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.bz2 -LIBJWT_DEPENDENCIES = host-pkgconf jansson -LIBJWT_INSTALL_STAGING = YES -LIBJWT_LICENSE = MPL-2.0 -LIBJWT_LICENSE_FILES = LICENSE -LIBJWT_CPE_ID_VENDOR = bencollins -LIBJWT_CPE_ID_PRODUCT = jwt_c_library -LIBJWT_CONF_OPTS = --without-examples - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBJWT_CONF_OPTS += --with-openssl -LIBJWT_DEPENDENCIES += openssl -else -LIBJWT_CONF_OPTS += --without-openssl -LIBJWT_DEPENDENCIES += gnutls -endif - -$(eval $(autotools-package)) diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index 1778acf2e9..56d1909110 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -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 diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 6fc9ca5a6e..18bebad662 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -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 diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 0403b3aed0..14fb45ef48 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# from https://web.mit.edu/kerberos/dist/krb5/1.21/krb5-1.21.3.tar.gz.asc +# from https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.1.tar.gz.asc # with key C4493CB739F4A89F9852CBC20CBA08575F8372DF -sha256 b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35 krb5-1.21.3.tar.gz +sha256 1a8832b8cad923ebbf1394f67e2efcf41e3a49f460285a66e35adec8fa0053af krb5-1.22.1.tar.gz # Hash for license file: -sha256 7601361a275aadbe35c90185519323c28730d60c553683e56fd06cf9c5f749a6 NOTICE +sha256 83914195f655de4f4970014a26f38b16bf4c5ff357ea51645ca2aea3a92764eb NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index e57a2b98a2..ede0b8afd3 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBKRB5_VERSION_MAJOR = 1.21 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).3 +LIBKRB5_VERSION_MAJOR = 1.22 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src @@ -16,6 +16,8 @@ LIBKRB5_CPE_ID_PRODUCT = kerberos_5 LIBKRB5_DEPENDENCIES = host-bison $(TARGET_NLS_DEPENDENCIES) LIBKRB5_INSTALL_STAGING = YES +LIBKRB5_CFLAGS = $(TARGET_CFLAGS) + # The configure script uses AC_TRY_RUN tests to check for those values, # which doesn't work in a cross-compilation scenario. Therefore, # we feed the configure script with the correct answer for those tests @@ -38,9 +40,11 @@ LIBKRB5_CONF_OPTS = \ # Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode # so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +LIBKRB5_CFLAGS += -marm endif +LIBKRB5_CONF_ENV += CFLAGS="$(LIBKRB5_CFLAGS)" + # Enabling static and shared at the same time is not supported ifeq ($(BR2_SHARED_STATIC_LIBS),y) LIBKRB5_CONF_OPTS += --disable-static diff --git a/package/liblinear/0001-build-static-lib.patch b/package/liblinear/0001-build-static-lib.patch index f3497b767e..69769a8005 100644 --- a/package/liblinear/0001-build-static-lib.patch +++ b/package/liblinear/0001-build-static-lib.patch @@ -1,14 +1,24 @@ -Makefile: add a rule to build a static library +From 43a6b4c7b3a63b1cd7f1ed2772a1147be892560f Mon Sep 17 00:00:00 2001 +From: Marcus Hoffmann +Date: Wed, 9 Apr 2025 16:03:59 +0200 +Subject: [PATCH] Makefile: add a rule to build a static library Signed-off-by: "Yann E. MORIN" [Fabrice: update for 2.43] Signed-off-by: Fabrice Fontaine -diff -durN liblinear-1.96.orig/Makefile liblinear-1.96/Makefile ---- liblinear-1.96.orig/Makefile 2014-11-15 07:50:23.000000000 +0100 -+++ liblinear-1.96/Makefile 2014-12-14 00:23:00.135893956 +0100 -@@ -16,6 +16,11 @@ - fi; \ - $(CXX) $${SHARED_LIB_FLAG} linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER) +[Marcus: update for 2.48] +Signed-off-by: Marcus Hoffmann +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 4f22d17..5cf9b26 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,6 +16,11 @@ all: train predict + lib: linear.o newton.o blas/blas.a + $(CXX) $(SHARED_LIB_FLAG) linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER) +# Keeping blas/blas.a as a pre-requisite, to ensure all .o files are built +static-lib: linear.o newton.o blas/blas.a @@ -18,3 +28,6 @@ diff -durN liblinear-1.96.orig/Makefile liblinear-1.96/Makefile train: newton.o linear.o train.c blas/blas.a $(CXX) $(CFLAGS) -o train train.c newton.o linear.o $(LIBS) +-- +2.43.0 + diff --git a/package/liblinear/liblinear.hash b/package/liblinear/liblinear.hash index 6bc72909d0..3a98c64a07 100644 --- a/package/liblinear/liblinear.hash +++ b/package/liblinear/liblinear.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c64eec45c01943a656baac7aeb8ffd782fe0aea53629aa9f5fdb8eec177c92f liblinear-2.45.tar.gz -sha256 d49b7898fd9ea7c29f0478e8c409ee7c0f621533d5eca7b7912e80391dc564e3 COPYRIGHT +sha256 166ca3c741b2207a74978cdb55077261be43b1e58e55f2b4c4f40e6ec1d8a347 liblinear-2.49.tar.gz +sha256 684e76f565a31ab057790c612bdacc2ee542f8a90b69f922377a92334771488c COPYRIGHT diff --git a/package/liblinear/liblinear.mk b/package/liblinear/liblinear.mk index 134673a230..d3ef578aa1 100644 --- a/package/liblinear/liblinear.mk +++ b/package/liblinear/liblinear.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLINEAR_VERSION = 2.45 +LIBLINEAR_VERSION = 2.49 LIBLINEAR_SITE = https://www.csie.ntu.edu.tw/~cjlin/liblinear/oldfiles LIBLINEAR_LICENSE = BSD-3-Clause LIBLINEAR_LICENSE_FILES = COPYRIGHT @@ -14,8 +14,8 @@ LIBLINEAR_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) # $1: destination directory define LIBLINEAR_INSTALL_SHARED - $(INSTALL) -m 0644 -D $(@D)/liblinear.so.5 $(1)/usr/lib/liblinear.so.5 - ln -sf liblinear.so.5 $(1)/usr/lib/liblinear.so + $(INSTALL) -m 0644 -D $(@D)/liblinear.so.6 $(1)/usr/lib/liblinear.so.6 + ln -sf liblinear.so.6 $(1)/usr/lib/liblinear.so endef LIBLINEAR_CFLAGS += -fPIC endif diff --git a/package/liblo/liblo.hash b/package/liblo/liblo.hash index a3d34d796c..cab192b421 100644 --- a/package/liblo/liblo.hash +++ b/package/liblo/liblo.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.31/ -sha1 d188a62df51e29fa98861daec1db0fdae400410d liblo-0.31.tar.gz -md5 14378c1e74c58e777fbb4fcf33ac5315 liblo-0.31.tar.gz +# From http://sourceforge.net/projects/liblo/files/liblo/0.34/ +md5 14a65154e8f2609f558ce2648f1c99ef liblo-0.34.tar.gz +sha1 0bcc3f30a4cdd2f41fe6c20c48f92bcaeaa8e6bc liblo-0.34.tar.gz # Locally computed -sha256 2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750 liblo-0.31.tar.gz +sha256 69aa0cd365dba5ea7799b850a7da659ad303e6074bbd67f4ab84e4d6f5f6c3a4 liblo-0.34.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index 27dba1f99f..ab30feab81 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -4,16 +4,13 @@ # ################################################################################ -LIBLO_VERSION = 0.31 +LIBLO_VERSION = 0.34 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) LIBLO_LICENSE = LGPL-2.1+ LIBLO_LICENSE_FILES = COPYING LIBLO_INSTALL_STAGING = YES -# IPv6 support broken, issue known upstream -LIBLO_CONF_OPTS = --disable-ipv6 - # Liblo uses atomic builtins, so we need to link with libatomic for # the architectures who explicitly need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/package/liblog4c-localtime/0006-examples-userloc_formatter.c-drop-usage-of-sd_debug.patch b/package/liblog4c-localtime/0006-examples-userloc_formatter.c-drop-usage-of-sd_debug.patch new file mode 100644 index 0000000000..8f54d1d6fd --- /dev/null +++ b/package/liblog4c-localtime/0006-examples-userloc_formatter.c-drop-usage-of-sd_debug.patch @@ -0,0 +1,42 @@ +From 1dfc4a60ebf96766b682c464ae69c453ce15105a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 19 Aug 2025 20:04:09 +0200 +Subject: [PATCH] examples/userloc_formatter.c: drop usage of sd_debug() + +With recent compilers, log4c-localtime fails to build with: + +userloc_formatter.c: In function 'userloc_format': +userloc_formatter.c:30:5: error: implicit declaration of function 'sd_debug' [-Wimplicit-function-declaration] + 30 | sd_debug("Formatter s13_userloc checking location info for userdata %X",a_event->evt_loc->loc_data); + | ^~~~~~~~ +make[4]: *** [Makefile:519: userloc_formatter.lo] Error 1 + +This function seems to be an internal function of the log4c-localtime +library, and is not used by any other example application. Since it's +only used to print some debugging information, we simply get rid of +the problematic code. + +Upstream: https://github.com/rcmadruga/log4c-localtime/pull/2 +Signed-off-by: Thomas Petazzoni +--- + examples/userloc_formatter.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/examples/userloc_formatter.c b/examples/userloc_formatter.c +index 4299a48..7bcf0e9 100644 +--- a/examples/userloc_formatter.c ++++ b/examples/userloc_formatter.c +@@ -27,10 +27,8 @@ static const char* userloc_format( + static char buffer[4096]; + user_locinfo_t* uloc = NULL; + +- sd_debug("Formatter s13_userloc checking location info for userdata %X",a_event->evt_loc->loc_data); + if (a_event->evt_loc->loc_data != NULL) + { +- sd_debug("Formatter s13_userloc getting a valid user location info pointer"); + uloc = (user_locinfo_t*) a_event->evt_loc->loc_data; + sprintf(buffer, "[%s][HOST:%s][PID:%i][FILE:%s][LINE:%i][MSG:%s]", + a_event->evt_category, +-- +2.50.1 + diff --git a/package/libmanette/Config.in b/package/libmanette/Config.in index 31fff15286..873f8d8b0b 100644 --- a/package/libmanette/Config.in +++ b/package/libmanette/Config.in @@ -2,8 +2,11 @@ config BR2_PACKAGE_LIBMANETTE bool "libmanette" depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2 -> gettext - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_PACKAGE_HAS_UDEV # hidapi + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # hidapi -> libusb + select BR2_PACKAGE_HIDAPI select BR2_PACKAGE_LIBEVDEV select BR2_PACKAGE_LIBGLIB2 help @@ -11,7 +14,9 @@ config BR2_PACKAGE_LIBMANETTE https://gitlab.gnome.org/GNOME/libmanette -comment "libmanette needs a toolchain w/ wchar, threads, headers >= 4.16" +comment "libmanette needs a toolchain w/ wchar, NPTL threads, gcc >= 4.9, headers >= 4.16, udev" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 || \ + !BR2_PACKAGE_HAS_UDEV diff --git a/package/libmanette/libmanette.hash b/package/libmanette/libmanette.hash index 3653d672de..f2974ca059 100644 --- a/package/libmanette/libmanette.hash +++ b/package/libmanette/libmanette.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.9.sha256sum -sha256 29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f libmanette-0.2.9.tar.xz +# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.13.sha256sum +sha256 287cc2fde0de092919366af757d85e7b3a0248eb1b395344726e97955a77d8ae libmanette-0.2.13.tar.xz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libmanette/libmanette.mk b/package/libmanette/libmanette.mk index 7872c8b796..c320b84840 100644 --- a/package/libmanette/libmanette.mk +++ b/package/libmanette/libmanette.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMANETTE_VERSION_MAJOR = 0.2 -LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).9 +LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).13 LIBMANETTE_SOURCE = libmanette-$(LIBMANETTE_VERSION).tar.xz LIBMANETTE_SITE = https://download.gnome.org/sources/libmanette/$(LIBMANETTE_VERSION_MAJOR) LIBMANETTE_LICENSE = LGPL-2.1+ @@ -14,6 +14,7 @@ LIBMANETTE_INSTALL_STAGING = YES LIBMANETTE_DEPENDENCIES = \ libevdev \ libglib2 \ + hidapi \ $(TARGET_NLS_DEPENDENCIES) LIBMANETTE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index ebc37504c5..d487b5156d 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 cfc729d23b9bf699b23a7ef2f5d732d6eff96234e31fed36b778771a6e3d3ee5 libmbim-1.30.0.tar.gz +sha256 7eca9f5af2eecfdb5e3a2a865a7f29d0ac9532ab187a9c6adce4d85f897eb385 libmbim-1.32.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 717c2396f7..190f3547ec 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.30.0 +LIBMBIM_VERSION = 1.32.0 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = \ diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 222e7caf5c..ae5266716b 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,6 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 19c0eb33e1ed43ca2a94dceb06dd31946432d16f30a9751d3701c67efa22eb1a libmdbx-amalgamated-0.12.12.tar.xz +sha256 57db987de6f7ccc66a66ae28a7bda9f9fbb48ac5fb9279bcca92fd5de13075d1 libmdbx-amalgamated-0.13.6.tar.xz # Locally calculated -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE +sha256 651f71b46c6bb0046d2122df7f9def9cb24f4dc28c5b11cef059f66565cda30f NOTICE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index c736945e92..f461d98397 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBMDBX_VERSION = 0.12.12 +LIBMDBX_VERSION = 0.13.6 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO -LIBMDBX_LICENSE = OLDAP-2.8 -LIBMDBX_LICENSE_FILES = LICENSE +LIBMDBX_LICENSE = Apache-2.0 +LIBMDBX_LICENSE_FILES = LICENSE NOTICE LIBMDBX_STRIP_COMPONENTS = 0 LIBMDBX_INSTALL_STAGING = YES diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index f1b3f8b7d8..59c87a738d 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a89e09fc9b4de34dde19f4fcb4faaa1ce10299b9908db1132bbfa1de47882b94 libmicrohttpd-1.0.1.tar.gz +sha256 df324fcd0834175dab07483133902d9774a605bfa298025f69883288fd20a8c7 libmicrohttpd-1.0.2.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 6998ffd1ae..335234c14b 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 1.0.1 +LIBMICROHTTPD_VERSION = 1.0.2 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 4f7e7c7aa1..de252310fc 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1 miniupnpc-2.2.7.tar.gz -sha256 7480ae23b082c05ad9823896163d78f3a96f1beadce51f29c96cf898545c27e5 LICENSE +sha256 d52a0afa614ad6c088cc9ddff1ae7d29c8c595ac5fdd321170a05f41e634bd1a miniupnpc-2.3.3.tar.gz +sha256 52bdad87d7aefe3eab35cb02426aa748510f9398a1e2d520d93bcbb18f10dd11 LICENSE diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 3bd4ee6a9f..7eea4318c6 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.2.7 +LIBMINIUPNPC_VERSION = 2.3.3 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES diff --git a/package/libmodsecurity/0001-modsecurity.pc.in-add-lstdc.patch b/package/libmodsecurity/0001-modsecurity.pc.in-add-lstdc.patch new file mode 100644 index 0000000000..9e0b672c8d --- /dev/null +++ b/package/libmodsecurity/0001-modsecurity.pc.in-add-lstdc.patch @@ -0,0 +1,33 @@ +From 4129643d657b5d0cce83f9ec4ca27289fd69ec43 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 26 Jul 2021 00:24:57 +0200 +Subject: [PATCH] modsecurity.pc.in: add -lstdc++ + +Add -lstdc++ to Libs.Private to avoid the following static build failure +with nginx: + +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libmodsecurity.a(libmodsecurity_la-transaction.o): in function `std::basic_streambuf >::sbumpc() [clone .isra.0]': +transaction.cc:(.text+0x40): undefined reference to `std::__cxx11::basic_string, std::allocator >::_M_dispose()' + +Fixes: + - http://autobuild.buildroot.org/results/e5a9eb8448980f1c5cafe97180b7d1f48ddf02ca + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Frank Vanbever +--- + modsecurity.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modsecurity.pc.in b/modsecurity.pc.in +index 96cdf5ca..7c895ddc 100644 +--- a/modsecurity.pc.in ++++ b/modsecurity.pc.in +@@ -8,4 +8,4 @@ Description: ModSecurity API + Version: @MSC_VERSION_WITH_PATCHLEVEL@ + Cflags: -I@includedir@ + Libs: -L@libdir@ -lmodsecurity +-Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ ++Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ -lstdc++ +-- +2.39.2 + diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index dbe43d18e7..821459f6b9 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,5 +1,4 @@ -# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 -sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz - +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.14/modsecurity-v3.0.14.tar.gz.sha256 +sha256 f7599057b35e67ab61764265daddf9ab03c35cee1e55527547afb073ce8f04e8 modsecurity-v3.0.14.tar.gz # Locally calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index d8c10b98b2..a90fa1d614 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.12 +LIBMODSECURITY_VERSION = 3.0.14 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES @@ -12,8 +12,6 @@ LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE LIBMODSECURITY_CPE_ID_VENDOR = trustwave LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity -# We're patching configure.ac -LIBMODSECURITY_AUTORECONF = YES LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \ diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash index 626c383402..849eeea344 100644 --- a/package/libmpdclient/libmpdclient.hash +++ b/package/libmpdclient/libmpdclient.hash @@ -1,5 +1,5 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.22.tar.xz.sig, sha256 locally computed -sha256 eac15b82b5ba5ed0648af580221eb74657394f7fe768e966d9e9ebb27435429f libmpdclient-2.22.tar.xz +# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.23.tar.xz.sig, sha256 locally computed +sha256 4a1b6c7f783d8cac3d3b8e4cbe9ad021c45491e383de3b893ea4eedefbc71607 libmpdclient-2.23.tar.xz # Hash for license files: sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 371bc20dbf..85e42eb44d 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).22 +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).23 LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) LIBMPDCLIENT_INSTALL_STAGING = YES diff --git a/package/libmpeg2/libmpeg2.hash b/package/libmpeg2/libmpeg2.hash index 615d0ea6bf..96b71fb1c8 100644 --- a/package/libmpeg2/libmpeg2.hash +++ b/package/libmpeg2/libmpeg2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4 libmpeg2-0.5.1.tar.gz +sha256 1b3adfb73e7d34ce9259130683d884b0b1af67572c9fd8229d45f55794b6dc0c libmpeg2-v41f78cf4d30d0da0a24c8ecbc38b0c9dfd43f871.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk index db9b2f8bbb..ec23dff57b 100644 --- a/package/libmpeg2/libmpeg2.mk +++ b/package/libmpeg2/libmpeg2.mk @@ -5,13 +5,19 @@ ################################################################################ LIBMPEG2_VERSION = 0.5.1 -LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files +# Gitlab repository does not have a 0.5.1 git tag, +# use the corresponding commit sha instead +LIBMPEG2_VERSION_SHA = 41f78cf4d30d0da0a24c8ecbc38b0c9dfd43f871 +LIBMPEG2_SOURCE = libmpeg2-v$(LIBMPEG2_VERSION_SHA).tar.gz +LIBMPEG2_SITE = https://code.videolan.org/videolan/libmpeg2/-/archive/$(LIBMPEG2_VERSION_SHA) LIBMPEG2_LICENSE = GPL-2.0+ LIBMPEG2_LICENSE_FILES = COPYING LIBMPEG2_INSTALL_STAGING = YES LIBMPEG2_AUTORECONF = YES LIBMPEG2_CONF_OPTS = --without-x --disable-directx +LIBMPEG2_CPE_ID_VENDOR = videolan + ifeq ($(BR2_PACKAGE_SDL),y) LIBMPEG2_CONF_ENV += ac_cv_prog_SDLCONFIG=$(STAGING_DIR)/usr/bin/sdl-config LIBMPEG2_CONF_OPTS += --enable-sdl diff --git a/package/libmspack/libmspack.hash b/package/libmspack/libmspack.hash index 9e97063f01..a4fcb61bef 100644 --- a/package/libmspack/libmspack.hash +++ b/package/libmspack/libmspack.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e libmspack-0.10.1alpha.tar.gz +sha256 70dd1fb2f0aecc36791b71a1e1840e62173079eadaa081192d1c323a0eeea21b libmspack-0.11alpha.tar.gz sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING.LIB diff --git a/package/libmspack/libmspack.mk b/package/libmspack/libmspack.mk index f806192eec..2f64e992fb 100644 --- a/package/libmspack/libmspack.mk +++ b/package/libmspack/libmspack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMSPACK_VERSION_MAJOR = 0.10.1 +LIBMSPACK_VERSION_MAJOR = 0.11 LIBMSPACK_VERSION_MINOR = alpha LIBMSPACK_VERSION = $(LIBMSPACK_VERSION_MAJOR)$(LIBMSPACK_VERSION_MINOR) LIBMSPACK_SITE = https://www.cabextract.org.uk/libmspack diff --git a/package/libndp/0001-fix-incompatible-pointer-types-with-gcc14-and-musl.patch b/package/libndp/0001-fix-incompatible-pointer-types-with-gcc14-and-musl.patch new file mode 100644 index 0000000000..6cf97e8afa --- /dev/null +++ b/package/libndp/0001-fix-incompatible-pointer-types-with-gcc14-and-musl.patch @@ -0,0 +1,43 @@ +From e821ddbfdff5e1b14846421d9196978ffebac346 Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sat, 15 Mar 2025 18:38:50 -0700 +Subject: [PATCH] libndp: fix incompatible pointer types with gcc14 and musl + +When compiling with gcc14 and musl, the following error is produced: +libndp.c: In function 'mysendto6': +libndp.c:212:50: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types] + 212 | ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6)); + | ^~~~~ + | | + | struct sockaddr_in6 * +In file included from libndp.c:27: +/usr/include/sys/socket.h:343:49: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_in6 *' + 343 | ssize_t sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t); + | ^~~~~~~~~~~~~~~~~~~~~~~ + +In POSIX, sendto() takes a sockaddr pointer: +https://pubs.opengroup.org/onlinepubs/009604499/functions/sendto.html + +While glibc uses the gcc __transparent_union__ extension to mark them as +compatible types, musl does not, as such we need to explicitly cast the pointer +to tell the compiler that it is fine. + +Upstream: https://github.com/jpirko/libndp/pull/29 +Signed-off-by: Fiona Klute (WIWA) +--- + libndp/libndp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libndp/libndp.c b/libndp/libndp.c +index fa20a31..315333a 100644 +--- a/libndp/libndp.c ++++ b/libndp/libndp.c +@@ -209,7 +209,7 @@ static int mysendto6(int sockfd, void *buf, size_t buflen, int flags, + memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr)); + sin6.sin6_scope_id = ifindex; + resend: +- ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6)); ++ ret = sendto(sockfd, buf, buflen, flags, (struct sockaddr*)&sin6, sizeof(sin6)); + if (ret == -1) { + switch(errno) { + case EINTR: diff --git a/package/libndp/libndp.hash b/package/libndp/libndp.hash index 389e0ba5fc..ee2b758919 100644 --- a/package/libndp/libndp.hash +++ b/package/libndp/libndp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c3ea76e253def89869651686a827da75b56896fe94fabd87d8c14b1d4588fd05 libndp-1.8.tar.gz +sha256 e564f5914a6b1b799c3afa64c258824a801c1b79a29e2fe6525b682249c65261 libndp-1.9.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libndp/libndp.mk b/package/libndp/libndp.mk index db1de7b81c..30281627af 100644 --- a/package/libndp/libndp.mk +++ b/package/libndp/libndp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNDP_VERSION = 1.8 +LIBNDP_VERSION = 1.9 LIBNDP_SITE = $(call github,jpirko,libndp,v$(LIBNDP_VERSION)) LIBNDP_LICENSE = LGPL-2.1+ LIBNDP_LICENSE_FILES = COPYING diff --git a/package/libnetconf2/Config.in b/package/libnetconf2/Config.in index 1763243120..59e021375d 100644 --- a/package/libnetconf2/Config.in +++ b/package/libnetconf2/Config.in @@ -12,6 +12,24 @@ config BR2_PACKAGE_LIBNETCONF2 https://github.com/CESNET/libnetconf2 +if BR2_PACKAGE_LIBNETCONF2 + +config BR2_PACKAGE_LIBNETCONF2_SSH_TLS + bool "SSH/TLS support" + depends on BR2_USE_MMU # libssh + depends on !BR2_STATIC_LIBS # libssh + depends on BR2_TOOLCHAIN_HAS_THREADS # libssh + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBSSH + select BR2_PACKAGE_LIBSSH_SERVER + +comment "SSH/TLS support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + +endif + comment "libnetconf2 needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 675c76a500..2efa297361 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz +sha256 7146932ea4fc8e12b9152e23e18e46699174c531ef1e0fc351b05fcd12295a81 libnetconf2-3.7.10.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 88163926c0..dd873a3828 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.28 +LIBNETCONF2_VERSION = 3.7.10 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause @@ -16,18 +16,16 @@ LIBNETCONF2_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DENABLE_VALGRIND_TESTS=OFF -ifeq ($(BR2_PACKAGE_LIBSSH_SERVER), y) -LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON -LIBNETCONF2_DEPENDENCIES += libssh +ifeq ($(BR2_PACKAGE_LIBNETCONF2_SSH_TLS),y) +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH_TLS=ON +LIBNETCONF2_DEPENDENCIES += libcurl libssh +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBNETCONF2_DEPENDENCIES += mbedtls else -LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBOPENSSL), y) -LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=ON LIBNETCONF2_DEPENDENCIES += openssl +endif else -LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=OFF +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH_TLS=OFF endif ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) @@ -37,8 +35,7 @@ endif HOST_LIBNETCONF2_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DENABLE_VALGRIND_TESTS=OFF \ - -DENABLE_SSH=OFF \ - -DENABLE_TLS=OFF + -DENABLE_SSH_TLS=OFF $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index bd29e76bc3..1182d31fee 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,8 +1,9 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html # Checked pgp signature: -# https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.2.7.tar.xz.sig +# https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.3.0.tar.xz.sig # with key: # https://www.netfilter.org/files/coreteam-gpg-key-0xD55D978A8A1420E4.txt -sha256 9122774f968093d5c0bacddd67de480f31fa4073405a7fc058a34b0f387aecb3 libnftnl-1.2.7.tar.xz +# https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.3.0.tar.xz.sha256sum +sha256 0f4be47a8bb8b77a350ee58cbd4b5fae6260ad486a527706ab15cfe1dd55a3c4 libnftnl-1.3.0.tar.xz # Locally computed: sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index 65a1431e94..26f112c504 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.7 +LIBNFTNL_VERSION = 1.3.0 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.xz LIBNFTNL_LICENSE = GPL-2.0+ diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index 77d7781493..caf75616fe 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,4 +1,4 @@ -# From https://github.com/thom311/libnl/releases/download/libnl3_9_0/libnl-3.9.0.tar.gz.sha256sum -sha256 aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb libnl-3.9.0.tar.gz +# From https://github.com/thom311/libnl/releases/download/libnl3_11_0/libnl-3.11.0.tar.gz.sha256sum +sha256 2a56e1edefa3e68a7c00879496736fdbf62fc94ed3232c0baba127ecfa76874d libnl-3.11.0.tar.gz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 6f50fd6afc..a0441b7835 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNL_VERSION = 3.9.0 +LIBNL_VERSION = 3.11.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING diff --git a/package/libnpth/libnpth.hash b/package/libnpth/libnpth.hash index a140a23f64..ad541111a3 100644 --- a/package/libnpth/libnpth.hash +++ b/package/libnpth/libnpth.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 a9f7adc1b1f6707071d29bfb3338c28b995ca1ce npth-1.7.tar.bz2 -sha256 8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05 npth-1.7.tar.bz2 +sha1 6f60ce8540453e120d715f269d0c7cfd9e0b0d24 npth-1.8.tar.bz2 +sha256 8bd24b4f23a3065d6e5b26e98aba9ce783ea4fd781069c1b35d149694e90ca3e npth-1.8.tar.bz2 # Hash for license file: sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING.LIB diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index 634da6ed3a..76abf45fd5 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBNPTH_VERSION = 1.7 +LIBNPTH_VERSION = 1.8 LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2 LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth LIBNPTH_LICENSE = LGPL-2.0+ LIBNPTH_LICENSE_FILES = COPYING.LIB LIBNPTH_INSTALL_STAGING = YES -# 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch -LIBNPTH_AUTORECONF = YES LIBNPTH_CONF_OPTS = --disable-tests HOST_LIBNPTH_CONF_OPTS = --disable-tests diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 521447e051..172778540e 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.36/src/SHA256SUMS -sha256 55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895 nspr-4.36.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.37/src/SHA256SUMS +sha256 5f9344ed0e31855bd38f88b33c9d9ab94f70ce547ef3213e488d1520f61840fa nspr-4.37.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 62a2b92db6..a045140743 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.36 +LIBNSPR_VERSION = 4.37 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 36e2296d38..cf339697ea 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_106_RTM/src/SHA256SUMS -sha256 026b744e1e0784b890c3846ac9506472a92138c1f4d41dec581949574c585c38 nss-3.106.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_117_RTM/src/SHA256SUMS +sha256 5786b523a2f2e9295ed10d711960d2e33cd620bb80d6288443eda43553a51996 nss-3.117.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 0c3c24b664..8ba82dd6e2 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.106 +LIBNSS_VERSION = 3.117 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 68546c76b4..29071da1bf 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 6d5d8ba2cc4c94a61a994c9f7f25b3b26ef973fb5c0daa37729890903f37a1f1 libnvme-1.11.1.tar.gz +sha256 ce1d9d393feb84c4e82ca096db2bdb7dd4a5fd1997d711cc1904796944f2c579 libnvme-1.16.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index fc7edda7ff..f9bc0be371 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBNVME_VERSION = 1.11.1 +LIBNVME_VERSION = 1.16.1 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING LIBNVME_INSTALL_STAGING = YES LIBNVME_CONF_OPTS += \ + -Dexamples=false \ -Dtests=false ifeq ($(BR2_PACKAGE_PYTHON3),y) diff --git a/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch b/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch deleted file mode 100644 index 945307bba8..0000000000 --- a/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 5f1c949b1703367f7f06454fcff650bdb7bac840 Mon Sep 17 00:00:00 2001 -From: DJ Lucas -Date: Sun, 9 Sep 2018 15:46:15 +0200 -Subject: [PATCH] Fixes build issue with OpenSSL-1.1.0 - -Downloaded from -http://www.linuxfromscratch.org/patches/blfs/svn/liboauth-1.0.3-openssl-1.1.0-2.patch - -Patch was sent upstream: https://github.com/x42/liboauth/issues/9 - -Signed-off-by: Bernd Kuhls ---- - src/hash.c | 65 ++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 44 insertions(+), 21 deletions(-) - -diff --git a/src/hash.c b/src/hash.c -index 17ff5c8..b7958f7 100644 ---- a/src/hash.c -+++ b/src/hash.c -@@ -362,6 +362,11 @@ looser: - #include "oauth.h" // base64 encode fn's. - #include - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#define EVP_MD_CTX_new EVP_MD_CTX_create -+#define EVP_MD_CTX_free EVP_MD_CTX_destroy -+#endif -+ - char *oauth_sign_hmac_sha1 (const char *m, const char *k) { - return(oauth_sign_hmac_sha1_raw (m, strlen(m), k, strlen(k))); - } -@@ -386,7 +391,7 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { - unsigned char *sig = NULL; - unsigned char *passphrase = NULL; - unsigned int len=0; -- EVP_MD_CTX md_ctx; -+ EVP_MD_CTX *md_ctx; - - EVP_PKEY *pkey; - BIO *in; -@@ -399,24 +404,31 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { - return xstrdup("liboauth/OpenSSL: can not read private key"); - } - -+ md_ctx = EVP_MD_CTX_new(); -+ if (md_ctx == NULL) { -+ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); -+ } -+ - len = EVP_PKEY_size(pkey); - sig = (unsigned char*)xmalloc((len+1)*sizeof(char)); - -- EVP_SignInit(&md_ctx, EVP_sha1()); -- EVP_SignUpdate(&md_ctx, m, strlen(m)); -- if (EVP_SignFinal (&md_ctx, sig, &len, pkey)) { -+ EVP_SignInit(md_ctx, EVP_sha1()); -+ EVP_SignUpdate(md_ctx, m, strlen(m)); -+ if (EVP_SignFinal (md_ctx, sig, &len, pkey)) { - char *tmp; - sig[len] = '\0'; - tmp = oauth_encode_base64(len,sig); - OPENSSL_free(sig); - EVP_PKEY_free(pkey); -+ EVP_MD_CTX_free(md_ctx); - return tmp; - } -+ EVP_MD_CTX_free(md_ctx); - return xstrdup("liboauth/OpenSSL: rsa-sha1 signing failed"); - } - - int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { -- EVP_MD_CTX md_ctx; -+ EVP_MD_CTX *md_ctx; - EVP_PKEY *pkey; - BIO *in; - X509 *cert = NULL; -@@ -437,13 +449,18 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { - return -2; - } - -+ md_ctx = EVP_MD_CTX_new(); -+ if (md_ctx == NULL) { -+ return -2; -+ } -+ - b64d= (unsigned char*) xmalloc(sizeof(char)*strlen(s)); - slen = oauth_decode_base64(b64d, s); - -- EVP_VerifyInit(&md_ctx, EVP_sha1()); -- EVP_VerifyUpdate(&md_ctx, m, strlen(m)); -- err = EVP_VerifyFinal(&md_ctx, b64d, slen, pkey); -- EVP_MD_CTX_cleanup(&md_ctx); -+ EVP_VerifyInit(md_ctx, EVP_sha1()); -+ EVP_VerifyUpdate(md_ctx, m, strlen(m)); -+ err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey); -+ EVP_MD_CTX_free(pkey); - EVP_PKEY_free(pkey); - xfree(b64d); - return (err); -@@ -455,35 +472,41 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { - */ - char *oauth_body_hash_file(char *filename) { - unsigned char fb[BUFSIZ]; -- EVP_MD_CTX ctx; -+ EVP_MD_CTX *ctx; - size_t len=0; - unsigned char *md; - FILE *F= fopen(filename, "r"); - if (!F) return NULL; - -- EVP_MD_CTX_init(&ctx); -- EVP_DigestInit(&ctx,EVP_sha1()); -+ ctx = EVP_MD_CTX_new(); -+ if (ctx == NULL) { -+ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); -+ } -+ EVP_DigestInit(ctx,EVP_sha1()); - while (!feof(F) && (len=fread(fb,sizeof(char),BUFSIZ, F))>0) { -- EVP_DigestUpdate(&ctx, fb, len); -+ EVP_DigestUpdate(ctx, fb, len); - } - fclose(F); - len=0; - md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); -- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); -- EVP_MD_CTX_cleanup(&ctx); -+ EVP_DigestFinal(ctx, md,(unsigned int*) &len); -+ EVP_MD_CTX_free(ctx); - return oauth_body_hash_encode(len, md); - } - - char *oauth_body_hash_data(size_t length, const char *data) { -- EVP_MD_CTX ctx; -+ EVP_MD_CTX *ctx; - size_t len=0; - unsigned char *md; - md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); -- EVP_MD_CTX_init(&ctx); -- EVP_DigestInit(&ctx,EVP_sha1()); -- EVP_DigestUpdate(&ctx, data, length); -- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); -- EVP_MD_CTX_cleanup(&ctx); -+ ctx = EVP_MD_CTX_new(); -+ if (ctx == NULL) { -+ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); -+ } -+ EVP_DigestInit(ctx,EVP_sha1()); -+ EVP_DigestUpdate(ctx, data, length); -+ EVP_DigestFinal(ctx, md,(unsigned int*) &len); -+ EVP_MD_CTX_free(ctx); - return oauth_body_hash_encode(len, md); - } - --- -2.14.4 - diff --git a/package/liboauth/Config.in b/package/liboauth/Config.in deleted file mode 100644 index 4ed0efa6b1..0000000000 --- a/package/liboauth/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBOAUTH - bool "liboauth" - select BR2_PACKAGE_OPENSSL - help - liboauth is a collection of c functions implementing the oAuth - Core 1.0 Rev A standard API. liboauth provides basic functions - to escape and encode parameters according to oAuth specs and - offers high-level functions to sign requests or verify - signatures. - - http://liboauth.sourceforge.net/ diff --git a/package/liboauth/liboauth.hash b/package/liboauth/liboauth.hash deleted file mode 100644 index 5fa0353d50..0000000000 --- a/package/liboauth/liboauth.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f liboauth-1.0.3.tar.gz -sha256 c30608672733bf3abd2ccf6f3206be8d91b7ee58b007b2fdbcfbc61c655e7fb7 COPYING.MIT diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk deleted file mode 100644 index bd54330ddf..0000000000 --- a/package/liboauth/liboauth.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# liboauth -# -################################################################################ - -LIBOAUTH_VERSION = 1.0.3 -LIBOAUTH_SITE = http://downloads.sourceforge.net/project/liboauth -LIBOAUTH_INSTALL_STAGING = YES -LIBOAUTH_DEPENDENCIES += host-pkgconf openssl -LIBOAUTH_LICENSE = MIT -LIBOAUTH_LICENSE_FILES = COPYING.MIT - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -LIBOAUTH_DEPENDENCIES += libcurl -else -LIBOAUTH_CONF_OPTS += --disable-libcurl -endif - -$(eval $(autotools-package)) diff --git a/package/libogg/libogg.hash b/package/libogg/libogg.hash index 9727c1cfaa..d6a775dda8 100644 --- a/package/libogg/libogg.hash +++ b/package/libogg/libogg.hash @@ -1,5 +1,5 @@ # From https://www.xiph.org/downloads/ -sha256 c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705 libogg-1.3.5.tar.xz +sha256 5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061 libogg-1.3.6.tar.xz # Hash for license file: sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk index 49f9c7b6ac..e23b7b9154 100644 --- a/package/libogg/libogg.mk +++ b/package/libogg/libogg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOGG_VERSION = 1.3.5 +LIBOGG_VERSION = 1.3.6 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz LIBOGG_SITE = http://downloads.xiph.org/releases/ogg LIBOGG_LICENSE = BSD-3-Clause diff --git a/package/libolm/Config.in b/package/libolm/Config.in deleted file mode 100644 index a863216d5c..0000000000 --- a/package/libolm/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBOLM - bool "libolm" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - help - libolm is an implementation of the Double Ratchet - cryptographic ratchet in C++ - - https://gitlab.matrix.org/matrix-org/olm - -comment "libolm needs a toolchain w/ C++, gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash deleted file mode 100644 index a95115d2fe..0000000000 --- a/package/libolm/libolm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 1e90f9891009965fd064be747616da46b232086fe270b77605ec9bda34272a68 olm-3.2.16.tar.gz -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk deleted file mode 100644 index 5c8bcd1f59..0000000000 --- a/package/libolm/libolm.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libolm -# -################################################################################ - -LIBOLM_VERSION = 3.2.16 -LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz -LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) -LIBOLM_LICENSE = Apache-2.0 -LIBOLM_LICENSE_FILES = LICENSE -LIBOLM_CPE_ID_VENDOR = matrix -LIBOLM_CPE_ID_PRODUCT = olm -LIBOLM_INSTALL_STAGING = YES - -LIBOLM_CONF_OPTS = -DOLM_TESTS=OFF - -$(eval $(cmake-package)) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 6eb78e2009..af02a33746 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea libopenh264-2.4.1.tar.gz +sha256 558544ad358283a7ab2930d69a9ceddf913f4a51ee9bf1bfb9e377322af81a69 libopenh264-2.6.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index e371e4cdc0..c9584b4ebe 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.4.1 +LIBOPENH264_VERSION = 2.6.0 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE diff --git a/package/libopenmpt/libopenmpt.hash b/package/libopenmpt/libopenmpt.hash index 0289393024..f23956536d 100644 --- a/package/libopenmpt/libopenmpt.hash +++ b/package/libopenmpt/libopenmpt.hash @@ -1,3 +1,3 @@ # computed locally -sha256 53a798b8c6e2e1f695e8ad05e93a0c1b53199e5aa9981837c41696b370520767 libopenmpt-0.7.11+release.autotools.tar.gz -sha256 e3d7e76c6b441ddd9fff0a397e7b5e055a11678bd7c3b246a0ce13e352eb15e8 LICENSE +sha256 dcd7cde4f9c498eb496c4556e1c1b81353e2a74747e8270a42565117ea42e1f1 libopenmpt-0.7.13+release.autotools.tar.gz +sha256 d173856a870d3f6d0603060c615f5e3b145d79a008576e8efd2e5eab8b843430 LICENSE diff --git a/package/libopenmpt/libopenmpt.mk b/package/libopenmpt/libopenmpt.mk index 74ffbdbbd4..e8c4ace2db 100644 --- a/package/libopenmpt/libopenmpt.mk +++ b/package/libopenmpt/libopenmpt.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBOPENMPT_VERSION = 0.7.11 +LIBOPENMPT_VERSION = 0.7.13 LIBOPENMPT_SITE = https://lib.openmpt.org/files/libopenmpt/src LIBOPENMPT_SOURCE = libopenmpt-$(LIBOPENMPT_VERSION)+release.autotools.tar.gz LIBOPENMPT_LICENSE = BSD-3-Clause LIBOPENMPT_LICENSE_FILES = LICENSE LIBOPENMPT_CPE_ID_VENDOR = openmpt LIBOPENMPT_DEPENDENCIES = host-pkgconf +LIBOPENMPT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBOPENMPT_OPENMPT123),y) LIBOPENMPT_CONF_OPTS += --enable-openmpt123 diff --git a/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index 629d9c26ce..f74576beae 100644 --- a/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -18,10 +18,10 @@ Signed-off-by: Bernd Kuhls 1 file changed, 4 insertions(+) diff --git a/Configure b/Configure -index 5a699836f3..f9152b1702 100755 +index 15054f9..ac3206e 100755 --- a/Configure +++ b/Configure -@@ -1549,6 +1549,10 @@ unless ($disabled{asm}) { +@@ -1686,6 +1686,10 @@ unless ($disabled{asm}) { } } diff --git a/package/libopenssl/0003-Revert-Fix-static-builds.patch b/package/libopenssl/0003-Revert-Fix-static-builds.patch index b4b78c97fc..10ca97a240 100644 --- a/package/libopenssl/0003-Revert-Fix-static-builds.patch +++ b/package/libopenssl/0003-Revert-Fix-static-builds.patch @@ -15,10 +15,10 @@ Signed-off-by: Dario Binacchi 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure -index 2a5e58805c3b..0e8c1ce5cc74 100755 +index ac3206e..764ef89 100755 --- a/Configure +++ b/Configure -@@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) { +@@ -1510,10 +1510,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) { unless file_name_is_absolute($config{prefix}); } @@ -29,7 +29,7 @@ index 2a5e58805c3b..0e8c1ce5cc74 100755 # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; -@@ -1764,6 +1760,10 @@ if ($strict_warnings) +@@ -1808,6 +1804,10 @@ if ($strict_warnings) } } diff --git a/package/libopenssl/0004-Scope-aes_cfb128_vaes_encdec_wrapper-to-x64.patch b/package/libopenssl/0004-Scope-aes_cfb128_vaes_encdec_wrapper-to-x64.patch new file mode 100644 index 0000000000..ab4cf88a40 --- /dev/null +++ b/package/libopenssl/0004-Scope-aes_cfb128_vaes_encdec_wrapper-to-x64.patch @@ -0,0 +1,36 @@ +From a37d316e643a4c2be4708d504cc3ecbf37ec1773 Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Wed, 8 Oct 2025 18:50:33 +0200 +Subject: [PATCH] Scope aes_cfb128_vaes_encdec_wrapper to x64 + +This function is only used on x64 and relies on other functions which +are only implemented for x64. +Fixes #28745. + +Upstream: https://github.com/openssl/openssl/pull/28792 + +Signed-off-by: Bernd Kuhls +--- + providers/implementations/ciphers/cipher_aes_cfb_hw_aesni.inc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/providers/implementations/ciphers/cipher_aes_cfb_hw_aesni.inc b/providers/implementations/ciphers/cipher_aes_cfb_hw_aesni.inc +index d5577d00f132e..eb8e0164ac9ed 100644 +--- a/providers/implementations/ciphers/cipher_aes_cfb_hw_aesni.inc ++++ b/providers/implementations/ciphers/cipher_aes_cfb_hw_aesni.inc +@@ -30,6 +30,7 @@ + static int ossl_aes_cfb8_vaes_eligible(void) { return 0; } + static int ossl_aes_cfb1_vaes_eligible(void) { return 0; } + ++#if (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)) + /* active in 64-bit builds when AES-NI, AVX512F, and VAES are detected */ + static int aes_cfb128_vaes_encdec_wrapper( + PROV_CIPHER_CTX* dat, +@@ -56,6 +57,7 @@ static int aes_cfb128_vaes_encdec_wrapper( + + return 1; + } ++#endif + + /* generates AES round keys for AES-NI and VAES implementations */ + static int cipher_hw_aesni_initkey(PROV_CIPHER_CTX *dat, diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index dad30da34e..9322a56e76 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz.sha256 -sha256 e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf openssl-3.4.0.tar.gz +# From https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz.sha256 +sha256 b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 openssl-3.6.0.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 6a59cb2ff0..28dcb9dfc2 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.4.0 +LIBOPENSSL_VERSION = 3.6.0 LIBOPENSSL_SITE = https://github.com/openssl/openssl/releases/download/openssl-$(LIBOPENSSL_VERSION) LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in index 825e2b7e33..c2e905cd37 100644 --- a/package/libosmium/Config.in +++ b/package/libosmium/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBOSMIUM bool "libosmium" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST @@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBOSMIUM https://osmcode.org/libosmium/ -comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" +comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index 37bcdd267c..9f09024f74 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3d3e0873c6aaabb3b2ef4283896bebf233334891a7a49f4712af30ca6ed72477 libosmium-2.20.0.tar.gz +sha256 8f74e3f6ba295baa7325ae5606e8f74ad9056f1d6ab4555c50bff6aa8246f366 libosmium-2.22.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index c39e7d0152..5b73b3a128 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.20.0 +LIBOSMIUM_VERSION = 2.22.0 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE @@ -23,10 +23,6 @@ ifeq ($(BR2_PACKAGE_LIBGEOS),y) LIBOSMIUM_DEPENDENCIES += libgeos endif -ifeq ($(BR2_PACKAGE_PROJ),y) -LIBOSMIUM_DEPENDENCIES += proj -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) LIBOSMIUM_DEPENDENCIES += zlib endif diff --git a/package/libp11/0002-change-bool-attribute-true-false-names.patch b/package/libp11/0002-change-bool-attribute-true-false-names.patch new file mode 100644 index 0000000000..d63ec74590 --- /dev/null +++ b/package/libp11/0002-change-bool-attribute-true-false-names.patch @@ -0,0 +1,67 @@ +From 89ccb1f097f56a0933f881af051422b8d67e457f Mon Sep 17 00:00:00 2001 +From: dlegault +Date: Fri, 2 Sep 2022 12:01:23 -0400 +Subject: [PATCH] Change bool attribute true/false names to _true/_false + +This prevents conflicts with true/false defined in stdbool.h + +fixes #472 + +Upstream: https://github.com/OpenSC/libp11/commit/89ccb1f097f56a0933f881af051422b8d67e457f +Signed-off-by: Thomas Perale +--- + src/p11_attr.c | 6 +++--- + src/p11_ec.c | 14 +++++++------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/p11_attr.c b/src/p11_attr.c +index d425241a..a420efad 100644 +--- a/src/p11_attr.c ++++ b/src/p11_attr.c +@@ -123,9 +123,9 @@ unsigned int pkcs11_addattr(PKCS11_TEMPLATE *tmpl, int type, void *data, size_t + + void pkcs11_addattr_bool(PKCS11_TEMPLATE *tmpl, int type, int value) + { +- static CK_BBOOL true = CK_TRUE; +- static CK_BBOOL false = CK_FALSE; +- pkcs11_addattr(tmpl, type, value ? &true : &false, sizeof(CK_BBOOL)); ++ static CK_BBOOL _true = CK_TRUE; ++ static CK_BBOOL _false = CK_FALSE; ++ pkcs11_addattr(tmpl, type, value ? &_true : &_false, sizeof(CK_BBOOL)); + } + + void pkcs11_addattr_s(PKCS11_TEMPLATE *tmpl, int type, const char *s) +diff --git a/src/p11_ec.c b/src/p11_ec.c +index 4fb4efc3..16e3b3af 100644 +--- a/src/p11_ec.c ++++ b/src/p11_ec.c +@@ -590,22 +590,22 @@ static int pkcs11_ecdh_derive(unsigned char **out, size_t *outlen, + CK_MECHANISM mechanism; + int rv; + +- CK_BBOOL true = TRUE; +- CK_BBOOL false = FALSE; ++ CK_BBOOL _true = TRUE; ++ CK_BBOOL _false = FALSE; + CK_OBJECT_HANDLE newkey = CK_INVALID_HANDLE; + CK_OBJECT_CLASS newkey_class= CKO_SECRET_KEY; + CK_KEY_TYPE newkey_type = CKK_GENERIC_SECRET; + CK_ULONG newkey_len = key_len; + CK_OBJECT_HANDLE *tmpnewkey = (CK_OBJECT_HANDLE *)outnewkey; + CK_ATTRIBUTE newkey_template[] = { +- {CKA_TOKEN, &false, sizeof(false)}, /* session only object */ ++ {CKA_TOKEN, &_false, sizeof(_false)}, /* session only object */ + {CKA_CLASS, &newkey_class, sizeof(newkey_class)}, + {CKA_KEY_TYPE, &newkey_type, sizeof(newkey_type)}, + {CKA_VALUE_LEN, &newkey_len, sizeof(newkey_len)}, +- {CKA_SENSITIVE, &false, sizeof(false) }, +- {CKA_EXTRACTABLE, &true, sizeof(true) }, +- {CKA_ENCRYPT, &true, sizeof(true)}, +- {CKA_DECRYPT, &true, sizeof(true)} ++ {CKA_SENSITIVE, &_false, sizeof(_false) }, ++ {CKA_EXTRACTABLE, &_true, sizeof(_true) }, ++ {CKA_ENCRYPT, &_true, sizeof(_true)}, ++ {CKA_DECRYPT, &_true, sizeof(_true)} + }; + + memset(&mechanism, 0, sizeof(mechanism)); diff --git a/package/libpam-pkcs11/Config.in b/package/libpam-pkcs11/Config.in new file mode 100644 index 0000000000..8db34090b2 --- /dev/null +++ b/package/libpam-pkcs11/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_LIBPAM_PKCS11 + bool "libpam-pkcs11" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # pcsc-lite -> fork() + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite -> _Atomic keyword + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_PCSC_LITE + help + The Linux-PAM login module for X.509 certificate + based user login. + + https://github.com/OpenSC/pam_pkcs11 + +comment "libpam-pkcs11 needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libsexy/libsexy.hash b/package/libpam-pkcs11/libpam-pkcs11.hash similarity index 50% rename from package/libsexy/libsexy.hash rename to package/libpam-pkcs11/libpam-pkcs11.hash index 6f47e8ba7c..95747afc08 100644 --- a/package/libsexy/libsexy.hash +++ b/package/libpam-pkcs11/libpam-pkcs11.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz +sha256 8a853f4e6e136ceecdcffad798570e3d6af2fde08e975656b2dc931989c35aff pam_pkcs11-0.6.13.tar.gz sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/libpam-pkcs11/libpam-pkcs11.mk b/package/libpam-pkcs11/libpam-pkcs11.mk new file mode 100644 index 0000000000..4bad47f69a --- /dev/null +++ b/package/libpam-pkcs11/libpam-pkcs11.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# libpam-pkcs11 +# +################################################################################ + +LIBPAM_PKCS11_VERSION = 0.6.13 +LIBPAM_PKCS11_SOURCE = pam_pkcs11-$(LIBPAM_PKCS11_VERSION).tar.gz +LIBPAM_PKCS11_SITE = https://github.com/OpenSC/pam_pkcs11/archive/refs/tags +LIBPAM_PKCS11_LICENSE = LGPL-2.1 +LIBPAM_PKCS11_LICENSE_FILES = COPYING + +LIBPAM_PKCS11_AUTORECONF = YES + +LIBPAM_PKCS11_CONF_OPTS = \ + --libdir=/lib \ + --without-docbook \ + --without-ldap +LIBPAM_PKCS11_DEPENDENCIES = linux-pam openssl pcsc-lite + +$(eval $(autotools-package)) diff --git a/package/libpam-radius-auth/libpam-radius-auth.hash b/package/libpam-radius-auth/libpam-radius-auth.hash index 63f3f1e45e..383576f568 100644 --- a/package/libpam-radius-auth/libpam-radius-auth.hash +++ b/package/libpam-radius-auth/libpam-radius-auth.hash @@ -1,5 +1,7 @@ -# Locally calculated after checking PGP signature -sha256 798dc358e7a143163e103bd38c4101645b2e93d82aa0ec63d32c0cb929d9c65c libpam-radius-auth-2.0.0.tar.gz +# Locally calculated after checking PGP signature from +# https://github.com/FreeRADIUS/pam_radius/releases/download/release_3_0_0/pam_radius-3.0.0.tar.bz2.sig +# with key: BF2384EC6938B9744B03E2A620E37C25995B4F85 +sha256 fa622eef903fdcc8b3f64bd1d6437ccc1f160758ce65f947ceba951770071143 pam_radius-3.0.0.tar.bz2 # Hash for license file: sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 LICENSE diff --git a/package/libpam-radius-auth/libpam-radius-auth.mk b/package/libpam-radius-auth/libpam-radius-auth.mk index 9519aad750..772456ceae 100644 --- a/package/libpam-radius-auth/libpam-radius-auth.mk +++ b/package/libpam-radius-auth/libpam-radius-auth.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBPAM_RADIUS_AUTH_VERSION = 2.0.0 -LIBPAM_RADIUS_AUTH_SITE = $(call github,FreeRADIUS,pam_radius,release_$(subst .,_,$(LIBPAM_RADIUS_AUTH_VERSION))) +LIBPAM_RADIUS_AUTH_VERSION = 3.0.0 +LIBPAM_RADIUS_AUTH_SITE = https://github.com/FreeRADIUS/pam_radius/releases/download/release_$(subst .,_,$(LIBPAM_RADIUS_AUTH_VERSION)) +LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.bz2 LIBPAM_RADIUS_AUTH_DEPENDENCIES = linux-pam LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES LIBPAM_RADIUS_AUTH_LICENSE = GPL-2.0+ diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index d72e1090e3..e85d1f47b4 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5805c1171acab4af9684d7ad096dcb92f71fc42809852144e97e1413468c9981 pjproject-2.14.tar.gz +sha256 8f3bd99caf003f96ed8038b8a36031eb9d8cd9eaea1eaff7e01c2eef6bd55706 pjproject-2.15.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8169e0dcee..69b3c1cffc 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.14 +LIBPJSIP_VERSION = 2.15.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash index 283b435b7c..5fead5eb95 100644 --- a/package/libplatform/libplatform.hash +++ b/package/libplatform/libplatform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ebee46c76b86b40b703fa913465f5004fa3166eeb6a4794c58fc8a5c25702931 libplatform-a7cd0d5780ed80a4e70480d1650749f29e8a1fb2.tar.gz -sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h +sha256 2ab98ba486b28dd9c31e9f0f8a04eddad12c09ad1951c359fdef475baafba296 libplatform-2748be52ae27e6007ef548b697d4a03ff7de4291.tar.gz +sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a LICENSE.md diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk index 90192369fe..aeded5e9a7 100644 --- a/package/libplatform/libplatform.mk +++ b/package/libplatform/libplatform.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPLATFORM_VERSION = a7cd0d5780ed80a4e70480d1650749f29e8a1fb2 +LIBPLATFORM_VERSION = 2748be52ae27e6007ef548b697d4a03ff7de4291 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) LIBPLATFORM_LICENSE = GPL-2.0+ -LIBPLATFORM_LICENSE_FILES = src/os.h +LIBPLATFORM_LICENSE_FILES = LICENSE.md LIBPLATFORM_INSTALL_STAGING = YES $(eval $(cmake-package)) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index 3fd4033f83..1e57e1dc33 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,5 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/58815959/ -sha256 60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e libpng-1.6.44.tar.xz +# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.53/ +sha1 90672f16e545e4931abd50d372edef50596a1d46 libpng-1.6.53.tar.xz # Locally computed: -sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE +sha256 1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4 libpng-1.6.53.tar.xz +sha256 16d9daaafbf63a31a5bdc91d4600972548fef5aaa1244202393288dbd079c49a LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index c0b3ad24d5..7b66f17bbf 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,13 +4,15 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.44 +LIBPNG_VERSION = 1.6.53 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz -LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) +LIBPNG_SITE = https://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) LIBPNG_LICENSE = Libpng-2.0 LIBPNG_LICENSE_FILES = LICENSE LIBPNG_CPE_ID_VENDOR = libpng +# 0001-riscv-Support-only-RVV-1.0.patch +LIBPNG_AUTORECONF = YES LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib diff --git a/package/libpqxx/libpqxx.hash b/package/libpqxx/libpqxx.hash index 7e13e7415b..5fb93cbe63 100644 --- a/package/libpqxx/libpqxx.hash +++ b/package/libpqxx/libpqxx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e37d5774c39f6c802e32d7f418e88b8e530404fb54758516e884fc0ebdee6da4 libpqxx-7.9.2.tar.gz -sha256 3dd057a614dd24688aafc38d4c41111140e17147cfd94f314a80af30879641b2 COPYING +sha256 cfbbb1d93a0a3d81319ec71d9a3db80447bb033c4f6cee088554a88862fd77d7 libpqxx-7.10.1.tar.gz +sha256 2ccd31347a87796860a6600f57bf97ff4d54c203ecce4ea040425ba79774cf5f COPYING diff --git a/package/libpqxx/libpqxx.mk b/package/libpqxx/libpqxx.mk index c69b77260d..4364dd09a9 100644 --- a/package/libpqxx/libpqxx.mk +++ b/package/libpqxx/libpqxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPQXX_VERSION = 7.9.2 +LIBPQXX_VERSION = 7.10.1 LIBPQXX_SITE = $(call github,jtv,libpqxx,$(LIBPQXX_VERSION)) LIBPQXX_INSTALL_STAGING = YES LIBPQXX_DEPENDENCIES = postgresql diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 7937f989a0..3962e925ce 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 8690d25b4d110b6df28b31da0a8bf16c7e966d31abcfeeb854f2753451e7a400 libqmi-1.34.0.tar.gz +sha256 e254fafdd916a78a27126e6d72ae436662487f59c7de84d4d40286059af89093 libqmi-1.36.0.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 524333feba..c14caa3113 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.34.0 +LIBQMI_VERSION = 1.36.0 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB diff --git a/package/libqrencode/Config.in b/package/libqrencode/Config.in index b86662621e..7c3d9e4df6 100644 --- a/package/libqrencode/Config.in +++ b/package/libqrencode/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBQRENCODE QR Code is up to 7000 digits or 4000 characters, and is highly robust. - http://fukuchi.org/works/qrencode/index.html + https://fukuchi.org/en/works/qrencode/ if BR2_PACKAGE_LIBQRENCODE diff --git a/package/libqrencode/libqrencode.hash b/package/libqrencode/libqrencode.hash index ffcc537379..4586159420 100644 --- a/package/libqrencode/libqrencode.hash +++ b/package/libqrencode/libqrencode.hash @@ -1,5 +1,5 @@ -# From http://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz.sha -sha512 209bb656ae3f391b03c7b3ceb03e34f7320b0105babf48b619e7a299528b8828449e0e7696f0b5db0d99170a81709d0518e34835229a748701e7df784e58a9ce qrencode-4.1.1.tar.gz +# Locally computed: +sha256 5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c libqrencode-4.1.1.tar.gz # Hash for license file: sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk index 0062a96a39..8698d88611 100644 --- a/package/libqrencode/libqrencode.mk +++ b/package/libqrencode/libqrencode.mk @@ -5,12 +5,12 @@ ################################################################################ LIBQRENCODE_VERSION = 4.1.1 -LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz -LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode +LIBQRENCODE_SITE = $(call github,fukuchi,libqrencode,v$(LIBQRENCODE_VERSION)) LIBQRENCODE_DEPENDENCIES = host-pkgconf LIBQRENCODE_INSTALL_STAGING = YES LIBQRENCODE_LICENSE = LGPL-2.1+ LIBQRENCODE_LICENSE_FILES = COPYING +LIBQRENCODE_AUTORECONF = YES ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBQRENCODE_CONF_ENV += LIBS='-pthread' diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 838c598d78..36d9d31948 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fe7288013206854baf6e4417d0fb63ba4ed7227bf36fff021992671c2dd34b03 LibRaw-0.21.2.tar.gz +sha256 6be43f19397e43214ff56aab056bf3ff4925ca14012ce5a1538a172406a09e63 LibRaw-0.21.4.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 211b67f935..e320b2d835 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.21.2 +LIBRAW_VERSION = 0.21.4 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES diff --git a/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch b/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch index 6f63d7b546..12e67f9c91 100644 --- a/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch +++ b/package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch @@ -13,8 +13,9 @@ libtool: link: /home/peko/autobuild/instance-0/output-1/host/bin/arm-buildroot-l Fixes: - http://autobuild.buildroot.org/results/b6ac3664d61ad826515b57c4d057b6f001b5167d +Upstream: https://github.com/blunderer/libroxml/commit/34257124eefe0ca095ed54681c818381070ed549 + Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/blunderer/libroxml/pull/79] --- src/roxml_mem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libroxml/0002-Fix-musl-build-errors.patch b/package/libroxml/0002-Fix-musl-build-errors.patch new file mode 100644 index 0000000000..4931f12d5b --- /dev/null +++ b/package/libroxml/0002-Fix-musl-build-errors.patch @@ -0,0 +1,69 @@ +From abf4404c6c0213666f3fce73cff6e51435eac923 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 15 Nov 2025 12:29:33 +0100 +Subject: [PATCH] Fix musl build errors + +src/roxml_cat.c: In function 'display_usage': +src/roxml_cat.c:21:22: error: implicit declaration of function 'basename'; did you mean 'rename'? [-Wimplicit-function-declaration] + 21 | char *name = basename(prgname); + | ^~~~~~~~ + | rename +src/roxml_cat.c:21:22: error: initialization of 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] + +src/roxml_mem.c: In function 'roxml_malloc': +src/roxml_mem.c:138:18: error: assignment to 'long unsigned int' from 'pthread_t' {aka 'struct __pthread *'} makes integer from pointer without a cast [-Wint-conversion] + 138 | cell->id = pthread_self(); + +src/roxml_utils.h:51:16: error: returning 'pthread_t' {aka 'struct __pthread *'} from a function with return type 'long unsigned int' makes integer from pointer without a cast [-Wint-conversion] + 51 | return pthread_self(); + +Upstream: https://github.com/blunderer/libroxml/pull/86 + +Signed-off-by: Bernd Kuhls +--- + src/roxml_cat.c | 1 + + src/roxml_mem.c | 2 +- + src/roxml_utils.h | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/roxml_cat.c b/src/roxml_cat.c +index 11e42d9..4320efd 100644 +--- a/src/roxml_cat.c ++++ b/src/roxml_cat.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include "roxml.h" + + static struct option long_options[] = +diff --git a/src/roxml_mem.c b/src/roxml_mem.c +index 91b5db2..bf757bb 100644 +--- a/src/roxml_mem.c ++++ b/src/roxml_mem.c +@@ -135,7 +135,7 @@ ROXML_INT void *roxml_malloc(int size, int num, int type) + cell->next->prev = cell; + cell = cell->next; + cell->type = type; +- cell->id = pthread_self(); ++ cell->id = (unsigned long)pthread_self(); + cell->occ = size; + cell->ptr = calloc(num, size); + head_cell.prev = cell; +diff --git a/src/roxml_utils.h b/src/roxml_utils.h +index 3f50976..f5fc582 100644 +--- a/src/roxml_utils.h ++++ b/src/roxml_utils.h +@@ -48,7 +48,7 @@ ROXML_STATIC_INLINE ROXML_INT int roxml_unlock(node_t *n) + #else /* CONFIG_XML_THREAD_SAFE==1 */ + ROXML_STATIC_INLINE ROXML_INT unsigned long int roxml_thread_id(node_t *n) + { +- return pthread_self(); ++ return (unsigned long)pthread_self(); + } + + ROXML_STATIC_INLINE ROXML_INT int roxml_lock_init(node_t *n) +-- +2.47.3 + diff --git a/package/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index 3bdb1d0f46..0d6db785ec 100644 --- a/package/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -36,7 +36,7 @@ index 190016e2af34..7ee22fd35da3 100644 RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -193,7 +192,7 @@ install: all +@@ -195,7 +194,7 @@ install: all install-pywrap: pywrap CFLAGS="$(CPPFLAGS) $(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index fac9d3cef2..2f897e1287 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 ea03f42d13a4f95757997dba8cf0b26321fac5d2f164418b4cc856a92d2b17bd libselinux-3.7.tar.gz +sha256 e7ee2c01dba64a0c35c9d7c9c0e06209d8186b325b0638a0d83f915cc3c101e8 libselinux-3.9.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 360ab063ca..405c4a9f21 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.7 +LIBSELINUX_VERSION = 3.9 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 4d1b2161da..1fd5a8019b 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 e166cae29a417dab008db9ca0874023f353a3017b07693a036ed97487eda35b1 libsemanage-3.7.tar.gz +sha256 ec05850aef48bfb8e02135a7f4f3f7edba3670f63d5e67f2708d4bd80b9a4634 libsemanage-3.9.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE +sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 LICENSE diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index cf9e9c46fa..12e378f045 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.7 +LIBSEMANAGE_VERSION = 3.9 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = LICENSE @@ -41,7 +41,7 @@ HOST_LIBSEMANAGE_MAKE_OPTS += \ SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" \ DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf \ PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)/" \ - PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \ + PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" \ PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" define HOST_LIBSEMANAGE_BUILD_CMDS diff --git a/package/libsepol/0001-support-static-only.patch b/package/libsepol/0001-support-static-only.patch deleted file mode 100644 index b3eb608f7b..0000000000 --- a/package/libsepol/0001-support-static-only.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2140db697c7f1da2a0a3f7bbcb14c1a0dade84e5 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 9 Oct 2017 16:28:12 -0400 -Subject: [PATCH] Add support for static-only build - -Instead of unconditionally building shared libraries, this patch -improves the libsepol build system with a "STATIC" variable, which -when defined to some non-empty value, will disable the build of shared -libraries. It allows to support cases where the target architecture -does not have support for shared libraries. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Adam Duskett -Signed-off-by: Fabrice Fontaine -[Update for 2.8] ---- - src/Makefile | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile ---- libsepol-2.7.orig/src/Makefile 2018-01-15 21:07:51.285183415 +0100 -+++ libsepol-2.7/src/Makefile 2018-01-15 21:08:56.515182717 +0100 -@@ -39,7 +39,12 @@ - LN=gln - endif - --all: $(LIBA) $(LIBSO) $(LIBPC) -+ALL_TARGETS = $(LIBA) $(LIBPC) -+ifeq ($(STATIC),) -+ALL_TARGETS += $(LIBSO) -+endif -+ -+all: $(ALL_TARGETS) - - - $(LIBA): $(OBJS) -@@ -81,8 +86,10 @@ - install: all - test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR) - install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR) -+ifeq ($(STATIC),) - test -d $(DESTDIR)$(SHLIBDIR) || install -m 755 -d $(DESTDIR)$(SHLIBDIR) - install -m 755 $(LIBSO) $(DESTDIR)$(SHLIBDIR) -+endif - test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig - $(LN) -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 5dfd1a41d3..5b0832009c 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -12,6 +12,7 @@ if BR2_PACKAGE_LIBSEPOL config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION int "Policy version" + default 34 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 default 33 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 @@ -32,6 +33,7 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION >= 4.13 < 5.5 31 >= 5.5 < 5.8 32 >= 5.8 33 + >= 6.14 34 endif diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index dcc67ac638..08a1bf0cc2 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 cd741e25244e7ef6cd934d633614131a266c3eaeab33d8bfa45e8a93b45cc901 libsepol-3.7.tar.gz +sha256 ba630b59e50c5fbf9e9dd45eb3734f373cf78d689d8c10c537114c9bd769fa2e libsepol-3.9.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index af14778ead..3e1a275808 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.7 +LIBSEPOL_VERSION = 3.9 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = LICENSE @@ -17,7 +17,7 @@ HOST_LIBSEPOL_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) host-flex LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ifeq ($(BR2_STATIC_LIBS),y) -LIBSEPOL_MAKE_FLAGS += STATIC=1 +LIBSEPOL_MAKE_FLAGS += DISABLE_SHARED=y endif define LIBSEPOL_BUILD_CMDS diff --git a/package/libserialport/libserialport.hash b/package/libserialport/libserialport.hash index 39f0c8f1f0..5bf7823d63 100644 --- a/package/libserialport/libserialport.hash +++ b/package/libserialport/libserialport.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d libserialport-0.1.1.tar.gz +sha256 5deb92b5ca72c0347b07b786848350deca2dcfd975ce613b8e0e1d947a4b4ca9 libserialport-0.1.2.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/libserialport/libserialport.mk b/package/libserialport/libserialport.mk index 84d7a5315b..f3331db074 100644 --- a/package/libserialport/libserialport.mk +++ b/package/libserialport/libserialport.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBSERIALPORT_VERSION = 0.1.1 +LIBSERIALPORT_VERSION = 0.1.2 LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport LIBSERIALPORT_LICENSE = LGPL-3.0+ LIBSERIALPORT_LICENSE_FILES = COPYING LIBSERIALPORT_INSTALL_STAGING = YES LIBSERIALPORT_DEPENDENCIES = host-pkgconf -LIBSERIALPORT_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/libsexy/Config.in b/package/libsexy/Config.in deleted file mode 100644 index a2a2cc820c..0000000000 --- a/package/libsexy/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBSEXY - bool "libsexy" - depends on BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBXML2 - help - libsexy is a collection of GTK+ widgets that extend the - functionality of such standard widgets as GtkEntry and - GtkLabel by subclassing them and working around the - limitations of the widgets. - - https://blog.chipx86.com/tag/libsexy/ diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk deleted file mode 100644 index b079264122..0000000000 --- a/package/libsexy/libsexy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libsexy -# -################################################################################ - -LIBSEXY_VERSION = 0.1.11 -LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy -LIBSEXY_DEPENDENCIES = libgtk2 libxml2 -LIBSEXY_INSTALL_STAGING = YES -LIBSEXY_LICENSE = LGPL-2.1+ -LIBSEXY_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package/libsha1/0001-test-fix-gcc-14.x-compile-implicit-int.patch b/package/libsha1/0001-test-fix-gcc-14.x-compile-implicit-int.patch new file mode 100644 index 0000000000..603a2b77a8 --- /dev/null +++ b/package/libsha1/0001-test-fix-gcc-14.x-compile-implicit-int.patch @@ -0,0 +1,39 @@ +From d449f26f782be91b3847f88ed2bd937582a575b6 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 25 Aug 2024 11:33:59 +0200 +Subject: [PATCH] test: fix gcc-14.x compile (implicit int) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + test.c:14:8: error: type defaults to ‘int’ in declaration of ‘num_test’ [-Wimplicit-int] + 14 | static num_test; + | ^~~~~~~~ + +Signed-off-by: Peter Seiderer + +Upstream: https://github.com/dottedmag/libsha1/pull/1 + +Signed-off-by: Thomas Bonnefille +--- + test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test.c b/test.c +index 21a6525..1ec89d3 100644 +--- a/test.c ++++ b/test.c +@@ -11,7 +11,7 @@ static void print_hex(const char* data, size_t size) + printf("%x%x", ((unsigned char)data[i])/16, ((unsigned char)data[i])%16); + } + +-static num_test; ++static int num_test; + + static int do_test(const char* data, size_t size, const char* expected_dgst) + { +-- +2.47.1 + diff --git a/package/libshout/0001-icy-include-stdlib.h-and-stdio.h.patch b/package/libshout/0001-icy-include-stdlib.h-and-stdio.h.patch new file mode 100644 index 0000000000..cf3f02bae9 --- /dev/null +++ b/package/libshout/0001-icy-include-stdlib.h-and-stdio.h.patch @@ -0,0 +1,31 @@ +From 3ea67b511bdf4f12b3d5de4d7e133badf8c18d54 Mon Sep 17 00:00:00 2001 +From: Alexandre Janniaux +Date: Wed, 14 Sep 2022 16:29:22 +0200 +Subject: [PATCH] icy: include stdlib.h and stdio.h + +malloc, free, and snprintf had no valid previous declaration, making the +build fail with clang. + +Upstream: https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4 + +Signed-off-by: Bernd Kuhls +--- + src/icy.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/icy.c b/src/icy.c +index 8e83552..4de3c14 100644 +--- a/src/icy.c ++++ b/src/icy.c +@@ -24,6 +24,8 @@ + #endif + + #include ++#include /* for free() and malloc() */ ++#include /* for snprintf() */ + #include + + #include +-- +2.47.3 + diff --git a/package/libshout/0002-legacy-include-stdlib.h.patch b/package/libshout/0002-legacy-include-stdlib.h.patch new file mode 100644 index 0000000000..863d8095c8 --- /dev/null +++ b/package/libshout/0002-legacy-include-stdlib.h.patch @@ -0,0 +1,30 @@ +From 1742df325b52eef5af32c40893d821f895dc9d88 Mon Sep 17 00:00:00 2001 +From: Alexandre Janniaux +Date: Wed, 14 Sep 2022 16:30:03 +0200 +Subject: [PATCH] legacy: include stdlib.h + +free() had no previous declaration, making the build fail with clang. + +Upstream: https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4 + +Signed-off-by: Bernd Kuhls +--- + src/legacy.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/legacy.c b/src/legacy.c +index 3e1d3d7..e0ed961 100644 +--- a/src/legacy.c ++++ b/src/legacy.c +@@ -28,6 +28,8 @@ + #include "shout_private.h" + #include "util.h" + ++#include /* for free() */ ++ + int shout_set_format(shout_t *self, unsigned int format) + { + if (!self) +-- +2.47.3 + diff --git a/package/libsigc2/libsigc2.hash b/package/libsigc2/libsigc2.hash index 4811213568..e7bf7d4e7d 100644 --- a/package/libsigc2/libsigc2.hash +++ b/package/libsigc2/libsigc2.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.0.sha256sum -sha256 1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 libsigc++-2.12.0.tar.xz +# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.1.sha256sum +sha256 a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359bd50843 libsigc++-2.12.1.tar.xz # Locally calculated sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc2/libsigc2.mk b/package/libsigc2/libsigc2.mk index 845d03ba85..b5685fd50a 100644 --- a/package/libsigc2/libsigc2.mk +++ b/package/libsigc2/libsigc2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSIGC2_VERSION_MAJOR = 2.12 -LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).0 +LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).1 LIBSIGC2_SOURCE = libsigc++-$(LIBSIGC2_VERSION).tar.xz LIBSIGC2_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC2_VERSION_MAJOR) LIBSIGC2_INSTALL_STAGING = YES diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk index 639ee4dc25..22524dd4f6 100644 --- a/package/libsigrok/libsigrok.mk +++ b/package/libsigrok/libsigrok.mk @@ -65,4 +65,20 @@ else LIBSIGROK_CONF_OPTS += --disable-cxx endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +LIBSIGROK_UDEV_RULES = \ + 60-libsigrok.rules \ + $(if $(BR2_PACKAGE_SYSTEMD_LOGIND), \ + 61-libsigrok-uaccess.rules, \ + 61-libsigrok-plugdev.rules \ + ) +define LIBSIGROK_INSTALL_UDEV_RULES + $(foreach rule, $(LIBSIGROK_UDEV_RULES), \ + $(INSTALL) -D -m 0644 $(@D)/contrib/$(rule) \ + $(TARGET_DIR)/usr/lib/udev/rules.d/$(rule)$(sep) \ + ) +endef +LIBSIGROK_POST_INSTALL_TARGET_HOOKS += LIBSIGROK_INSTALL_UDEV_RULES +endif + $(eval $(autotools-package)) diff --git a/package/libsigrokdecode/Config.in b/package/libsigrokdecode/Config.in index b58c8a2a29..463cb25f28 100644 --- a/package/libsigrokdecode/Config.in +++ b/package/libsigrokdecode/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBSIGROKDECODE depends on !BR2_STATIC_LIBS # python3 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Libsigrokdecode is a shared library written in C, which provides (streaming) protocol decoding functionality. Say diff --git a/package/libsilk/libsilk.hash b/package/libsilk/libsilk.hash index 3ed7eac46c..c4a825852a 100644 --- a/package/libsilk/libsilk.hash +++ b/package/libsilk/libsilk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1b2d44790e841f0707b06fa10af798fa97a326ad4a6a3395b12be1231ed6f9a3 libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45-git4.tar.gz +sha256 2c04da72855b98b6c7bffe3d13940530d1d325b5aeaae5d7f0a211198247b8fc libsilk-f97ee24e561610618a5af9abd78e35d565f448d0.tar.gz sha256 62a5963f034024665641f4a9888b208f1e39aa7e29e87c9634fdcf07d3073baf COPYING diff --git a/package/libsilk/libsilk.mk b/package/libsilk/libsilk.mk index eba7085261..cd45d58ee8 100644 --- a/package/libsilk/libsilk.mk +++ b/package/libsilk/libsilk.mk @@ -4,10 +4,9 @@ # ################################################################################ -LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45 +LIBSILK_VERSION = f97ee24e561610618a5af9abd78e35d565f448d0 # we use the FreeSwitch fork because it contains pkgconf support -LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git -LIBSILK_SITE_METHOD = git +LIBSILK_SITE = $(call github,freeswitch,libsilk,$(LIBSILK_VERSION)) LIBSILK_LICENSE = BSD-3-Clause LIBSILK_LICENSE_FILES = COPYING LIBSILK_AUTORECONF = YES diff --git a/package/libsndfile/0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch b/package/libsndfile/0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch new file mode 100644 index 0000000000..79d521002c --- /dev/null +++ b/package/libsndfile/0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch @@ -0,0 +1,45 @@ +From 0754562e13d2e63a248a1c82f90b30bc0ffe307c Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 10 Oct 2023 16:10:34 -0400 +Subject: [PATCH] mat4/mat5: fix int overflow in dataend calculation + +The clang sanitizer warns of a possible signed integer overflow when +calculating the `dataend` value in `mat4_read_header()`. + +``` +src/mat4.c:323:41: runtime error: signed integer overflow: 205 * -100663296 cannot be represented in type 'int' +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:41 in +src/mat4.c:323:48: runtime error: signed integer overflow: 838860800 * 4 cannot be represented in type 'int' +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:48 in +``` + +Cast the offending `rows` and `cols` ints to `sf_count_t` (the type of +`dataend` before performing the calculation, to avoid the issue. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/789 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/0754562e13d2e63a248a1c82f90b30bc0ffe307c +Signed-off-by: Peter Korsgaard +--- + src/mat4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mat4.c b/src/mat4.c +index 0b1b414b..575683ba 100644 +--- a/src/mat4.c ++++ b/src/mat4.c +@@ -320,7 +320,7 @@ mat4_read_header (SF_PRIVATE *psf) + psf->filelength - psf->dataoffset, psf->sf.channels * psf->sf.frames * psf->bytewidth) ; + } + else if ((psf->filelength - psf->dataoffset) > psf->sf.channels * psf->sf.frames * psf->bytewidth) +- psf->dataend = psf->dataoffset + rows * cols * psf->bytewidth ; ++ psf->dataend = psf->dataoffset + (sf_count_t) rows * (sf_count_t) cols * psf->bytewidth ; + + psf->datalength = psf->filelength - psf->dataoffset - psf->dataend ; + +-- +2.39.5 + diff --git a/package/libsndfile/0002-au-avoid-int-overflow-while-calculating-data_end.patch b/package/libsndfile/0002-au-avoid-int-overflow-while-calculating-data_end.patch new file mode 100644 index 0000000000..28d8cfff64 --- /dev/null +++ b/package/libsndfile/0002-au-avoid-int-overflow-while-calculating-data_end.patch @@ -0,0 +1,58 @@ +From a5afea2e24080ddf5c7b8e26c29cdbd94ae8226b Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:36:02 -0400 +Subject: [PATCH] au: avoid int overflow while calculating data_end + +At several points in au_read_header(), we calculate the functional end +of the data segment by adding the (int)au_fmt.dataoffset and the +(int)au_fmt.datasize. This can overflow the implicit int_32 return value +and cause undefined behavior. + +Instead, precalculate the value and assign it to a 64-bit +(sf_count_t)data_end variable. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/a5afea2e24080ddf5c7b8e26c29cdbd94ae8226b +Signed-off-by: Peter Korsgaard +--- + src/au.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/au.c b/src/au.c +index 62bd691d..f68f2587 100644 +--- a/src/au.c ++++ b/src/au.c +@@ -291,6 +291,7 @@ static int + au_read_header (SF_PRIVATE *psf) + { AU_FMT au_fmt ; + int marker, dword ; ++ sf_count_t data_end ; + + memset (&au_fmt, 0, sizeof (au_fmt)) ; + psf_binheader_readf (psf, "pm", 0, &marker) ; +@@ -317,14 +318,15 @@ au_read_header (SF_PRIVATE *psf) + return SFE_AU_EMBED_BAD_LEN ; + } ; + ++ data_end = (sf_count_t) au_fmt.dataoffset + (sf_count_t) au_fmt.datasize ; + if (psf->fileoffset > 0) +- { psf->filelength = au_fmt.dataoffset + au_fmt.datasize ; ++ { psf->filelength = data_end ; + psf_log_printf (psf, " Data Size : %d\n", au_fmt.datasize) ; + } +- else if (au_fmt.datasize == -1 || au_fmt.dataoffset + au_fmt.datasize == psf->filelength) ++ else if (au_fmt.datasize == -1 || data_end == psf->filelength) + psf_log_printf (psf, " Data Size : %d\n", au_fmt.datasize) ; +- else if (au_fmt.dataoffset + au_fmt.datasize < psf->filelength) +- { psf->filelength = au_fmt.dataoffset + au_fmt.datasize ; ++ else if (data_end < psf->filelength) ++ { psf->filelength = data_end ; + psf_log_printf (psf, " Data Size : %d\n", au_fmt.datasize) ; + } + else +-- +2.39.5 + diff --git a/package/libsndfile/0003-avr-fix-int-overflow-in-avr_read_header.patch b/package/libsndfile/0003-avr-fix-int-overflow-in-avr_read_header.patch new file mode 100644 index 0000000000..f50e4fb552 --- /dev/null +++ b/package/libsndfile/0003-avr-fix-int-overflow-in-avr_read_header.patch @@ -0,0 +1,34 @@ +From 2f8eece78cc8b4dce6c95b3045867f0936714db8 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:46:29 -0400 +Subject: [PATCH] avr: fix int overflow in avr_read_header() + +Pre-cast hdr.frames to sf_count_t, to provide the calculation with +enough numeric space to avoid an int-overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/2f8eece78cc8b4dce6c95b3045867f0936714db8 +Signed-off-by: Peter Korsgaard +--- + src/avr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/avr.c b/src/avr.c +index 6c78ff69..1bc1ffc9 100644 +--- a/src/avr.c ++++ b/src/avr.c +@@ -162,7 +162,7 @@ avr_read_header (SF_PRIVATE *psf) + psf->endian = SF_ENDIAN_BIG ; + + psf->dataoffset = AVR_HDR_SIZE ; +- psf->datalength = hdr.frames * (hdr.rez / 8) ; ++ psf->datalength = (sf_count_t) hdr.frames * (hdr.rez / 8) ; + + if (psf->fileoffset > 0) + psf->filelength = AVR_HDR_SIZE + psf->datalength ; +-- +2.39.5 + diff --git a/package/libsndfile/0004-sds-fix-int-overflow-warning-in-sample-calculations.patch b/package/libsndfile/0004-sds-fix-int-overflow-warning-in-sample-calculations.patch new file mode 100644 index 0000000000..c93b1006d7 --- /dev/null +++ b/package/libsndfile/0004-sds-fix-int-overflow-warning-in-sample-calculations.patch @@ -0,0 +1,61 @@ +From 2e9f71dd5d5c85b5bd4a0573d1fa05b5b89b33a7 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:54:21 -0400 +Subject: [PATCH] sds: fix int overflow warning in sample calculations + +The sds_*byte_read() functions compose their uint_32 sample buffers by +shifting 7bit samples into a 32bit wide buffer, and adding them +together. Because the 7bit samples are stored in 32bit ints, code +fuzzers become concerned that the addition operation can overflow and +cause undefined behavior. + +Instead, bitwise-OR the bytes together - which should accomplish the +same arithmetic operation, without risking an int-overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart + +Do the same for the 3byte and 4byte read functions. + +Upstream: https://github.com/libsndfile/libsndfile/commit/2e9f71dd5d5c85b5bd4a0573d1fa05b5b89b33a7 +Signed-off-by: Peter Korsgaard +--- + src/sds.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/sds.c b/src/sds.c +index 6bc76171..2a0f164c 100644 +--- a/src/sds.c ++++ b/src/sds.c +@@ -454,7 +454,7 @@ sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) + + ucptr = psds->read_data + 5 ; + for (k = 0 ; k < 120 ; k += 2) +- { sample = arith_shift_left (ucptr [k], 25) + arith_shift_left (ucptr [k + 1], 18) ; ++ { sample = arith_shift_left (ucptr [k], 25) | arith_shift_left (ucptr [k + 1], 18) ; + psds->read_samples [k / 2] = (int) (sample - 0x80000000) ; + } ; + +@@ -498,7 +498,7 @@ sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) + + ucptr = psds->read_data + 5 ; + for (k = 0 ; k < 120 ; k += 3) +- { sample = (((uint32_t) ucptr [k]) << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) ; ++ { sample = (((uint32_t) ucptr [k]) << 25) | (ucptr [k + 1] << 18) | (ucptr [k + 2] << 11) ; + psds->read_samples [k / 3] = (int) (sample - 0x80000000) ; + } ; + +@@ -542,7 +542,7 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) + + ucptr = psds->read_data + 5 ; + for (k = 0 ; k < 120 ; k += 4) +- { sample = (((uint32_t) ucptr [k]) << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) + (ucptr [k + 3] << 4) ; ++ { sample = (((uint32_t) ucptr [k]) << 25) | (ucptr [k + 1] << 18) | (ucptr [k + 2] << 11) | (ucptr [k + 3] << 4) ; + psds->read_samples [k / 4] = (int) (sample - 0x80000000) ; + } ; + +-- +2.39.5 + diff --git a/package/libsndfile/0005-aiff-fix-int-overflow-when-counting-header-elements.patch b/package/libsndfile/0005-aiff-fix-int-overflow-when-counting-header-elements.patch new file mode 100644 index 0000000000..5efb6f2368 --- /dev/null +++ b/package/libsndfile/0005-aiff-fix-int-overflow-when-counting-header-elements.patch @@ -0,0 +1,39 @@ +From 187451dbd3c044f9a76b6c1d950d458de0103180 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 17:26:51 -0400 +Subject: [PATCH] aiff: fix int overflow when counting header elements + +aiff_read_basc_chunk() tries to count the AIFF header size by keeping +track of the bytes returned by psf_binheader_readf(). Though improbable, +it is technically possible for these added bytes to exceed the int-sized +`count` accumulator. + +Use a 64-bit sf_count_t type for `count`, to ensure that it always has +enough numeric space. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/187451dbd3c044f9a76b6c1d950d458de0103180 +Signed-off-by: Peter Korsgaard +--- + src/aiff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/aiff.c b/src/aiff.c +index ac3655e9..6d8f1bc8 100644 +--- a/src/aiff.c ++++ b/src/aiff.c +@@ -1702,7 +1702,7 @@ static int + aiff_read_basc_chunk (SF_PRIVATE * psf, int datasize) + { const char * type_str ; + basc_CHUNK bc ; +- int count ; ++ sf_count_t count ; + + count = psf_binheader_readf (psf, "E442", &bc.version, &bc.numBeats, &bc.rootNote) ; + count += psf_binheader_readf (psf, "E222", &bc.scaleType, &bc.sigNumerator, &bc.sigDenominator) ; +-- +2.39.5 + diff --git a/package/libsndfile/0006-ircam-fix-int-overflow-in-ircam_read_header.patch b/package/libsndfile/0006-ircam-fix-int-overflow-in-ircam_read_header.patch new file mode 100644 index 0000000000..b240a38e2f --- /dev/null +++ b/package/libsndfile/0006-ircam-fix-int-overflow-in-ircam_read_header.patch @@ -0,0 +1,82 @@ +From 5d5319300587e3d4a146332a2f48674ceb8a0257 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 17:43:02 -0400 +Subject: [PATCH] ircam: fix int overflow in ircam_read_header() + +When reading the IRCAM header, it is possible for the calculated +blockwidth to exceed the bounds of a signed int32. + +Use a 64bit sf_count_t to store the blockwidth. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/5d5319300587e3d4a146332a2f48674ceb8a0257 +Signed-off-by: Peter Korsgaard +--- + src/common.h | 2 +- + src/ircam.c | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/common.h b/src/common.h +index cd9ac8b0..01f6ae09 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -439,7 +439,7 @@ typedef struct sf_private_tag + sf_count_t datalength ; /* Length in bytes of the audio data. */ + sf_count_t dataend ; /* Offset to file tailer. */ + +- int blockwidth ; /* Size in bytes of one set of interleaved samples. */ ++ sf_count_t blockwidth ; /* Size in bytes of one set of interleaved samples. */ + int bytewidth ; /* Size in bytes of one sample (one channel). */ + + void *dither ; +diff --git a/src/ircam.c b/src/ircam.c +index 8e7cdba8..3d73ba44 100644 +--- a/src/ircam.c ++++ b/src/ircam.c +@@ -171,35 +171,35 @@ ircam_read_header (SF_PRIVATE *psf) + switch (encoding) + { case IRCAM_PCM_16 : + psf->bytewidth = 2 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_PCM_16 ; + break ; + + case IRCAM_PCM_32 : + psf->bytewidth = 4 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_PCM_32 ; + break ; + + case IRCAM_FLOAT : + psf->bytewidth = 4 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_FLOAT ; + break ; + + case IRCAM_ALAW : + psf->bytewidth = 1 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_ALAW ; + break ; + + case IRCAM_ULAW : + psf->bytewidth = 1 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_ULAW ; + break ; +-- +2.39.5 + diff --git a/package/libsndfile/0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch b/package/libsndfile/0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch new file mode 100644 index 0000000000..ef4d6c0f04 --- /dev/null +++ b/package/libsndfile/0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch @@ -0,0 +1,48 @@ +From 39f2a4ffe5ab77d1cadc2057c2db046a9a3d5d65 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:12:22 -0400 +Subject: [PATCH] mat4/mat5: fix int overflow when calculating blockwidth + +Pre-cast the components of the blockwidth calculation to sf_count_t to +avoid overflowing integers during calculation. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/39f2a4ffe5ab77d1cadc2057c2db046a9a3d5d65 +Signed-off-by: Peter Korsgaard +--- + src/mat4.c | 2 +- + src/mat5.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mat4.c b/src/mat4.c +index 575683ba..9f046f0c 100644 +--- a/src/mat4.c ++++ b/src/mat4.c +@@ -104,7 +104,7 @@ mat4_open (SF_PRIVATE *psf) + + psf->container_close = mat4_close ; + +- psf->blockwidth = psf->bytewidth * psf->sf.channels ; ++ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ; + + switch (subformat) + { case SF_FORMAT_PCM_16 : +diff --git a/src/mat5.c b/src/mat5.c +index da5a6eca..20f0ea64 100644 +--- a/src/mat5.c ++++ b/src/mat5.c +@@ -114,7 +114,7 @@ mat5_open (SF_PRIVATE *psf) + + psf->container_close = mat5_close ; + +- psf->blockwidth = psf->bytewidth * psf->sf.channels ; ++ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ; + + switch (subformat) + { case SF_FORMAT_PCM_U8 : +-- +2.39.5 + diff --git a/package/libsndfile/0008-common-fix-int-overflow-in-psf_binheader_readf.patch b/package/libsndfile/0008-common-fix-int-overflow-in-psf_binheader_readf.patch new file mode 100644 index 0000000000..c9b6ff18f2 --- /dev/null +++ b/package/libsndfile/0008-common-fix-int-overflow-in-psf_binheader_readf.patch @@ -0,0 +1,181 @@ +From 6be8906740cdca067f12920bb4a63f728485aff0 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Mon, 16 Oct 2023 12:37:47 -0400 +Subject: [PATCH] common: fix int overflow in psf_binheader_readf() + +The psf_binheader_readf() function attempts to count and return the +number of bytes traversed in the header. During this accumulation, it is +possible to overflow the int-sized byte_count variable. + +Avoid this overflow by checking that the accumulated bytes do not exceed +INT_MAX and throwing an error if they do. This implies that files with +multi-gigabyte headers threaten to produce this error, but I imagine +those files don't really exist - and this error is better than the +undefined behavior which would have resulted previously. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/6be8906740cdca067f12920bb4a63f728485aff0 +Signed-off-by: Peter Korsgaard +--- + src/common.c | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +diff --git a/src/common.c b/src/common.c +index b877aa86..8982379a 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + #include + #if HAVE_UNISTD_H +@@ -990,6 +991,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + double *doubleptr ; + char c ; + int byte_count = 0, count = 0 ; ++ int read_bytes = 0 ; + + if (! format) + return psf_ftell (psf) ; +@@ -998,6 +1000,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + + while ((c = *format++)) + { ++ read_bytes = 0 ; + if (psf->header.indx + 16 >= psf->header.len && psf_bump_header_allocation (psf, 16)) + break ; + +@@ -1014,7 +1017,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; + ucptr = (unsigned char*) intptr ; +- byte_count += header_read (psf, ucptr, sizeof (int)) ; ++ read_bytes = header_read (psf, ucptr, sizeof (int)) ; + *intptr = GET_MARKER (ucptr) ; + break ; + +@@ -1022,7 +1025,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; + ucptr = (unsigned char*) intptr ; +- byte_count += header_read (psf, sixteen_bytes, sizeof (sixteen_bytes)) ; ++ read_bytes = header_read (psf, sixteen_bytes, sizeof (sixteen_bytes)) ; + { int k ; + intdata = 0 ; + for (k = 0 ; k < 16 ; k++) +@@ -1034,14 +1037,14 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case '1' : + charptr = va_arg (argptr, char*) ; + *charptr = 0 ; +- byte_count += header_read (psf, charptr, sizeof (char)) ; ++ read_bytes = header_read (psf, charptr, sizeof (char)) ; + break ; + + case '2' : /* 2 byte value with the current endian-ness */ + shortptr = va_arg (argptr, unsigned short*) ; + *shortptr = 0 ; + ucptr = (unsigned char*) shortptr ; +- byte_count += header_read (psf, ucptr, sizeof (short)) ; ++ read_bytes = header_read (psf, ucptr, sizeof (short)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *shortptr = GET_BE_SHORT (ucptr) ; + else +@@ -1051,7 +1054,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case '3' : /* 3 byte value with the current endian-ness */ + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; +- byte_count += header_read (psf, sixteen_bytes, 3) ; ++ read_bytes = header_read (psf, sixteen_bytes, 3) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *intptr = GET_BE_3BYTE (sixteen_bytes) ; + else +@@ -1062,7 +1065,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; + ucptr = (unsigned char*) intptr ; +- byte_count += header_read (psf, ucptr, sizeof (int)) ; ++ read_bytes = header_read (psf, ucptr, sizeof (int)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *intptr = psf_get_be32 (ucptr, 0) ; + else +@@ -1072,7 +1075,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case '8' : /* 8 byte value with the current endian-ness */ + countptr = va_arg (argptr, sf_count_t *) ; + *countptr = 0 ; +- byte_count += header_read (psf, sixteen_bytes, 8) ; ++ read_bytes = header_read (psf, sixteen_bytes, 8) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + countdata = psf_get_be64 (sixteen_bytes, 0) ; + else +@@ -1083,7 +1086,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case 'f' : /* Float conversion */ + floatptr = va_arg (argptr, float *) ; + *floatptr = 0.0 ; +- byte_count += header_read (psf, floatptr, sizeof (float)) ; ++ read_bytes = header_read (psf, floatptr, sizeof (float)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *floatptr = float32_be_read ((unsigned char*) floatptr) ; + else +@@ -1093,7 +1096,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case 'd' : /* double conversion */ + doubleptr = va_arg (argptr, double *) ; + *doubleptr = 0.0 ; +- byte_count += header_read (psf, doubleptr, sizeof (double)) ; ++ read_bytes = header_read (psf, doubleptr, sizeof (double)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *doubleptr = double64_be_read ((unsigned char*) doubleptr) ; + else +@@ -1117,7 +1120,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + charptr = va_arg (argptr, char*) ; + count = va_arg (argptr, size_t) ; + memset (charptr, 0, count) ; +- byte_count += header_read (psf, charptr, count) ; ++ read_bytes = header_read (psf, charptr, count) ; + break ; + + case 'G' : +@@ -1128,7 +1131,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + if (psf->header.indx + count >= psf->header.len && psf_bump_header_allocation (psf, count)) + break ; + +- byte_count += header_gets (psf, charptr, count) ; ++ read_bytes = header_gets (psf, charptr, count) ; + break ; + + case 'z' : +@@ -1152,7 +1155,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case 'j' : /* Seek to position from current position. */ + count = va_arg (argptr, size_t) ; + header_seek (psf, count, SEEK_CUR) ; +- byte_count += count ; ++ read_bytes = count ; + break ; + + case '!' : /* Clear buffer, forcing re-read. */ +@@ -1164,8 +1167,17 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + psf->error = SFE_INTERNAL ; + break ; + } ; ++ ++ if (read_bytes > 0 && byte_count > (INT_MAX - read_bytes)) ++ { psf_log_printf (psf, "Header size exceeds INT_MAX. Aborting.", c) ; ++ psf->error = SFE_INTERNAL ; ++ break ; ++ } else ++ { byte_count += read_bytes ; + } ; + ++ } ; /*end while*/ ++ + va_end (argptr) ; + + return byte_count ; +-- +2.39.5 + diff --git a/package/libsndfile/0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch b/package/libsndfile/0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch new file mode 100644 index 0000000000..266fa661b1 --- /dev/null +++ b/package/libsndfile/0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch @@ -0,0 +1,233 @@ +From 71565532463b22c24824101845a533a67bff4c9c Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Thu, 19 Oct 2023 14:07:19 -0400 +Subject: [PATCH] nms_adpcm: fix int overflow in signal estimate + +It is possible (though functionally incorrect) for the signal estimate +calculation in nms_adpcm_update() to overflow the int value of s_e, +resulting in undefined behavior. + +Since adpcm state signal values are never practically larger than +16 bits, use smaller numeric sizes throughout the file to avoid the +overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Authored-by: Arthur Taylor +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/71565532463b22c24824101845a533a67bff4c9c +[Peter: adjust for 1.2.2] +Signed-off-by: Peter Korsgaard +--- + src/nms_adpcm.c | 81 ++++++++++++++++++++++++------------------------- + 1 file changed, 40 insertions(+), 41 deletions(-) + +diff --git a/src/nms_adpcm.c b/src/nms_adpcm.c +index 5999be1f..dca85f0b 100644 +--- a/src/nms_adpcm.c ++++ b/src/nms_adpcm.c +@@ -48,36 +48,36 @@ + /* Variable names from ITU G.726 spec */ + struct nms_adpcm_state + { /* Log of the step size multiplier. Operated on by codewords. */ +- int yl ; ++ short yl ; + + /* Quantizer step size multiplier. Generated from yl. */ +- int y ; ++ short y ; + + /* Coefficents of the pole predictor */ +- int a [2] ; ++ short a [2] ; + + /* Coefficents of the zero predictor */ +- int b [6] ; ++ short b [6] ; + + /* Previous quantized deltas (multiplied by 2^14) */ +- int d_q [7] ; ++ short d_q [7] ; + + /* d_q [x] + s_ez [x], used by the pole-predictor for signs only. */ +- int p [3] ; ++ short p [3] ; + + /* Previous reconstructed signal values. */ +- int s_r [2] ; ++ short s_r [2] ; + + /* Zero predictor components of the signal estimate. */ +- int s_ez ; ++ short s_ez ; + + /* Signal estimate, (including s_ez). */ +- int s_e ; ++ short s_e ; + + /* The most recent codeword (enc:generated, dec:inputted) */ +- int Ik ; ++ char Ik ; + +- int parity ; ++ char parity ; + + /* + ** Offset into code tables for the bitrate. +@@ -109,7 +109,7 @@ typedef struct + } NMS_ADPCM_PRIVATE ; + + /* Pre-computed exponential interval used in the antilog approximation. */ +-static unsigned int table_expn [] = ++static unsigned short table_expn [] = + { 0x4000, 0x4167, 0x42d5, 0x444c, 0x45cb, 0x4752, 0x48e2, 0x4a7a, + 0x4c1b, 0x4dc7, 0x4f7a, 0x5138, 0x52ff, 0x54d1, 0x56ac, 0x5892, + 0x5a82, 0x5c7e, 0x5e84, 0x6096, 0x62b4, 0x64dd, 0x6712, 0x6954, +@@ -117,21 +117,21 @@ static unsigned int table_expn [] = + } ; + + /* Table mapping codewords to scale factor deltas. */ +-static int table_scale_factor_step [] = ++static short table_scale_factor_step [] = + { 0x0, 0x0, 0x0, 0x0, 0x4b0, 0x0, 0x0, 0x0, /* 2-bit */ + -0x3c, 0x0, 0x90, 0x0, 0x2ee, 0x0, 0x898, 0x0, /* 3-bit */ + -0x30, 0x12, 0x6b, 0xc8, 0x188, 0x2e0, 0x551, 0x1150, /* 4-bit */ + } ; + + /* Table mapping codewords to quantized delta interval steps. */ +-static unsigned int table_step [] = ++static unsigned short table_step [] = + { 0x73F, 0, 0, 0, 0x1829, 0, 0, 0, /* 2-bit */ + 0x3EB, 0, 0xC18, 0, 0x1581, 0, 0x226E, 0, /* 3-bit */ + 0x20C, 0x635, 0xA83, 0xF12, 0x1418, 0x19E3, 0x211A, 0x2BBA, /* 4-bit */ + } ; + + /* Binary search lookup table for quantizing using table_step. */ +-static int table_step_search [] = ++static short table_step_search [] = + { 0, 0x1F6D, 0, -0x1F6D, 0, 0, 0, 0, /* 2-bit */ + 0x1008, 0x1192, 0, -0x219A, 0x1656, -0x1656, 0, 0, /* 3-bit */ + 0x872, 0x1277, -0x8E6, -0x232B, 0xD06, -0x17D7, -0x11D3, 0, /* 4-bit */ +@@ -179,23 +179,23 @@ static sf_count_t nms_adpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) + ** Maps [1,20480] to [1,1024] in an exponential relationship. This is + ** approximately ret = b^exp where b = e^(ln(1024)/ln(20480)) ~= 1.0003385 + */ +-static inline int +-nms_adpcm_antilog (int exp) +-{ int ret ; ++static inline short ++nms_adpcm_antilog (short exp) ++{ int_fast32_t r ; + +- ret = 0x1000 ; +- ret += (((exp & 0x3f) * 0x166b) >> 12) ; +- ret *= table_expn [(exp & 0x7c0) >> 6] ; +- ret >>= (26 - (exp >> 11)) ; ++ r = 0x1000 ; ++ r += (((int_fast32_t) (exp & 0x3f) * 0x166b) >> 12) ; ++ r *= table_expn [(exp & 0x7c0) >> 6] ; ++ r >>= (26 - (exp >> 11)) ; + +- return ret ; ++ return (short) r ; + } /* nms_adpcm_antilog */ + + static void + nms_adpcm_update (struct nms_adpcm_state *s) + { /* Variable names from ITU G.726 spec */ +- int a1ul ; +- int fa1 ; ++ short a1ul, fa1 ; ++ int_fast32_t se ; + int i ; + + /* Decay and Modify the scale factor in the log domain based on the codeword. */ +@@ -222,7 +222,7 @@ nms_adpcm_update (struct nms_adpcm_state *s) + else if (fa1 > 256) + fa1 = 256 ; + +- s->a [0] = (0xff * s->a [0]) >> 8 ; ++ s->a [0] = (s->a [0] * 0xff) >> 8 ; + if (s->p [0] != 0 && s->p [1] != 0 && ((s->p [0] ^ s->p [1]) < 0)) + s->a [0] -= 192 ; + else +@@ -230,7 +230,7 @@ nms_adpcm_update (struct nms_adpcm_state *s) + fa1 = -fa1 ; + } + +- s->a [1] = fa1 + ((0xfe * s->a [1]) >> 8) ; ++ s->a [1] = fa1 + ((s->a [1] * 0xfe) >> 8) ; + if (s->p [0] != 0 && s->p [2] != 0 && ((s->p [0] ^ s->p [2]) < 0)) + s->a [1] -= 128 ; + else +@@ -250,19 +250,18 @@ nms_adpcm_update (struct nms_adpcm_state *s) + s->a [0] = a1ul ; + } ; + +- /* Compute the zero predictor estimate. Rotate past deltas too. */ +- s->s_ez = 0 ; ++ /* Compute the zero predictor estimate and rotate past deltas. */ ++ se = 0 ; + for (i = 5 ; i >= 0 ; i--) +- { s->s_ez += s->d_q [i] * s->b [i] ; ++ { se += (int_fast32_t) s->d_q [i] * s->b [i] ; + s->d_q [i + 1] = s->d_q [i] ; + } ; ++ s->s_ez = se >> 14 ; + +- /* Compute the signal estimate. */ +- s->s_e = s->a [0] * s->s_r [0] + s->a [1] * s->s_r [1] + s->s_ez ; +- +- /* Return to scale */ +- s->s_ez >>= 14 ; +- s->s_e >>= 14 ; ++ /* Complete the signal estimate. */ ++ se += (int_fast32_t) s->a [0] * s->s_r [0] ; ++ se += (int_fast32_t) s->a [1] * s->s_r [1] ; ++ s->s_e = se >> 14 ; + + /* Rotate members to prepare for next iteration. */ + s->s_r [1] = s->s_r [0] ; +@@ -274,7 +273,7 @@ nms_adpcm_update (struct nms_adpcm_state *s) + static int16_t + nms_adpcm_reconstruct_sample (struct nms_adpcm_state *s, uint8_t I) + { /* Variable names from ITU G.726 spec */ +- int dqx ; ++ int_fast32_t dqx ; + + /* + ** The ordering of the 12-bit right-shift is a precision loss. It agrees +@@ -308,17 +307,17 @@ nms_adpcm_codec_init (struct nms_adpcm_state *s, enum nms_enc_type type) + /* + ** nms_adpcm_encode_sample() + ** +-** Encode a linear 16-bit pcm sample into a 2,3, or 4 bit NMS-ADPCM codeword ++** Encode a linear 16-bit pcm sample into a 2, 3, or 4 bit NMS-ADPCM codeword + ** using and updating the predictor state. + */ + static uint8_t + nms_adpcm_encode_sample (struct nms_adpcm_state *s, int16_t sl) + { /* Variable names from ITU G.726 spec */ +- int d ; ++ int_fast32_t d ; + uint8_t I ; + + /* Down scale the sample from 16 => ~14 bits. */ +- sl = (sl * 0x1fdf) / 0x7fff ; ++ sl = ((int_fast32_t) sl * 0x1fdf) / 0x7fff ; + + /* Compute estimate, and delta from actual value */ + nms_adpcm_update (s) ; +@@ -407,7 +406,7 @@ nms_adpcm_encode_sample (struct nms_adpcm_state *s, int16_t sl) + */ + static int16_t + nms_adpcm_decode_sample (struct nms_adpcm_state *s, uint8_t I) +-{ int sl ; ++{ int_fast32_t sl ; + + nms_adpcm_update (s) ; + sl = nms_adpcm_reconstruct_sample (s, I) ; +-- +2.39.5 + diff --git a/package/libsndfile/0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch b/package/libsndfile/0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch new file mode 100644 index 0000000000..0763a53de4 --- /dev/null +++ b/package/libsndfile/0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch @@ -0,0 +1,39 @@ +From 3fb27a2c93a11dd3321b0b13140d89ebb39060cb Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 11:50:53 -0400 +Subject: [PATCH] nms_adpcm: fix int overflow in sf.frames calc + +When calculating sf.frames from the blocks_total PNMS variable, it is +theoretically possible to overflow the blocks_total int boundaries, +leading to undefined behavior. + +Cast blocks_total to a long-sized sf_count_t before the calculation, to +provide it with enough numeric space and because that is the final +typing regardless. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/3fb27a2c93a11dd3321b0b13140d89ebb39060cb +Signed-off-by: Peter Korsgaard +--- + src/nms_adpcm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nms_adpcm.c b/src/nms_adpcm.c +index dca85f0b..61d171c7 100644 +--- a/src/nms_adpcm.c ++++ b/src/nms_adpcm.c +@@ -1090,7 +1090,7 @@ nms_adpcm_init (SF_PRIVATE *psf) + else + pnms->blocks_total = psf->datalength / (pnms->shortsperblock * sizeof (short)) ; + +- psf->sf.frames = pnms->blocks_total * NMS_SAMPLES_PER_BLOCK ; ++ psf->sf.frames = (sf_count_t) pnms->blocks_total * NMS_SAMPLES_PER_BLOCK ; + psf->codec_close = nms_adpcm_close ; + psf->seek = nms_adpcm_seek ; + +-- +2.39.5 + diff --git a/package/libsndfile/0011-pcm-fix-int-overflow-in-pcm_init.patch b/package/libsndfile/0011-pcm-fix-int-overflow-in-pcm_init.patch new file mode 100644 index 0000000000..aa30090a69 --- /dev/null +++ b/package/libsndfile/0011-pcm-fix-int-overflow-in-pcm_init.patch @@ -0,0 +1,35 @@ +From 09f8f8d5544d98a5a2d28504c02314a2a816ac37 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 11:57:23 -0400 +Subject: [PATCH] pcm: fix int overflow in pcm_init() + +Cast the int-sized bytewidth variable to a long-sized sf_count_t type +prior to calculating the blockwidth, to provide the calculation with +enough numeric space and sf_count_t is the final typing regardless. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/09f8f8d5544d98a5a2d28504c02314a2a816ac37 +Signed-off-by: Peter Korsgaard +--- + src/pcm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pcm.c b/src/pcm.c +index bdf46183..a42e4868 100644 +--- a/src/pcm.c ++++ b/src/pcm.c +@@ -127,7 +127,7 @@ pcm_init (SF_PRIVATE *psf) + return SFE_INTERNAL ; + } ; + +- psf->blockwidth = psf->bytewidth * psf->sf.channels ; ++ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ; + + if ((SF_CODEC (psf->sf.format)) == SF_FORMAT_PCM_S8) + chars = SF_CHARS_SIGNED ; +-- +2.39.5 + diff --git a/package/libsndfile/0012-rf64-fix-int-overflow-in-rf64_read_header.patch b/package/libsndfile/0012-rf64-fix-int-overflow-in-rf64_read_header.patch new file mode 100644 index 0000000000..8d39986260 --- /dev/null +++ b/package/libsndfile/0012-rf64-fix-int-overflow-in-rf64_read_header.patch @@ -0,0 +1,40 @@ +From 49704025956f03751d3436a0bb42287cd7f434b6 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 12:01:00 -0400 +Subject: [PATCH] rf64: fix int overflow in rf64_read_header() + +When checking for mismatches between the filelength and riff_size, it is +possible to overflow the temporary riff_size value used in the +comparison by adding a static offset; which is probably fine, but it is +offensive to overflow fuzzers. + +Since filelength is always a positive value, simply move the offset to +the other side of the comparison operator as a negative value, avoid the +possibility of an overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/49704025956f03751d3436a0bb42287cd7f434b6 +Signed-off-by: Peter Korsgaard +--- + src/rf64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rf64.c b/src/rf64.c +index 123db445..c60399fb 100644 +--- a/src/rf64.c ++++ b/src/rf64.c +@@ -242,7 +242,7 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) + } ; + } ; + +- if (psf->filelength != riff_size + 8) ++ if (psf->filelength - 8 != riff_size) + psf_log_printf (psf, " Riff size : %D (should be %D)\n", riff_size, psf->filelength - 8) ; + else + psf_log_printf (psf, " Riff size : %D\n", riff_size) ; +-- +2.39.5 + diff --git a/package/libsndfile/0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch b/package/libsndfile/0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch new file mode 100644 index 0000000000..ee324158c4 --- /dev/null +++ b/package/libsndfile/0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch @@ -0,0 +1,55 @@ +From 9a829113c88a51e57c1e46473e90609e4b7df151 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 12:19:12 -0400 +Subject: [PATCH] ima_adpcm: fix int overflow in ima_reader_init() + +When calculating sf.frames, pre-cast samplesperblock to sf_count_t, to +provide the calculation with enough numeric space to avoid overflows. + +Other changes in this commit are syntactic, and only to satisfy the git +pre-commit syntax checker. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/9a829113c88a51e57c1e46473e90609e4b7df151 +Signed-off-by: Peter Korsgaard +--- + src/ima_adpcm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ima_adpcm.c b/src/ima_adpcm.c +index bc61f4e5..7464d1b3 100644 +--- a/src/ima_adpcm.c ++++ b/src/ima_adpcm.c +@@ -187,7 +187,7 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) + ** to avoid having to branch when pulling apart the nibbles. + */ + count = ((samplesperblock - 2) | 7) + 2 ; +- pimasize = sizeof (IMA_ADPCM_PRIVATE) + psf->sf.channels * (blockalign + samplesperblock + sizeof(short) * count) ; ++ pimasize = sizeof (IMA_ADPCM_PRIVATE) + psf->sf.channels * (blockalign + samplesperblock + sizeof (short) * count) ; + + if (! (pima = calloc (1, pimasize))) + return SFE_MALLOC_FAILED ; +@@ -238,7 +238,7 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) + case SF_FORMAT_AIFF : + psf_log_printf (psf, "still need to check block count\n") ; + pima->decode_block = aiff_ima_decode_block ; +- psf->sf.frames = pima->samplesperblock * pima->blocks / pima->channels ; ++ psf->sf.frames = (sf_count_t) pima->samplesperblock * pima->blocks / pima->channels ; + break ; + + default : +@@ -391,7 +391,7 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) + static int + wavlike_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) + { int chan, k, predictor, blockindx, indx, indxstart, diff ; +- short step, bytecode, stepindx [2] = { 0 }; ++ short step, bytecode, stepindx [2] = { 0 } ; + + pima->blockcount ++ ; + pima->samplecount = 0 ; +-- +2.39.5 + diff --git a/package/libsndfile/0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch b/package/libsndfile/0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch new file mode 100644 index 0000000000..dd9f157811 --- /dev/null +++ b/package/libsndfile/0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch @@ -0,0 +1,411 @@ +From 4755f5bd7854611d92ad0f1295587b439f9950ba Mon Sep 17 00:00:00 2001 +From: Arthur Taylor +Date: Fri, 15 Nov 2024 19:46:53 -0800 +Subject: [PATCH] src/ogg: better error checking for vorbis. Fixes #1035 + +Upstream: https://github.com/libsndfile/libsndfile/commit/4755f5bd7854611d92ad0f1295587b439f9950ba +Signed-off-by: Peter Korsgaard +--- + src/ogg.c | 12 ++-- + src/ogg_opus.c | 17 +++-- + src/ogg_vorbis.c | 170 ++++++++++++++++++++++++++--------------------- + 3 files changed, 114 insertions(+), 85 deletions(-) + +diff --git a/src/ogg.c b/src/ogg.c +index 529941af..e2d679d4 100644 +--- a/src/ogg.c ++++ b/src/ogg.c +@@ -211,12 +211,16 @@ ogg_read_first_page (SF_PRIVATE *psf, OGG_PRIVATE *odata) + + int + ogg_write_page (SF_PRIVATE *psf, ogg_page *page) +-{ int bytes ; ++{ int n ; + +- bytes = psf_fwrite (page->header, 1, page->header_len, psf) ; +- bytes += psf_fwrite (page->body, 1, page->body_len, psf) ; ++ n = psf_fwrite (page->header, 1, page->header_len, psf) ; ++ if (n == page->header_len) ++ n += psf_fwrite (page->body, 1, page->body_len, psf) ; + +- return bytes == page->header_len + page->body_len ; ++ if (n != page->body_len + page->header_len) ++ return -1 ; ++ ++ return n ; + } /* ogg_write_page */ + + sf_count_t +diff --git a/src/ogg_opus.c b/src/ogg_opus.c +index 511653ec..e01224b9 100644 +--- a/src/ogg_opus.c ++++ b/src/ogg_opus.c +@@ -827,15 +827,16 @@ ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + + /* The first page MUST only contain the header, so flush it out now */ + ogg_stream_packetin (&odata->ostream, &op) ; +- for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; ) +- { if (! (nn = ogg_write_page (psf, &odata->opage))) ++ while (ogg_stream_flush (&odata->ostream, &odata->opage)) ++ { nn = ogg_write_page (psf, &odata->opage) ; ++ if (nn < 0) + { psf_log_printf (psf, "Opus : Failed to write header!\n") ; + if (psf->error) + return psf->error ; + return SFE_INTERNAL ; + } ; + psf->dataoffset += nn ; +- } ++ } ; + + /* + ** Metadata Tags (manditory) +@@ -850,15 +851,16 @@ ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + vorbiscomment_write_tags (psf, &op, &opustags_ident, opus_get_version_string (), - (OGG_OPUS_COMMENT_PAD)) ; + op.packetno = 2 ; + ogg_stream_packetin (&odata->ostream, &op) ; +- for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; ) +- { if (! (nn = ogg_write_page (psf, &odata->opage))) ++ while (ogg_stream_flush (&odata->ostream, &odata->opage)) ++ { nn = ogg_write_page (psf, &odata->opage) ; ++ if (nn < 0) + { psf_log_printf (psf, "Opus : Failed to write comments!\n") ; + if (psf->error) + return psf->error ; + return SFE_INTERNAL ; + } ; + psf->dataoffset += nn ; +- } ++ } ; + + return 0 ; + } /* ogg_opus_write_header */ +@@ -1132,7 +1134,8 @@ ogg_opus_write_out (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) + if (nbytes > 0) + { oopus->u.encode.last_segments -= ogg_page_segments (&odata->opage) ; + oopus->pg_pos = oopus->pkt_pos ; +- ogg_write_page (psf, &odata->opage) ; ++ if (ogg_write_page (psf, &odata->opage) < 0) ++ return -1 ; + } + else + break ; +diff --git a/src/ogg_vorbis.c b/src/ogg_vorbis.c +index add12396..fae252ca 100644 +--- a/src/ogg_vorbis.c ++++ b/src/ogg_vorbis.c +@@ -82,28 +82,6 @@ + /* How many seconds in the future to not bother bisection searching for. */ + #define VORBIS_SEEK_THRESHOLD 2 + +-typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ; +- +-static int vorbis_read_header (SF_PRIVATE *psf) ; +-static int vorbis_write_header (SF_PRIVATE *psf, int calc_length) ; +-static int vorbis_close (SF_PRIVATE *psf) ; +-static int vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; +-static int vorbis_byterate (SF_PRIVATE *psf) ; +-static int vorbis_calculate_granulepos (SF_PRIVATE *psf, uint64_t *gp_out) ; +-static int vorbis_skip (SF_PRIVATE *psf, uint64_t target_gp) ; +-static int vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) ; +-static sf_count_t vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +-static sf_count_t vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ; +-static int vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ; +- + typedef struct + { int id ; + const char *name ; +@@ -145,6 +123,45 @@ typedef struct + sf_count_t last_page ; + } VORBIS_PRIVATE ; + ++typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ; ++ ++static int vorbis_read_header (SF_PRIVATE *psf) ; ++static int vorbis_write_header (SF_PRIVATE *psf, int calc_length) ; ++static int vorbis_close (SF_PRIVATE *psf) ; ++static int vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; ++static int vorbis_byterate (SF_PRIVATE *psf) ; ++static int vorbis_calculate_granulepos (SF_PRIVATE *psf, uint64_t *gp_out) ; ++static int vorbis_skip (SF_PRIVATE *psf, uint64_t target_gp) ; ++static int vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) ; ++static sf_count_t vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; ++static sf_count_t vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ; ++static int vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) ; ++static int vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ; ++static void vorbis_log_error (SF_PRIVATE *psf, int error) ; ++ ++ ++static void ++vorbis_log_error(SF_PRIVATE *psf, int error) { ++ switch (error) ++ { case 0: return; ++ case OV_EIMPL: psf->error = SFE_UNIMPLEMENTED ; break ; ++ case OV_ENOTVORBIS: psf->error = SFE_MALFORMED_FILE ; break ; ++ case OV_EBADHEADER: psf->error = SFE_MALFORMED_FILE ; break ; ++ case OV_EVERSION: psf->error = SFE_UNSUPPORTED_ENCODING ; break ; ++ case OV_EFAULT: ++ case OV_EINVAL: ++ default: psf->error = SFE_INTERNAL ; ++ } ; ++} ; ++ + static int + vorbis_read_header (SF_PRIVATE *psf) + { OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; +@@ -380,7 +397,6 @@ vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + { ogg_packet header ; + ogg_packet header_comm ; + ogg_packet header_code ; +- int result ; + + vorbis_analysis_headerout (&vdata->vdsp, &vdata->vcomment, &header, &header_comm, &header_code) ; + ogg_stream_packetin (&odata->ostream, &header) ; /* automatically placed in its own page */ +@@ -390,9 +406,9 @@ vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + /* This ensures the actual + * audio data will start on a new page, as per spec + */ +- while ((result = ogg_stream_flush (&odata->ostream, &odata->opage)) != 0) +- { ogg_write_page (psf, &odata->opage) ; +- } ; ++ while (ogg_stream_flush (&odata->ostream, &odata->opage)) ++ if (ogg_write_page (psf, &odata->opage) < 0) ++ return -1 ; + } + + return 0 ; +@@ -402,6 +418,7 @@ static int + vorbis_close (SF_PRIVATE *psf) + { OGG_PRIVATE* odata = psf->container_data ; + VORBIS_PRIVATE *vdata = psf->codec_data ; ++ int ret = 0 ; + + if (odata == NULL || vdata == NULL) + return 0 ; +@@ -412,34 +429,14 @@ vorbis_close (SF_PRIVATE *psf) + if (psf->file.mode == SFM_WRITE) + { + if (psf->write_current <= 0) +- vorbis_write_header (psf, 0) ; ++ ret = vorbis_write_header (psf, 0) ; + +- vorbis_analysis_wrote (&vdata->vdsp, 0) ; +- while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1) +- { +- +- /* analysis, assume we want to use bitrate management */ +- vorbis_analysis (&vdata->vblock, NULL) ; +- vorbis_bitrate_addblock (&vdata->vblock) ; +- +- while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) +- { /* weld the packet into the bitstream */ +- ogg_stream_packetin (&odata->ostream, &odata->opacket) ; +- +- /* write out pages (if any) */ +- while (!odata->eos) +- { int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ; +- if (result == 0) break ; +- ogg_write_page (psf, &odata->opage) ; +- +- /* this could be set above, but for illustrative purposes, I do +- it here (to show that vorbis does know where the stream ends) */ +- +- if (ogg_page_eos (&odata->opage)) odata->eos = 1 ; +- } +- } +- } +- } ++ if (ret == 0) ++ { /* A write of zero samples tells Vorbis the stream is done and to ++ flush. */ ++ ret = vorbis_write_samples (psf, odata, vdata, 0) ; ++ } ; ++ } ; + + /* ogg_page and ogg_packet structs always point to storage in + libvorbis. They are never freed or manipulated directly */ +@@ -449,7 +446,7 @@ vorbis_close (SF_PRIVATE *psf) + vorbis_comment_clear (&vdata->vcomment) ; + vorbis_info_clear (&vdata->vinfo) ; + +- return 0 ; ++ return ret ; + } /* vorbis_close */ + + int +@@ -688,33 +685,40 @@ vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens) + /*============================================================================== + */ + +-static void ++static int + vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) +-{ +- vorbis_analysis_wrote (&vdata->vdsp, in_frames) ; ++{ int ret ; ++ ++ if ((ret = vorbis_analysis_wrote (&vdata->vdsp, in_frames)) != 0) ++ return ret ; + + /* + ** Vorbis does some data preanalysis, then divvies up blocks for + ** more involved (potentially parallel) processing. Get a single + ** block for encoding now. + */ +- while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1) ++ while ((ret = vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock)) == 1) + { + /* analysis, assume we want to use bitrate management */ +- vorbis_analysis (&vdata->vblock, NULL) ; +- vorbis_bitrate_addblock (&vdata->vblock) ; ++ if ((ret = vorbis_analysis (&vdata->vblock, NULL)) != 0) ++ return ret ; ++ if ((ret = vorbis_bitrate_addblock (&vdata->vblock)) != 0) ++ return ret ; + +- while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) ++ while ((ret = vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) == 1) + { + /* weld the packet into the bitstream */ +- ogg_stream_packetin (&odata->ostream, &odata->opacket) ; ++ if ((ret = ogg_stream_packetin (&odata->ostream, &odata->opacket)) != 0) ++ return ret ; + + /* write out pages (if any) */ + while (!odata->eos) +- { int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ; +- if (result == 0) ++ { ret = ogg_stream_pageout (&odata->ostream, &odata->opage) ; ++ if (ret == 0) + break ; +- ogg_write_page (psf, &odata->opage) ; ++ ++ if (ogg_write_page (psf, &odata->opage) < 0) ++ return -1 ; + + /* This could be set above, but for illustrative purposes, I do + ** it here (to show that vorbis does know where the stream ends) */ +@@ -722,16 +726,22 @@ vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata + odata->eos = 1 ; + } ; + } ; ++ if (ret != 0) ++ return ret ; + } ; ++ if (ret != 0) ++ return ret ; + + vdata->gp += in_frames ; ++ ++ return 0 ; + } /* vorbis_write_data */ + + + static sf_count_t + vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens) + { +- int i, m, j = 0 ; ++ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -740,14 +750,17 @@ vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) (ptr [j++]) / 32767.0f ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames))) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_s */ + + static sf_count_t + vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens) +-{ int i, m, j = 0 ; ++{ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -756,14 +769,17 @@ vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames))) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_i */ + + static sf_count_t + vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens) +-{ int i, m, j = 0 ; ++{ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -772,14 +788,17 @@ vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = ptr [j++] ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)) != 0) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_f */ + + static sf_count_t + vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens) +-{ int i, m, j = 0 ; ++{ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -788,7 +807,10 @@ vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) ptr [j++] ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)) != 0) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_d */ +@@ -884,7 +906,7 @@ vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) + return 0 ; + + /* Search for a position a half large-block before our target. As Vorbis is +- ** lapped, every sample position come from two blocks, the "left" half of ++ ** lapped, every sample position comes from two blocks, the "left" half of + ** one block and the "right" half of the previous block. The granule + ** position of an Ogg page of a Vorbis stream is the sample offset of the + ** last finished sample in the stream that can be decoded from a page. A +-- +2.39.5 + diff --git a/package/libsndfile/0015-ALAC-Include-config.h-to-avoid-warnings.patch b/package/libsndfile/0015-ALAC-Include-config.h-to-avoid-warnings.patch new file mode 100644 index 0000000000..27181493b7 --- /dev/null +++ b/package/libsndfile/0015-ALAC-Include-config.h-to-avoid-warnings.patch @@ -0,0 +1,95 @@ +From 2c6ffea6ac8bb1b89e1f778bdad8bf8b0342d32f Mon Sep 17 00:00:00 2001 +From: Marcel Telka +Date: Wed, 20 Sep 2023 14:54:42 +0200 +Subject: [PATCH] ALAC: Include config.h to avoid warnings + +Upstream: https://github.com/libsndfile/libsndfile/commit/2c6ffea6ac8bb1b89e1f778bdad8bf8b0342d32f + +Signed-off-by: Bernd Kuhls +--- + src/ALAC/ag_dec.c | 2 ++ + src/ALAC/ag_enc.c | 2 ++ + src/ALAC/alac_decoder.c | 2 ++ + src/ALAC/alac_encoder.c | 2 ++ + src/ALAC/matrix_dec.c | 2 ++ + src/ALAC/matrix_enc.c | 2 ++ + 6 files changed, 12 insertions(+) + +diff --git a/src/ALAC/ag_dec.c b/src/ALAC/ag_dec.c +index 37671d240..68707f825 100644 +--- a/src/ALAC/ag_dec.c ++++ b/src/ALAC/ag_dec.c +@@ -26,6 +26,8 @@ + Copyright: (c) 2001-2011 Apple, Inc. + */ + ++#include "config.h" ++ + #include + #include + #include +diff --git a/src/ALAC/ag_enc.c b/src/ALAC/ag_enc.c +index 4737b96e3..a56db7b18 100644 +--- a/src/ALAC/ag_enc.c ++++ b/src/ALAC/ag_enc.c +@@ -27,6 +27,8 @@ + Copyright: (c) 2001-2011 Apple, Inc. + */ + ++#include "config.h" ++ + #include "aglib.h" + #include "ALACBitUtilities.h" + #include "EndianPortable.h" +diff --git a/src/ALAC/alac_decoder.c b/src/ALAC/alac_decoder.c +index 46d333060..978919a70 100644 +--- a/src/ALAC/alac_decoder.c ++++ b/src/ALAC/alac_decoder.c +@@ -23,6 +23,8 @@ + File: ALACDecoder.cpp + */ + ++#include "config.h" ++ + #include + #include + #include +diff --git a/src/ALAC/alac_encoder.c b/src/ALAC/alac_encoder.c +index 599399afe..29012f3f4 100644 +--- a/src/ALAC/alac_encoder.c ++++ b/src/ALAC/alac_encoder.c +@@ -28,6 +28,8 @@ + #define DebugMsg printf + + // headers ++#include "config.h" ++ + #include + #include + #include +diff --git a/src/ALAC/matrix_dec.c b/src/ALAC/matrix_dec.c +index 6d0b40153..bc1f028a9 100644 +--- a/src/ALAC/matrix_dec.c ++++ b/src/ALAC/matrix_dec.c +@@ -27,6 +27,8 @@ + Copyright: (c) 2004-2011 Apple, Inc. + */ + ++#include "config.h" ++ + #include "matrixlib.h" + #include "ALACAudioTypes.h" + #include "shift.h" +diff --git a/src/ALAC/matrix_enc.c b/src/ALAC/matrix_enc.c +index b50f83b78..dcd9cab11 100644 +--- a/src/ALAC/matrix_enc.c ++++ b/src/ALAC/matrix_enc.c +@@ -27,6 +27,8 @@ + Copyright: (c) 2004-2011 Apple, Inc. + */ + ++#include "config.h" ++ + #include "matrixlib.h" + #include "ALACAudioTypes.h" + diff --git a/package/libsndfile/0016-Include-stdbool.h-instead-of-redefining-bool-true-an.patch b/package/libsndfile/0016-Include-stdbool.h-instead-of-redefining-bool-true-an.patch new file mode 100644 index 0000000000..adfd85787d --- /dev/null +++ b/package/libsndfile/0016-Include-stdbool.h-instead-of-redefining-bool-true-an.patch @@ -0,0 +1,65 @@ +From 2251737b3b175925684ec0d37029ff4cb521d302 Mon Sep 17 00:00:00 2001 +From: Fabian Greffrath +Date: Tue, 17 Dec 2024 10:38:47 +0100 +Subject: [PATCH] Include instead of redefining `bool`, `true` and + `false` keywords + +Fixes #1049 + +Upstream: https://github.com/libsndfile/libsndfile/commit/2251737b3b175925684ec0d37029ff4cb521d302.patch + +Signed-off-by: Bernd Kuhls +--- + src/ALAC/alac_decoder.c | 6 +----- + src/ALAC/alac_encoder.c | 7 +------ + 2 files changed, 2 insertions(+), 11 deletions(-) + +diff --git a/src/ALAC/alac_decoder.c b/src/ALAC/alac_decoder.c +index 978919a70..417645316 100644 +--- a/src/ALAC/alac_decoder.c ++++ b/src/ALAC/alac_decoder.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "alac_codec.h" +@@ -40,11 +41,6 @@ + #include "ALACBitUtilities.h" + #include "EndianPortable.h" + +-typedef enum +-{ false = 0, +- true = 1 +-} bool ; +- + // constants/data + const uint32_t kMaxBitDepth = 32 ; // max allowed bit depth is 32 + +diff --git a/src/ALAC/alac_encoder.c b/src/ALAC/alac_encoder.c +index 29012f3f4..c9395b1d5 100644 +--- a/src/ALAC/alac_encoder.c ++++ b/src/ALAC/alac_encoder.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + + #include "sfendian.h" +@@ -46,12 +47,6 @@ + #include "ALACAudioTypes.h" + #include "EndianPortable.h" + +-typedef enum +-{ +- false = 0, +- true = 1 +-} bool ; +- + static void GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) ; + + static int32_t EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; diff --git a/package/libsndfile/Config.in b/package/libsndfile/Config.in index 4ccf937691..6fdc7fbd6c 100644 --- a/package/libsndfile/Config.in +++ b/package/libsndfile/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBSNDFILE containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) through one standard library interface. - http://www.mega-nerd.com/libsndfile/ + https://libsndfile.github.io/libsndfile/ diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index dc23d94cb1..4caba72c4f 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -13,6 +13,24 @@ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VALID = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf +# 0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch +# 0002-au-avoid-int-overflow-while-calculating-data_end.patch +# 0003-avr-fix-int-overflow-in-avr_read_header.patch +# 0004-sds-fix-int-overflow-warning-in-sample-calculations.patch +# 0005-aiff-fix-int-overflow-when-counting-header-elements.patch +# 0006-ircam-fix-int-overflow-in-ircam_read_header.patch +# 0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch +# 0008-common-fix-int-overflow-in-psf_binheader_readf.patch +# 0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch +# 0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch +# 0011-pcm-fix-int-overflow-in-pcm_init.patch +# 0012-rf64-fix-int-overflow-in-rf64_read_header.patch +# 0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch +LIBSNDFILE_IGNORE_CVES += CVE-2022-33065 + +# 0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch +LIBSNDFILE_IGNORE_CVES += CVE-2024-50612 + LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ diff --git a/package/libsodium/libsodium.hash b/package/libsodium/libsodium.hash index 37c1a620b6..ae4765a2ab 100644 --- a/package/libsodium/libsodium.hash +++ b/package/libsodium/libsodium.hash @@ -1,4 +1,4 @@ # Locally calculated after checking Minisign signature -# https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.minisig -sha256 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 libsodium-1.0.18.tar.gz -sha256 dea1855c9809f3faf22aa4a1fba20ec8af5a5587f23115012e5b98279cedc4af LICENSE +# https://download.libsodium.org/libsodium/releases/libsodium-1.0.20.tar.gz.minisig +sha256 ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19 libsodium-1.0.20.tar.gz +sha256 43964d976a6db3fb986af689d05f8ca0e9971878bccae709750dac8fdc4a99cf LICENSE diff --git a/package/libsodium/libsodium.mk b/package/libsodium/libsodium.mk index a8e0f79149..7dd763e145 100644 --- a/package/libsodium/libsodium.mk +++ b/package/libsodium/libsodium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSODIUM_VERSION = 1.0.18 +LIBSODIUM_VERSION = 1.0.20 LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases LIBSODIUM_LICENSE = ISC LIBSODIUM_LICENSE_FILES = LICENSE diff --git a/package/libsolv/0001-Fix-qsort_r-preprocessor-for-musl-and-FreeBSD.patch b/package/libsolv/0001-Fix-qsort_r-preprocessor-for-musl-and-FreeBSD.patch new file mode 100644 index 0000000000..04a4312db4 --- /dev/null +++ b/package/libsolv/0001-Fix-qsort_r-preprocessor-for-musl-and-FreeBSD.patch @@ -0,0 +1,83 @@ +From 2d0718a4f2001c857d9af24398c68d676a98a3ca Mon Sep 17 00:00:00 2001 +From: Gong Zhile +Date: Wed, 22 Oct 2025 18:14:30 +0800 +Subject: [PATCH] Fix qsort_r preprocessor for musl and FreeBSD + +The original mentioned qsort_r signature difference now only exists in DragonFly +BSD & MacOS. However, the preprocessor also broke the compliation on musl+linux +and FreeBSD, leading the compilation error on buildroot. + +musl: https://git.musl-libc.org/cgit/musl/commit/?id=b76f37fd5625d038141b52184956fb4b7838e9a5 +freebsd, dragonfly, macos: QSORT(3) + +FreeBSD and musl use the same GNU-like signature. + +Upstream: https://github.com/openSUSE/libsolv/commit/2d0718a4f2001c857d9af24398c68d676a98a3ca + +Signed-off-by: Gong Zhile +[Bernd: added Upstream: tag] +Signed-off-by: Bernd Kuhls +--- + src/util.c | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +diff --git a/src/util.c b/src/util.c +index 72426e09..a60ed3da 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -154,26 +154,14 @@ solv_setcloexec(int fd, int state) + #endif + } + +-/* bsd's qsort_r has different arguments, so we define our ++#if defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R) ++#if (defined(__APPLE__) || defined(__DragonFly__)) && defined(HAVE_QSORT_R) ++ ++/* MacOS and DragonFly have qsort_r with different arguments, so we define our + own version in case we need to do some clever mapping + + see also: http://sources.redhat.com/ml/libc-alpha/2008-12/msg00003.html + */ +-#if (defined(__GLIBC__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R)) +- +-void +-solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) +-{ +-# if defined(HAVE_QSORT_R) +- qsort_r(base, nmemb, size, compar, compard); +-# else +- /* backported for SLE10-SP2 */ +- __qsort_r(base, nmemb, size, compar, compard); +-# endif +- +-} +- +-#elif defined(HAVE_QSORT_R) /* not glibc, but has qsort_r() */ + + struct solv_sort_data { + int (*compar)(const void *, const void *, void *); +@@ -196,6 +184,21 @@ solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, con + qsort_r(base, nmemb, size, &d, solv_sort_helper); + } + ++#else ++ ++void ++solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) ++{ ++# if defined(HAVE_QSORT_R) ++ qsort_r(base, nmemb, size, compar, compard); ++# else ++ /* backported for SLE10-SP2 */ ++ __qsort_r(base, nmemb, size, compar, compard); ++# endif ++ ++} ++ ++#endif + #else /* not glibc and no qsort_r() */ + /* use own version of qsort if none available */ + #include "qsort_r.c" +-- +2.47.3 + diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash index 97259ae93f..14726168a3 100644 --- a/package/libsolv/libsolv.hash +++ b/package/libsolv/libsolv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ce4aa2f0e3c5c9ab99dced6a1810af3f670f1b98892394edc68ccabe7b272133 libsolv-0.7.30.tar.gz +sha256 e6ef552846f908beb3bbf6ca718b6dd431bd8a281086d82af9a6d2a3ba919be5 libsolv-0.7.35.tar.gz sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 2317d3e663..2217ef499b 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOLV_VERSION = 0.7.30 +LIBSOLV_VERSION = 0.7.35 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD diff --git a/package/libsoundtouch/libsoundtouch.hash b/package/libsoundtouch/libsoundtouch.hash index 125bcd47a5..853f3b90bb 100644 --- a/package/libsoundtouch/libsoundtouch.hash +++ b/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 43b23dfac2f64a3aff55d64be096ffc7b73842c3f5665caff44975633a975a99 soundtouch-2.3.3.tar.gz +sha256 3dda3c9ab1e287f15028c010a66ab7145fa855dfa62763538f341e70b4d10abd soundtouch-2.4.0.tar.gz sha256 84c6d82dc7de80f5b73f231edfd3ddc5b53513908117452bfa37ea36bb4b7e0a COPYING.TXT diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index 099539250c..3140d890f5 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 2.3.3 +LIBSOUNDTOUCH_VERSION = 2.4.0 LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ diff --git a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch b/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch index a999f5964e..3fc0e833d2 100644 --- a/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch +++ b/package/libsoup/0001-meson.build-set-c_std-to-gnu99.patch @@ -15,9 +15,9 @@ In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabi/ Fixes: - http://autobuild.buildroot.org/results/56b9cb987e25b99d6fed16c537552f47c3376f21 +Upstream: https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/241 + Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/241] --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsoup/0003-sniffer-fix-potential-overflow.patch b/package/libsoup/0003-sniffer-fix-potential-overflow.patch new file mode 100644 index 0000000000..13fa5b7ce2 --- /dev/null +++ b/package/libsoup/0003-sniffer-fix-potential-overflow.patch @@ -0,0 +1,59 @@ +From 2eacbd762332795e00692ddab2515c6da23198d3 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 12 May 2025 14:06:41 +0800 +Subject: [PATCH] sniffer: Add better coverage of skip_insignificant_space() + +CVE: CVE-2025-2784 +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/435/diffs?commit_id=242a10fbb12dbdc12d254bd8fc8669a0ac055304; + https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/442/diffs?commit_id=c415ad0b6771992e66c70edf373566c6e247089d] + +Test code is not added since it uses some functions not defined in +version 2.74. These tests are not used now, so just ignore them. + +Upstream: https://git.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-content-sniffer.c | 9 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c +index 5f2896e..9554636 100644 +--- a/libsoup/soup-content-sniffer.c ++++ b/libsoup/soup-content-sniffer.c +@@ -612,8 +612,10 @@ sniff_text_or_binary (SoupContentSniffer *sniffer, SoupBuffer *buffer) + } + + static gboolean +-skip_insignificant_space (const char *resource, int *pos, int resource_length) ++skip_insignificant_space (const char *resource, gsize *pos, gsize resource_length) + { ++ if (*pos >= resource_length) ++ return TRUE; + while ((resource[*pos] == '\x09') || + (resource[*pos] == '\x20') || + (resource[*pos] == '\x0A') || +@@ -632,7 +634,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer) + { + const char *resource = (const char *)buffer->data; + int resource_length = MIN (512, buffer->length); +- int pos = 0; ++ gsize pos = 0; + + if (resource_length < 3) + goto text_html; +@@ -642,9 +644,6 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer) + pos = 3; + + look_for_tag: +- if (pos > resource_length) +- goto text_html; +- + if (skip_insignificant_space (resource, &pos, resource_length)) + goto text_html; + +-- +2.34.1 + diff --git a/package/libsoup/0004-headers-Strictly-dont-allow-NUL-bytes.patch b/package/libsoup/0004-headers-Strictly-dont-allow-NUL-bytes.patch new file mode 100644 index 0000000000..120358b5fa --- /dev/null +++ b/package/libsoup/0004-headers-Strictly-dont-allow-NUL-bytes.patch @@ -0,0 +1,60 @@ +From 4a2bb98e03d79146c729dca52c8d6edc635218ff Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Mon, 8 Jul 2024 12:33:15 -0500 +Subject: [PATCH] headers: Strictly don't allow NUL bytes + +In the past (2015) this was allowed for some problematic sites. However Chromium also does not allow NUL bytes in either header names or values these days. So this should no longer be a problem. + +CVE: CVE-2024-52530 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/402/diffs?commit_id=04df03bc092ac20607f3e150936624d4f536e68b] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch + +Signed-off-by: Changqing Li +[Titouan: Remove changes on test files] +Signed-off-by: Titouan Christophe +--- + libsoup/soup-headers.c | 15 +++------ + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c +index eec28ad..e5d3c03 100644 +--- a/libsoup/soup-headers.c ++++ b/libsoup/soup-headers.c +@@ -50,13 +50,14 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest) + * ignorable trailing whitespace. + */ + ++ /* No '\0's are allowed */ ++ if (memchr (str, '\0', len)) ++ return FALSE; ++ + /* Skip over the Request-Line / Status-Line */ + headers_start = memchr (str, '\n', len); + if (!headers_start) + return FALSE; +- /* No '\0's in the Request-Line / Status-Line */ +- if (memchr (str, '\0', headers_start - str)) +- return FALSE; + + /* We work on a copy of the headers, which we can write '\0's + * into, so that we don't have to individually g_strndup and +@@ -68,14 +69,6 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest) + headers_copy[copy_len] = '\0'; + value_end = headers_copy; + +- /* There shouldn't be any '\0's in the headers already, but +- * this is the web we're talking about. +- */ +- while ((p = memchr (headers_copy, '\0', copy_len))) { +- memmove (p, p + 1, copy_len - (p - headers_copy)); +- copy_len--; +- } +- + while (*(value_end + 1)) { + name = value_end + 1; + name_end = strchr (name, ':'); + +-- +2.34.1 + diff --git a/package/libsoup/0005-headers-Be-more-robust-against-invalid-input.patch b/package/libsoup/0005-headers-Be-more-robust-against-invalid-input.patch new file mode 100644 index 0000000000..0665182d0a --- /dev/null +++ b/package/libsoup/0005-headers-Be-more-robust-against-invalid-input.patch @@ -0,0 +1,136 @@ +From 12523a592f1216450d18706bcf6c16e0f1ab0ce0 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 16 May 2025 13:52:37 +0800 +Subject: [PATCH] headers: Be more robust against invalid input when + parsing params + +If you pass invalid input to a function such as soup_header_parse_param_list_strict() +it can cause an overflow if it decodes the input to UTF-8. + +This should never happen with valid UTF-8 input which libsoup's client API +ensures, however it's server API does not currently. + +CVE: CVE-2024-52531 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=a35222dd0bfab2ac97c10e86b95f762456628283] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-headers.c | 45 +++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) + +diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c +index 67905b2..39e8d34 100644 +--- a/libsoup/soup-headers.c ++++ b/libsoup/soup-headers.c +@@ -642,8 +642,9 @@ soup_header_contains (const char *header, const char *token) + } + + static void +-decode_quoted_string (char *quoted_string) ++decode_quoted_string_inplace (GString *quoted_gstring) + { ++ char *quoted_string = quoted_gstring->str; + char *src, *dst; + + src = quoted_string + 1; +@@ -657,10 +658,11 @@ decode_quoted_string (char *quoted_string) + } + + static gboolean +-decode_rfc5987 (char *encoded_string) ++decode_rfc5987_inplace (GString *encoded_gstring) + { + char *q, *decoded; + gboolean iso_8859_1 = FALSE; ++ const char *encoded_string = encoded_gstring->str; + + q = strchr (encoded_string, '\''); + if (!q) +@@ -689,14 +691,7 @@ decode_rfc5987 (char *encoded_string) + decoded = utf8; + } + +- /* If encoded_string was UTF-8, then each 3-character %-escape +- * will be converted to a single byte, and so decoded is +- * shorter than encoded_string. If encoded_string was +- * iso-8859-1, then each 3-character %-escape will be +- * converted into at most 2 bytes in UTF-8, and so it's still +- * shorter. +- */ +- strcpy (encoded_string, decoded); ++ g_string_assign (encoded_gstring, decoded); + g_free (decoded); + return TRUE; + } +@@ -706,15 +701,16 @@ parse_param_list (const char *header, char delim, gboolean strict) + { + GHashTable *params; + GSList *list, *iter; +- char *item, *eq, *name_end, *value; +- gboolean override, duplicated; + + params = g_hash_table_new_full (soup_str_case_hash, + soup_str_case_equal, +- g_free, NULL); ++ g_free, g_free); + + list = parse_list (header, delim); + for (iter = list; iter; iter = iter->next) { ++ char *item, *eq, *name_end; ++ gboolean override, duplicated; ++ GString *parsed_value = NULL; + item = iter->data; + override = FALSE; + +@@ -729,19 +725,19 @@ parse_param_list (const char *header, char delim, gboolean strict) + + *name_end = '\0'; + +- value = (char *)skip_lws (eq + 1); ++ parsed_value = g_string_new ((char *)skip_lws (eq + 1)); + + if (name_end[-1] == '*' && name_end > item + 1) { + name_end[-1] = '\0'; +- if (!decode_rfc5987 (value)) { ++ if (!decode_rfc5987_inplace (parsed_value)) { ++ g_string_free (parsed_value, TRUE); + g_free (item); + continue; + } + override = TRUE; +- } else if (*value == '"') +- decode_quoted_string (value); +- } else +- value = NULL; ++ } else if (parsed_value->str[0] == '"') ++ decode_quoted_string_inplace (parsed_value); ++ } + + duplicated = g_hash_table_lookup_extended (params, item, NULL, NULL); + +@@ -749,11 +745,16 @@ parse_param_list (const char *header, char delim, gboolean strict) + soup_header_free_param_list (params); + params = NULL; + g_slist_foreach (iter, (GFunc)g_free, NULL); ++ if (parsed_value) ++ g_string_free (parsed_value, TRUE); + break; +- } else if (override || !duplicated) +- g_hash_table_replace (params, item, value); +- else ++ } else if (override || !duplicated) { ++ g_hash_table_replace (params, item, parsed_value ? g_string_free (parsed_value, FALSE) : NULL); ++ } else { ++ if (parsed_value) ++ g_string_free (parsed_value, TRUE); + g_free (item); ++ } + } + + g_slist_free (list); +-- +2.34.1 + diff --git a/package/libsoup/0006-websocket-process-the-frame-as-soon-as-we-read-data.patch b/package/libsoup/0006-websocket-process-the-frame-as-soon-as-we-read-data.patch new file mode 100644 index 0000000000..de33ac7b53 --- /dev/null +++ b/package/libsoup/0006-websocket-process-the-frame-as-soon-as-we-read-data.patch @@ -0,0 +1,40 @@ +From a693d49bff058fc20a448dc4e7d324ff0dc6597e Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Wed, 11 Sep 2024 11:52:11 +0200 +Subject: [PATCH] websocket: process the frame as soon as we read data + +Otherwise we can enter in a read loop because we were not +validating the data until the all the data was read. + +Fixes #391 + +CVE: CVE-2024-52532 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be#f1d67ca0386b145ea201cf88d27f72724d7c6715] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-websocket-connection.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c +index a4095e1..65c1492 100644 +--- a/libsoup/soup-websocket-connection.c ++++ b/libsoup/soup-websocket-connection.c +@@ -1140,9 +1140,8 @@ soup_websocket_connection_read (SoupWebsocketConnection *self) + } + + pv->incoming->len = len + count; +- } while (count > 0); +- +- process_incoming (self); ++ process_incoming (self); ++ } while (count > 0 && !pv->close_sent && !pv->io_closing); + + if (end) { + if (!pv->close_sent || !pv->close_received) { +-- +2.34.1 + diff --git a/package/libsoup/0007-Fix-using-int-instead-of-size_t.patch b/package/libsoup/0007-Fix-using-int-instead-of-size_t.patch new file mode 100644 index 0000000000..b057e8de98 --- /dev/null +++ b/package/libsoup/0007-Fix-using-int-instead-of-size_t.patch @@ -0,0 +1,32 @@ +From 5709dfffb6fdc5b66ce001bf82a755ad8ad1d992 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Mon, 28 Oct 2024 12:29:48 -0500 +Subject: [PATCH] Fix using int instead of size_t for strcspn return + +CVE: CVE-2025-32050 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9bb0a55de55c6940ced811a64fbca82fe93a9323] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-headers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c +index 9707ca0..67905b2 100644 +--- a/libsoup/soup-headers.c ++++ b/libsoup/soup-headers.c +@@ -902,7 +902,7 @@ append_param_quoted (GString *string, + const char *name, + const char *value) + { +- int len; ++ gsize len; + + g_string_append (string, name); + g_string_append (string, "=\""); +-- +2.34.1 + diff --git a/package/libsoup/0008-Fix-heap-buffer-overflow.patch b/package/libsoup/0008-Fix-heap-buffer-overflow.patch new file mode 100644 index 0000000000..ece24baba2 --- /dev/null +++ b/package/libsoup/0008-Fix-heap-buffer-overflow.patch @@ -0,0 +1,35 @@ +From f4a67a9a3033586edaee715d40d5992e02d32893 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Sat, 16 Nov 2024 12:07:30 -0600 +Subject: [PATCH] Fix heap buffer overflow in soup_content_sniffer_sniff + +Co-Author: Ar Jun + +CVE: CVE-2025-32052 +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libsoup/-/commit/f182429e5b1fc034050510da20c93256c4fa9652#500da7cfde649872c49169be34b03a1c42a53ddb] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-content-sniffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c +index 9554636..eac9e7b 100644 +--- a/libsoup/soup-content-sniffer.c ++++ b/libsoup/soup-content-sniffer.c +@@ -504,7 +504,7 @@ sniff_unknown (SoupContentSniffer *sniffer, SoupBuffer *buffer, + guint index_pattern = 0; + gboolean skip_row = FALSE; + +- while ((index_stream < resource_length) && ++ while ((index_stream < resource_length - 1) && + (index_pattern <= type_row->pattern_length)) { + /* Skip insignificant white space ("WS" in the spec) */ + if (type_row->pattern[index_pattern] == ' ') { +-- +2.34.1 + diff --git a/package/libsoup/0009-Fix-heap-buffer-overflow.patch b/package/libsoup/0009-Fix-heap-buffer-overflow.patch new file mode 100644 index 0000000000..440b7c308a --- /dev/null +++ b/package/libsoup/0009-Fix-heap-buffer-overflow.patch @@ -0,0 +1,42 @@ +From d9bcffd6cd5e8ec32889a594f7348d67a5101b3a Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 12 May 2025 13:58:42 +0800 +Subject: [PATCH] Fix heap buffer overflow in + soup-content-sniffer.c:sniff_feed_or_html() + +CVE: CVE-2025-32053 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/eaed42ca8d40cd9ab63764e3d63641180505f40a] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-content-sniffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c +index 967ec61..5f2896e 100644 +--- a/libsoup/soup-content-sniffer.c ++++ b/libsoup/soup-content-sniffer.c +@@ -620,7 +620,7 @@ skip_insignificant_space (const char *resource, int *pos, int resource_length) + (resource[*pos] == '\x0D')) { + *pos = *pos + 1; + +- if (*pos > resource_length) ++ if (*pos >= resource_length) + return TRUE; + } + +@@ -682,7 +682,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer) + do { + pos++; + +- if (pos > resource_length) ++ if ((pos + 1) > resource_length) + goto text_html; + } while (resource[pos] != '>'); + +-- +2.34.1 + diff --git a/package/libsoup/0010-headers-Handle-parsing-only-newlines.patch b/package/libsoup/0010-headers-Handle-parsing-only-newlines.patch new file mode 100644 index 0000000000..b6b3f4f37f --- /dev/null +++ b/package/libsoup/0010-headers-Handle-parsing-only-newlines.patch @@ -0,0 +1,46 @@ +From 4b8809cca4bbcbf9514314d86227f985362258b0 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Wed, 12 Feb 2025 11:30:02 -0600 +Subject: [PATCH] headers: Handle parsing only newlines + +Closes #404 +Closes #407 + +CVE: CVE-2025-32906 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/af5b9a4a3945c52b940d5ac181ef51bb12011f1f] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch + +Signed-off-by: Changqing Li +[Titouan: Remove changes on test files] +Signed-off-by: Titouan Christophe +--- + libsoup/soup-headers.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c +index e5d3c03..87bb3dc 100644 +--- a/libsoup/soup-headers.c ++++ b/libsoup/soup-headers.c +@@ -185,7 +185,7 @@ soup_headers_parse_request (const char *str, + /* RFC 2616 4.1 "servers SHOULD ignore any empty line(s) + * received where a Request-Line is expected." + */ +- while ((*str == '\r' || *str == '\n') && len > 0) { ++ while (len > 0 && (*str == '\r' || *str == '\n')) { + str++; + len--; + } +@@ -369,7 +369,7 @@ soup_headers_parse_response (const char *str, + * after a response, which we then see prepended to the next + * response on that connection. + */ +- while ((*str == '\r' || *str == '\n') && len > 0) { ++ while (len > 0 && (*str == '\r' || *str == '\n')) { + str++; + len--; + } + +-- +2.34.1 + diff --git a/package/libsoup/0011-auth-digest-Handle-missing-realm-nonce.patch b/package/libsoup/0011-auth-digest-Handle-missing-realm-nonce.patch new file mode 100644 index 0000000000..8c7610237d --- /dev/null +++ b/package/libsoup/0011-auth-digest-Handle-missing-realm-nonce.patch @@ -0,0 +1,35 @@ +From a7e711d0f162c6edc8acad2a96981d4890784ea3 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 12 May 2025 17:02:55 +0800 +Subject: [PATCH] auth-digest: Handle missing realm/nonce in authenticate + header + +CVE: CVE-2025-32910 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=e40df6d48a1cbab56f5d15016cc861a503423cfe] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-auth-digest.c | 3 +++ + 1 files changed, 3 insertions(+) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index e8ba990..0ab3499 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -142,6 +142,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + guint qop_options; + gboolean ok = TRUE; + ++ if (!soup_auth_get_realm (auth)) ++ return FALSE; ++ + g_free (priv->domain); + g_free (priv->nonce); + g_free (priv->opaque); + +-- +2.34.1 + diff --git a/package/libsoup/0012-auth-digest-Handle-missing-nonce.patch b/package/libsoup/0012-auth-digest-Handle-missing-nonce.patch new file mode 100644 index 0000000000..7749491fd3 --- /dev/null +++ b/package/libsoup/0012-auth-digest-Handle-missing-nonce.patch @@ -0,0 +1,97 @@ +From eccfca1074fc485a0b60dfb9c8385429a226bf73 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 16 May 2025 13:19:38 +0800 +Subject: [PATCH] auth-digest: Handle missing nonce + +CVE: CVE-2025-32910 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=405a8a34597a44bd58c4759e7d5e23f02c3b556a] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-auth-digest.c | 45 ++++++++++++++++++++++++++++---------- + 1 files changed, 28 insertions(+), 10 deletions(-) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index 0ab3499..10a8591 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -132,6 +132,19 @@ soup_auth_digest_get_qop (SoupAuthDigestQop qop) + return g_string_free (out, FALSE); + } + ++static gboolean ++validate_params (SoupAuthDigest *auth_digest) ++{ ++ SoupAuthDigestPrivate *priv = soup_auth_digest_get_instance_private (auth_digest); ++ ++ if (priv->qop || priv->algorithm == SOUP_AUTH_DIGEST_ALGORITHM_MD5_SESS) { ++ if (!priv->nonce) ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + static gboolean + soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + GHashTable *auth_params) +@@ -169,17 +182,22 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + if (priv->algorithm == -1) + ok = FALSE; + +- stale = g_hash_table_lookup (auth_params, "stale"); +- if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp) +- recompute_hex_a1 (priv); +- else { +- g_free (priv->user); +- priv->user = NULL; +- g_free (priv->cnonce); +- priv->cnonce = NULL; +- memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); +- memset (priv->hex_a1, 0, sizeof (priv->hex_a1)); +- } ++ if (!validate_params (auth_digest)) ++ ok = FALSE; ++ ++ if (ok) { ++ stale = g_hash_table_lookup (auth_params, "stale"); ++ if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp) ++ recompute_hex_a1 (priv); ++ else { ++ g_free (priv->user); ++ priv->user = NULL; ++ g_free (priv->cnonce); ++ priv->cnonce = NULL; ++ memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); ++ memset (priv->hex_a1, 0, sizeof (priv->hex_a1)); ++ } ++ } + + return ok; + } +@@ -359,6 +377,8 @@ soup_auth_digest_compute_response (const char *method, + if (qop) { + char tmp[9]; + ++ g_assert (cnonce); ++ + g_snprintf (tmp, 9, "%.8x", nc); + g_checksum_update (checksum, (guchar *)tmp, strlen (tmp)); + g_checksum_update (checksum, (guchar *)":", 1); +@@ -422,6 +442,9 @@ soup_auth_digest_get_authorization (SoupAuth *auth, SoupMessage *msg) + g_return_val_if_fail (uri != NULL, NULL); + url = soup_uri_to_string (uri, TRUE); + ++ g_assert (priv->nonce); ++ g_assert (!priv->qop || priv->cnonce); ++ + soup_auth_digest_compute_response (msg->method, url, priv->hex_a1, + priv->qop, priv->nonce, + priv->cnonce, priv->nc, + +-- +2.34.1 + diff --git a/package/libsoup/0013-auth-digest-Fix-leak.patch b/package/libsoup/0013-auth-digest-Fix-leak.patch new file mode 100644 index 0000000000..b7d5ec4de3 --- /dev/null +++ b/package/libsoup/0013-auth-digest-Fix-leak.patch @@ -0,0 +1,31 @@ +From 74c95d54fe42041fe161cb74c76d942ffd37a5dd Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 16 May 2025 13:21:43 +0800 +Subject: [PATCH] auth-digest: Fix leak + +CVE: CVE-2025-32910 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=ea16eeacb052e423eb5c3b0b705e5eab34b13832] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-auth-digest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index 10a8591..6d965d2 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -66,6 +66,7 @@ soup_auth_digest_finalize (GObject *object) + g_free (priv->nonce); + g_free (priv->domain); + g_free (priv->cnonce); ++ g_free (priv->opaque); + + memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); + memset (priv->hex_a1, 0, sizeof (priv->hex_a1)); +-- +2.34.1 + diff --git a/package/libsoup/0014-CVE-2025-32911.patch b/package/libsoup/0014-CVE-2025-32911.patch new file mode 100644 index 0000000000..102acb4af3 --- /dev/null +++ b/package/libsoup/0014-CVE-2025-32911.patch @@ -0,0 +1,77 @@ +From 52c5859b82fe79f2c32d883e048d218e0d7f2182 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 30 Apr 2025 14:59:55 +0800 +Subject: [PATCH] CVE-2025-32911 + +CVE: CVE-2025-32911 CVE-2025-32913 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/422/commits] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-message-headers.c | 13 +++++++++---- + tests/header-parsing-test.c | 15 +++++++++++++++ + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c +index 39ad14a..78b2455 100644 +--- a/libsoup/soup-message-headers.c ++++ b/libsoup/soup-message-headers.c +@@ -1454,10 +1454,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs, + */ + if (params && g_hash_table_lookup_extended (*params, "filename", + &orig_key, &orig_value)) { +- char *filename = strrchr (orig_value, '/'); +- +- if (filename) +- g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); ++ if (orig_value) { ++ char *filename = strrchr (orig_value, '/'); ++ ++ if (filename) ++ g_hash_table_insert (*params, g_strdup (orig_key), g_strdup(filename + 1)); ++ } else { ++ /* filename with no value isn't valid. */ ++ g_hash_table_remove (*params, "filename"); ++ } + } + return TRUE; + } +diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c +index 946f118..752196e 100644 +--- a/tests/header-parsing-test.c ++++ b/tests/header-parsing-test.c +@@ -1034,6 +1034,7 @@ do_param_list_tests (void) + #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\"" + #define RFC5987_TEST_HEADER_NO_TYPE "filename=\"test.txt\"" + #define RFC5987_TEST_HEADER_NO_TYPE_2 "filename=\"test.txt\"; foo=bar" ++#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename" + + static void + do_content_disposition_tests (void) +@@ -1133,6 +1134,20 @@ do_content_disposition_tests (void) + g_assert_cmpstr (filename, ==, RFC5987_TEST_FALLBACK_FILENAME); + parameter2 = g_hash_table_lookup (params, "foo"); + g_assert_cmpstr (parameter2, ==, "bar"); ++ g_hash_table_destroy (params); ++ ++ /* Empty filename */ ++ soup_message_headers_clear (hdrs); ++ soup_message_headers_append (hdrs, "Content-Disposition", ++ RFC5987_TEST_HEADER_EMPTY_FILENAME); ++ if (!soup_message_headers_get_content_disposition (hdrs, ++ &disposition, ++ ¶ms)) { ++ soup_test_assert (FALSE, "empty filename decoding FAILED"); ++ return; ++ } ++ g_free (disposition); ++ g_assert_false (g_hash_table_contains (params, "filename")); + g_hash_table_destroy (params); + + soup_message_headers_free (hdrs); +-- +2.34.1 + diff --git a/package/libsoup/0015-auth-digest-Handle-missing-nonce.patch b/package/libsoup/0015-auth-digest-Handle-missing-nonce.patch new file mode 100644 index 0000000000..79fd727a55 --- /dev/null +++ b/package/libsoup/0015-auth-digest-Handle-missing-nonce.patch @@ -0,0 +1,35 @@ +From 0984dddb11daf14fdf5ca24077cd0ebda796439a Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 16 May 2025 13:25:32 +0800 +Subject: [PATCH] auth-digest: Handle missing nonce + +CVE: CVE-2025-32912 +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992?merge_request_iid=434 +https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-auth-digest.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index 6d965d2..f1621ec 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + guint qop_options; + gboolean ok = TRUE; + +- if (!soup_auth_get_realm (auth)) ++ if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce")) + return FALSE; + + g_free (priv->domain); + +-- +2.34.1 + diff --git a/package/libsoup/0016-CVE-2025-32914.patch b/package/libsoup/0016-CVE-2025-32914.patch new file mode 100644 index 0000000000..3bb206bfc3 --- /dev/null +++ b/package/libsoup/0016-CVE-2025-32914.patch @@ -0,0 +1,38 @@ +From ac844b9fc7945c38ea21fb7cf1a49a5c226d7c9c Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 12 May 2025 16:17:20 +0800 +Subject: [PATCH] Resolve "(CVE-2025-32914) (#YWH-PGM9867-23) OOB Read on + libsoup through function "soup_multipart_new_from_message" in + soup-multipart.c leads to crash or exit of process" + +CVE: CVE-2025-32914 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450/diffs?commit_id=5bfcf8157597f2d327050114fb37ff600004dbcf] + +Test code are not added since some functions not aligned with version +2.74.3 + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-multipart.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c +index a7e550f..dd93973 100644 +--- a/libsoup/soup-multipart.c ++++ b/libsoup/soup-multipart.c +@@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, + return NULL; + } + +- split = strstr (start, "\r\n\r\n"); ++ split = g_strstr_len (start, body_end - start, "\r\n\r\n"); + if (!split || split > end) { + soup_multipart_free (multipart); + soup_buffer_free (flattened); + +-- +2.34.1 + diff --git a/package/libsoup/0017-auth-digest-fix-crash.patch b/package/libsoup/0017-auth-digest-fix-crash.patch new file mode 100644 index 0000000000..f73cdf6614 --- /dev/null +++ b/package/libsoup/0017-auth-digest-fix-crash.patch @@ -0,0 +1,41 @@ +From 52a0f9234d384b9dab368835b22e5a5a01542168 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 16 May 2025 14:16:10 +0800 +Subject: [PATCH] auth-digest: fix crash in + soup_auth_digest_get_protection_space() + +We need to validate the Domain parameter in the WWW-Authenticate header. + +Unfortunately this crash only occurs when listening on default ports 80 +and 443, so there's no good way to test for this. The test would require +running as root. + +Fixes #440 + +CVE: CVE-2025-4476 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c?merge_request_iid=457] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-auth-digest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index f1621ec..a2dc560 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -229,7 +229,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, SoupURI *source_uri) + uri = soup_uri_new (d); + if (uri && uri->scheme == source_uri->scheme && + uri->port == source_uri->port && +- !strcmp (uri->host, source_uri->host)) ++ !g_strcmp0 (uri->host, source_uri->host)) + dir = g_strdup (uri->path); + else + dir = NULL; +-- +2.34.1 + diff --git a/package/libsoup/0018-soup_header_parse_quality_list-Fix-leak.patch b/package/libsoup/0018-soup_header_parse_quality_list-Fix-leak.patch new file mode 100644 index 0000000000..5dfe074d91 --- /dev/null +++ b/package/libsoup/0018-soup_header_parse_quality_list-Fix-leak.patch @@ -0,0 +1,64 @@ +From 81e03c538d6a102406114567f4f1c468033ce2e4 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Thu, 26 Dec 2024 18:31:42 -0600 +Subject: [PATCH] soup_header_parse_quality_list: Fix leak + +When iterating over the parsed list we now steal the allocated strings that we want and then free_full the list which may contain remaining strings. + +CVE: CVE-2025-46420 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/421/diffs?commit_id=c9083869ec2a3037e6df4bd86b45c419ba295f8e] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-headers.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c +index 87bb3dc..9707ca0 100644 +--- a/libsoup/soup-headers.c ++++ b/libsoup/soup-headers.c +@@ -528,7 +528,7 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable) + GSList *unsorted; + QualityItem *array; + GSList *sorted, *iter; +- char *item, *semi; ++ char *semi; + const char *param, *equal, *value; + double qval; + int n; +@@ -541,9 +541,8 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable) + unsorted = soup_header_parse_list (header); + array = g_new0 (QualityItem, g_slist_length (unsorted)); + for (iter = unsorted, n = 0; iter; iter = iter->next) { +- item = iter->data; + qval = 1.0; +- for (semi = strchr (item, ';'); semi; semi = strchr (semi + 1, ';')) { ++ for (semi = strchr (iter->data, ';'); semi; semi = strchr (semi + 1, ';')) { + param = skip_lws (semi + 1); + if (*param != 'q') + continue; +@@ -575,15 +574,15 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable) + if (qval == 0.0) { + if (unacceptable) { + *unacceptable = g_slist_prepend (*unacceptable, +- item); ++ g_steal_pointer (&iter->data)); + } + } else { +- array[n].item = item; ++ array[n].item = g_steal_pointer (&iter->data); + array[n].qval = qval; + n++; + } + } +- g_slist_free (unsorted); ++ g_slist_free_full (unsorted, g_free); + + qsort (array, n, sizeof (QualityItem), sort_by_qval); + sorted = NULL; +-- +2.34.1 + diff --git a/package/libsoup/0019-session-Strip-authentication-credentials.patch b/package/libsoup/0019-session-Strip-authentication-credentials.patch new file mode 100644 index 0000000000..4e766d066f --- /dev/null +++ b/package/libsoup/0019-session-Strip-authentication-credentials.patch @@ -0,0 +1,50 @@ +From 5eb225f02bb35de56cfeedd87bde716bf1cb750b Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Wed, 5 Feb 2025 16:18:10 -0600 +Subject: [PATCH] session: Strip authentication credentails on + cross-origin redirect + +This should match the behavior of Firefox and Safari but not of Chromium. + +CVE: CVE-2025-46421 +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/436/diffs?commit_id=3e5c26415811f19e7737238bb23305ffaf96f66b] + +Test code not added since it included some headers not in version 2.74.3 + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-session.c | 8 ++++- + 2 files changed, 85 insertions(+), 1 deletion(-) + +diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c +index 83421ef..8d6ac61 100644 +--- a/libsoup/soup-session.c ++++ b/libsoup/soup-session.c +@@ -1189,12 +1189,18 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg) + SOUP_ENCODING_NONE); + } + ++ /* Strip all credentials on cross-origin redirect. */ ++ if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) { ++ soup_message_headers_remove (msg->request_headers, "Authorization"); ++ soup_message_set_auth (msg, NULL); ++ } ++ + soup_message_set_uri (msg, new_uri); + soup_uri_free (new_uri); + + soup_session_requeue_message (session, msg); + return TRUE; +-} ++} + + static void + redirect_handler (SoupMessage *msg, gpointer user_data) + +-- +2.34.1 + diff --git a/package/libsoup/0020-soup-multipart-Verify-boundary-limits.patch b/package/libsoup/0020-soup-multipart-Verify-boundary-limits.patch new file mode 100644 index 0000000000..e6b8b2fb97 --- /dev/null +++ b/package/libsoup/0020-soup-multipart-Verify-boundary-limits.patch @@ -0,0 +1,41 @@ +From dfdc9b3cc73e6fe88cc12792ba00e14642572339 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 15 May 2025 17:49:11 +0200 +Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body + +It could happen that the boundary started at a place which resulted into +a negative number, which in an unsigned integer is a very large value. +Check the body size is not a negative value before setting it. + +Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449 + +Part-of: + +CVE: CVE-2025-4948 +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-multipart.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c +index dd93973..ce2fc10 100644 +--- a/libsoup/soup-multipart.c ++++ b/libsoup/soup-multipart.c +@@ -214,7 +214,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, + */ + part_body = soup_buffer_new_subbuffer (flattened, + split - flattened->data, +- end - 2 - split); ++ end - 2 >= split ? end - 2 - split : 0); + g_ptr_array_add (multipart->bodies, part_body); + + start = end; +-- +2.34.1 + diff --git a/package/libsoup/0021-soup-multipart-Verify-array-bounds.patch b/package/libsoup/0021-soup-multipart-Verify-array-bounds.patch new file mode 100644 index 0000000000..7cd2a2c036 --- /dev/null +++ b/package/libsoup/0021-soup-multipart-Verify-array-bounds.patch @@ -0,0 +1,40 @@ +From a7d0c58608ed830bedfb6b92aea11e00feb55aa9 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Mon, 19 May 2025 17:48:27 +0200 +Subject: [PATCH] soup-multipart: Verify array bounds before accessing its + members + +The boundary could be at a place which, calculated, pointed +before the beginning of the array. Check the bounds, to avoid +read out of the array bounds. + +Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447 + +CVE: CVE-2025-4969 +Upstream-Status: Backport +[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/467/diffs?commit_id=b5b4dd10d4810f0c87b4eaffe88504f06e502f33] + +Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch + +Signed-off-by: Changqing Li +Signed-off-by: Titouan Christophe +--- + libsoup/soup-multipart.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c +index ce2fc10..a29cdf0 100644 +--- a/libsoup/soup-multipart.c ++++ b/libsoup/soup-multipart.c +@@ -108,7 +108,7 @@ find_boundary (const char *start, const char *end, + continue; + + /* Check that it's at start of line */ +- if (!(b == start || (b[-1] == '\n' && b[-2] == '\r'))) ++ if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r'))) + continue; + + /* Check for "--" or "\r\n" after boundary */ +-- +2.34.1 + diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 81bf42cabe..4ac88a1178 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -22,6 +22,43 @@ LIBSOUP_DEPENDENCIES = \ sqlite \ $(TARGET_NLS_DEPENDENCIES) +# 0003-sniffer-fix-potential-overflow.patch +LIBSOUP_IGNORE_CVES += CVE-2025-2784 +# 0004-headers-Strictly-dont-allow-NUL-bytes.patch +LIBSOUP_IGNORE_CVES += CVE-2024-52530 +# 0005-headers-Be-more-robust-against-invalid-input.patch +LIBSOUP_IGNORE_CVES += CVE-2024-52531 +# 0006-websocket-process-the-frame-as-soon-as-we-read-data.patch +LIBSOUP_IGNORE_CVES += CVE-2024-52532 +# 0007-Fix-using-int-instead-of-size_t.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32050 +# 0008-Fix-heap-buffer-overflow.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32052 +# 0009-Fix-heap-buffer-overflow.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32053 +# 0010-headers-Handle-parsing-only-newlines.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32906 +# 0011-auth-digest-Handle-missing-realm-nonce.patch +# 0012-auth-digest-Handle-missing-nonce.patch +# 0013-auth-digest-Fix-leak.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32910 +# 0014-CVE-2025-32911.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32911 CVE-2025-32913 +# 0015-auth-digest-Handle-missing-nonce.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32912 +# 0016-CVE-2025-32914.patch +LIBSOUP_IGNORE_CVES += CVE-2025-32914 +# 0017-auth-digest-fix-crash.patch +LIBSOUP_IGNORE_CVES += CVE-2025-4476 +# 0018-soup_header_parse_quality_list-Fix-leak.patch +LIBSOUP_IGNORE_CVES += CVE-2025-46420 +# 0019-session-Strip-authentication-credentials.patch +LIBSOUP_IGNORE_CVES += CVE-2025-46421 +# 0020-soup-multipart-Verify-boundary-limits.patch +LIBSOUP_IGNORE_CVES += CVE-2025-4948 +# 0021-soup-multipart-Verify-array-bounds.patch +LIBSOUP_IGNORE_CVES += CVE-2025-4969 + LIBSOUP_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSOUP_CONF_OPTS = \ diff --git a/package/libsoup3/libsoup3.hash b/package/libsoup3/libsoup3.hash index 37ecd2db84..32aa7382fa 100644 --- a/package/libsoup3/libsoup3.hash +++ b/package/libsoup3/libsoup3.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.0.sha256sum -sha256 62959f791e8e8442f8c13cedac8c4919d78f9120d5bb5301be67a5e53318b4a3 libsoup-3.6.0.tar.xz +# From https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.5.sha256sum +sha256 6891765aac3e949017945c3eaebd8cc8216df772456dc9f460976fbdb7ada234 libsoup-3.6.5.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup3/libsoup3.mk b/package/libsoup3/libsoup3.mk index f8a7e26159..0db587a93a 100644 --- a/package/libsoup3/libsoup3.mk +++ b/package/libsoup3/libsoup3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSOUP3_VERSION_MAJOR = 3.6 -LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).0 +LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).5 LIBSOUP3_SOURCE = libsoup-$(LIBSOUP3_VERSION).tar.xz LIBSOUP3_SITE = https://download.gnome.org/sources/libsoup/$(LIBSOUP3_VERSION_MAJOR) LIBSOUP3_LICENSE = LGPL-2.0+ @@ -45,9 +45,7 @@ LIBSOUP3_CONF_OPTS += -Dintrospection=disabled -Dvapi=disabled endif ifeq ($(BR2_PACKAGE_LIBKRB5),y) -LIBSOUP3_CONF_OPTS += \ - -Dgssapi=enabled \ - -Dkrb5_config=$(STAGING_DIR)/usr/bin/krb5-config +LIBSOUP3_CONF_OPTS += -Dgssapi=enabled LIBSOUP3_DEPENDENCIES += libkrb5 else LIBSOUP3_CONF_OPTS += -Dgssapi=disabled diff --git a/package/libsoxr/0001-CMakeLists.txt-allow-building-without-ffmpeg-support.patch b/package/libsoxr/0001-CMakeLists.txt-allow-building-without-ffmpeg-support.patch new file mode 100644 index 0000000000..37c931f4f5 --- /dev/null +++ b/package/libsoxr/0001-CMakeLists.txt-allow-building-without-ffmpeg-support.patch @@ -0,0 +1,33 @@ +From 2592f0d38826e8db3603ce1535d82ab427ac73bc Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 28 Aug 2025 18:11:13 +0200 +Subject: [PATCH] CMakeLists.txt: allow building without ffmpeg support + +The ffmpeg support is optional, but is automatically pulled in (if +available) on ARM with SIMD, even when WITH_AVFFT is disabled. + +Instead, ensure WITH_AVFFT does its job, which is to allow disabling +ffmpeg usage if not desired. + +Upstream: https://github.com/chirlu/soxr/pull/16 +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ee48f6c..48f91f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,7 +134,7 @@ if (WITH_AVFFT) + endif () + endif () + +-if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WITH_CR32)) ++if (WITH_AVFFT AND (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WITH_CR32)) + find_package (LibAVUtil) + if (AVUTIL_FOUND) + include_directories (${AVUTIL_INCLUDE_DIRS}) +-- +2.50.1 + diff --git a/package/libsoxr/libsoxr.mk b/package/libsoxr/libsoxr.mk index b34962c4ad..ace13c630b 100644 --- a/package/libsoxr/libsoxr.mk +++ b/package/libsoxr/libsoxr.mk @@ -10,7 +10,7 @@ LIBSOXR_SITE = http://downloads.sourceforge.net/project/soxr LIBSOXR_LICENSE = LGPL-2.1+ LIBSOXR_LICENSE_FILES = LICENCE COPYING.LGPL LIBSOXR_INSTALL_STAGING = YES -LIBSOXR_CONF_OPTS = -DWITH_OPENMP=OFF +LIBSOXR_CONF_OPTS = -DWITH_OPENMP=OFF -DWITH_AVFFT=OFF ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG) LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=1 @@ -18,8 +18,4 @@ else LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0 endif -ifeq ($(BR2_PACKAGE_FFMPEG),y) -LIBSOXR_DEPENDENCIES += ffmpeg -endif - $(eval $(cmake-package)) diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index e29c5994a3..86358dad62 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7b8a556be64120bab9c321964e67b90f5e6adb59abf3992c5c7937f37a4e7c8f libspdm-3.5.0.tar.gz -sha256 c6ffa7e6889e63893078cb21b89594070183f7e2cf5b4ea01a4fb23eac59ed32 LICENSE.md +sha256 e7aefb9bc546bbd3ff10d707a6f05213cfb2e679354438ea0d1b5c483b5daa85 libspdm-3.8.0.tar.gz +sha256 8c891ecf439cca84ceab33fc819c029a72c198f31818aa53a3788a0553841d6e LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 9d8da2a3c6..4d29429811 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.5.0 +LIBSPDM_VERSION = 3.8.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 95daf0d792..232c106387 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bf641aa654861be10570bfc137d1441283822418e9757dc71ebb69a6cf84ea6b libsrtp-2.6.0.tar.gz +sha256 54facb1727a557c2a76b91194dcb2d0a453aaf8e2d0cbbf1e3c2848c323e28ad libsrtp-2.7.0.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 269c1ae3f8..ba58b900d4 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.6.0 +LIBSRTP_VERSION = 2.7.0 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index b131557ee8..1c15d77a45 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.libssh.org/files/0.11/libssh-0.11.1.tar.xz.asc +# https://www.libssh.org/files/0.11/libssh-0.11.3.tar.xz.asc # with key 88A228D89B07C2C77D0C780903D5DF8CFDD3E8E7 -sha256 14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79 libssh-0.11.1.tar.xz +sha256 7d8a1361bb094ec3f511964e78a5a4dba689b5986e112afabe4f4d0d6c6125c3 libssh-0.11.3.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 6f8a1ac389..2be9013454 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.11 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 @@ -17,9 +17,9 @@ LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF -# Not part of any release -# https://www.libssh.org/2023/07/14/cve-2023-3603-potential-null-dereference-in-libsshs-sftp-server/ -LIBSSH_IGNORE_CVES += CVE-2023-3603 +# NVD database is missing an upper version specifier. +# This vulnerability only affects libssh<0.11.2 +LIBSSH_IGNORE_CVES = CVE-2025-5318 ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) LIBSSH_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash index b5bc571f86..bf04c5acab 100644 --- a/package/libssh2/libssh2.hash +++ b/package/libssh2/libssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a488a22625296342ddae862de1d59633e6d446eff8417398e06674a49be3d7c2 libssh2-1.11.0.tar.xz -sha256 fda5e2522c58ba1f31c9f2044747616457466f4aebec16ade4af86e3a16a8e02 COPYING +sha256 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769 libssh2-1.11.1.tar.xz +sha256 f7f9633cf9ff2f1333f3d7ce46973a8716a4d2a2815ad56f30d437d5fea7bafe COPYING diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index b2c07cbf30..1702d94c79 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSSH2_VERSION = 1.11.0 +LIBSSH2_VERSION = 1.11.1 LIBSSH2_SOURCE= libssh2-$(LIBSSH2_VERSION).tar.xz LIBSSH2_SITE = https://www.libssh2.org/download LIBSSH2_LICENSE = BSD @@ -13,9 +13,6 @@ LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build --disable-rpath -# 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch -LIBSSH2_IGNORE_CVES += CVE-2023-48795 - ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) LIBSSH2_DEPENDENCIES += mbedtls LIBSSH2_CONF_OPTS += --with-libmbedcrypto-prefix=$(STAGING_DIR)/usr \ diff --git a/package/libsvgtiny/0001-disable-debug-printfs.patch b/package/libsvgtiny/0001-disable-debug-printfs.patch deleted file mode 100644 index 72ed21ccfa..0000000000 --- a/package/libsvgtiny/0001-disable-debug-printfs.patch +++ /dev/null @@ -1,125 +0,0 @@ -svntiny: svntiny_gradient.c: only print debugging if GRADIENT_DEBUG is enabled - -Signed-off-by: Peter Korsgaard ---- - src/svgtiny_gradient.c | 23 ++++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - -Index: libsvgtiny/src/svgtiny_gradient.c -=================================================================== ---- libsvgtiny.orig/src/svgtiny_gradient.c -+++ libsvgtiny/src/svgtiny_gradient.c -@@ -30,8 +30,9 @@ void svgtiny_find_gradient(const char *i - { - xmlNode *gradient; - -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "svgtiny_find_gradient: id \"%s\"\n", id); -- -+#endif - state->linear_gradient_stop_count = 0; - state->gradient_x1 = "0%"; - state->gradient_y1 = "0%"; -@@ -47,13 +48,17 @@ void svgtiny_find_gradient(const char *i - - gradient = svgtiny_find_element_by_id( - (xmlNode *) state->document, id); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "gradient %p\n", (void *) gradient); -+#endif - if (!gradient) { - fprintf(stderr, "gradient \"%s\" not found\n", id); - return; - } - -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "gradient name \"%s\"\n", gradient->name); -+#endif - if (strcmp((const char *) gradient->name, "linearGradient") == 0) { - svgtiny_parse_linear_gradient(gradient, state); - } -@@ -98,8 +103,10 @@ svgtiny_code svgtiny_parse_linear_gradie - return svgtiny_OUT_OF_MEMORY; - svgtiny_parse_transform(s, &a, &b, &c, &d, &e, &f); - free(s); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "transform %g %g %g %g %g %g\n", - a, b, c, d, e, f); -+#endif - state->gradient_transform.a = a; - state->gradient_transform.b = b; - state->gradient_transform.c = c; -@@ -143,7 +150,9 @@ svgtiny_code svgtiny_parse_linear_gradie - } - - if (offset != -1 && color != svgtiny_TRANSPARENT) { -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "stop %g %x\n", offset, color); -+#endif - state->gradient_stop[i].offset = offset; - state->gradient_stop[i].color = color; - i++; -@@ -220,9 +229,11 @@ svgtiny_code svgtiny_add_path_linear_gra - #endif - - /* compute gradient vector */ -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "x1 %s, y1 %s, x2 %s, y2 %s\n", - state->gradient_x1, state->gradient_y1, - state->gradient_x2, state->gradient_y2); -+#endif - if (!state->gradient_user_space_on_use) { - gradient_x0 = object_x0 + - svgtiny_parse_length(state->gradient_x1, -@@ -297,9 +308,11 @@ svgtiny_code svgtiny_add_path_linear_gra - - /* invert gradient transform for applying to vertices */ - svgtiny_invert_matrix(&state->gradient_transform.a, trans); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "inverse transform %g %g %g %g %g %g\n", - trans[0], trans[1], trans[2], trans[3], - trans[4], trans[5]); -+#endif - - /* compute points on the path for triangle vertices */ - /* r, r0, r1 are distance along gradient vector */ -@@ -372,8 +385,10 @@ svgtiny_code svgtiny_add_path_linear_gra - steps = ceilf(fabsf(r1 - r0) / 0.05); - if (steps == 0) - steps = 1; -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "r0 %g, r1 %g, steps %i\n", - r0, r1, steps); -+#endif - - /* loop through intermediate points */ - for (z = 1; z != steps; z++) { -@@ -398,7 +413,9 @@ svgtiny_code svgtiny_add_path_linear_gra - r = ((x_trans - gradient_x0) * gradient_dx + - (y_trans - gradient_y0) * gradient_dy) / - gradient_norm_squared; -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "(%g %g [%g]) ", x, y, r); -+#endif - point = svgtiny_list_push(pts); - if (!point) { - svgtiny_list_free(pts); -@@ -412,14 +429,18 @@ svgtiny_code svgtiny_add_path_linear_gra - min_pt = svgtiny_list_size(pts) - 1; - } - } -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "\n"); -+#endif - - /* next segment start point is this segment end point */ - x0 = x1; - y0 = y1; - } -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "pts size %i, min_pt %i, min_r %.3f\n", - svgtiny_list_size(pts), min_pt, min_r); -+#endif - - /* render triangles */ - stop_count = state->linear_gradient_stop_count; diff --git a/package/libsvgtiny/0002-Remove-Werror.patch b/package/libsvgtiny/0002-Remove-Werror.patch deleted file mode 100644 index c8b0c0b9ef..0000000000 --- a/package/libsvgtiny/0002-Remove-Werror.patch +++ /dev/null @@ -1,44 +0,0 @@ -Remove -Werror from Makefile - -glibc-2.20 includes some changes to the include/features.h file -introduced by this commit: - - https://sourceware.org/git/?p=glibc.git;a=commit;h=ade40b10ff5fa59a318cf55b9d8414b758e8df78 - -Those changes make libsvgtiny fail because some warnings are thrown and -the build system is using the -Werror option. We disable this to be able -to build it, or otherwise we will see errors like this one: - -GPERF: src/colors.gperf -COMPILE: build-Linux-Linux-release-lib-static/src_colors.c -In file included from -/br/output/host/usr/mipsel-buildroot-linux-gnu/sysroot/usr/include/string.h:25:0, - from src/colors.gperf:16: -/br/output/host/usr/mipsel-buildroot-linux-gnu/sysroot/usr/include/features.h:148:3: -error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use -_DEFAULT_SOURCE" [-Werror=cpp] - -and this one: - -In file included from src/colors.gperf:18:0: -/home/ldap/vriera/work/mips-buildroots/mips32/output/build/libsvgtiny-12121/src/svgtiny_internal.h:71:0: -error: "strndup" redefined [-Werror] - -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile b/Makefile ---- a/Makefile 2010-01-03 23:37:39.000000000 +0000 -+++ b/Makefile 2014-12-11 11:35:37.241903884 +0000 -@@ -13,12 +13,6 @@ TESTRUNNER := $(ECHO) - WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ - -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs -pedantic --# BeOS/Haiku/AmigaOS4 standard library headers create warnings --ifneq ($(TARGET),beos) -- ifneq ($(TARGET),AmigaOS) -- WARNFLAGS := $(WARNFLAGS) -Werror -- endif --endif - CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \ - -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) - ifneq ($(GCCVER),2) diff --git a/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch b/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch deleted file mode 100644 index 9285477d25..0000000000 --- a/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 21b4836ac9d6c6725590a925daa5d17eda9843e9 Mon Sep 17 00:00:00 2001 -From: Daniel Silverstone -Date: Sat, 26 Apr 2014 16:24:54 +0100 -Subject: Hopefully silence warnings about inlines and non inlines calling one - another. - -[Retrieved from: -https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=21b4836ac9d6c6725590a925daa5d17eda9843e9] -Signed-off-by: Fabrice Fontaine ---- - src/colors.gperf | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/colors.gperf b/src/colors.gperf -index 89152d2..96d5b9e 100644 ---- a/src/colors.gperf -+++ b/src/colors.gperf -@@ -16,6 +16,15 @@ - #include - #include "svgtiny.h" - #include "svgtiny_internal.h" -+ -+/* This unusual define shennanigan is to try and prevent the gperf -+ * generated function from being inlined. This is pointless given -+ * it (a) is in a separate .c file and (b) has external linkage. -+ */ -+#ifdef __inline -+#undef __inline -+#define __inline -+#endif - %} - - struct svgtiny_named_color; --- -cgit v1.2.1 - diff --git a/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch b/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch deleted file mode 100644 index b5443e9912..0000000000 --- a/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 4390f1c84e8fee51fc22468821e6fc158e783053 Mon Sep 17 00:00:00 2001 -From: Michael Drake -Date: Thu, 20 Apr 2017 10:51:07 +0100 -Subject: Build: Include gperf-generated code directly. - -Previously we built the generated code separatly and then linked to -it. However, this caused problems with certain compilers and gperf -versions. This change includes the generated code directly in -svgtiny.c instead, which is the only place its used. - -[Retrieved from: -https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=4390f1c84e8fee51fc22468821e6fc158e783053] -Signed-off-by: Fabrice Fontaine -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/Makefile | 13 +++++++------ - src/colors.gperf | 8 -------- - src/svgtiny.c | 3 +++ - src/svgtiny_internal.h | 5 ----- - 4 files changed, 10 insertions(+), 19 deletions(-) - -(limited to 'src') - -diff --git a/src/Makefile b/src/Makefile -index a979720..fb8a72f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,13 +1,14 @@ - # Sources - DIR_SOURCES := svgtiny.c svgtiny_gradient.c svgtiny_list.c - --SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c -+SOURCES := $(SOURCES) - --$(BUILDDIR)/src_colors.c: src/colors.gperf -+$(DIR)autogenerated_colors.c: src/colors.gperf - $(VQ)$(ECHO) " GPERF: $<" -- $(Q)gperf --output-file=$@.tmp $< --# Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly) -- $(Q)$(SED) -e 's/#ifdef __GNUC_STDC_INLINE__/#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/' $@.tmp >$@ -- $(Q)$(RM) $@.tmp -+ $(Q)gperf --output-file=$@ $< -+ -+PRE_TARGETS := $(DIR)autogenerated_colors.c -+ -+CLEAN_ITEMS := $(DIR)autogenerated_colors.c - - include build/makefiles/Makefile.subdir -diff --git a/src/colors.gperf b/src/colors.gperf -index 96d5b9e..a836787 100644 ---- a/src/colors.gperf -+++ b/src/colors.gperf -@@ -17,14 +17,6 @@ - #include "svgtiny.h" - #include "svgtiny_internal.h" - --/* This unusual define shennanigan is to try and prevent the gperf -- * generated function from being inlined. This is pointless given -- * it (a) is in a separate .c file and (b) has external linkage. -- */ --#ifdef __inline --#undef __inline --#define __inline --#endif - %} - - struct svgtiny_named_color; -diff --git a/src/svgtiny.c b/src/svgtiny.c -index 4661a58..bbefb88 100644 ---- a/src/svgtiny.c -+++ b/src/svgtiny.c -@@ -17,6 +17,9 @@ - #include "svgtiny.h" - #include "svgtiny_internal.h" - -+/* Source file generated by `gperf`. */ -+#include "autogenerated_colors.c" -+ - #ifndef M_PI - #define M_PI 3.14159265358979323846 - #endif -diff --git a/src/svgtiny_internal.h b/src/svgtiny_internal.h -index 158d230..6bf5d64 100644 ---- a/src/svgtiny_internal.h -+++ b/src/svgtiny_internal.h -@@ -87,9 +87,4 @@ - void *svgtiny_list_push(struct svgtiny_list *list); - void svgtiny_list_free(struct svgtiny_list *list); - --/* colors.gperf */ --const struct svgtiny_named_color * -- svgtiny_color_lookup(register const char *str, -- register unsigned int len); -- - #endif --- -cgit v1.2.1 - diff --git a/package/libsvgtiny/Config.in b/package/libsvgtiny/Config.in deleted file mode 100644 index 836dec210e..0000000000 --- a/package/libsvgtiny/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBSVGTINY - bool "libsvgtiny" - select BR2_PACKAGE_LIBXML2 - help - Libsvgtiny is an implementation of SVG Tiny, written in C. - It is currently in development for use with NetSurf and is - intended to be suitable for use in other projects too. - - http://www.netsurf-browser.org/projects/libsvgtiny/ diff --git a/package/libsvgtiny/libsvgtiny.hash b/package/libsvgtiny/libsvgtiny.hash deleted file mode 100644 index 55f4093e19..0000000000 --- a/package/libsvgtiny/libsvgtiny.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 758641d339b324a76294ef08e323faa2cefb557793f437c08af7deb3b73a453e libsvgtiny-ea9d99fc8b231c22d06168135e181d61f4eb2f06-git4.tar.gz -sha256 92b965c77be71661cae51425a6b40a5ca274f44cc13c723c90fb471a9a26a828 README diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk deleted file mode 100644 index 55ce4327fe..0000000000 --- a/package/libsvgtiny/libsvgtiny.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# libsvgtiny -# -################################################################################ - -LIBSVGTINY_SITE = http://git.netsurf-browser.org/libsvgtiny.git -LIBSVGTINY_SITE_METHOD = git -LIBSVGTINY_VERSION = ea9d99fc8b231c22d06168135e181d61f4eb2f06 -LIBSVGTINY_INSTALL_STAGING = YES -LIBSVGTINY_DEPENDENCIES = \ - libxml2 host-gperf host-pkgconf host-netsurf-buildsystem -LIBSVGTINY_LICENSE = MIT -LIBSVGTINY_LICENSE_FILES = README - -# The libsvgtiny build system cannot build both the shared and static -# libraries. So when the Buildroot configuration requests to build -# both the shared and static variants, we build only the shared one. -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSVGTINY_COMPONENT_TYPE = lib-shared -else -LIBSVGTINY_COMPONENT_TYPE = lib-static -endif - -define LIBSVGTINY_CONFIGURE_CMDS - ln -sf $(HOST_DIR)/share/netsurf-buildsystem $(@D)/build -endef - -# Use $(MAKE1) since parallel build fails -define LIBSVGTINY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) PREFIX=/usr \ - COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) -endef - -define LIBSVGTINY_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE1) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ - COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install -endef - -define LIBSVGTINY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE1) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ - COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install -endef - -$(eval $(generic-package)) diff --git a/package/libtasn1/libtasn1.hash b/package/libtasn1/libtasn1.hash index 4bcb6a3feb..b9c9dad131 100644 --- a/package/libtasn1/libtasn1.hash +++ b/package/libtasn1/libtasn1.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.19.0.tar.gz.sig -sha256 1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a libtasn1-4.19.0.tar.gz +# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.20.0.tar.gz.sig +sha256 92e0e3bd4c02d4aeee76036b2ddd83f0c732ba4cda5cb71d583272b23587a76c libtasn1-4.20.0.tar.gz # Locally calculated -sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER +sha256 990ef6a87f29a9d3db33698b94ea026a5d0f81bbf9806333d73699a250b7e5d6 README.md +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 COPYING.LESSERv2 diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index 3af1bcdcbb..3154e500f1 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBTASN1_VERSION = 4.19.0 +LIBTASN1_VERSION = 4.20.0 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 LIBTASN1_DEPENDENCIES = host-bison host-pkgconf LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) -LIBTASN1_LICENSE_FILES = COPYING doc/COPYING doc/COPYING.LESSER +LIBTASN1_LICENSE_FILES = README.md COPYING COPYING.LESSERv2 LIBTASN1_CPE_ID_VENDOR = gnu LIBTASN1_INSTALL_STAGING = YES diff --git a/package/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch b/package/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch new file mode 100644 index 0000000000..0d9cf9b8a0 --- /dev/null +++ b/package/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch @@ -0,0 +1,40 @@ +From 4eb54a811bef43da2be9cc84009567e5d6ca9741 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 11 May 2024 23:15:59 -0700 +Subject: [PATCH] teamd: Pass correct parameter type to accept API + +accept() expects sockaddr as second parameter + +int accept (int, struct sockaddr *__restrict, socklen_t *__restrict); + +Fixes build with gcc-16 on musl systems +| ../../git/teamd/teamd_usock.c: In function 'callback_usock': +| ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +| 280 | sock = accept(ctx->usock.sock, &addr, &alen); +| | ^~~~~ +| | | +| | struct sockaddr_un * + +Signed-off-by: Khem Raj +Signed-off-by: Jiri Pirko + +Upstream: https://github.com/jpirko/libteam/commit/4eb54a811bef43da2be9cc84009567e5d6ca9741 + +Signed-off-by: Bernd Kuhls +--- + teamd/teamd_usock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c +index 1adfdf8..5895124 100644 +--- a/teamd/teamd_usock.c ++++ b/teamd/teamd_usock.c +@@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv) + int err; + + alen = sizeof(addr); +- sock = accept(ctx->usock.sock, &addr, &alen); ++ sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen); + if (sock == -1) { + teamd_log_err("usock: Failed to accept connection."); + return -errno; diff --git a/package/libtheora/libtheora.hash b/package/libtheora/libtheora.hash index 42ffa05045..c2d0ea002e 100644 --- a/package/libtheora/libtheora.hash +++ b/package/libtheora/libtheora.hash @@ -1,6 +1,6 @@ # From http://downloads.xiph.org/releases/theora/SHA256SUMS -sha256 f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61 libtheora-1.1.1.tar.xz +sha256 ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe2122ec libtheora-1.2.0.tar.xz # Locally calculated sha256 8417fad7da775735564e209484a2e011e0fa201e94f01fdbee6e4977e478e6fc COPYING -sha256 654a0238f789f4435c4818f50005b141d013c5a09a31d861efc1d0d67ba975a4 LICENSE +sha256 2c902950c73a63cd285dc0c36573de9c5fefe66d49312949c51d941f33e92932 LICENSE diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk index f408e6cce6..906acc8641 100644 --- a/package/libtheora/libtheora.mk +++ b/package/libtheora/libtheora.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTHEORA_VERSION = 1.1.1 +LIBTHEORA_VERSION = 1.2.0 LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.xz LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora LIBTHEORA_INSTALL_STAGING = YES @@ -20,6 +20,12 @@ LIBTHEORA_CONF_OPTS = \ --disable-examples \ --disable-spec +# assembly code on arm is broken: +# https://gitlab.xiph.org/xiph/theora/-/merge_requests/53 +ifeq ($(BR2_arm)$(BR2_armeb),y) +LIBTHEORA_CONF_OPTS += --disable-asm +endif + LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkgconf $(eval $(autotools-package)) diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 946e30b807..0c94fd80c0 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 03352908461ad2122e5be4a678893aaa2ad2ac45 libtirpc-1.3.6.tar.bz2 +sha1 885aaa0b9c348d06dd8a9e2ae0a1a7343711eb1b libtirpc-1.3.7.tar.bz2 # Locally computed -sha256 bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508 libtirpc-1.3.6.tar.bz2 +sha256 b47d3ac19d3549e54a05d0019a6c400674da716123858cfdb6d3bdd70a66c702 libtirpc-1.3.7.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 2d2675895c..ab15954561 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.6 +LIBTIRPC_VERSION = 1.3.7 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause diff --git a/package/libtpms/libtpms.hash b/package/libtpms/libtpms.hash index 1026aaa4f4..f10364f36e 100644 --- a/package/libtpms/libtpms.hash +++ b/package/libtpms/libtpms.hash @@ -1,2 +1,2 @@ -sha256 2807466f1563ebe45fdd12dd26e501e8a0c4fbb99c7c428fbb508789efd221c0 libtpms-0.9.6.tar.gz +sha256 ebc24f3191d90f6cf0b4d4200cd876db4bd224b3c565708bbea0a82ee275e0fb libtpms-0.10.1.tar.gz sha256 82f1e6bae374bb6a9d4f4596767fd33e499718d560de140fd9f3d402cc5e41fb LICENSE diff --git a/package/libtpms/libtpms.mk b/package/libtpms/libtpms.mk index 19d7cef89f..6e5708202e 100644 --- a/package/libtpms/libtpms.mk +++ b/package/libtpms/libtpms.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTPMS_VERSION = 0.9.6 +LIBTPMS_VERSION = 0.10.1 LIBTPMS_SITE = $(call github,stefanberger,libtpms,v$(LIBTPMS_VERSION)) LIBTPMS_LICENSE = BSD-4-Clause LIBTPMS_LICENSE_FILES = LICENSE diff --git a/package/libtraceevent/libtraceevent.hash b/package/libtraceevent/libtraceevent.hash index c0738de4e7..a974f326e0 100644 --- a/package/libtraceevent/libtraceevent.hash +++ b/package/libtraceevent/libtraceevent.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 dc456d4d2bf4b4cd4d0c737d3374a8093f9e5ca18c1d7fc2279a4bf41e613121 libtraceevent-1.8.4.tar.gz +sha256 812547d2f7b248485c183be2799b7041038ee44183000705609754b128c84c6f libtraceevent-1.8.6.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtraceevent/libtraceevent.mk b/package/libtraceevent/libtraceevent.mk index 8c3514f265..cc0190f84a 100644 --- a/package/libtraceevent/libtraceevent.mk +++ b/package/libtraceevent/libtraceevent.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEEVENT_VERSION = 1.8.4 +LIBTRACEEVENT_VERSION = 1.8.6 LIBTRACEEVENT_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot LIBTRACEEVENT_LICENSE = GPL-2.0, LGPL-2.1 LIBTRACEEVENT_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash index e728e6431f..17036c3f00 100644 --- a/package/libtracefs/libtracefs.hash +++ b/package/libtracefs/libtracefs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d295aa20d711c313a9e229dbd15ba14026f0c1a50d57ae8b0823cc561b23745f libtracefs-1.8.1.tar.gz +sha256 255980e1da5648fbbc32777ed8457b485b2b96f3449674610b46d9c437271209 libtracefs-1.8.2.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk index 86baa5d9cd..6b8f838c2e 100644 --- a/package/libtracefs/libtracefs.mk +++ b/package/libtracefs/libtracefs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEFS_VERSION = 1.8.1 +LIBTRACEFS_VERSION = 1.8.2 LIBTRACEFS_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot LIBTRACEFS_INSTALL_STAGING = YES LIBTRACEFS_LICENSE = GPL-2.0, LGPL-2.1 @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent LIBTRACEFS_CONF_OPTS = \ -Ddoc=false \ - -Dsamples=false + -Dsamples=false \ + -Dutest=false $(eval $(meson-package)) diff --git a/package/libubootenv/0002-Update-cmake_minimum_required-to-3.5.patch b/package/libubootenv/0002-Update-cmake_minimum_required-to-3.5.patch new file mode 100644 index 0000000000..531623bc53 --- /dev/null +++ b/package/libubootenv/0002-Update-cmake_minimum_required-to-3.5.patch @@ -0,0 +1,53 @@ +From 87581f45d442903af8a9f331b11052bdd836c7f6 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 14 May 2025 14:03:38 -0600 +Subject: [PATCH] Update cmake_minimum_required to 3.5 + +This supports compilation with cmake-4.0.0. + +Fixes: +CMake Error at CMakeLists.txt:5 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Signed-off-by: James Hilliard +Upstream: https://patchwork.ozlabs.org/project/swupdate/patch/20250514201740.686772-1-james.hilliard1@gmail.com/ +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 796d7bc..0a11730 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ + # + # SPDX-License-Identifier: LGPL-2.1-or-later + +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + project (libubootenv C) + + # The version number. +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c56d0c7..3370232 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,7 @@ + # SPDX-FileCopyrightText: 2019-2021 Stefano Babic + # + # SPDX-License-Identifier: LGPL-2.1-or-later +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + # Sources and private headers + SET(libubootenv_SOURCES + uboot_env.c +-- +2.34.1 + diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index 887ad6843d..986b651e42 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dc27ddcb377e259d898256e90449bc3128437660cacc33dc75f6630d3e52c44e libubootenv-0.3.5.tar.gz +sha256 7946006781ad518aac1f06e2ad7e0281e4ece3d59e9616cccb01fd0c169a3e0b libubootenv-0.3.6.tar.gz sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/MIT.txt diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk index e5f5e9b15a..5c2c36e90b 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUBOOTENV_VERSION = 0.3.5 +LIBUBOOTENV_VERSION = 0.3.6 LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1+, MIT, CC0-1.0 LIBUBOOTENV_LICENSE_FILES = LICENSES/CC0-1.0.txt \ diff --git a/package/libubox/libubox.hash b/package/libubox/libubox.hash index 7738caf223..eb37d33230 100644 --- a/package/libubox/libubox.hash +++ b/package/libubox/libubox.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 918acc85199117ef109f2a204020f6fe4d5a1724a09888f45b70b6474345d6fe libubox-75a3b870cace1171faf57bd55e5a9a2f1564f757-git4.tar.gz +sha256 df6e1350fd11016ef30242a279cec195d91e6748c11c40e0991593718c46fa52 libubox-3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a-git4.tar.gz diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index d6da078c7b..00ae2b0595 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUBOX_VERSION = 75a3b870cace1171faf57bd55e5a9a2f1564f757 +LIBUBOX_VERSION = 3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause diff --git a/package/libuci/libuci.hash b/package/libuci/libuci.hash index cc04320331..1e429f8160 100644 --- a/package/libuci/libuci.hash +++ b/package/libuci/libuci.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d095dc7ff4714e33aa18ef3ea5d30f525a202d6997d7b13bd952da53818988d6 libuci-4b3db1179747b6a6779029407984bacef851325c-git4.tar.gz -sha256 39e1cc18a36172fb80d9b37f0af77d78ae935bd8a020978a7895d9e76a24e112 cli.c -sha256 69d4eea4de19d27014f3d6ed723081b4039700bfd73cd0a5e39e2c4f19a58c66 libuci.c +sha256 d3b12df54f9faa69f0ff6d2a239fdcc30d64eda5269ddc882cf97677ea8cb066 libuci-f3fc0b76040685829191debc03edf72f486ae8ae-git4.tar.gz +sha256 5bb12361838b588bb263ade8537f5ae1a5e62d54b0a8f0640489db8cc29831d8 cli.c +sha256 bbc34ea5f391abc3b27416dc3c96b0f71f852c44210faf1cde0990218f68b13a libuci.c diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk index 81e87aa5be..3c7e12baae 100644 --- a/package/libuci/libuci.mk +++ b/package/libuci/libuci.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUCI_VERSION = 4b3db1179747b6a6779029407984bacef851325c +LIBUCI_VERSION = f3fc0b76040685829191debc03edf72f486ae8ae LIBUCI_SITE = https://git.openwrt.org/project/uci.git LIBUCI_SITE_METHOD = git LIBUCI_LICENSE = LGPL-2.1, GPL-2.0 (tools) diff --git a/package/libucontext/libucontext.hash b/package/libucontext/libucontext.hash index a8e1e23e36..dc6ef3dfb1 100644 --- a/package/libucontext/libucontext.hash +++ b/package/libucontext/libucontext.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 937fba9d0beebd7cf957b79979b19fe3a29bb9c4bfd25e869477d7154bbf8fd3 libucontext-1.2.tar.gz +sha256 06fca63bc00a236ea7e2ce4fe984d7203b1f9ea046f5c8c815d280da4ea281e3 libucontext-1.3.3.tar.gz # License files, locally calculated sha256 ecf4be354bbb6ccebdf150d1a8f2b3caeb10cf7c8a580f278a30799372f9e037 LICENSE diff --git a/package/libucontext/libucontext.mk b/package/libucontext/libucontext.mk index 75c4f9b9e4..64ffa2ec37 100644 --- a/package/libucontext/libucontext.mk +++ b/package/libucontext/libucontext.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUCONTEXT_VERSION = 1.2 +LIBUCONTEXT_VERSION = 1.3.3 LIBUCONTEXT_SITE = $(call github,kaniini,libucontext,libucontext-$(LIBUCONTEXT_VERSION)) LIBUCONTEXT_LICENSE = ISC LIBUCONTEXT_LICENSE_FILES = LICENSE diff --git a/package/libudfread/Config.in b/package/libudfread/Config.in index c1f3f23af9..803bfee0f5 100644 --- a/package/libudfread/Config.in +++ b/package/libudfread/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_LIBUDFREAD bool "libudfread" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS help UDF reader https://code.videolan.org/videolan/libudfread comment "libudfread needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libudfread/libudfread.hash b/package/libudfread/libudfread.hash index 332b472d59..90fd10d5e9 100644 --- a/package/libudfread/libudfread.hash +++ b/package/libudfread/libudfread.hash @@ -1,3 +1,4 @@ +# From https://download.videolan.org/pub/videolan/libudfread/libudfread-1.2.0.tar.xz.sha512 +sha512 e3ed8dc7fab472ad382b1b6cd068f1dc0084c34e5ec2c460c1dd84fa14a9d368c4d7af08a23efc5057e7f021f5812222c01247d5f304632716c94fc8c689a1a2 libudfread-1.2.0.tar.xz # Locally computed -sha256 cd062016d78902da53a34c4d536479dbb70b2a05116354d46ead4d0c498ed375 libudfread-1.1.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libudfread/libudfread.mk b/package/libudfread/libudfread.mk index 55d4fb8e47..1e74c42076 100644 --- a/package/libudfread/libudfread.mk +++ b/package/libudfread/libudfread.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBUDFREAD_VERSION = 1.1.2 -LIBUDFREAD_SOURCE = libudfread-$(LIBUDFREAD_VERSION).tar.bz2 -LIBUDFREAD_SITE = https://code.videolan.org/videolan/libudfread/-/archive/$(LIBUDFREAD_VERSION) -LIBUDFREAD_AUTORECONF = YES +LIBUDFREAD_VERSION = 1.2.0 +LIBUDFREAD_SOURCE = libudfread-$(LIBUDFREAD_VERSION).tar.xz +LIBUDFREAD_SITE = https://download.videolan.org/pub/videolan/libudfread LIBUDFREAD_INSTALL_STAGING = YES LIBUDFREAD_LICENSE = LGPL-2.1+ LIBUDFREAD_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index e4fde4eb64..7f0ecc0030 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16 libuhttpd-3.14.1.tar.gz +sha256 ce2abbc599a922c4bac12f1cdf3e9c9740f387f819a54ca01e9fed60905baa40 libuhttpd-3.14.2.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 78e0f42b22..dca26fc3c0 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.14.1 +LIBUHTTPD_VERSION = 3.14.2 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE diff --git a/package/libunibreak/libunibreak.hash b/package/libunibreak/libunibreak.hash index bb85f21cdc..8f1e7d292a 100644 --- a/package/libunibreak/libunibreak.hash +++ b/package/libunibreak/libunibreak.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dd1a92d4c5646aa0e457ff41d89812ec5243863be6c20bbcb5ee380f3dd78377 libunibreak-5.1.tar.gz +sha256 cc4de0099cf7ff05005ceabff4afed4c582a736abc38033e70fdac86335ce93f libunibreak-6.1.tar.gz sha256 0c57e2ec42ece17791a75d2f9b2f8e0663181be008667a507f765b3ef22522db LICENCE diff --git a/package/libunibreak/libunibreak.mk b/package/libunibreak/libunibreak.mk index fa52116c1f..de3ea0fefc 100644 --- a/package/libunibreak/libunibreak.mk +++ b/package/libunibreak/libunibreak.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNIBREAK_VERSION = 5.1 +LIBUNIBREAK_VERSION = 6.1 LIBUNIBREAK_SITE = https://github.com/adah1972/libunibreak/releases/download/libunibreak_$(subst .,_,$(LIBUNIBREAK_VERSION)) LIBUNIBREAK_INSTALL_STAGING = YES LIBUNIBREAK_LICENSE = Zlib diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index e7fbc85414..f86b6f94b0 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libunistring/libunistring-1.3.tar.xz.sig -sha256 f245786c831d25150f3dfb4317cda1acc5e3f79a5da4ad073ddca58886569527 libunistring-1.3.tar.xz +# https://ftp.gnu.org/gnu/libunistring/libunistring-1.4.1.tar.xz.sig +sha256 67d88430892527861903788868c77802a217b0959990f7449f2976126a307763 libunistring-1.4.1.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index fc785c28a5..1abbfde6da 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 1.3 +LIBUNISTRING_VERSION = 1.4.1 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index 08f7f879c9..dd8cc72926 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -26,7 +26,7 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS default y if BR2_TOOLCHAIN_USES_GLIBC && \ (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_sh || \ - BR2_i386 || BR2_x86_64) + BR2_i386 || BR2_x86_64 || (BR2_riscv && BR2_ARCH_IS_64)) default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_x86_64) diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in index 5e8fd6060f..d30abc526d 100644 --- a/package/liburcu/Config.in +++ b/package/liburcu/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS default y depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be || \ BR2_i386 || BR2_mips || BR2_mips64 || BR2_mipsel || \ - BR2_mips64el || BR2_nios2 || BR2_powerpc || BR2_powerpc64 || \ + BR2_mips64el || BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_s390x || BR2_x86_64 depends on BR2_USE_MMU # fork() in test diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index f2e3317897..bed9c8ee9b 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1d71c054837ea32a31e462bce5a1af272379ecf511e33448e88100b87ff73b2e uriparser-0.9.8.tar.xz -sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING +sha256 85645df1bb220a3867c42f8adeba4f6a4b2fdc1563e91ad7d9f92d14d3dd377d uriparser-0.9.9.tar.xz +sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING.BSD-3-Clause diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index b0ba8c387b..66ec72409c 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.8 +LIBURIPARSER_VERSION = 0.9.9 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause -LIBURIPARSER_LICENSE_FILES = COPYING +LIBURIPARSER_LICENSE_FILES = COPYING.BSD-3-Clause LIBURIPARSER_CPE_ID_VENDOR = uriparser_project LIBURIPARSER_CPE_ID_PRODUCT = uriparser LIBURIPARSER_INSTALL_STAGING = YES diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 8ca68f03ba..4c76609930 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575 libusb-1.0.27.tar.bz2 +sha256 5977fc950f8d1395ccea9bd48c06b3f808fd3c2c961b44b0c2e6e29fc3a70a85 libusb-1.0.29.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 15649a2ab1..95ce8b17df 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).27 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).29 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ diff --git a/package/libusbgx/libusbgx.hash b/package/libusbgx/libusbgx.hash index b18258978f..724da27a57 100644 --- a/package/libusbgx/libusbgx.hash +++ b/package/libusbgx/libusbgx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d0b483d8b190a75a1f9b52d6db229de5580c78b201077361a524cf32c5aad517 libusbgx-a5bfa81017a9b2064bc449cf74f5f9d106445f62.tar.gz +sha256 23d72c415ffd80d752efccc9bb5a6afdece6a83a31975344ef31a4967d189e3c libusbgx-0.3.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk index 03e8dff6bb..7a0e4c5e5b 100644 --- a/package/libusbgx/libusbgx.mk +++ b/package/libusbgx/libusbgx.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUSBGX_VERSION = a5bfa81017a9b2064bc449cf74f5f9d106445f62 -LIBUSBGX_SITE = $(call github,linux-usb-gadgets,libusbgx,$(LIBUSBGX_VERSION)) +LIBUSBGX_VERSION = 0.3.0 +LIBUSBGX_SITE = $(call github,linux-usb-gadgets,libusbgx,libusbgx-v$(LIBUSBGX_VERSION)) LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index a2bb65b9ae..8becf44d50 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2e910e668e5daf1be6a5195a696985d7200adfa5c4d3400ee7b3355affdcf52c libuv-v1.49.2-dist.tar.gz +sha256 2ceca1a7577633cf92794db5bf5512370f6cd45a5746d6e14f8c20aeab0a547b libuv-v1.51.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 36a5b89fa7..b38f3c62ac 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.49.2 +LIBUV_VERSION = 1.51.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf diff --git a/package/libv4l/0001-meson.build-fix-arm-_TIME_BITS-64-error.patch b/package/libv4l/0001-meson.build-fix-arm-_TIME_BITS-64-error.patch new file mode 100644 index 0000000000..43fe9b2721 --- /dev/null +++ b/package/libv4l/0001-meson.build-fix-arm-_TIME_BITS-64-error.patch @@ -0,0 +1,37 @@ +From 6faf5e963eadeab8b7d47d5b3c14f06e0ae1da01 Mon Sep 17 00:00:00 2001 +From: Hans Verkuil +Date: Sat, 12 Apr 2025 12:30:13 +0200 +Subject: [PATCH] meson.build: fix arm _TIME_BITS=64 error + +Undefine _TIME_BITS to avoid this error on 32-bit arm: + +/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" + +Signed-off-by: Hans Verkuil +Upstream: https://git.linuxtv.org/v4l-utils.git/commit/?id=d517cfdcdc16533ab7e06e97c07ca089cf261aef +Signed-off-by: Thomas Petazzoni +--- + meson.build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 269a9da7..31927cda 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,8 +53,12 @@ v4l2_wrapper_args = [ + # As the library needs to provide both 32-bit and 64-bit versions + # of file operations, disable transparent large file support (fixes + # 'Error: symbol `open64/mmap64' is already defined' compile failure +- # otherwise) ++ # otherwise). ++ # ++ # Also disable _TIME_BITS=64 since this is allowed only with ++ # _FILE_OFFSET_BITS=64, which is now 32. + '-U_FILE_OFFSET_BITS', ++ '-U_TIME_BITS', + '-D_FILE_OFFSET_BITS=32', + '-D_LARGEFILE64_SOURCE', + ] +-- +2.49.0 + diff --git a/package/libv4l/0002-libv4lconvert-fix-jpeg-v9x-gcc-14.x-compile-jpeg_mem.patch b/package/libv4l/0002-libv4lconvert-fix-jpeg-v9x-gcc-14.x-compile-jpeg_mem.patch new file mode 100644 index 0000000000..298eaaf888 --- /dev/null +++ b/package/libv4l/0002-libv4lconvert-fix-jpeg-v9x-gcc-14.x-compile-jpeg_mem.patch @@ -0,0 +1,83 @@ +From 9f0da8467183f9f647bddc4a5b4f01aad930846a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 2 Sep 2024 15:59:53 +0200 +Subject: [PATCH] libv4lconvert: fix jpeg-v9x/gcc-14.x compile (jpeg_mem_dest + argument mismatch) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- fix jpeg_mem_dest pointer arument mismatch (long unsigned int vs. size_t) + with jpeg-v9x/gcc-14.x 32-bit arm compile + +Fixes: + + ../lib/libv4lconvert/jl2005bcd.c: In function ‘v4lconvert_decode_jl2005bcd’: + ../lib/libv4lconvert/jl2005bcd.c:94:46: error: passing argument 3 of ‘jpeg_mem_dest’ from incompatible pointer type [-Wincompatible-pointer-types] + 94 | jpeg_mem_dest (&cinfo, &jpeg_header, &jpeg_header_size); + | ^~~~~~~~~~~~~~~~~ + | | + | long unsigned int * + In file included from ../lib/libv4lconvert/libv4lconvert-priv.h:26, + from ../lib/libv4lconvert/jl2005bcd.c:30: + .../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/jpeglib.h:979:28: note: expected ‘size_t *’ {aka ‘unsigned int *’} but argument is of type ‘long unsigned int *’ + 979 | EXTERN(void) jpeg_mem_dest JPP((j_compress_ptr cinfo, + | ^~~ + + ../lib/libv4lconvert/jpeg.c: In function ‘init_libjpeg_cinfo’: + ../lib/libv4lconvert/jpeg.c:157:45: error: passing argument 3 of ‘jpeg_mem_dest’ from incompatible pointer type [-Wincompatible-pointer-types] + 157 | jpeg_mem_dest(&cinfo, &jpeg_header, &jpeg_header_size); + | ^~~~~~~~~~~~~~~~~ + | | + | long unsigned int * + In file included from ../lib/libv4lconvert/libv4lconvert-priv.h:26, + from ../lib/libv4lconvert/jpeg.c:21: + .../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/jpeglib.h:979:28: note: expected ‘size_t *’ {aka ‘unsigned int *’} but argument is of type ‘long unsigned int *’ + 979 | EXTERN(void) jpeg_mem_dest JPP((j_compress_ptr cinfo, + | ^~~ + +Signed-off-by: Peter Seiderer +Signed-off-by: Hans Verkuil +Upstream: https://git.linuxtv.org/v4l-utils.git/commit/?id=e11e10ff7c8a4ef69526edd275c0ed92a450fbf3 +[Romain: backport to 1.28.1] +Signed-off-by: Romain Naour +--- + lib/libv4lconvert/jl2005bcd.c | 4 ++++ + lib/libv4lconvert/jpeg.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/lib/libv4lconvert/jl2005bcd.c b/lib/libv4lconvert/jl2005bcd.c +index 707c3205..14b040f3 100644 +--- a/lib/libv4lconvert/jl2005bcd.c ++++ b/lib/libv4lconvert/jl2005bcd.c +@@ -63,7 +63,11 @@ int v4lconvert_decode_jl2005bcd(struct v4lconvert_data *data, + struct jpeg_decompress_struct dinfo; + struct jpeg_error_mgr jcerr, jderr; + JOCTET *jpeg_header = NULL; ++#if JPEG_LIB_VERSION >= 90 ++ size_t jpeg_header_size = 0; ++#else + unsigned long jpeg_header_size = 0; ++#endif + int i, x, y, x1, y1, jpeg_data_size, jpeg_data_idx, eoi, size; + + /* src_size had better be bigger than 16 */ +diff --git a/lib/libv4lconvert/jpeg.c b/lib/libv4lconvert/jpeg.c +index ebfc8149..450d0967 100644 +--- a/lib/libv4lconvert/jpeg.c ++++ b/lib/libv4lconvert/jpeg.c +@@ -136,7 +136,11 @@ static void init_libjpeg_cinfo(struct v4lconvert_data *data) + { + struct jpeg_compress_struct cinfo; + unsigned char *jpeg_header = NULL; ++#if JPEG_LIB_VERSION >= 90 ++ size_t jpeg_header_size = 0; ++#else + unsigned long jpeg_header_size = 0; ++#endif + + if (data->cinfo_initialized) + return; +-- +2.50.1 + diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index e8bcc2bdfc..a535b8e8a6 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -16,6 +16,10 @@ LIBV4L_LDFLAGS = $(TARGET_LDFLAGS) LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPL-2.1+ (libraries) LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt +ifeq ($(BR2_STATIC_LIBS),y) +LIBV4L_CONF_OPTS += -Dv4l-plugins=false -Dv4l-wrappers=false +endif + ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBV4L_DEPENDENCIES += alsa-lib endif diff --git a/package/libvips/libvips.hash b/package/libvips/libvips.hash index 1ba242d1cf..dd7510ecb2 100644 --- a/package/libvips/libvips.hash +++ b/package/libvips/libvips.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 2468088d958e0e2de1be2991ff8940bf45664a826c0dad12342e1804e2805a6e vips-8.10.6.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# From https://github.com/libvips/libvips/releases/download/v8.17.2/vips-8.17.2.tar.xz.sha256sum +sha256 57ea0ec4f30ea04748c9e8eec5415e7c9ac7cafe6822e4788fc110376a1d224a vips-8.17.2.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 8eb1f0964e..e7641fa8cd 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBVIPS_VERSION = 8.10.6 -LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz +LIBVIPS_VERSION = 8.17.2 +LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.xz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ -LIBVIPS_LICENSE_FILES = COPYING +LIBVIPS_LICENSE_FILES = LICENSE LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To @@ -22,135 +22,125 @@ LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) LIBVIPS_CONF_OPTS = \ - --without-dmalloc \ - --without-gsf \ - --without-OpenEXR \ - --without-openslide \ - --without-cfitsio \ - --without-pangoft2 \ - --without-x + -Dopenexr=disabled \ + -Dopenslide=disabled \ + -Dcfitsio=disabled \ + -Dpangocairo=disabled LIBVIPS_INSTALL_STAGING = YES LIBVIPS_DEPENDENCIES = \ host-pkgconf expat libglib2 \ $(TARGET_NLS_DEPENDENCIES) -ifeq ($(BR2_PACKAGE_GIFLIB),y) -LIBVIPS_CONF_OPTS += --with-giflib -LIBVIPS_DEPENDENCIES += giflib -else -LIBVIPS_CONF_OPTS += --without-giflib -endif - ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBVIPS_CONF_OPTS += --enable-introspection +LIBVIPS_CONF_OPTS += -Dintrospection=enabled LIBVIPS_DEPENDENCIES += gobject-introspection else -LIBVIPS_CONF_OPTS += --disable-introspection +LIBVIPS_CONF_OPTS += -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) LIBVIPS_CONF_OPTS += \ - --with-magick \ - --with-magickpackage=MagickCore + -Dmagick=enabled \ + -Dmagick-package=MagickCore LIBVIPS_DEPENDENCIES += imagemagick else ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y) LIBVIPS_CONF_OPTS += \ - --with-magick \ - --with-magickpackage=GraphicsMagick + -Dmagick=enabled \ + -Dmagick-package=GraphicsMagick LIBVIPS_DEPENDENCIES += graphicsmagick else -LIBVIPS_CONF_OPTS += --without-magick +LIBVIPS_CONF_OPTS += -Dmagick=disabled endif ifeq ($(BR2_PACKAGE_JPEG),y) -LIBVIPS_CONF_OPTS += --with-jpeg +LIBVIPS_CONF_OPTS += -Djpeg=enabled LIBVIPS_DEPENDENCIES += jpeg else -LIBVIPS_CONF_OPTS += --without-jpeg +LIBVIPS_CONF_OPTS += -Djpeg=disabled endif ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBVIPS_CONF_OPTS += --with-lcms +LIBVIPS_CONF_OPTS += -Dlcms=enabled LIBVIPS_DEPENDENCIES += lcms2 else -LIBVIPS_CONF_OPTS += --without-lcms +LIBVIPS_CONF_OPTS += -Dlcms=disabled endif ifeq ($(BR2_PACKAGE_LIBPNG),y) -LIBVIPS_CONF_OPTS += --with-png +LIBVIPS_CONF_OPTS += -Dpng=enabled LIBVIPS_DEPENDENCIES += libpng else -LIBVIPS_CONF_OPTS += --without-png +LIBVIPS_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_LIBRSVG),y) -LIBVIPS_CONF_OPTS += --with-rsvg +LIBVIPS_CONF_OPTS += -Drsvg=enabled LIBVIPS_DEPENDENCIES += librsvg else -LIBVIPS_CONF_OPTS += --without-rsvg +LIBVIPS_CONF_OPTS += -Drsvg=disabled endif ifeq ($(BR2_PACKAGE_MATIO),y) -LIBVIPS_CONF_OPTS += --with-matio +LIBVIPS_CONF_OPTS += -Dmatio=enabled LIBVIPS_DEPENDENCIES += matio else -LIBVIPS_CONF_OPTS += --without-matio +LIBVIPS_CONF_OPTS += -Dmatio=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) -LIBVIPS_CONF_OPTS += --with-orc +LIBVIPS_CONF_OPTS += -Dorc=enabled LIBVIPS_DEPENDENCIES += orc else -LIBVIPS_CONF_OPTS += --without-orc +LIBVIPS_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_POPPLER),y) -LIBVIPS_CONF_OPTS += --with-poppler +LIBVIPS_CONF_OPTS += -Dpoppler=enabled LIBVIPS_DEPENDENCIES += poppler else -LIBVIPS_CONF_OPTS += --without-poppler +LIBVIPS_CONF_OPTS += -Dpoppler=disabled endif ifeq ($(BR2_PACKAGE_TIFF),y) -LIBVIPS_CONF_OPTS += --with-tiff +LIBVIPS_CONF_OPTS += -Dtiff=enabled LIBVIPS_DEPENDENCIES += tiff else -LIBVIPS_CONF_OPTS += --without-tiff +LIBVIPS_CONF_OPTS += -Dtiff=disabled endif ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) -LIBVIPS_CONF_OPTS += --with-fftw +LIBVIPS_CONF_OPTS += -Dfftw=enabled LIBVIPS_DEPENDENCIES += fftw-double else -LIBVIPS_CONF_OPTS += --without-fftw +LIBVIPS_CONF_OPTS += -Dfftw=disabled endif ifeq ($(BR2_PACKAGE_LIBEXIF),y) -LIBVIPS_CONF_OPTS += --with-libexif +LIBVIPS_CONF_OPTS += -Dexif=enabled LIBVIPS_DEPENDENCIES += libexif else -LIBVIPS_CONF_OPTS += --without-libexif +LIBVIPS_CONF_OPTS += -Dexif=disabled endif ifeq ($(BR2_PACKAGE_LIBHEIF),y) -LIBVIPS_CONF_OPTS += --with-heif +LIBVIPS_CONF_OPTS += -Dheif=enabled LIBVIPS_DEPENDENCIES += libheif else -LIBVIPS_CONF_OPTS += --without-heif +LIBVIPS_CONF_OPTS += -Dheif=disabled endif ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -LIBVIPS_CONF_OPTS += --with-libwebp +LIBVIPS_CONF_OPTS += -Dwebp=enabled LIBVIPS_DEPENDENCIES += webp else -LIBVIPS_CONF_OPTS += --without-libwebp +LIBVIPS_CONF_OPTS += -Dwebp=disabled endif ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBVIPS_CONF_OPTS += --with-zlib +LIBVIPS_CONF_OPTS += -Dzlib=enabled LIBVIPS_DEPENDENCIES += zlib else -LIBVIPS_CONF_OPTS += --without-zlib +LIBVIPS_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 6e4de43f73..5664f69dd8 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -46,6 +46,8 @@ config BR2_PACKAGE_LIBVIRT_DAEMON default y depends on BR2_INSTALL_LIBSTDCPP # nmap depends on !BR2_KERNEL_64_USERLAND_32 # ebtables + depends on !BR2_sparc64 # ebtables + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # radvd -> libbsd select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 1dc61a7549..7f2a33e926 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -250,6 +250,36 @@ define LIBVIRT_INSTALL_UDEV_RULES endef LIBVIRT_POST_INSTALL_TARGET_HOOKS += LIBVIRT_INSTALL_UDEV_RULES +ifeq ($(BR2_PACKAGE_LIBVIRT_QEMU),y) +define LIBVIRT_USERS_QEMU + qemu -1 kvm -1 * - - - Libvirt qemu/kvm daemon +endef +define LIBVIRT_PERMISSIONS_QEMU + /var/cache/libvirt/qemu d 750 qemu kvm - - - - - + /var/cache/libvirt/qemu/capabilities d 755 root root - - - - - + /var/lib/libvirt/qemu d 751 qemu kvm - - - - - + /var/lib/libvirt/qemu/autostart d 700 root root - - - - - + /var/lib/libvirt/qemu/channel d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/channel/target d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/dump d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/networks d 700 root root - - - - - + /var/lib/libvirt/qemu/networks/autostart d 700 root root - - - - - + /var/lib/libvirt/qemu/nvram d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/save d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/snapshot d 755 qemu kvm - - - - - + /var/log/libvirt/qemu d 750 root root - - - - - + /var/log/swtpm/libvirt/qemu d 711 root root - - - - - +endef +define LIBVIRT_CREATE_SYMLINKS_QEMU + $(INSTALL) -m 751 -d $(TARGET_DIR)/var/lib/libvirt/qemu + ln -s -f ../../var/lib/libvirt/qemu $(TARGET_DIR)/etc/libvirt/ +endef +endif + +define LIBVIRT_USERS + $(LIBVIRT_USERS_QEMU) +endef + # Adjust directory ownerships and permissions. Notice /var/log is a symlink to # /tmp in the default sysvinit skeleton, so some directories may disappear at # run-time. Set the permissions anyway, since they are valid for the default @@ -263,29 +293,16 @@ define LIBVIRT_PERMISSIONS /var/lib/libvirt/filesystems d 711 root root - - - - - /var/lib/libvirt/images d 711 root root - - - - - /var/lib/libvirt/network d 700 root root - - - - - - /var/lib/libvirt/qemu d 751 qemu kvm - - - - - - /var/lib/libvirt/qemu/autostart d 700 root root - - - - - - /var/lib/libvirt/qemu/networks d 700 root root - - - - - - /var/lib/libvirt/qemu/networks/autostart d 700 root root - - - - - - /var/lib/libvirt/qemu/channel d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/channel/target d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/dump d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/nvram d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/save d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/snapshot d 755 qemu kvm - - - - - /var/lib/libvirt/secrets d 700 root root - - - - - /var/lib/libvirt/storage d 755 root root - - - - - /var/lib/libvirt/storage/autostart d 755 root root - - - - - /var/cache/libvirt d 711 root root - - - - - /var/cache/libvirt/lxc d 750 root root - - - - - - /var/cache/libvirt/qemu d 750 qemu kvm - - - - - - /var/cache/libvirt/qemu/capabilities d 755 root root - - - - - /var/log/libvirt d 700 root root - - - - - /var/log/libvirt/lxc d 750 root root - - - - - - /var/log/libvirt/qemu d 750 root root - - - - - /var/log/swtpm d 755 root root - - - - - /var/log/swtpm/libvirt d 755 root root - - - - - - /var/log/swtpm/libvirt/qemu d 711 root root - - - - - + $(LIBVIRT_PERMISSIONS_QEMU) endef # libvirt may need to create persistent files (e.g. VM definitions) in these @@ -296,22 +313,15 @@ endef define LIBVIRT_CREATE_SYMLINKS $(INSTALL) -m 700 -d $(TARGET_DIR)/etc/libvirt $(INSTALL) -m 755 -d $(TARGET_DIR)/var/lib/libvirt - $(INSTALL) -m 751 -d $(TARGET_DIR)/var/lib/libvirt/qemu $(INSTALL) -m 700 -d $(TARGET_DIR)/var/lib/libvirt/secrets $(INSTALL) -m 755 -d $(TARGET_DIR)/var/lib/libvirt/storage - ln -s -f ../../var/lib/libvirt/qemu $(TARGET_DIR)/etc/libvirt/ ln -s -f ../../var/lib/libvirt/secrets $(TARGET_DIR)/etc/libvirt/ ln -s -f ../../var/lib/libvirt/storage $(TARGET_DIR)/etc/libvirt/ + $(LIBVIRT_CREATE_SYMLINKS_QEMU) endef LIBVIRT_PRE_INSTALL_TARGET_HOOKS += LIBVIRT_CREATE_SYMLINKS -ifeq ($(BR2_PACKAGE_LIBVIRT_QEMU),y) -define LIBVIRT_USERS - qemu -1 kvm -1 * - - - Libvirt qemu/kvm daemon -endef -endif - ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) define LIBVIRT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/libvirt/S91virtlogd $(TARGET_DIR)/etc/init.d/S91virtlogd diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in index f284894555..a3dce57271 100644 --- a/package/libvncserver/Config.in +++ b/package/libvncserver/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_LIBVNCSERVER bool "libvncserver" depends on BR2_USE_MMU # VNCommand.c uses fork() - # binutils issue (bad expression) - depends on !BR2_nios2 depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LZO select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL @@ -27,5 +25,4 @@ endif comment "libvncserver needs a toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on !BR2_nios2 depends on BR2_STATIC_LIBS diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index 0e7abd1e19..3c60fe960e 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd libvpl-2.13.0.tar.gz +sha256 7218c3b8206b123204c3827ce0cf7c008d5c693c1f58ab461958d05fe6f847b3 libvpl-2.15.0.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 8933cbabd1..5b71b9bc92 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.13.0 +LIBVPL_VERSION = 2.15.0 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE diff --git a/package/libvpx/Config.in b/package/libvpx/Config.in index 6b0400c0a2..f0fb69115e 100644 --- a/package/libvpx/Config.in +++ b/package/libvpx/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_LIBVPX bool "libvpx" - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() help A high-quality, open video format that's freely available to everyone. Supports the VP8 and VP9 formats. http://webmproject.org -comment "libvpx needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libvpx needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index 7cda8cc2eb..1082721f1a 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 00dae80465567272abd077f59355f95ac91d7809a2d3006f9ace2637dd429d14 libvpx-1.13.1.tar.gz +sha256 26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa libvpx-1.15.2.tar.gz sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index 9092ca6a8e..4f4144f4ff 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPX_VERSION = 1.13.1 +LIBVPX_VERSION = 1.15.2 LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS diff --git a/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch b/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch deleted file mode 100644 index ea3fd0074b..0000000000 --- a/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch +++ /dev/null @@ -1,81 +0,0 @@ -From a6c35dbab5a2a75c176e031122ee64152e50e5d3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 1 Jan 2015 12:23:43 +0100 -Subject: [PATCH] Switch to use pkg-config to detect libevent and openssl - -Switching to pkg-config fixes a number of problems when detecting the -libraries. For example the detection of libpthread was failing, -because libevent_threads was added to LIBS before libevent itself, -causing the libpthread test to fail due to missing symbols. pkg-config -is anyway nowadays the preferred way for detecting libraries. It also -has the benefit of working properly in static library situations. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 36 ++++++++++++------------------------ - 1 file changed, 12 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4109ce..fc1cadc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,35 +27,20 @@ AC_FUNC_MALLOC - AC_FUNC_REALLOC - AC_CHECK_FUNCS([memset socket strstr]) - --AC_CHECK_HEADERS([event2/thread.h], [ -- LIBS="-levent_pthreads ${LIBS}" -- ], [ -- echo "libevent_pthreads required, failing" -- exit -1 -- ]) --AC_CHECK_LIB(pthread, pthread_create, [LIBS="-lpthread ${LIBS}"], [ -+AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], [ - echo "pthreads required, failing" - exit -1 - ]) --AC_CHECK_LIB(event, event_base_dispatch, [], [ -- echo "libevent required, failing" -- exit -1 -- ]) -+ -+PKG_CHECK_MODULES([EVENT], [libevent]) -+PKG_CHECK_MODULES([EVENT_PTHREAD], [libevent_pthreads]) - - AS_IF([test "x$with_ssl" != "xno"], - [ -- AC_CHECK_LIB([ssl], [SSL_CTX_new], -- [ -- LIBS="-lssl ${LIBS}" -- AC_CHECK_LIB([event_openssl], [bufferevent_openssl_socket_new], [ -- LIBS="-levent_openssl ${LIBS}" -- have_ssl=yes -- ], [have_ssl=no]) -- ], -- [have_ssl=no]) -- ], -- [have_ssl=no]) -- -+ PKG_CHECK_MODULES([SSL], [openssl], [have_ssl=yes], [have_ssl=no]) -+ AS_IF([test "x${have_ssl}" = "xyes"], -+ [PKG_CHECK_MODULES([EVENT_OPENSSL], [libevent_openssl], [have_ssl=yes], [have_ssl=no])])]) -+ - AS_IF([test "x$have_ssl" = "xyes"], - [ - AC_DEFINE([WEBSOCK_HAVE_SSL], [1], [Define if building SSL support]) -@@ -63,8 +48,11 @@ AS_IF([test "x$have_ssl" = "xyes"], - [AS_IF([test "x$with_ssl" = "xyes"], - [AC_MSG_ERROR([SSL support requested but not found]) - ])]) -- -+ - AM_CONDITIONAL([HAVE_SSL], [test "x$have_ssl" = "xyes"]) -+ -+LIBS="${EVENT_LIBS} ${EVENT_PTHREAD_LIBS} ${PTHREAD_LIBS} ${SSL_LIBS} ${EVENT_OPENSSL_LIBS}" -+ - AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_VERSION], ["$PACKAGE_VERSION"], [libwebsock version]) - AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_STRING], ["$PACKAGE_STRING"], [libwebsock package string]) - AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_NAME], ["$PACKAGE_NAME"], [libwebsock package name]) --- -2.1.0 - diff --git a/package/libwebsock/0002-fix-ssl.patch b/package/libwebsock/0002-fix-ssl.patch deleted file mode 100644 index f577538713..0000000000 --- a/package/libwebsock/0002-fix-ssl.patch +++ /dev/null @@ -1,21 +0,0 @@ -config: fix SSL detection - -The @WEBSOCK_HAVE_SSL@ is replaced at configure time with either a 1 or 0. -The rest of the code is simply checking to see if WEBSOCK_HAVE_SSL is -defined at all. Using a #undef WEBSOCK_HAVE_SSL will cause configure -to either comment it out or change the line to -"#define WEBSOCK_HAVE_SSL 1". - -Signed-off-by: Clayton Shotwell - -diff -durN a/src/websock_config.h.in b/src/websock_config.h.in ---- a/src/websock_config.h.in -+++ b/src/websock_config.h.in -@@ -4,6 +4,6 @@ - #define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@ - #define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@ - #define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@ --#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@ -+#undef WEBSOCK_HAVE_SSL - - #endif diff --git a/package/libwebsock/0003-fix-incorrect-inline.patch b/package/libwebsock/0003-fix-incorrect-inline.patch deleted file mode 100644 index 043df45bd3..0000000000 --- a/package/libwebsock/0003-fix-incorrect-inline.patch +++ /dev/null @@ -1,66 +0,0 @@ -utf: do not define decode() to be inline - -Currently, decode() is prototyped in utf.h, its body is in utf.c and it -is called from util.c. - -However, decode() is defined to be inline, which can not work since, -when compiling util.c, the body of decode() is out-of-scope for that -compilation unit. - -Furthermore, decode() uses a utf8d, which is a static defined in utf.c . -So utf8d is not visible when compiling util.c either. - -This means that the definition of decode() along with utf8d is basically -wrong, and is now failing with gcc-5.x, with warnings like so: - - libtool: compile: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c utf.c -fPIC -DPIC -o .libs/libwebsock_la-utf.o - utf.c:36:12: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static - *state = utf8d[256 + *state*16 + type]; - ^ - utf.c:30:19: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static - uint32_t type = utf8d[byte]; - ^ - libtool: compile: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c util.c -fPIC -DPIC -o .libs/libwebsock_la-util.o - In file included from websock.h:73:0, - from util.c:20: - utf.h:25:17: warning: inline function ‘decode’ declared but never defined - uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte); - ^ - -This results in decode() to be omitted from libwebsock.so, and thus link -failures when another program wants to link with -lwebsock. - -The simplest solution is to not inline decode() at all. - -Signed-off-by: "Yann E. MORIN" - ---- -Note: an alternative would be to move both decode() and utf8d into -decode.h nad ditch decode.c if decode really must be inline. This is -left as an execise for an interested party. But since upstream hasn't -seen a single commit in more than a year now... :-( - -diff -durN a/src/utf.c b/src/utf.c ---- a/src/utf.c 2014-07-15 01:43:20.000000000 +0200 -+++ b/src/utf.c 2015-08-22 22:29:38.667393786 +0200 -@@ -24,7 +24,7 @@ - 1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8 - }; - --uint32_t inline -+uint32_t - decode(uint32_t* state, uint32_t* codep, uint32_t byte) - { - uint32_t type = utf8d[byte]; -diff -durN a/src/utf.h b/src/utf.h ---- a/src/utf.h 2014-07-15 01:43:20.000000000 +0200 -+++ b/src/utf.h 2015-08-22 22:29:10.439227396 +0200 -@@ -22,7 +22,7 @@ - - #include - --uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte); -+uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte); - - - #endif /* UTF_H_ */ diff --git a/package/libwebsock/Config.in b/package/libwebsock/Config.in deleted file mode 100644 index 14651cf4b4..0000000000 --- a/package/libwebsock/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBWEBSOCK - bool "libwebsock" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBEVENT - help - C library for easy WebSockets servers. - - This library allows a developer to quickly develop WebSocket - servers by focusing on the actual logic of your WebSocket - implementation instead of the details of the WebSocket - protocol or even specifics of C sockets. - - https://github.com/payden/libwebsock - -comment "libwebsock needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libwebsock/libwebsock.hash b/package/libwebsock/libwebsock.hash deleted file mode 100644 index 43f0935a36..0000000000 --- a/package/libwebsock/libwebsock.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 34cf8376446e2371c9af47394043a30dc16af7ed5437d56bc6135c5dfda9ed22 libwebsock-3c1615eeadb0b582b63851073bfe3e5132f31ebc.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.lesser diff --git a/package/libwebsock/libwebsock.mk b/package/libwebsock/libwebsock.mk deleted file mode 100644 index df3af3b059..0000000000 --- a/package/libwebsock/libwebsock.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libwebsock -# -################################################################################ - -LIBWEBSOCK_VERSION = 3c1615eeadb0b582b63851073bfe3e5132f31ebc -LIBWEBSOCK_SITE = $(call github,payden,libwebsock,$(LIBWEBSOCK_VERSION)) -LIBWEBSOCK_DEPENDENCIES = libevent host-pkgconf -LIBWEBSOCK_AUTORECONF = YES -LIBWEBSOCK_INSTALL_STAGING = YES -LIBWEBSOCK_LICENSE = LGPL-3.0 -LIBWEBSOCK_LICENSE_FILES = COPYING.lesser - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBWEBSOCK_DEPENDENCIES += openssl -LIBWEBSOCK_CONF_OPTS += --with-ssl -else -LIBWEBSOCK_CONF_OPTS += --without-ssl -endif - -$(eval $(autotools-package)) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 01e7c7bfd1..1466c8d9a2 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90 libwebsockets-4.3.3.tar.gz -sha256 2b5dd8030691f3d1870a040f085c37e45d9ab9c684a7f1284f5f379c1e829b28 LICENSE +sha256 472e6cfa77b6f80ff2cc176bc59f6cb2856df7e30e8f31afcbd1fc94ffd2f828 libwebsockets-4.4.1.tar.gz +sha256 6ff2868dd9d9e251de27574342663f4773a8c2f954128899eb6f3c2ba9d9a245 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index e53febfce4..7806b64bbc 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.3.3 +LIBWEBSOCKETS_VERSION = 4.4.1 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 2a2ee3c2e9..1c88105e48 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.16.0.tar.xz.sums -md5 9779115aaa7e67abe642777394e7bfa2 libwpe-1.16.0.tar.xz -sha1 ea574e09b5d47461a5579a24006488419474d136 libwpe-1.16.0.tar.xz -sha256 c7f3a3c6b3d006790d486dc7cceda2b6d2e329de07f33bc47dfc53f00f334b2a libwpe-1.16.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.16.3.tar.xz.sums +md5 a26e3703d2a35ba3e57436cd6b76a656 libwpe-1.16.3.tar.xz +sha1 969897ea9b908f92ef0b4f6feaaec74f23425c39 libwpe-1.16.3.tar.xz +sha256 c880fa8d607b2aa6eadde7d6d6302b1396ebc38368fe2332fa20e193c7ee1420 libwpe-1.16.3.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index de49cedfb4..d8d2caa08a 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -LIBWPE_VERSION = 1.16.0 +LIBWPE_VERSION = 1.16.3 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES diff --git a/package/libxcrypt/Config.in b/package/libxcrypt/Config.in index 57ae8f67a3..38c75b5e63 100644 --- a/package/libxcrypt/Config.in +++ b/package/libxcrypt/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBXCRYPT bool "libxcrypt" + depends on BR2_TOOLCHAIN_USES_GLIBC help libxcrypt is a modern library for one-way hashing of passwords. It supports a wide variety of both diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index 9bcf119077..7ec9140957 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,6 +1,6 @@ -# From https://github.com/besser82/libxcrypt/releases/download/v4.4.36/libxcrypt-4.4.36.tar.xz.sha256sum -sha256 e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943 libxcrypt-4.4.36.tar.xz +# From https://github.com/besser82/libxcrypt/releases/download/v4.5.2/libxcrypt-4.5.2.tar.xz.sha256sum +sha256 71513a31c01a428bccd5367a32fd95f115d6dac50fb5b60c779d5c7942aec071 libxcrypt-4.5.2.tar.xz # Locally calculated -sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING +sha256 9144e66d8140feb84f0e4e344906ac425378896320032e0248567ef195cf0135 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 60901988ac..ae7ecf5540 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.36 +LIBXCRYPT_VERSION = 4.5.2 LIBXCRYPT_SITE = https://github.com/besser82/libxcrypt/releases/download/v$(LIBXCRYPT_VERSION) LIBXCRYPT_SOURCE = libxcrypt-$(LIBXCRYPT_VERSION).tar.xz LIBXCRYPT_LICENSE = LGPL-2.1+ diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index fff2b7a943..50bcf52f17 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html -sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz +# Locally calculated +sha256 8d68a8b45796f34f7cace357b9f89b8c92b158557274fef5889b03648b55fe59 libxkbcommon-1.9.2.tar.gz # License file: -sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE +sha256 967e97b28658f0037bbe164a237bdfb0c3ec790e67f6c29372ea5b09306f61f3 LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 882791b917..21a2b937ef 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.4.0 -LIBXKBCOMMON_SITE = https://xkbcommon.org/download -LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz +LIBXKBCOMMON_VERSION = 1.9.2 +LIBXKBCOMMON_SITE = $(call github,xkbcommon,libxkbcommon,xkbcommon-$(LIBXKBCOMMON_VERSION)) LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE LIBXKBCOMMON_CPE_ID_VENDOR = xkbcommon diff --git a/package/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch b/package/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch new file mode 100644 index 0000000000..75232b6f00 --- /dev/null +++ b/package/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch @@ -0,0 +1,85 @@ +From 81992efb40b37cc893c55575a83cdd1cec1fde2a Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 29 Oct 2025 21:45:09 +0100 +Subject: [PATCH] Revert "cmake: Fix installation directories in + libxml2-config.cmake" + +This reverts commit 75dde50b20215a2a3a445b62f36a67c8ed337cab. + +Upstream: https://gitlab.gnome.org/GNOME/libxml2/-/issues/898#note_2452864 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 11 ----------- + libxml2-config.cmake.in | 11 +++++++---- + meson.build | 3 --- + 3 files changed, 7 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4eb629bb..150e06eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1006,17 +1006,6 @@ AC_SUBST(XML_PRIVATE_LIBS) + AC_SUBST(XML_PRIVATE_CFLAGS) + AC_SUBST(XML_INCLUDEDIR) + +-# for libxml2-config.cmake.in +-AX_RECURSIVE_EVAL(["$bindir"], [INSTALL_BINDIR]) +-AX_RECURSIVE_EVAL(["$includedir"], [INSTALL_INCLUDEDIR]) +-AX_RECURSIVE_EVAL(["$libdir"], [INSTALL_LIBDIR]) +-AC_SUBST(INSTALL_BINDIR) +-AC_SUBST(INSTALL_INCLUDEDIR) +-AC_SUBST(INSTALL_LIBDIR) +-AM_SUBST_NOTMAKE(INSTALL_BINDIR) +-AM_SUBST_NOTMAKE(INSTALL_INCLUDEDIR) +-AM_SUBST_NOTMAKE(INSTALL_LIBDIR) +- + AX_RECURSIVE_EVAL(["$sysconfdir"], [XML_SYSCONFDIR]) + AC_DEFINE_UNQUOTED([XML_SYSCONFDIR], ["$XML_SYSCONFDIR"], + [System configuration directory (/etc)]) +diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in +index ff6433fa..b775cfee 100644 +--- a/libxml2-config.cmake.in ++++ b/libxml2-config.cmake.in +@@ -24,17 +24,20 @@ + # LibXml2::LibXml2 - the LibXml2 library + # LibXml2::xmllint - the xmllint command-line executable + ++get_filename_component(_libxml2_rootdir ${CMAKE_CURRENT_LIST_DIR}/../../../ ABSOLUTE) ++ + set(LIBXML2_VERSION_MAJOR @LIBXML_MAJOR_VERSION@) + set(LIBXML2_VERSION_MINOR @LIBXML_MINOR_VERSION@) + set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@) + set(LIBXML2_VERSION_STRING "@VERSION@") + set(LIBXML2_DEFINITIONS "@XML_CFLAGS@") +-set(LIBXML2_INCLUDE_DIR @INSTALL_INCLUDEDIR@/libxml2) +-set(LIBXML2_LIBRARY_DIR @INSTALL_LIBDIR@) ++set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir}) ++set(LIBXML2_INCLUDE_DIR ${_libxml2_rootdir}/include/libxml2) ++set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib) + + find_library(LIBXML2_LIBRARY NAMES xml2 HINTS ${LIBXML2_LIBRARY_DIR} NO_DEFAULT_PATH) +-find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) +-find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) ++find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS ${_libxml2_rootdir}/bin NO_DEFAULT_PATH) ++find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS ${_libxml2_rootdir}/bin NO_DEFAULT_PATH) + + set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) + set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}) +diff --git a/meson.build b/meson.build +index 31c73b62..8728852c 100644 +--- a/meson.build ++++ b/meson.build +@@ -577,9 +577,6 @@ config_cmake = configuration_data() + config_cmake.set('LIBXML_MAJOR_VERSION', v_maj) + config_cmake.set('LIBXML_MINOR_VERSION', v_min) + config_cmake.set('LIBXML_MICRO_VERSION', v_mic) +-config_cmake.set('INSTALL_BINDIR', dir_bin) +-config_cmake.set('INSTALL_INCLUDEDIR', dir_include) +-config_cmake.set('INSTALL_LIBDIR', dir_lib) + config_cmake.set('VERSION', meson.project_version()) + config_cmake.set10('BUILD_SHARED_LIBS', + get_option('default_library') != 'static') +-- +2.47.3 + diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ed6c20e948..637ba52bb8 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.sha256sum -sha256 65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 libxml2-2.13.4.tar.xz +# From https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.1.sha256sum +sha256 c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c libxml2-2.15.1.tar.xz # License files, locally calculated -sha256 c99aae1afe013e50b8b3701e089222b351258043c3025b64053a233fd25b4be7 Copyright +sha256 5d4873884a890122a4b9b20ad56ac6f7da1d796a5bfcf04a427970ac96217626 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 8a5d703da6..35d373e130 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXML2_VERSION_MAJOR = 2.13 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 +LIBXML2_VERSION_MAJOR = 2.15 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).1 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) @@ -14,6 +14,8 @@ LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = Copyright LIBXML2_CPE_ID_VENDOR = xmlsoft LIBXML2_CONFIG_SCRIPTS = xml2-config +# 0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch +LIBXML2_AUTORECONF = YES # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) @@ -25,20 +27,18 @@ LIBXML2_CONF_OPTS = --with-http --with-gnu-ld --without-debug HOST_LIBXML2_DEPENDENCIES = host-pkgconf LIBXML2_DEPENDENCIES = host-pkgconf -HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma +HOST_LIBXML2_CONF_OPTS = --without-zlib -ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBXML2_DEPENDENCIES += python3 -LIBXML2_CONF_OPTS += --with-python +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBXML2_CONF_OPTS += --with-threads else -LIBXML2_CONF_OPTS += --without-python +LIBXML2_CONF_OPTS += --without-threads endif -ifeq ($(BR2_PACKAGE_HOST_PYTHON3),y) -HOST_LIBXML2_DEPENDENCIES += host-python3 -HOST_LIBXML2_CONF_OPTS += --with-python +ifeq ($(BR2_STATIC_LIBS),y) +LIBXML2_CONF_OPTS += --without-modules else -HOST_LIBXML2_CONF_OPTS += --without-python +LIBXML2_CONF_OPTS += --with-modules endif ifeq ($(BR2_PACKAGE_ICU),y) @@ -55,13 +55,6 @@ else LIBXML2_CONF_OPTS += --without-zlib endif -ifeq ($(BR2_PACKAGE_XZ),y) -LIBXML2_DEPENDENCIES += xz -LIBXML2_CONF_OPTS += --with-lzma -else -LIBXML2_CONF_OPTS += --without-lzma -endif - LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) diff --git a/package/libxmlrpc/Config.in b/package/libxmlrpc/Config.in index 33d512328e..798c286f2d 100644 --- a/package/libxmlrpc/Config.in +++ b/package/libxmlrpc/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBXMLRPC bool "libxmlrpc" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBCURL help XML-RPC is a quick-and-easy way to make procedure calls over @@ -24,4 +25,5 @@ comment "cli tool needs a toolchain w/ dynamic library" endif # BR2_PACKAGE_LIBXMLRPC comment "libxmlrpc needs a toolchain w/ threads" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libxmlrpc/libxmlrpc.hash b/package/libxmlrpc/libxmlrpc.hash index b9167ca5a0..00cef19b77 100644 --- a/package/libxmlrpc/libxmlrpc.hash +++ b/package/libxmlrpc/libxmlrpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7265be1a181e57106707b5278daf64b2a717b8a2a9e6ec8992d8c8084e64eaa2 libxmlrpc-r3176-svn5.tar.gz +sha256 4a071da3204132585a40313e17e01699d428e0fc9b58d30fcd7e538037254668 libxmlrpc-r3335-svn5.tar.gz sha256 db7a6d3f187b218c3534010a83424c6bcdef88e6a0b6b1aa3a8762238bd642e6 doc/COPYING diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk index dd09fa8f53..283914ca81 100644 --- a/package/libxmlrpc/libxmlrpc.mk +++ b/package/libxmlrpc/libxmlrpc.mk @@ -4,8 +4,8 @@ # ################################################################################ -# 1.60.01 (code/advanced@r3176) -LIBXMLRPC_VERSION = r3176 +# 1.67.00 (code/advanced@r3335) +LIBXMLRPC_VERSION = r3335 LIBXMLRPC_SITE = https://svn.code.sf.net/p/xmlrpc-c/code/advanced LIBXMLRPC_SITE_METHOD = svn LIBXMLRPC_LICENSE = BSD-3-Clause (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c) @@ -47,6 +47,12 @@ else LIBXMLRPC_CONF_OPTS += --disable-abyss-openssl endif +ifeq ($(BR2_PACKAGE_LIBXML2),y) +LIBXMLRPC_DEPENDENCIES += libxml2 +else +LIBXMLRPC_CONF_OPTS += --disable-libxml2-backend +endif + LIBXMLRPC_MAKE_OPTS += $(LIBXMLRPC_STATIC_OPTS) LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \ DESTDIR=$(STAGING_DIR) install diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index dd67940c8a..0523c51362 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.42.sha256sum -sha256 85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb libxslt-1.1.42.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.45.sha256sum +sha256 9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e libxslt-1.1.45.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 Copyright diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index b5bb22f9ae..229f3de2f6 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.42 +LIBXSLT_VERSION = 1.1.45 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT -LIBXSLT_LICENSE_FILES = COPYING +LIBXSLT_LICENSE_FILES = Copyright LIBXSLT_CPE_ID_VENDOR = xmlsoft LIBXSLT_CONF_OPTS = \ diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index e03278adfd..c6bf66169d 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz -sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE +sha256 5cd5018f39c830f97d70616c003990287ce5e820ae2792763a49e2a1f63af8d6 libyang-3.13.6.tar.gz +sha256 9fe5fa94b97504d1bc32b4221cc3d32a2bd10b2086583b980ce36a3207a88eab LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index fca0cd63f8..6f82397eb0 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.148 +LIBYANG_VERSION = 3.13.6 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE diff --git a/package/libzenoh-c/libzenoh-c.hash b/package/libzenoh-c/libzenoh-c.hash index da4596e4dc..9a1cbca0ff 100644 --- a/package/libzenoh-c/libzenoh-c.hash +++ b/package/libzenoh-c/libzenoh-c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e3419a3ef9c1d0c65a2749728e332cbc5a8da2ba3dfbc24f310fa8735fb5949 libzenoh-c-1.0.2-cargo2.tar.gz +sha256 5b1cc424771338f28ed16bce23a442856ed5b7f7f3ba1ff2aeb7373d68b484dd libzenoh-c-1.2.1-cargo4.tar.gz sha256 01a44774f7b1a453595c7c6d7f7308284ba6a1059dc49e14dad6647e1d44a338 LICENSE diff --git a/package/libzenoh-c/libzenoh-c.mk b/package/libzenoh-c/libzenoh-c.mk index a697146049..148edd008a 100644 --- a/package/libzenoh-c/libzenoh-c.mk +++ b/package/libzenoh-c/libzenoh-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZENOH_C_VERSION = 1.0.2 +LIBZENOH_C_VERSION = 1.2.1 LIBZENOH_C_SITE = $(call github,eclipse-zenoh,zenoh-c,$(LIBZENOH_C_VERSION)) LIBZENOH_C_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_C_LICENSE_FILES = LICENSE diff --git a/package/libzenoh-pico/0001-CMakeLists.txt-don-t-override-the-optimization-level.patch b/package/libzenoh-pico/0001-CMakeLists.txt-don-t-override-the-optimization-level.patch new file mode 100644 index 0000000000..e9a3520407 --- /dev/null +++ b/package/libzenoh-pico/0001-CMakeLists.txt-don-t-override-the-optimization-level.patch @@ -0,0 +1,67 @@ +From 32d087860abaf5b2374043db7034174aec06b885 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 31 Dec 2024 15:52:57 +0100 +Subject: [PATCH] CMakeLists.txt: don't override the optimization level + +zenoh-pico's CMakeLists.txt has some logic to provide its own compiler +optimization level: -O3 for release builds, -O0 for debug builds. + +Unfortunately, using add_compile_options() means that those settings +take precedence over what the user can pass as custom compiler +flags. And this causes issues for example when doing a debug build +with _FORTIFY_SOURCE enabled, as _FORTIFY_SOURCE support in glibc is +incompatible with unoptimized builds causing this build failure: + +/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:414:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + 414 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) + | ^~~~~~~ + +which is a warning, but as zenoh-pico builds with -Werror, it turns +into a build failure. + +As it is unclear how CMakeLists.txt can pass a default -O level, while +allowing it to be overridden by the user, we simply remove those +optimization level options. + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/eclipse-zenoh/zenoh-pico/pull/847 +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25b62fb5..623d13f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,15 +86,15 @@ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) + # Compile options + if(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR "Release") + if(UNIX) +- add_compile_options(-pipe -O3) ++ add_compile_options(-pipe) + elseif(CMAKE_SYSTEM_NAME MATCHES "Generic") +- add_compile_options(-pipe -O3) ++ add_compile_options(-pipe) + endif() + else() + if(CMAKE_SYSTEM_NAME MATCHES "PICO") +- add_compile_options(-c -Wall -Wextra -Wno-unused -Wno-strict-prototypes -pipe -g -O0) ++ add_compile_options(-c -Wall -Wextra -Wno-unused -Wno-strict-prototypes -pipe -g) + elseif(UNIX) +- add_compile_options(-c -Wall -Wextra -Werror -Wshadow -Wunused -Wstrict-prototypes -pipe -g -O0) ++ add_compile_options(-c -Wall -Wextra -Werror -Wshadow -Wunused -Wstrict-prototypes -pipe -g) + # C99 pedantic doesn't like struct anonymous in unix header + if (NOT CMAKE_C_STANDARD STREQUAL "99") + add_compile_options(-Wpedantic) +@@ -103,7 +103,7 @@ else() + elseif(MSVC) + add_compile_options(/W4 /WX /Od /wd4127) + elseif(CMAKE_SYSTEM_NAME MATCHES "Generic") +- add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -pipe -g -O0) ++ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -pipe -g) + endif() + endif() + +-- +2.47.1 + diff --git a/package/libzenoh-pico/0002-fix-compilation-issues.patch b/package/libzenoh-pico/0002-fix-compilation-issues.patch new file mode 100644 index 0000000000..f9ff5bf506 --- /dev/null +++ b/package/libzenoh-pico/0002-fix-compilation-issues.patch @@ -0,0 +1,199 @@ +From 584e3d2cf8e879e5ad042f742a3d8656d7d98ed7 Mon Sep 17 00:00:00 2001 +From: Jean-Roland Gosse +Date: Thu, 10 Jul 2025 14:37:00 +0200 +Subject: [PATCH] Fix compilation issues (#986) + +* fix: compilation issues + +* fix: stringop-overflow + +* doc: add comment to _z_str_append function + +Upstream: https://github.com/eclipse-zenoh/zenoh-pico/commit/60e635cbb1dc6be8eda559a913d4689845f0d62e +Signed-off-by: Thomas Perale +--- + include/zenoh-pico/utils/string.h | 8 ++++++++ + src/api/encoding.c | 4 ++-- + src/protocol/codec/declarations.c | 4 ++++ + src/protocol/codec/transport.c | 3 ++- + src/protocol/config.c | 8 +++----- + src/session/rx.c | 3 +++ + src/transport/multicast/rx.c | 4 ++++ + src/transport/unicast/rx.c | 4 ++++ + 8 files changed, 30 insertions(+), 8 deletions(-) + +diff --git a/include/zenoh-pico/utils/string.h b/include/zenoh-pico/utils/string.h +index e4ffd69d..2f56cb79 100644 +--- a/include/zenoh-pico/utils/string.h ++++ b/include/zenoh-pico/utils/string.h +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #ifdef __cplusplus + extern "C" { +@@ -63,6 +64,13 @@ size_t _z_strcnt(char const *haystack_start, const char *harstack_end, const cha + + size_t _z_str_startswith(const char *s, const char *needle); + ++// Must be used on a null terminated string with str[strlen(str) + 1] being valid memory. ++static inline void _z_str_append(char *str, const char c) { ++ size_t len = strlen(str); ++ str[len] = c; ++ str[len + 1] = '\0'; ++} ++ + #ifdef __cplusplus + } + #endif +diff --git a/src/api/encoding.c b/src/api/encoding.c +index b4ff4cb1..16a5b9ff 100644 +--- a/src/api/encoding.c ++++ b/src/api/encoding.c +@@ -19,6 +19,7 @@ + #include + + #include "zenoh-pico.h" ++#include "zenoh-pico/utils/string.h" + + #if Z_FEATURE_ENCODING_VALUES == 1 + #define ENCODING_SCHEMA_SEPARATOR ';' +@@ -196,11 +197,10 @@ static z_result_t _z_encoding_convert_into_string(const z_loaned_encoding_t *enc + return _Z_ERR_SYSTEM_OUT_OF_MEMORY; + } + // Copy prefix +- char sep = ENCODING_SCHEMA_SEPARATOR; + (void)strncpy(value, prefix, prefix_len); + // Copy schema and separator + if (has_schema) { +- (void)strncat(value, &sep, 1); ++ _z_str_append(value, ENCODING_SCHEMA_SEPARATOR); + (void)strncat(value, _z_string_data(&encoding->schema), _z_string_len(&encoding->schema)); + } + // Fill container +diff --git a/src/protocol/codec/declarations.c b/src/protocol/codec/declarations.c +index 905aad39..2146537e 100644 +--- a/src/protocol/codec/declarations.c ++++ b/src/protocol/codec/declarations.c +@@ -163,6 +163,10 @@ z_result_t _z_declaration_encode(_z_wbuf_t *wbf, const _z_declaration_t *decl) { + case _Z_DECL_FINAL: { + ret = _z_decl_final_encode(wbf); + } break; ++ ++ default: ++ ret = _Z_ERR_MESSAGE_SERIALIZATION_FAILED; ++ break; + } + return ret; + } +diff --git a/src/protocol/codec/transport.c b/src/protocol/codec/transport.c +index 894fb41d..51830cd1 100644 +--- a/src/protocol/codec/transport.c ++++ b/src/protocol/codec/transport.c +@@ -217,11 +217,12 @@ z_result_t _z_init_encode(_z_wbuf_t *wbf, uint8_t header, const _z_t_msg_init_t + } + + z_result_t _z_init_decode_ext(_z_msg_ext_t *extension, void *ctx) { ++ _ZP_UNUSED(ctx); + z_result_t ret = _Z_RES_OK; +- _z_t_msg_init_t *msg = (_z_t_msg_init_t *)ctx; + if (false) { + #if Z_FEATURE_FRAGMENTATION == 1 + } else if (_Z_EXT_FULL_ID(extension->_header) == _Z_MSG_EXT_ID_INIT_PATCH) { ++ _z_t_msg_init_t *msg = (_z_t_msg_init_t *)ctx; + msg->_patch = (uint8_t)extension->_body._zint._val; + #endif + } else if (_Z_MSG_EXT_IS_MANDATORY(extension->_header)) { +diff --git a/src/protocol/config.c b/src/protocol/config.c +index 1cfcff9c..245e7c3d 100644 +--- a/src/protocol/config.c ++++ b/src/protocol/config.c +@@ -21,6 +21,7 @@ + + #include "zenoh-pico/collections/string.h" + #include "zenoh-pico/utils/pointers.h" ++#include "zenoh-pico/utils/string.h" + + z_result_t _z_config_init(_z_config_t *ps) { + _z_str_intmap_init(ps); +@@ -142,15 +143,12 @@ size_t _z_str_intmap_strlen(const _z_str_intmap_t *s, uint8_t argc, _z_str_intma + void _z_str_intmap_onto_str(char *dst, size_t dst_len, const _z_str_intmap_t *s, uint8_t argc, + _z_str_intmapping_t argv[]) { + size_t len = dst_len; +- const char lsep = INT_STR_MAP_LIST_SEPARATOR; +- const char ksep = INT_STR_MAP_KEYVALUE_SEPARATOR; +- + dst[0] = '\0'; + for (size_t i = 0; i < argc; i++) { + char *v = _z_str_intmap_get(s, argv[i]._key); + if (v != NULL) { + if (len > (size_t)0) { +- (void)strncat(dst, &lsep, 1); // List separator ++ _z_str_append(dst, INT_STR_MAP_LIST_SEPARATOR); // List separator + len = len - (size_t)1; + } + +@@ -159,7 +157,7 @@ void _z_str_intmap_onto_str(char *dst, size_t dst_len, const _z_str_intmap_t *s, + len = len - strlen(argv[i]._str); + } + if (len > (size_t)0) { +- (void)strncat(dst, &ksep, 1); // KeyValue separator ++ _z_str_append(dst, INT_STR_MAP_KEYVALUE_SEPARATOR); // KeyValue separator + len = len - (size_t)1; + } + if (len > (size_t)0) { +diff --git a/src/session/rx.c b/src/session/rx.c +index d85f9d38..8556ce1d 100644 +--- a/src/session/rx.c ++++ b/src/session/rx.c +@@ -93,6 +93,8 @@ static z_result_t _z_handle_declare(_z_session_t *zn, _z_n_msg_declare_t *decl, + + static z_result_t _z_handle_request(_z_session_rc_t *zsrc, _z_session_t *zn, _z_n_msg_request_t *req, + z_reliability_t reliability) { ++ _ZP_UNUSED(reliability); ++ _ZP_UNUSED(zsrc); + switch (req->_tag) { + case _Z_REQUEST_QUERY: + #if Z_FEATURE_QUERYABLE == 1 +@@ -158,6 +160,7 @@ static z_result_t _z_handle_response(_z_session_t *zn, _z_n_msg_response_t *resp + } + #else + _z_n_msg_response_clear(resp); ++ _ZP_UNUSED(zn); + #endif + return _Z_RES_OK; + } +diff --git a/src/transport/multicast/rx.c b/src/transport/multicast/rx.c +index 121406d0..47269b1a 100644 +--- a/src/transport/multicast/rx.c ++++ b/src/transport/multicast/rx.c +@@ -294,6 +294,10 @@ static z_result_t _z_multicast_handle_fragment_inner(_z_transport_multicast_t *z + *dbuf_state = _Z_DBUF_STATE_NULL; + } + #else ++ _ZP_UNUSED(ztm); ++ _ZP_UNUSED(header); ++ _ZP_UNUSED(msg); ++ _ZP_UNUSED(entry); + _Z_INFO("Fragment dropped because fragmentation feature is deactivated"); + #endif + return ret; +diff --git a/src/transport/unicast/rx.c b/src/transport/unicast/rx.c +index c5ccf932..43e1b4c8 100644 +--- a/src/transport/unicast/rx.c ++++ b/src/transport/unicast/rx.c +@@ -248,6 +248,10 @@ static z_result_t _z_unicast_handle_fragment_inner(_z_transport_unicast_t *ztu, + *dbuf_state = _Z_DBUF_STATE_NULL; + } + #else ++ _ZP_UNUSED(ztu); ++ _ZP_UNUSED(header); ++ _ZP_UNUSED(msg); ++ _ZP_UNUSED(peer); + _Z_INFO("Fragment dropped because fragmentation feature is deactivated"); + #endif + return ret; +-- +2.50.1 diff --git a/package/libzenoh-pico/libzenoh-pico.hash b/package/libzenoh-pico/libzenoh-pico.hash index 11c9dc5fa8..3e0344cdaf 100644 --- a/package/libzenoh-pico/libzenoh-pico.hash +++ b/package/libzenoh-pico/libzenoh-pico.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b2c7645e023cd317a21f6adc0f8c50d71ab3b058a1a630ba4a0f29f9c0eacf3a libzenoh-pico-1.0.2.tar.gz +sha256 822aaeafa47405c21b7935a1428b2ac796177ea35ac6b59580481c357edd2b78 libzenoh-pico-1.2.1.tar.gz sha256 d386df32cf327bbb25abe894277d3d7e0f447bafc59f4ad362615b0136f30db5 LICENSE diff --git a/package/libzenoh-pico/libzenoh-pico.mk b/package/libzenoh-pico/libzenoh-pico.mk index 28d702c459..6e05ae340c 100644 --- a/package/libzenoh-pico/libzenoh-pico.mk +++ b/package/libzenoh-pico/libzenoh-pico.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZENOH_PICO_VERSION = 1.0.2 +LIBZENOH_PICO_VERSION = 1.2.1 LIBZENOH_PICO_SITE = $(call github,eclipse-zenoh,zenoh-pico,$(LIBZENOH_PICO_VERSION)) LIBZENOH_PICO_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_PICO_LICENSE_FILES = LICENSE diff --git a/package/lightning/Config.in b/package/lightning/Config.in index e42730addb..e36ce05ac2 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -21,7 +21,6 @@ if BR2_PACKAGE_LIGHTNING config BR2_PACKAGE_LIGHTNING_DISASSEMBLER bool "enable disassembler" - depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils select BR2_PACKAGE_BINUTILS select BR2_PACKAGE_ZLIB @@ -29,7 +28,6 @@ config BR2_PACKAGE_LIGHTNING_DISASSEMBLER Enable the GNU lightning disassembler. comment "lightning disassembler needs a toolchain w/ wchar" - depends on !BR2_nios2 depends on !BR2_USE_WCHAR endif diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 2eab2a84e5..61f58c609f 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,4 +1,4 @@ -From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 +From bb0a1cc656b2df4184a0794fb67ae74c634c1ecd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a @@ -15,16 +15,18 @@ Signed-off-by: Simon Dawson Signed-off-by: Gustavo Zacarias [Thomas: update for 1.4.69 - drop server.use-ipv6] Signed-off-by: Thomas Devoogdt +[Thomas: update for 1.4.77 - move lighttpd.conf to lighttpd.annotated.conf] +Signed-off-by: Thomas Devoogdt --- - doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 14 +++++++------- + doc/config/conf.d/access_log.conf | 2 +- + doc/config/lighttpd.annotated.conf | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d437..92cff4f0 100644 +index f8294802..9886cddf 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf -@@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) +@@ -7,7 +7,7 @@ server.modules += ( "mod_accesslog" ) ## ## Default access log. ## @@ -33,10 +35,10 @@ index e685d437..92cff4f0 100644 ## ## The default format produces CLF compatible output. -diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index d45a284d..4e926d5a 100644 ---- a/doc/config/lighttpd.conf -+++ b/doc/config/lighttpd.conf +diff --git a/doc/config/lighttpd.annotated.conf b/doc/config/lighttpd.annotated.conf +index c94f703b..35263a1e 100644 +--- a/doc/config/lighttpd.annotated.conf ++++ b/doc/config/lighttpd.annotated.conf @@ -13,8 +13,8 @@ ## if you add a variable here. Add the corresponding variable in the ## chroot example as well. @@ -48,9 +50,9 @@ index d45a284d..4e926d5a 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -97,8 +97,8 @@ server.port = 80 +@@ -97,8 +97,8 @@ include conf_dir + "/modules.conf" ## Run as a different username/groupname. - ## This requires root permissions during startup. + ## This requires root permissions during startup. ## -server.username = "lighttpd" -server.groupname = "lighttpd" @@ -76,10 +78,10 @@ index d45a284d..4e926d5a 100644 +server.errorlog = log_root + "/lighttpd-error.log" ## - ## If you want to log to syslog you have to unset the + ## If you want to log to syslog you have to unset the @@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network - ## servers transfer files as fast as possible + ## servers transfer files as fast as possible ## -#server.network-backend = "sendfile" +server.network-backend = "writev" @@ -87,5 +89,5 @@ index d45a284d..4e926d5a 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.39.0 +2.43.0 diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 66532d7dd5..fe2c7a2815 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -34,6 +34,23 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_DBI + bool "dbi support" + select BR2_PACKAGE_LIBDBI + help + Enable dbi support for lighttpd mod_auth mod_vhostdb_dbi. + +config BR2_PACKAGE_LIGHTTPD_GNUTLS + bool "gnutls support" + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR + select BR2_PACKAGE_GNUTLS + help + Enable gnutls support for lighttpd mod_auth. + +comment "gnutls support needs a toolchain w/ wchar, dynamic library" + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS + config BR2_PACKAGE_LIGHTTPD_KRB5 bool "krb5 support" select BR2_PACKAGE_LIBKRB5 @@ -62,6 +79,12 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB help Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb +config BR2_PACKAGE_LIGHTTPD_MBEDTLS + bool "mbedtls support" + select BR2_PACKAGE_MBEDTLS + help + Enable mbedtls support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_MYSQL bool "mysql support" depends on BR2_PACKAGE_MARIADB @@ -71,6 +94,12 @@ config BR2_PACKAGE_LIGHTTPD_MYSQL comment "mysql support needs mariadb" depends on !BR2_PACKAGE_MARIADB +config BR2_PACKAGE_LIGHTTPD_NETTLE + bool "nettle support" + select BR2_PACKAGE_NETTLE + help + Enable nettle support for lighttpd. + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -94,6 +123,9 @@ config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help @@ -113,6 +145,17 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav +config BR2_PACKAGE_LIGHTTPD_WOLFSSL + bool "wolfssl support" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_WOLFSSL + select BR2_PACKAGE_WOLFSSL_ALL + help + Enable wolfssl support for lighttpd mod_auth. + +comment "wolfssl support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_LIGHTTPD_ZLIB bool "zlib support" select BR2_PACKAGE_ZLIB diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index c5545150b0..2a7c3c5e84 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,6 +1,6 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.76.sha512sum -sha512 940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782 lighttpd-1.4.76.tar.xz -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.76.sha256sum -sha256 8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011 lighttpd-1.4.76.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.82.sha512sum +sha512 a8ced6e61b6768d31fb643c1f75af906ee975000286a9a522415571878c7979fd9e5e39f36871e8f34f6ca5d3702fa4b20a0c1203b57ba446dae2dbb6efa71b4 lighttpd-1.4.82.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.82.sha256sum +sha256 abfe74391f9cbd66ab154ea07e64f194dbe7e906ef4ed47eb3b0f3b46246c962 lighttpd-1.4.82.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index b54f5dd213..a126e96167 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).76 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).82 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,17 +13,10 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=disabled \ -Dwith_fam=disabled \ - -Dwith_gnutls=false \ - -Dwith_libev=disabled \ - -Dwith_libunwind=disabled \ - -Dwith_mbedtls=false \ - -Dwith_nettle=false \ -Dwith_nss=false \ -Dwith_pcre=disabled \ -Dwith_sasl=disabled \ - -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ @@ -34,6 +27,13 @@ ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) LIGHTTPD_DEPENDENCIES += libxcrypt endif +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +LIGHTTPD_DEPENDENCIES += libunwind +LIGHTTPD_CONF_OPTS += -Dwith_libunwind=enabled +else +LIGHTTPD_CONF_OPTS += -Dwith_libunwind=disabled +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled @@ -48,6 +48,20 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_DBI),y) +LIGHTTPD_DEPENDENCIES += libdbi +LIGHTTPD_CONF_OPTS += -Dwith_dbi=enabled +else +LIGHTTPD_CONF_OPTS += -Dwith_dbi=disabled +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_GNUTLS),y) +LIGHTTPD_DEPENDENCIES += gnutls +LIGHTTPD_CONF_OPTS += -Dwith_gnutls=true +else +LIGHTTPD_CONF_OPTS += -Dwith_gnutls=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled @@ -76,6 +90,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MBEDTLS),y) +LIGHTTPD_DEPENDENCIES += mbedtls +LIGHTTPD_CONF_OPTS += -Dwith_mbedtls=true +else +LIGHTTPD_CONF_OPTS += -Dwith_mbedtls=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mariadb LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled @@ -83,6 +104,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_NETTLE),y) +LIGHTTPD_DEPENDENCIES += nettle +LIGHTTPD_CONF_OPTS += -Dwith_nettle=true +else +LIGHTTPD_CONF_OPTS += -Dwith_nettle=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -124,6 +152,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_WOLFSSL),y) +LIGHTTPD_DEPENDENCIES += wolfssl +LIGHTTPD_CONF_OPTS += -Dwith_wolfssl=true +else +LIGHTTPD_CONF_OPTS += -Dwith_wolfssl=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled @@ -143,6 +178,8 @@ define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www $(INSTALL) -D -m 0644 $(@D)/doc/config/lighttpd.conf \ $(TARGET_DIR)/etc/lighttpd/lighttpd.conf + $(INSTALL) -D -m 0644 $(@D)/doc/config/lighttpd.annotated.conf \ + $(TARGET_DIR)/etc/lighttpd/lighttpd.annotated.conf $(INSTALL) -D -m 0644 $(@D)/doc/config/modules.conf \ $(TARGET_DIR)/etc/lighttpd/modules.conf $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/access_log.conf \ diff --git a/package/links/Config.in b/package/links/Config.in index cc2389c9f1..e7fffaf130 100644 --- a/package/links/Config.in +++ b/package/links/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_LINKS config BR2_PACKAGE_LINKS_GRAPHICS bool "use graphics" - depends on BR2_PACKAGE_GPM || BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_GPM || BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG help @@ -18,7 +18,7 @@ config BR2_PACKAGE_LINKS_GRAPHICS Framebuffer output requires GPM (console mouse). Otherwise links will be text-mode only. -comment "links graphics needs GPM, DirectFB or X11" - depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_DIRECTFB && !BR2_PACKAGE_XORG7 +comment "links graphics needs GPM or X11" + depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_XORG7 endif diff --git a/package/links/links.mk b/package/links/links.mk index 7ebe3af474..a2833c9514 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -11,6 +11,7 @@ LINKS_DEPENDENCIES = host-pkgconf LINKS_LICENSE = GPL-2.0+ LINKS_LICENSE_FILES = COPYING LINKS_CPE_ID_VENDOR = twibright +LINKS_CONF_OPTS = --without-directfb ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) LINKS_CONF_OPTS += --enable-graphics @@ -24,16 +25,6 @@ LINKS_DEPENDENCIES += xlib_libXt else LINKS_CONF_OPTS += --without-x endif -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config -ifeq ($(BR2_STATIC_LIBS),y) -LINKS_CONF_ENV += LIBS=-lstdc++ -endif -LINKS_CONF_OPTS += --with-directfb -LINKS_DEPENDENCIES += directfb -else -LINKS_CONF_OPTS += --without-directfb -endif ifeq ($(BR2_PACKAGE_JPEG),y) LINKS_CONF_OPTS += --with-libjpeg LINKS_DEPENDENCIES += jpeg diff --git a/package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch b/package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch deleted file mode 100644 index 1655fa59a1..0000000000 --- a/package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d5d528e7562f358b9564e64cea0678020c51479a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 Mar 2020 18:56:19 +0100 -Subject: [PATCH] src/core/paths/paths.cpp: fix powerpc build - -Fix the following build failure on powerpc: - -/home/test/autobuild/run/instance-2/output-1/build/linphone-4.3.1/src/core/paths/paths.cpp:32:3: error: #error "Unsupported system." - #error "Unsupported system." - ^~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d90bca02c2771df8dfbf39892d529fb5f9069656 - -Signed-off-by: Fabrice Fontaine ---- - src/core/paths/paths.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/paths/paths.cpp b/src/core/paths/paths.cpp -index 0442282fe..2c6508a51 100644 ---- a/src/core/paths/paths.cpp -+++ b/src/core/paths/paths.cpp -@@ -26,7 +26,7 @@ - #include "paths-android.h" - #elif defined(_WIN32) - #include "paths-windows.h" --#elif defined(__linux) -+#elif defined(__linux) || defined(__linux__) - #include "paths-linux.h" - #else - #error "Unsupported system." --- -2.25.1 - diff --git a/package/linphone/Config.in b/package/linphone/Config.in deleted file mode 100644 index 3fe25c1659..0000000000 --- a/package/linphone/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_LINPHONE - bool "linphone" - depends on BR2_USE_MMU - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS # belle-sip, mediastreamer - depends on BR2_TOOLCHAIN_HAS_THREADS # belr, belle-sip, mediastreamer - # belr, belle-sip, mediastreamer - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on BR2_USE_WCHAR # belle-sip - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # mediastreamer - select BR2_PACKAGE_BELLE_SIP - select BR2_PACKAGE_BELR - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_MEDIASTREAMER - select BR2_PACKAGE_SQLITE - help - Linphone is an internet phone or Voice Over IP phone (VoIP). - - With linphone you can communicate freely with people over - the internet, with voice, video, and text instant messaging. - Linphone makes use of the SIP protocol, an open standard - for internet telephony. You can use Linphone with any SIP - VoIP operator, including our free SIP audio/video service. - linphone is free-software (or open-source), you can download - and redistribute it freely. - Linphone is available for desktop computers: Linux, Windows, - MacOSX, and for mobile phones: Android, iPhone, Blackberry. - - Linphone support in Buildroot is limited to the commandline - client, linphonec, and video support is not enabled. - - http://www.linphone.org/ - -comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar, gcc >= 5" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 - -comment "linphone needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/linphone/linphone.hash b/package/linphone/linphone.hash deleted file mode 100644 index 6d456ac9c9..0000000000 --- a/package/linphone/linphone.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9956f6785a787041328da000cee5fcc1e41d6f17956ffe5e0402fac0f9a9676b linphone-4.4.8.tar.gz -# Locally computed -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk deleted file mode 100644 index bb79e2f782..0000000000 --- a/package/linphone/linphone.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# linphone -# -################################################################################ - -LINPHONE_VERSION = 4.4.8 -LINPHONE_SITE = \ - https://gitlab.linphone.org/BC/public/liblinphone/-/archive/$(LINPHONE_VERSION) -LINPHONE_CONF_OPTS = \ - -DENABLE_ADVANCED_IM=OFF \ - -DENABLE_CXX_WRAPPER=OFF \ - -DENABLE_DB_STORAGE=OFF \ - -DENABLE_LIME=OFF \ - -DENABLE_LIME_X3DH=OFF \ - -DENABLE_STRICT=OFF \ - -DENABLE_TOOLS=OFF \ - -DENABLE_TUTORIALS=OFF \ - -DENABLE_UNIT_TESTS=OFF \ - -DENABLE_VCARD=OFF \ - -DENABLE_VIDEO=OFF \ - -DGIT_EXECUTABLE=OFF -LINPHONE_INSTALL_STAGING = YES -LINPHONE_DEPENDENCIES = \ - belle-sip \ - belr \ - libxml2 \ - mediastreamer \ - sqlite \ - $(if $(BR2_PACKAGE_ZLIB),zlib) -LINPHONE_LICENSE = GPL-3.0+ -LINPHONE_LICENSE_FILES = LICENSE.txt - -ifeq ($(BR2_STATIC_LIBS),y) -LINPHONE_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LINPHONE_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LINPHONE_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -endif - -$(eval $(cmake-package)) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4630252c5e..4a6eaa9428 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -17,6 +17,15 @@ config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP endmenu # Audio +menu "CPU Microcode" + +config BR2_PACKAGE_LINUX_FIRMWARE_AMD_UCODE + bool "amd-ucode" + help + Firmware blobs for AMD CPUs (amd-ucode). + +endmenu # CPU Microcode + menu "Video firmware" config BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU @@ -24,11 +33,27 @@ config BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU help Firmware files for AMD GPU video cards. +config BR2_PACKAGE_LINUX_FIRMWARE_CDNS_MHDP8546 + bool "Cadence MHDP8546" + help + Firmware file for the Cadence MHDP8546 DPI/DP bridge. + +config BR2_PACKAGE_LINUX_FIRMWARE_CNM_WAVE521C_K3_CODEC + bool "Chips&Media Wave 521C codec IP for K3" + help + Firmware files for the Chips&Media Wave521C decoder + needed by the Linux TI j721s2-wave521c driver. + config BR2_PACKAGE_LINUX_FIRMWARE_I915 bool "Intel i915 video card firmware" help Firmware files for the Intel i915 video cards. +config BR2_PACKAGE_LINUX_FIRMWARE_XE + bool "Intel Xe video card firmware" + help + Firmware files for the Intel Xe video cards. + config BR2_PACKAGE_LINUX_FIRMWARE_RADEON bool "AMD Radeon video card firmware" help @@ -61,8 +86,8 @@ config BR2_PACKAGE_LINUX_FIRMWARE_AMLOGIC config BR2_PACKAGE_LINUX_FIRMWARE_IBT bool "Intel Wireless Bluetooth" help - Firmware files for Intel 3160/7260/7265/8260/8265 Wireless - bluetooth support. + Firmware files for Intel 3160/7260/7265/8260/8265/9xxx/6E/7 + Wireless bluetooth support. config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650 bool "MediaTek MT7650" @@ -335,6 +360,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E Firmware files for the Intel Wi-Fi 6 and Wi-Fi 6E devices supported by the iwlwifi kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7 + bool "Intel iwlwifi 7" + help + Firmware files for the Intel Wi-Fi 7 (BE20x) devices + supported by the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_QUZ bool "Intel iwlwifi QuZ" help @@ -454,11 +485,28 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7925 help MediaTek MT7925 +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7986 + bool "MediaTek MT7986 SOC WiFi" + help + MediaTek MT7986 SOC WiFi + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174 bool "Qualcomm Atheros 6174" help Firmware files for the Qualcomm Atheros QCA6174 chip +config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_QCN9274 + bool "Qualcomm QCN9274" + help + Firmware files for the Qualcomm 802.11be QCN9274 chip + supported by the ath12k kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WCN7850 + bool "Qualcomm WCN7850" + help + Firmware files for the Qualcomm 802.11be WCN7850 chip + supported by the ath12k kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61 bool "Ralink rt2501/rt61" help @@ -570,6 +618,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5 Firmware files for Chelsio T5 1Gb and 10Gb ethernet cards (cxgb4) +config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T6 + bool "Chelsio T6" + help + Firmware files for Chelsio T6 1/10/25/40/50/100 Gb ethernet + cards (cxgb4) + config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100 bool "Intel e100 825xx" help @@ -709,6 +763,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF Firmware files for Arm Mali 10th generation GPU needed by the linux panthor kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_POWERVR_ROGUE + bool "PowerVR Technologies Rogue GPU firmware" + help + Firmware files for PowerVR Technologies Rogue video cards. + endmenu menu "Serial adapters firmware" @@ -721,4 +780,17 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RP2 endmenu +menu "NPU Firmware" + +config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_NPU + bool "Intel NPU firmware" + help + Firmware files for Intel NPU device. Intel NPU device is an + AI inference accelerator integrated with Intel client CPUs. + The full device name is Neural Processing Unit, but the + Linux kernel driver uses the older name Versatile Processing + Unit (VPU). + +endmenu + endif diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 97004505c6..f1fdca52a9 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,16 +1,23 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 943fbd19883cf8eadf89e0b22422549db056557b1ecd30a56400615971369671 linux-firmware-20240909.tar.xz +sha256 b6c9a9c112b88417d985b87d6521b677fa2fa0d5d7ee5219c76dc8ca66945ad3 linux-firmware-20251011.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis +sha256 27907ae1d74b94fd6f1159971158ed3199e472f129ea1ff748ea13aded2a59d5 LICENSE.amd-ucode sha256 572872598565dc3513470de971a32bf9db301f47afeef3636345eadae33b2eee LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt +sha256 097ceeb6f03dad7e74a2de0f217b1dad149989e550681e8726908ef477c9d58f ath12k/QCN9274/hw2.0/Notice.txt +sha256 515bf4c9d620a87458e4447fe01a0e9bc384d1c3e0037cc4c3d2037b1ff25525 ath12k/WCN7850/hw2.0/Notice.txt +sha256 bf1cb89140fe7e138fec229b26fa45d2fb46f416ab559916c6e56c0224df2e8e LICENCE.bnx2 +sha256 691f2b5e3e94e06aa89450c99ff08c83336c77fe4ad64a609b1cddea4bf98727 LICENCE.bnx2x sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 5b97965d9a820a747fa1ab6339290cea0e6ce86b001e6620c4de4c0df532ed2f LICENCE.cadence sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 88236d5ae45b7abc96c2ab4c6952af88758e24b17412dd173746ee1c559b3c6f LICENCE.cnm sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware @@ -23,12 +30,14 @@ sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENC sha256 a90d3f66704d85889945fec5525ea77622549da83aced1aac99828383f8f1805 LICENCE.mediatek sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip sha256 59ae206c89108905ebdc9ad4c9336526bd2c0d50fbf988c21e8c2a82719d42a4 LICENCE.moxa +sha256 1c9aa6bd6703a7ce1cdb879542fa1d8aca115a327bd819b193c971de9c53f402 LICENSE.powervr sha256 0bd9f7cae3cf72b12a63359a725ccbb76ddbd6831372695a9162144329800dd0 LICENCE.qat_firmware sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware sha256 a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e LICENCE.rtlwifi_firmware.txt sha256 190fdf103278cd69f489dc0d1d4da81d9a36af8b5baea336567fcb1df51a1973 LICENCE.ti-connectivity +sha256 a255d4a90c457bbc840a839d009fe57765ed85223965a2e4e5ecb83b348e5ec8 LICENCE.tigon sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000 sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000 sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c @@ -40,6 +49,8 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 d6a8d8b935d275e4092a0ec578eb430f9ef70bec34165d18bcabfa4a81f65724 WHENCE +sha256 fc3825c3807cf5028aa9c60a4f5936a8265e3e00fcbc85b5c016bdfc136e045f WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 +sha256 26b3c946f1f378ff25bb3bb7c365d108a2bc0bf08619e5e08bc0e4f9aaa6ee1e LICENSE.xe +sha256 4a10165191a9ab82daf1539cab4242ac266eeaa1ad1d158d5d9699546966c139 LICENSE.intel_vpu diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9ffd52dff5..6e58814279 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20240909 +LINUX_FIRMWARE_VERSION = 20251011 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES @@ -15,16 +15,31 @@ LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.fw_sst_0f28 endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AMD_UCODE),y) +LINUX_FIRMWARE_DIRS += amd-ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.amd-ucode +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU),y) LINUX_FIRMWARE_DIRS += amdgpu LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.amdgpu endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CNM_WAVE521C_K3_CODEC),y) +LINUX_FIRMWARE_FILES += cnm/wave521c_k3_codec_fw.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cnm +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_I915),y) LINUX_FIRMWARE_DIRS += i915 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.i915 endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_XE),y) +LINUX_FIRMWARE_DIRS += xe +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.xe +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RADEON),y) LINUX_FIRMWARE_DIRS += radeon LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.radeon @@ -247,14 +262,14 @@ LINUX_FIRMWARE_FILES += ath10k/QCA9377/hw1.0/board-2.bin \ ath10k/QCA9377/hw1.0/firmware-5.bin \ ath10k/QCA9377/hw1.0/firmware-6.bin \ ath10k/QCA9377/hw1.0/firmware-sdio-5.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X),y) LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \ ath10k/QCA988X/hw2.0/firmware-4.bin \ ath10k/QCA988X/hw2.0/firmware-5.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif # sd8686 v8 @@ -417,6 +432,23 @@ LINUX_FIRMWARE_FILES += mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek endif +# Mediatek MT7986 SoC WiFi +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7986),y) +LINUX_FIRMWARE_FILES += \ + mediatek/mt7986_eeprom_mt7975_dual.bin \ + mediatek/mt7986_eeprom_mt7976.bin \ + mediatek/mt7986_eeprom_mt7976_dbdc.bin \ + mediatek/mt7986_eeprom_mt7976_dual.bin \ + mediatek/mt7986_rom_patch.bin \ + mediatek/mt7986_rom_patch_mt7975.bin \ + mediatek/mt7986_wa.bin \ + mediatek/mt7986_wm.bin \ + mediatek/mt7986_wm_mt7975.bin \ + mediatek/mt7986_wo_0.bin \ + mediatek/mt7986_wo_1.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + # qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174 @@ -427,6 +459,25 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += \ ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WCN7850),y) +LINUX_FIRMWARE_FILES += \ + ath12k/WCN7850/hw2.0/board-2.bin \ + ath12k/WCN7850/hw2.0/amss.bin \ + ath12k/WCN7850/hw2.0/m3.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += \ + LICENSE.QualcommAtheros_ath10k \ + ath12k/WCN7850/hw2.0/Notice.txt +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_QCN9274),y) +LINUX_FIRMWARE_FILES += \ + ath12k/QCN9274/hw2.0/board-2.bin \ + ath12k/QCN9274/hw2.0/firmware-2.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += \ + LICENSE.QualcommAtheros_ath10k \ + ath12k/QCN9274/hw2.0/Notice.txt +endif + # CC2560(A) ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560),y) LINUX_FIRMWARE_FILES += \ @@ -500,62 +551,62 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100),y) -LINUX_FIRMWARE_FILES += iwlwifi-100-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-100-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105),y) -LINUX_FIRMWARE_FILES += iwlwifi-105-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-105-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135),y) -LINUX_FIRMWARE_FILES += iwlwifi-135-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-135-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000),y) -LINUX_FIRMWARE_FILES += iwlwifi-1000-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-1000-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000),y) -LINUX_FIRMWARE_FILES += iwlwifi-2000-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-2000-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030),y) -LINUX_FIRMWARE_FILES += iwlwifi-2030-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-2030-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) -LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-QuZ-*.ucode intel/iwlwifi/iwlwifi-Qu-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) -LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-cc-a0-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y) -LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-3160-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168),y) -LINUX_FIRMWARE_FILES += iwlwifi-3168-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-3168-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3945),y) -LINUX_FIRMWARE_FILES += iwlwifi-3945-2.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-3945-2.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965),y) -LINUX_FIRMWARE_FILES += iwlwifi-4965-2.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-4965-2.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif @@ -564,77 +615,79 @@ endif # different versions of the firmware API. For now, we only install the # most recent one. ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000),y) -LINUX_FIRMWARE_FILES += iwlwifi-5000-5.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-5000-5.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A),y) -LINUX_FIRMWARE_FILES += iwlwifi-6000g2a-6.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-6000g2a-6.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B),y) -LINUX_FIRMWARE_FILES += iwlwifi-6000g2b-6.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-6000g2b-6.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y) -LINUX_FIRMWARE_FILES += iwlwifi-7260-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-7260-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265),y) -LINUX_FIRMWARE_FILES += iwlwifi-7265-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-7265-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D),y) -LINUX_FIRMWARE_FILES += iwlwifi-7265D-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-7265D-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C),y) -LINUX_FIRMWARE_FILES += iwlwifi-8000C-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-8000C-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265),y) -LINUX_FIRMWARE_FILES += iwlwifi-8265-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-8265-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX),y) -LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode -LINUX_FIRMWARE_FILES += iwlwifi-so-a0-jf-b0*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-9???-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-so-a0-jf-b0*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E),y) -LINUX_FIRMWARE_FILES += iwlwifi-so-a0-gf-a0*.{ucode,pnvm} +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-{so,ty}-a0-gf-a0*.{ucode,pnvm} +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7),y) +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-gl-c0-fm-c0*.{ucode,pnvm} LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_QUZ),y) -LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode +LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-QuZ-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) LINUX_FIRMWARE_FILES += tigon/* -# No license file; the license is in the file WHENCE -# which is installed unconditionally +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.tigon endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2),y) LINUX_FIRMWARE_FILES += bnx2/* -# No license file; the license is in the file WHENCE -# which is installed unconditionally +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.bnx2 endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* -# No license file; the license is in the file WHENCE -# which is installed unconditionally +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.bnx2x endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4),y) @@ -647,6 +700,11 @@ LINUX_FIRMWARE_FILES += cxgb4/t5fw*.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T6),y) +LINUX_FIRMWARE_FILES += cxgb4/t6fw*.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100),y) LINUX_FIRMWARE_FILES += e100/*.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.e100 @@ -691,6 +749,7 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8107e-2.fw \ rtl_nic/rtl8125a-3.fw \ rtl_nic/rtl8125b-2.fw \ + rtl_nic/rtl8125d-1.fw \ rtl_nic/rtl8168d-1.fw \ rtl_nic/rtl8168d-2.fw \ rtl_nic/rtl8168e-1.fw \ @@ -871,17 +930,17 @@ LINUX_FIRMWARE_FILES += \ endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_DH895XCC),y) -LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin +LINUX_FIRMWARE_FILES += intel/qat/qat_895xcc.bin intel/qat/qat_895xcc_mmp.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_C3XXX),y) -LINUX_FIRMWARE_FILES += qat_c3xxx.bin qat_c3xxx_mmp.bin +LINUX_FIRMWARE_FILES += intel/qat/qat_c3xxx.bin intel/qat/qat_c3xxx_mmp.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X),y) -LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin +LINUX_FIRMWARE_FILES += intel/qat/qat_c62x.bin intel/qat/qat_c62x_mmp.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware endif @@ -895,6 +954,11 @@ LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.moxa endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CDNS_MHDP8546),y) +LINUX_FIRMWARE_FILES += cadence/mhdp8546.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.cadence +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CX231XX),y) LINUX_FIRMWARE_FILES += v4l-cx231xx-avcore-01.fw # No license file; the license is in the file WHENCE @@ -918,10 +982,20 @@ LINUX_FIRMWARE_FILES += arm/mali/arch*/mali_csffw.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mali_csffw endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_POWERVR_ROGUE),y) +LINUX_FIRMWARE_DIRS += powervr +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.powervr +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RP2),y) LINUX_FIRMWARE_FILES += rp2.fw endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_NPU),y) +LINUX_FIRMWARE_FILES += intel/vpu/vpu_*.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.intel_vpu +endif + ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) define LINUX_FIRMWARE_BUILD_CMDS diff --git a/package/linux-fusion/0001-fix-for-linux-4-and-above.patch b/package/linux-fusion/0001-fix-for-linux-4-and-above.patch deleted file mode 100644 index bc9e936510..0000000000 --- a/package/linux-fusion/0001-fix-for-linux-4-and-above.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build for linux >= 4.x - -Instead of relying on testing for '3' as the linux kernel major version, -check that it is 2.x to include the proper Makefile, otherwise forcibly -include the .26 Makefile, that is good for 3.x and 4.x too. - -Signed-off-by: "Yann E. MORIN" - -diff -durN linux-fusion-9.0.2.orig/Makefile linux-fusion-9.0.2/Makefile ---- linux-fusion-9.0.2.orig/Makefile 2013-07-15 11:58:03.000000000 +0200 -+++ linux-fusion-9.0.2/Makefile 2015-06-06 19:03:04.059842652 +0200 -@@ -62,10 +62,10 @@ - CPPFLAGS += -DHAVE_LINUX_CONFIG_H - endif - --ifeq ($(K_VERSION),3) -- KMAKEFILE = Makefile-2.6 --else -+ifeq ($(K_VERSION),2) - KMAKEFILE = Makefile-2.$(K_PATCHLEVEL) -+else -+ KMAKEFILE = Makefile-2.6 - endif - - check-version = $(shell expr \( $(K_VERSION) \* 65536 + $(K_PATCHLEVEL) \* 256 + $(K_SUBLEVEL) \) \>= \( $(1) \* 65536 + $(2) \* 256 + $(3) \)) diff --git a/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch b/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch deleted file mode 100644 index a3f8bb7812..0000000000 --- a/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch +++ /dev/null @@ -1,29 +0,0 @@ -From debb9cafe9b7cc2b286399ecc8e3210480061c70 Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Mon, 11 Jan 2016 15:42:16 +0100 -Subject: [PATCH] Fix mismatched conversion spec and value in printk - -linux/drivers/char/fusion/fusiondev.c:775:38: warning: -format '%ld' expects argument of type 'long int', but argument 7 has type 'int' - -Subtracting two pointers yields a ptrdiff_t value, and ptrdiff_t is not -necessarily an alias for long int. Cast the value to long int. - -Signed-off-by: Marc Gonzalez ---- - linux/drivers/char/fusion/fusiondev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c -index 7003407f7e1e..dfb5f8ecb81a 100644 ---- a/linux/drivers/char/fusion/fusiondev.c -+++ b/linux/drivers/char/fusion/fusiondev.c -@@ -775,7 +775,7 @@ call_ioctl(FusionDev * dev, Fusionee * fusionee, - printk( KERN_ERR "fusion: FUSION_CALL_EXECUTE3 with errorneous call (failed on previous ioctl call), " - "call id %d, flags 0x%08x, arg %d, length %u, serial %u, %ld\n", - execute3.call_id, execute3.flags, execute3.call_arg, execute3.length, execute3.ret_length, -- (execute3_bin - (FusionCallExecute3 *) arg) ); -+ (long int)(execute3_bin - (FusionCallExecute3 *) arg) ); - return -EIO; - } - diff --git a/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch b/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch deleted file mode 100644 index b14ec9d90a..0000000000 --- a/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9fcd5003c0363af140a06aba94e62c9e1ea0381e Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Mon, 11 Jan 2016 16:45:30 +0100 -Subject: [PATCH] Fix fusion: Unknown symbol tasklist_lock (err 0) - -Commit 28f6569ab7d0 renamed TREE_PREEMPT_RCU to PREEMPT_RCU in 3.19 -As a result, the code incorrectly falls back to using tasklist_lock -(which was made private in 2.6.18) - -Always use rcu_read_lock on modern kernels. - -Signed-off-by: Marc Gonzalez ---- - linux/drivers/char/fusion/fusionee.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linux/drivers/char/fusion/fusionee.c b/linux/drivers/char/fusion/fusionee.c -index ef067f5bc831..70cd0a665f98 100644 ---- a/linux/drivers/char/fusion/fusionee.c -+++ b/linux/drivers/char/fusion/fusionee.c -@@ -925,7 +925,7 @@ fusionee_kill(FusionDev * dev, - if (f != fusionee && (!target || target == f->id)) { - struct task_struct *p; - --#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_RCU) || defined(rcu_read_lock) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - rcu_read_lock(); - #else - read_lock(&tasklist_lock); -@@ -946,7 +946,7 @@ fusionee_kill(FusionDev * dev, - } - } - --#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_RCU) || defined(rcu_read_unlock) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - rcu_read_unlock(); - #else - read_unlock(&tasklist_lock); diff --git a/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch b/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch deleted file mode 100644 index 3ee4dac487..0000000000 --- a/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch +++ /dev/null @@ -1,118 +0,0 @@ -From be288b60278c78eccfd347aacf4d3dd8771215a9 Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Tue, 12 Jan 2016 14:01:42 +0100 -Subject: [PATCH] Port one/one_udp.c to Linux 4.1 - -Kernel commit c0371da6047a replaced msg_iov and msg_iovlen with msg_iter -in struct msghdr since 3.19 - -one/one_udp.c: In function 'ksocket_send_iov': -one/one_udp.c:186:9: error: 'struct msghdr' has no member named 'msg_iov' -one/one_udp.c:187:9: error: 'struct msghdr' has no member named 'msg_iovlen' - -one/one_udp.c: In function 'ksocket_receive': -one/one_udp.c:221:9: error: 'struct msghdr' has no member named 'msg_iov' -one/one_udp.c:222:9: error: 'struct msghdr' has no member named 'msg_iovlen' - -The iov_iter interface -https://lwn.net/Articles/625077/ - -Kernel commit d8725c86aeba dropped the len parameter in sock_sendmsg -since 4.1 - -one/one_udp.c: In function 'ksocket_send_iov': -one/one_udp.c:192:13: error: too many arguments to function 'sock_sendmsg' - -Signed-off-by: Marc Gonzalez - -Kernel commit 2da62906b1e29 dropped the size parameter in sock_recvmsg -since 4.7 - -In function 'ksocket_receive' -one/one_udp.c:235:13: error: too many arguments to function 'sock_recvmsg' - -Signed-off-by: Matthew Shyu ---- - one/one_udp.c | 34 +++++++++++++++++++--------------- - 1 file changed, 19 insertions(+), 15 deletions(-) - -diff --git a/one/one_udp.c b/one/one_udp.c -index 26b9e6a..9b59529 100644 ---- a/one/one_udp.c -+++ b/one/one_udp.c -@@ -161,7 +161,7 @@ ksocket_send_iov( struct socket *sock, - const struct iovec *iov, - size_t iov_count ) - { -- struct msghdr msg; -+ struct msghdr msg = { addr, sizeof *addr }; - mm_segment_t oldfs; - int size = 0; - size_t len = 0; -@@ -178,18 +178,20 @@ ksocket_send_iov( struct socket *sock, - for (i=0; i +Date: Fri, 30 Aug 2024 08:00:00 +0000 +Subject: [PATCH] build: consistently include config.h first + +Make sure that config.h is included before any system header. + +Upstream: https://github.com/linux-pam/linux-pam/commit/5d7eefb1883c557c7a027f68e966e2fae294a9b6 +Signed-off-by: Thomas Petazzoni +--- + libpam/pam_prelude.c | 8 ++++---- + modules/pam_namespace/argv_parse.c | 2 ++ + modules/pam_setquota/pam_setquota.c | 3 ++- + modules/pam_timestamp/sha1.c | 2 +- + modules/pam_unix/audit.c | 3 +-- + modules/pam_unix/bigcrypt_main.c | 2 ++ + modules/pam_unix/md5.c | 4 ++-- + modules/pam_unix/md5_crypt.c | 2 +- + modules/pam_unix/yppasswd.h | 2 ++ + 9 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/libpam/pam_prelude.c b/libpam/pam_prelude.c +index 6c73bf5d..c62e2f2c 100644 +--- a/libpam/pam_prelude.c ++++ b/libpam/pam_prelude.c +@@ -5,17 +5,17 @@ + * (C) Sebastien Tricaud 2005 + */ + +-#include +-#include +- + #ifdef PRELUDE + ++#include "pam_private.h" ++ ++#include ++#include + #include + #include + #include + + #include "pam_prelude.h" +-#include "pam_private.h" + + + #define ANALYZER_CLASS "pam" +diff --git a/modules/pam_namespace/argv_parse.c b/modules/pam_namespace/argv_parse.c +index ac7c9ae0..cbae7831 100644 +--- a/modules/pam_namespace/argv_parse.c ++++ b/modules/pam_namespace/argv_parse.c +@@ -28,6 +28,8 @@ + * Version 1.1, modified 2/27/1999 + */ + ++#include "config.h" ++ + #include + #include + #include +diff --git a/modules/pam_setquota/pam_setquota.c b/modules/pam_setquota/pam_setquota.c +index c15fc669..73445e29 100644 +--- a/modules/pam_setquota/pam_setquota.c ++++ b/modules/pam_setquota/pam_setquota.c +@@ -8,6 +8,8 @@ + Copyright © 2016 Keller Fuchs + */ + ++#include "pam_inline.h" ++ + #include + #include + #include +@@ -22,7 +24,6 @@ + #include + #include + #include +-#include "pam_inline.h" + + #ifndef PATH_LOGIN_DEFS + # define PATH_LOGIN_DEFS "/etc/login.defs" +diff --git a/modules/pam_timestamp/sha1.c b/modules/pam_timestamp/sha1.c +index dff454cf..f21b2870 100644 +--- a/modules/pam_timestamp/sha1.c ++++ b/modules/pam_timestamp/sha1.c +@@ -37,6 +37,7 @@ + */ + /* See http://www.itl.nist.gov/fipspubs/fip180-1.htm for descriptions. */ + ++#include "pam_inline.h" + #include + #include + #include +@@ -47,7 +48,6 @@ + #include + #include + #include "sha1.h" +-#include "pam_inline.h" + + static const unsigned char + padding[SHA1_BLOCK_SIZE] = { +diff --git a/modules/pam_unix/audit.c b/modules/pam_unix/audit.c +index 1547a652..9513aaa9 100644 +--- a/modules/pam_unix/audit.c ++++ b/modules/pam_unix/audit.c +@@ -1,5 +1,3 @@ +-#include "audit.h" +- + #include "config.h" + + #ifdef HAVE_LIBAUDIT +@@ -11,6 +9,7 @@ + + #include + ++#include "audit.h" + #include "passverify.h" + + int audit_log(int type, const char *uname, int retval) +diff --git a/modules/pam_unix/bigcrypt_main.c b/modules/pam_unix/bigcrypt_main.c +index fab212d9..22d325da 100644 +--- a/modules/pam_unix/bigcrypt_main.c ++++ b/modules/pam_unix/bigcrypt_main.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include + #include + +diff --git a/modules/pam_unix/md5.c b/modules/pam_unix/md5.c +index 95b8de4c..78e9af27 100644 +--- a/modules/pam_unix/md5.c ++++ b/modules/pam_unix/md5.c +@@ -18,11 +18,11 @@ + * + */ + ++#include "pam_inline.h" ++ + #include + #include "md5.h" + +-#include "pam_inline.h" +- + #ifndef HIGHFIRST + #define byteReverse(buf, len) /* Nothing */ + #else +diff --git a/modules/pam_unix/md5_crypt.c b/modules/pam_unix/md5_crypt.c +index 9a6bd4f9..9451f376 100644 +--- a/modules/pam_unix/md5_crypt.c ++++ b/modules/pam_unix/md5_crypt.c +@@ -12,11 +12,11 @@ + * + */ + ++#include "pam_inline.h" + #include + #include + #include + #include "md5.h" +-#include "pam_inline.h" + + static const unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +diff --git a/modules/pam_unix/yppasswd.h b/modules/pam_unix/yppasswd.h +index dc686cd7..3a40c3ea 100644 +--- a/modules/pam_unix/yppasswd.h ++++ b/modules/pam_unix/yppasswd.h +@@ -6,6 +6,8 @@ + #ifndef _YPPASSWD_H_RPCGEN + #define _YPPASSWD_H_RPCGEN + ++#include "config.h" ++ + #include + + +-- +2.47.1 + diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index df3030439e..d67318571a 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -180,8 +180,7 @@ define PERF_INSTALL_REMOVE_SCRIPTS endef LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ - /usr/libexec/perf-core/tests/pe-file.exe \ - /usr/libexec/perf-core/tests/pe-file.exe.debug + /usr/libexec/perf-core/tests/ endif define PERF_INSTALL_TARGET_CMDS diff --git a/package/linux-tools/linux-tool-rtla.mk.in b/package/linux-tools/linux-tool-rtla.mk.in index 449371ddfe..d9bdcc3016 100644 --- a/package/linux-tools/linux-tool-rtla.mk.in +++ b/package/linux-tools/linux-tool-rtla.mk.in @@ -9,6 +9,7 @@ LINUX_TOOLS += rtla RTLA_DEPENDENCIES = host-pkgconf libtracefs RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ CC=$(TARGET_CC) \ + LD=$(TARGET_LD) \ EXTRA_CFLAGS="-D_GNU_SOURCE" \ LDFLAGS="$(TARGET_LDFLAGS)" \ PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index 0bcc47af0a..db7e4fa1a3 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -26,6 +26,9 @@ SELFTESTS_MAKE_FLAGS = \ ARCH=$(SELFTESTS_ARCH) \ KHDR_DIR=$(LINUX_DIR)/usr/include +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ + /usr/lib/kselftests/tc-testing/ + # O must be redefined here to overwrite the one used by Buildroot for # out of tree build. We build the selftests in $(LINUX_DIR)/tools/selftests and # not just $(LINUX_DIR) so that it isn't built in the root directory of the kernel diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk index 5a04c9d277..49e73a9ca4 100644 --- a/package/linux-tools/linux-tools.mk +++ b/package/linux-tools/linux-tools.mk @@ -1,81 +1,78 @@ +################################################################################ +# +# linux-tools +# +################################################################################ + +# Vampirising sources from the kernel tree, so no source nor site specified. +# Instead, we directly build in the sources of the linux package. We can do +# that, because we're not building in the same location and the same files. +# +# So, all tools refer to $(LINUX_DIR) instead of $(@D). + +# Note: we need individual tools makefiles to be included *before* we build +# the list of build and install hooks below to guarantee that each tool has +# a chance to register itself once, and only once. Therefore, the makefiles # are named linux-tool-*.mk.in, so they won't be picked up by the top-level # Makefile, but can be included here, guaranteeing the single inclusion and # the proper ordering. include $(sort $(wildcard package/linux-tools/*.mk.in)) -# We only need the kernel to be extracted, not actually built -LINUX_TOOLS_PATCH_DEPENDENCIES = linux +# Prevent the kernel from being compiled in parallel with linux-tools. The +# kernel and some linux-tools (such as perf) use fixdep to manage kconfig +# dependencies. There is a race condition where the kernel and linux-tools try +# to build fixdep while the other tries to use fixdep, resulting in the use of +# fixdep failing. +LINUX_TOOLS_DEPENDENCIES = linux # Install Linux kernel tools in the staging directory since some tools # may install shared libraries and headers (e.g. cpupower). LINUX_TOOLS_INSTALL_STAGING = YES LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $($(call UPPERCASE,$(tool))_DEPENDENCIES))) + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_DEPENDENCIES))) LINUX_TOOLS_POST_BUILD_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(call UPPERCASE,$(tool))_BUILD_CMDS)) + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $(call UPPERCASE,$(tool))_BUILD_CMDS)) LINUX_TOOLS_POST_INSTALL_STAGING_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(call UPPERCASE,$(tool))_INSTALL_STAGING_CMDS)) + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $(call UPPERCASE,$(tool))_INSTALL_STAGING_CMDS)) LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) -# -# Fix up kernel config if needed -# define LINUX_TOOLS_LINUX_CONFIG_FIXUPS - $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS)) - ) + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS)) + ) endef -# -# Systemd, SysV, and OpenRC init installations -# define LINUX_TOOLS_INSTALL_INIT_SYSTEMD - $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSTEMD)) - ) + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSTEMD)) + ) endef define LINUX_TOOLS_INSTALL_INIT_SYSV - $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV)) - ) + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV)) + ) endef define LINUX_TOOLS_INSTALL_INIT_OPENRC - $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(or $($(call UPPERCASE,$(tool))_INSTALL_INIT_OPENRC),\ - $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV))) - ) + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $(or $($(call UPPERCASE,$(tool))_INSTALL_INIT_OPENRC),\ + $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV))) + ) endef -# -# ------------------------------------------------------------------- -# Remove the 'action-ebpf' test artifact that triggers an -# "architecture mismatch" error on x86_64. This file is built -# for "Linux BPF" instead of the host architecture, so Buildroot -# complains on the first build. -# ------------------------------------------------------------------- -# -define LINUX_TOOLS_REMOVE_BPF_TEST_ARTIFACT - # Only remove if it exists. This is safe even if the file - # doesn't get built or already got cleaned up. - rm -f $(TARGET_DIR)/usr/lib/kselftests/tc-testing/action-ebpf -endef - -LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += LINUX_TOOLS_REMOVE_BPF_TEST_ARTIFACT - $(eval $(generic-package)) diff --git a/package/linuxptp/Config.in b/package/linuxptp/Config.in index c88b7a0619..5f2f267bf1 100644 --- a/package/linuxptp/Config.in +++ b/package/linuxptp/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_LINUXPTP Linux kernel. Supporting legacy APIs and other platforms is not a goal. - http://linuxptp.sourceforge.net/ + https://linuxptp.nwtime.org/about/features/ comment "linuxptp needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/linuxptp/linuxptp.cfg b/package/linuxptp/linuxptp.cfg index f9d02e8d97..09a905ed9e 100644 --- a/package/linuxptp/linuxptp.cfg +++ b/package/linuxptp/linuxptp.cfg @@ -10,7 +10,7 @@ # or the linuxptp SysV init script. [global] -slaveOnly 1 +clientOnly 1 delay_mechanism Auto network_transport UDPv4 time_stamping hardware diff --git a/package/linuxptp/linuxptp.hash b/package/linuxptp/linuxptp.hash index 1d5c590ea7..06ba8eb12b 100644 --- a/package/linuxptp/linuxptp.hash +++ b/package/linuxptp/linuxptp.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 70e38e5d2764e0217443da6f14e8846fe401a472293ac138d8419c07a665447a linuxptp-4.2.tgz +sha256 61757bc0a58d789b8fcbdddf56c88a0230597184a70dcb2ac05b4c6b619f7d5c linuxptp-4.4.tgz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index eea41f0baf..a537eac4cc 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -4,9 +4,9 @@ # ################################################################################ -LINUXPTP_VERSION = 4.2 +LINUXPTP_VERSION = 4.4 LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz -LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp +LINUXPTP_SITE = https://downloads.nwtime.org/linuxptp LINUXPTP_LICENSE = GPL-2.0+ LINUXPTP_LICENSE_FILES = COPYING LINUXPTP_CPE_ID_VALID = YES diff --git a/package/lirc-tools/0003-Fix-default.so-plugin-not-loading.patch b/package/lirc-tools/0003-Fix-default.so-plugin-not-loading.patch new file mode 100644 index 0000000000..3b2d536055 --- /dev/null +++ b/package/lirc-tools/0003-Fix-default.so-plugin-not-loading.patch @@ -0,0 +1,39 @@ +From 515325a90a9007fa12737c93c5c47ffaf6fea983 Mon Sep 17 00:00:00 2001 +From: Milan Vit +Date: Fri, 24 May 2024 18:34:26 +0900 +Subject: [PATCH] Fix default.so plugin not loading + +Upstream: 5d9e0f17436a98aedd0da885bd0096e147e54423 +Signed-off-by: Thomas Petazzoni +--- + lib/drv_enum.c | 1 + + plugins/default.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/lib/drv_enum.c b/lib/drv_enum.c +index 5fd74d0c..45abaa19 100644 +--- a/lib/drv_enum.c ++++ b/lib/drv_enum.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/plugins/default.c b/plugins/default.c +index 79c942d6..37cba788 100644 +--- a/plugins/default.c ++++ b/plugins/default.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.50.1 + diff --git a/package/lite/0001-dfbspy-stat.patch b/package/lite/0001-dfbspy-stat.patch deleted file mode 100644 index 5ca73691ed..0000000000 --- a/package/lite/0001-dfbspy-stat.patch +++ /dev/null @@ -1,53 +0,0 @@ -From upstream git (git://git.directfb.org/git/directfb/libs/LiTE.git) - -From ffe0ce78327a63ddb1265328ea9b5b03acdca019 Mon Sep 17 00:00:00 2001 -From: Denis Oliver Kropp -Date: Fri, 1 Apr 2011 20:20:26 +0200 -Subject: [PATCH] dfbspy: Build fix for dfbspy example. - ---- - examples/dfbspy.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/examples/dfbspy.c b/examples/dfbspy.c -index 5f36f0b..c7f9725 100644 ---- a/examples/dfbspy.c -+++ b/examples/dfbspy.c -@@ -89,9 +89,9 @@ read_stat( FusionStat *stat, int world ) - - /**************************************************************************************************/ - --#define CALC(x) stat.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) -+#define CALC(x) stats.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) - --static FusionStat last_stat, stat; -+static FusionStat last_stat, stats; - static long long last_millis; - - static int -@@ -145,14 +145,14 @@ static const struct { - void (*update)( LiteLabel *label, void *ctx ); - void *ctx; - } list[] = { -- { "lease/purchase", update_number, &stat.lease_purchase }, -- { "cede", update_number, &stat.cede }, -- { "attach", update_number, &stat.attach }, -- { "detach", update_number, &stat.detach }, -- { "ref up", update_number, &stat.ref_up }, -- { "ref down", update_number, &stat.ref_down }, -- { "prevail/swoop", update_number, &stat.prevail_swoop }, -- { "dismiss", update_number, &stat.dismiss } -+ { "lease/purchase", update_number, &stats.lease_purchase }, -+ { "cede", update_number, &stats.cede }, -+ { "attach", update_number, &stats.attach }, -+ { "detach", update_number, &stats.detach }, -+ { "ref up", update_number, &stats.ref_up }, -+ { "ref down", update_number, &stats.ref_down }, -+ { "prevail/swoop", update_number, &stats.prevail_swoop }, -+ { "dismiss", update_number, &stats.dismiss } - }; - - #define NUM_LIST (sizeof(list)/sizeof(list[0])) --- -1.7.6.3 - diff --git a/package/lite/0002-no-tests.patch b/package/lite/0002-no-tests.patch deleted file mode 100644 index 3a47186512..0000000000 --- a/package/lite/0002-no-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2008-07-07 13:07:12.000000000 +0200 -+++ b/Makefile.in 2008-07-07 13:07:05.000000000 +0200 -@@ -202,7 +202,7 @@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = data fonts lite leck examples tests -+SUBDIRS = data fonts lite leck examples - EXTRA_DIST = TODO lite.pc.in leck.pc.in - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = lite.pc leck.pc diff --git a/package/lite/0003-pkg-config.patch b/package/lite/0003-pkg-config.patch deleted file mode 100644 index cdd24162c7..0000000000 --- a/package/lite/0003-pkg-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7982cccbb6ad58f3802bb266467290200d130a48 Mon Sep 17 00:00:00 2001 -From: Ville Syrjala -Date: Sat, 27 Nov 2010 01:14:25 +0200 -Subject: [PATCH] Too many '\' characters in the .pc file - ---- - lite.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lite.pc.in b/lite.pc.in -index 48eb969..3a21eaa 100644 ---- a/lite.pc.in -+++ b/lite.pc.in -@@ -9,4 +9,4 @@ Description: "LiTE" is a Toolkit Engine - Requires: directfb >= @DFB_REQUIRED_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} -llite --Cflags: -I${includedir} -DLITEFONTDIR=\\\"@LITEFONTDIR@\\\" -+Cflags: -I${includedir} -DLITEFONTDIR=\"@LITEFONTDIR@\" --- -1.7.1 - diff --git a/package/lite/Config.in b/package/lite/Config.in deleted file mode 100644 index 62cd21e53d..0000000000 --- a/package/lite/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LITE - bool "LiTE (toolbox engine)" - depends on BR2_PACKAGE_DIRECTFB - help - LiTE stands for LiTE is a Toolbox Engine. - Its role is to facilitate the functions of DirectFB so that a - toolbox could be written on top of DirectFB with less effort. - As such LiTE has abstractions for the underlying graphics and - event systems. - - See http://www.directfb.org/wiki/index.php/LiTE:Architecture diff --git a/package/lite/lite.hash b/package/lite/lite.hash deleted file mode 100644 index 13a494b714..0000000000 --- a/package/lite/lite.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 1b784cf595c3d5313e3705db210119f77d48826dbc7fcf6328af83a1270c2264 LiTE-0.8.10.tar.gz -sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING diff --git a/package/lite/lite.mk b/package/lite/lite.mk deleted file mode 100644 index ddb55d46be..0000000000 --- a/package/lite/lite.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# lite -# -################################################################################ - -LITE_VERSION = 0.8.10 -LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz -LITE_SITE = http://www.directfb.org/downloads/Libs -LITE_INSTALL_STAGING = YES -LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb -LITE_DEPENDENCIES = directfb -LITE_LICENSE = LGPL-2.1+ -LITE_LICENSE_FILES = COPYING - -define LITE_FINALIZE_INSTALL - $(INSTALL) -d $(TARGET_DIR)/usr/share/LiTE/examples/ - $(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/truetype/ - $(INSTALL) -m0644 $(@D)/data/*.png $(TARGET_DIR)/usr/share/LiTE/ - $(INSTALL) -m0644 $(@D)/examples/*.png $(TARGET_DIR)/usr/share/LiTE/examples/ - $(INSTALL) -m0644 $(@D)/fonts/*.ttf $(TARGET_DIR)/usr/share/fonts/truetype/ -endef - -LITE_POST_INSTALL_TARGET_HOOKS += LITE_FINALIZE_INSTALL - -$(eval $(autotools-package)) diff --git a/package/live555/live555.hash b/package/live555/live555.hash index d4fa93d029..f0a56bda32 100644 --- a/package/live555/live555.hash +++ b/package/live555/live555.hash @@ -1,5 +1,5 @@ -# From http://www.live555.com/liveMedia/public/live555-latest-md5.txt -md5 3c1992b0e9b871bcad7491a3da541781 live.2021.05.03.tar.gz +# From http://www.live555.com/liveMedia/public/live555-latest-sha1.txt +sha1 483146b15c5fdb973b88fc318f2772f022253563 live.2025.10.13.tar.gz # Locally generated -sha256 ae73241f9cc4ab740d60737c0438d62a7635af3822de5d84acf275793de42029 live.2021.05.03.tar.gz +sha256 44eb6ae4ae02ef68a5028d9fc8b70c45b9ba45c058f846b68bc4d32c74355f49 live.2025.10.13.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/package/live555/live555.mk b/package/live555/live555.mk index 56ed705783..6d12d1c17c 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -4,9 +4,10 @@ # ################################################################################ -LIVE555_VERSION = 2021.05.03 +LIVE555_VERSION = 2025.10.13 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz -LIVE555_SITE = http://www.live555.com/liveMedia/public +# upstream site removes older versions, use videolan.org instead +LIVE555_SITE = https://download.videolan.org/contrib/live555 # There is a COPYING file with the GPL-3.0 license text, but none of # the source files appear to be released under GPL-3.0, and the # project web site says it's licensed under the LGPL: @@ -28,6 +29,13 @@ LIVE555_LIBRARY_LINK = $(TARGET_CC) -o LIVE555_CFLAGS += -fPIC endif +# "struct std::atomic_flag" has no member named "test" +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_11),y) +LIVE555_CFLAGS += -std=c++20 +else +LIVE555_CFLAGS += -DNO_STD_LIB=1 +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIVE555_DEPENDENCIES += host-pkgconf openssl LIVE555_CONSOLE_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl` diff --git a/package/llama-cpp/Config.in b/package/llama-cpp/Config.in new file mode 100644 index 0000000000..c3eaa2a4ea --- /dev/null +++ b/package/llama-cpp/Config.in @@ -0,0 +1,51 @@ +config BR2_PACKAGE_LLAMA_CPP_ARCH_SUPPORTS + bool + default y + depends on !BR2_s390x_z13 # ggml requires z14 or higher + +config BR2_PACKAGE_LLAMA_CPP + bool "llama.cpp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_LLAMA_CPP_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + # llama.cpp needs libexecinfo when built with uclibc, + # and libexecinfo needs dynamic libraries. + depends on !BR2_TOOLCHAIN_USES_UCLIBC \ + || (BR2_TOOLCHAIN_USES_UCLIBC && !BR2_STATIC_LIBS) + depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBEXECINFO if BR2_TOOLCHAIN_USES_UCLIBC + help + LLM inference in C/C++ + + https://github.com/ggml-org/llama.cpp + +if BR2_PACKAGE_LLAMA_CPP + +config BR2_PACKAGE_LLAMA_CPP_TOOLS + bool "Enable tools" + help + Build CLI tools like llama-cli, llama-bench, etc. + +config BR2_PACKAGE_LLAMA_CPP_SERVER + bool "Enable server" + help + Build OpenAI API-compatible web server, llama-server. + +config BR2_PACKAGE_LLAMA_CPP_VULKAN + bool "Vulkan support" + depends on !BR2_ARM_CPU_ARMV5 + depends on !BR2_STATIC_LIBS # vulkan-loader + select BR2_PACKAGE_VULKAN_LOADER + help + Enable Vulkan backend for GPU acceleration. + +endif + +comment "llama-cpp needs a toolchain w/ C++, wchar, threads, and gcc >= 9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + +comment "llama-cpp needs a uclibc toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_USES_UCLIBC && BR2_STATIC_LIBS diff --git a/package/llama-cpp/llama-cpp.hash b/package/llama-cpp/llama-cpp.hash new file mode 100644 index 0000000000..81ddf4508f --- /dev/null +++ b/package/llama-cpp/llama-cpp.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 c108fadd61d34da6ff2cfdf085821ff03a45acde2245d9eeeba9358482b305c3 b6865.tar.gz +# License +sha256 e562a2ddfaf8280537795ac5ecd34e3012b6582a147ef69ba6a6a5c08c84757d LICENSE diff --git a/package/llama-cpp/llama-cpp.mk b/package/llama-cpp/llama-cpp.mk new file mode 100644 index 0000000000..7554d80a1e --- /dev/null +++ b/package/llama-cpp/llama-cpp.mk @@ -0,0 +1,70 @@ +################################################################################ +# +# llama.cpp +# +################################################################################ + +LLAMA_CPP_VERSION = b6865 +LLAMA_CPP_SOURCE = $(LLAMA_CPP_VERSION).tar.gz +LLAMA_CPP_SITE = https://github.com/ggml-org/llama.cpp/archive/refs/tags +LLAMA_CPP_LICENSE = MIT +LLAMA_CPP_LICENSE_FILES = LICENSE +LLAMA_CPP_CPE_ID_VENDOR = ggml +LLAMA_CPP_CPE_ID_PRODUCT = llama.cpp +LLAMA_CPP_INSTALL_STAGING = YES +LLAMA_CPP_CONF_OPTS = \ + -DLLAMA_BUILD_TESTS=OFF \ + -DLLAMA_BUILD_EXAMPLES=OFF \ + -DLLAMA_FATAL_WARNINGS=OFF + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LLAMA_CPP_DEPENDENCIES += libexecinfo +LLAMA_CPP_LDFLAGS += -lexecinfo +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LLAMA_CPP_LDFLAGS += -latomic +endif + +LLAMA_CPP_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(LLAMA_CPP_LDFLAGS)" + +ifeq ($(BR2_STATIC_LIBS),y) +LLAMA_CPP_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LLAMA_CPP_CONF_OPTS += -DLLAMA_CURL=ON +LLAMA_CPP_DEPENDENCIES += libcurl +else +LLAMA_CPP_CONF_OPTS += -DLLAMA_CURL=OFF +endif + +ifeq ($(BR2_PACKAGE_LLAMA_CPP_TOOLS),y) +LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_TOOLS=ON +else +LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_TOOLS=OFF +endif + +ifeq ($(BR2_PACKAGE_LLAMA_CPP_SERVER),y) +LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_SERVER=ON +else +LLAMA_CPP_CONF_OPTS += -DLLAMA_BUILD_SERVER=OFF +endif + +ifeq ($(BR2_PACKAGE_LLAMA_CPP_VULKAN),y) +LLAMA_CPP_DEPENDENCIES += vulkan-loader +LLAMA_CPP_CONF_OPTS += -DGGML_VULKAN=ON +else +LLAMA_CPP_CONF_OPTS += -DGGML_VULKAN=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENBLAS),y) +LLAMA_CPP_DEPENDENCIES += openblas +LLAMA_CPP_CONF_OPTS += -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS +else +LLAMA_CPP_CONF_OPTS += -DGGML_BLAS=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash index 127480095e..f3cefe7b73 100644 --- a/package/lldpd/lldpd.hash +++ b/package/lldpd/lldpd.hash @@ -1,6 +1,6 @@ # Locally computed after checking gpg key -# https://media.luffy.cx/files/lldpd/lldpd-1.0.18.tar.gz.gpg +# https://media.luffy.cx/files/lldpd/lldpd-1.0.20.tar.gz.gpg # using key AEF2348766F371C689A7360095A42FE8353525F9 -# gpg --verify lldpd-1.0.18.tar.gz.gpg lldpd-1.0.18.tar.gz -sha256 4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7 lldpd-1.0.18.tar.gz +# gpg --verify lldpd-1.0.20.tar.gz.gpg lldpd-1.0.20.tar.gz +sha256 61b8cb22d4879e68f7825a2fb8e1e92abb4aba4773977cf0258bc32ed9f55450 lldpd-1.0.20.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index 1b2cef9865..a3015e9e7d 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLDPD_VERSION = 1.0.18 +LLDPD_VERSION = 1.0.20 LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ diff --git a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch deleted file mode 100644 index ffdd5d187f..0000000000 --- a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 5 Aug 2019 16:06:48 +0200 -Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set - of prefixes for searching the gcc toolchain - -By default, the Gnu Toolchains driver is looking at the parent -directory while looking for the gcc toolchain when clang is installed -at "D.InstalledDir" - -But this doesn't work with Buildroot since the external -toolchain is installed in host/opt/ext-toolchain and the sysroot is -moved to host/-buildroot-linux-gnu/sysroot/ directory. - -We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang -but it doesn't work since we already provide a sysroot [1]. - -Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. - -Since we want to be able to relocate the clang toolchain, -allow to use a relative path with GCC_INSTALL_PREFIX. - -Buildroot will provide such relative path by using: -HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` - -Doing so allow to use clang without providing additional search -paths with -B option on the clang's command line. - -[1] https://reviews.llvm.org/D49244 -[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html - -Signed-off-by: Romain Naour -Signed-off-by: Matthew Weber ---- -Pending, access to llvm mailing lists to submit it is pending. They -seem to be having issues with their listserv. ---- - lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index 2ad45097dc..90d6b5b748 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( - - Prefixes.push_back(std::string(GCCToolchainDir)); - } else { -+ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; -+ - // If we have a SysRoot, try that first. - if (!D.SysRoot.empty()) { - Prefixes.push_back(D.SysRoot); -@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( - // Then look for gcc installed alongside clang. - Prefixes.push_back(D.InstalledDir + "/.."); - -+ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. -+ if (!GccIinstallPrefix.empty()) -+ { -+ if (llvm::sys::path::is_relative(GccIinstallPrefix)) -+ { -+ // Use a relative path to gcc from clang install path. -+ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); -+ } -+ else -+ { -+ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. -+ Prefixes.push_back(GCC_INSTALL_PREFIX); -+ } -+ } -+ - // Next, look for prefix(es) that correspond to distribution-supplied gcc - // installations. - if (D.SysRoot.empty()) { --- -2.20.1 - diff --git a/package/llvm-project/clang/Config.in b/package/llvm-project/clang/Config.in index 2e23888720..4eda9391dd 100644 --- a/package/llvm-project/clang/Config.in +++ b/package/llvm-project/clang/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_CLANG depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring depends on BR2_HOST_GCC_AT_LEAST_7 + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 select BR2_PACKAGE_LLVM help Clang is a C/C++, Objective C/C++ and OpenCL C front-end diff --git a/package/llvm-project/clang/clang.hash b/package/llvm-project/clang/clang.hash index 52c755cfb3..5ac73a252c 100644 --- a/package/llvm-project/clang/clang.hash +++ b/package/llvm-project/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 96036052694e703d159c995bda203b59d1ff185c6879189b9eba837726e1738c clang-15.0.3.src.tar.xz +sha256 348ace5d715c4caa6fb89b4c6fe07c21650e10b2fac37d8b0db75c0b11be9011 clang-21.1.6.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 0bafd6461b..2f17a04efc 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -14,9 +14,12 @@ CLANG_CPE_ID_VENDOR = llvm CLANG_SUPPORTS_IN_SOURCE_BUILD = NO CLANG_INSTALL_STAGING = YES -HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 +HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 host-python3 CLANG_DEPENDENCIES = llvm host-clang +# since we have LLVM_ENABLE_LIBXML2=OFF, set CLANG_ENABLE_LIBXML2=OFF +CLANG_CONF_OPTS += -DCLANG_ENABLE_LIBXML2=OFF + # This option is needed, otherwise multiple shared libs # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will # be generated. As a final shared lib containing all these components @@ -45,12 +48,14 @@ CLANG_CONF_OPTS += -DCLANG_BUILD_TOOLS=ON HOST_CLANG_CONF_OPTS += \ -DCLANG_BUILD_EXAMPLES=OFF \ -DCLANG_INCLUDE_DOCS=OFF \ - -DCLANG_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF CLANG_CONF_OPTS += \ -DCLANG_BUILD_EXAMPLES=OFF \ -DCLANG_INCLUDE_DOCS=OFF \ - -DCLANG_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_DEFAULT_LINKER=$(TARGET_LD) @@ -59,6 +64,12 @@ CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen +HOST_CLANG_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm +CLANG_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm + +HOST_CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION) +CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION) + # Clang can't be used as compiler on the target since there are no # development files (headers) and other build tools. So remove clang # binaries and some other unnecessary files from target. @@ -102,7 +113,14 @@ CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all # installation directory to the external toolchain installation directory in order to # not hardcode the toolchain absolute path. ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` +define HOST_CLANG_INSTALL_CONFIG_FILE + mkdir -p $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR) + echo "--gcc-install-dir=$$($(TARGET_CC) -print-search-dirs | awk -F ': ' '$$1=="install" {print $$2}')" > $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg + echo "--target=$(GNU_TARGET_NAME)" >> $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg +endef + +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_INSTALL_CONFIG_FILE +HOST_CLANG_TOOLCHAIN_WRAPPER_ARGS += -DBR_CLANG_CONFIG_FILE="\"--config=$(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/$(GNU_TARGET_NAME).cfg\"" endif define HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS diff --git a/package/llvm-project/compiler-rt/0001-include-cstdint.patch b/package/llvm-project/compiler-rt/0001-include-cstdint.patch new file mode 100644 index 0000000000..ce75b29f4e --- /dev/null +++ b/package/llvm-project/compiler-rt/0001-include-cstdint.patch @@ -0,0 +1,31 @@ +From 735207ac16bb15d88116bf00283eb0135ed2585a Mon Sep 17 00:00:00 2001 +From: Paul Zander +Date: Thu, 22 Aug 2024 11:40:13 +0200 +Subject: [PATCH] include cstdint +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Gentoo-Component: compiler-rt +Signed-off-by: Paul Zander +Signed-off-by: Michał Górny +Signed-off-by: James Hilliard +Upstream: https://bugs.gentoo.org/939498 +--- + lib/orc/error.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/orc/error.h b/lib/orc/error.h +index 92ac5a884ac6..33a599f71149 100644 +--- a/lib/orc/error.h ++++ b/lib/orc/error.h +@@ -14,6 +14,7 @@ + #include "stl_extras.h" + + #include ++#include + #include + #include + #include +-- +2.46.0 diff --git a/package/llvm-project/compiler-rt/0002-compiler-rt-Use-LLVM_THIRD_PARTY_DIR-for-siphash-inc.patch b/package/llvm-project/compiler-rt/0002-compiler-rt-Use-LLVM_THIRD_PARTY_DIR-for-siphash-inc.patch new file mode 100644 index 0000000000..2aa2d2c583 --- /dev/null +++ b/package/llvm-project/compiler-rt/0002-compiler-rt-Use-LLVM_THIRD_PARTY_DIR-for-siphash-inc.patch @@ -0,0 +1,32 @@ +From 8fb17d03f8f7cec84dc8d6baebd479c4c34ba74b Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 2 Nov 2025 21:18:24 +0100 +Subject: [PATCH] compiler-rt: Use LLVM_THIRD_PARTY_DIR for siphash include + +Introduced by https://github.com/llvm/llvm-project/commit/7f3afab9181d83f92771293ad3b6c00ac62800fd +but currently unused in compiler-rt leading to build errors with +COMPILER_RT_STANDALONE_BUILD=ON + +Upstream: https://github.com/llvm/llvm-project/pull/166097 + +Signed-off-by: Bernd Kuhls +--- + lib/builtins/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 6c226aa7d2d4..7eb5ef487d31 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -64,7 +64,7 @@ include(CMakePushCheckState) + option(COMPILER_RT_BUILTINS_HIDE_SYMBOLS + "Do not export any symbols from the static library." ON) + +-include_directories(../../../third-party/siphash/include) ++include_directories(${LLVM_THIRD_PARTY_DIR}/siphash/include) + + # TODO: Need to add a mechanism for logging errors when builtin source files are + # added to a sub-directory and not this CMakeLists file. +-- +2.47.3 + diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in index 10f5d796b3..b665165516 100644 --- a/package/llvm-project/compiler-rt/Config.in +++ b/package/llvm-project/compiler-rt/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_COMPILER_RT depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang select BR2_PACKAGE_LIBXCRYPT + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help A collection of runtime libraries primarily used by clang and llvm to provide builtins, sanitizer runtimes, and profiling diff --git a/package/llvm-project/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash index fe4e98164b..b9ec906595 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.hash +++ b/package/llvm-project/compiler-rt/compiler-rt.hash @@ -1,3 +1,4 @@ # Locally computed: -sha256 db958eee92d1571d8b7f76c1be8513817f1a888dcf6ced88aca871acfb0eeddd compiler-rt-15.0.3.src.tar.xz +sha256 bdd904f3aac9f4c4424f3440aff498cc04d66f243e37156b6d167ffb7b599f89 compiler-rt-21.1.6.src.tar.xz +sha256 8d09dc219cdb3da7dafd2161836aacdd6e02c1a113498ab5f37688599406dc8a third-party-21.1.6.src.tar.xz sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index d4bc4d305b..2571114253 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -16,11 +16,22 @@ 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_EXTRA_DOWNLOADS = third-party-$(COMPILER_RT_VERSION).src.tar.xz + +define COMPILER_RT_THIRD_PARTY_EXTRACT + $(call suitable-extractor,$(notdir $(COMPILER_RT_EXTRA_DOWNLOADS))) \ + $(COMPILER_RT_DL_DIR)/$(notdir $(COMPILER_RT_EXTRA_DOWNLOADS)) | \ + $(TAR) -C $(@D) $(TAR_OPTIONS) - +endef +COMPILER_RT_POST_EXTRACT_HOOKS += COMPILER_RT_THIRD_PARTY_EXTRACT + +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 \ - -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm + -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm \ + -DLLVM_THIRD_PARTY_DIR=$(@D)/third-party-$(COMPILER_RT_VERSION).src \ + -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm # The installation of the target runtime libraries defaults to DESTDIR, however # host-clang resources directory needs a link so Clang can find the runtime @@ -29,9 +40,9 @@ COMPILER_RT_CONF_OPTS=-DCOMPILER_RT_STANDALONE_BUILD=OFF \ # assumed, as compiler-rt is usually build at the same time as Clang and not # standalone. define COMPILER_RT_SETUP_RUNTIME_LIBS - mkdir -p $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib - ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/lib/linux $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib/linux - ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/share $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/share + mkdir -p $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/lib + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/lib/linux $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/lib/linux + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/share $(HOST_DIR)/lib/clang/$(CLANG_VERSION_MAJOR)/share endef COMPILER_RT_POST_INSTALL_STAGING_HOOKS += COMPILER_RT_SETUP_RUNTIME_LIBS diff --git a/package/llvm-project/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch index de7207bedb..d2cde4de0a 100644 --- a/package/llvm-project/libclc/0001-support-out-of-tree-build.patch +++ b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch @@ -1,71 +1,32 @@ -From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Tue, 9 Mar 2021 15:55:17 -0600 +From a435f3c9318935ba29b04dabe7342cd6160711e0 Mon Sep 17 00:00:00 2001 +From: El Mehdi YOUNES +Date: Thu, 15 May 2025 10:02:12 +0200 Subject: [PATCH] support out of tree build -(1) The package has a prepare_builtins tool which is built +prepare_builtins tool is built but not placed in the path for later use in the build. This fix allows the later build steps to use the binary in-place. -(2) With cmake, find_file() when used for non-host builds is -limited by CMAKE_FIND_ROOT_PATH* scope. +Upstream: Not submitted -In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the -following target settings for CMAKE_FIND_ROOT_PATH* which -limit the scope. -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - -Signed-off-by: Matthew Weber +Signed-off-by: El Mehdi YOUNES --- - CMakeLists.txt | 2 +- - cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ - cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ - 3 files changed, 9 insertions(+), 1 deletion(-) + libclc/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9472f19..a784519 100644 +index d651a9bf506b..18bd7efe8217 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) - - # Add prepare target - add_custom_command( OUTPUT "${obj_suffix}" -- COMMAND prepare_builtins -o -+ COMMAND ./prepare_builtins -o - "${obj_suffix}" - "builtins.opt.${obj_suffix}" - DEPENDS "opt.${obj_suffix}" -diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake -index 94d85d9..5de6a48 100644 ---- a/cmake/CMakeDetermineCLCCompiler.cmake -+++ b/cmake/CMakeDetermineCLCCompiler.cmake -@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) - - set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") - set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") --find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) -+set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) - # configure all variables set in this file - configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) - mark_as_advanced(clc_comp_in) -diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake -index 1c424c7..dd3bfb6 100644 ---- a/cmake/CMakeDetermineLLAsmCompiler.cmake -+++ b/cmake/CMakeDetermineLLAsmCompiler.cmake -@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) - set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") - set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") - set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") --find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) -+set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) - # configure all variables set in this file - configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) - mark_as_advanced(ll_comp_in) +@@ -180,7 +180,7 @@ set(LLVM_LINK_COMPONENTS + ) + if( LIBCLC_STANDALONE_BUILD ) + add_llvm_executable( prepare_builtins utils/prepare-builtins.cpp ) +- set( prepare_builtins_exe prepare_builtins ) ++ set( prepare_builtins_exe ./prepare_builtins ) + set( prepare_builtins_target prepare_builtins ) + else() + add_llvm_utility( prepare_builtins utils/prepare-builtins.cpp ) -- -2.17.1 +2.43.0 diff --git a/package/llvm-project/libclc/Config.in b/package/llvm-project/libclc/Config.in index 85eb888578..6b92357e0f 100644 --- a/package/llvm-project/libclc/Config.in +++ b/package/llvm-project/libclc/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBCLC bool "libclc" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help libclc is an open source, BSD licensed implementation of the library requirements of the OpenCL C programming language, diff --git a/package/llvm-project/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash index 7140884f6c..92b51fc1fa 100644 --- a/package/llvm-project/libclc/libclc.hash +++ b/package/llvm-project/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 07e8a2b31e07a8cc8a976a6bfd87797d2543d5a9530f449755bf5119acbdbe8e libclc-15.0.3.src.tar.xz +sha256 a1a09ccfa17f2d5fbe5e54271a4a9fbe396950f29f80f52b67a7083fee73120c libclc-21.1.6.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk index 9f303d6d2f..399878bf0b 100644 --- a/package/llvm-project/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -11,6 +11,7 @@ LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator +HOST_LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator LIBCLC_INSTALL_STAGING = YES # CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes @@ -26,8 +27,6 @@ LIBCLC_CONF_OPTS = \ -DCMAKE_SYSROOT="" \ -DCMAKE_C_COMPILER_FORCED=ON \ -DCMAKE_CXX_COMPILER_FORCED=ON \ - -DCMAKE_CLC_COMPILER_FORCED=ON \ - -DCMAKE_LLAsm_COMPILER_FORCED=ON \ -DCMAKE_INSTALL_DATADIR="share" \ -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ @@ -37,6 +36,11 @@ LIBCLC_CONF_OPTS = \ -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ - -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" + -DLLVM_CMAKE_DIR="$(HOST_DIR)/lib/cmake/llvm" \ + -DLIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR="$(HOST_DIR)/bin" + +HOST_LIBCLC_CONF_OPTS = \ + -DLIBCLC_TARGETS_TO_BUILD=spirv64-mesa3d- $(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/llvm-project/lld/Config.in.host b/package/llvm-project/lld/Config.in.host index 3bed364a79..63f9f68558 100644 --- a/package/llvm-project/lld/Config.in.host +++ b/package/llvm-project/lld/Config.in.host @@ -2,6 +2,7 @@ config BR2_PACKAGE_HOST_LLD bool "host lld" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help LLD is a linker from the LLVM project that is a drop-in replacement for system linkers, and runs much faster than diff --git a/package/llvm-project/lld/lld.hash b/package/llvm-project/lld/lld.hash index 2d2598dbeb..b05f1e30f9 100644 --- a/package/llvm-project/lld/lld.hash +++ b/package/llvm-project/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 cd5d0894a74b957ce78d62212c1df0b3876a7297593aaece6b0512285e3b8732 lld-15.0.3.src.tar.xz +sha256 5b297faecdddc9581c260a1570b4c0ec8810d1213e23d7aa84732c0e2feea85f lld-21.1.6.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/llvm-project/lld/lld.mk b/package/llvm-project/lld/lld.mk index 539dd0bd71..e7233e74ae 100644 --- a/package/llvm-project/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -15,11 +15,13 @@ HOST_LLD_DEPENDENCIES = host-llvm host-llvm-libunwind # build as static libs as is done in llvm & clang HOST_LLD_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF +HOST_LLD_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm + # GCC looks for tools in a different path from LLD's default installation path define HOST_LLD_CREATE_SYMLINKS mkdir -p $(HOST_DIR)/$(GNU_TARGET_NAME)/bin - ln -sf $(HOST_DIR)/bin/lld $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/lld - ln -sf $(HOST_DIR)/bin/lld $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/ld.lld + ln -sfr $(HOST_DIR)/bin/lld $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/lld + ln -sfr $(HOST_DIR)/bin/lld $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/ld.lld endef HOST_LLD_POST_INSTALL_HOOKS += HOST_LLD_CREATE_SYMLINKS diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.hash b/package/llvm-project/llvm-cmake/llvm-cmake.hash index 862c5d92e8..402a5f4ef7 100644 --- a/package/llvm-project/llvm-cmake/llvm-cmake.hash +++ b/package/llvm-project/llvm-cmake/llvm-cmake.hash @@ -1,2 +1,2 @@ # locally calculated -sha256 21cf3f52c53dc8b8972122ae35a5c18de09c7df693b48b5cd8553c3e3fed090d cmake-15.0.3.src.tar.xz +sha256 e364f135fa14c343d70cac96f577f44e8e20bf026682f647f8c3c5687a0bebd1 cmake-21.1.6.src.tar.xz diff --git a/package/llvm-project/llvm-cmake/llvm-cmake.mk b/package/llvm-project/llvm-cmake/llvm-cmake.mk index 33b6ba8339..26dc04dcd7 100644 --- a/package/llvm-project/llvm-cmake/llvm-cmake.mk +++ b/package/llvm-project/llvm-cmake/llvm-cmake.mk @@ -10,8 +10,9 @@ LLVM_CMAKE_SOURCE = cmake-$(LLVM_CMAKE_VERSION).src.tar.xz LLVM_CMAKE_LICENSE = Apache-2.0 with exceptions define HOST_LLVM_CMAKE_INSTALL_CMDS - mkdir -p $(HOST_DIR)/lib/cmake/llvm - cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm + mkdir -p $(HOST_DIR)/lib/cmake/llvm/Modules + cp -Rv $(@D)/Modules/* $(HOST_DIR)/lib/cmake/llvm/Modules + ln -sf $(HOST_DIR)/lib/cmake/llvm/Modules/* $(HOST_DIR)/lib/cmake/llvm/ endef $(eval $(host-generic-package)) diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash index 86775f5dba..7326a0d863 100644 --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.hash +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.hash @@ -1,3 +1,3 @@ # locally computed -sha256 0ab6e07bf05359e242e9ea80e4089b819914867fa997a715e324e584bcfdf114 libunwind-15.0.3.src.tar.xz +sha256 25d8bf5bd0d95641c738ea690b18564f5fc9fb7e7bbab17329b391988e71ae8c libunwind-21.1.6.src.tar.xz sha256 b5efebcaca80879234098e52d1725e6d9eb8fb96a19fce625d39184b705f7b6d LICENSE.TXT diff --git a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk index b293c7ccc2..e7b59a9dcf 100644 --- a/package/llvm-project/llvm-libunwind/llvm-libunwind.mk +++ b/package/llvm-project/llvm-libunwind/llvm-libunwind.mk @@ -11,9 +11,8 @@ LLVM_LIBUNWIND_LICENSE = Apache-2.0 with exceptions LLVM_LIBUNWIND_LICENSE_FILES = LICENSE.TXT LLVM_LIBUNWIND_SUPPORTS_IN_SOURCE_BUILD = NO -HOST_LLVM_LIBUNWIND_DEPENDENCIES = host-llvm-cmake +HOST_LLVM_LIBUNWIND_DEPENDENCIES = host-llvm-cmake host-llvm-runtimes HOST_LLVM_LIBUNWIND_CONF_OPTS += \ - -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" \ - -DLIBUNWIND_INSTALL_HEADERS=ON + -DCMAKE_MODULE_PATH="$(HOST_DIR)/lib/cmake/llvm" $(eval $(host-cmake-package)) diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk index 5859ff7cfc..268367d6bd 100644 --- a/package/llvm-project/llvm-project.mk +++ b/package/llvm-project/llvm-project.mk @@ -4,8 +4,8 @@ # ################################################################################ -LLVM_PROJECT_VERSION_MAJOR = 15 -LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).0.3 +LLVM_PROJECT_VERSION_MAJOR = 21 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.6 LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) include $(sort $(wildcard package/llvm-project/*/*.mk)) diff --git a/package/llvm-project/llvm-runtimes/llvm-runtimes.hash b/package/llvm-project/llvm-runtimes/llvm-runtimes.hash new file mode 100644 index 0000000000..c68f1c13ff --- /dev/null +++ b/package/llvm-project/llvm-runtimes/llvm-runtimes.hash @@ -0,0 +1,2 @@ +# locally calculated +sha256 3b2dcaec1163caf067988228c1d21a75334c47d22610956dd9699ea0631bce45 runtimes-21.1.6.src.tar.xz diff --git a/package/llvm-project/llvm-runtimes/llvm-runtimes.mk b/package/llvm-project/llvm-runtimes/llvm-runtimes.mk new file mode 100644 index 0000000000..1886ff3a14 --- /dev/null +++ b/package/llvm-project/llvm-runtimes/llvm-runtimes.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# llvm-runtimes +# +################################################################################ + +LLVM_RUNTIMES_VERSION = $(LLVM_PROJECT_VERSION) +LLVM_RUNTIMES_SITE = $(LLVM_PROJECT_SITE) +LLVM_RUNTIMES_SOURCE = runtimes-$(LLVM_RUNTIMES_VERSION).src.tar.xz +LLVM_RUNTIMES_LICENSE = Apache-2.0 with exceptions + +define HOST_LLVM_RUNTIMES_INSTALL_CMDS + mkdir -p $(HOST_DIR)/lib/cmake/llvm/Modules + cp -Rv $(@D)/cmake/Modules/* $(HOST_DIR)/lib/cmake/llvm +endef + +$(eval $(host-generic-package)) diff --git a/package/llvm-project/llvm/0001-Fix-standalone-build-for-llvm.patch b/package/llvm-project/llvm/0001-Fix-standalone-build-for-llvm.patch new file mode 100644 index 0000000000..cbb15599cb --- /dev/null +++ b/package/llvm-project/llvm/0001-Fix-standalone-build-for-llvm.patch @@ -0,0 +1,49 @@ +From 255068deb7f3d18837ed30e739aa92c111ab450a Mon Sep 17 00:00:00 2001 +From: El Mehdi YOUNES +Date: Sat, 10 May 2025 12:55:07 +0200 +Subject: [PATCH] Fix standalone build for llvm + +Upstream commit 9dd01a5241dc ("Harmonize cmake_policy() across standalone builds of all projects") +moved the `cmake_policy()` settings from `llvm/CMakeLists.txt` into a shared +`cmake/modules/CMakePolicy.cmake`, and included it from all relevant projects +(Clang, LLD, LLDB, etc.) to harmonize standalone builds. + +However, in `llvm/CMakeLists.txt`, unlike other components, the line: + set(LLVM_COMMON_CMAKE_UTILS ...) +was left **without** the usual: + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) + +This prevents external build systems (e.g., when using separate source archives) +from overriding the `LLVM_COMMON_CMAKE_UTILS` variable, since the value is +always reset unconditionally. + +This patch adds the missing `if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)` guard, +in the same way as it is already done in Clang, LLD, etc., to make +`LLVM_COMMON_CMAKE_UTILS` properly overridable. + +Upstream: Not submitted + +Signed-off-by: El Mehdi YOUNES +--- + llvm/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5293e866324..d861233f299f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,10 @@ cmake_minimum_required(VERSION 3.20.0) + + include(CMakeDependentOption) + +-set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) ++if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) ++ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) ++endif() ++ + include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake + NO_POLICY_SCOPE) + +-- +2.49.0 + diff --git a/package/llvm-project/llvm/Config.in b/package/llvm-project/llvm/Config.in index 4ee84b3bcc..fcf6417a33 100644 --- a/package/llvm-project/llvm/Config.in +++ b/package/llvm-project/llvm/Config.in @@ -24,6 +24,7 @@ config BR2_PACKAGE_LLVM depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_HOST_CMAKE_AT_LEAST_3_20 # cmake required version at least 3.20 help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. diff --git a/package/llvm-project/llvm/llvm.hash b/package/llvm-project/llvm/llvm.hash index df9aa88411..1738c94d29 100644 --- a/package/llvm-project/llvm/llvm.hash +++ b/package/llvm-project/llvm/llvm.hash @@ -1,3 +1,4 @@ # locally calculated -sha256 c39aec729662416dcbf0bfe53a9786b34e7d93d02908a0779a2f6d83ad0a4a27 llvm-15.0.3.src.tar.xz +sha256 908bce97be0275943414b45af2e2b20e8f6d5d9266fdc120bd59f096ebc547ad llvm-21.1.6.src.tar.xz +sha256 8d09dc219cdb3da7dafd2161836aacdd6e02c1a113498ab5f37688599406dc8a third-party-21.1.6.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm-project/llvm/llvm.mk b/package/llvm-project/llvm/llvm.mk index b0515474d8..554e16169f 100644 --- a/package/llvm-project/llvm/llvm.mk +++ b/package/llvm-project/llvm/llvm.mk @@ -13,6 +13,19 @@ LLVM_CPE_ID_VENDOR = llvm LLVM_SUPPORTS_IN_SOURCE_BUILD = NO LLVM_INSTALL_STAGING = YES +HOST_LLVM_EXTRA_DOWNLOADS = third-party-$(LLVM_VERSION).src.tar.xz + +define HOST_LLVM_THIRD_PARTY_EXTRACT + $(call suitable-extractor,$(notdir $(HOST_LLVM_EXTRA_DOWNLOADS))) \ + $(HOST_LLVM_DL_DIR)/$(notdir $(HOST_LLVM_EXTRA_DOWNLOADS)) | \ + $(TAR) -C $(@D) $(TAR_OPTIONS) - +endef +HOST_LLVM_POST_EXTRACT_HOOKS += HOST_LLVM_THIRD_PARTY_EXTRACT +LLVM_POST_EXTRACT_HOOKS += HOST_LLVM_THIRD_PARTY_EXTRACT + +HOST_LLVM_CONF_OPTS += -DLLVM_THIRD_PARTY_DIR=$(@D)/third-party-$(LLVM_PROJECT_VERSION).src +LLVM_CONF_OPTS += -DLLVM_THIRD_PARTY_DIR=$(@D)/third-party-$(LLVM_PROJECT_VERSION).src + HOST_LLVM_DEPENDENCIES = host-python3 host-llvm-cmake LLVM_DEPENDENCIES = host-llvm @@ -20,11 +33,19 @@ LLVM_DEPENDENCIES = host-llvm HOST_LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm LLVM_CONF_OPTS += -DCMAKE_MODULE_PATH=$(HOST_DIR)/lib/cmake/llvm +HOST_LLVM_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm +LLVM_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm + # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects # This flag assumes that projects are checked out side-by-side and not nested HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" +# LLVM_ENABLE_RUNTIMES for runtime components libcxx etc + +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RUNTIMES="" +LLVM_CONF_OPTS += -DLLVM_ENABLE_RUNTIMES="" + HOST_LLVM_CONF_OPTS += -DLLVM_CCACHE_BUILD=$(if $(BR2_CCACHE),ON,OFF) LLVM_CONF_OPTS += -DLLVM_CCACHE_BUILD=$(if $(BR2_CCACHE),ON,OFF) @@ -123,10 +144,6 @@ LLVM_CONF_OPTS += -DENABLE_CRASH_OVERRIDES=ON HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_FFI=OFF LLVM_CONF_OPTS += -DLLVM_ENABLE_FFI=OFF -# Disable terminfo database (needs ncurses libtinfo.so) -HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_TERMINFO=OFF -LLVM_CONF_OPTS += -DLLVM_ENABLE_TERMINFO=OFF - # Enable thread support HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_THREADS=ON LLVM_CONF_OPTS += -DLLVM_ENABLE_THREADS=ON @@ -151,6 +168,10 @@ LLVM_CONF_OPTS += -DLLVM_ENABLE_Z3_SOLVER=OFF HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON +# Disable TFTLite integration +HOST_LLVM_CONF_OPTS += -DLLVM_HAVE_TFLITE="" +LLVM_CONF_OPTS += -DLLVM_HAVE_TFLITE="" + # Default is Debug build, which requires considerably more disk space and # build time. Release build is selected for host and target because the linker # can run out of memory in Debug mode. @@ -261,7 +282,6 @@ HOST_LLVM_CONF_OPTS += \ -DLLVM_ENABLE_SPHINX=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF LLVM_CONF_OPTS += \ @@ -273,7 +293,6 @@ LLVM_CONF_OPTS += \ -DLLVM_ENABLE_SPHINX=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ - -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_INCLUDE_TESTS=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF diff --git a/package/lm-sensors/lm-sensors.hash b/package/lm-sensors/lm-sensors.hash index c941043343..0ca07b7e69 100644 --- a/package/lm-sensors/lm-sensors.hash +++ b/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz +sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 1bf27fc25a..8975efaffa 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -4,9 +4,8 @@ # ################################################################################ -LM_SENSORS_VERSION = 3.6.0 -LM_SENSORS_SITE = \ - $(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION))) +LM_SENSORS_VERSION = 3-6-0 +LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) diff --git a/package/lmbench/0006-Add-signum-param-to-signal-handlers.patch b/package/lmbench/0006-Add-signum-param-to-signal-handlers.patch new file mode 100644 index 0000000000..261a2bf8f9 --- /dev/null +++ b/package/lmbench/0006-Add-signum-param-to-signal-handlers.patch @@ -0,0 +1,130 @@ +From ed4f31bb09bc6355b2b642a89a1f1017de46f26e Mon Sep 17 00:00:00 2001 +From: Charlie Jenkins +Date: Fri, 4 Apr 2025 15:35:08 -0700 +Subject: [PATCH] Add signum param to signal handlers + +A signal handler is required to have a signum parameter that is an +integer. + +Upstream: dead +Signed-off-by: Charlie Jenkins +--- + src/lat_udp.c | 4 ++-- + src/lmdd.c | 14 +++++++------- + src/lmhttp.c | 4 ++-- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/lat_udp.c b/src/lat_udp.c +index cdd2e9b..4b4441b 100644 +--- a/src/lat_udp.c ++++ b/src/lat_udp.c +@@ -19,7 +19,7 @@ char *id = "$Id$\n"; + + void client_main(int ac, char **av); + void server_main(); +-void timeout(); ++void timeout(int signum); + void init(iter_t iterations, void* cookie); + void cleanup(iter_t iterations, void* cookie); + void doit(iter_t iterations, void* cookie); +@@ -164,7 +164,7 @@ cleanup(iter_t iterations, void* cookie) + } + + void +-timeout() ++timeout(int signum) + { + fprintf(stderr, "Recv timed out\n"); + exit(1); +diff --git a/src/lmdd.c b/src/lmdd.c +index dee37b4..529ae21 100644 +--- a/src/lmdd.c ++++ b/src/lmdd.c +@@ -148,7 +148,7 @@ char *cmds[] = { + + + void error(char *); +-void done(); ++void done(int signum); + #ifdef DBG + extern int dbg; + #endif +@@ -332,7 +332,7 @@ main(int ac, char **av) + register int moved; + + if (gotcnt && count-- <= 0) { +- done(); ++ done(0); + } + + /* +@@ -445,7 +445,7 @@ main(int ac, char **av) + perror("read"); + } + if (moved <= 0) { +- done(); ++ done(0); + } + if (inpat != -1) { + register int foo, cnt; +@@ -458,7 +458,7 @@ main(int ac, char **av) + (uint)(off + foo*sizeof(int)), + buf[foo]); + if (mismatch != -1 && --misses == 0) { +- done(); ++ done(0); + } + } + } +@@ -523,7 +523,7 @@ main(int ac, char **av) + if (moved2 != moved) { + fprintf(stderr, "write: wanted=%d got=%d\n", + moved, moved2); +- done(); ++ done(0); + } + if ((Wtmax != -1) || (Wtmin != -1)) { + int mics = stop(&start_tv, &stop_tv); +@@ -560,7 +560,7 @@ main(int ac, char **av) + perror("write"); + } + if (moved2 != moved) { +- done(); ++ done(0); + } + + if (touch) { +@@ -626,7 +626,7 @@ chkarg(char *arg) + } + + void +-done(void) ++done(int signum) + { + int i; + int step; +diff --git a/src/lmhttp.c b/src/lmhttp.c +index 41d9949..9b5d665 100644 +--- a/src/lmhttp.c ++++ b/src/lmhttp.c +@@ -26,7 +26,7 @@ char *buf; + char *bufs[3]; + int Dflg, dflg, nflg, lflg, fflg, zflg; + int data, logfile; +-void die(); ++void die(int signum); + void worker(); + char *http_time(void); + char *date(time_t *tt); +@@ -387,7 +387,7 @@ logit(int sock, char *name, int size) + nbytes += len; + } + +-void die() ++void die(int signum) + { + if (nbytes) { + write(logfile, logbuf, nbytes); +-- +2.43.0 + diff --git a/package/lmbench/0007-scripts-build-int-return-type-main.patch b/package/lmbench/0007-scripts-build-int-return-type-main.patch new file mode 100644 index 0000000000..17a4517f72 --- /dev/null +++ b/package/lmbench/0007-scripts-build-int-return-type-main.patch @@ -0,0 +1,204 @@ +From 3340c9552cc6e7d77adf39becbc6be52233d80c0 Mon Sep 17 00:00:00 2001 +From: Charlie Jenkins +Date: Thu, 10 Apr 2025 13:25:07 -0700 +Subject: [PATCH] scripts/build: int return type main() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some compilers (such as the bootlin riscv64-lp64d glibc bleeding-edge +2024.05-1 toolchain) fail to run the dependency checking scripts and +error at "return type defaults to ‘int’ [-Wimplicit-int]". Add types +to these main() functions to allow this dependency tracking to work. + +Upstream: dead +Signed-off-by: Charlie Jenkins +--- + scripts/build | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/scripts/build b/scripts/build +index 4820d80..2c8a50a 100755 +--- a/scripts/build ++++ b/scripts/build +@@ -51,14 +51,14 @@ fi + + # check for bcopy (optionally set the SYS5 flag) + echo "#include " > ${BASE}$$.c +-echo "main() { char a[256], b[256]; bcopy(a, b, 256); }" >> ${BASE}$$.c ++echo "int main() { char a[256], b[256]; bcopy(a, b, 256); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -DSYS5" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for valloc + echo "#include " > ${BASE}$$.c +-echo "main() { char* buf = valloc(123); }" >> ${BASE}$$.c ++echo "int main() { char* buf = valloc(123); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -Dvalloc=malloc" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -67,7 +67,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { off64_t off; }" >> ${BASE}$$.c ++echo "int main() { off64_t off; }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_off64_t" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -76,7 +76,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { int fd = 0; off64_t off = 0; off = lseek64(fd, off, SEEK_SET); }" >> ${BASE}$$.c ++echo "int main() { int fd = 0; off64_t off = 0; off = lseek64(fd, off, SEEK_SET); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_lseek64" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -88,7 +88,7 @@ echo "#include " >> ${BASE}$$.c + echo "#ifndef RUSAGE_SELF" >> ${BASE}$$.c + echo "#define RUSAGE_SELF 0" >> ${BASE}$$.c + echo "#endif /* RUSAGE_SELF */" >> ${BASE}$$.c +-echo "main() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); }" >> ${BASE}$$.c ++echo "int main() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DRUSAGE" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -136,13 +136,13 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for OSs that have S_IFFIFO instead of S_IFIFO + echo "#include " > ${BASE}$$.c +-echo "main() { return (S_IFIFO); }" >> ${BASE}$$.c ++echo "int main() { return (S_IFIFO); }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + true; + else + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c +- echo "main() { return (S_IFFIFO); }" >> ${BASE}$$.c ++ echo "int main() { return (S_IFFIFO); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -DS_IFIFO=S_IFFIFO" + fi +@@ -151,7 +151,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + # check that we have uint + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { uint i = 0; return (i); }" >> ${BASE}$$.c ++echo "int main() { uint i = 0; return (i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -161,7 +161,7 @@ HAVE_uint64=0 + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { uint64 i = 0; return (int)(i); }" >> ${BASE}$$.c ++echo "int main() { uint64 i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint64=1" && HAVE_uint64=1; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -170,7 +170,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ${HAVE_uint64} = 0 ]; then + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +- echo "main() { uint64_t i = 0; return (int)(i); }" >> ${BASE}$$.c ++ echo "int main() { uint64_t i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint64_t=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -181,7 +181,7 @@ HAVE_int64=0 + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { int64 i = 0; return (int)(i); }" >> ${BASE}$$.c ++echo "int main() { int64 i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_int64=1" && HAVE_int64=1; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -190,7 +190,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ${HAVE_int64} = 0 ]; then + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +- echo "main() { int64_t i = 0; return (int)(i); }" >> ${BASE}$$.c ++ echo "int main() { int64_t i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_int64_t=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -209,15 +209,15 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { int s; struct sockaddr dest; socklen_t len; getsockname(s, &dest, &len); }" >> ${BASE}$$.c +-${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ ++echo "int main() { int s; struct sockaddr dest; socklen_t len; getsockname(s, &dest, &len); }" >> ${BASE}$$.c ++${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} \ + && CFLAGS="${CFLAGS} -DHAVE_socklen_t" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check that we have drand48 and srand48 + HAVE_RANDOM=0 + echo "#include " > ${BASE}$$.c +-echo "main() { srand48(973); return (int)(1.0E9 * drand48()); }" >> ${BASE}$$.c ++echo "int main() { srand48(973); return (int)(1.0E9 * drand48()); }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_DRAND48" + HAVE_RANDOM=1 +@@ -226,7 +226,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + if [ ${HAVE_RANDOM} -eq 0 ]; then + echo "#include " > ${BASE}$$.c +- echo "main() { srand(973); return (10 * rand()) / RAND_MAX; }" >> ${BASE}$$.c ++ echo "int main() { srand(973); return (10 * rand()) / RAND_MAX; }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_RAND" + HAVE_RANDOM=1 +@@ -236,7 +236,7 @@ fi + + if [ ${HAVE_RANDOM} -eq 0 ]; then + echo "#include " > ${BASE}$$.c +- echo "main() { srandom(973); return (10 * random()) / RAND_MAX; }" >> ${BASE}$$.c ++ echo "int main() { srandom(973); return (10 * random()) / RAND_MAX; }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_RANDOM" + HAVE_RANDOM=1 +@@ -247,7 +247,7 @@ fi + # check that we have sysmp + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { return (int)sysmp(MP_NPROCS); }" >> ${BASE}$$.c ++echo "int main() { return (int)sysmp(MP_NPROCS); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_SYSMP=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -257,7 +257,7 @@ echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { return bindprocessor(BINDPROCESS, getpid(), 0); }" >> ${BASE}$$.c ++echo "int main() { return bindprocessor(BINDPROCESS, getpid(), 0); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_BINDPROCESSOR=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -267,7 +267,7 @@ echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { return processor(P_PID, P_MYPID, 0, NULL); }" >> ${BASE}$$.c ++echo "int main() { return processor(P_PID, P_MYPID, 0, NULL); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_BINDPROCESSOR=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -276,7 +276,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { unsigned long mask = 1; return sched_setaffinity(0, sizeof(unsigned long), &mask); }" >> ${BASE}$$.c ++echo "int main() { unsigned long mask = 1; return sched_setaffinity(0, sizeof(unsigned long), &mask); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_SCHED_SETAFFINITY=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +-- +2.43.0 + diff --git a/package/lmbench/0008-Fixup-function-declarations.patch b/package/lmbench/0008-Fixup-function-declarations.patch new file mode 100644 index 0000000000..03c14a3490 --- /dev/null +++ b/package/lmbench/0008-Fixup-function-declarations.patch @@ -0,0 +1,115 @@ +From 6255495abf4ea516aad3b447cc32d1b244229878 Mon Sep 17 00:00:00 2001 +From: Charlie Jenkins +Date: Fri, 4 Apr 2025 15:48:07 -0700 +Subject: [PATCH] Fixup function declarations + +GCC-15 requires function declarations to be properly typed. + +Upstream: dead +Signed-off-by: Charlie Jenkins +--- + src/bench.h | 4 ++-- + src/lat_rpc.c | 18 +++++++----------- + src/lmdd.c | 4 ++-- + 3 files changed, 11 insertions(+), 15 deletions(-) + +diff --git a/src/bench.h b/src/bench.h +index 597d068..b1624c5 100644 +--- a/src/bench.h ++++ b/src/bench.h +@@ -345,7 +345,7 @@ extern int sched_pin(int cpu); + #define XACT_VERS ((u_long)1) + #define RPC_XACT ((u_long)1) + #define RPC_EXIT ((u_long)2) +-extern char *rpc_xact_1(); +-extern char *client_rpc_xact_1(); ++extern char *rpc_xact_1(char *msg, register SVCXPRT *transp); ++extern char *client_rpc_xact_1(char *argp, CLIENT *clnt); + + #endif /* _BENCH_H */ +diff --git a/src/lat_rpc.c b/src/lat_rpc.c +index ff4380f..dcc24df 100644 +--- a/src/lat_rpc.c ++++ b/src/lat_rpc.c +@@ -187,16 +187,14 @@ client_rpc_xact_1(char *argp, CLIENT *clnt) + */ + /* ARGSUSED */ + char * +-rpc_xact_1(msg, transp) +- char *msg; +- register SVCXPRT *transp; ++rpc_xact_1(char *msg, register SVCXPRT *transp) + { + static char r = 123; + + return &r; + } + +-static void xact_prog_1(); ++static void xact_prog_1(struct svc_req *rqstp, register SVCXPRT *transp); + + void + server_main() +@@ -234,16 +232,14 @@ server_main() + } + + static void +-xact_prog_1(rqstp, transp) +- struct svc_req *rqstp; +- register SVCXPRT *transp; ++xact_prog_1(struct svc_req *rqstp, register SVCXPRT *transp) + { + union { + char rpc_xact_1_arg; + } argument; + char *result; +- bool_t (*xdr_argument)(), (*xdr_result)(); +- char *(*local)(); ++ bool_t (*xdr_argument)(XDR *, char *), (*xdr_result)(XDR *, char *); ++ char *(*local)(char *, struct svc_req *); + + switch (rqstp->rq_proc) { + case NULLPROC: +@@ -253,7 +249,7 @@ xact_prog_1(rqstp, transp) + case RPC_XACT: + xdr_argument = xdr_char; + xdr_result = xdr_char; +- local = (char *(*)()) rpc_xact_1; ++ local = (char *(*)(char *, struct svc_req *)) rpc_xact_1; + break; + + case RPC_EXIT: +@@ -270,7 +266,7 @@ xact_prog_1(rqstp, transp) + svcerr_decode(transp); + return; + } +- result = (*local)(&argument, rqstp); ++ result = (*local)((char *)&argument, rqstp); + if (result != NULL && !svc_sendreply(transp, (xdrproc_t)xdr_result, result)) { + svcerr_systemerr(transp); + } +diff --git a/src/lmdd.c b/src/lmdd.c +index 529ae21..197ac46 100644 +--- a/src/lmdd.c ++++ b/src/lmdd.c +@@ -76,7 +76,7 @@ int norepeats = -1; + bds_msg *m1, *m2; + #endif + +-uint64 getarg(); ++uint64 getarg(char *s, int ac, char **av); + int been_there(uint64 off); + int getfile(char *s, int ac, char **av); + +@@ -162,7 +162,7 @@ main(int ac, char **av) + int Fork, misses, mismatch, outpat, inpat, in, timeopen, gotcnt; + int slp; + uint64 skip, size, count; +- void chkarg(); ++ void chkarg(char *arg); + int i; + uint64 off = 0; + int touch; +-- +2.43.0 + diff --git a/package/lmbench/0009-src-bench.h-include-string.h.patch b/package/lmbench/0009-src-bench.h-include-string.h.patch new file mode 100644 index 0000000000..0c82a58b59 --- /dev/null +++ b/package/lmbench/0009-src-bench.h-include-string.h.patch @@ -0,0 +1,36 @@ +From 30a95099f4711d7c5a59526a84e2c73701af3c3c Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 25 Nov 2025 22:57:21 +0100 +Subject: [PATCH] src/bench.h: include string.h + +Fixes build error with newer gcc, detected by buildroot autobuilders: +https://autobuild.buildroot.net/results/189/189219853fbe1b7daf0aaad29279858c6e60507b//build-end.log + +lib_unix.c: In function 'unix_server': +lib_unix.c:29:9: error: implicit declaration of function 'strcpy' [-Wimplicit-function-declaration] + 29 | strcpy(s.sun_path, path); + | ^~~~~~ +lib_unix.c:10:1: note: include '' or provide a declaration of 'strcpy' + +Upstream: https://github.com/intel/lmbench/pull/41 + +Signed-off-by: Bernd Kuhls +--- + src/bench.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/bench.h b/src/bench.h +index 3b25a47..f0fd6b7 100644 +--- a/src/bench.h ++++ b/src/bench.h +@@ -27,6 +27,7 @@ typedef unsigned char bool_t; + #ifndef WIN32 + #include + #endif ++#include + #include + #ifndef WIN32 + #include +-- +2.47.3 + diff --git a/package/localedef/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch index ef126c6bd3..dd3906eb37 100644 --- a/package/localedef/0001-HACK-only-build-and-install-localedef.patch +++ b/package/localedef/0001-HACK-only-build-and-install-localedef.patch @@ -1,4 +1,4 @@ -From 03b1573ca341f1852ac05a884a68ed375cceccc0 Mon Sep 17 00:00:00 2001 +From a3006d23a58d825dcaa4863ce81a454e151d038d Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 21 May 2018 16:45:02 +0200 Subject: [PATCH] HACK: only build and install localedef @@ -17,10 +17,10 @@ Signed-off-by: Yann E. MORIN 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Rules b/Rules -index 9010c5d5b2..f5e5525061 100644 +index 44c041c491..156c82619b 100644 --- a/Rules +++ b/Rules -@@ -223,10 +223,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ +@@ -239,10 +239,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ $(binaries-all-notests)) ifneq "$(strip $(binaries-shared-notests))" "" @@ -42,7 +42,7 @@ index 9010c5d5b2..f5e5525061 100644 ifneq "$(strip $(binaries-shared-tests))" "" diff --git a/locale/Makefile b/locale/Makefile -index 2810f28605..6b4cc9e831 100644 +index 9d9c1a7691..4d26032c15 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -76,7 +76,6 @@ aux = \ @@ -70,5 +70,5 @@ index 2810f28605..6b4cc9e831 100644 libBrokenLocale-routines = broken_cur_max -- -2.45.2 +2.50.1 diff --git a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index b8e53a23a6..cc11c9a08c 100644 --- a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -1,4 +1,4 @@ -From 1ddee6fdcde6b12df22619380d51b47e6c8f2c08 Mon Sep 17 00:00:00 2001 +From 2cb626348a64846b836a878ab7fc93f54eb0afd6 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 6 Feb 2020 14:36:21 -0600 Subject: [PATCH] relax dependency on GCC to 4.8 and binutils to 2.24 @@ -35,27 +35,27 @@ Signed-off-by: Yann E. MORIN 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 1d543548cd..3e13c46b2e 100755 +index 180e49d95b..fdb19d1d27 100755 --- a/configure +++ b/configure -@@ -5302,7 +5302,7 @@ printf %s "checking version of $LD... " >&6; } +@@ -5352,7 +5352,7 @@ printf %s "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) +- 2.[1-9][0-9][0-9]*|2.39*|2.[4-9][0-9]*|[3-9].*|[1-9][0-9]*) + 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -@@ -5750,7 +5750,7 @@ int +@@ -5801,7 +5801,7 @@ int main (void) { --#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2) +-#if !defined __GNUC__ || __GNUC__ < 12 || (__GNUC__ == 12 && __GNUC_MINOR__ < 1) +#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) #error insufficient compiler #endif ; -- -2.45.2 +2.50.1 diff --git a/package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch b/package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch index 57a8f8e35c..5c3803d583 100644 --- a/package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch +++ b/package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch @@ -1,8 +1,8 @@ -From efc989e7e5dcbc38ccc32634e49cfc2881c5a318 Mon Sep 17 00:00:00 2001 +From c01b78e37885c7c4a191f752dc346c848d73b731 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 9 Sep 2023 23:58:50 +0200 -Subject: [PATCH] HACK: keep _ISOC23_SOURCE undefined to build localedef with - old glibc +Subject: [PATCH] HACK: keep _ISOC23_SOURCE undefined to build localedef + with old glibc Fixes: host-localedef-2.38-13-g92201f16cbcfd9eafe314ef6654be2ea7ba25675/build/locale/ld-ctype.o: in function `ctype_read': @@ -15,21 +15,23 @@ Signed-off-by: Romain Naour to _ISOC23_SOURCE] Signed-off-by: Thomas Petazzoni --- - include/features.h | 1 - - 1 file changed, 1 deletion(-) + include/features.h | 2 -- + 1 file changed, 2 deletions(-) diff --git a/include/features.h b/include/features.h -index 093de6f44c..8d9ca6e402 100644 +index 8515b06b36..9abd65af93 100644 --- a/include/features.h +++ b/include/features.h -@@ -215,7 +215,6 @@ +@@ -217,9 +217,7 @@ # undef _ISOC11_SOURCE # define _ISOC11_SOURCE 1 # undef _ISOC23_SOURCE -# define _ISOC23_SOURCE 1 + # undef _ISOC2Y_SOURCE +-# define _ISOC2Y_SOURCE 1 # undef _POSIX_SOURCE # define _POSIX_SOURCE 1 # undef _POSIX_C_SOURCE -- -2.45.2 +2.50.1 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index b3e8ab5a1b..c34fe22b5e 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.40-18-g5641780762723156b0d20a0b9f7df1d76831bab0 +LOCALEDEF_VERSION = 2.42-3-gbc13db73937730401d592b33092db6df806d193e LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in index 27a5f06988..d9daf27eb6 100644 --- a/package/log4cxx/Config.in +++ b/package/log4cxx/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LOG4CXX depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR # mbsinit depends on BR2_USE_MMU # apr depends on BR2_USE_WCHAR || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # boost depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # boost-thread @@ -21,9 +22,9 @@ config BR2_PACKAGE_LOG4CXX https://logging.apache.org/log4cxx/ -comment "log4cxx needs a toolchain w/ C++, threads, dynamic library" +comment "log4cxx needs a toolchain w/ C++, threads, dynamic library, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_USE_WCHAR depends on BR2_USE_MMU comment "log4cxx needs a toolchain w/ wchar or gcc >= 7" diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 728d49ee38..d9e9af18cf 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/1.1.0/apache-log4cxx-1.1.0.tar.gz.sha512 -sha512 66a66eab933a6afd0779e3f73f65afa4fb82481208b591fd7c7c86ded805f50abcd9cdf954bdb49e1e7f5198e6c1c4fff8a7e180ff5fff9491f1946e9ba6fe2b apache-log4cxx-1.1.0.tar.gz +# From https://downloads.apache.org/logging/log4cxx/1.3.1/apache-log4cxx-1.3.1.tar.gz.sha512 +sha512 0956fd034fd1a98d2e48ed461578c1e85da02d176850a580195b6a60b959feaf402a2743cc84ccb5d467dd924ee46422b8a7b39d2be9ee131e4e275e65ba839c apache-log4cxx-1.3.1.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 8024c96d46..2d8d57a612 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CXX_VERSION = 1.1.0 +LOG4CXX_VERSION = 1.3.1 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index cc466a6f4e..37cf85ff6d 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516 logrotate-3.21.0.tar.xz +sha256 42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618 logrotate-3.22.0.tar.xz diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 3fed1b957f..9867835aeb 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.21.0 +LOGROTATE_VERSION = 3.22.0 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ diff --git a/package/logsurfer/Config.in b/package/logsurfer/Config.in deleted file mode 100644 index 43e2f519e6..0000000000 --- a/package/logsurfer/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LOGSURFER - bool "logsurfer" - depends on BR2_USE_MMU # fork() - help - Logsurfer is a program for monitoring system logs in - real-time, and reporting on the occurrence of events. - - http://www.crypt.gen.nz/logsurfer/ diff --git a/package/logsurfer/logsurfer.hash b/package/logsurfer/logsurfer.hash deleted file mode 100644 index 8e9f5c95bd..0000000000 --- a/package/logsurfer/logsurfer.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://www.crypt.gen.nz/logsurfer/ -md5 4c26a74d813ccf766117c95c644aa601 logsurfer-1.8.tar.gz -sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk deleted file mode 100644 index 8eb9dc8f8a..0000000000 --- a/package/logsurfer/logsurfer.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# logsurfer -# -################################################################################ - -LOGSURFER_VERSION = 1.8 -LOGSURFER_SITE = http://downloads.sourceforge.net/project/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION) - -define LOGSURFER_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/logsurfer \ - $(TARGET_DIR)/usr/bin/logsurfer -endef - -$(eval $(autotools-package)) diff --git a/package/lowdown/Config.in b/package/lowdown/Config.in new file mode 100644 index 0000000000..00ae6fcce6 --- /dev/null +++ b/package/lowdown/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_LOWDOWN + bool "lowdown" + depends on BR2_USE_WCHAR + depends on !BR2_STATIC_LIBS + help + Simple markdown translator to HTML5, terminal, and more. + Useful for providing the same help texts both for a CLI + and web. + + https://kristaps.bsd.lv/lowdown/ + +comment "lowdown needs a toolchain w/ wchar and shared library support" + depends on BR2_USE_WCHAR + depends on !BR2_STATIC_LIBS diff --git a/package/lowdown/lowdown.hash b/package/lowdown/lowdown.hash new file mode 100644 index 0000000000..0b4d1fd25d --- /dev/null +++ b/package/lowdown/lowdown.hash @@ -0,0 +1,5 @@ +# SHA512 from release archive https://kristaps.bsd.lv/lowdown/snapshots/ +sha512 316b27384f83cb57fa414c315556fd177f2998c009e031986446e82252f276dc68adfeb263b88640deccb7084da4771d0ee8fae7d37388dba4e1a0aa426c701d lowdown-1.4.0.tar.gz + +# Locally calculated +sha256 204658eb0d5ba87935056630534cdafd21ed29597e0a9c9f8f557779a3fb99d4 LICENSE.md diff --git a/package/lowdown/lowdown.mk b/package/lowdown/lowdown.mk new file mode 100644 index 0000000000..d88b70327a --- /dev/null +++ b/package/lowdown/lowdown.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# lowdown +# +################################################################################ + +LOWDOWN_VERSION = 1.4.0 +LOWDOWN_SITE = https://kristaps.bsd.lv/lowdown/snapshots +LOWDOWN_LICENSE = ISC +LOWDOWN_LICENSE_FILES = LICENSE.md + +define LOWDOWN_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define LOWDOWN_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define LOWDOWN_INSTALL_TARGET_CMDS + $(INSTALL) -t $(TARGET_DIR)/usr/bin -D -m 0755 $(@D)/lowdown +endef + +$(eval $(generic-package)) diff --git a/package/lpac/Config.in b/package/lpac/Config.in new file mode 100644 index 0000000000..c754da96d9 --- /dev/null +++ b/package/lpac/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LPAC + bool "lpac" + depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite + depends on BR2_USE_MMU # pcsc-lite + depends on !BR2_STATIC_LIBS # pcsc-lite + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite + select BR2_PACKAGE_PCSC_LITE + select BR2_PACKAGE_LIBQMI if BR2_PACKAGE_LIBQRTR_GLIB + help + C-based eUICC LPA. + + https://github.com/estkme-group/lpac + +comment "lpac needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/lpac/lpac.hash b/package/lpac/lpac.hash new file mode 100644 index 0000000000..bf93ef245f --- /dev/null +++ b/package/lpac/lpac.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 3d87080a625b10430eebb82f89e2d24e16a84a8435a9c40b3718fd88c82028ba lpac-2.2.1.tar.gz +sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef src/LICENSE +sha256 b673293d21e887eaa9b971696b33f0f9141839900c65c83e560afa469d291ba6 euicc/LICENSE +sha256 163766832b15cc9c90d593216360c67af579b8b36932b297fca2aeb61544de2f cjson/LICENSE diff --git a/package/lpac/lpac.mk b/package/lpac/lpac.mk new file mode 100644 index 0000000000..36cd4d591d --- /dev/null +++ b/package/lpac/lpac.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# lpac +# +################################################################################ + +LPAC_VERSION = 2.2.1 +LPAC_SITE = $(call github,estkme-group,lpac,v$(LPAC_VERSION)) +LPAC_LICENSE = LGPL-2.1+ (library), AGPL-3.0 (programs), MIT (cjson) +LPAC_LICENSE_FILES = src/LICENSE euicc/LICENSE cjson/LICENSE +LPAC_DEPENDENCIES = pcsc-lite + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LPAC_DEPENDENCIES += libcurl +LPAC_CONF_OPTS += -DLPAC_WITH_HTTP_CURL=ON +else +LPAC_CONF_OPTS += -DLPAC_WITH_HTTP_CURL=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBQMI),y) +LPAC_DEPENDENCIES += libqmi +LPAC_CONF_OPTS += -DLPAC_WITH_APDU_QMI=ON +else +LPAC_CONF_OPTS += -DLPAC_WITH_APDU_QMI=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +LPAC_DEPENDENCIES += libqmi libqrtr-glib +LPAC_CONF_OPTS += -DLPAC_WITH_APDU_QMI_QRTR=ON +else +LPAC_CONF_OPTS += -DLPAC_WITH_APDU_QMI_QRTR=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBMBIM),y) +LPAC_DEPENDENCIES += libmbim +LPAC_CONF_OPTS += -DLPAC_WITH_APDU_MBIM=ON +else +LPAC_CONF_OPTS += -DLPAC_WITH_APDU_MBIM=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/lrzsz/0001-configure-fix-main-prototype.patch b/package/lrzsz/0001-configure-fix-main-prototype.patch index dfe4385a1c..f5752814a5 100644 --- a/package/lrzsz/0001-configure-fix-main-prototype.patch +++ b/package/lrzsz/0001-configure-fix-main-prototype.patch @@ -1,4 +1,4 @@ -From c2758812867a52a6bb56b87d52c35ebff797e777 Mon Sep 17 00:00:00 2001 +From 4c264d704357220b91a070862e0490c641b3f560 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 15 Sep 2024 15:12:07 +0200 Subject: [PATCH] configure: fix main() prototype @@ -30,5 +30,5 @@ index cc586d5..16a259a 100755 if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes -- -2.45.2 +2.50.1 diff --git a/package/lrzsz/0002-include-stdio.h-to-remove-warning.patch b/package/lrzsz/0002-include-stdio.h-to-remove-warning.patch new file mode 100644 index 0000000000..12d9a0ae5f --- /dev/null +++ b/package/lrzsz/0002-include-stdio.h-to-remove-warning.patch @@ -0,0 +1,26 @@ +From bbbaccd80c69a705f27e9236808d42088cf1f1cb Mon Sep 17 00:00:00 2001 +From: Uwe Ohse +Date: Mon, 2 Mar 2020 22:38:16 +0000 +Subject: [PATCH] include stdio.h to remove warning + +Upstream: https://github.com/UweOhse/lrzsz/commit/937a2ff696fb600672eb0e8fab87f75d5e4fbc25 +Signed-off-by: Thomas Petazzoni +--- + src/lsyslog.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lsyslog.c b/src/lsyslog.c +index 6baf4a2..d21ab35 100644 +--- a/src/lsyslog.c ++++ b/src/lsyslog.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #endif + + #if __STDC__ +-- +2.50.1 + diff --git a/package/lrzsz/0003-FTBFS-fix-missing-includes.patch b/package/lrzsz/0003-FTBFS-fix-missing-includes.patch new file mode 100644 index 0000000000..19c60bd022 --- /dev/null +++ b/package/lrzsz/0003-FTBFS-fix-missing-includes.patch @@ -0,0 +1,124 @@ +From b526a62d5992d838ee34fb992defdeb8ee0ed594 Mon Sep 17 00:00:00 2001 +From: Wolfram Sang +Date: Fri, 29 Nov 2024 14:14:25 +0100 +Subject: [PATCH] FTBFS fix missing includes + +Taken from: https://sources.debian.org/data/main/l/lrzsz/0.12.21rc-0.1/debian/patches/include.diff + +Description: Fixes FTBFS (missing includes) +Author: Martin A. Godisch +Bug-Debian: https://bugs.debian.org/1066514 +Forwarded: no + +Signed-off-by: Wolfram Sang +Upstream: https://sources.debian.org/data/main/l/lrzsz/0.12.21rc-0.1/debian/patches/include.diff +--- + lib/error.c | 1 + + src/canit.c | 1 + + src/lrz.c | 1 + + src/lsyslog.c | 1 + + src/lsz.c | 1 + + src/tcp.c | 1 + + src/zperr.c | 1 + + src/zreadline.c | 1 + + 8 files changed, 8 insertions(+) + +diff --git a/lib/error.c b/lib/error.c +index 8b96b91..3861578 100644 +--- a/lib/error.c ++++ b/lib/error.c +@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #endif + + #include ++#include + + #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC || defined(__cplusplus) + # if __STDC__ || defined(__cplusplus) +diff --git a/src/canit.c b/src/canit.c +index f947a25..ae91807 100644 +--- a/src/canit.c ++++ b/src/canit.c +@@ -24,6 +24,7 @@ + #define SS_NORMAL 0 + #include + #include ++#include + #include + #include + #include +diff --git a/src/lrz.c b/src/lrz.c +index 2f6a5ad..63e1326 100644 +--- a/src/lrz.c ++++ b/src/lrz.c +@@ -27,6 +27,7 @@ + #define SS_NORMAL 0 + #include + #include ++#include + #include + #include + #include +diff --git a/src/lsyslog.c b/src/lsyslog.c +index d21ab35..24d8cd1 100644 +--- a/src/lsyslog.c ++++ b/src/lsyslog.c +@@ -18,6 +18,7 @@ + 02111-1307, USA. + + */ ++#define _GNU_SOURCE + #include "config.h" + #ifdef ENABLE_SYSLOG + #include "zglobal.h" +diff --git a/src/lsz.c b/src/lsz.c +index b9d2545..1598150 100644 +--- a/src/lsz.c ++++ b/src/lsz.c +@@ -28,6 +28,7 @@ + #define SS_NORMAL 0 + #include + #include ++#include + #include + #include + #include +diff --git a/src/tcp.c b/src/tcp.c +index 7e1ba3f..cdf9187 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "zglobal.h" + #include +diff --git a/src/zperr.c b/src/zperr.c +index 31963de..0b9dc29 100644 +--- a/src/zperr.c ++++ b/src/zperr.c +@@ -22,6 +22,7 @@ + #include "zglobal.h" + #include + #include ++#include + #include + + #ifdef __STDC__ +diff --git a/src/zreadline.c b/src/zreadline.c +index dd9736b..7bc3736 100644 +--- a/src/zreadline.c ++++ b/src/zreadline.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.50.1 + diff --git a/package/lrzsz/0004-Fix-build-with-GCC-15.patch b/package/lrzsz/0004-Fix-build-with-GCC-15.patch new file mode 100644 index 0000000000..53c7c5ab02 --- /dev/null +++ b/package/lrzsz/0004-Fix-build-with-GCC-15.patch @@ -0,0 +1,93 @@ +From 01a8cdf3f8e64b80ff219c250c899605c50312f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Mar 2025 23:06:54 -0700 +Subject: [PATCH] Fix build with GCC 15 + +This is collection of changes needed to get compiling with gcc-15 +which switched to use C23 as default std. + +Signed-off-by: Khem Raj +Upstream: https://github.com/UweOhse/lrzsz/pull/8 +Signed-off-by: Frank Chung +--- + lib/error.c | 2 +- + lib/getopt.h | 2 +- + lib/long-options.c | 3 ++- + lib/long-options.h | 2 +- + lib/xstrtol.c | 2 -- + 5 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/lib/error.c b/lib/error.c +index 3861578..2a2f1ff 100644 +--- a/lib/error.c ++++ b/lib/error.c +@@ -74,7 +74,7 @@ extern char *program_name; + + # if HAVE_STRERROR + # ifndef strerror /* On some systems, strerror is a macro */ +-char *strerror (); ++char *strerror (int); + # endif + # else + static char * +diff --git a/lib/getopt.h b/lib/getopt.h +index 4ac33b7..46971cb 100644 +--- a/lib/getopt.h ++++ b/lib/getopt.h +@@ -101,7 +101,7 @@ struct option + errors, only prototype getopt for the GNU C library. */ + extern int getopt (int argc, char *const *argv, const char *shortopts); + #else /* not __GNU_LIBRARY__ */ +-extern int getopt (); ++extern int getopt (int, char * const [], const char *); + #endif /* __GNU_LIBRARY__ */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); +diff --git a/lib/long-options.c b/lib/long-options.c +index fe069fd..4db5cea 100644 +--- a/lib/long-options.c ++++ b/lib/long-options.c +@@ -22,6 +22,7 @@ + #endif + + #include ++#include + #include + #include "long-options.h" + +@@ -43,7 +44,7 @@ parse_long_options (argc, argv,version, usage) + int argc; + char **argv; + void (*version)(); +- void (*usage)(); ++ void (*usage)(int); + #endif + { + int c; +diff --git a/lib/long-options.h b/lib/long-options.h +index 14459cd..3fb8fa6 100644 +--- a/lib/long-options.h ++++ b/lib/long-options.h +@@ -6,5 +6,5 @@ + #endif + + void parse_long_options __P ((int _argc, char **_argv, +- void (*_version) (void), ++ void (*_version) (), + void (*_usage) (int))); +diff --git a/lib/xstrtol.c b/lib/xstrtol.c +index d7b4b56..7d0737d 100644 +--- a/lib/xstrtol.c ++++ b/lib/xstrtol.c +@@ -65,8 +65,6 @@ extern int errno; + } \ + while (0) + +-__unsigned long int __strtol (); +- + /* FIXME: comment. */ + + strtol_error +-- +2.50.1 + diff --git a/package/lrzsz/0005-remove-old-prototypes.patch b/package/lrzsz/0005-remove-old-prototypes.patch new file mode 100644 index 0000000000..8b93ba1f1c --- /dev/null +++ b/package/lrzsz/0005-remove-old-prototypes.patch @@ -0,0 +1,38 @@ +From 8d91782ae404c59f42029b3af394fbccb2d43856 Mon Sep 17 00:00:00 2001 +From: Uwe Ohse +Date: Mon, 2 Mar 2020 21:24:45 +0000 +Subject: [PATCH] remove old prototypes + +Upstream: 34f9527076276aace5fc2e31388e09aaaf1773eb +Signed-off-by: Thomas Petazzoni +--- + src/lrz.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/lrz.c b/src/lrz.c +index 63e1326..a31e82d 100644 +--- a/src/lrz.c ++++ b/src/lrz.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_UTIME_H + #include +@@ -42,11 +43,6 @@ + #include "xstrtoul.h" + #include "error.h" + +-#ifndef STRICT_PROTOTYPES +-extern time_t time(); +-extern char *strerror(); +-extern char *strstr(); +-#endif + + #ifndef HAVE_ERRNO_DECLARATION + extern int errno; +-- +2.50.1 + diff --git a/package/lrzsz/0006-remove-old-prototypes.patch b/package/lrzsz/0006-remove-old-prototypes.patch new file mode 100644 index 0000000000..fd947c63cd --- /dev/null +++ b/package/lrzsz/0006-remove-old-prototypes.patch @@ -0,0 +1,31 @@ +From 755da0781a2b20674f183cbf8cddf28ac56f7bad Mon Sep 17 00:00:00 2001 +From: Uwe Ohse +Date: Mon, 2 Mar 2020 21:26:21 +0000 +Subject: [PATCH] remove old prototypes + +Upstream: 7cdaef47634d2d8944a4192bb87c6e57dd24c41f +Signed-off-by: Thomas Petazzoni +--- + src/lsz.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/lsz.c b/src/lsz.c +index 1598150..b8041b2 100644 +--- a/src/lsz.c ++++ b/src/lsz.c +@@ -51,12 +51,6 @@ void *mm_addr=NULL; + #include "xstrtoul.h" + #include "error.h" + +-#ifndef STRICT_PROTOTYPES +-extern time_t time(); +-extern char *strerror(); +-extern char *strstr(); +-#endif +- + #ifndef HAVE_ERRNO_DECLARATION + extern int errno; + #endif +-- +2.50.1 + diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 12d52b8ebd..c0bb13fdda 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -11,7 +11,9 @@ LRZSZ_LICENSE = GPL-2.0+ LRZSZ_LICENSE_FILES = COPYING LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +LRZSZ_CONF_ENV = \ + ac_cv_type_signal=void \ + LIBS=$(TARGET_NLS_LIBS) define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz diff --git a/package/lshw/lshw.hash b/package/lshw/lshw.hash index 5626d7131e..40f150778c 100644 --- a/package/lshw/lshw.hash +++ b/package/lshw/lshw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c62c89d4b3305d897bd644524bbc816c1793c41c9fea10381b75f9d5b074e056 lshw-d76afbaaf40e953243da921844cddff8185324f3.tar.gz +sha256 6b8346a89fb0f0f1798e66f6a707a881d38b9b3a67256b30fc4628dac09f291a lshw-02.20.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 86c8f356cc..70fa2aef27 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -4,8 +4,8 @@ # ################################################################################ -LSHW_VERSION = d76afbaaf40e953243da921844cddff8185324f3 -LSHW_SITE = $(call github,lyonel,lshw,$(LSHW_VERSION)) +LSHW_VERSION = 02.20 +LSHW_SITE = $(call github,lyonel,lshw,B.$(LSHW_VERSION)) LSHW_LICENSE = GPL-2.0 LSHW_LICENSE_FILES = COPYING diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index 90d8aede92..e8e2aac1cd 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b9c56468b927d9691ab168c0b1e9f8f1f835694a35ff898c549d383bd8d09bd4 lsof-4.99.3.tar.gz +sha256 90d02ae35cd14341bfb04ce80e0030767476b0fc414a0acb115d49e79b13d56c lsof-4.99.4.tar.gz sha256 225222ff9bf38abc2cef7205e9b05c60935efa9ec28d1fd01e503c9316088718 COPYING diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index cb4e987bd5..fb2309ae7b 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.99.3 +LSOF_VERSION = 4.99.4 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license LSOF_LICENSE_FILES = COPYING diff --git a/package/ltp-testsuite/0001-configure-Fix-build-on-kernel-6.14-headers.patch b/package/ltp-testsuite/0001-configure-Fix-build-on-kernel-6.14-headers.patch new file mode 100644 index 0000000000..6638ee2ccd --- /dev/null +++ b/package/ltp-testsuite/0001-configure-Fix-build-on-kernel-6.14-headers.patch @@ -0,0 +1,51 @@ +From 3ef4bac1dd253628dfdb8a823b51ae0d24fa0616 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Mon, 2 Jun 2025 19:08:30 +0200 +Subject: [PATCH] configure: Fix build on kernel 6.14 headers + +We decided in a2300dc0f5 to remove in lapi/mount.h and +use only . But later in 5c5411ea8e we add autotools checks +in configure.ac which use for detection, but kept using +lapi/mount.h. This worked until now, because no toolchain used new +header enough. Recent Alpine update broke that. + +This fixes CI build on Alpine v3.22 (the default Alpine version in +GitHub action), which uses 6.14.2 kernel headers, which already define +struct mnt_id_req (configure.ac detect it but lapi/mount.h was not using +a correct header): + + listmount.h: In function 'listmount': + listmount.h:18:16: error: variable 'req' has initializer but incomplete type + 18 | struct mnt_id_req req = { + | ^~~~~~~~~~ + +Link: https://lore.kernel.org/ltp/20250602170831.404641-1-pvorel@suse.cz/ +Fixes: 5c5411ea8e ("Add listmount/statmount fallback declarations") +Reviewed-by: Cyril Hrubis +Acked-by: Jan Stancek +Signed-off-by: Petr Vorel +Upstream: https://github.com/linux-test-project/ltp/commit/3ef4bac1dd253628dfdb8a823b51ae0d24fa0616 +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9ff098b273..69c5be7362 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -254,8 +254,10 @@ AC_CHECK_TYPES([struct mount_attr],,,[ + + AC_CHECK_TYPES([struct cachestat_range],,,[#include ]) + AC_CHECK_TYPES([struct cachestat],,,[#include ]) +-AC_CHECK_TYPES([struct mnt_id_req],,,[#include ]) +-AC_CHECK_TYPES([struct statmount],,,[#include ]) ++ ++# Defined in , but include/lapi/mount.h includes */ ++AC_CHECK_TYPES([struct mnt_id_req],,,[#include ]) ++AC_CHECK_TYPES([struct statmount],,,[#include ]) + + # Tools knobs + +-- +2.50.0 + diff --git a/package/ltp-testsuite/0002-statmount02-Remove-linux-btrfs.h.patch b/package/ltp-testsuite/0002-statmount02-Remove-linux-btrfs.h.patch new file mode 100644 index 0000000000..c82c422000 --- /dev/null +++ b/package/ltp-testsuite/0002-statmount02-Remove-linux-btrfs.h.patch @@ -0,0 +1,52 @@ +From fe8c0dac5ab4aa49c4f977d14f8a8d24cefa6435 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Wed, 4 Jun 2025 16:13:18 +0200 +Subject: [PATCH] statmount02: Remove + +statmount02.c does not need because it's skipped. + +Avoid using it fixes the problem due the old problem of indirect include + by on Alpine v3.22 (the default Alpine +version in GitHub action), which uses 6.14.2 kernel headers: + + In file included from /usr/include/linux/fs.h:19, + from /usr/include/linux/btrfs.h:29, + from statmount02.c:23: + /usr/include/linux/mount.h:155:8: error: redefinition of 'struct statmount' + 155 | struct statmount { + | ^~~~~~~~~ + In file included from statmount.h:12, + from statmount02.c:20: + ../../../../include/lapi/mount.h:58:8: note: originally defined here + 58 | struct statmount { + | ^~~~~~~~~ + /usr/include/linux/mount.h:193:8: error: redefinition of 'struct mnt_id_req' + 193 | struct mnt_id_req { + | ^~~~~~~~~~ + ../../../../include/lapi/mount.h:49:8: note: originally defined here + 49 | struct mnt_id_req { + | ^~~~~~~~~~ + +Fixes: 5f9942dffe ("Add statmount02 test") +Suggested-by: Jan Stancek +Signed-off-by: Petr Vorel +Upstream: https://github.com/linux-test-project/ltp/commit/fe8c0dac5ab4aa49c4f977d14f8a8d24cefa6435 +--- + testcases/kernel/syscalls/statmount/statmount02.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/statmount/statmount02.c b/testcases/kernel/syscalls/statmount/statmount02.c +index 504c558a11..07f877e040 100644 +--- a/testcases/kernel/syscalls/statmount/statmount02.c ++++ b/testcases/kernel/syscalls/statmount/statmount02.c +@@ -20,7 +20,6 @@ + #include "statmount.h" + #include "lapi/stat.h" + #include "lapi/sched.h" +-#include + + #define MNTPOINT "mntpoint" + +-- +2.50.0 + diff --git a/package/ltp-testsuite/0003-tlibio-Detect-aio.h-support.patch b/package/ltp-testsuite/0003-tlibio-Detect-aio.h-support.patch new file mode 100644 index 0000000000..442e2fd96b --- /dev/null +++ b/package/ltp-testsuite/0003-tlibio-Detect-aio.h-support.patch @@ -0,0 +1,342 @@ +From 91e6272febf95e19a8300695dfc2089569adf9d8 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Sun, 27 Jul 2025 22:54:54 +0200 +Subject: [PATCH] tlibio: Detect support + +Some libc (i.e. uclibc-ng or uclibc) does not implement . +Requiring it for the core LTP library breaks build of these libc. +Restore unintentional removal in fed3e3ee63. + +Changes: +* Fix for all libc without support: previous check + 'defined(__linux__) && !defined(__UCLIBC__)' was uclibc-ng specific + (and check for __linux__ was not needed anyway). All of these used + prior fed3e3ee63 is replaced just by HAVE_AIO_H. +* Comment out also if block first and last 'line if (...) {' and '}' if + the block would be empty anyway. +* Further join preprocessor checks as code prior fed3e3ee63 contained + code compiled for old unixes (e.g. sgi), which fed3e3ee63 removed. +* Remove nested preprocessors checks in code which is already checked + (i.e. lio_wait4asyncio()). +* Fix wrong #endif comments. +* Add further cleanup of old unixes. + +I also wonder if #else part of struct lio_info_type Lio_info1[] +should be really defined for code without . + +Fixes: fed3e3ee63 ("lib/tlibio: Get rid of support for old UNIXes") +Fixes: https://autobuild.buildroot.org/results/f3e/f3e03b9a1a69988d6497f36c9d64a37a66e9ad20/ +Fixes: https://autobuild.buildroot.org/results/856/856365f467efc449faee1951250e63d8d4442bbc/ +Fixes: https://autobuild.buildroot.org/results/2ac/2ac08cecd6a505f1bac1a673efc280b3a8dcb23a/ +Fixes: https://autobuild.buildroot.org/results/59b/59b3ad33667b7e87c81e49dd434d5f494e189e0d/ +Fixes: https://autobuild.buildroot.org/results/b1a/b1a36f9971c97300670d8d772ace11e5fedceaaa/ +Reviewed-by: Li Wang +Acked-by: Cyril Hrubis +Signed-off-by: Petr Vorel +Upstream: https://github.com/linux-test-project/ltp/commit/91e6272febf95e19a8300695dfc2089569adf9d8 +--- + configure.ac | 1 + + lib/tlibio.c | 52 +++++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 44 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8ec37639c1..12025be51c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -48,6 +48,7 @@ AC_CHECK_DECLS([PR_CAPBSET_DROP, PR_CAPBSET_READ],,,[#include ]) + AC_CHECK_DECLS([SEM_STAT_ANY],,,[#include ]) + + AC_CHECK_HEADERS_ONCE([ \ ++ aio.h \ + asm/ldt.h \ + asm/prctl.h \ + cpuid.h \ +diff --git a/lib/tlibio.c b/lib/tlibio.c +index b877393df2..70e0c6f7d2 100644 +--- a/lib/tlibio.c ++++ b/lib/tlibio.c +@@ -88,7 +88,9 @@ + #include + #include /* readv(2)/writev(2) */ + #include +-#include ++#ifdef HAVE_AIO_H ++# include ++#endif + #include /* atoi, abs */ + + #include "tlibio.h" /* defines LIO* macros */ +@@ -108,7 +110,7 @@ struct lio_info_type Lio_info1[] = { + {"b", LIO_IO_ASYNC | LIO_WAIT_SIGPAUSE, "async i/o using pause"}, + {"a", LIO_IO_ASYNC | LIO_WAIT_RECALL, + "async i/o using recall/aio_suspend"}, +-#if defined(sgi) || (defined(__linux__) && !defined(__UCLIBC__)) ++#ifdef HAVE_AIO_H + {"r", + LIO_RANDOM | LIO_IO_TYPES | LIO_WAIT_TYPES, + "random sync i/o types and wait methods"}, +@@ -159,7 +161,7 @@ char Lio_SysCall[PATH_MAX]; /* string containing last i/o system call */ + + static volatile int Received_signal = 0; /* number of signals received */ + static volatile int Rec_signal; +-#if defined(sgi) || (defined(__linux__) && !defined(__UCLIBC__)) ++#ifdef HAVE_AIO_H + static volatile int Received_callback = 0; /* number of callbacks received */ + static volatile int Rec_callback; + #endif +@@ -399,7 +401,7 @@ static void lio_async_signal_handler(int sig) + return; + } + +-#if defined(sgi) || (defined(__linux__) && !defined(__UCLIBC__)) ++#ifdef HAVE_AIO_H + /*********************************************************************** + * This is an internal callback handler. + * If the handler is called, it will increment the Received_callback +@@ -417,7 +419,7 @@ static void lio_async_callback_handler(union sigval sigval) + + return; + } +-#endif /* sgi */ ++#endif + + /*********************************************************************** + * lio_random_methods +@@ -515,9 +517,11 @@ int lio_write_buffer(int fd, /* open file descriptor */ + int omethod = method; + int listio_cmd; /* Holds the listio/lio_listio cmd */ + struct iovec iov; /* iovec for writev(2) */ ++#ifdef HAVE_AIO_H + struct aiocb aiocbp; /* POSIX aio control block */ + struct aiocb *aiolist[1]; /* list of aio control blocks for lio_listio */ + off64_t poffset; /* pwrite(2) offset */ ++#endif + + /* + * If LIO_RANDOM bit specified, get new method randomly. +@@ -536,12 +540,15 @@ int lio_write_buffer(int fd, /* open file descriptor */ + *errmsg = Errormsg; + + Rec_signal = Received_signal; /* get the current number of signals received */ ++#ifdef HAVE_AIO_H + Rec_callback = Received_callback; /* get the current number of callbacks received */ ++#endif + + memset(&iov, 0x00, sizeof(struct iovec)); + iov.iov_base = buffer; + iov.iov_len = size; + ++#ifdef HAVE_AIO_H + memset(&aiocbp, 0x00, sizeof(struct aiocb)); + + aiocbp.aio_fildes = fd; +@@ -589,6 +596,7 @@ int lio_write_buffer(int fd, /* open file descriptor */ + + poffset = (off64_t) ret; + aiocbp.aio_offset = ret; ++#endif + + /* + * If the LIO_USE_SIGNAL bit is not set, only use the signal +@@ -597,9 +605,9 @@ int lio_write_buffer(int fd, /* open file descriptor */ + * the signal. + */ + if (sig && !(method & LIO_USE_SIGNAL) && !(method & LIO_WAIT_SIGTYPES)) { +- + sig = 0; /* ignore signal parameter */ + } ++#ifdef HAVE_AIO_H + if (sig && (method & LIO_WAIT_CBTYPES)) + sig = 0; /* ignore signal parameter */ + +@@ -626,6 +634,7 @@ int lio_write_buffer(int fd, /* open file descriptor */ + aiocbp.aio_sigevent.sigev_notify_attributes = + (void *)(uintptr_t) size; + } ++#endif + + /* + * Determine the system call that will be called and produce +@@ -684,6 +693,7 @@ int lio_write_buffer(int fd, /* open file descriptor */ + } + + else if (method & LIO_IO_ASYNC) { ++#ifdef HAVE_AIO_H + sprintf(Lio_SysCall, + "aio_write(fildes=%d, buf, nbytes=%d, signo=%d)", fd, + size, sig); +@@ -705,9 +715,11 @@ int lio_write_buffer(int fd, /* open file descriptor */ + sigrelse(sig); + return -errno; + } ++#endif + } + /* LIO_IO_ASYNC */ + else if (method & LIO_IO_SLISTIO) { ++#ifdef HAVE_AIO_H + aiocbp.aio_lio_opcode = LIO_WRITE; + listio_cmd = LIO_WAIT; + io_type = "lio_listio(3) sync write"; +@@ -739,9 +751,11 @@ int lio_write_buffer(int fd, /* open file descriptor */ + + ret = lio_check_asyncio(io_type, size, &aiocbp, method); + return ret; ++#endif + } + /* LIO_IO_SLISTIO */ + else if (method & LIO_IO_ALISTIO) { ++#ifdef HAVE_AIO_H + aiocbp.aio_lio_opcode = LIO_WRITE; + listio_cmd = LIO_NOWAIT; + io_type = "lio_listio(3) async write"; +@@ -766,6 +780,7 @@ int lio_write_buffer(int fd, /* open file descriptor */ + sigrelse(sig); + return -errno; + } ++#endif + } + /* LIO_IO_ALISTIO */ + else if (method & LIO_IO_SYNCV) { +@@ -796,6 +811,7 @@ int lio_write_buffer(int fd, /* open file descriptor */ + + return ret; + } /* LIO_IO_SYNCV */ ++#ifdef HAVE_AIO_H + else if (method & LIO_IO_SYNCP) { + io_type = "pwrite(2)"; + +@@ -827,6 +843,7 @@ int lio_write_buffer(int fd, /* open file descriptor */ + + return ret; + } /* LIO_IO_SYNCP */ ++#endif + else { + printf("DEBUG %s/%d: No I/O method chosen\n", __FILE__, + __LINE__); +@@ -836,7 +853,9 @@ int lio_write_buffer(int fd, /* open file descriptor */ + /* + * wait for async io to complete. + */ ++#ifdef HAVE_AIO_H + ret = lio_wait4asyncio(method, fd, &aiocbp); ++#endif + + /* + * If there was an error waiting for async i/o to complete, +@@ -862,7 +881,9 @@ int lio_write_buffer(int fd, /* open file descriptor */ + * have been updated but the actual i/o size if returned. + */ + ++#ifdef HAVE_AIO_H + ret = lio_check_asyncio(io_type, size, &aiocbp, method); ++#endif + + return ret; + } /* end of lio_write_buffer */ +@@ -924,9 +945,11 @@ int lio_read_buffer(int fd, /* open file descriptor */ + int listio_cmd; /* Holds the listio/lio_listio cmd */ + int omethod = method; + struct iovec iov; /* iovec for readv(2) */ ++#ifdef HAVE_AIO_H + struct aiocb aiocbp; /* POSIX aio control block */ + struct aiocb *aiolist[1]; /* list of aio control blocks for lio_listio */ + off64_t poffset; /* pread(2) offset */ ++#endif + + /* + * If LIO_RANDOM bit specified, get new method randomly. +@@ -945,12 +968,15 @@ int lio_read_buffer(int fd, /* open file descriptor */ + *errmsg = Errormsg; + + Rec_signal = Received_signal; /* get the current number of signals received */ ++#ifdef HAVE_AIO_H + Rec_callback = Received_callback; /* get the current number of callbacks received */ ++#endif + + memset(&iov, 0x00, sizeof(struct iovec)); + iov.iov_base = buffer; + iov.iov_len = size; + ++#ifdef HAVE_AIO_H + memset(&aiocbp, 0x00, sizeof(struct aiocb)); + + aiocbp.aio_fildes = fd; +@@ -998,6 +1024,7 @@ int lio_read_buffer(int fd, /* open file descriptor */ + } + poffset = (off64_t) ret; + aiocbp.aio_offset = ret; ++#endif + + /* + * If the LIO_USE_SIGNAL bit is not set, only use the signal +@@ -1010,6 +1037,7 @@ int lio_read_buffer(int fd, /* open file descriptor */ + sig = 0; /* ignore signal parameter */ + } + ++#ifdef HAVE_AIO_H + if (sig && (method & LIO_WAIT_CBTYPES)) + sig = 0; /* ignore signal parameter */ + +@@ -1020,7 +1048,6 @@ int lio_read_buffer(int fd, /* open file descriptor */ + * old signal handler will not be restored. + *** restoring the signal handler could be added *** + */ +- + if (sig && (method & LIO_WAIT_SIGTYPES)) { + aiocbp.aio_sigevent.sigev_notify = SIGEV_SIGNAL; + aiocbp.aio_sigevent.sigev_signo = sig; +@@ -1035,6 +1062,7 @@ int lio_read_buffer(int fd, /* open file descriptor */ + aiocbp.aio_sigevent.sigev_notify_attributes = + (void *)(uintptr_t) size; + } ++#endif + + /* + * Determine the system call that will be called and produce +@@ -1093,6 +1121,7 @@ int lio_read_buffer(int fd, /* open file descriptor */ + wait4sync_io(fd, 1); + } + ++#ifdef HAVE_AIO_H + } else if (method & LIO_IO_ASYNC) { + sprintf(Lio_SysCall, + "aio_read(fildes=%d, buf, nbytes=%d, signo=%d)", fd, +@@ -1236,7 +1265,8 @@ int lio_read_buffer(int fd, /* open file descriptor */ + __FILE__, __LINE__, ret); + + return ret; +- } /* LIO_IO_SYNCP */ ++#endif ++ } + + else { + printf("DEBUG %s/%d: No I/O method chosen\n", __FILE__, +@@ -1248,7 +1278,9 @@ int lio_read_buffer(int fd, /* open file descriptor */ + * wait for async io to complete. + * Note: Sync io should have returned prior to getting here. + */ ++#ifdef HAVE_AIO_H + ret = lio_wait4asyncio(method, fd, &aiocbp); ++#endif + + /* + * If there was an error waiting for async i/o to complete, +@@ -1274,12 +1306,14 @@ int lio_read_buffer(int fd, /* open file descriptor */ + * have been updated but the actual i/o size if returned. + */ + ++#ifdef HAVE_AIO_H + ret = lio_check_asyncio(io_type, size, &aiocbp, method); ++#endif + + return ret; + } /* end of lio_read_buffer */ + +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#ifdef HAVE_AIO_H + /*********************************************************************** + * This function will check that async io was successful. + * It can also be used to check sync listio since it uses the +-- +2.50.0 + diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in index b42082e2cc..eafac0743c 100644 --- a/package/ltp-testsuite/Config.in +++ b/package/ltp-testsuite/Config.in @@ -5,8 +5,6 @@ config BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS # provided in ltp-testsuite default y if BR2_TOOLCHAIN_HAS_SYNC_4 default y if BR2_arc - # does not build on nios2, cachectl.h issue - depends on !BR2_nios2 config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 03aa586156..8ffde75e37 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20240524/ltp-full-20240524.tar.xz.sha256 -sha256 2b7c07bb281b7ec49981eeb06c4b66f147b103977254632678d384034f6e9663 ltp-full-20240524.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20250530/ltp-full-20250530.tar.xz.sha256 +sha256 27586ba78eac1e40cd422add2842f1ad70f09fea55da3bd6a25e10feb786d4f2 ltp-full-20250530.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index bbeb80c732..8be3b21b38 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,13 +4,16 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20240524 +LTP_TESTSUITE_VERSION = 20250530 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ LTP_TESTSUITE_LICENSE_FILES = COPYING +# 0001-configure-Fix-build-on-kernel-6.14-headers.patch +LTP_TESTSUITE_AUTORECONF = YES + LTP_TESTSUITE_CONF_OPTS += --disable-metadata ifeq ($(BR2_PACKAGE_LTP_TESTSUITE_OPEN_POSIX),y) @@ -77,7 +80,6 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_MUSL) += \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ - testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ testcases/kernel/syscalls/timer_create/timer_create01.c \ testcases/kernel/syscalls/timer_create/timer_create03.c diff --git a/package/ltrace/ltrace.hash b/package/ltrace/ltrace.hash index a677ed3511..cb505b46c3 100644 --- a/package/ltrace/ltrace.hash +++ b/package/ltrace/ltrace.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4aecf69e4a33331aed1e50ce4907e73a98cbccc4835febc3473863474304d547 ltrace-82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4.tar.gz +sha256 11c85a1353fcf2b5438b19d0ccc2d376c96656ce6f11cf9537e3a92b84392c58 ltrace-0.8.1.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index b3bd90daaa..61d1a13809 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -4,11 +4,8 @@ # ################################################################################ -# This github version has some extra fixes on top of https://ltrace.org/ -# in particular the following commit to avoid a crash: -# 192e0a6 void struct members are now ignored -LTRACE_VERSION = 82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4 -LTRACE_SITE = $(call github,dkogan,ltrace,$(LTRACE_VERSION)) +LTRACE_VERSION = 0.8.1 +LTRACE_SITE = $(call gitlab,cespedes,ltrace,$(LTRACE_VERSION)) LTRACE_DEPENDENCIES = elfutils LTRACE_CONF_OPTS = --disable-werror LTRACE_LICENSE = GPL-2.0 diff --git a/package/lua-iconv/Config.in b/package/lua-iconv/Config.in index e76019d676..73c2af9bfb 100644 --- a/package/lua-iconv/Config.in +++ b/package/lua-iconv/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUA_ICONV help Lua binding to the POSIX 'iconv' library - http://ittner.github.io/lua-iconv/ + https://github.com/lunarmodules/lua-iconv diff --git a/package/lua-iconv/lua-iconv.hash b/package/lua-iconv/lua-iconv.hash index b28ce0b31c..d534295258 100644 --- a/package/lua-iconv/lua-iconv.hash +++ b/package/lua-iconv/lua-iconv.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa lua-iconv-7-1.src.rock -sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4 lua-iconv-7/COPYING +sha256 fdcb6b3fdae53967451054a87b1c977d87aeaa88f2d9518c0e316efb777d65f4 lua-iconv-7.1.0-1.src.rock +sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4 lua-iconv/COPYING diff --git a/package/lua-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk index ea8e0dd8b6..23f4b31b4c 100644 --- a/package/lua-iconv/lua-iconv.mk +++ b/package/lua-iconv/lua-iconv.mk @@ -4,7 +4,8 @@ # ################################################################################ -LUA_ICONV_VERSION = 7-1 +LUA_ICONV_VERSION = 7.1.0-1 +LUA_ICONV_SUBDIR = lua-iconv LUA_ICONV_LICENSE = MIT LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/package/lua-lrexlib-pcre2/Config.in b/package/lua-lrexlib-pcre2/Config.in new file mode 100644 index 0000000000..0d73ee8d6e --- /dev/null +++ b/package/lua-lrexlib-pcre2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUA_LREXLIB_PCRE2 + bool "lua-lrexlib-pcre2" + select BR2_PACKAGE_PCRE2 + help + Regular expression library binding (PCRE2 flavour). + + https://github.com/rrthomas/lrexlib diff --git a/package/lua-lrexlib-pcre2/lua-lrexlib-pcre2.hash b/package/lua-lrexlib-pcre2/lua-lrexlib-pcre2.hash new file mode 100644 index 0000000000..090b83d48a --- /dev/null +++ b/package/lua-lrexlib-pcre2/lua-lrexlib-pcre2.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 9bb1cb2f307eb70d66fdab499864de732c891aace0ceb6a338194e2e6631b9c3 lrexlib-pcre2-2.9.2-1.src.rock +sha256 067992fa7c5866e01d6c8fe93dfa1e1456a6ac81fa59ccdc72f5adcd6e5b3690 lrexlib/LICENSE diff --git a/package/lua-lrexlib-pcre2/lua-lrexlib-pcre2.mk b/package/lua-lrexlib-pcre2/lua-lrexlib-pcre2.mk new file mode 100644 index 0000000000..3d0c3c57fc --- /dev/null +++ b/package/lua-lrexlib-pcre2/lua-lrexlib-pcre2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lua-lrexlib-pcre2 +# +################################################################################ + +LUA_LREXLIB_PCRE2_VERSION = 2.9.2-1 +LUA_LREXLIB_PCRE2_NAME_UPSTREAM = Lrexlib-PCRE2 +LUA_LREXLIB_PCRE2_SUBDIR = lrexlib +LUA_LREXLIB_PCRE2_LICENSE = MIT +LUA_LREXLIB_PCRE2_LICENSE_FILES = $(LUA_LREXLIB_PCRE2_SUBDIR)/LICENSE +LUA_LREXLIB_PCRE2_DEPENDENCIES = pcre2 + +$(eval $(luarocks-package)) diff --git a/package/lua-lsdbus/lua-lsdbus.hash b/package/lua-lsdbus/lua-lsdbus.hash index 43029f61e9..d6f30c0529 100644 --- a/package/lua-lsdbus/lua-lsdbus.hash +++ b/package/lua-lsdbus/lua-lsdbus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 33d14d52df702dbb2b1e5b7770cb4e4efb11df2da0b743c5f9a19e16a09783fe lua-lsdbus-ae5e674e5e792dd72e4164c436ca7b064158e7c6.tar.gz +sha256 fce5db789b18663c5c48010eaa0b3411f63a7f0b3c70c761535c0d5e3f9f5e11 lua-lsdbus-3704232a634d1c866275b9a138b860421fd1c8ac.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/lua-lsdbus/lua-lsdbus.mk b/package/lua-lsdbus/lua-lsdbus.mk index 606fa16c5e..d398af029f 100644 --- a/package/lua-lsdbus/lua-lsdbus.mk +++ b/package/lua-lsdbus/lua-lsdbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LSDBUS_VERSION = ae5e674e5e792dd72e4164c436ca7b064158e7c6 +LUA_LSDBUS_VERSION = 3704232a634d1c866275b9a138b860421fd1c8ac LUA_LSDBUS_SITE = $(call github,kmarkus,lsdbus,$(LUA_LSDBUS_VERSION)) LUA_LSDBUS_DEPENDENCIES = luainterpreter mxml systemd LUA_LSDBUS_LICENSE = LGPL-2.1 diff --git a/package/lua-periphery/lua-periphery.hash b/package/lua-periphery/lua-periphery.hash index d1331a489f..b09dbe7c5f 100644 --- a/package/lua-periphery/lua-periphery.hash +++ b/package/lua-periphery/lua-periphery.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ff8a4d08f02356586fadfe47f01859ba28539cc42013836f79a032bf4ccc78b3 lua-periphery-1.1.1-1.src.rock -sha256 7c60847b46f718e9651d1eca2f56bf6be09608cf08d130446a521eb8288c98e1 lua-periphery/LICENSE +sha256 cd8ecf48e1dd53244f7e108e5e77f8a1c78949e8decd7ada1a881c6178b840e6 lua-periphery-2.4.3-1.src.rock +sha256 fd3377c82df42bd00d8ac9c25d22dc63f80b7a491b84f2ba82d2a7621432c511 lua-periphery/LICENSE diff --git a/package/lua-periphery/lua-periphery.mk b/package/lua-periphery/lua-periphery.mk index af5abe70df..f0a52bf8b3 100644 --- a/package/lua-periphery/lua-periphery.mk +++ b/package/lua-periphery/lua-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_PERIPHERY_VERSION = 1.1.1-1 +LUA_PERIPHERY_VERSION = 2.4.3-1 LUA_PERIPHERY_SUBDIR = lua-periphery LUA_PERIPHERY_LICENSE = MIT LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash index b4d455ceb7..8973b4bffb 100644 --- a/package/lua-utf8/lua-utf8.hash +++ b/package/lua-utf8/lua-utf8.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 68bd8e3c3e20f98fceb9e20d5a7a50168202c22eb45b87eff3247a0608f465ae luautf8-0.1.5-2.src.rock -sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.5/LICENSE +sha256 37901bc127c4afe9f611bba58af7b12eda6599fc270e1706e2f767807dfacd82 luautf8-0.1.6-1.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.6/LICENSE diff --git a/package/lua-utf8/lua-utf8.mk b/package/lua-utf8/lua-utf8.mk index 33c34a4eb2..991ebfa2f9 100644 --- a/package/lua-utf8/lua-utf8.mk +++ b/package/lua-utf8/lua-utf8.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_UTF8_VERSION = 0.1.5-2 +LUA_UTF8_VERSION = 0.1.6-1 LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE diff --git a/package/lua-zlib/lua-zlib.hash b/package/lua-zlib/lua-zlib.hash index cef29efb10..c092ea431a 100644 --- a/package/lua-zlib/lua-zlib.hash +++ b/package/lua-zlib/lua-zlib.hash @@ -1,2 +1,2 @@ # computed by luarocks/buildroot -sha256 42436ba2b78c9a2d515d6da59ceb12cdea7f84c9ce3c859d91addb42badd4061 lua-zlib-1.2-0.src.rock +sha256 65e90d13f9da12168276d5533b1989ad0d8fc806ee93152b52106a6f2c52c1ae lua-zlib-1.3-0.src.rock diff --git a/package/lua-zlib/lua-zlib.mk b/package/lua-zlib/lua-zlib.mk index 23e2a8ae32..cc58073716 100644 --- a/package/lua-zlib/lua-zlib.mk +++ b/package/lua-zlib/lua-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_ZLIB_VERSION = 1.2-0 +LUA_ZLIB_VERSION = 1.3-0 LUA_ZLIB_SUBDIR = lua-zlib LUA_ZLIB_LICENSE = MIT LUA_ZLIB_DEPENDENCIES = zlib diff --git a/package/lua/5.1.5/0003-Fix-stack-overflow-in-vararg-functions.patch b/package/lua/5.1.5/0003-Fix-stack-overflow-in-vararg-functions.patch new file mode 100644 index 0000000000..00142d2338 --- /dev/null +++ b/package/lua/5.1.5/0003-Fix-stack-overflow-in-vararg-functions.patch @@ -0,0 +1,24 @@ +From: Enrico Tassi +Date: Tue, 26 Aug 2014 16:20:55 +0200 +Subject: Fix stack overflow in vararg functions + +CVE: CVE-2014-5461 +Upstream: https://sources.debian.org/data/main/l/lua5.1/5.1.5-11/debian/patches/0004-Fix-stack-overflow-in-vararg-functions.patch +Signed-off-by: Thomas Perale +--- + src/ldo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ldo.c b/src/ldo.c +index d1bf786..30333bf 100644 +--- a/src/ldo.c ++++ b/src/ldo.c +@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) { + CallInfo *ci; + StkId st, base; + Proto *p = cl->p; +- luaD_checkstack(L, p->maxstacksize); ++ luaD_checkstack(L, p->maxstacksize + p->numparams); + func = restorestack(L, funcr); + if (!p->is_vararg) { /* no varargs? */ + base = func + 1; diff --git a/package/lua/5.4.8/0001-root-path.patch b/package/lua/5.4.8/0001-root-path.patch new file mode 100644 index 0000000000..cec9066eee --- /dev/null +++ b/package/lua/5.4.8/0001-root-path.patch @@ -0,0 +1,18 @@ +Adjust installation location to /usr. + +Upstream: N/A specific for Buildroot build +Signed-off-by: Francois Perrad + +Index: b/src/luaconf.h +=================================================================== +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -223,7 +223,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + diff --git a/package/lua/5.4.8/0002-shared-libs-for-lua.patch b/package/lua/5.4.8/0002-shared-libs-for-lua.patch new file mode 100644 index 0000000000..6115960956 --- /dev/null +++ b/package/lua/5.4.8/0002-shared-libs-for-lua.patch @@ -0,0 +1,79 @@ +Add the compilation of a shared library. +Compile the lua binary with the shared library. +And install the shared library. +The variable BUILDMODE allows to switch between static and dynamic mode. + +Upstream: N/A specific for Buildroot build +Signed-off-by: Francois Perrad + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -42,6 +42,7 @@ + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp + TO_LIB= liblua.a ++TO_SOLIB = liblua.so.$(R) + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -57,6 +58,8 @@ + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) ++ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || : ++ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || : + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) +Index: b/src/Makefile +=================================================================== +--- a/src/Makefile ++++ b/src/Makefile +@@ -33,6 +33,7 @@ + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,8 +45,13 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) ++ifneq (dynamic,$(BUILDMODE)) + ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++else ++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) ++endif + ALL_A= $(LUA_A) ++ALL_SO= $(LUA_SO) + + # Targets start here. + default: $(PLAT) +@@ -56,12 +62,23 @@ + + a: $(ALL_A) + ++so: $(ALL_SO) ++ + $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? ++ ln -fs $@.$(PKG_VERSION) $@ ++ ++ifneq (dynamic,$(BUILDMODE)) + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++else ++$(LUA_T): $(LUA_O) $(LUA_SO) ++ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS) ++endif + + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/package/lua/5.4.8/0003-linenoise.patch b/package/lua/5.4.8/0003-linenoise.patch new file mode 100644 index 0000000000..a82c8801ad --- /dev/null +++ b/package/lua/5.4.8/0003-linenoise.patch @@ -0,0 +1,24 @@ +Add support of linenoise (replace readline) + +Upstream: http://lua-users.org/lists/lua-l/2010-03/msg00879.html +Signed-off-by: Francois Perrad + +Index: b/src/lua.c +=================================================================== +--- a/src/lua.c ++++ b/src/lua.c +@@ -447,6 +447,14 @@ + #define lua_saveline(L,line) ((void)L, add_history(line)) + #define lua_freeline(L,b) ((void)L, free(b)) + ++#elif defined(LUA_USE_LINENOISE) ++ ++#include ++#define lua_initreadline(L) ((void)L) ++#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) ++#define lua_saveline(L,line) ((void)L, linenoiseHistoryAdd(line)) ++#define lua_freeline(L,b) ((void)L, free(b)) ++ + #else /* }{ */ + + #define lua_initreadline(L) ((void)L) diff --git a/package/lua/5.4.8/lua.hash b/package/lua/5.4.8/lua.hash new file mode 100644 index 0000000000..8494511529 --- /dev/null +++ b/package/lua/5.4.8/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 4f18ddae154e793e46eeab727c59ef1c0c0c2b744e7b94219710d76f530629ae lua-5.4.8.tar.gz + +# Locally computed +sha256 3773a4900f3539c56aea9d6cd48d71c8751d495c4abc28472706bb9553d1493c doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 15772dbdf3..269eafe4bb 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.7 +LUA_VERSION = 5.4.8 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else @@ -21,6 +21,12 @@ LUA_LICENSE_FILES = COPYRIGHT endif LUA_CPE_ID_VENDOR = lua +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +# Only affect lua version 5.1.5 +# 5.1.5/0003-Fix-stack-overflow-in-vararg-functions.patch +LUA_IGNORE_CVES += CVE-2014-5461 +endif + LUA_PROVIDES = luainterpreter LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.hash b/package/luadbi-sqlite3/luadbi-sqlite3.hash index 4096fbb26a..96f083dcb8 100644 --- a/package/luadbi-sqlite3/luadbi-sqlite3.hash +++ b/package/luadbi-sqlite3/luadbi-sqlite3.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 c5b043db43941a3c6e43d3e3699236846ed6d03a6c4cb12fa1a497f965138d9f luadbi-sqlite3-0.7.2-1.src.rock +sha256 ab4b0b47614aa26c143da0e164476779bfdd406d263e0c4184a97d59f0430cdf luadbi-sqlite3-0.7.3-1.src.rock sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.mk b/package/luadbi-sqlite3/luadbi-sqlite3.mk index 4ae2b5cf38..ea01671605 100644 --- a/package/luadbi-sqlite3/luadbi-sqlite3.mk +++ b/package/luadbi-sqlite3/luadbi-sqlite3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUADBI_SQLITE3_VERSION = 0.7.2-1 +LUADBI_SQLITE3_VERSION = 0.7.3-1 LUADBI_SQLITE3_SUBDIR = luadbi LUADBI_SQLITE3_LICENSE = MIT LUADBI_SQLITE3_LICENSE_FILES = $(LUADBI_SQLITE3_SUBDIR)/COPYING diff --git a/package/luadbi/luadbi.hash b/package/luadbi/luadbi.hash index e142f5e62e..992de9571f 100644 --- a/package/luadbi/luadbi.hash +++ b/package/luadbi/luadbi.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 9ebbbaf4ea1f48628341e9ff3c1de10a57200c02453734f41b8016b0fc7b4956 luadbi-0.7.2-1.src.rock +sha256 b1b6abd58a7b9cb51ccf67be903d5cbace9721c35dbf799379ffd57f45b40f12 luadbi-0.7.3-1.src.rock sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/package/luadbi/luadbi.mk b/package/luadbi/luadbi.mk index fbae6b319c..6f617fdc2b 100644 --- a/package/luadbi/luadbi.mk +++ b/package/luadbi/luadbi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUADBI_VERSION = 0.7.2-1 +LUADBI_VERSION = 0.7.3-1 LUADBI_SUBDIR = luadbi LUADBI_LICENSE = MIT LUADBI_LICENSE_FILES = $(LUADBI_SUBDIR)/COPYING diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index 621293a0b9..91fc9177c1 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 eb7abc4cc39dd50eecb30896686bac84e66fd3c0774d0749b391e7ac5d222f45 luaexpat-1.5.1-1.src.rock -sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE +sha256 a88ac147d2ceaf168fddedd2245928f35d4c0218094142b054db7e9bae0b5b82 luaexpat-1.5.2-1.src.rock +sha256 9a169eddcc5b1f05e85659a0ba5403a7e3804bc3b6e60b730251d963e1a9ac10 luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index 73675a8ee6..86d800d690 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.5.1-1 +LUAEXPAT_VERSION = 1.5.2-1 LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE diff --git a/package/luajit/0001-no-bin-symlink.patch b/package/luajit/0001-no-bin-symlink.patch index ea0e5bf8d0..3141d2adba 100644 --- a/package/luajit/0001-no-bin-symlink.patch +++ b/package/luajit/0001-no-bin-symlink.patch @@ -6,7 +6,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -50,8 +50,7 @@ +@@ -51,8 +51,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig @@ -16,7 +16,7 @@ Index: b/Makefile INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_SOSHORT1= libluajit-$(ABIVER).so INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) -@@ -66,7 +65,6 @@ +@@ -67,7 +66,6 @@ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) diff --git a/package/luajit/0002-install-inc.patch b/package/luajit/0002-install-inc.patch index eec77a5f82..ff4d169afb 100644 --- a/package/luajit/0002-install-inc.patch +++ b/package/luajit/0002-install-inc.patch @@ -6,12 +6,12 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -38,7 +38,7 @@ - INSTALL_BIN= $(DPREFIX)/bin +@@ -39,7 +39,7 @@ INSTALL_LIB= $(DPREFIX)/$(MULTILIB) - INSTALL_SHARE= $(DPREFIX)/share + INSTALL_SHARE_= $(PREFIX)/share + INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_) -INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) +INSTALL_DEFINC= $(DPREFIX)/include INSTALL_INC= $(INSTALL_DEFINC) - export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) + export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index eddd2a2419..e147845e4c 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7 luajit-97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz +sha256 ab3f16d82df6946543565cfb0d2810d387d79a3a43e0431695b03466188e2680 luajit-871db2c84ecefd70a850e03a6c340214a81739f0.tar.gz # Locally calculated -sha256 1130331ac861a4b4520e9c8ad0814efdc6f1e79ea55ea9c460c73733d13ccb5f COPYRIGHT +sha256 5b79fb4754728487cf43d55b213bb68369912484f2dd7ab68380435e994bce39 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 301973db7e..ed44e165c2 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,11 +4,28 @@ # ################################################################################ -LUAJIT_VERSION = 97813fb924edf822455f91a5fbbdfdb349e5984f +LUAJIT_VERSION = 871db2c84ecefd70a850e03a6c340214a81739f0 LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT LUAJIT_CPE_ID_VENDOR = luajit +LUAJIT_CPE_ID_VERSION = 2.1.0 +LUAJIT_CPE_ID_UPDATE = beta3 + +# Fixed in 53f82e6e2e858a0a62fd1a2ff47e9866693382e6 +LUAJIT_IGNORE_CVES += CVE-2020-15890 + +# Fixed in e296f56b825c688c3530a981dc6b495d972f3d01 +LUAJIT_IGNORE_CVES += CVE-2020-24372 + +# Fixed in 343ce0edaf3906a62022936175b2f5410024cbfc +LUAJIT_IGNORE_CVES += CVE-2024-25176 + +# Fixed in 85b4fed0b0353dd78c8c875c2f562d522a2b310f +LUAJIT_IGNORE_CVES += CVE-2024-25177 + +# Fixed in defe61a56751a0db5f00ff3ab7b8f45436ba74c8 +LUAJIT_IGNORE_CVES += CVE-2024-25178 LUAJIT_INSTALL_STAGING = YES diff --git a/package/luaossl/luaossl.hash b/package/luaossl/luaossl.hash index bf08fbd51e..734c916f5a 100644 --- a/package/luaossl/luaossl.hash +++ b/package/luaossl/luaossl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 d711c86f433def90f63cb6747fe0bebaac604b868de6a9a35e4da2bb4e0967be luaossl-20220711-0.src.rock -sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20220711/LICENSE +sha256 19cfc635dd804bde649a8db1ffae01e5fc0cdfac2630fb73c617fe6d8a0bfd30 luaossl-20250929-0.src.rock +sha256 421c26c8788c46fd59e4dbfe5bf8eab6c21e37ce3ca8cb44dfff5dc179098756 luaossl-rel-20250929/LICENSE diff --git a/package/luaossl/luaossl.mk b/package/luaossl/luaossl.mk index a6283a520e..079d1e0ca4 100644 --- a/package/luaossl/luaossl.mk +++ b/package/luaossl/luaossl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAOSSL_VERSION_UPSTREAM = 20220711 +LUAOSSL_VERSION_UPSTREAM = 20250929 LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0 LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM) LUAOSSL_LICENSE = MIT diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash index d54395c29b..fbcc0dd6fa 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 44e5087cd3c47058f9934b90c0017e4cf870b71619f99707dd433074622debb1 luaposix-36.2.1.tar.gz -sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE +sha256 82cd9a96c41a4a3205c050206f0564ff4456f773a8f9ffc9235ff8f1907ca5e6 luaposix-36.3.tar.gz +sha256 0aaf3d6797693f3ea0ef4df2cb4d43627b00eb08213ead4fb037a8c4a04f8631 LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index c5d98fbbd4..46be3b42a5 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 36.2.1 +LUAPOSIX_VERSION = 36.3 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 15a44f9dbe..9c69e31dd9 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102 luarocks-3.11.1.tar.gz +sha256 b0e0c85205841ddd7be485f53d6125766d18a81d226588d2366931e9a1484492 luarocks-3.12.2.tar.gz sha256 660773f53ed17cd0d8be7d67168c25e8cc664a506788c7b5971192bdd2994a9d COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index cf5f966cd5..43d099726f 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.11.1 +LUAROCKS_VERSION = 3.12.2 LUAROCKS_SITE = https://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING diff --git a/package/lugaru/Config.in b/package/lugaru/Config.in index 4454ebcd06..904652d99b 100644 --- a/package/lugaru/Config.in +++ b/package/lugaru/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LUGARU depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX) - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_USE_MMU # SDL2 OpenGL (GLX) depends on !BR2_STATIC_LIBS # SDL2 @@ -29,10 +29,10 @@ config BR2_PACKAGE_LUGARU https://osslugaru.gitlab.io/ -comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.9, NPTL, dynamic library" +comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 9, NPTL, dynamic library" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS diff --git a/package/lugaru/lugaru.mk b/package/lugaru/lugaru.mk index 53797f405e..57ec9fef3a 100644 --- a/package/lugaru/lugaru.mk +++ b/package/lugaru/lugaru.mk @@ -5,7 +5,7 @@ ################################################################################ LUGARU_VERSION = 1.2 -LUGARU_SITE = https://bitbucket.org/osslugaru/lugaru/downloads +LUGARU_SITE = https://github.com/osslugaru/lugaru/releases/download/$(LUGARU_VERSION) LUGARU_SOURCE = lugaru-$(LUGARU_VERSION).tar.xz LUGARU_LICENSE = GPL-2.0+, CC-BY-SA-3.0 (Wolfire and Slib assets), \ diff --git a/package/luksmeta/luksmeta.hash b/package/luksmeta/luksmeta.hash index b367f29a5c..5936fb56f3 100644 --- a/package/luksmeta/luksmeta.hash +++ b/package/luksmeta/luksmeta.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ca0c35b551b331ba1444fc9d36e8c48ff8cae53dd4e6155b028e8904edc202a luksmeta-9.tar.bz2 +sha256 a842538ba39680c8319c41dac0bcc082fe40fb43342561761925c0daa1a48f28 luksmeta-10.tar.bz2 sha256 4b72eb6b5a336cd3ec837cc2d6347c23bf7574168db6b4802267700b93021abf COPYING diff --git a/package/luksmeta/luksmeta.mk b/package/luksmeta/luksmeta.mk index 129713aec8..bfbda9fb36 100644 --- a/package/luksmeta/luksmeta.mk +++ b/package/luksmeta/luksmeta.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUKSMETA_VERSION = 9 +LUKSMETA_VERSION = 10 LUKSMETA_SOURCE = luksmeta-$(LUKSMETA_VERSION).tar.bz2 LUKSMETA_SITE = https://github.com/latchset/luksmeta/releases/download/v$(LUKSMETA_VERSION) LUKSMETA_LICENSE = LGPL-2.1+ diff --git a/package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch b/package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch new file mode 100644 index 0000000000..d29ba37bcf --- /dev/null +++ b/package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch @@ -0,0 +1,80 @@ +From 52bc36f5a548543835c24b87e7b7b72a327b1df7 Mon Sep 17 00:00:00 2001 +From: RDW +Date: Sun, 14 Sep 2025 00:33:10 +0200 +Subject: [PATCH] Selectively disable GCC diagnostics in ocsp.c + +GCC 14 fails to compile the library because -Wincompatible-pointer-types is now fatal. +Since the warning is already disabled for clang here, might as well include GCC also. +Needless to say, this is a workaround and a proper fix would require upstream changes. + +Upstream: https://github.com/zhaozg/lua-openssl/commit/bfeedbe8c06d8b4400fa670edecd452a433ddac4 +[Romain: + - rebase on lua-openssl 0.9.0-0 + - format the patch as luvi patch (patching lua-openssl submodule) +] +Signed-off-by: Romain Naour +--- + deps/lua-openssl/src/ocsp.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/deps/lua-openssl/src/ocsp.c b/deps/lua-openssl/src/ocsp.c +index ac67a53..00e3b61 100644 +--- a/deps/lua-openssl/src/ocsp.c ++++ b/deps/lua-openssl/src/ocsp.c +@@ -183,15 +183,26 @@ static int openssl_ocsp_request_read(lua_State *L) + BIO *bio = load_bio_object(L, 1); + int pem = lua_gettop(L) > 1 ? auxiliar_checkboolean(L, 2) : 0; + ++#if defined(__GNUC__) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++ + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wincompatible-pointer-types" + #endif + OCSP_REQUEST *req = pem ? PEM_read_bio_OCSP_REQUEST(bio, NULL, NULL) + : d2i_OCSP_REQUEST_bio(bio, NULL); ++ ++#if defined(__GNUC__) ++#pragma GCC diagnostic pop ++#endif ++ + #if defined(__clang__) + #pragma clang diagnostic pop + #endif ++ + BIO_free(bio); + + if (req) +@@ -359,15 +370,26 @@ static int openssl_ocsp_response_read(lua_State *L) + int pem = lua_gettop(L) > 1 ? auxiliar_checkboolean(L, 2) : 0; + int ret = 0; + ++#if defined(__GNUC__) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++ + #if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wincompatible-pointer-types" + #endif + OCSP_RESPONSE *res = pem ? PEM_read_bio_OCSP_RESPONSE(bio, NULL, NULL) + : d2i_OCSP_RESPONSE_bio(bio, NULL); ++ ++#if defined(__GNUC__) ++#pragma GCC diagnostic pop ++#endif ++ + #if defined(__clang__) + #pragma clang diagnostic pop + #endif ++ + if (res) + { + PUSH_OBJECT(res, "openssl.ocsp_response"); +-- +2.51.0 + diff --git a/package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch b/package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch new file mode 100644 index 0000000000..b658fed202 --- /dev/null +++ b/package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch @@ -0,0 +1,54 @@ +From c82c147e83d6a21f572353bf6e95dcf3a736490c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 13 Sep 2025 23:21:04 +0200 +Subject: [PATCH] CMakeLists.txt: disable Wincompatible-pointer-types for gcc + >= 14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport partially a patch [1] disabling GCC 14 warning +Wincompatible-pointer-types. + +From [1]: +"lua-openssl triggering the incompatible pointer types error by +silencing the warning, which lua-openssl does internally but only for +clang." + +Latest lua-openssl version (0.9.1-0) also disable this warning [2]. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/11271124430 (TestLuvi) + +[1] https://github.com/luvit/luvi/commit/85d7d7bf51bc523159ad579d846cbefbbff38fdb +[2] https://github.com/zhaozg/lua-openssl/commit/bfeedbe8c06d8b4400fa670edecd452a433ddac4 + +Upstream: https://github.com/luvit/luvi/commit/85d7d7bf51bc523159ad579d846cbefbbff38fdb + +Signed-off-by: Romain Naour +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b0007d..bf10de5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,6 +141,14 @@ if (WIN32) + add_library (luvi_renamed src/luvi_renamed.c) + endif () + ++if (CMAKE_C_COMPILER_ID MATCHES "Clang|GNU") ++ add_compile_options(-Wno-incompatible-pointer-types) ++endif() ++ ++if(UNIX) ++ add_definitions(-Wall) ++endif() ++ + if (WITH_LUA_ENGINE STREQUAL Lua) + add_definitions(-DWITH_PLAIN_LUA) + endif () +-- +2.51.0 + diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index 3518a2dc85..d8825487db 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4be4468d01657100967a9c696f503aa3c30de6f23af39050c1aae909fbf0aaf2 luvi-src-v2.14.0.tar.gz +sha256 f933bf1899a5419b26d46d7f111aaa50101831922716ffaed62e355b1bc9de1d luvi-v2.15.0-git4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index ebd1066c5c..78de76aa45 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,9 +4,10 @@ # ################################################################################ -LUVI_VERSION = 2.14.0 -LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz -LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) +LUVI_VERSION = v2.15.0 +LUVI_SITE = https://github.com/luvit/luvi.git +LUVI_SITE_METHOD = git +LUVI_GIT_SUBMODULES = YES LUVI_LICENSE = Apache-2.0 LUVI_LICENSE_FILES = LICENSE.txt LUVI_DEPENDENCIES = libuv luajit luv host-luajit host-pkgconf @@ -44,12 +45,12 @@ LUVI_CONF_OPTS = \ -DTARGET_ARCH=$(LUVI_TARGET_ARCH) \ -DLUA_PATH=$(HOST_DIR)/share/luajit-$(LUVI_LUAJIT_MAJVER).$(LUVI_LUAJIT_MINVER)/?.lua -# Add "rex" module (PCRE via bundled lrexlib) -ifeq ($(BR2_PACKAGE_PCRE),y) -LUVI_DEPENDENCIES += pcre -LUVI_CONF_OPTS += -DWithPCRE=ON -DWithSharedPCRE=ON +# Add "rex" module (PCRE2 via bundled lrexlib) +ifeq ($(BR2_PACKAGE_PCRE2),y) +LUVI_DEPENDENCIES += pcre2 +LUVI_CONF_OPTS += -DWithPCRE2=ON -DWithSharedPCRE2=ON else -LUVI_CONF_OPTS += -DWithPCRE=OFF -DWithSharedPCRE=OFF +LUVI_CONF_OPTS += -DWithPCRE2=OFF -DWithSharedPCRE2=OFF endif # Add "ssl" module (via bundled lua-openssl) diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk index 2dde9b907c..cef90d13f0 100644 --- a/package/lv2/lv2.mk +++ b/package/lv2/lv2.mk @@ -24,10 +24,6 @@ ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LV2_DEPENDENCIES += libsndfile endif -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -LV2_DEPENDENCIES += libgtk2 -endif - ifeq ($(BR2_STATIC_LIBS),y) LV2_CONF_OPTS += -Dplugins=disabled endif diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 1abaeb0497..8492c150cd 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,6 @@ # From https://sourceware.org/ftp/lvm2/sha512.sum -sha512 02607797f067b2b26d615b9a182ad70017e61d436e3866acf820a04154e503fb59114e9a4540a273d9f570d0337332ca995fb3be83c11eadaca53c1b826eb810 LVM2.2.03.27.tgz +sha512 254131e28b22d55531d211886afbfdc219e77a4df802e3ec9b66d889ff22bf6d0a6c2df9c5ff017592d92e1dce0f658a6628fb321c1e90152ff7257492218242 LVM2.2.03.31.tgz + # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 2fc24be60e..3a1dded55f 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.27 +LVM2_VERSION = 2.03.31 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index b2afb978e6..7a5f91e1a8 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -13,10 +13,16 @@ LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES LXC_CONF_OPTS = \ - -Dapparmor=false \ -Dexamples=false \ -Dman=false +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +LXC_CONF_OPTS += -Dapparmor=true +LXC_DEPENDENCIES += libapparmor +else +LXC_CONF_OPTS += -Dapparmor=false +endif + ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) LXC_DEPENDENCIES += bash-completion endif diff --git a/package/lynis/Config.in b/package/lynis/Config.in new file mode 100644 index 0000000000..e97cb0bf91 --- /dev/null +++ b/package/lynis/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LYNIS + bool "lynis" + depends on BR2_USE_WCHAR # gzip + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_GZIP # runtime (zgrep /proc/config.gz) + help + Lynis is an auditing tool which tests and gathers (security) + information from Unix based systems. + Written in shell and running on system itself. + + https://cisofy.com/lynis/ diff --git a/package/lynis/lynis.hash b/package/lynis/lynis.hash new file mode 100644 index 0000000000..a8b1d87a0a --- /dev/null +++ b/package/lynis/lynis.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2a31e3e028d6b9f0e8f502402ad6752b069f9082893514c8c023962f5786b3b6 lynis-3.1.6.tar.gz +sha256 57151f0fa287550534af08facb1c6693ca803ffa65b512da38b55c3130810bcf LICENSE diff --git a/package/lynis/lynis.mk b/package/lynis/lynis.mk new file mode 100644 index 0000000000..d630182732 --- /dev/null +++ b/package/lynis/lynis.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# lynis +# +################################################################################ + +LYNIS_VERSION = 3.1.6 +LYNIS_SITE = $(call github,CISOfy,lynis,$(LYNIS_VERSION)) +LYNIS_LICENSE = GPL-3.0 +LYNIS_LICENSE_FILES = LICENSE + +define LYNIS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/lynis \ + $(TARGET_DIR)/usr/sbin/lynis + $(INSTALL) -D -m 0644 $(@D)/default.prf \ + $(TARGET_DIR)/etc/lynis/default.prf + $(INSTALL) -D -m 0644 $(@D)/developer.prf \ + $(TARGET_DIR)/etc/lynis/developer.prf + $(INSTALL) -D -m 0644 $(@D)/plugins/* \ + -t $(TARGET_DIR)/etc/lynis/plugins + $(INSTALL) -D -m 0644 $(@D)/include/* \ + -t $(TARGET_DIR)/usr/share/lynis/include + $(INSTALL) -D -m 0644 $(@D)/db/*.db \ + -t $(TARGET_DIR)/usr/share/lynis/db + $(INSTALL) -D -m 0644 $(@D)/db/languages/en \ + $(TARGET_DIR)/usr/share/lynis/db/languages/en +endef + +ifneq ($(BR2_PACKAGE_GAWK),y) +define LYNIS_AWK_BUSYBOX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_AWK) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_AWK_LIBM) +endef +endif + +ifneq ($(BR2_PACKAGE_COREUTILS),y) +define LYNIS_STAT_BUSYBOX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_STAT) +endef +endif + +define LYNIS_BUSYBOX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PGREP) + $(LYNIS_AWK_BUSYBOX_CONFIG_FIXUPS) + $(LYNIS_STAT_BUSYBOX_CONFIG_FIXUPS) +endef + +$(eval $(generic-package)) diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 48ee8175ca..ec8a86b29f 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,4 @@ -# From https://lists.nongnu.org/archive/html/lzip-bug/2022-02/msg00000.html -sha256 4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d lzip-1.23.tar.gz +# From https://lists.nongnu.org/archive/html/lzip-bug/2025-01/msg00012.html +sha256 09418a6d8fb83f5113f5bd856e09703df5d37bae0308c668d0f346e3d3f0a56f lzip-1.25.tar.gz # Locally calculated -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 022e9c2e9cc1aac3622313df6f971fbb39c1d1b0cb45324c16b8a1fe231c5ea6 COPYING diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index 9e09e578db..9c8c54a8b1 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZIP_VERSION = 1.23 +LZIP_VERSION = 1.25 LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING diff --git a/package/lzo/0001-cmake-bump-compatibility-level-up-to-3.10.patch b/package/lzo/0001-cmake-bump-compatibility-level-up-to-3.10.patch new file mode 100644 index 0000000000..2c5c9d95b7 --- /dev/null +++ b/package/lzo/0001-cmake-bump-compatibility-level-up-to-3.10.patch @@ -0,0 +1,48 @@ +From 8158764baaa6cea81f514af157019c0dc81b6e46 Mon Sep 17 00:00:00 2001 +From: Florian Larysch +Date: Thu, 22 May 2025 23:46:42 +0200 +Subject: [PATCH] cmake: bump compatibility level up to 3.10 + +As of CMake 4.0, backwards compatibility to versions older than 3.5 has +been removed and is deprecated for versions older than 3.10. Bump +compatibility to version 3.10 using the process described in [1]. + +Of the changed policies, only CMP0065 seems to affect the LZO build as +is, namely the example binaries, but this seems like a reasonable change +rather than an actual compatibility issue. + +[1] https://cmake.org/cmake/help/v4.0/manual/cmake-policies.7.html#updating-projects + +Upstream: Submitted to upstream via direct email as there is no public + mailing list or forge presence. + +Signed-off-by: Florian Larysch +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98c0a1a..108537c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # All Rights Reserved. + # + +-cmake_minimum_required(VERSION 3.0 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.0...3.10 FATAL_ERROR) + + # + # simple usage example (Unix): +@@ -57,7 +57,7 @@ if(NOT ENABLE_STATIC AND NOT ENABLE_SHARED) + set(ENABLE_STATIC ON) + endif() + if(ENABLE_SHARED AND WIN32) +- cmake_minimum_required(VERSION 3.4.3 FATAL_ERROR) # needed for WINDOWS_EXPORT_ALL_SYMBOLS ++ cmake_minimum_required(VERSION 3.4.3...3.10 FATAL_ERROR) # needed for WINDOWS_EXPORT_ALL_SYMBOLS + endif() + + # install directories +-- +2.49.0 + diff --git a/package/m4/m4.hash b/package/m4/m4.hash index a81f4fab9c..a5b8456cc2 100644 --- a/package/m4/m4.hash +++ b/package/m4/m4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 m4-1.4.19.tar.xz +sha256 e236ea3a1ccf5f6c270b1c4bb60726f371fa49459a8eaaebc90b216b328daf2b m4-1.4.20.tar.xz # License files, locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/m4/m4.mk b/package/m4/m4.mk index 39ad898b10..396c2bbee2 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -4,7 +4,7 @@ # ################################################################################ -M4_VERSION = 1.4.19 +M4_VERSION = 1.4.20 M4_SOURCE = m4-$(M4_VERSION).tar.xz M4_SITE = $(BR2_GNU_MIRROR)/m4 M4_LICENSE = GPL-3.0+ diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index 9083ced423..99a92c2dec 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0c53f1e5e11e75e4896197df795bee63b3d46b8821fbc3368f7a240861b543b5 makedumpfile-1.7.5.tar.gz +sha256 b54e88bef256c589eb4adce17bc856da898a762626fe54f76a77a7f22ad9a844 makedumpfile-1.7.8.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 5fa1331910..af510598ad 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.7.5 -MAKEDUMPFILE_SITE = https://github.com/makedumpfile/makedumpfile/releases/download/$(MAKEDUMPFILE_VERSION) +MAKEDUMPFILE_VERSION = 1.7.8 +MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,$(MAKEDUMPFILE_VERSION)) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 MAKEDUMPFILE_LICENSE_FILES = COPYING diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index ddde56b55c..c6b027f1a3 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3111757a411ba216a4b8e3d88c29eb3be3182a7f0d5f8b9cfe10f85ec6693bc9 mali-driver-d40c57d81c9cf4bc6fefeaf47153fde8eed19ef2.tar.gz +sha256 bbfd78d3342fe8bdef5e37659740f69818aa1b3be3a75e5bb085223d87a2a1d4 mali-driver-ef3da788030833289040e4396bff010edcc2289b.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index fa5a8d94d9..40ae03a1df 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = d40c57d81c9cf4bc6fefeaf47153fde8eed19ef2 +MALI_DRIVER_VERSION = ef3da788030833289040e4396bff010edcc2289b MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in index acedd1da9d..b4c276a72f 100644 --- a/package/mariadb/Config.in +++ b/package/mariadb/Config.in @@ -12,7 +12,10 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PCRE2 + # HAVE_SYSTEM_LIBFMT cmake < 3.30 check TRY_RUN issue + select BR2_HOST_CMAKE_AT_LEAST_3_30 help MariaDB is one of the most popular database servers in the world. It's made by the original developers of MySQL and @@ -20,11 +23,6 @@ config BR2_PACKAGE_MARIADB http://www.mariadb.org/ -comment "mariadb needs a toolchain w/ dynamic library, C++, threads, wchar" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 - if BR2_PACKAGE_MARIADB config BR2_PACKAGE_MARIADB_SERVER @@ -39,3 +37,8 @@ config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED Install the mariadb embedded server on the target. endif + +comment "mariadb needs a toolchain w/ dynamic library, C++, threads, wchar" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index fd73cca4f3..216b3be7e3 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,6 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.11.6 -sha512 3d77f7be4a26d5a36af56150a5f8ed5e21adeed9bc8ea1bd694e47a25a571bd73468eada7c96e0dfe5a6c81bef625abf71a56d228cf43a738e555e3c0d824a6a mariadb-10.11.6.tar.gz +# From https://downloads.mariadb.org/mariadb/10.11.15 +sha512 98d1e54954b69cf87a96be7d76f80333f27832a29279e6b0a9615b830e171713222abcb9ec9b9a545c0fc4a0f9f8e3d4774babcabf534a6fa3cb3dfdaed0dedc mariadb-10.11.15.tar.gz # Hash for license files -sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md +sha256 ff437f42ea15b42f3d9617e691b9f159f38a0b1b0748e482304857a5026ede90 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 1dcf6568da..e2c0cee3d5 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.11.6 +MARIADB_VERSION = 10.11.15 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text @@ -27,7 +27,8 @@ MARIADB_DEPENDENCIES = \ MARIADB_CONF_OPTS += \ -DWITH_LIBFMT=system \ - -DWITH_PCRE=system + -DWITH_PCRE=system \ + -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 # use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+ MARIADB_CONF_OPTS += -DWITH_READLINE=ON @@ -111,7 +112,8 @@ MARIADB_CONF_OPTS += \ -DINSTALL_SQLBENCHDIR=share/mysql/bench \ -DINSTALL_SUPPORTFILESDIR=share/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) + -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) \ + -DPLUGIN_COLUMNSTORE=NO HOST_MARIADB_DEPENDENCIES = host-openssl HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system diff --git a/package/matio/matio.mk b/package/matio/matio.mk index dc9be2ac18..d378f06e5b 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -19,10 +19,6 @@ MATIO_CONF_ENV = ac_cv_va_copy=yes MATIO_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y) -MATIO_CFLAGS += -O0 -endif - MATIO_CONF_ENV += CFLAGS="$(MATIO_CFLAGS)" # mat73 require hdf5 (not available), extented-sparse take 2KB diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 3dc2359c82..7f81c93a3a 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 a39967927dfa1b0116efc45b944a0f5b5b4c34f8e842a4b223dcdd7b367399e0 mawk-1.3.4-20240905.tgz +sha256 51bcb82d577b141d896d9d9c3077d7aaa209490132e9f2b9573ba8511b3835be mawk-1.3.4-20250131.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index 1a5e80ae8e..f9f0623904 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20240905 +MAWK_VERSION = 1.3.4-20250131 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 diff --git a/package/mbedtls/Config.in b/package/mbedtls/Config.in index abbe3356d8..21e746d842 100644 --- a/package/mbedtls/Config.in +++ b/package/mbedtls/Config.in @@ -17,18 +17,6 @@ config BR2_PACKAGE_MBEDTLS_PROGRAMS This option enables the installation and the build of mbed TLS companion programs. -config BR2_PACKAGE_MBEDTLS_COMPRESSION - bool "enable compression support" - select BR2_PACKAGE_ZLIB - help - Enable support for compression of the content data before it - enters the secure channel as described in RFC 3749. - - Warning: TLS compression may make you vulnerable to the - CRIME attack. You should not enable it unless you know for - sure CRIME and similar attacks are not applicable to your - particular situation. - config BR2_PACKAGE_MBEDTLS_DTLS_SRTP bool "enable DTLS-SRTP support" help diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 9de7f731da..b86c66af3e 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.9: -sha256 e85ea97aaf78dd6c0a5ba2e54dd5932ffa15f39abfc189c26beef7684630c02b mbedtls-2.28.9.tar.bz2 +# From https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.5: +sha256 4a11f1777bb95bf4ad96721cac945a26e04bf19f57d905f241fe77ebeddf46d8 mbedtls-3.6.5.tar.bz2 # Locally calculated sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 2faa6dff55..c1aa9f0850 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.9 +MBEDTLS_VERSION = 3.6.5 MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-$(MBEDTLS_VERSION) MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION).tar.bz2 MBEDTLS_CONF_OPTS = \ @@ -22,9 +22,9 @@ MBEDTLS_CPE_ID_PRODUCT = mbed_tls ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) define MBEDTLS_ENABLE_THREADING $(SED) "s://#define MBEDTLS_THREADING_C:#define MBEDTLS_THREADING_C:" \ - $(@D)/include/mbedtls/config.h + $(@D)/include/mbedtls/mbedtls_config.h $(SED) "s://#define MBEDTLS_THREADING_PTHREAD:#define MBEDTLS_THREADING_PTHREAD:" \ - $(@D)/include/mbedtls/config.h + $(@D)/include/mbedtls/mbedtls_config.h endef MBEDTLS_PRE_CONFIGURE_HOOKS += MBEDTLS_ENABLE_THREADING ifeq ($(BR2_STATIC_LIBS),y) @@ -43,25 +43,13 @@ MBEDTLS_CONF_OPTS += \ -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF endif -ifeq ($(BR2_PACKAGE_MBEDTLS_COMPRESSION),y) -MBEDTLS_CONF_OPTS += -DENABLE_ZLIB_SUPPORT=ON -MBEDTLS_DEPENDENCIES += zlib -define MBEDTLS_ENABLE_ZLIB - $(SED) "s://#define MBEDTLS_ZLIB_SUPPORT:#define MBEDTLS_ZLIB_SUPPORT:" \ - $(@D)/include/mbedtls/config.h -endef -MBEDTLS_PRE_CONFIGURE_HOOKS += MBEDTLS_ENABLE_ZLIB -else -MBEDTLS_CONF_OPTS += -DENABLE_ZLIB_SUPPORT=OFF -endif - define MBEDTLS_DISABLE_ASM $(SED) '/^#define MBEDTLS_AESNI_C/d' \ - $(@D)/include/mbedtls/config.h + $(@D)/include/mbedtls/mbedtls_config.h $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ - $(@D)/include/mbedtls/config.h + $(@D)/include/mbedtls/mbedtls_config.h $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ - $(@D)/include/mbedtls/config.h + $(@D)/include/mbedtls/mbedtls_config.h endef # ARM in thumb mode breaks debugging with asm optimizations @@ -76,7 +64,7 @@ endif ifeq ($(BR2_PACKAGE_MBEDTLS_DTLS_SRTP),y) define MBEDTLS_ENABLE_DTLS_SRTP $(SED) "s://#define MBEDTLS_SSL_DTLS_SRTP:#define MBEDTLS_SSL_DTLS_SRTP:" \ - $(@D)/include/mbedtls/config.h + $(@D)/include/mbedtls/mbedtls_config.h endef MBEDTLS_PRE_CONFIGURE_HOOKS += MBEDTLS_ENABLE_DTLS_SRTP endif diff --git a/package/mbpfan/0001-Makefile-util.c-fix-build-on-musl-uClibc-ng.patch b/package/mbpfan/0001-Makefile-util.c-fix-build-on-musl-uClibc-ng.patch new file mode 100644 index 0000000000..7b42957bdd --- /dev/null +++ b/package/mbpfan/0001-Makefile-util.c-fix-build-on-musl-uClibc-ng.patch @@ -0,0 +1,64 @@ +From 2e6ae7ce5c28acaff9b3e77d7a693b7224a46003 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Mon, 1 Sep 2025 12:08:53 +0200 +Subject: [PATCH] {Makefile,util.c}: fix build on musl / uClibc-ng + +vsyslog() is not in POSIX, so only exposed by on musl and +uclibc-ng if we define _DEFAULT_SOURCE. + +https://git.musl-libc.org/cgit/musl/tree/include/syslog.h#n64 +https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/sys/syslog.h#n200 + +While we are at it, drop the glibc-implementation-specific __USE_MISC define +in src/util.c to get rid of a double definition: + +src/util.c:3: warning: "__USE_MISC" redefined + 3 | #define __USE_MISC + | +In file included from /usr/include/x86_64-linux-gnu/bits/libc-header-start.h:33, + from /usr/include/stdio.h:27, + from src/util.c:2: +/usr/include/features.h:395: note: this is the location of the previous definition + 395 | # define __USE_MISC 1 + +On glibc (and uClibc-ng) the internal __USE_MISC symbol gets defined if +_DEFAULT_SOURCE is: + +https://github.com/bminor/glibc/blob/master/include/features.h#L417-L419 + +Upstream: https://github.com/linux-on-mac/mbpfan/pull/271 +(cherry picked from commit 25c2a09bd0d74e19c3843ce35ac54b5e288480ab) +[Peter: backport to 2.4.0] +Signed-off-by: Peter Korsgaard +--- + Makefile | 2 +- + src/util.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 41873fa..bb6c913 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ BINFLAG = -o + INCLUDES = + LIBS = -lm + LIBPATH = +-CFLAGS += $(COPT) -g $(INCLUDES) -Wall -Wextra -Wno-unused-function -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 ++CFLAGS += $(COPT) -g $(INCLUDES) -Wall -Wextra -Wno-unused-function -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE + LDFLAGS += $(LIBPATH) -g + + OBJS := $(patsubst %.$(C),%.$(OBJ),$(wildcard $(SOURCE_PATH)*.$(C))) +diff --git a/src/util.c b/src/util.c +index c66e6d7..b7fe71e 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -1,6 +1,5 @@ + #include + #include +-#define __USE_MISC + #include + + #include "global.h" +-- +2.39.5 + diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 01c0f61b44..09fdcd24a5 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.32.sha256 -sha256 4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe mc-4.8.32.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.33.sha256 +sha256 cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c mc-4.8.33.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index b7e7e107c7..9401b8a191 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.32 +MC_VERSION = 4.8.33 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ diff --git a/package/mdevd/mdevd.hash b/package/mdevd/mdevd.hash index 0151b03bd5..f2667f2643 100644 --- a/package/mdevd/mdevd.hash +++ b/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7358ce530b6b9befb715e48190981e9b69a12cca858519e6d2e4b46eab7e2470 mdevd-0.1.6.4.tar.gz +sha256 d5c86420c81b2e4720b41e4f48f727cd5d9a17f4e6317115d21c32099e72a628 mdevd-0.1.6.5.tar.gz sha256 701e0e7d93a5da6421f69bed2136d4c64fd4bc17f35221297838a3ad9ba6050e COPYING diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index a1d9e17cef..5a3b2a971f 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.6.4 +MDEVD_VERSION = 0.1.6.5 MDEVD_SITE = https://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING @@ -12,8 +12,7 @@ MDEVD_INSTALL_STAGING = YES MDEVD_DEPENDENCIES = skalibs MDEVD_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ diff --git a/package/mdio-tools/mdio-tools.mk b/package/mdio-tools/mdio-tools.mk index b42ea41c79..e61f847e13 100644 --- a/package/mdio-tools/mdio-tools.mk +++ b/package/mdio-tools/mdio-tools.mk @@ -16,6 +16,7 @@ define MDIO_TOOLS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) $(call KCONFIG_ENABLE_OPT,CONFIG_MDIO_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_MDIO_BUS) endef $(eval $(kernel-module)) diff --git a/package/mdnsd/S50mdnsd b/package/mdnsd/S50mdnsd index 1c2b71802c..803ac12a8e 100644 --- a/package/mdnsd/S50mdnsd +++ b/package/mdnsd/S50mdnsd @@ -1,4 +1,5 @@ #!/bin/sh +# shellcheck disable=SC2317 # Don't warn about unreachable commands in this file DAEMON=mdnsd MDNSD=/usr/sbin/$DAEMON @@ -36,7 +37,9 @@ reload() { case "$1" in start|stop|restart|reload) - if "$1"; then + "$1" + status=$? + if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" @@ -48,4 +51,4 @@ case "$1" in ;; esac -exit $? +exit "$status" diff --git a/package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch b/package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch deleted file mode 100644 index 8e7812c389..0000000000 --- a/package/mediastreamer/0001-src-videofilters-nowebcam.c-fix-build-without-ffmpeg.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 342f59f1603f759b6dd90754f8dba14d08947f55 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 27 Feb 2020 16:18:35 +0100 -Subject: [PATCH] src/videofilters/nowebcam.c: fix build without ffmpeg or jpeg - -jpeg2yuv is only defined if ffmpeg or turbojpeg is available - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 3 +++ - src/videofilters/nowebcam.c | 4 ++++ - 2 files changed, 7 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0efc1a5f..6668db2b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -336,7 +336,10 @@ if(ENABLE_JPEG) - if(NOT TURBOJPEG_FOUND) - message(WARNING "Could not find libturbo-jpeg, mediastreamer2 will be compiled without LibJpeg-Turbo") - set(ENABLE_JPEG OFF CACHE BOOL "Enable JPEG support" FORCE) -+ add_definitions(-DNO_JPEG) - endif() -+else() -+ add_definitions(-DNO_JPEG) - endif() - if(ENABLE_QRCODE) - find_package(Zxing) -diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c -index a2344dcd..afb0d7b1 100644 ---- a/src/videofilters/nowebcam.c -+++ b/src/videofilters/nowebcam.c -@@ -107,7 +107,9 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize) { - if (err != st_sizel) { - ms_error("Could not read as much as wanted !"); - } -+#if !(defined(NO_FFMPEG) && defined(NO_JPEG)) - m = jpeg2yuv(jpgbuf, st_sizel, reqsize); -+#endif - ms_free(jpgbuf); - if (m == NULL) { - CloseHandle(fd); -@@ -140,7 +142,9 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize) { - if (err != statbuf.st_size) { - ms_error("Could not read as much as wanted: %i<>%li !", err, (long)statbuf.st_size); - } -+#if !(defined(NO_FFMPEG) && defined(NO_JPEG)) - m = jpeg2yuv(jpgbuf,statbuf.st_size,reqsize); -+#endif - ms_free(jpgbuf); - if (m == NULL) { - close(fd); --- -2.25.0 - diff --git a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch deleted file mode 100644 index 9fd3fda2ec..0000000000 --- a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 84b1919124884232e0fa30b30458470db27c73fc Mon Sep 17 00:00:00 2001 -From: James Cowgill -Date: Sat, 18 Aug 2018 12:56:38 +0200 -Subject: [PATCH] Use AV_INPUT_BUFFER_PADDING_SIZE to determine padding - size - -Hardcoding the value for FF_INPUT_BUFFER_PADDING_SIZE is not safe -because upstream FFmpeg might change it (as they did in FFmpeg 4.0). - -Instead, use FFmpeg's AV_INPUT_BUFFER_PADDING_SIZE if available and -only hardcode a value if FFmpeg is disabled (in which case the value -doesn't particularly matter anyway). For compatibility with older -FFmpeg versions, define AV_INPUT_BUFFER_PADDING_SIZE if hasn't been -defined yet. - -Downloaded from -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735 - -Signed-off-by: Bernd Kuhls -[Fabrice: updated for 4.3.1] -Signed-off-by: Fabrice Fontaine -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/utils/ffmpeg-priv.h | 4 ++++ - src/videofilters/nowebcam.c | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h -index c0745a9a..d59ea0e1 100644 ---- a/src/utils/ffmpeg-priv.h -+++ b/src/utils/ffmpeg-priv.h -@@ -115,6 +115,10 @@ - extern "C" { - #endif - -+#ifndef AV_INPUT_BUFFER_PADDING_SIZE -+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE -+#endif -+ - #ifndef HAVE_FUN_avcodec_encode_video2 - int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr); - #endif --- -2.18.0 - diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in deleted file mode 100644 index e776b60df3..0000000000 --- a/package/mediastreamer/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_MEDIASTREAMER - bool "mediastreamer" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS # ortp - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # ortp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 - select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_PCM if BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_MBEDTLS - select BR2_PACKAGE_ORTP - help - Mediastreamer is a powerful and lightweighted streaming - engine specialized for voice/video telephony applications. - - It is the library that is responsible for all the receiving - and sending of multimedia streams in linphone, including - voice/video capture, encoding and decoding, and rendering. - - http://www.linphone.org/technical-corner/mediastreamer2 - -comment "mediastreamer needs a toolchain w/ threads, C++, dynamic library, gcc >= 5" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 - -comment "mediastreamer needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/mediastreamer/mediastreamer.hash b/package/mediastreamer/mediastreamer.hash deleted file mode 100644 index dfa469d8dd..0000000000 --- a/package/mediastreamer/mediastreamer.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 64bdfe9dd6bfa64b492b21a45ad4bb36d67626a7f3b3ab2084a708864f129e84 mediastreamer-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk deleted file mode 100644 index febbb7b343..0000000000 --- a/package/mediastreamer/mediastreamer.mk +++ /dev/null @@ -1,179 +0,0 @@ -################################################################################ -# -# mediastreamer -# -################################################################################ - -MEDIASTREAMER_VERSION = 4.4.8 -MEDIASTREAMER_SITE = \ - https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/$(MEDIASTREAMER_VERSION) -MEDIASTREAMER_LICENSE = GPL-3.0+ -MEDIASTREAMER_LICENSE_FILES = LICENSE.txt -MEDIASTREAMER_INSTALL_STAGING = YES -MEDIASTREAMER_DEPENDENCIES = ortp -MEDIASTREAMER_CONF_OPTS = \ - -DENABLE_DOC=OFF \ - -DENABLE_GL=OFF \ - -DENABLE_GLX=OFF \ - -DENABLE_MKV=OFF \ - -DENABLE_SOUND=OFF \ - -DENABLE_STRICT=OFF \ - -DENABLE_TOOLS=OFF \ - -DENABLE_UNIT_TESTS=OFF \ - -DENABLE_ZRTP=OFF - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -MEDIASTREAMER_CONF_OPTS += \ - -DENABLE_ALSA=ON \ - -DENABLE_SOUND=ON -MEDIASTREAMER_DEPENDENCIES += alsa-lib -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_ALSA=OFF -endif - -ifeq ($(BR2_PACKAGE_BCG729),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_G729=ON -MEDIASTREAMER_DEPENDENCIES += bcg729 -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_G729=OFF -endif - -ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_JPEG=ON -MEDIASTREAMER_DEPENDENCIES += jpeg -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_JPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBGSM),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_GSM=ON -MEDIASTREAMER_DEPENDENCIES += libgsm -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_GSM=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBPCAP),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_PCAP=ON -MEDIASTREAMER_DEPENDENCIES += libpcap -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_PCAP=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBSRTP),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SRTP=ON -MEDIASTREAMER_DEPENDENCIES += libsrtp -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_SRTP=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBVPX),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_VPX=ON -MEDIASTREAMER_DEPENDENCIES += libvpx -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_VPX=OFF -endif - -ifeq ($(BR2_PACKAGE_OPUS),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_OPUS=ON -MEDIASTREAMER_DEPENDENCIES += opus -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_OPUS=OFF -endif - -# portaudio backend needs speexdsp as well -ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEXDSP),yy) -MEDIASTREAMER_CONF_OPTS += \ - -DENABLE_PORTAUDIO=ON \ - -DENABLE_SOUND=ON -MEDIASTREAMER_DEPENDENCIES += portaudio -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_PORTAUDIO=OFF -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -MEDIASTREAMER_CONF_OPTS += \ - -DENABLE_PULSEAUDIO=ON \ - -DENABLE_SOUND=ON -MEDIASTREAMER_DEPENDENCIES += pulseaudio -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_CODEC=ON -MEDIASTREAMER_DEPENDENCIES += speex -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_CODEC=OFF -endif - -ifeq ($(BR2_PACKAGE_SPEEXDSP),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_DSP=ON -MEDIASTREAMER_DEPENDENCIES += speexdsp -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_SPEEX_DSP=OFF -endif - -ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) -MEDIASTREAMER_CONF_OPTS += -DENABLE_RESAMPLE=ON -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_RESAMPLE=OFF -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_FFMPEG=ON -MEDIASTREAMER_DEPENDENCIES += ffmpeg -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_FFMPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_SDL),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SDL=ON -MEDIASTREAMER_DEPENDENCIES += sdl -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_SDL=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_X11=ON -MEDIASTREAMER_DEPENDENCIES += xlib_libX11 -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_X11=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_XV=ON -MEDIASTREAMER_DEPENDENCIES += xlib_libXv -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_XV=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_THEORA=ON -MEDIASTREAMER_DEPENDENCIES += libtheora -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_THEORA=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_V4L=ON -MEDIASTREAMER_DEPENDENCIES += libv4l -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_V4L=OFF -endif - -ifeq ($(BR2_PACKAGE_ZXING_CPP),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_QRCODE=ON -MEDIASTREAMER_DEPENDENCIES += zxing-cpp -else -MEDIASTREAMER_CONF_OPTS += -DENABLE_QRCODE=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_LIBS),y) -MEDIASTREAMER_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -endif - -$(eval $(cmake-package)) diff --git a/package/memtest86/memtest86.hash b/package/memtest86/memtest86.hash index 695e6a234b..20d96dce95 100644 --- a/package/memtest86/memtest86.hash +++ b/package/memtest86/memtest86.hash @@ -1,3 +1,3 @@ # locally computed using sha256sum -sha256 463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8 memtest86-6.20.tar.gz +sha256 8bad4b5788bc28e4dd1db78c9069bd0c65a4a6baf16409ab537c795bb04578b3 memtest86-7.20.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk index c0f85755fe..4f9c1b9a28 100644 --- a/package/memtest86/memtest86.mk +++ b/package/memtest86/memtest86.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMTEST86_VERSION = 6.20 +MEMTEST86_VERSION = 7.20 MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION)) MEMTEST86_LICENSE = GPL-2.0 MEMTEST86_LICENSE_FILES = LICENSE diff --git a/package/memtester/memtester.hash b/package/memtester/memtester.hash index 6e5d156ffd..1606fdbd01 100644 --- a/package/memtester/memtester.hash +++ b/package/memtester/memtester.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c5fc2382576c084b314cfd334d127a66c20bd63892cac9f445bc1d8b4ca5a47 memtester-4.5.1.tar.gz +sha256 e427de663f7bd22d1ebee8af12506a852c010bd4fcbca1e0e6b02972d298b5bb memtester-4.7.1.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index 347a158b74..1d3a8329fc 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMTESTER_VERSION = 4.5.1 +MEMTESTER_VERSION = 4.7.1 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions MEMTESTER_LICENSE = GPL-2.0 MEMTESTER_LICENSE_FILES = COPYING diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash index e87d52fa72..19f650046a 100644 --- a/package/mender-artifact/mender-artifact.hash +++ b/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 3fc2d45bedf28843f84c4b8fcc6a9592e1dc176fc91123d99a5172935d7c78a0 mender-artifact-3.11.2-go2.tar.gz -sha256 8c41e20f891ae04abd2d32367248eaf33e1bd2f1328789ab60b8b0d10cc414a1 LIC_FILES_CHKSUM.sha256 +sha256 14ba008df9b24321de72821de394bc4326e4dd9e17ed7c111340689e90d8b596 mender-artifact-4.2.0-go2.tar.gz +sha256 a99c495576ecc6d6e137e471c515d38757179240ff6cc41bd481e29d3504f334 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -8,52 +8,60 @@ sha256 8c41e20f891ae04abd2d32367248eaf33e1bd2f1328789ab60b8b0d10cc414a1 LIC_FI # sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache 2.0 licenses. -sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE +sha256 38791d93beae962b266e11ac888ea2af4f07578b272c2f9dcb05f54f32960a76 LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE -sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE +sha256 132fb47b89947cd5f98e380186bc412af5561c70669d37d3a83b36f03a0ddae5 vendor/github.com/mendersoftware/progressbar/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/googleapis/api/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/googleapis/rpc/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/grpc/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/appengine/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/kms/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/iam/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/compute/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/compute/metadata/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd vendor/go.opencensus.io/LICENSE -sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/golang/groupcache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/auth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/auth/oauth2adapt/LICENSE sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/googleapis/enterprise-certificate-proxy/LICENSE sha256 dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d vendor/github.com/go-jose/go-jose/v3/json/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/go-jose/go-jose/v3/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/google/s2a-go/LICENSE.md +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/github.com/Keyfactor/signserver-go-client-sdk/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/kylelemons/godebug/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/go.opentelemetry.io/otel/trace/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/go.opentelemetry.io/otel/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/go.opentelemetry.io/otel/metric/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/go.opentelemetry.io/auto/sdk/LICENSE +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/github.com/go-logr/logr/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/github.com/go-logr/stdr/LICENSE # # BSD 2 Clause licenses. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +sha256 4801bb0c5d70b980b3e1f63d1d2df8d84fec22548e3d73f03a68df1fb808791f vendor/github.com/pkg/browser/LICENSE # # BSD 3 Clause licenses. sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/sys/LICENSE sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE sha256 75e1ca97a84a9da6051dee0114333388216f2c4a5a028296b882ff3d57274735 vendor/github.com/russross/blackfriday/v2/LICENSE.txt -sha256 17b5d209ba8f9684257ecfcff87df6ceda6194143a8fbd074f29727cff6f0c40 vendor/github.com/google/go-cmp/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/oauth2/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/time/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/net/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/oauth2/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/text/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/crypto/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/time/LICENSE +sha256 911f8f5782931320f5b8d1160a76365b83aea6447ee6c04fa6d5591467db9dad vendor/golang.org/x/sync/LICENSE sha256 110244b02140866ee37d17fa7449436a377ec3b85a481fbb208f4c87964382de vendor/google.golang.org/api/LICENSE sha256 fc0a2f71df4e8f047902da53d1f85301be43e0f360fc167057a2d04658ed2ba9 vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE sha256 4835612df0098ca95f8e7d9e3bffcb02358d435dbb38057c844c99d7f725eb20 vendor/google.golang.org/protobuf/LICENSE -sha256 8778a9fc1eaffb03ab873caae251df2d224f6b5502be8777d3cd573a4dd43903 vendor/github.com/golang/protobuf/LICENSE sha256 b95218cd9607855a6536384c0262922b30a0c2bf56e4ced790240f3a3bac4722 vendor/github.com/googleapis/gax-go/v2/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/time/LICENSE sha256 f69f157b0be75da373605dbc8bbf142e8924ee82d8f44f11bcaf351335bf98cf vendor/github.com/klauspost/compress/internal/snapref/LICENSE +sha256 701cbcc144a7c865b072f27547e66ddbf17ac44a3bd21f71149ace02518f107c vendor/github.com/ulikunitz/xz/LICENSE +sha256 0a8d61ed3cbfd5312326e8126c31ce9c627a283adc99131b56896d29ada04b2d vendor/github.com/google/uuid/LICENSE # # ISC licenses. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE +sha256 480be5fb1be03ff19fd71d863f453f16262e98d4e568f5bccfcb7aa3ccf8cf0d vendor/github.com/decred/dcrd/dcrec/secp256k1/v4/LICENSE # # MIT licenses. sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE @@ -69,6 +77,20 @@ sha256 22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26 vendor sha256 38049e50b486f5394e40b786388f4a006401996e46c7c1cd18925afe7c3b4e34 vendor/github.com/ryanuber/go-glob/LICENSE sha256 5c0476add4c38b55d0ed5ac11b85e00c38f26e1caee20dfe3ab58190103d1fbc vendor/github.com/cenkalti/backoff/v3/LICENSE sha256 f566a9f97bacdaf00d9f21dd991e81dc11201c4e016c86b470799429a1c9a79c vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt +sha256 646f8936b8ddcd14e13e578ff6857e368780b0d1a4f6066bee89211923a373e2 vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/LICENSE.txt +sha256 646f8936b8ddcd14e13e578ff6857e368780b0d1a4f6066bee89211923a373e2 vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/LICENSE.txt +sha256 a096a435e19bb6b631da46992c011a39be563e97ce7366879ad516c772904632 vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/LICENSE.txt +sha256 a096a435e19bb6b631da46992c011a39be563e97ce7366879ad516c772904632 vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys/LICENSE.txt +sha256 646f8936b8ddcd14e13e578ff6857e368780b0d1a4f6066bee89211923a373e2 vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/LICENSE.txt +sha256 9906940f61b1f0b533fa7d99baf55178b2808fbe113ea51dfbfad8572ccd5f2b vendor/github.com/AzureAD/microsoft-authentication-library-for-go/LICENSE +sha256 a707cd425201945d57500566c47c74dc9fb8cd02ef91b9a761abddeb2401e6a7 vendor/github.com/goccy/go-json/LICENSE +sha256 fe26ca41577b9b2b4448050a24b25e5753af66b5d5945d5d36094e7790bfcb2f vendor/github.com/golang-jwt/jwt/v5/LICENSE +sha256 d5c8d4935994cfcfbc53d12fe756b28316858736d6e0a61acaff5fe4a84fca12 vendor/github.com/lestrrat-go/iter/LICENSE +sha256 b9b5b03485eb7446da7ecad22178664a53c7fcecceb74d69f905819a807d710e vendor/github.com/lestrrat-go/blackmagic/LICENSE +sha256 e148deed982672627e875fe0cb03b9aa0d3e315e0f59992973c3c34dbcf5f322 vendor/github.com/lestrrat-go/backoff/v2/LICENSE +sha256 d5c8d4935994cfcfbc53d12fe756b28316858736d6e0a61acaff5fe4a84fca12 vendor/github.com/lestrrat-go/httpcc/LICENSE +sha256 b9b5b03485eb7446da7ecad22178664a53c7fcecceb74d69f905819a807d710e vendor/github.com/lestrrat-go/option/LICENSE +sha256 0c4868a07b1c2dbb67c75767b4f1b2936c392d02ca2c7ee9827cac1a9d60ab1d vendor/github.com/lestrrat-go/jwx/LICENSE # # MPL-2.0 licenses. sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-secure-stdlib/strutil/LICENSE @@ -77,7 +99,8 @@ sha256 bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd vendor sha256 bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd vendor/github.com/hashicorp/hcl/LICENSE sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-cleanhttp/LICENSE sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-rootcerts/LICENSE -sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-retryablehttp/LICENSE +sha256 d6b1a865f1c8c697d343bd4e0ce61025f91898486a1f00d727f32e8644af77d3 vendor/github.com/hashicorp/go-retryablehttp/LICENSE sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 vendor/github.com/hashicorp/go-sockaddr/LICENSE sha256 d6b1a865f1c8c697d343bd4e0ce61025f91898486a1f00d727f32e8644af77d3 vendor/github.com/hashicorp/vault/api/LICENSE sha256 a830016911a348a54e89bd54f2f8b0d8fffdeac20aecfba8e36ebbf38a03f5ff vendor/github.com/hashicorp/go-multierror/LICENSE +sha256 8108e14b5cb2b6bcd51583d3849ef0c2b5c4de61758256c20308bc70d1775dbb vendor/github.com/felixge/httpsnoop/LICENSE.txt diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 399c194c99..609ce05c5a 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -4,9 +4,11 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.11.2 +HOST_MENDER_ARTIFACT_VERSION = 4.2.0 HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION)) HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, MPL-2.0 +# Vendor license paths generated with: +# awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor HOST_MENDER_ARTIFACT_LICENSE_FILES = \ LICENSE \ LIC_FILES_CHKSUM.sha256 \ @@ -16,39 +18,47 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/google.golang.org/genproto/googleapis/api/LICENSE \ vendor/google.golang.org/genproto/googleapis/rpc/LICENSE \ vendor/google.golang.org/grpc/LICENSE \ - vendor/google.golang.org/appengine/LICENSE \ vendor/cloud.google.com/go/kms/LICENSE \ vendor/cloud.google.com/go/iam/LICENSE \ - vendor/cloud.google.com/go/compute/LICENSE \ vendor/cloud.google.com/go/compute/metadata/LICENSE \ - vendor/go.opencensus.io/LICENSE \ - vendor/github.com/golang/groupcache/LICENSE \ + vendor/cloud.google.com/go/auth/LICENSE \ + vendor/cloud.google.com/go/auth/oauth2adapt/LICENSE \ vendor/github.com/mendersoftware/openssl/LICENSE \ vendor/github.com/googleapis/enterprise-certificate-proxy/LICENSE \ vendor/github.com/go-jose/go-jose/v3/json/LICENSE \ vendor/github.com/go-jose/go-jose/v3/LICENSE \ vendor/github.com/google/s2a-go/LICENSE.md \ + vendor/github.com/Keyfactor/signserver-go-client-sdk/LICENSE \ + vendor/github.com/kylelemons/godebug/LICENSE \ + vendor/go.opentelemetry.io/otel/trace/LICENSE \ + vendor/go.opentelemetry.io/otel/LICENSE \ + vendor/go.opentelemetry.io/otel/metric/LICENSE \ + vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/LICENSE \ + vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE \ + vendor/go.opentelemetry.io/auto/sdk/LICENSE \ + vendor/github.com/go-logr/logr/LICENSE \ + vendor/github.com/go-logr/stdr/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/pkg/browser/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ - vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/russross/blackfriday/v2/LICENSE.txt \ - vendor/github.com/google/go-cmp/LICENSE \ vendor/golang.org/x/net/LICENSE \ vendor/golang.org/x/oauth2/LICENSE \ vendor/golang.org/x/text/LICENSE \ vendor/golang.org/x/crypto/LICENSE \ vendor/golang.org/x/time/LICENSE \ + vendor/golang.org/x/sync/LICENSE \ vendor/google.golang.org/api/LICENSE \ vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE \ vendor/google.golang.org/protobuf/LICENSE \ - vendor/github.com/golang/protobuf/LICENSE \ vendor/github.com/googleapis/gax-go/v2/LICENSE \ - vendor/golang.org/x/crypto/LICENSE \ - vendor/golang.org/x/time/LICENSE \ vendor/github.com/klauspost/compress/internal/snapref/LICENSE \ + vendor/github.com/ulikunitz/xz/LICENSE \ + vendor/github.com/google/uuid/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/decred/dcrd/dcrec/secp256k1/v4/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ @@ -62,6 +72,20 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/github.com/ryanuber/go-glob/LICENSE \ vendor/github.com/cenkalti/backoff/v3/LICENSE \ vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt \ + vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/LICENSE.txt \ + vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/LICENSE.txt \ + vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/LICENSE.txt \ + vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys/LICENSE.txt \ + vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/LICENSE.txt \ + vendor/github.com/AzureAD/microsoft-authentication-library-for-go/LICENSE \ + vendor/github.com/goccy/go-json/LICENSE \ + vendor/github.com/golang-jwt/jwt/v5/LICENSE \ + vendor/github.com/lestrrat-go/iter/LICENSE \ + vendor/github.com/lestrrat-go/blackmagic/LICENSE \ + vendor/github.com/lestrrat-go/backoff/v2/LICENSE \ + vendor/github.com/lestrrat-go/httpcc/LICENSE \ + vendor/github.com/lestrrat-go/option/LICENSE \ + vendor/github.com/lestrrat-go/jwx/LICENSE \ vendor/github.com/hashicorp/go-secure-stdlib/strutil/LICENSE \ vendor/github.com/hashicorp/go-secure-stdlib/parseutil/LICENSE \ vendor/github.com/hashicorp/errwrap/LICENSE \ @@ -71,7 +95,8 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/github.com/hashicorp/go-retryablehttp/LICENSE \ vendor/github.com/hashicorp/go-sockaddr/LICENSE \ vendor/github.com/hashicorp/vault/api/LICENSE \ - vendor/github.com/hashicorp/go-multierror/LICENSE + vendor/github.com/hashicorp/go-multierror/LICENSE \ + vendor/github.com/felixge/httpsnoop/LICENSE.txt HOST_MENDER_ARTIFACT_DEPENDENCIES = host-pkgconf host-openssl host-xz @@ -90,7 +115,4 @@ HOST_MENDER_ARTIFACT_GO_ENV += \ HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION) -HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact -HOST_MENDER_ARTIFACT_INSTALL_BINS = $(HOST_MENDER_ARTIFACT_BIN_NAME) - $(eval $(host-golang-package)) diff --git a/package/mender-connect/mender-connect.hash b/package/mender-connect/mender-connect.hash index 5f7e082e1b..4b18a540cf 100644 --- a/package/mender-connect/mender-connect.hash +++ b/package/mender-connect/mender-connect.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7e83c4cabc090ed26088036c6c68fc8e73546fa4a75db817f676dc8b1e8a3c8f mender-connect-2.2.1-go2.tar.gz +sha256 c90a5f5e2d7ab4396e04d1914e2cbb2a16cb11c1d6e038b889ba7ff941f1e02a mender-connect-2.3.0-go2.tar.gz sha256 c57e1178f932015d7f08b4d76c4b18e4a55083a6fbc97629cd25ef426bf1db30 LIC_FILES_CHKSUM.sha256 # Vendor licenses diff --git a/package/mender-connect/mender-connect.mk b/package/mender-connect/mender-connect.mk index f4f7e0f195..9e6fb87ed5 100644 --- a/package/mender-connect/mender-connect.mk +++ b/package/mender-connect/mender-connect.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_CONNECT_VERSION = 2.2.1 +MENDER_CONNECT_VERSION = 2.3.0 MENDER_CONNECT_SITE = $(call github,mendersoftware,mender-connect,$(MENDER_CONNECT_VERSION)) MENDER_CONNECT_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash index d7f784493c..f3083e5d39 100644 --- a/package/mender-grubenv/mender-grubenv.hash +++ b/package/mender-grubenv/mender-grubenv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0bac59698165a8dafdd282610246addd7bebf41612efa88c77b779f8ffb5ed9d mender-grubenv-38e5043a215f696d126a2d707c9db9aeb93cfb2d.tar.gz -sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE +sha256 bdb055332952f471d36d30cf8148d1d34eae16b8671cfd98200eaab5bc392a7f mender-grubenv-e4cdd9db213de15e79576b40fd3f07736ac85709.tar.gz +sha256 38791d93beae962b266e11ac888ea2af4f07578b272c2f9dcb05f54f32960a76 LICENSE diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index a47531fe58..cf2f7520c0 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_GRUBENV_VERSION = 38e5043a215f696d126a2d707c9db9aeb93cfb2d +MENDER_GRUBENV_VERSION = e4cdd9db213de15e79576b40fd3f07736ac85709 MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION)) MENDER_GRUBENV_LICENSE = Apache-2.0 MENDER_GRUBENV_LICENSE_FILES = LICENSE diff --git a/package/mender-update-modules/Config.in b/package/mender-update-modules/Config.in new file mode 100644 index 0000000000..e71309c3d6 --- /dev/null +++ b/package/mender-update-modules/Config.in @@ -0,0 +1,246 @@ +config BR2_PACKAGE_MENDER_UPDATE_MODULES + bool "mender-update-modules" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + depends on BR2_PACKAGE_MENDER + select BR2_PACKAGE_HOST_MENDER_ARTIFACT + help + community supported Update Modules. An Update Module is an + extension to the Mender client for supporting a new type of + software update, such as a package manager, container, + bootloader or even updates of nearby microcontrollers. + An Update Module can be tailored to a specific device or + environment (e.g. update a proprietary bootloader), or be + more general-purpose (e.g. install a set of .deb packages.). + + https://github.com/mendersoftware/mender-update-modules + +if BR2_PACKAGE_MENDER_UPDATE_MODULES + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_DFU + bool "DFU" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_DFU_UTIL + help + The DFU Update Module is able to update peripheral devices + connected to the device running Mender. + Example use-cases: + - Deploy firmware updates to peripheral devices using the + USB Device Firmware Update (DFU) protocol + + https://github.com/mendersoftware/mender-update-modules/tree/master/dfu + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_DIR_OVERLAY + bool "dir-overlay" + help + The Directory Overlay Update Module installs a user defined + file tree structure into a given destination directory in the + target. + + Before the deploy into the destination folder on the device, + the Update Module will take a backup copy of the current + contents, allowing restore of it using the rollback mechanism + of the Mender client if something goes wrong. The Update + Module will also delete the current installed content that was + previously installed using the same module, this means that + each deployment is self contained and there is no residues + left on the system from the previous deployment. + + Example use-cases: + - Deploy root filesystem overlays + + https://github.com/mendersoftware/mender-update-modules/tree/master/dir-overlay + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_DIRTY + bool "dirty" + help + The dirty Update Module: modify your device state without + installing an artifact + Example use-cases: + - You have a specific action on the device that you want to + run multiple times + + - You want to avoid re-creating artifacts just for the sake + of a new version/name + + - You don't want the artifact the show up in the list of + installed artifacts + + - The module will always fail the update process, which + means it can never be marked as installed. So it can be + attempted any number of times without having to recreate + newly versioned artifacts. + + https://github.com/mendersoftware/mender-update-modules/tree/master/dirty + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_DOCKER + bool "docker" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # docker-engine, docker-cli + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS # docker-engine, docker-cli + depends on BR2_TOOLCHAIN_HAS_THREADS # docker-engine, docker-cli + depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc + depends on BR2_USE_MMU # containerd + depends on !BR2_PACKAGE_CGROUPFS_MOUNT # docker-engine + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 # docker-engine + select BR2_PACKAGE_DOCKER_ENGINE + select BR2_PACKAGE_DOCKER_CLI + select BR2_PACKAGE_JQ # runtime + help + The Docker Update Module handles the Docker images that shall + be running in the device. A deployment with this module will + stop all currently running Docker containers in the device, + and start new containers with the provided list of Docker + images in the Mender Artifact. + + In case of an unforeseen error during the process, the module + will use the rollback mechanism of the Mender client to + restore the previously running Docker containers. + + https://github.com/mendersoftware/mender-update-modules/tree/master/docker + +comment "docker support needs a glibc or musl toolchain w/ threads, headers >= 5.2" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + depends on BR2_USE_MMU + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_IPK + bool "ipk" + depends on BR2_USE_MMU # opkg + depends on BR2_USE_WCHAR # opkg -> libarchive + select BR2_PACKAGE_OPKG + help + The IPK Update Module allows opkg-based packages to be + installed on a device + + Example use-cases: + - Deploy any ipk package + + https://github.com/mendersoftware/mender-update-modules/tree/master/ipk + +comment "ipk support needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_PODMAN + bool "podman" + depends on BR2_USE_MMU # podman + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # podman + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # podman + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # podman + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # podman + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # podman + depends on BR2_TOOLCHAIN_HAS_THREADS # podman + depends on BR2_USE_WCHAR # podman + select BR2_PACKAGE_JQ # runtime + select BR2_PACKAGE_PODMAN + help + The Podman Update Module handles the Podman container images + that shall be running on the target device. A deployment with + this module will stop all currently running Podman containers + on the device and start new containers based on the list of + Podman images provided in the Mender Artifact. + + In case of any unforeseen error during the process, the module + will trigger the rollback mechanism of the Mender client to + restore the previously running Podman containers. + + https://github.com/mendersoftware/mender-update-modules/tree/master/podman + +comment "podman support needs a toolchain w/ headers >= 3.17, threads, wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_USE_WCHAR + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_REBOOT + bool "reboot" + help + The reboot Update Module: reboot your device remotely. + + Example use-cases: + - Something went wrong and you have to reboot your device + remotely, and all access to the device you have is Mender. + + https://github.com/mendersoftware/mender-update-modules/tree/master/reboot + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_ROOTFS_VERSION_CHECK + bool "rootfs version check" + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 # runtime + help + The rootfs-version-check Update Module implements a full image + update with additional checks to protect against replay + attacks. + + This is functionally equivalent to the built-in full image + update with an extra check to ensure the artifact name + follows a specific format and that installing "older" images + is rejected. For this reference implementaton, we simply use + a numeric identifier and ensure that it is larger than the + version installed. For actual device fleet use, you may need + to customize this based on your artifact naming scheme. + + Example use-cases: + - Deploy root filesystem updates and ensure only newer + artifacts are installed + + https://github.com/mendersoftware/mender-update-modules/tree/master/rootfs-version-check + +comment "rootfs version check needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_RPM + bool "rpm" + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_PACKAGE_LUA && !BR2_PACKAGE_LUA_5_1 + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_RPM + help + The Rpm Update Module updates software on the device using + the native local package manager. + + A Mender Artifact containing one or more software packages + is sent to the device, where the Update Module will call + the package manager to install them in alphabetical order. + + https://github.com/mendersoftware/mender-update-modules/tree/master/rpm + +comment "rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || !BR2_PACKAGE_LUA || BR2_PACKAGE_LUA_5_1 + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + +config BR2_PACKAGE_MENDER_UPDATE_MODULES_SWU + bool "swupdate" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # swupdate + select BR2_PACKAGE_JQ # runtime + select BR2_PACKAGE_SWUPDATE + help + The SWU Update Module allows deploying an SWUpdate-based + artifact to the device. + + Example use-cases: + - Extend an existing platform using SWUpdate with OTA. + + https://github.com/mendersoftware/mender-update-modules/tree/master/swu + +comment "swupdate support needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_STATIC_LIBS + +endif + +comment "mender-update-modules needs mender" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + depends on !BR2_PACKAGE_MENDER diff --git a/package/mender-update-modules/mender-update-modules.hash b/package/mender-update-modules/mender-update-modules.hash new file mode 100644 index 0000000000..ec879f46a1 --- /dev/null +++ b/package/mender-update-modules/mender-update-modules.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4846f39abc254ad2ae2a9f3d5479b064bc1bae5034b9d276ebdb09d8c60f4541 mender-update-modules-d8c4683e6660af6c65069e10ee4b8ee50ec1af46.tar.gz +sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE diff --git a/package/mender-update-modules/mender-update-modules.mk b/package/mender-update-modules/mender-update-modules.mk new file mode 100644 index 0000000000..0024acc189 --- /dev/null +++ b/package/mender-update-modules/mender-update-modules.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# mender-update-modules +# +################################################################################ + +MENDER_UPDATE_MODULES_VERSION = d8c4683e6660af6c65069e10ee4b8ee50ec1af46 +MENDER_UPDATE_MODULES_SITE = $(call github,mendersoftware,mender-update-modules,$(MENDER_UPDATE_MODULES_VERSION)) +MENDER_UPDATE_MODULES_LICENSE = Apache-2.0 +MENDER_UPDATE_MODULES_LICENSE_FILES = LICENSE +MENDER_UPDATE_MODULES_DEPENDENCIES = host-mender-artifact mender + +MENDER_UPDATE_MODULES_MODULES = script + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_DFU),y) +MENDER_UPDATE_MODULES_MODULES += dfu +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_DIR_OVERLAY),y) +MENDER_UPDATE_MODULES_MODULES += dir-overlay +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_DIRTY),y) +MENDER_UPDATE_MODULES_MODULES += dirty +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_DOCKER),y) +MENDER_UPDATE_MODULES_MODULES += docker +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_IPK),y) +MENDER_UPDATE_MODULES_MODULES += ipk +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_PODMAN),y) +MENDER_UPDATE_MODULES_MODULES += podman +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_REBOOT),y) +MENDER_UPDATE_MODULES_MODULES += reboot +define MENDER_UPDATE_MODULES_INSTALL_MENDER_REBOOT_GEN + $(INSTALL) -D -m 0755 $(@D)/reboot/reboot-gen \ + $(HOST_DIR)/bin/reboot-artifact-gen +endef +MENDER_UPDATE_MODULES_POST_INSTALL_TARGET_HOOKS += MENDER_UPDATE_MODULES_INSTALL_MENDER_REBOOT_GEN +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_ROOTFS_VERSION_CHECK),y) +MENDER_UPDATE_MODULES_DEPENDENCIES += python3 +MENDER_UPDATE_MODULES_MODULES += rootfs-version-check +define MENDER_UPDATE_MODULES_INSTALL_MENDER_COMPARE_VERSIONS + $(INSTALL) -D -m 0755 $(@D)/rootfs-version-check/mender-compare-versions \ + $(TARGET_DIR)/usr/bin/mender-compare-versions +endef +MENDER_UPDATE_MODULES_POST_INSTALL_TARGET_HOOKS += MENDER_UPDATE_MODULES_INSTALL_MENDER_COMPARE_VERSIONS +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_RPM),y) +MENDER_UPDATE_MODULES_MODULES += rpm +endif + +ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_SWU),y) +MENDER_UPDATE_MODULES_MODULES += swu +endif + +define MENDER_UPDATE_MODULES_INSTALL_TARGET_CMDS + $(foreach f,$(MENDER_UPDATE_MODULES_MODULES), \ + $(INSTALL) -D -m 0775 $(@D)/$(f)/module/$(f) \ + $(TARGET_DIR)/usr/share/mender/modules/v3/$(f); \ + if [ -d $(@D)/$(f)/module-artifact-gen ]; then \ + $(INSTALL) -D -m 0775 $(@D)/$(f)/module-artifact-gen/$(f)-artifact-gen \ + $(HOST_DIR)/bin/$(f)-artifact-gen; \ + fi; \ + ) +endef + +$(eval $(generic-package)) diff --git a/package/mender/S42mender b/package/mender/S42mender index 0f2077d089..70116ed4eb 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -8,22 +8,6 @@ PIDFILE="/var/run/${DAEMON}.pid" DAEMON_ARGS="daemon" start() { - # If /var/lib/mender is a symlink to /var/run/mender, and - # - the filesystem is RO (i.e. we can not rm the symlink), - # create the directory pointed to by the symlink. - # - the filesystem is RW (i.e. we can rm the symlink), - # replace the symlink with an actual directory - if [ -L /var/lib/mender ] && [ "$(readlink /var/lib/mender)" = "/var/run/mender" ] - then - if rm -f /var/lib/mender >/dev/null 2>&1; then - mkdir -p /var/lib/mender - else - echo "No persistent location to store mender data. Data will be lost" - echo "at reboot. Are you sure this is what you want to do?" - mkdir -p "$(readlink /var/lib/mender)" - fi - fi - printf "Starting mender service: " umask 077 start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${DAEMON_ARGS} diff --git a/package/mender/mender-client.service b/package/mender/mender-client.service index 5539a56fd6..47e439993c 100644 --- a/package/mender/mender-client.service +++ b/package/mender/mender-client.service @@ -6,17 +6,6 @@ After=systemd-resolved.service Type=idle User=root Group=root -ExecStartPre=/bin/sh -c '\ -if [ -L /var/lib/mender \ - -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]; then \ - if rm -f /var/lib/mender >/dev/null 2>&1; then \ - mkdir -p /var/lib/mender; \ - else \ - echo "No persistent location to store mender data. Data will be lost" \ - echo "at reboot. Are you sure this is what you want to do?"; \ - mkdir -p "$(readlink /var/lib/mender)"; \ - fi; \ -fi' ExecStart=/usr/bin/mender daemon Restart=on-abort diff --git a/package/mender/mender.conf b/package/mender/mender.conf index f89118ac1b..2393948f8e 100644 --- a/package/mender/mender.conf +++ b/package/mender/mender.conf @@ -4,6 +4,7 @@ "RetryPollIntervalSeconds": 300, "RootfsPartA": "/dev/mmcblk0p2", "RootfsPartB": "/dev/mmcblk0p3", + "DeviceTypeFile": "/var/lib/mender/device_type", "ServerCertificate": "/etc/mender/server.crt", "ServerURL": "https://docker.mender.io", "TenantToken": "dummy" diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 118cce9d02..17fe08c827 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,12 +1,12 @@ # Locally computed: -sha256 8a149b11b990beb7620b372023eec28df63cee6a1aa4132e88ecef554f080f72 mender-3.4.0-go2.tar.gz +sha256 35e369759b8d4f012153e538b5daf1e0cebe842205811e708332c5a092270ac5 mender-3.5.3-go2.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE -sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE +sha256 52b2497ce07650b825015e80ca7a5d40c360c04c530234ca6d950b0f98bca23a vendor/github.com/mendersoftware/mender-artifact/LICENSE sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE @@ -29,6 +29,8 @@ sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor # # MIT license. sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE +sha256 f69f157b0be75da373605dbc8bbf142e8924ee82d8f44f11bcaf351335bf98cf vendor/github.com/klauspost/compress/internal/snapref/LICENSE +sha256 f566a9f97bacdaf00d9f21dd991e81dc11201c4e016c86b470799429a1c9a79c vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE @@ -42,4 +44,4 @@ sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 93d9db9b43097b174e362ac8f398aa9a37fcdde2974d0567b62bd6d1e0d22037 LIC_FILES_CHKSUM.sha256 +sha256 86407bd98d5ea7fb0f09ab771c3333e975d06565b809a2dd95f864dc1e3a09b3 LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index ee1398244b..770589390f 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 3.4.0 +MENDER_VERSION = 3.5.3 MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 MENDER_CPE_ID_VENDOR = northern.tech @@ -29,6 +29,8 @@ MENDER_LICENSE_FILES = \ vendor/golang.org/x/term/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/klauspost/pgzip/LICENSE \ + vendor/github.com/klauspost/compress/internal/snapref/LICENSE \ + vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt \ vendor/github.com/klauspost/cpuid/v2/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ @@ -43,12 +45,7 @@ MENDER_DEPENDENCIES = host-pkgconf openssl MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION) -MENDER_UPDATE_MODULES_FILES = \ - directory \ - script \ - single-file \ - $(if $(BR2_PACKAGE_DOCKER_CLI),docker) \ - $(if $(BR2_PACKAGE_RPM),rpm) +MENDER_UPDATE_MODULES_FILES = directory single-file define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts @@ -66,14 +63,10 @@ define MENDER_INSTALL_CONFIG_FILES $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) - $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/artifact_info \ - $(TARGET_DIR)/etc/mender/artifact_info - $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/device_type \ $(TARGET_DIR)/etc/mender/device_type - mkdir -p $(TARGET_DIR)/var/lib - ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender + mkdir -p $(TARGET_DIR)/var/lib/mender $(foreach f,$(MENDER_UPDATE_MODULES_FILES), \ $(INSTALL) -D -m 0755 $(@D)/support/modules/$(notdir $(f)) \ $(TARGET_DIR)/usr/share/mender/modules/v3/$(notdir $(f)) diff --git a/package/mender/readme.txt b/package/mender/readme.txt index c884524a1b..56d6204583 100644 --- a/package/mender/readme.txt +++ b/package/mender/readme.txt @@ -28,13 +28,23 @@ In Buildroot the following packages are provided: - This will install the client on target rootfs - BR2_PACKAGE_HOST_MENDER_ARTIFACT - This will install the 'mender-artifact' tool in host rootfs. +- BR2_PACKAGE_MENDER_CONNECT + - This installs a client that allows for remote terminal access + to mender clients registered on a mender server. +- BR2_PACKAGE_MENDER_GRUBENV + - This package provides boot scripts to integrate mender into grub. + Mender recommends every client to use this package, including boards + using uboot as the primary bootloader. To fully utilize atomic image-based deployments using the A/B update strategy, additional integration is required in the bootloader. This integration is board specific. -Currently supported bootloaders are GRUB and U-boot, and for reference -integrations please visit: +Currently supported bootloaders are GRUB and U-boot. Buildroot provides +a reference integration at board/mender/x86_64/ using the +mender_x86_64_efi_defconfig file. + +Additional support and integrations are found at: https://github.com/mendersoftware/buildroot-mender @@ -46,12 +56,7 @@ files that need your attention: - /etc/mender/mender.conf - main configuration file for the Mender client - - https://docs.mender.io/client-configuration/configuration-file/configuration-options - -- /etc/mender/artifact_info - - The name of the image or update that will be built. This is what the - device will report that it is running, and different updates must have - different names + - https://docs.mender.io/client-installation/configuration/configuration-options - /var/lib/mender/device_type - A string that defines the type of device @@ -110,40 +115,13 @@ Creating Mender Artifacts To create Mender Artifacts based on Buildroot build output you must include BR2_PACKAGE_HOST_MENDER_ARTIFACT in your configuration, and then you would typically create the Mender Artifact in a post image -script (BR2_ROOTFS_POST_IMAGE_SCRIPT). Below is an example of such a -script: +script (BR2_ROOTFS_POST_IMAGE_SCRIPT). See the generate_mender_image +method in board/mender/x86_64/post-image-efi.sh for a working example. - #!/bin/sh - - set -e - set -x - - device_type=$(cat ${TARGET_DIR}/var/lib/mender/device_type | sed 's/[^=]*=//') - artifact_name=$(cat ${TARGET_DIR}/etc/mender/artifact_info | sed 's/[^=]*=//') - - if [ -z "${device_type}" ] || [ -z "${artifact_name}" ]; then - echo "missing files required by Mender" - exit 1 - fi - - ${HOST_DIR}/usr/bin/mender-artifact write rootfs-image \ - --update ${BINARIES_DIR}/rootfs.ext4 \ - --output-path ${BINARIES_DIR}/${artifact_name}.mender \ - --artifact-name ${artifact_name} \ - --device-type ${device_type} - -As you can see some properties are extracted from target rootfs, and -this is because these values are used for compatibility checks, -meaning that the information must be present in both rootfs and in -Mender Artifact meta data. - -- device_type - must be an exact match between rootfs and Mender - Artifact meta-data to apply update. You can set an - array of devices here as well, e.g if your image is - compatible with multiple hardware revisions - -- artifact_name - must be an exact match between rootfs and Mender - Artifact meta-data to apply update. +Additionally, mender requires a bootstrap.mender file which is also +generated using the host-mender-artifact package. See the +generate_mender_bootstrap_artifact method in +board/mender/x86_64/post-image-efi.sh for an example Configuring Mender with certificates ------------------------------------ diff --git a/package/mesa3d-demos/0003-vulkan-wsi-use-unsigned-instead-of-uint.patch b/package/mesa3d-demos/0003-vulkan-wsi-use-unsigned-instead-of-uint.patch new file mode 100644 index 0000000000..160dc9010d --- /dev/null +++ b/package/mesa3d-demos/0003-vulkan-wsi-use-unsigned-instead-of-uint.patch @@ -0,0 +1,68 @@ +From 3f4d5ff34e061f3d47b9cf28bff2fc588d8c5326 Mon Sep 17 00:00:00 2001 +From: psykose +Date: Thu, 23 Mar 2023 21:18:56 +0000 +Subject: [PATCH] vulkan/wsi: use unsigned instead of uint + +uint is not a standard type name and fails to build against musl libc + +Reviewed-by: Erik Faye-Lund +Upstream: https://gitlab.freedesktop.org/mesa/demos/-/commit/3f4d5ff34e061f3d47b9cf28bff2fc588d8c5326 +Signed-off-by: Fiona Klute (WIWA) +--- + src/vulkan/wsi/wayland.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/vulkan/wsi/wayland.c b/src/vulkan/wsi/wayland.c +index 444d2bb81..5958d283a 100644 +--- a/src/vulkan/wsi/wayland.c ++++ b/src/vulkan/wsi/wayland.c +@@ -128,7 +128,7 @@ dispatch_key(xkb_keycode_t xkb_key, enum wl_keyboard_key_state state) + } + + static void +-handle_key(uint key, enum wl_keyboard_key_state state) ++handle_key(unsigned key, enum wl_keyboard_key_state state) + { + xkb_keycode_t xkb_key = key + 8; + struct itimerspec timer = {0}; +@@ -151,15 +151,15 @@ handle_key(uint key, enum wl_keyboard_key_state state) + } + + static void +-key(void *data, struct wl_keyboard *keyboard, uint serial, +- uint time, uint key, enum wl_keyboard_key_state state) ++key(void *data, struct wl_keyboard *keyboard, unsigned serial, ++ unsigned time, unsigned key, enum wl_keyboard_key_state state) + { + handle_key(key, state); + } + + static void +-modifiers(void *data, struct wl_keyboard *keyboard, uint serial, +- uint mods_depressed, uint mods_latched, uint mods_locked, uint group) ++modifiers(void *data, struct wl_keyboard *keyboard, unsigned serial, ++ unsigned mods_depressed, unsigned mods_latched, unsigned mods_locked, unsigned group) + { + xkb_state_update_mask(keyboard_data.xkb_state, mods_depressed, mods_latched, + mods_locked, 0, 0, group); +@@ -184,7 +184,7 @@ keymap(void *data, struct wl_keyboard *keyboard, + } + + static void +-enter(void *data, struct wl_keyboard *keyboard, uint serial, ++enter(void *data, struct wl_keyboard *keyboard, unsigned serial, + struct wl_surface *surface, struct wl_array *keys) + { + uint32_t *key; +@@ -194,7 +194,7 @@ enter(void *data, struct wl_keyboard *keyboard, uint serial, + } + + static void +-leave(void *data, struct wl_keyboard *keyboard, uint serial, ++leave(void *data, struct wl_keyboard *keyboard, unsigned serial, + struct wl_surface *surface) + { + struct itimerspec timer = {0}; +-- +GitLab + diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 8acba9270a..fd4805a728 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -11,7 +11,8 @@ MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - -Dgles1=disabled + -Dgles1=disabled \ + -Dosmesa=disabled # BR2_PACKAGE_MESA3D_OSMESA_GALLIUM removed in mesa 25.1 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext @@ -52,14 +53,6 @@ endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += -Dwith-glut=$(STAGING_DIR)/usr -# osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled -else -MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled -endif -else -MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_LIBDECOR)$(BR2_PACKAGE_WAYLAND),yy) @@ -69,4 +62,11 @@ else MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled endif +ifeq ($(BR2_PACKAGE_VULKAN_LOADER),y) +MESA3D_DEMOS_DEPENDENCIES += vulkan-loader +MESA3D_DEMOS_CONF_OPTS += -Dvulkan=enabled +else +MESA3D_DEMOS_CONF_OPTS += -Dvulkan=disabled +endif + $(eval $(meson-package)) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 33c60b285f..75d7405504 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.9 +MESA3D_HEADERS_VERSION = 25.2.7 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch deleted file mode 100644 index e3c70c3f24..0000000000 --- a/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 17 Apr 2019 23:07:42 +0200 -Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Based on the patch for autotools provided by Valentin Korenblit. - -Signed-off-by: Romain Naour -Signed-off-by: Bernd Kuhls -[rebased for 20.2.0 & 20.3.0] ---- - src/gallium/frontends/clover/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build -index 62ac5f5278d..ecdeb39669c 100644 ---- a/src/gallium/frontends/clover/meson.build -+++ b/src/gallium/frontends/clover/meson.build -@@ -27,7 +27,7 @@ - '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', - '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', - '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', -- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')), -+ '-DLIBCLC_INCLUDEDIR="/usr/share"', - '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) - ] - clover_spirv_cpp_args = [] --- -2.20.1 - diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch similarity index 81% rename from package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch rename to package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index f3919478a6..52e23e35da 100644 --- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -9,22 +9,22 @@ to force disabling it at compile time. Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 Signed-off-by: Peter Seiderer -Signed-off-by: Bernd Kuhls -[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0] +Signed-off-by: Bernd Kuhls +[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0, 24.3.0, 25.1.0 & 25.2.0] Signed-off-by: Peter Seiderer [fix syntax error after previous rebases] --- - meson_options.txt | 7 +++++++ + meson.options | 7 +++++++ src/gallium/drivers/vc4/meson.build | 4 ++-- src/gallium/drivers/vc4/vc4_tiling.h | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) -diff --git a/meson_options.txt b/meson_options.txt +diff --git a/meson.options b/meson.options index 8e0bf2a..1cf0e07 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -124,6 +124,13 @@ option( - description : 'enable gallium va frontend.', +--- a/meson.options ++++ b/meson.options +@@ -131,6 +131,13 @@ option( + description : 'enable gallium mediafoundation frontend tests.', ) +option( @@ -41,18 +41,18 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson index 84da951..7f950de 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build -@@ -84,7 +84,7 @@ files_libvc4 = files( - vc4_c_args = [] +@@ -72,7 +72,7 @@ files_libvc4 = files( + ] libvc4_neon = [] -if host_machine.cpu_family() == 'arm' +if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled() libvc4_neon = static_library( 'vc4_neon', - 'vc4_tiling_lt_neon.c', -@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' - ], - c_args : '-mfpu=neon', + 'vc4_tiling_lt.c', +@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' + c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'], + dependencies : vc4_deps, ) - vc4_c_args += '-DUSE_ARM_ASM' + vc4_c_args += '-DVC4_TILING_LT_NEON' diff --git a/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/package/mesa3d/0002-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch similarity index 100% rename from package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch rename to package/mesa3d/0002-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch diff --git a/package/mesa3d/0004-Fix-uClibc-build.patch b/package/mesa3d/0003-Fix-uClibc-build.patch similarity index 100% rename from package/mesa3d/0004-Fix-uClibc-build.patch rename to package/mesa3d/0003-Fix-uClibc-build.patch diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7761b0a650..d2003fce42 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -21,6 +21,12 @@ if BR2_PACKAGE_MESA3D config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS bool +config BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + bool + select BR2_PACKAGE_MESA3D_OPENCL + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + select BR2_PACKAGE_SPIRV_TOOLS + config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS @@ -44,17 +50,44 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 -# clang and libclc dependencies are satisfied by -# BR2_PACKAGE_MESA3D_LLVM -config BR2_PACKAGE_MESA3D_OPENCL +menuconfig BR2_PACKAGE_MESA3D_OPENCL bool "OpenCL support" depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS || \ + BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL || \ + (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER) select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL +if BR2_PACKAGE_MESA3D_OPENCL +# libclc dependency is satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_RUSTICL + bool "RustiCL" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_LLVM_DUMP + select BR2_PACKAGE_SPIRV_TOOLS + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + select BR2_PACKAGE_OPENCL_ICD_LOADER + help + RustiCL is an OpenCL implementation written in Rust. + By default, devices are disabled in RustiCL. If you want + to enable a device, you need to set the environment variable + RUSTICL_ENABLE to the driver you are using. + + https://docs.mesa3d.org/envvars.html#envvar-RUSTICL_ENABLE + +endif # BR2_PACKAGE_MESA3D_OPENCL + +config BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + bool # inform the .mk file of gallium or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER @@ -69,12 +102,6 @@ config BR2_PACKAGE_MESA3D_DRIVER bool select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 -# Gallium xa state tracker. -# Quote from mesa3d meson.build: "XA state tracker requires at least -# one of the following gallium drivers: nouveau, freedreno, i915, svga. -config BR2_PACKAGE_MESA3D_NEEDS_XA - bool - # OpenGL GLX and Gallium VDPAU both needs X11 config BR2_PACKAGE_MESA3D_NEEDS_X11 bool @@ -128,11 +155,16 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS bool "Gallium iris driver" - depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Mesa driver for iris-based Intel GPUs. +comment "iris driver needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence @@ -140,22 +172,40 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA help Mesa driver for ARM Mali Utgard GPUs. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE + bool "Gallium llvmpipe driver" + depends on BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + help + This is a llvm opengl implementation using the Gallium3D + infrastructure. + +comment "llvmpipe driver needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU bool "Gallium nouveau driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_NOUVEAU - select BR2_PACKAGE_MESA3D_NEEDS_XA select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Supports all Nvidia GPUs. config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. +comment "panfrost driver needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 bool "Gallium Radeon R300 driver" depends on BR2_i386 || BR2_x86_64 @@ -200,6 +250,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI select BR2_PACKAGE_LLVM_AMDGPU select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs. @@ -208,12 +259,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_VMWGFX - select BR2_PACKAGE_MESA3D_NEEDS_XA help This is a virtual GPU driver for VMWare virtual machines. -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST - bool "Gallium swrast driver" +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE + bool "Gallium softpipe driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help This is a software opengl implementation using the Gallium3D @@ -224,7 +274,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU select BR2_PACKAGE_LIBDRM_NOUVEAU - select BR2_PACKAGE_MESA3D_NEEDS_XA help Adds support for Nvidia Tegra GPUs, requires nouveau. @@ -236,7 +285,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime select BR2_PACKAGE_MESA3D_OPENGL_EGL help - Driver for Broadcom VC6 (rpi4) GPUs (needs vc4). + Driver for Broadcom VC6/7 (rpi4/5) GPUs (needs vc4). It requires a kernel 4.18+ with DRM V3D support enabled: @@ -245,13 +294,14 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" - depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 + depends on BR2_arm || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL help - Driver for Broadcom VC4 (rpi2/3) GPUs. + Driver for Broadcom VC4 (rpi0/1/2/3) GPUs. + It requires a vanilla 4.5+ kernel with drm vc4 (open) support. config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL @@ -262,6 +312,16 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL virgl is the 3D acceleration backend for the virtio-gpu shipping with qemu. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK + bool "Gallium zink driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + select BR2_PACKAGE_VULKAN_LOADER + help + Zink is a Gallium driver that emits Vulkan API calls, + providing OpenGL support on devices that only support + Vulkan. + config BR2_PACKAGE_MESA3D_VDPAU bool "Gallium VDPAU state tracker" depends on BR2_PACKAGE_XORG7 @@ -285,23 +345,34 @@ comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM bool "Vulkan broadcom driver" depends on BR2_arm || BR2_aarch64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan broadcom driver. +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_IMAGINATION + bool "Vulkan imagination driver (experimental)" + depends on BR2_arm || BR2_aarch64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan imagination driver. + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" - depends on BR2_i386 || BR2_x86_64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert + depends on BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan driver for Intel hardware from Ivy Bridge onward. +comment "intel vulkan needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" - depends on BR2_i386 || BR2_x86_64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ !BR2_TOOLCHAIN_USES_GLIBC @@ -309,18 +380,16 @@ comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST bool "Vulkan swrast driver" depends on BR2_PACKAGE_MESA3D_LLVM - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan swrast driver. -comment "Off-screen Rendering" - -config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM - bool "OSMesa (Gallium) library" - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO + bool "Vulkan VirtIO driver (Venus)" + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help - The OSMesa API provides functions for off-screen rendering. + Vulkan VirtIO (venus) driver. if BR2_PACKAGE_MESA3D_DRIVER diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d506d398b8..e2b3d9ca79 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,7 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html -sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz -sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2025-November/000828.html +sha256 b40232a642011820211aab5a9cdf754e106b0bce15044bc4496b0ac9615892ad mesa-25.2.7.tar.xz +sha512 87dd815e0d11d6ec0eb969ee93d3f376103bb899d90599e0b7902394e41c58139384df79f89633e132ca969348d3320f55308a74651d409b454d51f1bcda27bc mesa-25.2.7.tar.xz # License -sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst +sha256 0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615 docs/license.rst +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f licenses/MIT +sha256 686bf035a1fd22076416fd3b90370ac67771e884bf57f55693d51f8ce7c710a7 licenses/SGI-B-2.0 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index ce460c4475..5305ea2de1 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,11 +5,14 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.9 +MESA3D_VERSION = 25.2.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -MESA3D_LICENSE_FILES = docs/license.rst +MESA3D_LICENSE_FILES = \ + docs/license.rst \ + licenses/MIT \ + licenses/SGI-B-2.0 MESA3D_CPE_ID_VENDOR = mesa3d MESA3D_CPE_ID_PRODUCT = mesa @@ -21,19 +24,16 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ host-python-mako \ + host-python-pyyaml \ expat \ libdrm \ zlib MESA3D_CONF_OPTS = \ - -Dgallium-omx=disabled \ - -Dpower8=disabled + -Dmicrosoft-clc=disabled ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) -MESA3D_CONF_OPTS += -Ddri3=enabled MESA3D_DEPENDENCIES += xlib_libxshmfence -else -MESA3D_CONF_OPTS += -Ddri3=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) @@ -50,14 +50,33 @@ else MESA3D_CONF_OPTS += -Dllvm=disabled endif -# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of -# libMesaOpenCL and CL headers are installed ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc -MESA3D_CONF_OPTS += -Dgallium-opencl=standalone +endif + +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) +MESA3D_DEPENDENCIES += \ + host-rustc \ + host-rust-bindgen \ + spirv-tools \ + spirv-llvm-translator \ + opencl-icd-loader + +# rust_std is defined here to workaround a known meson bug. See: +# https://docs.mesa3d.org/rusticl.html#known-issues +# https://github.com/mesonbuild/meson/issues/10664 +MESA3D_CONF_OPTS += \ + -Dgallium-rusticl=true \ + -Drust_std=2021 \ + -Dmesa-clc-bundle-headers=enabled + +MESA3D_MESON_EXTRA_BINARIES += \ + rust=['$(HOST_DIR)/bin/rustc','--target=$(RUSTC_TARGET_NAME)'] \ + rust_ld='$(TARGET_CROSS)gcc' + else -MESA3D_CONF_OPTS += -Dgallium-opencl=disabled +MESA3D_CONF_OPTS += -Dgallium-rusticl=false endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) @@ -67,21 +86,15 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # Disable-mangling not yet supported by meson build system. # glx: -# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# dri : dri based GLX requires at least one DRI driver # xlib : xlib conflicts with any dri driver # Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ -Dglx-direct=true -ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += -Dgallium-xa=enabled -else -MESA3D_CONF_OPTS += -Dgallium-xa=disabled -endif else MESA3D_CONF_OPTS += \ - -Dglx=disabled \ - -Dgallium-xa=disabled + -Dglx=disabled endif ifeq ($(BR2_ARM_CPU_HAS_NEON),y) @@ -98,22 +111,28 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris +HOST_MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE) += llvmpipe MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost +HOST_MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE) += softpipe MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK) += zink # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_IMAGINATION) += imagination-experimental MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO) += virtio ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ @@ -121,11 +140,23 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - -Dshared-glapi=enabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ -Dgallium-extra-hud=true endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) +MESA3D_DEPENDENCIES += host-python-pycparser +endif + +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y) +MESA3D_DEPENDENCIES += host-python-ply +endif + +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER),y) +MESA3D_CONF_OPTS += -Dmesa-clc=system -Dprecomp-compiler=system +MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools +endif + ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= @@ -137,12 +168,6 @@ endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -MESA3D_CONF_OPTS += -Dosmesa=true -else -MESA3D_CONF_OPTS += -Dosmesa=false -endif - # Always enable OpenGL: # - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. MESA3D_CONF_OPTS += -Dopengl=true @@ -251,12 +276,46 @@ endif ifeq ($(BR2_PACKAGE_LIBGLVND),y) ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) MESA3D_DEPENDENCIES += libglvnd -MESA3D_CONF_OPTS += -Dglvnd=true +MESA3D_CONF_OPTS += -Dglvnd=enabled else -MESA3D_CONF_OPTS += -Dglvnd=false +MESA3D_CONF_OPTS += -Dglvnd=disabled endif else -MESA3D_CONF_OPTS += -Dglvnd=false +MESA3D_CONF_OPTS += -Dglvnd=disabled endif +HOST_MESA3D_CONF_OPTS = \ + -Dglvnd=disabled \ + -Dgallium-drivers=$(subst $(space),$(comma),$(HOST_MESA3D_GALLIUM_DRIVERS-y)) \ + -Dgallium-vdpau=disabled \ + -Dinstall-mesa-clc=true \ + -Dmesa-clc=enabled \ + -Dplatforms= \ + -Dprecomp-compiler=enabled \ + -Dglx=disabled \ + -Dvulkan-drivers="" + +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +HOST_MESA3D_CONF_OPTS += -Dtools=panfrost +endif + +HOST_MESA3D_DEPENDENCIES = \ + host-libclc \ + host-libdrm \ + host-python-mako \ + host-python-pyyaml \ + host-spirv-tools + +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +HOST_MESA3D_INSTALL_PANFROST_COMPILE = \ + $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/panfrost/clc/panfrost_compile $(HOST_DIR)/bin/panfrost_compile +endif + +define HOST_MESA3D_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/compiler/clc/mesa_clc $(HOST_DIR)/bin/mesa_clc + $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/compiler/spirv/vtn_bindgen2 $(HOST_DIR)/bin/vtn_bindgen2 + $(HOST_MESA3D_INSTALL_PANFROST_COMPILE) +endef + $(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch index 55f7512e2e..c7f8557ec1 100644 --- a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch +++ b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch @@ -24,7 +24,8 @@ http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba Signed-off-by: Matthew Weber [Updated for 0.57.1 - get_builtin_option() vs. get_option(OptionKey())] Signed-off-by: Peter Seiderer -[Bernd: rebased for 1.6.0] +[Bernd: rebased for 1.6.0 & 1.7.0 + for 1.82.0 - get_option -> optstore.get_value_for] Signed-off-by: Bernd Kuhls --- mesonbuild/compilers/mixins/clike.py | 3 +++ @@ -42,11 +43,11 @@ index 09ad837b1..b7f6b9f22 100644 from .. import compilers from ..compilers import CompileCheckMode from .visualstudio import VisualStudioLikeCompiler -@@ -1038,6 +1038,9 @@ class CLikeCompiler(Compiler): - # TI C6000 compiler can use both extensions for static or dynamic libs. +@@ -1053,6 +1054,9 @@ class CLikeCompiler(Compiler): + # TI C28x compilers can use both extensions for static or dynamic libs. stlibext = ['a', 'lib'] shlibext = ['dll', 'so'] -+ elif env.coredata.get_option(OptionKey('default_library')) == 'static': ++ elif env.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static': + # Linux/BSDs + shlibext = ['a'] else: diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 8b95dc7592..d0b246f0a3 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -30,7 +30,7 @@ diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgc index e86206b88..94888657d 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py -@@ -169,7 +169,8 @@ class PkgConfigCLI(PkgConfigInterface): +@@ -170,7 +170,8 @@ class PkgConfigCLI(PkgConfigInterface): env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' args: T.List[str] = [] args += self._define_variable_args(define_variable) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index e02d878d79..c83daae6c9 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz.asc -sha256 999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496 meson-1.6.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.8.3/meson-1.8.3.tar.gz.asc +sha256 f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf meson-1.8.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index f36091e584..0c460eca6f 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.6.0 +MESON_VERSION = 1.8.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/package/metacity/0001-add-libm-reference.patch b/package/metacity/0001-add-libm-reference.patch deleted file mode 100644 index 628501726a..0000000000 --- a/package/metacity/0001-add-libm-reference.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream fix to link metacity itself against libm - -The upstream fix is modified to also include the changes on the -configure script directly, so that autoreconfiguring is not -needed. Autoreconfiguring cannot be done easily on metacity, due to -missing AM_GCONF_SOURCE_2 and AM_NLS macros. - -http://git.gnome.org/browse/metacity/commit/configure.in?id=9cb0b6ff520ea69bdff6c328a21787202aee1bcc - -Signed-off-by: Thomas Petazzoni - -From 9cb0b6ff520ea69bdff6c328a21787202aee1bcc Mon Sep 17 00:00:00 2001 -From: Götz Waschk -Date: Wed, 22 Oct 2008 12:08:48 +0000 -Subject: add libm reference. Closes #557357. - -2008-10-22 Götz Waschk - - * configure.in: add libm reference. Closes #557357. - - -svn path=/trunk/; revision=3984 ---- -(limited to 'configure.in') - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -413,7 +413,7 @@ - AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library]) - fi - --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -29509,7 +29509,7 @@ - - fi - --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" diff --git a/package/metacity/0002-gconf.patch b/package/metacity/0002-gconf.patch deleted file mode 100644 index 939ef7ef98..0000000000 --- a/package/metacity/0002-gconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] fix build with --disable-gconf - -src/core/prefs.c still contain a call to gconf_client_set_bool() when -built with --disable-gconf, breaking the build. - -Signed-off-by: Peter Korsgaard ---- - src/core/prefs.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: metacity-2.25.1/src/core/prefs.c -=================================================================== ---- metacity-2.25.1.orig/src/core/prefs.c -+++ metacity-2.25.1/src/core/prefs.c -@@ -2949,6 +2949,7 @@ - void - meta_prefs_set_compositing_manager (gboolean whether) - { -+#if HAVE_GCONF - GError *err = NULL; - - gconf_client_set_bool (default_client, -@@ -2962,6 +2963,7 @@ - err->message); - g_error_free (err); - } -+#endif - } - - #ifndef HAVE_GCONF diff --git a/package/metacity/0003-mag-add-libm-reference.patch b/package/metacity/0003-mag-add-libm-reference.patch deleted file mode 100644 index d47d807558..0000000000 --- a/package/metacity/0003-mag-add-libm-reference.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream patch to fix link against libm - -The upstream patch is modified to also include the necessary -Makefile.in, which avoids the need for autoreconfiguring the -package. Autoreconfiguring the package unfortunately doesn't work, due -to AM_GCONF_SOURCE_2 and AM_NLS macros being missing. - -http://git.gnome.org/browse/metacity/commit/src/tools/Makefile.am?id=13d0d52eb885598885b6ff4b73c795c8f29c2a6b - -Signed-off-by: Thomas Petazzoni - -From 13d0d52eb885598885b6ff4b73c795c8f29c2a6b Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sun, 02 May 2010 14:50:42 +0000 -Subject: fails to link with pedantic linkers - ---- -(limited to 'src/tools/Makefile.am') - -Index: b/src/tools/Makefile.am -=================================================================== ---- a/src/tools/Makefile.am -+++ b/src/tools/Makefile.am -@@ -26,7 +26,7 @@ - - metacity_message_LDADD= @METACITY_MESSAGE_LIBS@ - metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@ --metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -+metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ - - EXTRA_DIST=$(icon_DATA) -Index: b/src/tools/Makefile.in -=================================================================== ---- a/src/tools/Makefile.in -+++ b/src/tools/Makefile.in -@@ -281,7 +281,7 @@ - - metacity_message_LDADD = @METACITY_MESSAGE_LIBS@ - metacity_window_demo_LDADD = @METACITY_WINDOW_DEMO_LIBS@ --metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -+metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -lm - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ - EXTRA_DIST = $(icon_DATA) - all: all-am diff --git a/package/metacity/Config.in b/package/metacity/Config.in deleted file mode 100644 index fc106a26b9..0000000000 --- a/package/metacity/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_METACITY - bool "metacity" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - # Metacity configure.ac pretends it can be built without - # Composite, but in reality, it doesn't build. - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXDAMAGE - # We do not directly depend on Xft, but they are needed to get - # Xft support in Pango, which we require. - select BR2_PACKAGE_XLIB_LIBXFT - help - Metacity is a window manager for the X Window System. - - https://wiki.gnome.org/Projects/Metacity diff --git a/package/metacity/Xsession b/package/metacity/Xsession deleted file mode 100755 index 7225921a07..0000000000 --- a/package/metacity/Xsession +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -export GDK_USE_XFT=1 -export LANG="en_US.UTF-8" -export LC_ALL="en_US.UTF-8" -/usr/bin/X11/rxvt -bg black -fg gray90 & -exec /bin/metacity diff --git a/package/metacity/metacity.hash b/package/metacity/metacity.hash deleted file mode 100644 index 2aca099038..0000000000 --- a/package/metacity/metacity.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum -sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 - -# Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk deleted file mode 100644 index 5756658300..0000000000 --- a/package/metacity/metacity.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# metacity -# -################################################################################ - -# newer versions need libcanberra-gtk and gnome-doc-utils -METACITY_VERSION_MAJOR = 2.25 -METACITY_VERSION = $(METACITY_VERSION_MAJOR).1 -METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2 -METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR) -METACITY_LICENSE = GPL-2.0+ -METACITY_LICENSE_FILES = COPYING - -METACITY_CONF_OPTS = \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --disable-gconf \ - --disable-sm \ - --disable-startup-notification - -METACITY_DEPENDENCIES = libgtk2 \ - xlib_libX11 \ - host-libxml-parser-perl \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXrender \ - xlib_libXdamage \ - $(TARGET_NLS_DEPENDENCIES) - -METACITY_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -METACITY_DEPENDENCIES += xlib_libXcursor -endif - -define METACITY_INSTALL_XSESSION - $(INSTALL) -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession -endef - -METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION - -$(eval $(autotools-package)) diff --git a/package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch b/package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch new file mode 100644 index 0000000000..1d18db8235 --- /dev/null +++ b/package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch @@ -0,0 +1,85 @@ +From 7d9fcfcd1b0ef9f20e703037eba6a49a4fc4cb0c Mon Sep 17 00:00:00 2001 +From: Alessandro Gatti +Date: Tue, 28 Jan 2025 14:58:29 +0100 +Subject: [PATCH] py/emitinlinextensa: Simplify register name lookup. + +This commit changes the Xtensa inline assembly parser to use a slightly +simpler (and probably a tiny bit more efficient) way to look up register +names when decoding instruction parameters. + +Signed-off-by: Alessandro Gatti +Upstream: https://github.com/micropython/micropython/commit/50fab08e6b861adf65905d6adacd74201c87ddb9 +[tperale: backport 1.22.2] +Signed-off-by: Thomas Perale +--- + py/emitinlinextensa.c | 49 +++++++++---------------------------------- + 1 file changed, 10 insertions(+), 39 deletions(-) + +diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c +index 5dac2ae39..e59146047 100644 +--- a/py/emitinlinextensa.c ++++ b/py/emitinlinextensa.c +@@ -115,50 +115,21 @@ STATIC bool emit_inline_xtensa_label(emit_inline_asm_t *emit, mp_uint_t label_nu + return true; + } + +-typedef struct _reg_name_t { byte reg; +- byte name[3]; +-} reg_name_t; +-STATIC const reg_name_t reg_name_table[] = { +- {0, "a0\0"}, +- {1, "a1\0"}, +- {2, "a2\0"}, +- {3, "a3\0"}, +- {4, "a4\0"}, +- {5, "a5\0"}, +- {6, "a6\0"}, +- {7, "a7\0"}, +- {8, "a8\0"}, +- {9, "a9\0"}, +- {10, "a10"}, +- {11, "a11"}, +- {12, "a12"}, +- {13, "a13"}, +- {14, "a14"}, +- {15, "a15"}, ++STATIC const qstr_short_t REGISTERS[16] = { ++ MP_QSTR_a0, MP_QSTR_a1, MP_QSTR_a2, MP_QSTR_a3, MP_QSTR_a4, MP_QSTR_a5, MP_QSTR_a6, MP_QSTR_a7, ++ MP_QSTR_a8, MP_QSTR_a9, MP_QSTR_a10, MP_QSTR_a11, MP_QSTR_a12, MP_QSTR_a13, MP_QSTR_a14, MP_QSTR_a15 + }; + +-// return empty string in case of error, so we can attempt to parse the string +-// without a special check if it was in fact a string +-STATIC const char *get_arg_str(mp_parse_node_t pn) { +- if (MP_PARSE_NODE_IS_ID(pn)) { +- qstr qst = MP_PARSE_NODE_LEAF_ARG(pn); +- return qstr_str(qst); +- } else { +- return ""; +- } +-} +- + STATIC mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) { +- const char *reg_str = get_arg_str(pn); +- for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) { +- const reg_name_t *r = ®_name_table[i]; +- if (reg_str[0] == r->name[0] +- && reg_str[1] == r->name[1] +- && reg_str[2] == r->name[2] +- && (reg_str[2] == '\0' || reg_str[3] == '\0')) { +- return r->reg; ++ if (MP_PARSE_NODE_IS_ID(pn)) { ++ qstr node_qstr = MP_PARSE_NODE_LEAF_ARG(pn); ++ for (size_t i = 0; i < MP_ARRAY_SIZE(REGISTERS); i++) { ++ if (node_qstr == REGISTERS[i]) { ++ return i; ++ } + } + } ++ + emit_inline_xtensa_error_exc(emit, + mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, + MP_ERROR_TEXT("'%s' expects a register"), op)); +-- +2.49.0 + diff --git a/package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch b/package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch new file mode 100644 index 0000000000..31775bdbc0 --- /dev/null +++ b/package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch @@ -0,0 +1,234 @@ +From 531d4839d44a90447c232d51d1bee0cae45add9a Mon Sep 17 00:00:00 2001 +From: Angus Gratton +Date: Fri, 9 May 2025 13:34:37 +1000 +Subject: [PATCH] extmod/moductypes: Refactor string literal as array + initializer. + +Avoids the new Wunterminated-string-literal when compiled with gcc 15.1. + +Also split out the duplicate string to a top-level array (probably the +duplicate string literal was interned, so unlikely to have any impact.) + +This work was funded through GitHub Sponsors. + +Signed-off-by: Angus Gratton +Upstream: https://github.com/micropython/micropython/pull/17269 +[tperale: backport 1.22.2] +Signed-off-by: Thomas Perale +--- + extmod/moductypes.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/extmod/moductypes.c b/extmod/moductypes.c +index f56567107..87fd5fb69 100644 +--- a/extmod/moductypes.c ++++ b/extmod/moductypes.c +@@ -277,15 +277,18 @@ STATIC mp_obj_t uctypes_struct_sizeof(size_t n_args, const mp_obj_t *args) { + } + STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uctypes_struct_sizeof_obj, 1, 2, uctypes_struct_sizeof); + ++static const char type2char[16] = { ++ 'B', 'b', 'H', 'h', 'I', 'i', 'Q', 'q', ++ '-', '-', '-', '-', '-', '-', 'f', 'd' ++}; ++ + static inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) { + char struct_type = big_endian ? '>' : '<'; +- static const char type2char[16] = "BbHhIiQq------fd"; + return mp_binary_get_val(struct_type, type2char[val_type], p, &p); + } + + static inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) { + char struct_type = big_endian ? '>' : '<'; +- static const char type2char[16] = "BbHhIiQq------fd"; + mp_binary_set_val(struct_type, type2char[val_type], val, p, &p); + } + + +From 0398873d8c8096d2054db130efd1fcecba2a426d Mon Sep 17 00:00:00 2001 +From: Angus Gratton +Date: Fri, 9 May 2025 13:36:05 +1000 +Subject: [PATCH] py/emitinlinethumb: Refactor string literal as array + initializer. + +Avoids the new Wunterminated-string-literal when compiled with gcc 15.1. + +This work was funded through GitHub Sponsors. + +Signed-off-by: Angus Gratton +--- + py/emitinlinethumb.c | 108 +++++++++++++++++++++---------------------- + 1 file changed, 54 insertions(+), 54 deletions(-) + +diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c +index 29487f104..0b9efa1da 100644 +--- a/py/emitinlinethumb.c ++++ b/py/emitinlinethumb.c +@@ -150,27 +150,27 @@ typedef struct _reg_name_t { byte reg; + byte name[3]; + } reg_name_t; + STATIC const reg_name_t reg_name_table[] = { +- {0, "r0\0"}, +- {1, "r1\0"}, +- {2, "r2\0"}, +- {3, "r3\0"}, +- {4, "r4\0"}, +- {5, "r5\0"}, +- {6, "r6\0"}, +- {7, "r7\0"}, +- {8, "r8\0"}, +- {9, "r9\0"}, +- {10, "r10"}, +- {11, "r11"}, +- {12, "r12"}, +- {13, "r13"}, +- {14, "r14"}, +- {15, "r15"}, +- {10, "sl\0"}, +- {11, "fp\0"}, +- {13, "sp\0"}, +- {14, "lr\0"}, +- {15, "pc\0"}, ++ {0, {'r', '0' }}, ++ {1, {'r', '1' }}, ++ {2, {'r', '2' }}, ++ {3, {'r', '3' }}, ++ {4, {'r', '4' }}, ++ {5, {'r', '5' }}, ++ {6, {'r', '6' }}, ++ {7, {'r', '7' }}, ++ {8, {'r', '8' }}, ++ {9, {'r', '9' }}, ++ {10, {'r', '1', '0' }}, ++ {11, {'r', '1', '1' }}, ++ {12, {'r', '1', '2' }}, ++ {13, {'r', '1', '3' }}, ++ {14, {'r', '1', '4' }}, ++ {15, {'r', '1', '5' }}, ++ {10, {'s', 'l' }}, ++ {11, {'f', 'p' }}, ++ {13, {'s', 'p' }}, ++ {14, {'l', 'r' }}, ++ {15, {'p', 'c' }}, + }; + + #define MAX_SPECIAL_REGISTER_NAME_LENGTH 7 +@@ -368,20 +368,20 @@ typedef struct _cc_name_t { byte cc; + byte name[2]; + } cc_name_t; + STATIC const cc_name_t cc_name_table[] = { +- { ASM_THUMB_CC_EQ, "eq" }, +- { ASM_THUMB_CC_NE, "ne" }, +- { ASM_THUMB_CC_CS, "cs" }, +- { ASM_THUMB_CC_CC, "cc" }, +- { ASM_THUMB_CC_MI, "mi" }, +- { ASM_THUMB_CC_PL, "pl" }, +- { ASM_THUMB_CC_VS, "vs" }, +- { ASM_THUMB_CC_VC, "vc" }, +- { ASM_THUMB_CC_HI, "hi" }, +- { ASM_THUMB_CC_LS, "ls" }, +- { ASM_THUMB_CC_GE, "ge" }, +- { ASM_THUMB_CC_LT, "lt" }, +- { ASM_THUMB_CC_GT, "gt" }, +- { ASM_THUMB_CC_LE, "le" }, ++ { ASM_THUMB_CC_EQ, { 'e', 'q' }}, ++ { ASM_THUMB_CC_NE, { 'n', 'e' }}, ++ { ASM_THUMB_CC_CS, { 'c', 's' }}, ++ { ASM_THUMB_CC_CC, { 'c', 'c' }}, ++ { ASM_THUMB_CC_MI, { 'm', 'i' }}, ++ { ASM_THUMB_CC_PL, { 'p', 'l' }}, ++ { ASM_THUMB_CC_VS, { 'v', 's' }}, ++ { ASM_THUMB_CC_VC, { 'v', 'c' }}, ++ { ASM_THUMB_CC_HI, { 'h', 'i' }}, ++ { ASM_THUMB_CC_LS, { 'l', 's' }}, ++ { ASM_THUMB_CC_GE, { 'g', 'e' }}, ++ { ASM_THUMB_CC_LT, { 'l', 't' }}, ++ { ASM_THUMB_CC_GT, { 'g', 't' }}, ++ { ASM_THUMB_CC_LE, { 'l', 'e' }}, + }; + + typedef struct _format_4_op_t { byte op; +@@ -389,21 +389,21 @@ typedef struct _format_4_op_t { byte op; + } format_4_op_t; + #define X(x) (((x) >> 4) & 0xff) // only need 1 byte to distinguish these ops + STATIC const format_4_op_t format_4_op_table[] = { +- { X(ASM_THUMB_FORMAT_4_EOR), "eor" }, +- { X(ASM_THUMB_FORMAT_4_LSL), "lsl" }, +- { X(ASM_THUMB_FORMAT_4_LSR), "lsr" }, +- { X(ASM_THUMB_FORMAT_4_ASR), "asr" }, +- { X(ASM_THUMB_FORMAT_4_ADC), "adc" }, +- { X(ASM_THUMB_FORMAT_4_SBC), "sbc" }, +- { X(ASM_THUMB_FORMAT_4_ROR), "ror" }, +- { X(ASM_THUMB_FORMAT_4_TST), "tst" }, +- { X(ASM_THUMB_FORMAT_4_NEG), "neg" }, +- { X(ASM_THUMB_FORMAT_4_CMP), "cmp" }, +- { X(ASM_THUMB_FORMAT_4_CMN), "cmn" }, +- { X(ASM_THUMB_FORMAT_4_ORR), "orr" }, +- { X(ASM_THUMB_FORMAT_4_MUL), "mul" }, +- { X(ASM_THUMB_FORMAT_4_BIC), "bic" }, +- { X(ASM_THUMB_FORMAT_4_MVN), "mvn" }, ++ { X(ASM_THUMB_FORMAT_4_EOR), {'e', 'o', 'r' }}, ++ { X(ASM_THUMB_FORMAT_4_LSL), {'l', 's', 'l' }}, ++ { X(ASM_THUMB_FORMAT_4_LSR), {'l', 's', 'r' }}, ++ { X(ASM_THUMB_FORMAT_4_ASR), {'a', 's', 'r' }}, ++ { X(ASM_THUMB_FORMAT_4_ADC), {'a', 'd', 'c' }}, ++ { X(ASM_THUMB_FORMAT_4_SBC), {'s', 'b', 'c' }}, ++ { X(ASM_THUMB_FORMAT_4_ROR), {'r', 'o', 'r' }}, ++ { X(ASM_THUMB_FORMAT_4_TST), {'t', 's', 't' }}, ++ { X(ASM_THUMB_FORMAT_4_NEG), {'n', 'e', 'g' }}, ++ { X(ASM_THUMB_FORMAT_4_CMP), {'c', 'm', 'p' }}, ++ { X(ASM_THUMB_FORMAT_4_CMN), {'c', 'm', 'n' }}, ++ { X(ASM_THUMB_FORMAT_4_ORR), {'o', 'r', 'r' }}, ++ { X(ASM_THUMB_FORMAT_4_MUL), {'m', 'u', 'l' }}, ++ { X(ASM_THUMB_FORMAT_4_BIC), {'b', 'i', 'c' }}, ++ { X(ASM_THUMB_FORMAT_4_MVN), {'m', 'v', 'n' }}, + }; + #undef X + +@@ -428,10 +428,10 @@ typedef struct _format_vfp_op_t { + char name[3]; + } format_vfp_op_t; + STATIC const format_vfp_op_t format_vfp_op_table[] = { +- { 0x30, "add" }, +- { 0x34, "sub" }, +- { 0x20, "mul" }, +- { 0x80, "div" }, ++ { 0x30, {'a', 'd', 'd' }}, ++ { 0x34, {'s', 'u', 'b' }}, ++ { 0x20, {'m', 'u', 'l' }}, ++ { 0x80, {'d', 'i', 'v' }}, + }; + + // shorthand alias for whether we allow ARMv7-M instructions + +From bfd5a0350a0d53f52695d373dae6ee367971b145 Mon Sep 17 00:00:00 2001 +From: Angus Gratton +Date: Fri, 9 May 2025 14:34:09 +1000 +Subject: [PATCH] lib/littlefs: Fix string initializer in lfs1.c. + +Avoids the new Wunterminated-string-literal when compiled with gcc 15.1. + +It would be preferable to just disable this warning, but Clang +-Wunknown-warning-option kicks in even when disabling warnings so this +becomes fiddly to apply. + +This work was funded through GitHub Sponsors. + +Signed-off-by: Angus Gratton +--- + lib/littlefs/lfs1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/littlefs/lfs1.c b/lib/littlefs/lfs1.c +index 6a3fd670012cc..ec18dc470258c 100644 +--- a/lib/littlefs/lfs1.c ++++ b/lib/littlefs/lfs1.c +@@ -2141,7 +2141,7 @@ int lfs1_format(lfs1_t *lfs1, const struct lfs1_config *cfg) { + .d.elen = sizeof(superblock.d) - sizeof(superblock.d.magic) - 4, + .d.nlen = sizeof(superblock.d.magic), + .d.version = LFS1_DISK_VERSION, +- .d.magic = {"littlefs"}, ++ .d.magic = {'l', 'i', 't', 't', 'l', 'e', 'f', 's'}, + .d.block_size = lfs1->cfg->block_size, + .d.block_count = lfs1->cfg->block_count, + .d.root = {lfs1->root[0], lfs1->root[1]}, diff --git a/package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch b/package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch new file mode 100644 index 0000000000..90a795a6c3 --- /dev/null +++ b/package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch @@ -0,0 +1,183 @@ +From 4bed614e707c0644c06e117f848fa12605c711cd Mon Sep 17 00:00:00 2001 +From: Angus Gratton +Date: Tue, 13 Feb 2024 09:24:36 +1100 +Subject: [PATCH] py/objarray: Fix use-after-free if extending a bytearray from + itself. + +Two cases, one assigning to a slice. +Closes https://github.com/micropython/micropython/issues/13283 + +Second is extending a slice from itself, similar logic. + +In both cases the problem occurs when m_renew causes realloc to move the +buffer, leaving a dangling pointer behind. + +There are more complex and hard to fix cases when either argument is a +memoryview into the buffer, currently resizing to a new address breaks +memoryviews into that object. + +Reproducing this bug and confirming the fix was done by running the unix +port under valgrind with GC-aware extensions. + +Note in default configurations with GIL this bug exists but has no impact +(the free buffer won't be reused while the function is still executing, and +is no longer referenced after it returns). + +Signed-off-by: Angus Gratton +CVE: CVE-2024-8947 +Upstream: https://github.com/micropython/micropython/commit/4bed614e707c0644c06e117f848fa12605c711cd +Signed-off-by: Thomas Perale +--- + py/objarray.c | 20 ++++++++++++++++---- + tests/basics/bytearray_add.py | 9 ++++++++- + tests/basics/bytearray_add_self.py | 8 ++++++++ + tests/basics/bytearray_add_self.py.exp | 1 + + tests/basics/bytearray_slice_assign.py | 18 ++++++++++++------ + 5 files changed, 45 insertions(+), 11 deletions(-) + create mode 100644 tests/basics/bytearray_add_self.py + create mode 100644 tests/basics/bytearray_add_self.py.exp + +diff --git a/py/objarray.c b/py/objarray.c +index 1fff234822521..803af2cd270c7 100644 +--- a/py/objarray.c ++++ b/py/objarray.c +@@ -424,6 +424,13 @@ static mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) { + if (self->free < len) { + self->items = m_renew(byte, self->items, (self->len + self->free) * sz, (self->len + len) * sz); + self->free = 0; ++ ++ if (self_in == arg_in) { ++ // Get arg_bufinfo again in case self->items has moved ++ // ++ // (Note not possible to handle case that arg_in is a memoryview into self) ++ mp_get_buffer_raise(arg_in, &arg_bufinfo, MP_BUFFER_READ); ++ } + } else { + self->free -= len; + } +@@ -456,7 +463,8 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value + #if MICROPY_PY_ARRAY_SLICE_ASSIGN + // Assign + size_t src_len; +- void *src_items; ++ uint8_t *src_items; ++ size_t src_offs = 0; + size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL); + if (mp_obj_is_obj(value) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type, subscr) == array_subscr) { + // value is array, bytearray or memoryview +@@ -469,7 +477,7 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value + src_items = src_slice->items; + #if MICROPY_PY_BUILTINS_MEMORYVIEW + if (mp_obj_is_type(value, &mp_type_memoryview)) { +- src_items = (uint8_t *)src_items + (src_slice->memview_offset * item_sz); ++ src_offs = src_slice->memview_offset * item_sz; + } + #endif + } else if (mp_obj_is_type(value, &mp_type_bytes)) { +@@ -504,13 +512,17 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value + // TODO: alloc policy; at the moment we go conservative + o->items = m_renew(byte, o->items, (o->len + o->free) * item_sz, (o->len + len_adj) * item_sz); + o->free = len_adj; ++ // m_renew may have moved o->items ++ if (src_items == dest_items) { ++ src_items = o->items; ++ } + dest_items = o->items; + } + mp_seq_replace_slice_grow_inplace(dest_items, o->len, +- slice.start, slice.stop, src_items, src_len, len_adj, item_sz); ++ slice.start, slice.stop, src_items + src_offs, src_len, len_adj, item_sz); + } else { + mp_seq_replace_slice_no_grow(dest_items, o->len, +- slice.start, slice.stop, src_items, src_len, item_sz); ++ slice.start, slice.stop, src_items + src_offs, src_len, item_sz); + // Clear "freed" elements at the end of list + // TODO: This is actually only needed for typecode=='O' + mp_seq_clear(dest_items, o->len + len_adj, o->len, item_sz); +diff --git a/tests/basics/bytearray_add.py b/tests/basics/bytearray_add.py +index a7e2b57374255..1f30a3b740e95 100644 +--- a/tests/basics/bytearray_add.py ++++ b/tests/basics/bytearray_add.py +@@ -15,4 +15,11 @@ + + # this inplace add tests the code when the buffer doesn't need to be increased + b = bytearray() +-b += b'' ++b += b"" ++ ++# extend a bytearray from itself ++b = bytearray(b"abcdefgh") ++for _ in range(4): ++ c = bytearray(b) # extra allocation, as above ++ b.extend(b) ++print(b) +diff --git a/tests/basics/bytearray_add_self.py b/tests/basics/bytearray_add_self.py +new file mode 100644 +index 0000000000000..94ae8689fd16c +--- /dev/null ++++ b/tests/basics/bytearray_add_self.py +@@ -0,0 +1,8 @@ ++# add a bytearray to itself ++# This is not supported by CPython as of 3.11.18. ++ ++b = bytearray(b"123456789") ++for _ in range(4): ++ c = bytearray(b) # extra allocation increases chance 'b' has to relocate ++ b += b ++print(b) +diff --git a/tests/basics/bytearray_add_self.py.exp b/tests/basics/bytearray_add_self.py.exp +new file mode 100644 +index 0000000000000..5ef948157ac0f +--- /dev/null ++++ b/tests/basics/bytearray_add_self.py.exp +@@ -0,0 +1 @@ ++bytearray(b'123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789') +diff --git a/tests/basics/bytearray_slice_assign.py b/tests/basics/bytearray_slice_assign.py +index fa7878e10ddbb..4de0819042a13 100644 +--- a/tests/basics/bytearray_slice_assign.py ++++ b/tests/basics/bytearray_slice_assign.py +@@ -18,7 +18,7 @@ + l[1:3] = bytearray() + print(l) + l = bytearray(x) +-#del l[1:3] ++# del l[1:3] + print(l) + + l = bytearray(x) +@@ -28,7 +28,7 @@ + l[:3] = bytearray() + print(l) + l = bytearray(x) +-#del l[:3] ++# del l[:3] + print(l) + + l = bytearray(x) +@@ -38,7 +38,7 @@ + l[:-3] = bytearray() + print(l) + l = bytearray(x) +-#del l[:-3] ++# del l[:-3] + print(l) + + # slice assignment that extends the array +@@ -61,8 +61,14 @@ + print(b) + + # Growth of bytearray via slice extension +-b = bytearray(b'12345678') +-b.append(57) # expand and add a bit of unused space at end of the bytearray ++b = bytearray(b"12345678") ++b.append(57) # expand and add a bit of unused space at end of the bytearray + for i in range(400): +- b[-1:] = b'ab' # grow slowly into the unused space ++ b[-1:] = b"ab" # grow slowly into the unused space ++print(len(b), b) ++ ++# Growth of bytearray via slice extension from itself ++b = bytearray(b"1234567") ++for i in range(3): ++ b[-1:] = b + print(len(b), b) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index 43551866b9..bbfde0e89f 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 a042764f0b6f6d92b267454c5bd5afcb83fc3900119f2583672aac571e661924 micropython-1.22.0.tar.xz -sha256 d9e0e0395867c899090e150213bc2b417e970c17355a8d48300089875b3c8037 LICENSE +sha256 bb3ba34848a7620663b6a7cba22af45d3056fc79328c2ceb943874b5478d8756 micropython-1.22.2.tar.xz +sha256 fe63a3fbd0731f6530e0783224763bceef972e516cab4b8513ca4d7b05be9713 LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 125a0edcfb..826247069e 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.22.0 +MICROPYTHON_VERSION = 1.22.2 MICROPYTHON_SITE = https://micropython.org/resources/source MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # Micropython has a lot of code copied from other projects, and also a number @@ -15,15 +15,25 @@ MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-python3 MICROPYTHON_CPE_ID_VENDOR = micropython +# 0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch +MICROPYTHON_IGNORE_CVES += CVE-2024-8947 + # Use fallback implementation for exception handling on architectures that don't # have explicit support. ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),) -MICROPYTHON_CFLAGS = -DMICROPY_GCREGS_SETJMP=1 +MICROPYTHON_CFLAGS += -DMICROPY_GCREGS_SETJMP=1 endif # xtensa has problems with nlr_push, use setjmp based implementation instead ifeq ($(BR2_xtensa),y) -MICROPYTHON_CFLAGS = -DMICROPY_NLR_SETJMP=1 +MICROPYTHON_CFLAGS += -DMICROPY_NLR_SETJMP=1 +endif + +# https://github.com/micropython/micropython/issues/14115 +# Temporary fix for GCC 14 compatibility, should be removed after updating to +# 1.23.0 or later. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_14),y) +MICROPYTHON_CFLAGS += -DMICROPY_NLR_SETJMP=1 endif # When building from a tarball we don't have some of the dependencies that are in @@ -32,7 +42,7 @@ MICROPYTHON_MAKE_OPTS += \ MICROPY_PY_BTREE=0 \ MICROPY_PY_USSL=0 \ CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + CFLAGS_EXTRA="$(MICROPYTHON_CFLAGS)" \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= diff --git a/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch b/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch deleted file mode 100644 index ea02bf587e..0000000000 --- a/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 77b36eaeb2c38eba571b8db7e9bb0fd507774e6d Mon Sep 17 00:00:00 2001 -From: Kris Gesling -Date: Tue, 11 May 2021 09:15:22 +0930 -Subject: [PATCH] Fix linking on gcc 10.2.0 or newer - -Co-authored-by: MichaelSabal - -[Retrieved from: -https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d] -Signed-off-by: Fabrice Fontaine ---- - lang/cmu_indic_lang/cmu_indic_lang.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h b/lang/cmu_indic_lang/cmu_indic_lang.h -index 75ee46c..83e2afa 100644 ---- a/lang/cmu_indic_lang/cmu_indic_lang.h -+++ b/lang/cmu_indic_lang/cmu_indic_lang.h -@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v); - extern const cst_phoneset cmu_indic_phoneset; - extern const cst_cart cmu_indic_phrasing_cart; - --const cst_regex * const cst_rx_not_indic; -+extern const cst_regex * const cst_rx_not_indic; - - #ifdef __cplusplus - } /* extern "C" */ diff --git a/package/mimic/Config.in b/package/mimic/Config.in deleted file mode 100644 index 79641d3790..0000000000 --- a/package/mimic/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -comment "mimic needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_MIMIC - bool "mimic" - depends on BR2_USE_WCHAR - help - Mimic is a fast, lightweight Text-to-speech engine developed - by Mycroft A.I. and VocaliD, based on Carnegie Mellon - University's Flite (Festival-Lite) software. Mimic takes in - text and reads it out loud to create a high quality voice. - - https://github.com/MycroftAI/mimic - -if BR2_PACKAGE_MIMIC - -choice - prompt "audio backend" - default BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE - bool "none" - help - With no backend, mimic will only be able to produce .wav - files. - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA - bool "alsa" - depends on BR2_PACKAGE_ALSA_LIB - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO - bool "alsa via portaudio" - depends on BR2_PACKAGE_PORTAUDIO - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO - bool "pulseaudio" - depends on BR2_PACKAGE_PULSEAUDIO - -endchoice - -endif # BR2_PACKAGE_MIMIC diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash deleted file mode 100644 index 10780d415d..0000000000 --- a/package/mimic/mimic.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz -sha256 c423c1c6d260091d80ee4c00f386a10fea39963a3f1530f2c245f15dd20324ee COPYING diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk deleted file mode 100644 index 2d246561c9..0000000000 --- a/package/mimic/mimic.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# mimic -# -################################################################################ - -MIMIC_VERSION = 1.1.0 -MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) -MIMIC_LICENSE = MIT -MIMIC_LICENSE_FILES = COPYING - -MIMIC_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y) -MIMIC_AUDIO_BACKEND = alsa -MIMIC_DEPENDENCIES += alsa-lib -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO),y) -MIMIC_AUDIO_BACKEND = portaudio -MIMIC_DEPENDENCIES += portaudio -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO),y) -MIMIC_AUDIO_BACKEND = pulseaudio -MIMIC_DEPENDENCIES += pulseaudio -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y) -MIMIC_AUDIO_BACKEND = none -endif - -MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND) - -$(eval $(autotools-package)) diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 4e139ac3e2..290c062bab 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MINETEST bool "minetest" depends on BR2_INSTALL_LIBSTDCPP # irrlichtMt (bundled) - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_XORG7 # irrlichtMt (bundled) depends on BR2_PACKAGE_HAS_LIBGL # irrlichtMt (bundled) @@ -52,14 +52,14 @@ comment "sound support needs a toolchain w/ threads NPTL" endif -comment "minetest needs a toolchain w/ C++, gcc >= 5.1, threads" +comment "minetest needs a toolchain w/ C++, gcc >= 9, threads" depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ || !BR2_TOOLCHAIN_HAS_THREADS comment "minetest needs X11 and an OpenGL provider" depends on (BR2_INSTALL_LIBSTDCPP \ - && BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ && BR2_TOOLCHAIN_HAS_THREADS) depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash index dd10450262..92a50d010c 100644 --- a/package/minicom/minicom.hash +++ b/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c minicom-2.9.tar.bz2 +sha256 90e7ce2856b3eaaa3f452354d17981c49d32c426a255b6f0d3063a227c101538 minicom-2.10.tar.bz2 sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index 8bc5717417..0c9b1ae434 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINICOM_VERSION = 2.9 +MINICOM_VERSION = 2.10 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.bz2 MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) diff --git a/package/minidlna/0001-libav.h-fix-build-with-ffmpeg-7.0.patch b/package/minidlna/0001-libav.h-fix-build-with-ffmpeg-7.0.patch new file mode 100644 index 0000000000..888c867f36 --- /dev/null +++ b/package/minidlna/0001-libav.h-fix-build-with-ffmpeg-7.0.patch @@ -0,0 +1,48 @@ +From 5f698d645d71782c78e6495efd3b5e982f7db8c4 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 13 Apr 2024 15:03:34 +0200 +Subject: [PATCH] libav.h: fix build with ffmpeg 7.0 + +The old bitmask-based channel layout API was removed: +https://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=doc/APIchanges;hb=n7.0 + +Upstream: https://sourceforge.net/p/minidlna/patches/204/ + +Signed-off-by: Bernd Kuhls +--- + libav.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libav.h b/libav.h +index b69752c..d5a3358 100644 +--- a/libav.h ++++ b/libav.h +@@ -174,7 +174,12 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate ++#if LIBAVCODEC_VERSION_MAJOR > 52 || \ ++ (LIBAVCODEC_VERSION_MAJOR >= 52 && LIBAVCODEC_VERSION_MINOR >= 113) ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codecpar->channels ++#endif + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile +@@ -186,7 +191,12 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codec->codec_tag + #define lav_sample_rate(s) s->codec->sample_rate + #define lav_bit_rate(s) s->codec->bit_rate ++#if LIBAVCODEC_VERSION_MAJOR > 52 || \ ++ (LIBAVCODEC_VERSION_MAJOR >= 52 && LIBAVCODEC_VERSION_MINOR >= 113) ++#define lav_channels(s) s->codec->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codec->channels ++#endif + #define lav_width(s) s->codec->width + #define lav_height(s) s->codec->height + #define lav_profile(s) s->codec->profile +-- +2.39.2 + diff --git a/package/minisign/minisign.hash b/package/minisign/minisign.hash index 12cde42a43..e918891aa8 100644 --- a/package/minisign/minisign.hash +++ b/package/minisign/minisign.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 74c2c78a1cd51a43a6c98f46a4eabefbc8668074ca9aa14115544276b663fc55 minisign-0.11.tar.gz -sha256 d775d155cbf31638714c31c6f990f9fdc5f07998d91e42d1bf15483bd2d1706b LICENSE +sha256 796dce1376f9bcb1a19ece729c075c47054364355fe0c0c1ebe5104d508c7db0 minisign-0.12.tar.gz +sha256 01aa50818d6609e85a9610b7d04da037e8b28bcf3bb5b5b4963c0c3f7abdabbd LICENSE diff --git a/package/minisign/minisign.mk b/package/minisign/minisign.mk index 7cdce597f7..5cc8e14cba 100644 --- a/package/minisign/minisign.mk +++ b/package/minisign/minisign.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINISIGN_VERSION = 0.11 +MINISIGN_VERSION = 0.12 MINISIGN_SITE = $(call github,jedisct1,minisign,$(MINISIGN_VERSION)) MINISIGN_LICENSE = ISC MINISIGN_LICENSE_FILES = LICENSE diff --git a/package/mjpegtools/0001-gcc15.patch b/package/mjpegtools/0001-gcc15.patch new file mode 100644 index 0000000000..019317c7fd --- /dev/null +++ b/package/mjpegtools/0001-gcc15.patch @@ -0,0 +1,354 @@ +Fix build with gcc-15.x + +Upstream: https://sourceforge.net/p/mjpeg/Code/3513/ + +Signed-off-by: Bernd Kuhls + +Index: trunk/mjpeg_play/y4mdenoise/Region2D.hh +=================================================================== +--- mjpeg_play/y4mdenoise/Region2D.hh (Revision 3512) ++++ mjpeg_play/y4mdenoise/Region2D.hh (Revision 3513) +@@ -97,35 +97,11 @@ + // Add the given horizontal extent to the region. Note that + // a_tnXEnd is technically one past the end of the extent. + +- template +- void UnionDebug (Status_t &a_reStatus, INDEX a_tnY, +- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp); +- // Add the given horizontal extent to the region. Note that +- // a_tnXEnd is technically one past the end of the extent. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) +- + template + void Union (Status_t &a_reStatus, const REGION &a_rOther); + // Make the current region represent the union between itself + // and the other given region. + +- template +- void UnionDebug (Status_t &a_reStatus, +- REGION_O &a_rOther, REGION_TEMP &a_rTemp); +- // Make the current region represent the union between itself +- // and the other given region. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) +- + //void Merge (Status_t &a_reStatus, INDEX a_tnY, INDEX a_tnXStart, + // INDEX a_tnXEnd); + // Merge this extent into the current region. +@@ -166,36 +142,11 @@ + // Subtract the given horizontal extent from the region. Note + // that a_tnXEnd is technically one past the end of the extent. + +- template +- void SubtractDebug (Status_t &a_reStatus, INDEX a_tnY, +- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp); +- // Subtract the given horizontal extent from the region. Note +- // that a_tnXEnd is technically one past the end of the extent. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) +- + template + void Subtract (Status_t &a_reStatus, const REGION &a_rOther); + // Subtract the other region from the current region, i.e. + // remove from the current region any extents that exist in the + // other region. +- +- template +- void SubtractDebug (Status_t &a_reStatus, REGION_O &a_rOther, +- REGION_TEMP &a_rTemp); +- // Subtract the other region from the current region, i.e. +- // remove from the current region any extents that exist in the +- // other region. +- // Exhaustively (i.e. slowly) verifies the results, using a +- // much simpler algorithm. +- // Requires the use of a temporary region, usually of the +- // final subclass' type, in order to work. (Since that can't +- // be known at this level, a template parameter is included for +- // it.) + + //typedef ... ConstIterator; + //ConstIterator Begin (void) const { return m_setExtents.Begin(); } +@@ -404,85 +355,6 @@ + + + +-// Add the given horizontal extent to the region. +-template +-template +-void +-Region2D::UnionDebug (Status_t &a_reStatus, INDEX a_tnY, +- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp) +-{ +- typename REGION::ConstIterator itHere; +- typename REGION_TEMP::ConstIterator itHereO; +- INDEX tnX; +- // Used to loop through points. +- +- // Make sure they didn't start us off with an error. +- assert (a_reStatus == g_kNoError); +- +- // Calculate the union. +- a_rTemp.Assign (a_reStatus, *this); +- if (a_reStatus != g_kNoError) +- return; +- a_rTemp.Union (a_reStatus, a_tnY, a_tnXStart, a_tnXEnd); +- if (a_reStatus != g_kNoError) +- return; +- +- // Loop through every point in the result, make sure it's in +- // one of the two input regions. +- for (itHereO = a_rTemp.Begin(); itHereO != a_rTemp.End(); ++itHereO) +- { +- const Extent &rHere = *itHereO; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!((rHere.m_tnY == a_tnY +- && (tnX >= a_tnXStart && tnX < a_tnXEnd)) +- || this->DoesContainPoint (rHere.m_tnY, tnX))) +- goto error; +- } +- } +- +- // Loop through every point in the original region, make sure +- // it's in the result. +- for (itHere = this->Begin(); itHere != this->End(); ++itHere) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // Loop through every point in the added extent, make sure it's in +- // the result. +- for (tnX = a_tnXStart; tnX < a_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (a_tnY, tnX)) +- goto error; +- } +- +- // The operation succeeded. Commit it. +- Assign (a_reStatus, a_rTemp); +- if (a_reStatus != g_kNoError) +- return; +- +- // All done. +- return; +- +-error: +- // Handle deviations. +- fprintf (stderr, "Region2D::Union() failed\n"); +- fprintf (stderr, "Input region:\n"); +- PrintRegion (*this); +- fprintf (stderr, "Input extent: [%d,%d-%d]\n", +- int (a_tnY), int (a_tnXStart), int (a_tnXEnd)); +- fprintf (stderr, "Result:\n"); +- PrintRegion (a_rTemp); +- assert (false); +-} +- +- +- + // Make the current region represent the union between itself + // and the other given region. + template +@@ -511,184 +383,6 @@ + } + } + +- +- +-// Make the current region represent the union between itself +-// and the other given region. +-template +-template +-void +-Region2D::UnionDebug (Status_t &a_reStatus, +- REGION_O &a_rOther, REGION_TEMP &a_rTemp) +-{ +- typename REGION::ConstIterator itHere; +- typename REGION_O::ConstIterator itHereO; +- typename REGION_TEMP::ConstIterator itHereT; +- INDEX tnX; +- // Used to loop through points. +- +- // Make sure they didn't start us off with an error. +- assert (a_reStatus == g_kNoError); +- +- // Calculate the union. +- a_rTemp.Assign (a_reStatus, *this); +- if (a_reStatus != g_kNoError) +- return; +- a_rTemp.Union (a_reStatus, a_rOther); +- if (a_reStatus != g_kNoError) +- return; +- +- // Loop through every point in the result, make sure it's in +- // one of the two input regions. +- for (itHereT = a_rTemp.Begin(); itHereT != a_rTemp.End(); ++itHereT) +- { +- const Extent &rHere = *itHereT; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rOther.DoesContainPoint (rHere.m_tnY, tnX) +- && !this->DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // Loop through every point in the first input region, make sure +- // it's in the result. +- for (itHere = this->Begin(); itHere != this->End(); ++itHere) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // Loop through every point in the second input region, make sure +- // it's in the result. +- for (itHereO = a_rOther.Begin(); +- itHereO != a_rOther.End(); +- ++itHereO) +- { +- const Extent &rHere = *itHereO; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // The operation succeeded. Commit it. +- Assign (a_reStatus, a_rTemp); +- if (a_reStatus != g_kNoError) +- return; +- +- // All done. +- return; +- +-error: +- // Handle deviations. +- fprintf (stderr, "Region2D::Union() failed\n"); +- fprintf (stderr, "First input region:\n"); +- PrintRegion (*this); +- fprintf (stderr, "Second input region:\n"); +- PrintRegion (a_rOther); +- fprintf (stderr, "Result:\n"); +- PrintRegion (a_rTemp); +- assert (false); +-} +- +- +- +-// Subtract the other region from the current region, i.e. +-// remove from the current region any areas that exist in the +-// other region. +-template +-template +-void +-Region2D::SubtractDebug (Status_t &a_reStatus, +- REGION_O &a_rOther, REGION_TEMP &a_rTemp) +-{ +- typename REGION::ConstIterator itHere; +- typename REGION_O::ConstIterator itHereO; +- typename REGION_TEMP::ConstIterator itHereT; +- INDEX tnX; +- // Used to loop through points. +- +- // Make sure they didn't start us off with an error. +- assert (a_reStatus == g_kNoError); +- +- // Calculate the difference. +- a_rTemp.Assign (a_reStatus, *this); +- if (a_reStatus != g_kNoError) +- return; +- a_rTemp.Subtract (a_reStatus, a_rOther); +- if (a_reStatus != g_kNoError) +- return; +- +- // Loop through every point in the result, make sure it's in +- // the first input region but not the second. +- for (itHereT = a_rTemp.Begin(); itHereT != a_rTemp.End(); ++itHereT) +- { +- const Extent &rHere = *itHereT; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!(this->DoesContainPoint (rHere.m_tnY, tnX) +- && !a_rOther.DoesContainPoint (rHere.m_tnY, tnX))) +- goto error; +- } +- } +- +- // Loop through every point in the first input region, and if it's +- // not in the second input region, make sure it's in the result. +- for (itHere = this->Begin(); itHere != this->End(); ++itHere) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (!a_rOther.DoesContainPoint (rHere.m_tnY, tnX)) +- { +- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- } +- +- // Loop through every point in the second input region, make sure +- // it's not in the result. +- for (itHereO = a_rOther.Begin(); +- itHereO != a_rOther.End(); +- ++itHereO) +- { +- const Extent &rHere = *itHere; +- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX) +- { +- if (a_rTemp.DoesContainPoint (rHere.m_tnY, tnX)) +- goto error; +- } +- } +- +- // The operation succeeded. Commit it. +- Assign (a_reStatus, a_rTemp); +- if (a_reStatus != g_kNoError) +- return; +- +- // All done. +- return; +- +-error: +- // Handle deviations. +- fprintf (stderr, "Region2D::Subtract() failed\n"); +- fprintf (stderr, "First input region:\n"); +- PrintRegion (*this); +- fprintf (stderr, "Second input region:\n"); +- PrintRegion (a_rOther); +- fprintf (stderr, "Result:\n"); +- PrintRegion (a_rTemp); +- assert (false); +-} +- +- +- + // Flood-fill the current region. + template + template diff --git a/package/mjpegtools/mjpegtools.mk b/package/mjpegtools/mjpegtools.mk index 8d6c475518..871d1b8f36 100644 --- a/package/mjpegtools/mjpegtools.mk +++ b/package/mjpegtools/mjpegtools.mk @@ -10,6 +10,7 @@ MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg MJPEGTOOLS_INSTALL_STAGING = YES MJPEGTOOLS_LICENSE = GPL-2.0+ MJPEGTOOLS_LICENSE_FILES = COPYING +MJPEGTOOLS_CONF_OPTS = --without-gtk ifeq ($(BR2_PACKAGE_MJPEGTOOLS_SIMD_SUPPORT),y) MJPEGTOOLS_CONF_OPTS += --enable-simd-accel @@ -53,11 +54,4 @@ else MJPEGTOOLS_CONF_OPTS += --without-dga endif -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -MJPEGTOOLS_CONF_OPTS += --with-gtk -MJPEGTOOLS_DEPENDENCIES += libgtk2 -else -MJPEGTOOLS_CONF_OPTS += --without-gtk -endif - $(eval $(autotools-package)) diff --git a/package/mjpg-streamer/0002-cmake4.patch b/package/mjpg-streamer/0002-cmake4.patch new file mode 100644 index 0000000000..ed7211ab81 --- /dev/null +++ b/package/mjpg-streamer/0002-cmake4.patch @@ -0,0 +1,34 @@ +From 0dd9cf8b23fa183a403794e15617237662104d1d Mon Sep 17 00:00:00 2001 +From: Stephen L Arnold +Date: Mon, 29 Nov 2021 18:13:34 -0800 +Subject: [PATCH] fix: update cmake build, fix install, add simple test and + versioning + +Signed-off-by: Stephen L Arnold + +Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/333 + +Signed-off-by: Bernd Kuhls +[Bernd: + ported cmake version bump from upstream PR to fix build with cmake 4.x] +--- + mjpg-streamer-experimental/CMakeLists.txt | 102 +++++++++++++----- + mjpg-streamer-experimental/Makefile | 15 +-- + .../cmake/FindGphoto2.cmake | 20 ++-- + .../cmake/mjpg_streamer_utils.cmake | 22 ++-- + mjpg-streamer-experimental/mjpg_streamer.c | 4 - + mjpg-streamer-experimental/mjpg_streamer.h | 9 +- + .../plugins/input_ptp2/CMakeLists.txt | 6 +- + .../plugins/output_http/CMakeLists.txt | 2 +- + 8 files changed, 117 insertions(+), 63 deletions(-) + +diff --git a/mjpg-streamer-experimental/CMakeLists.txt b/mjpg-streamer-experimental/CMakeLists.txt +index cf26620e..e6e67bc7 100644 +--- a/mjpg-streamer-experimental/CMakeLists.txt ++++ b/mjpg-streamer-experimental/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.3) ++cmake_minimum_required(VERSION 3.10.0) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + + project("mjpg-streamer" C) diff --git a/package/mjpg-streamer/0003-output_viewer-fix-build-with-gcc-14.patch b/package/mjpg-streamer/0003-output_viewer-fix-build-with-gcc-14.patch new file mode 100644 index 0000000000..74c26ec3ea --- /dev/null +++ b/package/mjpg-streamer/0003-output_viewer-fix-build-with-gcc-14.patch @@ -0,0 +1,34 @@ +From c0656c6a538739635441b165b4f1ba7c22c68b1d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 18 Oct 2025 18:54:36 +0200 +Subject: [PATCH] output_viewer: fix build with gcc >= 14 + +Fixes build error found by buildroot autobuilders: + +output_viewer.c:125:32: error: assignment to 'boolean (*)(struct jpeg_decompress_struct *)' +from incompatible pointer type 'int (*)(struct jpeg_decompress_struct *)' +[-Wincompatible-pointer-types] + +Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/420 + +Signed-off-by: Bernd Kuhls +--- + .../plugins/output_viewer/output_viewer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mjpg-streamer-experimental/plugins/output_viewer/output_viewer.c b/mjpg-streamer-experimental/plugins/output_viewer/output_viewer.c +index dd6c55b..c50f701 100644 +--- a/mjpg-streamer-experimental/plugins/output_viewer/output_viewer.c ++++ b/mjpg-streamer-experimental/plugins/output_viewer/output_viewer.c +@@ -86,7 +86,7 @@ static void init_source(j_decompress_ptr cinfo) + return; + } + +-static int fill_input_buffer(j_decompress_ptr cinfo) ++static boolean fill_input_buffer(j_decompress_ptr cinfo) + { + my_source_mgr * src = (my_source_mgr *) cinfo->src; + +-- +2.47.3 + diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash index 164c9b2181..980549f657 100644 --- a/package/mjpg-streamer/mjpg-streamer.hash +++ b/package/mjpg-streamer/mjpg-streamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973 mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz +sha256 eb4de7fed9f8b15ee6d8ca2b0417aff2854cd018582b7090e28eb0aaa19bc808 mjpg-streamer-v1.0.0-1-g310b29f4a94c46652b20c4b7b6e5cf24e532af39.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk index 46f3f50104..5e52b45b01 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MJPG_STREAMER_VERSION = 5a6e0a2db163e6ae9461552b59079870d0959340 +MJPG_STREAMER_VERSION = v1.0.0-1-g310b29f4a94c46652b20c4b7b6e5cf24e532af39 MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION)) MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental MJPG_STREAMER_LICENSE = GPL-2.0+ diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index fec7533d16..781bd972d4 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4547b5f0f8a43857dcfb516b8b9c987d07febfecbe3d27987f43064db46ca8f9 mmc-utils-e1281d4de9166b7254ba30bb58f9191fc2c9e7fb-git4.tar.gz -sha256 4207d81122a02555f78c5a11b61c83a331ee03dc933e1ef9dd932ef9b434d12d README +sha256 39e6a89e06b53f99816f110af6743d1adc82220b26c51b0c3fd0a11ccf4206c2 mmc-utils-1.0.tar.gz +sha256 49cd65f67b516078ff7e0dbe639972dad21ed3858246e3969fc8a8fc2a4dca66 README diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index 48c347d846..9696f2a6dc 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,9 +4,8 @@ # ################################################################################ -MMC_UTILS_VERSION = e1281d4de9166b7254ba30bb58f9191fc2c9e7fb -MMC_UTILS_SITE = https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git -MMC_UTILS_SITE_METHOD = git +MMC_UTILS_VERSION = 1.0 +MMC_UTILS_SITE = https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot MMC_UTILS_LICENSE = GPL-2.0 MMC_UTILS_LICENSE_FILES = README @@ -25,7 +24,7 @@ endif # let's do this here otherwise it won't be automatically set and build # will fail define MMC_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) C=0 \ CFLAGS="$(MMC_UTILS_CFLAGS)" \ AM_CFLAGS='-DVERSION=\"$(shell echo $(MMC_UTILS_VERSION) | head -c 6)\"' endef diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 3b0e0d62b6..301243d52e 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24ecedd1220e215742cbfa9228797812f6f281ba87bf5dc58e8caac0c0d404d0 MoarVM-2024.06.tar.gz +sha256 7f8ae605a19189ebb48a51bae486bacd32141326df8289509825bdb1bee3984c MoarVM-2024.12.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 1254040748..c0dcc0a18e 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2024.06 +MOARVM_VERSION = 2024.12 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 91560c1ed1..4ae1abde3a 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -17,12 +17,8 @@ MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd MOBY_BUILDKIT_LDFLAGS = \ -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" -MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) - HOST_MOBY_BUILDKIT_TAGS = cgo HOST_MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd -HOST_MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(HOST_MOBY_BUILDKIT_BUILD_TARGETS)) - $(eval $(golang-package)) $(eval $(host-golang-package)) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 6990996a86..e03447b96c 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -38,6 +38,12 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQRTR comment "QRTR support needs a toolchain w/ headers >= 4.15" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 +config BR2_PACKAGE_MODEM_MANAGER_ATVIADBUS + bool "at-via-dbus support" + help + This option enables support for issuing AT commands + over the D-Bus interface. + endif comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index fa81acd9dc..103da30fb7 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated -sha256 6c8f8720737a3788e394c700f36236278c9de09d76069a079e6f1daaf08b2768 ModemManager-1.22.0.tar.gz +sha256 fbc75adcc0d7b0565f256e7ff4e8872b0a37c4413ff576665f7470932d9c1b68 ModemManager-1.24.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 495dbcd258..880ab6cdd0 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.22.0 +MODEM_MANAGER_VERSION = 1.24.2 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) @@ -48,6 +48,12 @@ else MODEM_MANAGER_CONF_OPTS += -Dqrtr=false endif +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_ATVIADBUS),y) +MODEM_MANAGER_CONF_OPTS += -Dat_command_via_dbus=true +else +MODEM_MANAGER_CONF_OPTS += -Dat_command_via_dbus=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) MODEM_MANAGER_DEPENDENCIES += systemd MODEM_MANAGER_CONF_OPTS += \ diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index fb1bfc960e..df5634bf89 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_MODSECURITY2 into HTTP(S) traffic and provides a power rules language and API to implement advanced protections. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index 2c77ffd830..3e6019d043 100644 --- a/package/modsecurity2/modsecurity2.hash +++ b/package/modsecurity2/modsecurity2.hash @@ -1,5 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz.sha256 -sha256 2a28fcfccfef21581486f98d8d5fe0397499749b8380f60ec7bb1c08478e1839 modsecurity-2.9.7.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v2.9.12/modsecurity-v2.9.12.tar.gz.sha256 +sha256 79ada8693303be3490201397344bf66900a45f07ae328bf6cf01ca99e5d135fa modsecurity-v2.9.12.tar.gz # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index 88bbf3bb29..0754d5c907 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,12 +4,12 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.7 -MODSECURITY2_SOURCE = modsecurity-$(MODSECURITY2_VERSION).tar.gz -MODSECURITY2_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) +MODSECURITY2_VERSION = 2.9.12 +MODSECURITY2_SOURCE = modsecurity-v$(MODSECURITY2_VERSION).tar.gz +MODSECURITY2_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(MODSECURITY2_VERSION) MODSECURITY2_LICENSE = Apache-2.0 MODSECURITY2_LICENSE_FILES = LICENSE -MODSECURITY2_CPE_ID_VENDOR = trustwave +MODSECURITY2_CPE_ID_VENDOR = owasp MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 diff --git a/package/mokutil/Config.in b/package/mokutil/Config.in index 8895b66d20..3412b2d29e 100644 --- a/package/mokutil/Config.in +++ b/package/mokutil/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_MOKUTIL depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_USE_MMU # keyutils depends on !BR2_STATIC_LIBS # efivar, keyutils - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar @@ -30,6 +29,6 @@ comment "mokutil needs a toolchain w/ dynamic library, threads, gcc >= 4.9, head depends on BR2_PACKAGE_SHIM_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || \ - BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch b/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch deleted file mode 100644 index b4b1746682..0000000000 --- a/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 362be06fc16a5ad0f9e9aa90cc763c5242e8e35c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Feb 2019 12:41:45 +0100 -Subject: [PATCH] ssl_manager.cpp: fix build with gcc 7 and -fpermissive - -Change prototype of DERToken::parse function from -parse(ConstDataRange cdr, size_t* outLength); -to parse(ConstDataRange cdr, uint64_t* outLength); - -Otherwise, we got the following error: - -src/mongo/util/net/ssl_manager.cpp: In static member function 'static mongo::StatusWith mongo::{anonymous}::DERToken::parse(mongo::ConstDataRange, size_t*)': -src/mongo/util/net/ssl_manager.cpp:575:79: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive] - if (mongoUnsignedAddOverflow64(tagAndLengthByteCount, derLength, outLength) || - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mongodb/mongo/pull/1296] ---- - src/mongo/util/net/ssl_manager.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp -index b93ebe84a4..3511eb5d99 100644 ---- a/src/mongo/util/net/ssl_manager.cpp -+++ b/src/mongo/util/net/ssl_manager.cpp -@@ -782,7 +782,7 @@ public: - * - * Returns a DERToken which consists of the (tag, length, value) tuple. - */ -- static StatusWith parse(ConstDataRange cdr, size_t* outLength); -+ static StatusWith parse(ConstDataRange cdr, uint64_t* outLength); - - private: - DERType _type{DERType::EndOfContent}; -@@ -799,7 +799,7 @@ struct DataType::Handler { - size_t length, - size_t* advanced, - std::ptrdiff_t debug_offset) { -- size_t outLength; -+ uint64_t outLength; - - auto swPair = DERToken::parse(ConstDataRange(ptr, length), &outLength); - -@@ -844,7 +844,7 @@ StatusWith readDERString(ConstDataRangeCursor& cdc) { - } - - --StatusWith DERToken::parse(ConstDataRange cdr, size_t* outLength) { -+StatusWith DERToken::parse(ConstDataRange cdr, uint64_t* outLength) { - const size_t kTagLength = 1; - const size_t kTagLengthAndInitialLengthByteLength = kTagLength + 1; - --- -2.14.1 - diff --git a/package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch b/package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch deleted file mode 100644 index e96a65252c..0000000000 --- a/package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0941e560850d54160c24778fa66b605714fd5012 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 9 Aug 2021 21:18:50 +0200 -Subject: [PATCH] src/mongo/db/exec/plan_stats.h: fix build with gcc - 11 - -Fix the following build failure with gcc 11: - -In file included from src/mongo/db/query/plan_cache.h:36, - from src/mongo/db/catalog/collection_info_cache.h:33, - from src/mongo/db/catalog/collection.h:42, - from src/mongo/db/exec/requires_collection_stage.h:32, - from src/mongo/db/exec/delete.h:32, - from src/mongo/db/query/internal_plans.h:33, - from src/mongo/db/query/internal_plans.cpp:32: -src/mongo/db/exec/plan_stats.h:214:10: error: 'optional' in namespace 'std' does not name a template type - 214 | std::optional replanReason; - | ^~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/8c0875fa413923504515a83d8b679366418c2444 - -Signed-off-by: Fabrice Fontaine -[Upstream status: already fixed by -https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0] ---- - src/mongo/db/exec/plan_stats.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h -index 43053e27be..813e4edc9e 100644 ---- a/src/mongo/db/exec/plan_stats.h -+++ b/src/mongo/db/exec/plan_stats.h -@@ -31,6 +31,7 @@ - - #include - #include -+#include - #include - #include - --- -2.30.2 - diff --git a/package/mongodb/Config.in b/package/mongodb/Config.in deleted file mode 100644 index 1ea4282573..0000000000 --- a/package/mongodb/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -# from https://docs.mongodb.com/manual/installation/#supported-platforms -config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - bool - # ARM needs LDREX/STREX, so ARMv6+ - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 - default y if BR2_aarch64 || BR2_x86_64 - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem - -config BR2_PACKAGE_MONGODB - bool "mongodb" - depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_IOSTREAMS - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UTF # runtime - select BR2_PACKAGE_SNAPPY - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_YAML_CPP - select BR2_PACKAGE_ZLIB - help - MongoDB is a cross-platform document-oriented database - (NoSQL). - - It uses JSON-like documents with dynamic schemas (BSON), - making the integration of data in certain types of - applications easier and faster. - - https://www.mongodb.org/ - -comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 7" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash deleted file mode 100644 index 02da8ad452..0000000000 --- a/package/mongodb/mongodb.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally computed: -sha256 5bbb9567cc1f358ac7d9f37d9fe749862728bdf9f742d1dfc5e35a8b6c2985ba mongodb-src-r4.2.18.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt -sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk deleted file mode 100644 index 9f6c7d31b8..0000000000 --- a/package/mongodb/mongodb.mk +++ /dev/null @@ -1,104 +0,0 @@ -################################################################################ -# -# mongodb -# -################################################################################ - -MONGODB_VERSION = 4.2.18 -MONGODB_SITE = https://fastdl.mongodb.org/src -MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz - -MONGODB_LICENSE = Apache-2.0 (drivers), SSPL (database) -MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt - -MONGODB_CPE_ID_VENDOR = mongodb -MONGODB_SELINUX_MODULES = mongodb - -MONGODB_DEPENDENCIES = \ - boost \ - host-python-cheetah \ - host-python-psutil \ - host-python-pyyaml \ - host-python-regex \ - host-python-requests \ - host-scons \ - pcre \ - snappy \ - sqlite \ - yaml-cpp \ - zlib - -MONGODB_SCONS_TARGETS = mongod mongos - -MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \ - -j"$(PARALLEL_JOBS)" - -MONGODB_SCONS_OPTS = \ - --disable-minimum-compiler-version-enforcement \ - --disable-warnings-as-errors \ - --use-system-boost \ - --use-system-pcre \ - --use-system-snappy \ - --use-system-sqlite \ - --use-system-yaml \ - --use-system-zlib - -# need to pass mongo version when not building from git repo -MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION)- - -# WiredTiger database storage engine only supported on 64 bits -ifeq ($(BR2_ARCH_IS_64),y) -MONGODB_SCONS_OPTS += --wiredtiger=on -else -MONGODB_SCONS_OPTS += --wiredtiger=off -endif - -# JavaScript scripting engine and tcmalloc supported only on -# x86/x86-64 systems. Mongo target is a shell interface that -# depends on the javascript engine, so it will also only be -# built on x86/x86-64 systems. -ifeq ($(BR2_i386)$(BR2_x86_64),y) -MONGODB_SCONS_OPTS += --js-engine=mozjs --allocator=tcmalloc -MONGODB_SCONS_TARGETS += mongo -else -MONGODB_SCONS_OPTS += --js-engine=none --allocator=system -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -MONGODB_DEPENDENCIES += libcurl -MONGODB_SCONS_OPTS += \ - --enable-free-mon=on \ - --enable-http-client=on -else -MONGODB_SCONS_OPTS += \ - --enable-free-mon=off \ - --enable-http-client=off -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MONGODB_DEPENDENCIES += openssl -MONGODB_SCONS_OPTS += \ - --ssl=on \ - --ssl-provider=openssl -else -MONGODB_SCONS_OPTS += --ssl=off -endif - -define MONGODB_BUILD_CMDS - (cd $(@D); \ - $(SCONS) \ - $(MONGODB_SCONS_ENV) \ - $(MONGODB_SCONS_OPTS) \ - $(MONGODB_SCONS_TARGETS)) -endef - -define MONGODB_INSTALL_TARGET_CMDS - (cd $(@D); \ - $(SCONS) \ - $(MONGODB_SCONS_ENV) \ - $(MONGODB_SCONS_OPTS) \ - --prefix=$(TARGET_DIR)/usr \ - install) -endef - -$(eval $(generic-package)) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 6e8d1e3804..07c0fc68c1 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 efcb5aa89b85d40373dcff3241316ddc0f2f130ad7f05c9c964f8cc1e2078a0b mongoose-7.15.tar.gz -sha256 7e2bc5dabbc27b431a530540161ba860906f12109d4b84b1e4bc8879f1afc3bc LICENSE +sha256 ede2371ff4e41e95fd7b2de83a7df727388307a64d3706046ead320defe35e7e mongoose-7.20.tar.gz +sha256 9abc2509d90c01ff2a0c91abf73582cdbcf1d2dbcc0b7973097eced43cf4cdd4 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index e3c57c8e8a..44de3fa1e0 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.15 +MONGOOSE_VERSION = 7.20 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE @@ -17,10 +17,12 @@ MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl -MONGOOSE_CFLAGS += -DMG_ENABLE_OPENSSL=1 +MONGOOSE_CFLAGS += -DMG_TLS=MG_TLS_OPENSSL else ifeq ($(BR2_PACKAGE_MBEDTLS),y) MONGOOSE_DEPENDENCIES += mbedtls -MONGOOSE_CFLAGS += -DMG_ENABLE_MBEDTLS=1 +MONGOOSE_CFLAGS += -DMG_TLS=MG_TLS_MBED +else +MONGOOSE_CFLAGS += -DMG_TLS=MG_TLS_NONE endif define MONGOOSE_BUILD_CMDS diff --git a/package/mongrel2/0001-Do-not-run-tests.patch b/package/mongrel2/0001-Do-not-run-tests.patch deleted file mode 100644 index 3b72aef3c5..0000000000 --- a/package/mongrel2/0001-Do-not-run-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3cbef2195533f357c8a80c2840108662461273b7 Mon Sep 17 00:00:00 2001 -From: Lionel Orry -Date: Wed, 27 Mar 2013 14:48:19 +0100 -Subject: [PATCH] Do not run tests. - -This patch is specific to cross-compiled environments and avoids running -the tests on the host. It is not meant to be applied upstream. - -Signed-off-by: Lionel Orry -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - Makefile | 2 +- - tools/m2sh/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7dc4089..ca72630 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,7 +18,7 @@ - TESTS=$(patsubst %.c,%,${TEST_SRC}) - MAKEOPTS=OPTFLAGS="${CFLAGS} ${NOEXTCFLAGS} ${OPTFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" - --all: bin/mongrel2 tests m2sh procer -+all: bin/mongrel2 m2sh procer filters config_modules - - ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} - ${OBJECTS}: | builddirs -diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile -index b50d8a0..334e4da 100644 ---- a/tools/m2sh/Makefile -+++ b/tools/m2sh/Makefile -@@ -12,7 +12,7 @@ - - $(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter - --all: ../lemon/lemon tests build/m2sh -+all: ../lemon/lemon build/m2sh - - dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS) - dev: all --- -1.8.1.4 - diff --git a/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch b/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch deleted file mode 100644 index 1961f128ed..0000000000 --- a/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 298356c44a7df2b34c4e307c531d2010e2cb4b79 Mon Sep 17 00:00:00 2001 -From: Lionel Orry -Date: Wed, 27 Mar 2013 15:56:56 +0100 -Subject: [PATCH] Fix Makefiles for cross-compilation - -The CFLAGS handling in mongrel2 is really messy and it is hard to make -it behave correctly with cross-compiling environments. This patch -restricts the Makefiles syntax to GNU Make, but help cross-compiling. - -This is not meant to be applied upstream. - -Signed-off-by: Lionel Orry -[Fabrice: refresh for 1.12.2] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 2 +- - tools/config_modules/Makefile | 2 +- - tools/filters/Makefile | 2 +- - tools/m2sh/Makefile | 2 +- - tools/procer/Makefile | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 4e89c33..2f549a8 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CFLAGS?=-g -O2 --CFLAGS += -Wall -Wextra -Wno-implicit-fallthrough -Wno-unused-const-variable -I./src -DNDEBUG -D_FILE_OFFSET_BITS=64 -pthread -+override CFLAGS += -Wall -Wextra -Wno-implicit-fallthrough -Wno-unused-const-variable -I./src -DNDEBUG -D_FILE_OFFSET_BITS=64 -pthread - CFLAGS += ${OPTFLAGS} - LIBS+=-lzmq -ldl -lsqlite3 -lmbedtls -lmbedx509 -lmbedcrypto - PREFIX?=/usr/local -diff --git a/tools/config_modules/Makefile b/tools/config_modules/Makefile -index c2680d1..ada3169 100644 ---- a/tools/config_modules/Makefile -+++ b/tools/config_modules/Makefile -@@ -1,5 +1,5 @@ - PREFIX?=/usr/local --CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build -+override CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build - LDFLAGS=$(OPTLIBS) - - MONGO_SRC = mongo-c-driver/src/bson.c \ -diff --git a/tools/filters/Makefile b/tools/filters/Makefile -index 6505ad5..a968ef6 100644 ---- a/tools/filters/Makefile -+++ b/tools/filters/Makefile -@@ -1,5 +1,5 @@ - PREFIX?=/usr/local --CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build -+override CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build - LDFLAGS=$(OPTLIBS) - - all: null.so rewrite.so sendfile.so -diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile -index b50d8a0..cc00062 100644 ---- a/tools/m2sh/Makefile -+++ b/tools/m2sh/Makefile -@@ -1,4 +1,4 @@ --CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) -+override CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) - LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS) - - PREFIX?=/usr/local -diff --git a/tools/procer/Makefile b/tools/procer/Makefile -index bb9aa31..d377f7f 100644 ---- a/tools/procer/Makefile -+++ b/tools/procer/Makefile -@@ -1,4 +1,4 @@ --CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) -+override CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) - PREFIX?=/usr/local - LIBS?=-lzmq - SOURCES=$(wildcard *.c) --- -2.27.0 - diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 996cd3246b..0000000000 --- a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 18 Jan 2022 22:41:36 +0100 -Subject: [PATCH] fix build with gcc 4.8 - -Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as -"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in -CFLAGS. This will avoid the following build failure with gcc 4.8 raised -since version 1.13.0 and -https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5: - -arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0' - -Fixes: - - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/mongrel2/mongrel2/pull/354 -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - Makefile | 1 - - tools/m2sh/Makefile | 4 ++-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index f6627ed..fb8d028 100644 ---- a/Makefile -+++ b/Makefile -@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer - - ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} - ${OBJECTS}: | builddirs --$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 - - .PHONY: builddirs - builddirs: -diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile -index 83e7ae4..86364af 100644 ---- a/tools/m2sh/Makefile -+++ b/tools/m2sh/Makefile -@@ -10,7 +10,7 @@ - LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) - RAGEL_OBJECTS=src/lexer.o src/cli.o - --$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter -+$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter - - all: ../lemon/lemon build/m2sh - -@@ -20,7 +20,7 @@ - install: build/m2sh - install build/m2sh ${DESTDIR}${PREFIX}/bin - --src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter -+src/parser.o: CFLAGS += -Wno-unused-parameter - - build/libm2sh.a: ${LIB_OBJ} - mkdir -p build --- -2.34.1 - diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in deleted file mode 100644 index 60fee6f96d..0000000000 --- a/package/mongrel2/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -# mongrel2 uses {get,make,swap}context() functions, which are -# available in glibc for all architectures and in uClibc only for a -# subset of the architectures -config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS - bool - default y if BR2_TOOLCHAIN_USES_GLIBC - default y if BR2_TOOLCHAIN_USES_UCLIBC && \ - (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_sparc || BR2_x86_64) - -comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS - -config BR2_PACKAGE_MONGREL2 - bool "mongrel2" - depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - depends on !BR2_STATIC_LIBS # uses dlopen() - depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS - select BR2_PACKAGE_MBEDTLS - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_ZEROMQ - help - Mongrel2 is an application, language, and network architecture - agnostic web server that focuses on web applications using - modern browser technologies. - - Mongrel2 supports 17 languages and platforms, HTTP, Flash - sockets, WebSockets, Long Polling, and many ways to deploy - and hack on it. - - http://www.mongrel2.org diff --git a/package/mongrel2/mongrel2.hash b/package/mongrel2/mongrel2.hash deleted file mode 100644 index f4f094ea03..0000000000 --- a/package/mongrel2/mongrel2.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://mongrel2.org -sha1 6057f9cbfae41e2cdef1e0f715df3c1a4d3a1884 mongrel2-v1.13.0.tar.bz2 - -# Locally computed -sha256 b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 mongrel2-v1.13.0.tar.bz2 -sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk deleted file mode 100644 index 07914ad0fe..0000000000 --- a/package/mongrel2/mongrel2.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# mongrel2 -# -################################################################################ - -MONGREL2_VERSION = 1.13.0 -MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 -# Do not use the github helper here, the generated tarball is *NOT* the same -# as the one uploaded by upstream for the release. -MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/v$(MONGREL2_VERSION) -MONGREL2_LICENSE = BSD-3-Clause -MONGREL2_LICENSE_FILES = LICENSE -MONGREL2_DEPENDENCIES = mbedtls sqlite zeromq - -define MONGREL2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - PREFIX=/usr all -endef - -define MONGREL2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - PREFIX=/usr DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package/monit/0001-Do-not-force-building-a-statically-linked-binary.patch b/package/monit/0001-Do-not-force-building-a-statically-linked-binary.patch new file mode 100644 index 0000000000..3b576f0502 --- /dev/null +++ b/package/monit/0001-Do-not-force-building-a-statically-linked-binary.patch @@ -0,0 +1,35 @@ +From 5beb7918daa46bcc5106e6302f0d8434fc5a23e6 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Fri, 27 Dec 2024 22:12:02 +0100 +Subject: [PATCH] Do not force building a statically-linked binary +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Statically-linked binary do not work well with glibc, because it +still dlopen()s the NSS libraries. + +Reported-by: Peter Kümmel +Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 6907706a..d2d123ba 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -98,7 +98,7 @@ monit_SOURCES = src/y.tab.c \ + src/statistics/Statistics.c + + monit_LDADD = libmonit/libmonit.la +-monit_LDFLAGS = -static $(EXTLDFLAGS) ++monit_LDFLAGS = $(EXTLDFLAGS) + + man_MANS = monit.1 + +-- +2.47.0 + diff --git a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch index 3bee55cb5e..9ed49e5797 100644 --- a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch +++ b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch @@ -1,4 +1,4 @@ -From 2c06ecdc02de75a9e7e1e30e9c3d7d3a64269b7c Mon Sep 17 00:00:00 2001 +From 99b466f5448951a83a0d763e633906b28c30fc0a Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Fri, 22 Sep 2023 21:32:18 +0200 Subject: [PATCH] configure.ac: fixes missing config macro dir @@ -18,12 +18,12 @@ Signed-off-by: Bernd Kuhls 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 3c3d30a2..f4c5ea07 100644 +index b4f2a14c..41a8c1a5 100644 --- a/configure.ac +++ b/configure.ac -@@ -8,7 +8,7 @@ +@@ -8,7 +8,7 @@ AC_PREREQ([2.53]) # Example: 5.0_beta2 - AC_INIT([monit], [5.34.2], [monit-general@nongnu.org]) + AC_INIT([monit], [5.34.3], [monit-general@nongnu.org]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4 config]) @@ -31,7 +31,7 @@ index 3c3d30a2..f4c5ea07 100644 AC_CONFIG_SRCDIR([src/monit.c]) AC_CONFIG_SUBDIRS([libmonit]) diff --git a/libmonit/configure.ac b/libmonit/configure.ac -index d4cd0789..5366444a 100644 +index 800ebf83..03101a6b 100644 --- a/libmonit/configure.ac +++ b/libmonit/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.53]) @@ -44,5 +44,5 @@ index d4cd0789..5366444a 100644 AC_CONFIG_SRCDIR([src]) -- -2.34.1 +2.47.0 diff --git a/package/monit/monit.hash b/package/monit/monit.hash index 276e0a19d8..2c2956afa3 100644 --- a/package/monit/monit.hash +++ b/package/monit/monit.hash @@ -1,4 +1,4 @@ -# From https://mmonit.com/monit/dist/monit-5.34.2.tar.gz.sha256 -sha256 291ca3d898e9b425b6d0c1768728fecd6c1cf4c268c79db15fda26285ad5b832 monit-5.34.2.tar.gz +# From https://mmonit.com/monit/dist/monit-5.34.3.tar.gz.sha256 +sha256 669d8b95ddec124d1444ba5264f67fdeae8e90e53b2929719f4750fc5ff3ba60 monit-5.34.3.tar.gz # Locally computed sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING diff --git a/package/monit/monit.mk b/package/monit/monit.mk index a2d8073c31..7d78597c25 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONIT_VERSION = 5.34.2 +MONIT_VERSION = 5.34.3 MONIT_SITE = https://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING diff --git a/package/mosh/Config.in b/package/mosh/Config.in index 5b90358cac..7ca5259ecb 100644 --- a/package/mosh/Config.in +++ b/package/mosh/Config.in @@ -1,7 +1,7 @@ -comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 4.8" +comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 8" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_MOSH @@ -9,7 +9,7 @@ config BR2_PACKAGE_MOSH depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on !BR2_STATIC_LIBS # protobuf depends on BR2_USE_WCHAR select BR2_PACKAGE_PROTOBUF diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index 3c41a17401..bc1f382a9f 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -5,7 +5,7 @@ ################################################################################ MOSH_VERSION = 1.4.0 -MOSH_SITE = https://mosh.org +MOSH_SITE = https://github.com/mobile-shell/mosh/releases/download/mosh-$(MOSH_VERSION) MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception MOSH_LICENSE_FILES = COPYING COPYING.iOS diff --git a/package/mosquitto/0001-Fix-CMake-builds-with-WITH_TLS-OFF.patch b/package/mosquitto/0001-Fix-CMake-builds-with-WITH_TLS-OFF.patch new file mode 100644 index 0000000000..9445148f44 --- /dev/null +++ b/package/mosquitto/0001-Fix-CMake-builds-with-WITH_TLS-OFF.patch @@ -0,0 +1,50 @@ +From 1ecc94d7b4ff495afd7f32c42072cdf4ea5407aa Mon Sep 17 00:00:00 2001 +From: Ben Marsh +Date: Mon, 21 Jul 2025 17:46:16 +0100 +Subject: [PATCH] Fix CMake builds with WITH_TLS=OFF + +Recent CMake changes caused CMake builds with the WITH_TLS option set to OFF to fail. The OpenSSL package is only found (find_package()) if WITH_TLS is ON, but linking to OpenSSL for the broker and library is not guarded by WITH_TLS. The build therefore fails. + +Guard linking to OpenSSL, only linking if WITH_TLS is set. + +Upstream: https://github.com/eclipse-mosquitto/mosquitto/pull/3321 +Signed-off-by: Scott Fan +--- + lib/CMakeLists.txt | 4 +++- + src/CMakeLists.txt | 5 ++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 21b61497..e6b8235b 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -60,7 +60,9 @@ set(C_SRC + util_mosq.c util_topic.c util_mosq.h + will_mosq.c will_mosq.h) + +-set (LIBRARIES OpenSSL::SSL) ++if (WITH_TLS) ++ set (LIBRARIES OpenSSL::SSL) ++endif() + + if (UNIX AND NOT APPLE AND NOT ANDROID) + find_library(LIBRT rt) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d4bae7cd..6fd0ee53 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -163,7 +163,10 @@ if (WITH_DLT) + set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES}) + endif (WITH_DLT) + +-set (MOSQ_LIBS ${MOSQ_LIBS} OpenSSL::SSL) ++if (WITH_TLS) ++ set (MOSQ_LIBS ${MOSQ_LIBS} OpenSSL::SSL) ++endif() ++ + # Check for getaddrinfo_a + include(CheckLibraryExists) + check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A) +-- +2.43.0 + diff --git a/package/mosquitto/0002-Add-configure-time-check-for-lanl.patch b/package/mosquitto/0002-Add-configure-time-check-for-lanl.patch new file mode 100644 index 0000000000..b67164123a --- /dev/null +++ b/package/mosquitto/0002-Add-configure-time-check-for-lanl.patch @@ -0,0 +1,47 @@ +From 447a6aa8df882a67ca3df6f5e95be42e1463eaf0 Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Fri, 29 Aug 2025 19:47:34 +0200 +Subject: [PATCH] Add configure-time check for -lanl + +Since glibc 2.34, libanl features have been integrated directly into libc [1]. +For backward compatibility, some toolchains still provide a shim for +libanl as a separate .so, but new toolchains (for example for new archs +like loongarch) do not provide it anymore. + +In such a case, building mosquitto fails at link time with (see [2]) + > cannot find -lanl: No such file or directory + +To fix this problem while maintaining compatibility with older toolchains, +check if a simple program that uses libanl can be compiled without -lanl, +and only add the linker flag otherwise. + +[1] https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html +[2] https://autobuild.buildroot.org/results/16223cd838876abc9b6f941f7dc20d23afa32c3b/build-end.log + +Upstream: https://github.com/eclipse-mosquitto/mosquitto/pull/3358 + +Signed-off-by: Titouan Christophe +--- + config.mk | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/config.mk b/config.mk +index 34d5163f..cc7987c4 100644 +--- a/config.mk ++++ b/config.mk +@@ -318,8 +318,11 @@ ifeq ($(WITH_EC),yes) + endif + + ifeq ($(WITH_ADNS),yes) +- BROKER_LDADD:=$(BROKER_LDADD) -lanl + BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_ADNS ++ NEED_LIBANL := $(shell printf '#include \n#include \nint main(){return getaddrinfo_a(0, NULL, 0, NULL);}'| $(CC) -D_GNU_SOURCE -o /dev/null -x c - 2>/dev/null || echo YES) ++ ifeq ($(NEED_LIBANL),YES) ++ BROKER_LDADD:=$(BROKER_LDADD) -lanl ++ endif + endif + + ifeq ($(WITH_CONTROL),yes) +-- +2.50.1 + diff --git a/package/mosquitto/S50mosquitto b/package/mosquitto/S50mosquitto index 5241a071d7..89989179c1 100644 --- a/package/mosquitto/S50mosquitto +++ b/package/mosquitto/S50mosquitto @@ -1,35 +1,74 @@ #!/bin/sh +DAEMON="mosquitto" +PIDFILE="/var/run/$DAEMON.pid" +MOSQUITTO_CONF="/etc/mosquitto/mosquitto.conf" + +[ -f "$MOSQUITTO_CONF" ] || exit 0 + start() { - printf "Starting mosquitto: " - start-stop-daemon -S -q -m -b -p /var/run/mosquitto.pid \ - --exec /usr/sbin/mosquitto \ - -- -c /etc/mosquitto/mosquitto.conf - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf "Starting %s: " "$DAEMON" + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" \ + -- -c "$MOSQUITTO_CONF" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } + stop() { - printf "Stopping mosquitto: " - start-stop-daemon -K -q -p /var/run/mosquitto.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf "Stopping %s: " "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + return "$status" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" } + restart() { stop start } +reload() { + printf "Reloading %s config: " "$DAEMON" + start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 + start) + start;; + stop) + stop;; + restart) + restart;; + reload) + reload;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac exit $? diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index f644f688b9..cf031f91e5 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.20.tar.gz.asc -sha256 ebd07d89d2a446a7f74100ad51272e4a8bf300b61634a7812e19f068f2759de8 mosquitto-2.0.20.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.22.tar.gz.asc +sha256 2f752589ef7db40260b633fbdb536e9a04b446a315138d64a7ff3c14e2de6b68 mosquitto-2.0.22.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 727dd4ff4c..8539f28d08 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.20 +MOSQUITTO_VERSION = 2.0.22 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 1d1a005e7a..4b5cec0a6f 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 657b7d8ee59f42cf06e00da04f0627f3ff42ff5344c9a1da33d16207c4451a03 motion-4.7.0.tar.gz +sha256 c11f68c7cea949227e57797b932f01432d8942ef5323c75063d19b951d0d4194 motion-4.7.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index fc70349221..a405403b2b 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.7.0 +MOTION_VERSION = 4.7.1 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE diff --git a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch index 390cf12583..9ebf7d09d9 100644 --- a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch +++ b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch @@ -9,9 +9,15 @@ Linking with libatomic is needed on sparc otherwise build fails on: Fixes: - http://autobuild.buildroot.org/results/7a9fdb7e323892fb6ed85a2441054303e889c089 +Upstream: not sent (the same kind of patch for ncmpc was +refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45) Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (the same kind of patch for ncmpc was -refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45)] +[Andreas: adapt upstream formatting] +Signed-off-by: Andreas Ziegler +--- +Rebase for mpd-0.24 + +Signed-off-by: Andreas Ziegler --- src/event/meson.build | 4 ++++ 1 file changed, 4 insertions(+) @@ -20,7 +26,7 @@ diff --git a/src/event/meson.build b/src/event/meson.build index bc13bbcd2..88370c03a 100644 --- a/src/event/meson.build +++ b/src/event/meson.build -@@ -47,9 +47,13 @@ event = declare_dependency( +@@ -46,9 +46,13 @@ ], ) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 902a3da779..48b8c914fa 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,13 +1,13 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # boost + depends on BR2_USE_WCHAR # libfmt depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 - depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 - select BR2_PACKAGE_BOOST + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 # C++20 recommended + depends on BR2_HOST_GCC_AT_LEAST_10 # C++20 constinit P4311R2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 # openat2.h select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -48,17 +48,10 @@ config BR2_PACKAGE_MPD_QOBUZ depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS select BR2_PACKAGE_MPD_CURL select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_YAJL + select BR2_PACKAGE_JSON_FOR_MODERN_CPP help Play songs from the commercial streaming service Qobuz. -config BR2_PACKAGE_MPD_SOUNDCLOUD - bool "soundcloud" - select BR2_PACKAGE_MPD_CURL - select BR2_PACKAGE_YAJL - help - Enable soundcloud.com playlist support. - comment "Converter plugins" config BR2_PACKAGE_MPD_LIBSAMPLERATE @@ -242,13 +235,11 @@ comment "nfs support needs a toolchain w/ threads support" depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) comment "samba support needs a glibc toolchain w/ dynamic library, RPC" - depends on !BR2_nios2 depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_NATIVE_RPC config BR2_PACKAGE_MPD_LIBSMBCLIENT bool "samba" - depends on !BR2_nios2 # samba depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC @@ -435,10 +426,11 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8" +comment "mpd needs a toolchain w/ C++, threads, wchar, host-gcc 10, gcc 12, headers 5.6" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ - !BR2_HOST_GCC_AT_LEAST_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_12 || \ + !BR2_HOST_GCC_AT_LEAST_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index fe3d449cc5..de385da77e 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a mpd-0.23.15.tar.xz +sha256 8ce34a010577feb42999a96d867325c6d38bf7ae1b7a57f878d7e548c1fd1fa9 mpd-0.24.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index e320ad9dec..ff6f08ba65 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,15 +4,17 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).15 +MPD_VERSION_MAJOR = 0.24 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) -MPD_DEPENDENCIES = host-pkgconf boost fmt +MPD_DEPENDENCIES = host-pkgconf fmt MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING -# these refer to the FreeBSD PPP daemon -MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 + +MPD_CPE_ID_VENDOR = musicpd +MPD_CPE_ID_PRODUCT = music_player_demon + MPD_SELINUX_MODULES = mpd MPD_CONF_OPTS = \ -Daudiofile=disabled \ @@ -44,11 +46,11 @@ else MPD_CONF_OPTS += -Dicu=disabled endif -ifeq ($(BR2_PACKAGE_YAJL),y) -MPD_DEPENDENCIES += yajl -MPD_CONF_OPTS += -Dyajl=enabled +ifeq ($(BR2_PACKAGE_JSON_FOR_MODERN_CPP),y) +MPD_DEPENDENCIES += json-for-modern-cpp +MPD_CONF_OPTS += -Dnlohmann_json=enabled else -MPD_CONF_OPTS += -Dyajl=disabled +MPD_CONF_OPTS += -Dnlohmann_json=disabled endif ifeq ($(BR2_PACKAGE_MPD_ALSA),y) @@ -285,12 +287,6 @@ else MPD_CONF_OPTS += -Dsidplay=disabled endif -ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) -MPD_CONF_OPTS += -Dsoundcloud=enabled -else -MPD_CONF_OPTS += -Dsoundcloud=disabled -endif - ifeq ($(BR2_PACKAGE_MPD_SQLITE),y) MPD_DEPENDENCIES += sqlite MPD_CONF_OPTS += -Dsqlite=enabled diff --git a/package/mpdecimal/mpdecimal.hash b/package/mpdecimal/mpdecimal.hash index 81150c7575..53ca182287 100644 --- a/package/mpdecimal/mpdecimal.hash +++ b/package/mpdecimal/mpdecimal.hash @@ -1,4 +1,4 @@ # From http://www.bytereef.org/mpdecimal/download.html -sha256 9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f mpdecimal-2.5.1.tar.gz +sha256 942445c3245b22730fd41a67a7c5c231d11cb1b9936b9c0f76334fb7d0b4468c mpdecimal-4.0.0.tar.gz # Locally computed -sha256 b07528d8b1dbf1e2d2741052996f0876e23342ce2d30d0effa39c5457716c25a LICENSE.txt +sha256 2713324211652ce4a60e6e21e54f9dc3004299e591b0933a352f1a89c5fb53c2 COPYRIGHT.txt diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index aa322df340..a2ab18523b 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -5,10 +5,10 @@ ################################################################################ MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.5.1 +MPDECIMAL_VERSION = 4.0.0 MPDECIMAL_INSTALL_STAGING = YES MPDECIMAL_LICENSE = BSD-2-Clause -MPDECIMAL_LICENSE_FILES = LICENSE.txt +MPDECIMAL_LICENSE_FILES = COPYRIGHT.txt MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" # threads are only needed for tests diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index 5a83f29586..2fc0061476 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/mpg123/files/mpg123/1.32.6/ -sha1 886c8c5f100caccfb4fefabc1c75ff6e2a834128 mpg123-1.32.6.tar.bz2 +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.33.3/ +sha1 41dd15e29668a8e1372d31f327c8962a8ef6b595 mpg123-1.33.3.tar.bz2 # Locally calculated -sha256 ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6 mpg123-1.32.6.tar.bz2 +sha256 6a0c6472dd156e213c2068f40115ebbb73978c2d873e66bae2a250e2d2198d26 mpg123-1.33.3.tar.bz2 # License file sha256 c22482728a634a8dfdb4ff72a96d4c1ed64cd8f3e79335c401751ac591609366 COPYING diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index dbf595e172..5e55d33b72 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.32.6 +MPG123_VERSION = 1.33.3 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = https://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_INSTALL_STAGING = YES diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index cf37091186..8832b68ece 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -14,197 +14,188 @@ MPV_LICENSE_FILES = LICENSE.GPL MPV_CPE_ID_VENDOR = mpv MPV_INSTALL_STAGING = YES -MPV_NEEDS_EXTERNAL_WAF = YES - # Some of these options need testing and/or tweaks MPV_CONF_OPTS = \ - --prefix=/usr \ - --disable-android \ - --disable-caca \ - --disable-cocoa \ - --disable-coreaudio \ - --disable-cuda-hwaccel \ - --disable-opensles \ - --disable-rubberband \ - --disable-uchardet \ - --disable-vapoursynth + -Dcaca=disabled \ + -Dcocoa=disabled \ + -Dcoreaudio=disabled \ + -Dcuda-hwaccel=disabled \ + -Dlibmpv=true \ + -Dopensles=disabled \ + -Drubberband=disabled \ + -Duchardet=disabled \ + -Dvapoursynth=disabled ifeq ($(BR2_REPRODUCIBLE),y) -MPV_CONF_OPTS += --disable-build-date -endif - -ifeq ($(BR2_STATIC_LIBS),y) -MPV_CONF_OPTS += --disable-libmpv-shared --enable-libmpv-static -else -MPV_CONF_OPTS += --enable-libmpv-shared --disable-libmpv-static +MPV_CONF_OPTS += -Dbuild-date=false endif ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -MPV_CONF_OPTS += --enable-alsa +MPV_CONF_OPTS += -Dalsa=enabled MPV_DEPENDENCIES += alsa-lib else -MPV_CONF_OPTS += --disable-alsa +MPV_CONF_OPTS += -Dalsa=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) -MPV_CONF_OPTS += --enable-gbm +MPV_CONF_OPTS += -Dgbm=enabled MPV_DEPENDENCIES += mesa3d ifeq ($(BR2_PACKAGE_LIBDRM),y) -MPV_CONF_OPTS += --enable-egl-drm +MPV_CONF_OPTS += -Degl-drm=enabled else -MPV_CONF_OPTS += --disable-egl-drm +MPV_CONF_OPTS += -Degl-drm=disabled endif else -MPV_CONF_OPTS += --disable-gbm --disable-egl-drm +MPV_CONF_OPTS += -Dgbm=disabled -Degl-drm=disabled endif # jack support # It also requires 64-bit sync intrinsics ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_JACK2),yy) -MPV_CONF_OPTS += --enable-jack +MPV_CONF_OPTS += -Djack=enabled MPV_DEPENDENCIES += jack2 else -MPV_CONF_OPTS += --disable-jack +MPV_CONF_OPTS += -Djack=disabled endif # jpeg support ifeq ($(BR2_PACKAGE_JPEG),y) -MPV_CONF_OPTS += --enable-jpeg +MPV_CONF_OPTS += -Djpeg=enabled MPV_DEPENDENCIES += jpeg else -MPV_CONF_OPTS += --disable-jpeg +MPV_CONF_OPTS += -Djpeg=disabled endif # lcms2 support ifeq ($(BR2_PACKAGE_LCMS2),y) -MPV_CONF_OPTS += --enable-lcms2 +MPV_CONF_OPTS += -Dlcms2=enabled MPV_DEPENDENCIES += lcms2 else -MPV_CONF_OPTS += --disable-lcms2 +MPV_CONF_OPTS += -Dlcms2=disabled endif # libarchive support ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -MPV_CONF_OPTS += --enable-libarchive +MPV_CONF_OPTS += -Dlibarchive=enabled MPV_DEPENDENCIES += libarchive else -MPV_CONF_OPTS += --disable-libarchive +MPV_CONF_OPTS += -Dlibarchive=disabled endif # bluray support ifeq ($(BR2_PACKAGE_LIBBLURAY),y) -MPV_CONF_OPTS += --enable-libbluray +MPV_CONF_OPTS += -Dlibbluray=enabled MPV_DEPENDENCIES += libbluray else -MPV_CONF_OPTS += --disable-libbluray +MPV_CONF_OPTS += -Dlibbluray=disabled endif # libcdio-paranoia ifeq ($(BR2_PACKAGE_LIBCDIO_PARANOIA),y) -MPV_CONF_OPTS += --enable-cdda +MPV_CONF_OPTS += -Dcdda=enabled MPV_DEPENDENCIES += libcdio-paranoia else -MPV_CONF_OPTS += --disable-cdda +MPV_CONF_OPTS += -Dcdda=disabled endif # libdvdnav ifeq ($(BR2_PACKAGE_LIBDVDNAV),y) -MPV_CONF_OPTS += --enable-dvdnav +MPV_CONF_OPTS += -Ddvdnav=enabled MPV_DEPENDENCIES += libdvdnav else -MPV_CONF_OPTS += --disable-dvdnav +MPV_CONF_OPTS += -Ddvdnav=disabled endif # libdrm ifeq ($(BR2_PACKAGE_LIBDRM),y) -MPV_CONF_OPTS += --enable-drm +MPV_CONF_OPTS += -Ddrm=enabled MPV_DEPENDENCIES += libdrm else -MPV_CONF_OPTS += --disable-drm +MPV_CONF_OPTS += -Ddrm=disabled endif # libvdpau ifeq ($(BR2_PACKAGE_LIBVDPAU),y) -MPV_CONF_OPTS += --enable-vdpau +MPV_CONF_OPTS += -Dvdpau=enabled MPV_DEPENDENCIES += libvdpau else -MPV_CONF_OPTS += --disable-vdpau +MPV_CONF_OPTS += -Dvdpau=disabled endif # LUA support, only for lua51/lua52/luajit # This enables the controller (OSD) together with libass ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUAJIT),y) -MPV_CONF_OPTS += --enable-lua +MPV_CONF_OPTS += -Dlua=enabled MPV_DEPENDENCIES += luainterpreter else -MPV_CONF_OPTS += --disable-lua +MPV_CONF_OPTS += -Dlua=disabled endif # OpenGL support ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -MPV_CONF_OPTS += --enable-gl +MPV_CONF_OPTS += -Dgl=enabled MPV_DEPENDENCIES += libgl else ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -MPV_CONF_OPTS += --enable-gl +MPV_CONF_OPTS += -Dgl=enabled MPV_DEPENDENCIES += libgles else ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -MPV_CONF_OPTS += --enable-gl +MPV_CONF_OPTS += -Dgl=enabled MPV_DEPENDENCIES += libegl else -MPV_CONF_OPTS += --disable-gl +MPV_CONF_OPTS += -Dgl=disabled endif # pulseaudio support ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -MPV_CONF_OPTS += --enable-pulse +MPV_CONF_OPTS += -Dpulse=enabled MPV_DEPENDENCIES += pulseaudio else -MPV_CONF_OPTS += --disable-pulse +MPV_CONF_OPTS += -Dpulse=disabled endif # SDL support # Sdl2 requires 64-bit sync intrinsics ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) -MPV_CONF_OPTS += --enable-sdl2 +MPV_CONF_OPTS += -Dsdl2=enabled MPV_DEPENDENCIES += sdl2 else -MPV_CONF_OPTS += --disable-sdl2 +MPV_CONF_OPTS += -Dsdl2=disabled endif # Raspberry Pi support ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -MPV_CONF_OPTS += --enable-rpi --enable-gl +MPV_CONF_OPTS += -Drpi=enabled -Dgl=enabled MPV_DEPENDENCIES += rpi-userland else -MPV_CONF_OPTS += --disable-rpi +MPV_CONF_OPTS += -Drpi=disabled endif # va-api support ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy) -MPV_CONF_OPTS += --enable-vaapi +MPV_CONF_OPTS += -Dvaapi=enabled MPV_DEPENDENCIES += libva ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) -MPV_CONF_OPTS += --enable-vaapi-drm +MPV_CONF_OPTS += -Dvaapi-drm=enabled else -MPV_CONF_OPTS += --disable-vaapi-drm +MPV_CONF_OPTS += -Dvaapi-drm=disabled endif else -MPV_CONF_OPTS += --disable-vaapi --disable-vaapi-drm +MPV_CONF_OPTS += -Dvaapi=disabled -Dvaapi-drm=disabled endif # wayland support ifeq ($(BR2_PACKAGE_WAYLAND),y) -MPV_CONF_OPTS += --enable-wayland +MPV_CONF_OPTS += -Dwayland=enabled MPV_DEPENDENCIES += libxkbcommon wayland wayland-protocols else -MPV_CONF_OPTS += --disable-wayland +MPV_CONF_OPTS += -Dwayland=disabled endif # Base X11 support. Config.in ensures that if BR2_PACKAGE_XORG7 is # enabled, xlib_libX11, xlib_libXext, xlib_libXinerama, # xlib_libXrandr, xlib_libXScrnSaver. ifeq ($(BR2_PACKAGE_XORG7),y) -MPV_CONF_OPTS += --enable-x11 +MPV_CONF_OPTS += -Dx11=enabled MPV_DEPENDENCIES += \ xlib_libX11 \ xlib_libXext \ @@ -214,17 +205,19 @@ MPV_DEPENDENCIES += \ xlib_libXScrnSaver # XVideo ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) -MPV_CONF_OPTS += --enable-xv +MPV_CONF_OPTS += -Dxv=enabled MPV_DEPENDENCIES += xlib_libXv else -MPV_CONF_OPTS += --disable-xv +MPV_CONF_OPTS += -Dxv=disabled endif else -MPV_CONF_OPTS += --disable-x11 +MPV_CONF_OPTS += -Dx11=disabled endif ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -MPV_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" +MPV_CONF_OPTS += -Dstdatomic=enabled +else +MPV_CONF_OPTS += -Dstdatomic=disabled endif -$(eval $(waf-package)) +$(eval $(meson-package)) diff --git a/package/mrouted/0001-gcc15.patch b/package/mrouted/0001-gcc15.patch new file mode 100644 index 0000000000..781f83f5c7 --- /dev/null +++ b/package/mrouted/0001-gcc15.patch @@ -0,0 +1,33 @@ +From cdb388c8dc6e661d2a23f1e9b79102bc68e89af5 Mon Sep 17 00:00:00 2001 +From: Philippe Troin +Date: Wed, 23 Apr 2025 16:04:20 -0700 +Subject: [PATCH] C23 compatibility. + +bool is a keyword in C23. + +Upstream: https://github.com/troglobit/mrouted/pull/65 + +Signed-off-by: Bernd Kuhls +--- + src/kern.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/kern.c b/src/kern.c +index 27f8dd4..04f1c36 100644 +--- a/src/kern.c ++++ b/src/kern.c +@@ -104,11 +104,11 @@ void k_set_rcvbuf(int bufsize, int minsize) + * in the kernel and "panic". The kernel patch for netinet/ip_raw.c + * coming with this distribution fixes it. + */ +-void k_hdr_include(int bool) ++void k_hdr_include(int flag) + { + #ifdef IP_HDRINCL +- if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, &bool, sizeof(bool)) < 0) +- logit(LOG_ERR, errno, "Failed setting socket IP_HDRINCL %u", bool); ++ if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, &flag, sizeof(flag)) < 0) ++ logit(LOG_ERR, errno, "Failed setting socket IP_HDRINCL %u", flag); + #endif + } + diff --git a/package/mrouted/mrouted.hash b/package/mrouted/mrouted.hash index 7516a1329c..aabfd19f33 100644 --- a/package/mrouted/mrouted.hash +++ b/package/mrouted/mrouted.hash @@ -1,5 +1,5 @@ -# From https://github.com/troglobit/mrouted/releases/ -sha256 99e1a1ca45e4e6c05b3cf379fd59a239aeabd9512656114528ad5e172d3c8ba8 mrouted-4.5.tar.gz +# From https://github.com/troglobit/mrouted/releases/download/4.6/mrouted-4.6.tar.gz.sha256 +sha256 49443c47b5b28a5ab65d796f3495d72a94c1c95e54333cb11fe04075006b576b mrouted-4.6.tar.gz # Locally calculated sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 7b5f5039f6..077afac2b9 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,7 +4,7 @@ # ################################################################################ -MROUTED_VERSION = 4.5 +MROUTED_VERSION = 4.6 MROUTED_SITE = \ https://github.com/troglobit/mrouted/releases/download/$(MROUTED_VERSION) MROUTED_DEPENDENCIES = host-bison diff --git a/package/msgpack-c/Config.in b/package/msgpack-c/Config.in new file mode 100644 index 0000000000..76dfe19614 --- /dev/null +++ b/package/msgpack-c/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_MSGPACK_C + bool "msgpack-c" + help + MessagePack is an efficient binary serialization format. + + It lets you exchange data among multiple languages like JSON + but it's faster and smaller. + + Note: this package is the C variant of msgpack-c. For the + C++ variant, use the "msgpack" Buildroot package. + + https://msgpack.org/ diff --git a/package/msgpack-c/msgpack-c.hash b/package/msgpack-c/msgpack-c.hash new file mode 100644 index 0000000000..e4fe61f424 --- /dev/null +++ b/package/msgpack-c/msgpack-c.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 c23c4070dbe01f46044bf70c5349f29453d655935b6dc710714c008bca0825a7 msgpack-c-6.1.0.tar.gz +sha256 664550b43996452a5a2c7471bb0ff77185a58c69ccafa60f983dc4c162e1ee22 COPYING +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/msgpack-c/msgpack-c.mk b/package/msgpack-c/msgpack-c.mk new file mode 100644 index 0000000000..f12dcb085f --- /dev/null +++ b/package/msgpack-c/msgpack-c.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# msgpack-c +# +################################################################################ + +MSGPACK_C_VERSION = 6.1.0 +MSGPACK_C_SITE = $(call github,msgpack,msgpack-c,c-$(MSGPACK_C_VERSION)) +MSGPACK_C_LICENSE = BSL-1.0 +MSGPACK_C_LICENSE_FILES = COPYING LICENSE_1_0.txt +MSGPACK_C_INSTALL_STAGING = YES +MSGPACK_C_CONF_OPTS = -DMSGPACK_BUILD_EXAMPLES=OFF -DMSGPACK_BUILD_TESTS=OFF + +ifeq ($(BR2_STATIC_LIBS),y) +MSGPACK_C_CONF_OPTS += -DMSGPACK_ENABLE_SHARED=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/msgpack/Config.in b/package/msgpack/Config.in index b7ae35a0c6..da67956a10 100644 --- a/package/msgpack/Config.in +++ b/package/msgpack/Config.in @@ -8,6 +8,9 @@ config BR2_PACKAGE_MSGPACK It lets you exchange data among multiple languages like JSON but it's faster and smaller. + Note: this package is the C++ variant of msgpack. For the + C variant, use the "msgpack-c" Buildroot package. + http://msgpack.org/ comment "msgpack needs a toolchain w/ C++" diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index ba4ef02746..30e1d19059 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.25.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.32.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738 msmtp-1.8.25.tar.xz +sha256 20cd58b58dd007acf7b937fa1a1e21f3afb3e9ef5bbcfb8b4f5650deadc64db4 msmtp-1.8.32.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index b964970bfa..485d2a1c1d 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.25 +MSMTP_VERSION = 1.8.32 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf diff --git a/package/mtdev/mtdev.hash b/package/mtdev/mtdev.hash index 355e50ff6f..605aedb922 100644 --- a/package/mtdev/mtdev.hash +++ b/package/mtdev/mtdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0 mtdev-1.1.6.tar.bz2 +sha256 a107adad2101fecac54ac7f9f0e0a0dd155d954193da55c2340c97f2ff1d814e mtdev-1.1.7.tar.bz2 sha256 795bfe74daae59a97d3a0c8ec0ba0f08c243adf94a3aa7981a4136fce31d55b4 COPYING diff --git a/package/mtdev/mtdev.mk b/package/mtdev/mtdev.mk index 7191858187..d3df198784 100644 --- a/package/mtdev/mtdev.mk +++ b/package/mtdev/mtdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTDEV_VERSION = 1.1.6 +MTDEV_VERSION = 1.1.7 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2 MTDEV_SITE = http://bitmath.org/code/mtdev diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 0cad06ce58..44f0803b0f 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 32ca85dfc1674c536143d4e0da60e3134039eb9552e0fecfa110e9c8736093ce mtools-4.0.45.tar.lz +sha256 7d57f14a2482dc4658e4b386180793ef50f0de89ee3a9a28f0a371630baac7c4 mtools-4.0.48.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 7089af339e..8c7a348fea 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.45 +MTOOLS_VERSION = 4.0.48 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in index 34c5e7d538..5c0a127a90 100644 --- a/package/mupdf/Config.in +++ b/package/mupdf/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_MUPDF help MuPDF is a lightweight PDF, XPS, and E-book viewer. - https://www.mupdf.com/index.html + https://www.mupdf.com/ comment "mupdf needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 9eecb84232..6b666033eb 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -21,6 +21,12 @@ MUPDF_DEPENDENCIES = \ lcms2 openjpeg \ zlib +# libfreeglut/0001-Plug-memory-leak-that-happens-upon-error.patch +# Fix is in libfreeglut, but CVE applied to mupdf. +MUPDF_IGNORE_CVES = \ + CVE-2024-24258 \ + CVE-2024-24259 + # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. # with USE_SYSTEM_LIBS it will try to use system libraries instead of the bundled ones. MUPDF_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/murata-cyw-fw/Config.in b/package/murata-cyw-fw/Config.in index 7530477511..8a2795e806 100644 --- a/package/murata-cyw-fw/Config.in +++ b/package/murata-cyw-fw/Config.in @@ -25,20 +25,9 @@ config BR2_PACKAGE_MURATA_CYW_FW_CYW43362 Murata Wireless CYW43362 (SN8000) module firmware files. config BR2_PACKAGE_MURATA_CYW_FW_CYW4339 - bool "CYW4339 (1CK/ZP)" + bool "CYW4339 (ZP)" help - Murata Wireless CYW4339 (1CK/ZP) module firmware files. - -choice - prompt "CYW4339 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW4339 - -config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK - bool "1CK" - -config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP - bool "ZP" - -endchoice + Murata Wireless CYW4339 (ZP) module firmware files. config BR2_PACKAGE_MURATA_CYW_FW_CYW43430 bool "CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)" @@ -60,6 +49,11 @@ config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN endchoice +config BR2_PACKAGE_MURATA_CYW_FW_CYW43439 + bool "CYW43439 (1YN)" + help + Murata Wireless CYW43439 (1YN) module firmware files. + config BR2_PACKAGE_MURATA_CYW_FW_CYW43455 bool "CYW43455 (1HK/1LC/1MW)" help diff --git a/package/murata-cyw-fw/murata-cyw-fw.hash b/package/murata-cyw-fw/murata-cyw-fw.hash index d3c23dca71..cf199929a6 100644 --- a/package/murata-cyw-fw/murata-cyw-fw.hash +++ b/package/murata-cyw-fw/murata-cyw-fw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c3ecf357786d6db6f3283c0ea36ec067b1728f801fd8871694aed1502a82e9bc murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz -sha256 03c140ae04f9c2036678262d6457b9c4b4a9ebb523c5e681af6d57b97c11da37 cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz -sha256 8f23ebb9a262112b62ace1e1bedcdeb00523d9a45e8d48a829d4ca35db4f0280 cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz +sha256 2b71cb2a9376d3dda36185f2afff294322f6d1b60dd26c534b5fbeeb6155ea14 murata-cyw-fw-35459425949f0fa7de0b5c9f0c8bc0560087e1de.tar.gz +sha256 59b6f9c117023226ea7e614265a71dc3ed4991774298609fd9f516a5581d3cba cyw-fmac-nvram-fd6587f8183b612ea52404c7a73aeb2698099587.tar.gz +sha256 d80f8a03095f0a63284bbc83e6b878d41f94d402c569a49a1a8c8105983d7d34 cyw-bt-patch-83f8e16423c47e195f52a06fd68ac92a20a80a9f.tar.gz sha256 3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c LICENCE.cypress diff --git a/package/murata-cyw-fw/murata-cyw-fw.mk b/package/murata-cyw-fw/murata-cyw-fw.mk index b99168b875..e482629e49 100644 --- a/package/murata-cyw-fw/murata-cyw-fw.mk +++ b/package/murata-cyw-fw/murata-cyw-fw.mk @@ -4,9 +4,9 @@ # ################################################################################ -MURATA_CYW_FW_VERSION = 8d87950bfad28c65926695b7357bd8995b60016a -MURATA_CYW_FW_VERSION_NVRAM = d27f1bf105fa1e5b828e355793b88d4b66188411 -MURATA_CYW_FW_VERSION_BT_PATCH = 748462f0b02ec4aeb500bedd60780ac51c37be31 +MURATA_CYW_FW_VERSION = 35459425949f0fa7de0b5c9f0c8bc0560087e1de +MURATA_CYW_FW_VERSION_NVRAM = fd6587f8183b612ea52404c7a73aeb2698099587 +MURATA_CYW_FW_VERSION_BT_PATCH = 83f8e16423c47e195f52a06fd68ac92a20a80a9f MURATA_CYW_FW_SITE = $(call github,murata-wireless,cyw-fmac-fw,$(MURATA_CYW_FW_VERSION)) MURATA_CYW_FW_EXTRA_DOWNLOADS = \ $(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz \ @@ -24,69 +24,66 @@ endef MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \ - brcmfmac43012-sdio.bin \ - brcmfmac43012-sdio.1LV.clm_blob \ - brcmfmac43012-sdio.1LV.txt \ - CYW43012C0.1LV.hcd + cyfmac43012-sdio.bin \ + cyfmac43012-sdio.1LV.clm_blob \ + cyfmac43012-sdio.1LV.txt \ + BCM43012C0_003.001.015.0303.0267.1LV.sAnt.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43340) += \ - brcmfmac43340-sdio.bin \ - brcmfmac43340-sdio.1BW.txt \ + cyfmac43340-sdio.bin \ + cyfmac43340-sdio.1BW.txt \ CYW43341B0.1BW.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43362) += \ - brcmfmac43362-sdio.bin \ - brcmfmac43362-sdio.SN8000.txt + cyfmac43362-sdio.bin MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339) += \ - brcmfmac4339-sdio.bin -MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK) += \ - brcmfmac4339-sdio.1CK.txt -MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP) += \ - brcmfmac4339-sdio.ZP.txt \ + cyfmac4339-sdio.bin \ CYW4335C0.ZP.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430) += \ - brcmfmac43430-sdio.bin + cyfmac43430-sdio.bin MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX) += \ - brcmfmac43430-sdio.1DX.clm_blob \ - brcmfmac43430-sdio.1DX.txt \ - CYW43430A1.1DX.hcd + cyfmac43430-sdio.1DX.clm_blob \ + cyfmac43430-sdio.1DX.txt \ + BCM43430A1_001.002.009.0159.0528.1DX.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX) += \ - brcmfmac43430-sdio.1FX.clm_blob \ - brcmfmac43430-sdio.1FX.txt + cyfmac43430-sdio.1FX.clm_blob \ + cyfmac43430-sdio.1FX.txt MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN) += \ - brcmfmac43430-sdio.1LN.clm_blob \ - brcmfmac43430-sdio.1LN.txt + cyfmac43430-sdio.1LN.clm_blob +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43439) += \ + cyfmac43439-sdio.bin \ + cyfmac43439-sdio.1YN.clm_blob \ + cyfmac43439-sdio.1YN.txt \ + CYW4343A2_001.003.016.0031.0000.1YN.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455) += \ - brcmfmac43455-sdio.bin + cyfmac43455-sdio.bin MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK) += \ - brcmfmac43455-sdio.1HK.clm_blob \ - brcmfmac43455-sdio.1HK.txt + cyfmac43455-sdio.1HK.clm_blob MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC) += \ - brcmfmac43455-sdio.1LC.clm_blob \ - brcmfmac43455-sdio.1LC.txt + cyfmac43455-sdio.1LC.clm_blob \ + cyfmac43455-sdio.1LC.txt MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW) += \ - brcmfmac43455-sdio.1MW.clm_blob \ - brcmfmac43455-sdio.1MW.txt \ - CYW4345C0.1MW.hcd + cyfmac43455-sdio.1MW.clm_blob \ + cyfmac43455-sdio.1MW.txt \ + BCM4345C0_003.001.025.0187.0366.1MW.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4354) += \ - brcmfmac4354-sdio.bin \ - brcmfmac4354-sdio.1BB.clm_blob \ - brcmfmac4354-sdio.1BB.txt \ + cyfmac4354-sdio.bin \ + cyfmac4354-sdio.1BB.clm_blob \ CYW4350C0.1BB.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4356) += \ - brcmfmac4356-pcie.bin \ - brcmfmac4356-pcie.1CX.clm_blob \ - brcmfmac4356-pcie.1CX.txt \ - CYW4354A2.1CX.hcd + cyfmac4356-pcie.bin \ + cyfmac4356-pcie.1CX.clm_blob \ + BCM4356A2_001.003.015.0112.0410.1CX.hcd MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4359) += \ - brcmfmac4359-pcie.bin \ - brcmfmac4359-pcie.1FD.clm_blob + cyfmac4359-pcie.bin \ + cyfmac4359-sdio.bin # Helper that assumes filename with model has two dots (CHIP.MODEL.EXT), -# but filename without model has only single dot (CHIP.EXT). -murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed 's/\..*\./\./') +# or a underscore with several dots (CHIP_MODEL.MODEL.MODEL.EXT), but +# filename without model has only single dot (CHIP.EXT). +murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed -e 's/\..*\./\./' -e 's/_.*\./\./') # Helper that strips model name and renames Bluetooth patch files to the ones # expected by Linux kernel. -murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(f))) +murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(patsubst cy%,brcm%,$(f)))) define MURATA_CYW_FW_INSTALL_TARGET_CMDS $(foreach f,$(MURATA_CYW_FW_FILES_y), \ diff --git a/package/musepack/0006-incompatible-pointers.patch b/package/musepack/0006-incompatible-pointers.patch new file mode 100644 index 0000000000..7fb1b8fa23 --- /dev/null +++ b/package/musepack/0006-incompatible-pointers.patch @@ -0,0 +1,47 @@ +Fixed incompatible pointer types + +This is due to GCC14 that no longer allows implicitly casting all pointer types +to all other pointer types. Resulting in error such as : + +output/build/musepack-475/libmpcpsy/ans.c:291:120: error: passing argument 10 of ‘FindOptimalANS’ from incompatible pointer type [-Wincompatible-pointer-types] + 291 | L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient ); + | ~^~~~~~~~~~~~~ + | | + | int * + +Patch downloaded from Gentoo: +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/musepack-tools/files/musepack-tools-495-incompatible-pointers.patch + +Signed-off-by: Thomas Bonnefille +Upstream: N/A no SCM, not active anymore + +--- musepack-tools-495/libmpcpsy/ans.c ++++ musepack-tools-495-fixed/libmpcpsy/ans.c +@@ -287,12 +287,12 @@ + // for L or M, respectively + memset ( m->FIR_L, 0, sizeof m->FIR_L ); // reset FIR + memset ( m->NS_Order_L, 0, sizeof m->NS_Order_L ); // reset Flags +- FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient ); ++ FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, (const void*)m->SCF_Index_L, Transient ); + + // for R or S, respectively + memset ( m->FIR_R, 0, sizeof m->FIR_R ); // reset FIR + memset ( m->NS_Order_R, 0, sizeof m->NS_Order_R ); // reset Flags +- FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, m->SCF_Index_R, Transient ); ++ FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, (const void*)m->SCF_Index_R, Transient ); + + return; + } +--- musepack-tools-495/mpcenc/mpcenc.h ++++ musepack-tools-495-fixed/mpcenc/mpcenc.h +@@ -241,8 +241,8 @@ + + float ISNR_Schaetzer ( const float* samples, const float comp, const int res); + float ISNR_Schaetzer_Trans ( const float* samples, const float comp, const int res); +-void QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder ); +-void QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR ); ++void QuantizeSubband ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const int maxNsOrder ); ++void QuantizeSubbandWithNoiseShaping ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const float* FIR ); + + void NoiseInjectionComp ( void ); + diff --git a/package/musl/0004-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch b/package/musl/0004-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch new file mode 100644 index 0000000000..dbfd87db76 --- /dev/null +++ b/package/musl/0004-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch @@ -0,0 +1,41 @@ +From e5adcd97b5196e29991b524237381a0202a60659 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Sun, 9 Feb 2025 10:07:19 -0500 +Subject: [PATCH] iconv: fix erroneous input validation in EUC-KR decoder + +as a result of incorrect bounds checking on the lead byte being +decoded, certain invalid inputs which should produce an encoding +error, such as "\xc8\x41", instead produced out-of-bounds loads from +the ksc table. + +in a worst case, the loaded value may not be a valid unicode scalar +value, in which case, if the output encoding was UTF-8, wctomb would +return (size_t)-1, causing an overflow in the output pointer and +remaining buffer size which could clobber memory outside of the output +buffer. + +bug report was submitted in private by Nick Wellnhofer on account of +potential security implications. + +Upstream: https://git.musl-libc.org/cgit/musl/commit/?id=e5adcd97b5196e29991b524237381a0202a60659 +Signed-off-by: Peter Korsgaard +--- + src/locale/iconv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/iconv.c b/src/locale/iconv.c +index 9605c8e9..008c93f0 100644 +--- a/src/locale/iconv.c ++++ b/src/locale/iconv.c +@@ -502,7 +502,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri + if (c >= 93 || d >= 94) { + c += (0xa1-0x81); + d += 0xa1; +- if (c >= 93 || c>=0xc6-0x81 && d>0x52) ++ if (c > 0xc6-0x81 || c==0xc6-0x81 && d>0x52) + goto ilseq; + if (d-'A'<26) d = d-'A'; + else if (d-'a'<26) d = d-'a'+26; +-- +2.39.5 + diff --git a/package/musl/0005-iconv-harden-UTF-8-output-code-path-against-input-de.patch b/package/musl/0005-iconv-harden-UTF-8-output-code-path-against-input-de.patch new file mode 100644 index 0000000000..a14041364a --- /dev/null +++ b/package/musl/0005-iconv-harden-UTF-8-output-code-path-against-input-de.patch @@ -0,0 +1,40 @@ +From c47ad25ea3b484e10326f933e927c0bc8cded3da Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Wed, 12 Feb 2025 17:06:30 -0500 +Subject: [PATCH] iconv: harden UTF-8 output code path against input decoder + bugs + +the UTF-8 output code was written assuming an invariant that iconv's +decoders only emit valid Unicode Scalar Values which wctomb can encode +successfully, thereby always returning a value between 1 and 4. + +if this invariant is not satisfied, wctomb returns (size_t)-1, and the +subsequent adjustments to the output buffer pointer and remaining +output byte count overflow, moving the output position backwards, +potentially past the beginning of the buffer, without storing any +bytes. + +Upstream: https://git.musl-libc.org/cgit/musl/commit/?id=c47ad25ea3b484e10326f933e927c0bc8cded3da +Signed-off-by: Peter Korsgaard +--- + src/locale/iconv.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/locale/iconv.c b/src/locale/iconv.c +index 008c93f0..52178950 100644 +--- a/src/locale/iconv.c ++++ b/src/locale/iconv.c +@@ -545,6 +545,10 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri + if (*outb < k) goto toobig; + memcpy(*out, tmp, k); + } else k = wctomb_utf8(*out, c); ++ /* This failure condition should be unreachable, but ++ * is included to prevent decoder bugs from translating ++ * into advancement outside the output buffer range. */ ++ if (k>4) goto ilseq; + *out += k; + *outb -= k; + break; +-- +2.39.5 + diff --git a/package/musl/0006-m68k-fix-poll.patch b/package/musl/0006-m68k-fix-poll.patch new file mode 100644 index 0000000000..cafee534e4 --- /dev/null +++ b/package/musl/0006-m68k-fix-poll.patch @@ -0,0 +1,26 @@ +From b09e3174a695d1db60b2abc442d29ed3f87f0358 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +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 +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 + diff --git a/package/musl/Config.in b/package/musl/Config.in index a6e2af054c..70475326f5 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_MUSL_ARCH_SUPPORTS default y if BR2_arm default y if BR2_armeb default y if BR2_i386 + default y if BR2_loongarch64 default y if BR2_m68k_m68k default y if BR2_microblaze default y if BR2_mips diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 783a103fcd..13a49a15eb 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -26,6 +26,10 @@ MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO MUSL_INSTALL_STAGING = YES +# 0004-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch +# 0005-iconv-harden-UTF-8-output-code-path-against-input-de.patch +MUSL_IGNORE_CVES += CVE-2025-26519 + # musl does not build with LTO, so explicitly disable it # when using a compiler that may have support for LTO ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y) diff --git a/package/mxt-app/mxt-app.hash b/package/mxt-app/mxt-app.hash index 2f5ea814d8..c808d0c35a 100644 --- a/package/mxt-app/mxt-app.hash +++ b/package/mxt-app/mxt-app.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38fdf7954d2184d122f6f1b1493fba1955c0e3c7dfd5196dbc3d536afc9c672a mxt-app-1.38.tar.gz +sha256 6676e18c4837b4adc6c4ee2287fb6a3fc7631b7454158fa04201c701493f0a41 mxt-app-1.45.tar.gz sha256 3682b125a40a4da00b6ab69bdbd38c25ed4beae69b3fe32458d2e32638477c4c LICENSE diff --git a/package/mxt-app/mxt-app.mk b/package/mxt-app/mxt-app.mk index 4921803e4c..db7e25793d 100644 --- a/package/mxt-app/mxt-app.mk +++ b/package/mxt-app/mxt-app.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXT_APP_VERSION = 1.38 +MXT_APP_VERSION = 1.45 MXT_APP_SITE = $(call github,atmel-maxtouch,mxt-app,v$(MXT_APP_VERSION)) MXT_APP_LICENSE = BSD-2-Clause MXT_APP_LICENSE_FILES = LICENSE diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 4f31eedef9..714046414a 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v8/nano-8.2.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.6.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb nano-8.2.tar.xz +sha256 f7abfbf0eed5f573ab51bd77a458f32d82f9859c55e9689f819d96fe1437a619 nano-8.6.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index a1b94c90d8..183dc07e7e 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 8 -NANO_VERSION = $(NANO_VERSION_MAJOR).2 +NANO_VERSION = $(NANO_VERSION_MAJOR).6 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ diff --git a/package/nanocom/0002-fix-build-with-gcc-14.patch b/package/nanocom/0002-fix-build-with-gcc-14.patch new file mode 100644 index 0000000000..87df33a04d --- /dev/null +++ b/package/nanocom/0002-fix-build-with-gcc-14.patch @@ -0,0 +1,19 @@ +GCC 14 made implicit function definitions an error and the forward declaration +for display_state() was using the wrong name, causing a compilation +failure at the call site. + +Upstream: Submitted to author via email +Signed-off-by: Florian Larysch + +diff -purN old/nanocom.h new/nanocom.h +--- old/nanocom.h 2025-08-10 01:34:12.000284003 +0200 ++++ new/nanocom.h 2025-08-10 01:27:59.545821909 +0200 +@@ -56,7 +56,7 @@ void cleanup_termios(int signal); + void init_stdin(struct termios *sts); + void init_comm(); + void usage( char *str); +-void display_status(); ++void display_state(); + + + /*typedef to represent the current line state diff --git a/package/nanocom/0003-fix-build-with-gcc-15.patch b/package/nanocom/0003-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..59a2095337 --- /dev/null +++ b/package/nanocom/0003-fix-build-with-gcc-15.patch @@ -0,0 +1,19 @@ +GCC 15 switched to C23 by default, which made "void foo()" equivalent to +"void foo(void)". This causes a build error because init_comm() doesn't +actually take any arguments. + +Upstream: Submitted to author via email +Signed-off-by: Florian Larysch + +diff -purN old/nanocom.c new/nanocom.c +--- old/nanocom.c 2025-08-10 01:34:12.000284003 +0200 ++++ new/nanocom.c 2025-08-10 01:31:05.639050630 +0200 +@@ -329,7 +329,7 @@ int main(int argc, char *argv[]) { + memcpy(&pots, &pts, sizeof(pots)); + + /*setup serial port with new settings*/ +- init_comm(&pts); ++ init_comm(); + + fprintf(stderr,"Press CTRL+T for menu options"); + display_state(); diff --git a/package/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch b/package/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch new file mode 100644 index 0000000000..72f43b1f9c --- /dev/null +++ b/package/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch @@ -0,0 +1,46 @@ +From 4664b8dd3bc124c27b160720113339c1da97c2c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 17:50:51 -0700 +Subject: [PATCH] nbd-client: Fix build on musl + gcc14 + +GCC-14 has promoted incompatible-pointer-types warning into error which is +now flagged especially with when building on musl + +Fixes following error + +| ../nbd-3.26.1/nbd-client.c: In function 'openunix': +| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] +| 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { +| | ^~~~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../nbd-3.26.1/nbd-client.c:25: +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' +| 386 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj + +Upstream: https://github.com/NetworkBlockDevice/nbd/commit/4664b8dd3bc124c27b160720113339c1da97c2c4 + +Signed-off-by: Bernd Kuhls +--- + nbd-client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nbd-client.c b/nbd-client.c +index f4e120f..bc79bdf 100644 +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -342,7 +342,7 @@ int openunix(const char *path) { + return -1; + }; + +- if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { ++ if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) { + err_nonfatal("CONNECT failed"); + close(sock); + return -1; +-- +2.47.3 + diff --git a/package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch b/package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch new file mode 100644 index 0000000000..e27f8c188d --- /dev/null +++ b/package/nbd/0002-Fix-the-check-no-cases-of-enable_manpages.patch @@ -0,0 +1,56 @@ +From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001 +From: Dave Jones +Date: Thu, 14 Mar 2024 11:13:05 +0000 +Subject: [PATCH] Fix the check & no cases of enable_manpages + +Currently, running "configure --disable-manpages" while docbook2man *is* +installed results in the error "don't know what to do here" when it +should disable manpages. + +There also appears to be a missing conditional at the start of the line; +there's closing un-matched ]) at the end of the line. Still, at this +point the check can be done in pure shell; no need for AC macros. I've +also removed the confusing m4_divert_text call on the check case. Not +sure why that was there, but it appears unnecessary. + +Upstream: https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5e1b53c..0dccafd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are requested]) + AC_ARG_ENABLE([manpages], + AS_HELP_STRING([--disable-manpages], [Do not install man pages]), + [], +- [: m4_divert_text([DEFAULTS], [enable_manpages=check])] ++ [enable_manpages=check] + ) + AC_MSG_RESULT([$enable_manpages]) + +@@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno"], [ + ]) + AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [ + AC_MSG_ERROR([docbook2man not found, but is required to build manpages]) +- ], +- [test "x$DB2M" != "x"], [enable_manpages=yes], +- [AC_MSG_ERROR([don't know what to do here])]) ++ ]) ++if test "x$enable_manpages" = "xcheck"; then ++ if test "x$DB2M" = "x"; then ++ enable_manpages=no ++ else ++ enable_manpages=yes ++ fi ++fi + AC_MSG_CHECKING([whether to build manpages]) + AC_MSG_RESULT([$enable_manpages]) + +-- +2.47.3 + diff --git a/package/nbd/0003-fix-generation-of-systemd-service.patch b/package/nbd/0003-fix-generation-of-systemd-service.patch new file mode 100644 index 0000000000..d001d1e36d --- /dev/null +++ b/package/nbd/0003-fix-generation-of-systemd-service.patch @@ -0,0 +1,56 @@ +From f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 4 Mar 2024 11:24:57 +0100 +Subject: [PATCH] fix generation of systemd service + +The shell template is no longer required to generate man pages, so more +it to systemd/ and ship it in tarball. + +Signed-off-by: Wouter Verhelst + +Upstream: https://github.com/NetworkBlockDevice/nbd/commit/f8d7d3dbf1ef2ef84c92fe375ebc8674a79e25c2 + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 3.26.1 tarball which does not contain man/sh.tmpl] +--- + systemd/Makefile.am | 6 +++--- + systemd/sh.tmpl | 7 +++++++ + 3 files changed, 10 insertions(+), 10 deletions(-) + delete mode 100644 man/sh.tmpl + create mode 100644 systemd/sh.tmpl + +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index f771dce..204f06f 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -5,11 +5,11 @@ + + noinst_DATA = nbd@.service + DISTCLEANFILES = nbd@.service +-EXTRA_DIST=nbd@.service.tmpl ++EXTRA_DIST=nbd@.service.tmpl sh.tmpl + + nbd@.service: nbd@.service.sh + sh nbd@.service.sh > nbd@.service + +-nbd@.service.sh.in: nbd@.service.tmpl ../man/sh.tmpl +- cat ../man/sh.tmpl nbd@.service.tmpl > nbd@.service.sh.in ++nbd@.service.sh.in: nbd@.service.tmpl sh.tmpl ++ cat sh.tmpl nbd@.service.tmpl > nbd@.service.sh.in + echo EOF >> nbd@.service.sh.in +diff --git a/systemd/sh.tmpl b/systemd/sh.tmpl +new file mode 100644 +index 0000000..d97aa3f +--- /dev/null ++++ b/systemd/sh.tmpl +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++sysconfdir=@sysconfdir@ ++ ++cat < -Upstream: fixed in latest release, no git/svn/hg - -diff -Nur ncurses-snapshots-6_4_20230603.orig/configure ncurses-snapshots-6_4_20230603/configure ---- ncurses-snapshots-6_4_20230603.orig/configure 2023-06-04 00:07:40.000000000 +0200 -+++ ncurses-snapshots-6_4_20230603/configure 2024-08-14 20:38:03.426905460 +0200 -@@ -10411,7 +10411,7 @@ - cf_xopen_source="-D_SGI_SOURCE" - cf_XOPEN_SOURCE= - ;; --(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*) -+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) - - cf_gnu_xopen_source=$cf_XOPEN_SOURCE - diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index b82a7b29e4..7369e3cd64 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b0910671694c2c8377f579eea68477a15d67bd20ddd4b29328cfe15c62c7b3fd ncurses-6.4-20230603.tar.gz +sha256 fc3871f051e941a637488c07c81d984f731003e65c0f78353606e18296011aac ncurses-6.5-20250720.tar.gz # Locally computed -sha256 0413b2f4ea863194c174673032f0fca84f1ea1ed4eed6476baea68c075a631ce COPYING +sha256 708999f95527e1ffa670c6fce288c6c600cb477dd04afcc1171422b3dd4ee226 COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 00e1c0d424..864f62b57c 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -5,8 +5,8 @@ ################################################################################ # When there is no snapshost yet for a new version, set it to the empty string -NCURSES_VERSION_MAJOR = 6.4 -NCURSES_SNAPSHOT_DATE = 20230603 +NCURSES_VERSION_MAJOR = 6.5 +NCURSES_SNAPSHOT_DATE = 20250720 NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) @@ -118,7 +118,8 @@ NCURSES_CONF_OPTS += --enable-ext-colors NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_PC - +else +NCURSES_CONF_OPTS += --disable-widec endif # BR2_PACKAGE_NCURSES_WCHAR ifneq ($(BR2_ENABLE_DEBUG),y) diff --git a/package/neard/neard.mk b/package/neard/neard.mk index c1804c48a2..e79ed278b4 100644 --- a/package/neard/neard.mk +++ b/package/neard/neard.mk @@ -16,7 +16,7 @@ NEARD_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive NEARD_CONF_OPTS = --disable-traces # Autoreconf is missing the m4/ directory, which might actually be missing -# iff it was the first argument, but unfortunately we are overriding the +# if it was the first argument, but unfortunately we are overriding the # first include directory above. Thus we need that hook here. define NEARD_CREATE_M4 mkdir -p $(@D)/m4 diff --git a/package/net-tools/0001-CVE-2025-46836-interface.c-Stack-based-Buffer-Overfl.patch b/package/net-tools/0001-CVE-2025-46836-interface.c-Stack-based-Buffer-Overfl.patch new file mode 100644 index 0000000000..0a02785f38 --- /dev/null +++ b/package/net-tools/0001-CVE-2025-46836-interface.c-Stack-based-Buffer-Overfl.patch @@ -0,0 +1,93 @@ +From 7a8f42fb20013a1493d8cae1c43436f85e656f2d Mon Sep 17 00:00:00 2001 +From: Zephkeks +Date: Tue, 13 May 2025 11:04:17 +0200 +Subject: [PATCH] CVE-2025-46836: interface.c: Stack-based Buffer Overflow in + get_name() + +Coordinated as GHSA-pfwf-h6m3-63wf + +Upstream: https://github.com/ecki/net-tools/commit/7a8f42fb20013a1493d8cae1c43436f85e656f2d +Signed-off-by: Peter Korsgaard +--- + lib/interface.c | 63 ++++++++++++++++++++++++++++++------------------- + 1 file changed, 39 insertions(+), 24 deletions(-) + +diff --git a/lib/interface.c b/lib/interface.c +index 71d4163..a054f12 100644 +--- a/lib/interface.c ++++ b/lib/interface.c +@@ -211,32 +211,47 @@ out: + } + + static const char *get_name(char *name, const char *p) ++/* Safe version — guarantees at most IFNAMSIZ‑1 bytes are copied ++ and the destination buffer is always NUL‑terminated. */ + { +- while (isspace(*p)) +- p++; +- while (*p) { +- if (isspace(*p)) +- break; +- if (*p == ':') { /* could be an alias */ +- const char *dot = p++; +- while (*p && isdigit(*p)) p++; +- if (*p == ':') { +- /* Yes it is, backup and copy it. */ +- p = dot; +- *name++ = *p++; +- while (*p && isdigit(*p)) { +- *name++ = *p++; +- } +- } else { +- /* No, it isn't */ +- p = dot; +- } +- p++; +- break; +- } +- *name++ = *p++; ++ char *dst = name; /* current write ptr */ ++ const char *end = name + IFNAMSIZ - 1; /* last byte we may write */ ++ ++ /* Skip leading white‑space. */ ++ while (isspace((unsigned char)*p)) ++ ++p; ++ ++ /* Copy until white‑space, end of string, or buffer full. */ ++ while (*p && !isspace((unsigned char)*p) && dst < end) { ++ if (*p == ':') { /* possible alias veth0:123: */ ++ const char *dot = p; /* remember the colon */ ++ ++p; ++ while (*p && isdigit((unsigned char)*p)) ++ ++p; ++ ++ if (*p == ':') { /* confirmed alias */ ++ p = dot; /* rewind and copy it all */ ++ ++ /* copy the colon */ ++ if (dst < end) ++ *dst++ = *p++; ++ ++ /* copy the digits */ ++ while (*p && isdigit((unsigned char)*p) && dst < end) ++ *dst++ = *p++; ++ ++ if (*p == ':') /* consume trailing colon */ ++ ++p; ++ } else { /* if so treat as normal */ ++ p = dot; ++ } ++ break; /* interface name ends here */ ++ } ++ ++ *dst++ = *p++; /* ordinary character copy */ + } +- *name++ = '\0'; ++ ++ *dst = '\0'; /* always NUL‑terminate */ + return p; + } + +-- +2.39.5 + diff --git a/package/net-tools/0002-CVE-2025-46836-interface-statistic-regression.patch b/package/net-tools/0002-CVE-2025-46836-interface-statistic-regression.patch new file mode 100644 index 0000000000..60cae48aef --- /dev/null +++ b/package/net-tools/0002-CVE-2025-46836-interface-statistic-regression.patch @@ -0,0 +1,30 @@ +From ddb0e375fb9ca95bb69335540b85bbdaa2714348 Mon Sep 17 00:00:00 2001 +From: Bernd Eckenfels +Date: Sat, 17 May 2025 21:53:23 +0200 +Subject: [PATCH] Interface statistic regression after 7a8f42fb2 + +CVE: CVE-2025-46836 +Upstream: https://sourceforge.net/p/net-tools/code/ci/ddb0e375fb9ca95bb69335540b85bbdaa2714348/ +Signed-off-by: Thomas Perale +--- + lib/interface.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/interface.c b/lib/interface.c +index a054f12..ca4adf1 100644 +--- a/lib/interface.c ++++ b/lib/interface.c +@@ -239,12 +239,11 @@ static const char *get_name(char *name, const char *p) + /* copy the digits */ + while (*p && isdigit((unsigned char)*p) && dst < end) + *dst++ = *p++; +- +- if (*p == ':') /* consume trailing colon */ +- ++p; + } else { /* if so treat as normal */ + p = dot; + } ++ if (*p == ':') /* consume trailing colon */ ++ ++p; + break; /* interface name ends here */ + } diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 03e1c73406..344abee8b3 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -12,6 +12,10 @@ NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING NET_TOOLS_CPE_ID_VALID = YES +# 0001-CVE-2025-46836-interface.c-Stack-based-Buffer-Overfl.patch +# 0002-CVE-2025-46836-interface-statistic-regression.patch +NET_TOOLS_IGNORE_CVES += CVE-2025-46836 + define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) endef @@ -38,10 +42,16 @@ endef # ifconfig & route reside in /sbin for busybox, so ensure we don't end # up with two versions of those. -define NET_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +ifeq ($(BR2_ROOTFS_MERGED_BIN),) +define NET_TOOLS_INSTALL_MV_BINS mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig mv -f $(TARGET_DIR)/bin/route $(TARGET_DIR)/sbin/route endef +endif + +define NET_TOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(NET_TOOLS_INSTALL_MV_BINS) +endef $(eval $(generic-package)) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 9ab5d604a8..285484ed2c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ -md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz -sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.19/ +md5 4861f0c2450ac7a6094e51090e6fdc75 netatalk-3.1.19.tar.xz +sha1 16900b3b14da9c2f40e1267ecb3e68021cc794b0 netatalk-3.1.19.tar.xz # Locally computed -sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz +sha256 433fa87ac23bc18a9acb0769b4f7f4047eeb14e02e0607ecd3a051c31859164f netatalk-3.1.19.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 53cd53876a..b6f9c3fa59 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.18 +NETATALK_VERSION = 3.1.19 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config diff --git a/package/netavark/Config.in b/package/netavark/Config.in new file mode 100644 index 0000000000..c78e57556f --- /dev/null +++ b/package/netavark/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_NETAVARK + bool "netavark" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_AARDVARK_DNS # runtime + select BR2_PACKAGE_IPTABLES if !BR2_PACKAGE_NFTABLES # runtime + select BR2_PACKAGE_NFTABLES_JSON if BR2_PACKAGE_NFTABLES && !BR2_PACKAGE_IPTABLES + help + Netavark is a rust based network stack for containers. It + is being designed to work with Podman but is also applicable + for other OCI container management applications. + + https://github.com/containers/netavark diff --git a/package/netavark/netavark.hash b/package/netavark/netavark.hash new file mode 100644 index 0000000000..79fcb2eab1 --- /dev/null +++ b/package/netavark/netavark.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4c696e3e61b425270762f8d9d97705358de15de80e06fac7142cf65011d1dc0c netavark-v1.17.0-git4-cargo4.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/netavark/netavark.mk b/package/netavark/netavark.mk new file mode 100644 index 0000000000..d47cee0fe1 --- /dev/null +++ b/package/netavark/netavark.mk @@ -0,0 +1,93 @@ +################################################################################ +# +# netavark +# +################################################################################ + +# When updating the version here, also update aardvark-dns in lockstep +NETAVARK_VERSION = v1.17.0 +NETAVARK_SITE = https://github.com/containers/netavark +NETAVARK_SITE_METHOD = git + +NETAVARK_LICENSE = Apache-2.0 +NETAVARK_LICENSE_FILES = LICENSE + +# For protoc +NETAVARK_DEPENDENCIES = host-protobuf + +NETAVARK_CARGO_ENV = PROTOC=$(HOST_DIR)/bin/protoc + +# In case only nftables is enabled, use that as the firwewall backend +ifeq ($(BR2_PACKAGE_IPTABLES).$(BR2_PACKAGE_NFTABLES),.y) +define NETAVARK_CONFIG_NFTABLES + $(Q)mkdir -p $(TARGET_DIR)/etc/containers/containers.conf.d/ + printf '[network]\nfirewall_driver = "nftables"\n' \ + > $(TARGET_DIR)/etc/containers/containers.conf.d/50-buildroot-nftables.conf +endef +NETAVARK_POST_INSTALL_TARGET_HOOKS += NETAVARK_CONFIG_NFTABLES + +# See https://github.com/containers/netavark/issues/1057#issuecomment-2286149984 +define NETAVARK_LINUX_CONFIG_FIXUPS_NFTABLES + $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_NUMGEN) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_CT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FLOW_OFFLOAD) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_CONNLIMIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_LOG) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_LIMIT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_MASQ) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REDIR) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_TUNNEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_QUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_QUOTA) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_COMPAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_HASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_XFRM) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_SOCKET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_TPROXY) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_SYNPROXY) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_DUP_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FWD_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_NETDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_DUP_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_COMPAT_ARP) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_REJECT_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_DUP_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_FIB_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_BRIDGE_META) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_BRIDGE_REJECT) +endef +endif + +define NETAVARK_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_COMMENT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MARK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) + $(NETAVARK_LINUX_CONFIG_FIXUPS_NFTABLES) +endef + +$(eval $(cargo-package)) diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash index e55dea53e7..24ea97b11c 100644 --- a/package/netcat-openbsd/netcat-openbsd.hash +++ b/package/netcat-openbsd/netcat-openbsd.hash @@ -1,6 +1,6 @@ -# From http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd/netcat-openbsd_1.218-3.dsc -sha256 a28a5d39abaf481747b1e78b4b50e96d0cdab0ffef289cba156dc11941c64857 netcat-openbsd_1.218.orig.tar.gz -sha256 19229ebc825d12cd805843228c498cc881dcef127a9d680fcfbd8cb2da966161 netcat-openbsd_1.218-3.debian.tar.xz +# From https://snapshot.debian.org/archive/debian/20251023T202923Z/pool/main/n/netcat-openbsd/netcat-openbsd_1.234-1.dsc +sha256 121c18d9441ec42b92a9b566468a596bbcf673894db8b12d892947552a8e3bbe netcat-openbsd_1.234.orig.tar.gz +sha256 008892553774e23a62f4088cdcbd4428f7b764a6cdadfcb35d1793224a697996 netcat-openbsd_1.234-1.debian.tar.xz # Hash for license file -sha256 acfd1d822ee2e8e0b196c7a369383d0cb9bc131b56c3c95976a32498728fe1e3 netcat.c +sha256 01754270c331f18613f3d0ee960d4f900ee20a82fad1b0b39f0ed34a3863a78d netcat.c diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index 311f8aa819..a8fff935ce 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -4,10 +4,10 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = 1.218 +NETCAT_OPENBSD_VERSION = 1.234 NETCAT_OPENBSD_SOURCE = netcat-openbsd_$(NETCAT_OPENBSD_VERSION).orig.tar.gz -NETCAT_OPENBSD_PATCH = netcat-openbsd_$(NETCAT_OPENBSD_VERSION)-3.debian.tar.xz -NETCAT_OPENBSD_SITE = http://snapshot.debian.org/archive/debian/20211206T030211Z/pool/main/n/netcat-openbsd +NETCAT_OPENBSD_PATCH = netcat-openbsd_$(NETCAT_OPENBSD_VERSION)-1.debian.tar.xz +NETCAT_OPENBSD_SITE = https://snapshot.debian.org/archive/debian/20251023T202923Z/pool/main/n/netcat-openbsd NETCAT_OPENBSD_LICENSE = BSD-3-Clause NETCAT_OPENBSD_LICENSE_FILES = netcat.c NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd diff --git a/package/netdata/0001-libjudy-remove-JudyLTablesGen.patch b/package/netdata/0001-libjudy-remove-JudyLTablesGen.patch new file mode 100644 index 0000000000..b04f61721a --- /dev/null +++ b/package/netdata/0001-libjudy-remove-JudyLTablesGen.patch @@ -0,0 +1,707 @@ +From 4241f557597013dcdf959b688730888b4370660c Mon Sep 17 00:00:00 2001 +From: mochaaP +Date: Sat, 29 Apr 2023 14:52:02 +0800 +Subject: [PATCH] libjudy: remove JudyLTablesGen + +JudyLTablesGen could be replaced with a pregenerated file +with 32-bit / 64-bit specific macros. Fixes #14185 + +Upstream: https://github.com/netdata/netdata/pull/14984 + +[Titouan: adapt to netdata v1.37.1] +Signed-off-by: Titouan Christophe +--- + Makefile.am | 17 +- + libnetdata/libjudy/src/JudyL/JudyLTables.c | 338 ++++++++++++++++++ + libnetdata/libjudy/src/JudyL/JudyLTablesGen.c | 296 --------------- + 3 files changed, 339 insertions(+), 312 deletions(-) + create mode 100644 libnetdata/libjudy/src/JudyL/JudyLTables.c + delete mode 100644 libnetdata/libjudy/src/JudyL/JudyLTablesGen.c + +diff --git a/Makefile.am b/Makefile.am +index 5e16052..750d86e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -504,15 +504,10 @@ libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \ + libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \ + libnetdata/libjudy/src/JudyL/JudyLPrev.c \ + libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \ ++ libnetdata/libjudy/src/JudyL/JudyLTables.c \ + libnetdata/libjudy/src/JudyHS/JudyHS.c \ + $(NULL) + +-nodist_libjudy_a_SOURCES = JudyLTables.c +- +-BUILT_SOURCES += JudyLTables.c +- +-CLEANFILES += JudyLTables.c +- + libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough + + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV +@@ -522,16 +517,6 @@ libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJU + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS += -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB + libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS += -DJUDYGETINLINE + +-noinst_PROGRAMS = judyltablesgen +- +-judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c +-judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough +- +-$(builddir)/judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security +- +-JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $(builddir)/judyltablesgen$(EXEEXT) +- $(builddir)/judyltablesgen$(EXEEXT) +- + libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL + + if ENABLE_DBENGINE +diff --git a/libnetdata/libjudy/src/JudyL/JudyLTables.c b/libnetdata/libjudy/src/JudyL/JudyLTables.c +new file mode 100644 +index 0000000..21c9749 +--- /dev/null ++++ b/libnetdata/libjudy/src/JudyL/JudyLTables.c +@@ -0,0 +1,338 @@ ++// @(#) From generation tool: $Revision: 4.37 $ $Source: /judy/src/JudyCommon/JudyTables.c $ ++// Pregenerated and modified by hand. Do not overwrite! ++ ++#include "JudyL.h" ++// Leave the malloc() sizes readable in the binary (via strings(1)): ++#ifdef JU_64BIT ++const char * JudyLMallocSizes = "JudyLMallocSizes = 3, 5, 7, 11, 15, 23, 32, 47, 64, Leaf1 = 13"; ++#else // JU_32BIT ++const char * JudyLMallocSizes = "JudyLMallocSizes = 3, 5, 7, 11, 15, 23, 32, 47, 64, Leaf1 = 25"; ++#endif // JU_64BIT ++ ++#ifdef JU_64BIT ++// object uses 64 words ++// cJU_BITSPERSUBEXPB = 32 ++const uint8_t ++j__L_BranchBJPPopToWords[cJU_BITSPERSUBEXPB + 1] = ++{ ++ 0, ++ 3, 5, 7, 11, 11, 15, 15, 23, ++ 23, 23, 23, 32, 32, 32, 32, 32, ++ 47, 47, 47, 47, 47, 47, 47, 64, ++ 64, 64, 64, 64, 64, 64, 64, 64 ++}; ++ ++// object uses 15 words ++// cJL_LEAF1_MAXPOP1 = 13 ++const uint8_t ++j__L_Leaf1PopToWords[cJL_LEAF1_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 3, 5, 5, 7, 7, 11, 11, ++ 11, 15, 15, 15, 15 ++}; ++const uint8_t ++j__L_Leaf1Offset[cJL_LEAF1_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 1, 1, 1, 1, 1, 2, 2, ++ 2, 2, 2, 2, 2 ++}; ++ ++// object uses 64 words ++// cJL_LEAF2_MAXPOP1 = 51 ++const uint8_t ++j__L_Leaf2PopToWords[cJL_LEAF2_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 3, 5, 5, 7, 11, 11, 11, ++ 15, 15, 15, 15, 23, 23, 23, 23, ++ 23, 23, 32, 32, 32, 32, 32, 32, ++ 32, 47, 47, 47, 47, 47, 47, 47, ++ 47, 47, 47, 47, 47, 64, 64, 64, ++ 64, 64, 64, 64, 64, 64, 64, 64, ++ 64, 64, 64 ++}; ++const uint8_t ++j__L_Leaf2Offset[cJL_LEAF2_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 1, 1, 1, 2, 3, 3, 3, ++ 3, 3, 3, 3, 5, 5, 5, 5, ++ 5, 5, 7, 7, 7, 7, 7, 7, ++ 7, 10, 10, 10, 10, 10, 10, 10, ++ 10, 10, 10, 10, 10, 13, 13, 13, ++ 13, 13, 13, 13, 13, 13, 13, 13, ++ 13, 13, 13 ++}; ++ ++// object uses 64 words ++// cJL_LEAF3_MAXPOP1 = 46 ++const uint8_t ++j__L_Leaf3PopToWords[cJL_LEAF3_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 3, 5, 7, 7, 11, 11, 11, ++ 15, 15, 23, 23, 23, 23, 23, 23, ++ 32, 32, 32, 32, 32, 32, 32, 47, ++ 47, 47, 47, 47, 47, 47, 47, 47, ++ 47, 47, 64, 64, 64, 64, 64, 64, ++ 64, 64, 64, 64, 64, 64 ++}; ++const uint8_t ++j__L_Leaf3Offset[cJL_LEAF3_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 1, 2, 2, 2, 3, 3, 3, ++ 4, 4, 6, 6, 6, 6, 6, 6, ++ 9, 9, 9, 9, 9, 9, 9, 13, ++ 13, 13, 13, 13, 13, 13, 13, 13, ++ 13, 13, 18, 18, 18, 18, 18, 18, ++ 18, 18, 18, 18, 18, 18 ++}; ++ ++// object uses 63 words ++// cJL_LEAF4_MAXPOP1 = 42 ++const uint8_t ++j__L_Leaf4PopToWords[cJL_LEAF4_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 3, 5, 7, 11, 11, 11, 15, ++ 15, 15, 23, 23, 23, 23, 23, 32, ++ 32, 32, 32, 32, 32, 47, 47, 47, ++ 47, 47, 47, 47, 47, 47, 47, 63, ++ 63, 63, 63, 63, 63, 63, 63, 63, ++ 63, 63 ++}; ++const uint8_t ++j__L_Leaf4Offset[cJL_LEAF4_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 1, 2, 2, 4, 4, 4, 5, ++ 5, 5, 8, 8, 8, 8, 8, 11, ++ 11, 11, 11, 11, 11, 16, 16, 16, ++ 16, 16, 16, 16, 16, 16, 16, 21, ++ 21, 21, 21, 21, 21, 21, 21, 21, ++ 21, 21 ++}; ++ ++// object uses 64 words ++// cJL_LEAF5_MAXPOP1 = 39 ++const uint8_t ++j__L_Leaf5PopToWords[cJL_LEAF5_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 5, 5, 7, 11, 11, 15, 15, ++ 15, 23, 23, 23, 23, 23, 32, 32, ++ 32, 32, 32, 47, 47, 47, 47, 47, ++ 47, 47, 47, 47, 64, 64, 64, 64, ++ 64, 64, 64, 64, 64, 64, 64 ++}; ++const uint8_t ++j__L_Leaf5Offset[cJL_LEAF5_MAXPOP1 + 1] = ++{ ++ 0, ++ 2, 2, 2, 3, 4, 4, 6, 6, ++ 6, 9, 9, 9, 9, 9, 12, 12, ++ 12, 12, 12, 18, 18, 18, 18, 18, ++ 18, 18, 18, 18, 25, 25, 25, 25, ++ 25, 25, 25, 25, 25, 25, 25 ++}; ++ ++// object uses 63 words ++// cJL_LEAF6_MAXPOP1 = 36 ++const uint8_t ++j__L_Leaf6PopToWords[cJL_LEAF6_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 5, 7, 7, 11, 11, 15, 15, ++ 23, 23, 23, 23, 23, 32, 32, 32, ++ 32, 32, 47, 47, 47, 47, 47, 47, ++ 47, 47, 63, 63, 63, 63, 63, 63, ++ 63, 63, 63, 63 ++}; ++const uint8_t ++j__L_Leaf6Offset[cJL_LEAF6_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 3, 3, 3, 5, 5, 6, 6, ++ 10, 10, 10, 10, 10, 14, 14, 14, ++ 14, 14, 20, 20, 20, 20, 20, 20, ++ 20, 20, 27, 27, 27, 27, 27, 27, ++ 27, 27, 27, 27 ++}; ++ ++// object uses 64 words ++// cJL_LEAF7_MAXPOP1 = 34 ++const uint8_t ++j__L_Leaf7PopToWords[cJL_LEAF7_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 5, 7, 11, 11, 15, 15, 15, ++ 23, 23, 23, 23, 32, 32, 32, 32, ++ 32, 47, 47, 47, 47, 47, 47, 47, ++ 47, 64, 64, 64, 64, 64, 64, 64, ++ 64, 64 ++}; ++const uint8_t ++j__L_Leaf7Offset[cJL_LEAF7_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 3, 3, 5, 5, 7, 7, 7, ++ 11, 11, 11, 11, 15, 15, 15, 15, ++ 15, 22, 22, 22, 22, 22, 22, 22, ++ 22, 30, 30, 30, 30, 30, 30, 30, ++ 30, 30 ++}; ++ ++// object uses 63 words ++// cJL_LEAFW_MAXPOP1 = 31 ++const uint8_t ++j__L_LeafWPopToWords[cJL_LEAFW_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 5, 7, 11, 11, 15, 15, 23, ++ 23, 23, 23, 32, 32, 32, 32, 47, ++ 47, 47, 47, 47, 47, 47, 47, 63, ++ 63, 63, 63, 63, 63, 63, 63 ++}; ++const uint8_t ++j__L_LeafWOffset[cJL_LEAFW_MAXPOP1 + 1] = ++{ ++ 0, ++ 2, 3, 4, 6, 6, 8, 8, 12, ++ 12, 12, 12, 16, 16, 16, 16, 24, ++ 24, 24, 24, 24, 24, 24, 24, 32, ++ 32, 32, 32, 32, 32, 32, 32 ++}; ++ ++// object uses 64 words ++// cJU_BITSPERSUBEXPL = 64 ++const uint8_t ++j__L_LeafVPopToWords[cJU_BITSPERSUBEXPL + 1] = ++{ ++ 0, ++ 3, 3, 3, 5, 5, 7, 7, 11, ++ 11, 11, 11, 15, 15, 15, 15, 23, ++ 23, 23, 23, 23, 23, 23, 23, 32, ++ 32, 32, 32, 32, 32, 32, 32, 32, ++ 47, 47, 47, 47, 47, 47, 47, 47, ++ 47, 47, 47, 47, 47, 47, 47, 64, ++ 64, 64, 64, 64, 64, 64, 64, 64, ++ 64, 64, 64, 64, 64, 64, 64, 64 ++}; ++#else // JU_32BIT ++// object uses 64 words ++// cJU_BITSPERSUBEXPB = 32 ++const uint8_t ++j__L_BranchBJPPopToWords[cJU_BITSPERSUBEXPB + 1] = ++{ ++ 0, ++ 3, 5, 7, 11, 11, 15, 15, 23, ++ 23, 23, 23, 32, 32, 32, 32, 32, ++ 47, 47, 47, 47, 47, 47, 47, 64, ++ 64, 64, 64, 64, 64, 64, 64, 64 ++}; ++ ++// object uses 32 words ++// cJL_LEAF1_MAXPOP1 = 25 ++const uint8_t ++j__L_Leaf1PopToWords[cJL_LEAF1_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 3, 5, 5, 7, 11, 11, 11, ++ 15, 15, 15, 15, 23, 23, 23, 23, ++ 23, 23, 32, 32, 32, 32, 32, 32, ++ 32 ++}; ++const uint8_t ++j__L_Leaf1Offset[cJL_LEAF1_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 1, 1, 1, 2, 3, 3, 3, ++ 3, 3, 3, 3, 5, 5, 5, 5, ++ 5, 5, 7, 7, 7, 7, 7, 7, ++ 7 ++}; ++ ++// object uses 63 words ++// cJL_LEAF2_MAXPOP1 = 42 ++const uint8_t ++j__L_Leaf2PopToWords[cJL_LEAF2_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 3, 5, 7, 11, 11, 11, 15, ++ 15, 15, 23, 23, 23, 23, 23, 32, ++ 32, 32, 32, 32, 32, 47, 47, 47, ++ 47, 47, 47, 47, 47, 47, 47, 63, ++ 63, 63, 63, 63, 63, 63, 63, 63, ++ 63, 63 ++}; ++const uint8_t ++j__L_Leaf2Offset[cJL_LEAF2_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 1, 2, 2, 4, 4, 4, 5, ++ 5, 5, 8, 8, 8, 8, 8, 11, ++ 11, 11, 11, 11, 11, 16, 16, 16, ++ 16, 16, 16, 16, 16, 16, 16, 21, ++ 21, 21, 21, 21, 21, 21, 21, 21, ++ 21, 21 ++}; ++ ++// object uses 63 words ++// cJL_LEAF3_MAXPOP1 = 36 ++const uint8_t ++j__L_Leaf3PopToWords[cJL_LEAF3_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 5, 7, 7, 11, 11, 15, 15, ++ 23, 23, 23, 23, 23, 32, 32, 32, ++ 32, 32, 47, 47, 47, 47, 47, 47, ++ 47, 47, 63, 63, 63, 63, 63, 63, ++ 63, 63, 63, 63 ++}; ++const uint8_t ++j__L_Leaf3Offset[cJL_LEAF3_MAXPOP1 + 1] = ++{ ++ 0, ++ 1, 3, 3, 3, 5, 5, 6, 6, ++ 10, 10, 10, 10, 10, 14, 14, 14, ++ 14, 14, 20, 20, 20, 20, 20, 20, ++ 20, 20, 27, 27, 27, 27, 27, 27, ++ 27, 27, 27, 27 ++}; ++ ++// object uses 63 words ++// cJL_LEAFW_MAXPOP1 = 31 ++const uint8_t ++j__L_LeafWPopToWords[cJL_LEAFW_MAXPOP1 + 1] = ++{ ++ 0, ++ 3, 5, 7, 11, 11, 15, 15, 23, ++ 23, 23, 23, 32, 32, 32, 32, 47, ++ 47, 47, 47, 47, 47, 47, 47, 63, ++ 63, 63, 63, 63, 63, 63, 63 ++}; ++const uint8_t ++j__L_LeafWOffset[cJL_LEAFW_MAXPOP1 + 1] = ++{ ++ 0, ++ 2, 3, 4, 6, 6, 8, 8, 12, ++ 12, 12, 12, 16, 16, 16, 16, 24, ++ 24, 24, 24, 24, 24, 24, 24, 32, ++ 32, 32, 32, 32, 32, 32, 32 ++}; ++ ++// object uses 32 words ++// cJU_BITSPERSUBEXPL = 32 ++const uint8_t ++j__L_LeafVPopToWords[cJU_BITSPERSUBEXPL + 1] = ++{ ++ 0, ++ 3, 3, 3, 5, 5, 7, 7, 11, ++ 11, 11, 11, 15, 15, 15, 15, 23, ++ 23, 23, 23, 23, 23, 23, 23, 32, ++ 32, 32, 32, 32, 32, 32, 32, 32 ++}; ++#endif // JU_64BIT +diff --git a/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c b/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c +deleted file mode 100644 +index cb8b13f..0000000 +--- a/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c ++++ /dev/null +@@ -1,296 +0,0 @@ +-// Copyright (C) 2000 - 2002 Hewlett-Packard Company +-// +-// This program is free software; you can redistribute it and/or modify it +-// under the term of the GNU Lesser General Public License as published by the +-// Free Software Foundation; either version 2 of the License, or (at your +-// option) any later version. +-// +-// This program is distributed in the hope that it will be useful, but WITHOUT +-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License +-// for more details. +-// +-// You should have received a copy of the GNU Lesser General Public License +-// along with this program; if not, write to the Free Software Foundation, +-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-// _________________ +- +-// @(#) $Revision: 4.37 $ $Source: /judy/src/JudyCommon/JudyTables.c $ +- +-#ifndef JU_WIN +-#include // unavailable on win_*. +-#endif +- +-#include +-#include +- +-#if (! (defined(JUDY1) || defined(JUDYL))) +-#error: One of -DJUDY1 or -DJUDYL must be specified. +-#endif +- +-#define TERMINATOR 999 // terminator for Alloc tables +- +-#define BPW sizeof(Word_t) // define bytes per word +- +-#ifdef JUDY1 +-#include "Judy1.h" +-#else +-#include "JudyL.h" +-#endif +- +-FILE *fd; +- +-// Definitions come from header files Judy1.h and JudyL.h: +- +-int AllocSizes[] = ALLOCSIZES; +- +-#define ROUNDUP(BYTES,BPW,OFFSETW) \ +- ((((BYTES) + (BPW) - 1) / (BPW)) + (OFFSETW)) +- +- +-// **************************************************************************** +-// G E N T A B L E +-// +-// Note: "const" is required for newer compilers. +- +-FUNCTION void GenTable( +- const char * TableName, // name of table string +- const char * TableSize, // dimentioned size string +- int IndexBytes, // bytes per Index +- int LeafSize, // number elements in object +- int ValueBytes, // bytes per Value +- int OffsetWords) // 1 for LEAFW +-{ +- int * PAllocSizes = AllocSizes; +- int OWord; +- int CurWord; +- int IWord; +- int ii; +- int BytesOfIndex; +- int BytesOfObject; +- int Index; +- int LastWords; +- int Words [1000] = { 0 }; +- int Offset[1000] = { 0 }; +- int MaxWords; +- +- MaxWords = ROUNDUP((IndexBytes + ValueBytes) * LeafSize, BPW, OffsetWords); +- Words[0] = 0; +- Offset[0] = 0; +- CurWord = TERMINATOR; +- +-// Walk through all number of Indexes in table: +- +- for (Index = 1; /* null */; ++Index) +- { +- +-// Calculate byte required for next size: +- +- BytesOfIndex = IndexBytes * Index; +- BytesOfObject = (IndexBytes + ValueBytes) * Index; +- +-// Round up and calculate words required for next size: +- +- OWord = ROUNDUP(BytesOfObject, BPW, OffsetWords); +- IWord = ROUNDUP(BytesOfIndex, BPW, OffsetWords); +- +-// Root-level leaves of population of 1 and 2 do not have the 1 word offset: +- +-// Save minimum value of offset: +- +- Offset[Index] = IWord; +- +-// Round up to next available size of words: +- +- while (OWord > *PAllocSizes) PAllocSizes++; +- +- if (Index == LeafSize) +- { +- CurWord = Words[Index] = OWord; +- break; +- } +-// end of available sizes ? +- +- if (*PAllocSizes == TERMINATOR) +- { +- fprintf(stderr, "BUG, in %sPopToWords, sizes not big enough for object\n", TableName); +- exit(1); +- } +- +-// Save words required and last word: +- +- if (*PAllocSizes < MaxWords) { CurWord = Words[Index] = *PAllocSizes; } +- else { CurWord = Words[Index] = MaxWords; } +- +- } // for each index +- +- LastWords = TERMINATOR; +- +-// Round up to largest size in each group of malloc sizes: +- +- for (ii = LeafSize; ii > 0; ii--) +- { +- if (LastWords > (Words[ii] - ii)) LastWords = Offset[ii]; +- else Offset[ii] = LastWords; +- } +- +-// Print the PopToWords[] table: +- +- fprintf(fd,"\n//\tobject uses %d words\n", CurWord); +- fprintf(fd,"//\t%s = %d\n", TableSize, LeafSize); +- +- fprintf(fd,"const uint8_t\n"); +- fprintf(fd,"%sPopToWords[%s + 1] =\n", TableName, TableSize); +- fprintf(fd,"{\n\t 0,"); +- +- for (ii = 1; ii <= LeafSize; ii++) +- { +- +-// 8 columns per line, starting with 1: +- +- if ((ii % 8) == 1) fprintf(fd,"\n\t"); +- +- fprintf(fd,"%2d", Words[ii]); +- +-// If not last number place comma: +- +- if (ii != LeafSize) fprintf(fd,", "); +- } +- fprintf(fd,"\n};\n"); +- +-// Print the Offset table if needed: +- +- if (! ValueBytes) return; +- +- fprintf(fd,"const uint8_t\n"); +- fprintf(fd,"%sOffset[%s + 1] =\n", TableName, TableSize); +- fprintf(fd,"{\n"); +- fprintf(fd,"\t 0,"); +- +- for (ii = 1; ii <= LeafSize; ii++) +- { +- if ((ii % 8) == 1) fprintf(fd,"\n\t"); +- +- fprintf(fd,"%2d", Offset[ii]); +- +- if (ii != LeafSize) fprintf(fd,", "); +- } +- fprintf(fd,"\n};\n"); +- +-} // GenTable() +- +- +-// **************************************************************************** +-// M A I N +- +-FUNCTION int main() +-{ +- int ii; +- +-#ifdef JUDY1 +- char *fname = "Judy1Tables.c"; +-#else +- char *fname = "JudyLTables.c"; +-#endif +- +- if ((fd = fopen(fname, "w")) == NULL){ +- perror("FATAL ERROR: could not write to Judy[1L]Tables.c file\n"); +- return (-1); +- } +- +- +- fprintf(fd,"// @(#) From generation tool: $Revision: 4.37 $ $Source: /judy/src/JudyCommon/JudyTables.c $\n"); +- fprintf(fd,"//\n\n"); +- +- +-// ================================ Judy1 ================================= +-#ifdef JUDY1 +- +- fprintf(fd,"#include \"Judy1.h\"\n"); +- +- fprintf(fd,"// Leave the malloc() sizes readable in the binary (via " +- "strings(1)):\n"); +- fprintf(fd,"const char * Judy1MallocSizes = \"Judy1MallocSizes ="); +- +- for (ii = 0; AllocSizes[ii] != TERMINATOR; ii++) +- fprintf(fd," %d,", AllocSizes[ii]); +- +-#ifndef JU_64BIT +- fprintf(fd," Leaf1 = %d\";\n\n", cJ1_LEAF1_MAXPOP1); +-#else +- fprintf(fd,"\";\n\n"); // no Leaf1 in this case. +-#endif +- +-// ================================ 32 bit ================================ +-#ifndef JU_64BIT +- +- GenTable("j__1_BranchBJP","cJU_BITSPERSUBEXPB", 8, cJU_BITSPERSUBEXPB,0,0); +- +- GenTable("j__1_Leaf1", "cJ1_LEAF1_MAXPOP1", 1, cJ1_LEAF1_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf2", "cJ1_LEAF2_MAXPOP1", 2, cJ1_LEAF2_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf3", "cJ1_LEAF3_MAXPOP1", 3, cJ1_LEAF3_MAXPOP1, 0, 0); +- GenTable("j__1_LeafW", "cJ1_LEAFW_MAXPOP1", 4, cJ1_LEAFW_MAXPOP1, 0, 1); +- +-#endif +- +-// ================================ 64 bit ================================ +-#ifdef JU_64BIT +- GenTable("j__1_BranchBJP","cJU_BITSPERSUBEXPB",16, cJU_BITSPERSUBEXPB,0,0); +- +- GenTable("j__1_Leaf2", "cJ1_LEAF2_MAXPOP1", 2, cJ1_LEAF2_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf3", "cJ1_LEAF3_MAXPOP1", 3, cJ1_LEAF3_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf4", "cJ1_LEAF4_MAXPOP1", 4, cJ1_LEAF4_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf5", "cJ1_LEAF5_MAXPOP1", 5, cJ1_LEAF5_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf6", "cJ1_LEAF6_MAXPOP1", 6, cJ1_LEAF6_MAXPOP1, 0, 0); +- GenTable("j__1_Leaf7", "cJ1_LEAF7_MAXPOP1", 7, cJ1_LEAF7_MAXPOP1, 0, 0); +- GenTable("j__1_LeafW", "cJ1_LEAFW_MAXPOP1", 8, cJ1_LEAFW_MAXPOP1, 0, 1); +-#endif +-#endif // JUDY1 +- +- +-// ================================ JudyL ================================= +-#ifdef JUDYL +- +- fprintf(fd,"#include \"JudyL.h\"\n"); +- +- fprintf(fd,"// Leave the malloc() sizes readable in the binary (via " +- "strings(1)):\n"); +- fprintf(fd,"const char * JudyLMallocSizes = \"JudyLMallocSizes ="); +- +- for (ii = 0; AllocSizes[ii] != TERMINATOR; ii++) +- fprintf(fd," %d,", AllocSizes[ii]); +- +- fprintf(fd," Leaf1 = %ld\";\n\n", (Word_t)cJL_LEAF1_MAXPOP1); +- +-#ifndef JU_64BIT +-// ================================ 32 bit ================================ +- GenTable("j__L_BranchBJP","cJU_BITSPERSUBEXPB", 8, cJU_BITSPERSUBEXPB, 0,0); +- +- GenTable("j__L_Leaf1", "cJL_LEAF1_MAXPOP1", 1, cJL_LEAF1_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf2", "cJL_LEAF2_MAXPOP1", 2, cJL_LEAF2_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf3", "cJL_LEAF3_MAXPOP1", 3, cJL_LEAF3_MAXPOP1, BPW,0); +- GenTable("j__L_LeafW", "cJL_LEAFW_MAXPOP1", 4, cJL_LEAFW_MAXPOP1, BPW,1); +- GenTable("j__L_LeafV", "cJU_BITSPERSUBEXPL", 4, cJU_BITSPERSUBEXPL, 0,0); +-#endif // 32 BIT +- +-#ifdef JU_64BIT +-// ================================ 64 bit ================================ +- GenTable("j__L_BranchBJP","cJU_BITSPERSUBEXPB",16, cJU_BITSPERSUBEXPB, 0,0); +- +- GenTable("j__L_Leaf1", "cJL_LEAF1_MAXPOP1", 1, cJL_LEAF1_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf2", "cJL_LEAF2_MAXPOP1", 2, cJL_LEAF2_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf3", "cJL_LEAF3_MAXPOP1", 3, cJL_LEAF3_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf4", "cJL_LEAF4_MAXPOP1", 4, cJL_LEAF4_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf5", "cJL_LEAF5_MAXPOP1", 5, cJL_LEAF5_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf6", "cJL_LEAF6_MAXPOP1", 6, cJL_LEAF6_MAXPOP1, BPW,0); +- GenTable("j__L_Leaf7", "cJL_LEAF7_MAXPOP1", 7, cJL_LEAF7_MAXPOP1, BPW,0); +- GenTable("j__L_LeafW", "cJL_LEAFW_MAXPOP1", 8, cJL_LEAFW_MAXPOP1, BPW,1); +- GenTable("j__L_LeafV", "cJU_BITSPERSUBEXPL", 8, cJU_BITSPERSUBEXPL, 0,0); +-#endif // 64 BIT +- +-#endif // JUDYL +- fclose(fd); +- +- return(0); +- +-} // main() +-- +2.51.0 + diff --git a/package/netdata/Config.in b/package/netdata/Config.in index d17b5e89aa..3603eb071c 100644 --- a/package/netdata/Config.in +++ b/package/netdata/Config.in @@ -23,15 +23,15 @@ config BR2_PACKAGE_NETDATA_PROMETHEUS bool "prometheus remote write backend" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_SNAPPY help Enable prometheus remote write backend -comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS endif diff --git a/package/netdata/netdata.hash b/package/netdata/netdata.hash index bc33a8b8a1..df80453f3a 100644 --- a/package/netdata/netdata.hash +++ b/package/netdata/netdata.hash @@ -1,5 +1,5 @@ -# From https://github.com/netdata/netdata/releases/download/v1.33.1/sha256sums.txt -sha256 20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b netdata-v1.33.1.tar.gz +# From https://github.com/netdata/netdata/releases/download/v1.37.1/sha256sums.txt +sha256 2caa042d43ca61007a61294a5ececa037d83a1973bd38032233760341eb1706b netdata-v1.37.1.tar.gz # Locally calculated sha256 0e5fd9d833efe9b79f784d1903281554af82d1b4261af67d35455728e5572aa6 LICENSE diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk index 4bc573df59..4bf239e1ef 100644 --- a/package/netdata/netdata.mk +++ b/package/netdata/netdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETDATA_VERSION = 1.33.1 +NETDATA_VERSION = 1.37.1 NETDATA_SOURCE = netdata-v$(NETDATA_VERSION).tar.gz NETDATA_SITE = \ https://github.com/netdata/netdata/releases/download/v$(NETDATA_VERSION) @@ -19,6 +19,9 @@ NETDATA_CONF_OPTS = \ --disable-unit-tests NETDATA_DEPENDENCIES = libuv util-linux zlib +# 0001-libjudy-remove-JudyLTablesGen.patch +NETDATA_AUTORECONF = YES + # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test # provided by autoconf relies on wchar_t. NETDATA_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 diff --git a/package/netopeer2/Config.in b/package/netopeer2/Config.in index db31a786a1..1e4248fa91 100644 --- a/package/netopeer2/Config.in +++ b/package/netopeer2/Config.in @@ -6,17 +6,15 @@ comment "netopeer2 needs a toolchain w/ gcc >= 4.8, C++, threads, dynamic librar config BR2_PACKAGE_NETOPEER2 bool "netopeer2" - depends on BR2_USE_MMU # libnetconf2, libssh, sysrepo + depends on BR2_USE_MMU # libnetconf2, sysrepo depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libyang - depends on !BR2_STATIC_LIBS # libnetconf2, libssh, libyang, sysrepo + depends on !BR2_STATIC_LIBS # libnetconf2, libyang, sysrepo depends on BR2_INSTALL_LIBSTDCPP # sysrepo depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sysrepo select BR2_PACKAGE_LIBNETCONF2 - select BR2_PACKAGE_LIBSSH - select BR2_PACKAGE_LIBSSH_SERVER # For libnetconf2 to have SSH + select BR2_PACKAGE_LIBNETCONF2_SSH_TLS select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_OPENSSL # For libnetconf2 to have TLS select BR2_PACKAGE_SYSREPO help Netopeer2 is a set of tools implementing network configuration diff --git a/package/netopeer2/S52netopeer2-server b/package/netopeer2/S52netopeer2-server new file mode 100644 index 0000000000..3fd993b578 --- /dev/null +++ b/package/netopeer2/S52netopeer2-server @@ -0,0 +1,50 @@ +#!/bin/sh + +DAEMON="netopeer2-server" +PIDFILE="/var/run/$DAEMON.pid" + +NETOPEER2_SERVER_ARGS="" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ + -- $NETOPEER2_SERVER_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + # we do not support real reload .. just restart + restart +} + +case "$1" in + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" +esac diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index 6a278fbbaf..e87aebf0bf 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz +sha256 63d42493752062e7dfb3d3aca9c4157f49298401bdc5cd5166975f2cbc5f6f1b netopeer2-2.4.5.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 47fcd31acd..543dfdfa33 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.49 +NETOPEER2_VERSION = 2.4.5 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause @@ -29,8 +29,8 @@ NETOPEER2_MAKE_ENV = \ SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) define NETOPEER2_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/netopeer2/S52netopeer2 \ - $(TARGET_DIR)/etc/init.d/S52netopeer2 + $(INSTALL) -m 755 -D $(NETOPEER2_PKGDIR)/S52netopeer2-server \ + $(TARGET_DIR)/etc/init.d/S52netopeer2-server endef # The host sysrepo used to install the netopeer2 modules will leave diff --git a/package/netsniff-ng/netsniff-ng.hash b/package/netsniff-ng/netsniff-ng.hash index 40b015cb0d..e63963c6d7 100644 --- a/package/netsniff-ng/netsniff-ng.hash +++ b/package/netsniff-ng/netsniff-ng.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -sha256 77d17d4158faf1d93c7d922a1bd7f093a8b437bd658292c830708540e10894ba netsniff-ng-0.6.8.tar.xz +sha256 027840fa3c4e11abfe4fd0fffe9909c5c4ed1428d4b9397fb6d2f5ea69325918 netsniff-ng-0.6.9.tar.xz # Locally computed sha256 b353349ba51e0d4b59cf2f188f0c285296e154ce8c58954bc5e0dc0282a4db2d README sha256 8f6d85366f3763557d6ddd0637988b9ba11edef354e3c9302fff4262a235c387 COPYING diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index 2b5b19b27f..5e779f1cfb 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNIFF_NG_VERSION = 0.6.8 +NETSNIFF_NG_VERSION = 0.6.9 NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz NETSNIFF_NG_LICENSE = GPL-2.0 diff --git a/package/netsnmp/0001-Add-Linux-6.7-compatibility-parsing-proc-net-snmp.patch b/package/netsnmp/0001-Add-Linux-6.7-compatibility-parsing-proc-net-snmp.patch new file mode 100644 index 0000000000..0c15543c0f --- /dev/null +++ b/package/netsnmp/0001-Add-Linux-6.7-compatibility-parsing-proc-net-snmp.patch @@ -0,0 +1,125 @@ +From 8350fd9e9c8bd97f587809265516f61aa7fe8aa0 Mon Sep 17 00:00:00 2001 +From: Philippe Troin +Date: Sat, 3 Feb 2024 10:30:30 -0800 +Subject: [PATCH] Add Linux 6.7 compatibility parsing /proc/net/snmp + +Linux 6.7 adds a new OutTransmits field to Ip in /proc/net/snmp. +This breaks the hard-coded assumptions about the Ip line length. +Add compatibility to parse Linux 6.7 Ip header while keep support +for previous versions. + +Upstream: https://github.com/net-snmp/net-snmp/commit/49d60ba57f4b462df7dc5fd5b38b4425dab0982c +Signed-off-by: Thomas Petazzoni +--- + .../ip-mib/data_access/systemstats_linux.c | 46 +++++++++++++++---- + 1 file changed, 37 insertions(+), 9 deletions(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c +index a0fbdd9ffa..8eb40742b4 100644 +--- a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c +@@ -36,7 +36,7 @@ netsnmp_access_systemstats_arch_init(void) + } + + /* +- /proc/net/snmp ++ /proc/net/snmp - Linux 6.6 and lower + + Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates + Ip: 2 64 7083534 0 0 0 0 0 6860233 6548963 0 0 1 286623 63322 1 259920 0 0 +@@ -49,6 +49,26 @@ netsnmp_access_systemstats_arch_init(void) + + Udp: InDatagrams NoPorts InErrors OutDatagrams + Udp: 1491094 122 0 1466178 ++* ++ /proc/net/snmp - Linux 6.7 and higher ++ ++ Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates OutTransmits ++ Ip: 1 64 50859058 496 0 37470604 0 0 20472980 7515791 1756 0 0 7264 3632 0 3548 0 7096 44961424 ++ ++ Icmp: InMsgs InErrors InCsumErrors InDestUnreachs InTimeExcds InParmProbs InSrcQuenchs InRedirects InEchos InEchoReps InTimestamps InTimestampReps InAddrMasks InAddrMaskReps OutMsgs OutErrors OutRateLimitGlobal OutRateLimitHost OutDestUnreachs OutTimeExcds OutParmProbs OutSrcQuenchs OutRedirects OutEchos OutEchoReps OutTimestamps OutTimestampReps OutAddrMasks OutAddrMaskReps ++ Icmp: 114447 2655 0 17589 0 0 0 0 66905 29953 0 0 0 0 143956 0 0 572 16610 484 0 0 0 59957 66905 0 0 0 0 ++ ++ IcmpMsg: InType0 InType3 InType8 OutType0 OutType3 OutType8 OutType11 ++ IcmpMsg: 29953 17589 66905 66905 16610 59957 484 ++ ++ Tcp: RtoAlgorithm RtoMin RtoMax MaxConn ActiveOpens PassiveOpens AttemptFails EstabResets CurrEstab InSegs OutSegs RetransSegs InErrs OutRsts InCsumErrors ++ Tcp: 1 200 120000 -1 17744 13525 307 3783 6 18093137 9277788 3499 8 7442 0 ++ ++ Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors ++ Udp: 2257832 1422 0 2252835 0 0 0 84 0 ++ ++ UdpLite: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors ++ UdpLite: 0 0 0 0 0 0 0 0 0 + */ + + +@@ -101,10 +121,10 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + FILE *devin; + char line[1024]; + netsnmp_systemstats_entry *entry = NULL; +- int scan_count; ++ int scan_count, expected_scan_count; + char *stats, *start = line; + int len; +- unsigned long long scan_vals[19]; ++ unsigned long long scan_vals[20]; + + DEBUGMSGTL(("access:systemstats:container:arch", "load v4 (flags %x)\n", + load_flags)); +@@ -126,10 +146,17 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + */ + NETSNMP_IGNORE_RESULT(fgets(line, sizeof(line), devin)); + len = strlen(line); +- if (224 != len) { ++ switch (len) { ++ case 224: ++ expected_scan_count = 19; ++ break; ++ case 237: ++ expected_scan_count = 20; ++ break; ++ default: + fclose(devin); + snmp_log(LOG_ERR, "systemstats_linux: unexpected header length in /proc/net/snmp." +- " %d != 224\n", len); ++ " %d not in { 224, 237 } \n", len); + return -4; + } + +@@ -178,20 +205,20 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + memset(scan_vals, 0x0, sizeof(scan_vals)); + scan_count = sscanf(stats, + "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu" +- "%llu %llu %llu %llu %llu %llu %llu %llu %llu", ++ "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu", + &scan_vals[0],&scan_vals[1],&scan_vals[2], + &scan_vals[3],&scan_vals[4],&scan_vals[5], + &scan_vals[6],&scan_vals[7],&scan_vals[8], + &scan_vals[9],&scan_vals[10],&scan_vals[11], + &scan_vals[12],&scan_vals[13],&scan_vals[14], + &scan_vals[15],&scan_vals[16],&scan_vals[17], +- &scan_vals[18]); ++ &scan_vals[18],&scan_vals[19]); + DEBUGMSGTL(("access:systemstats", " read %d values\n", scan_count)); + +- if(scan_count != 19) { ++ if(scan_count != expected_scan_count) { + snmp_log(LOG_ERR, + "error scanning systemstats data (expected %d, got %d)\n", +- 19, scan_count); ++ expected_scan_count, scan_count); + netsnmp_access_systemstats_entry_free(entry); + return -4; + } +@@ -223,6 +250,7 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + entry->stats.HCOutFragFails.high = scan_vals[17] >> 32; + entry->stats.HCOutFragCreates.low = scan_vals[18] & 0xffffffff; + entry->stats.HCOutFragCreates.high = scan_vals[18] >> 32; ++ /* entry->stats. = scan_vals[19]; / * OutTransmits */ + + entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCINRECEIVES] = 1; + entry->stats.columnAvail[IPSYSTEMSTATSTABLE_INHDRERRORS] = 1; +-- +2.49.0 + diff --git a/package/netsnmp/0002-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch b/package/netsnmp/0002-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch new file mode 100644 index 0000000000..cc45957c59 --- /dev/null +++ b/package/netsnmp/0002-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch @@ -0,0 +1,39 @@ +From af1b7f77975bbb2fcbdb3f005f8cb010d1d33cd3 Mon Sep 17 00:00:00 2001 +From: Adam Gajda +Date: Mon, 2 Oct 2023 16:40:31 +0200 +Subject: [PATCH] Fix configuration of NETSNMP_FD_MASK_TYPE + +Upstream: https://github.com/net-snmp/net-snmp/commit/af1b7f77975bbb2fcbdb3f005f8cb010d1d33cd3 + +Signed-off-by: Bernd Kuhls +--- + configure | 2 +- + configure.d/config_project_types | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 50522690f5..5512349926 100755 +--- a/configure ++++ b/configure +@@ -31577,7 +31577,7 @@ CFLAGS="$CFLAGS -Werror" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5 + printf %s "checking for the type of fd_set::fds_bits... " >&6; } +-for type in __fd_mask __int32_t unknown; do ++for type in __fd_mask __int32_t long\ int unknown; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +diff --git a/configure.d/config_project_types b/configure.d/config_project_types +index 1b4c66b95e..a78e8ebb06 100644 +--- a/configure.d/config_project_types ++++ b/configure.d/config_project_types +@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror" + + AC_MSG_CHECKING([for the type of fd_set::fds_bits]) +-for type in __fd_mask __int32_t unknown; do ++for type in __fd_mask __int32_t long\ int unknown; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + #include + #include diff --git a/package/netsnmp/0003-Android-Fix-the-build.patch b/package/netsnmp/0003-Android-Fix-the-build.patch new file mode 100644 index 0000000000..5cf37a0cb6 --- /dev/null +++ b/package/netsnmp/0003-Android-Fix-the-build.patch @@ -0,0 +1,81 @@ +From b4598662a39ff6974119c900ea56a4d020eac366 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Wed, 20 Dec 2023 13:08:06 -0800 +Subject: [PATCH] Android: Fix the build + +Include for the fd_set type. In the configure script, +check whether 'unsigned long' is the underlying type of fd_set. Use +u_long instead of ulong. + +Upstream: https://github.com/net-snmp/net-snmp/commit/b4598662a39ff6974119c900ea56a4d020eac366 + +Signed-off-by: Bernd Kuhls +--- + agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 4 ++-- + configure | 2 +- + configure.d/config_project_types | 2 +- + include/net-snmp/types.h | 3 +++ + 4 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +index b38beb57dd..232202d0f9 100644 +--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +@@ -50,7 +50,7 @@ int _load_v6(netsnmp_container *container, int idx_offset); + int + netsnmp_access_ipaddress_extra_prefix_info(int index, + u_long *preferedlt, +- ulong *validlt, ++ u_long *validlt, + char *addr); + #endif + +@@ -523,7 +523,7 @@ netsnmp_access_other_info_get(int index, int family) + + int + netsnmp_access_ipaddress_extra_prefix_info(int index, u_long *preferedlt, +- ulong *validlt, char *addr) ++ u_long *validlt, char *addr) + { + + struct { +diff --git a/configure b/configure +index e7bf859bba..48abcbab11 100755 +--- a/configure ++++ b/configure +@@ -31577,7 +31577,7 @@ CFLAGS="$CFLAGS -Werror" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5 + printf %s "checking for the type of fd_set::fds_bits... " >&6; } +-for type in __fd_mask __int32_t long\ int unknown; do ++for type in __fd_mask __int32_t long 'unsigned long' unknown; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +diff --git a/configure.d/config_project_types b/configure.d/config_project_types +index a78e8ebb06..ac958d6712 100644 +--- a/configure.d/config_project_types ++++ b/configure.d/config_project_types +@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror" + + AC_MSG_CHECKING([for the type of fd_set::fds_bits]) +-for type in __fd_mask __int32_t long\ int unknown; do ++for type in __fd_mask __int32_t long 'unsigned long' unknown; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + #include + #include +diff --git a/include/net-snmp/types.h b/include/net-snmp/types.h +index b78f53ffd7..6228170e5f 100644 +--- a/include/net-snmp/types.h ++++ b/include/net-snmp/types.h +@@ -23,6 +23,9 @@ + #endif + + #include ++#ifdef __ANDROID__ ++#include ++#endif + + #if defined(WIN32) && !defined(cygwin) + typedef HANDLE netsnmp_pid_t; diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index e1e9d10898..7898941271 100644 --- a/package/netsnmp/netsnmp.hash +++ b/package/netsnmp/netsnmp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature at -# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz.asc -# using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 -sha256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a net-snmp-5.9.3.tar.gz +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.4/net-snmp-5.9.4.tar.gz.asc +# using key 6E6718AEF1EB5C65C32D1B2A356BC0B552D53CAB +sha256 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 net-snmp-5.9.4.tar.gz # Hash for license file sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 6575ff1afa..a79c13c611 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,17 +4,13 @@ # ################################################################################ -NETSNMP_VERSION = 5.9.3 +NETSNMP_VERSION = 5.9.4 NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING NETSNMP_CPE_ID_VENDOR = net-snmp NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) -# 0001-snmp_agent-disallow-SET-with-NULL-varbind.patch -NETSNMP_IGNORE_CVES = \ - CVE-2022-44792 \ - CVE-2022-44793 NETSNMP_SELINUX_MODULES = snmp NETSNMP_INSTALL_STAGING = YES NETSNMP_CONF_ENV = \ diff --git a/package/netstat-nat/Config.in b/package/netstat-nat/Config.in deleted file mode 100644 index 6afcf89e3b..0000000000 --- a/package/netstat-nat/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_NETSTAT_NAT - bool "netstat-nat" - help - Displays NAT connections - - http://tweegy.nl/projects/netstat-nat/ diff --git a/package/netstat-nat/netstat-nat.hash b/package/netstat-nat/netstat-nat.hash deleted file mode 100644 index 7530b8a09f..0000000000 --- a/package/netstat-nat/netstat-nat.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca netstat-nat-1.4.10.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk deleted file mode 100644 index 0d16579a6a..0000000000 --- a/package/netstat-nat/netstat-nat.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# netstat-nat -# -################################################################################ - -NETSTAT_NAT_VERSION = 1.4.10 -NETSTAT_NAT_SITE = http://tweegy.nl/download -NETSTAT_NAT_LICENSE = GPL-2.0+ -NETSTAT_NAT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 394befcf28..dd37d876f6 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -40,12 +40,6 @@ config BR2_PACKAGE_NETSURF_SDL help Select SDL 1.2 frontend. -config BR2_PACKAGE_NETSURF_GTK - bool "gtk2 frontend" - depends on BR2_PACKAGE_LIBGTK2 - help - Select GTK+ 2 frontend. - config BR2_PACKAGE_NETSURF_GTK3 bool "gtk3 frontend" depends on BR2_PACKAGE_LIBGTK3 diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 574c1423df..383cd8ab9d 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -25,17 +25,10 @@ define NETSURF_DUKTAPE_CONFIGURE_CMDS endef endif -ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) -NETSURF_DEPENDENCIES += libgtk2 -NETSURF_FRONTEND = gtk2 -endif - ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y) NETSURF_DEPENDENCIES += libgtk3 NETSURF_FRONTEND = gtk3 -endif -ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y) ifeq ($(BR2_PACKAGE_LIBRSVG),y) NETSURF_DEPENDENCIES += librsvg define NETSURF_SVG_CONFIGURE_CMDS diff --git a/package/nettle/nettle.hash b/package/nettle/nettle.hash index 5b11cd0daf..b9b998f356 100644 --- a/package/nettle/nettle.hash +++ b/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.10.tar.gz.sig -sha256 b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c nettle-3.10.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.10.2.tar.gz.sig +sha256 fe9ff51cb1f2abb5e65a6b8c10a92da0ab5ab6eaf26e7fc2b675c45f1fb519b5 nettle-3.10.2.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 22a41ba55b..93c638a4cd 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETTLE_VERSION = 3.10 -NETTLE_SITE = https://ftp.gnu.org/gnu/nettle +NETTLE_VERSION = 3.10.2 +NETTLE_SITE = $(BR2_GNU_MIRROR)/nettle NETTLE_DEPENDENCIES = host-m4 gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 1d9a02c1d3..b388c573fe 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -4,7 +4,8 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_USE_MMU # dbus depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + # We need NETLINK_GET_STRICT_CHK + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 @@ -22,7 +23,7 @@ config BR2_PACKAGE_NETWORK_MANAGER configured and joined once, it can be detected and re-joined automatically the next time it's available. - http://projects.gnome.org/NetworkManager/ + https://networkmanager.dev/ if BR2_PACKAGE_NETWORK_MANAGER @@ -59,10 +60,10 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS This option enables support for OpenVSwitch endif -comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" +comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 5.4, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 9fe9ce4e8b..780d1205cb 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.48/NetworkManager-1.48.8.sha256sum -sha256 5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613 NetworkManager-1.48.10.tar.xz +# From https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.52.1/downloads/NetworkManager-1.52.1.tar.xz.sha256sum +sha256 8b122c73493a72f2bae527c125cebd87711671b90352dbe2b1788aba9575ac6f NetworkManager-1.52.1.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 8349b6c79b..1bec053c54 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,10 +4,10 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.48 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.52 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).1 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz -NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) +NETWORK_MANAGER_SITE = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/$(NETWORK_MANAGER_VERSION)/downloads NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL @@ -26,11 +26,11 @@ NETWORK_MANAGER_DEPENDENCIES = \ util-linux NETWORK_MANAGER_CONF_OPTS = \ - -Dintrospection=false \ -Ddocs=false \ -Dtests=no \ -Dqt=false \ -Diptables=/usr/sbin/iptables \ + -Dip6tables=/usr/sbin/ip6tables \ -Difupdown=false \ -Dnm_cloud_setup=false \ -Dsession_tracking_consolekit=false @@ -50,6 +50,12 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y) NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +NETWORK_MANAGER_CONF_OPTS += -Dintrospection=true +else +NETWORK_MANAGER_CONF_OPTS += -Dintrospection=false +endif + ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_CONF_OPTS += -Diwd=true @@ -125,6 +131,10 @@ else NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif +ifeq ($(BR2_PACKAGE_NFTABLES),y) +NETWORK_MANAGER_CONF_OPTS += -Dnft=/usr/sbin/nft +endif + ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono NETWORK_MANAGER_CONF_OPTS += -Dofono=true diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash index 827925373e..b22602033c 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.hash +++ b/package/newlib-bare-metal/newlib-bare-metal.hash @@ -1,8 +1,8 @@ # Locally calculated -sha256 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 newlib-4.4.0.20231231.tar.gz +sha256 33f12605e0054965996c25c1382b3e463b0af91799001f5bb8c0630f2ec8c852 newlib-4.5.0.20241231.tar.gz # Hashes for license files locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB -sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS -sha256 9a59b4ee3af067045fe0ea78786201c42d54756fe48cbccf44f3dfc398474717 COPYING.NEWLIB +sha256 bdaffd5fff30cb5fc7a239a4fa0b95f703590f7b3813ca7f4e76ff46437aeb81 COPYING.LIBGLOSS +sha256 fcfb5ec69b6ab52676dcc4dab7cf4338c8000ef97812dadd35b8592a640a8419 COPYING.NEWLIB diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index 89092eb973..f1e54d6f9e 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEWLIB_BARE_METAL_VERSION = 4.4.0.20231231 +NEWLIB_BARE_METAL_VERSION = 4.5.0.20241231 NEWLIB_BARE_METAL_SITE = https://sourceware.org/ftp/newlib NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).tar.gz NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal @@ -22,35 +22,55 @@ NEWLIB_BARE_METAL_INSTALL_STAGING = YES NEWLIB_BARE_METAL_INSTALL_TARGET = NO NEWLIB_BARE_METAL_MAKE_OPTS = MAKEINFO=true +ifeq ($(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_MULTILIB),y) +NEWLIB_BARE_METAL_MULTILIB = "--enable-multilib" +else +NEWLIB_BARE_METAL_MULTILIB = "--disable-multilib" +endif + +NEWLIB_BARE_METAL_CONF_OPTS = \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --program-prefix="" \ + $(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ + $(QUIET) \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ + $(NEWLIB_BARE_METAL_MULTILIB) \ + --with-tooldir=/usr + define NEWLIB_BARE_METAL_CONFIGURE_CMDS - (cd $(@D) && \ + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + mkdir -p $(@D)/build-$(arch_tuple) && \ + cd $(@D)/build-$(arch_tuple) && \ PATH=$(BR_PATH) \ - ./configure \ - --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ - --prefix=/usr \ - --enable-newlib-io-c99-formats \ - --enable-newlib-io-long-long \ - --enable-newlib-io-float \ - --enable-newlib-io-long-double \ - --disable-multilib \ + CONFIG_SITE=/dev/null \ + $(@D)/configure \ + $(NEWLIB_BARE_METAL_CONF_OPTS) \ + --target=$(arch_tuple) ) endef define NEWLIB_BARE_METAL_BUILD_CMDS - PATH=$(BR_PATH) $(MAKE1) $(NEWLIB_BARE_METAL_MAKE_OPTS) -C $(@D) + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + PATH=$(BR_PATH) $(MAKE1) \ + $(NEWLIB_BARE_METAL_MAKE_OPTS) \ + -C $(@D)/build-$(arch_tuple) + ) endef define NEWLIB_BARE_METAL_INSTALL_STAGING_CMDS - PATH=$(BR_PATH) $(MAKE1) -C $(@D) $(NEWLIB_BARE_METAL_MAKE_OPTS) \ - DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install + $(foreach arch_tuple, $(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE), \ + PATH=$(BR_PATH) $(MAKE1) \ + $(NEWLIB_BARE_METAL_MAKE_OPTS) \ + -C $(@D)/build-$(arch_tuple) \ + DESTDIR=$(HOST_DIR)/$(arch_tuple)/sysroot install + ) endef -define NEWLIB_BARE_METAL_FIXUP - mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \ - $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include - mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \ - $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib -endef -NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP - $(eval $(generic-package)) diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 9d74991df1..fb5c03d917 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.4/sha256sums.asc -sha256 01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d nfs-utils-2.6.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.4/sha256sums.asc +sha256 11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5 nfs-utils-2.8.4.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 9ea3bae79d..e7d82b10ba 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.6.4 +NFS_UTILS_VERSION = 2.8.4 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ @@ -17,6 +17,8 @@ NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no NFS_UTILS_CONF_OPTS = \ --enable-tirpc \ --enable-ipv6 \ + --disable-junction \ + --disable-nfsdctl \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --with-rpcgen=$(HOST_DIR)/bin/rpcgen @@ -30,6 +32,8 @@ HOST_NFS_UTILS_CONF_OPTS = \ --disable-gss \ --disable-uuid \ --disable-ipv6 \ + --disable-junction \ + --disable-nfsdctl \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 833a3a38a2..514682ec48 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -13,9 +13,14 @@ config BR2_PACKAGE_NFTABLES http://www.netfilter.org/projects/nftables/index.html -# Legacy: this used to be handled in nftables.mk if BR2_PACKAGE_NFTABLES +# Legacy: this used to be handled in nftables.mk source "package/nftables/nftables-python/Config.in" + +config BR2_PACKAGE_NFTABLES_JSON + bool "json support" + select BR2_PACKAGE_JANSSON + endif comment "nftables needs a toolchain w/ wchar, headers >= 3.12" diff --git a/package/nftables/S35nftables b/package/nftables/S35nftables new file mode 100644 index 0000000000..35b089e154 --- /dev/null +++ b/package/nftables/S35nftables @@ -0,0 +1,76 @@ +#!/bin/sh + +DAEMON="nftables" + +# Main ruleset file, override in /etc/default/nftables if you want a +# different location. The file should include a "flush ruleset" +# command to atomically replace any previous rules on reload (instead +# of adding to them). +NFTABLES_CONFIG="/etc/nftables.conf" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +# Run only if the ruleset file exists. +if [ ! -f "${NFTABLES_CONFIG}" ]; then + echo "${NFTABLES_CONFIG} does not exist, nothing to do." + exit 0 +fi + +start() { + printf "Loading nftables rules: " + /usr/sbin/nft --file "${NFTABLES_CONFIG}" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf "Clearing nftables rules: " + /usr/sbin/nft flush ruleset + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +reload() { + FLUSH='flush ruleset' + if ! grep -q -x "$FLUSH" "${NFTABLES_CONFIG}"; then + printf 'WARNING: no "%s" in %s, duplicated rules likely\n' \ + "$FLUSH" "${NFTABLES_CONFIG}" + fi + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index ef635cd3c3..b7c65777ca 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,8 +1,9 @@ # From https://netfilter.org/projects/nftables/downloads.html # Checked pgp signature: -# https://netfilter.org/projects/nftables/files/nftables-1.1.0.tar.xz.sig +# https://netfilter.org/projects/nftables/files/nftables-1.1.4.tar.xz.sig # with key: # https://netfilter.org/files/coreteam-gpg-key-0xD55D978A8A1420E4.txt -sha256 ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24 nftables-1.1.0.tar.xz +# https://www.netfilter.org/projects/nftables/files/nftables-1.1.4.tar.xz.sha256sum +sha256 3444f0012af0472399eeae89a758b9c6dc5f311f6c67a48988fa1600fc4bac86 nftables-1.1.4.tar.xz # Locally computed: sha256 4ee1e51baf5f3166712fa0c3e01338c7257e50ddef245d28bb14ad68f6070ba5 COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index c958f0eb26..94bf977725 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.1.0 +NFTABLES_VERSION = 1.1.4 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.xz NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) @@ -42,7 +42,7 @@ else NFTABLES_CONF_OPTS += --without-cli endif -ifeq ($(BR2_PACKAGE_JANSSON),y) +ifeq ($(BR2_PACKAGE_NFTABLES_JSON),y) NFTABLES_DEPENDENCIES += jansson NFTABLES_CONF_OPTS += --with-json else @@ -57,6 +57,11 @@ define NFTABLES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) endef +define NFTABLES_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/nftables/S35nftables \ + $(TARGET_DIR)/etc/init.d/S35nftables +endef + $(eval $(autotools-package)) # Legacy: we used to handle it in this .mk diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 0bbf05fad9..94f0ff0a45 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY point between nginx and libmodsecurity (ModSecurity v3). - https://github.com/SpiderLabs/ModSecurity-nginx + https://github.com/owasp-modsecurity/ModSecurity-nginx comment "nginx-modsecurity needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_NGINX_HTTP diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index 698dbc7da6..1d80138b94 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 -sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity-nginx/releases/download/v1.0.4/modsecurity-nginx-v1.0.4.tar.gz.sha256 +sha256 6bdc7570911be884c1e43aaf85046137f9fde0cfa0dd4a55b853c81c45a13313 modsecurity-nginx-v1.0.4.tar.gz # Locally calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index a00c200469..c1cd50cf9d 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,9 +4,9 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.3 +NGINX_MODSECURITY_VERSION = 1.0.4 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz -NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) +NGINX_MODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 NGINX_MODSECURITY_LICENSE_FILES = LICENSE NGINX_MODSECURITY_DEPENDENCIES = libmodsecurity diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 4cf859dadc..77220665f3 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738 nginx-1.26.2.tar.gz +sha256 69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa nginx-1.26.3.tar.gz # License files, locally calculated sha256 f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 7a5455def7..6ca1ac2075 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.26.2 +NGINX_VERSION = 1.26.3 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE diff --git a/package/ngrep/0005-gcc15.patch b/package/ngrep/0005-gcc15.patch new file mode 100644 index 0000000000..e1dd7785b8 --- /dev/null +++ b/package/ngrep/0005-gcc15.patch @@ -0,0 +1,34 @@ +From 742424ddd76e15bd151e40834e8f1fad65900b65 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 9 Dec 2024 09:44:12 +0000 +Subject: [PATCH] fix build with gcc-15 + +Upstream: https://github.com/jpr5/ngrep/commit/742424ddd76e15bd151e40834e8f1fad65900b65 + +Signed-off-by: Bernd Kuhls +--- + ngrep.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ngrep.c b/ngrep.c +index 3df9389..57b4ddd 100644 +--- a/ngrep.c ++++ b/ngrep.c +@@ -146,7 +146,7 @@ struct re_pattern_buffer pattern; + + char *match_data = NULL, *bin_data = NULL; + uint16_t match_len = 0; +-int8_t (*match_func)() = &blank_match_func; ++int8_t (*match_func)(unsigned char *, uint32_t, uint16_t *, uint16_t *) = &blank_match_func; + + int8_t dump_single = 0; + void (*dump_func)(unsigned char *, uint32_t, uint16_t, uint16_t) = &dump_formatted; +@@ -177,7 +177,7 @@ FD_SET delay_fds; + SOCKET delay_socket = 0; + #endif + +-void (*print_time)() = NULL, (*dump_delay)() = dump_delay_proc_init; ++void (*print_time)(struct pcap_pkthdr *) = NULL, (*dump_delay)(struct pcap_pkthdr *) = dump_delay_proc_init; + + + /* diff --git a/package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch b/package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch new file mode 100644 index 0000000000..6d596bfe37 --- /dev/null +++ b/package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch @@ -0,0 +1,44 @@ +From 52515bae377f221b5473d9040f5f43ab1c672672 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Dec 2022 11:49:06 +0100 +Subject: [PATCH] Include and "tcpkill.h" to avoid implicit function + declarations + +Implicit function declarations are a historic language feature that +were removed from C in 1999. + +Upstream: https://github.com/jpr5/ngrep/pull/28 + +Signed-off-by: Thomas Bonnefille +--- + ngrep.c | 1 + + tcpkill.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/ngrep.c b/ngrep.c +index 3df9389..b2fcceb 100644 +--- a/ngrep.c ++++ b/ngrep.c +@@ -98,6 +98,7 @@ + #endif + + #include "ngrep.h" ++#include "tcpkill.h" + + + /* +diff --git a/tcpkill.c b/tcpkill.c +index 5388ec5..ac8fd2e 100644 +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.50.1 + diff --git a/package/nilfs-utils/nilfs-utils.mk b/package/nilfs-utils/nilfs-utils.mk index 1c8b7e245c..a6ad2953e0 100644 --- a/package/nilfs-utils/nilfs-utils.mk +++ b/package/nilfs-utils/nilfs-utils.mk @@ -9,6 +9,7 @@ NILFS_UTILS_SOURCE = nilfs-utils-$(NILFS_UTILS_VERSION).tar.bz2 NILFS_UTILS_SITE = https://nilfs.sourceforge.io/download NILFS_UTILS_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) NILFS_UTILS_LICENSE_FILES = COPYING +NILFS_UTILS_INSTALL_STAGING = YES # need libuuid, libblkid, libmount NILFS_UTILS_DEPENDENCIES = util-linux diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index b7bc1a4f1c..805fef4541 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -10,6 +10,9 @@ NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING +# Filed against a different project called monitor-ninja +NINJA_IGNORE_CVES += CVE-2021-4336 + define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 4f6ea20731..9303ff613e 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,6 +1,6 @@ -# From https://nmap.org/dist/sigs/nmap-7.95.tar.bz2.digest.txt (lowercase) -sha256 e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778 nmap-7.95.tar.bz2 -sha512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e nmap-7.95.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.98.tar.bz2.digest.txt (lowercase) +sha256 ce847313eaae9e5c9f21708e42d2ab7b56c7e0eb8803729a3092f58886d897e6 nmap-7.98.tar.bz2 +sha512 14e13689d1276f70efc8c905e8eb0a15970f4312c2ef86d8d97e9df11319735e7f7cd73f728f69cf43d27a078ef5ac1e0f39cd119d8cb9262060c42606c6cab3 nmap-7.98.tar.bz2 # Locally calculated sha256 9d9a9a763c0e6145172cfe7d8483e23b38ce60b6c79a82e4894242917bdae6d3 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 077840b192..629a00f30e 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.95 +NMAP_VERSION = 7.98 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap diff --git a/package/nnn/Config.in b/package/nnn/Config.in new file mode 100644 index 0000000000..64cfa8e0a5 --- /dev/null +++ b/package/nnn/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_NNN + bool "nnn" + depends on BR2_USE_MMU # fork + # Building nnn without widechar/UTF support is theoretically + # possible, but in practice it leads to unstable builds. + # That’s why the WCHAR dependency is here. + depends on BR2_USE_WCHAR + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + help + nnn is a lightweight yet powerful terminal file manager. + It is written in C, has minimal dependency, and works + out of the box. + + https://github.com/jarun/nnn + +comment "nnn needs a toolchain with wchar" + depends on BR2_USE_MMU # fork + depends on !BR2_USE_WCHAR diff --git a/package/nnn/nnn.hash b/package/nnn/nnn.hash new file mode 100644 index 0000000000..670a591afb --- /dev/null +++ b/package/nnn/nnn.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9faaff1e3f5a2fd3ed570a83f6fb3baf0bfc6ebd6a9abac16203d057ac3fffe3 nnn-5.1.tar.gz +sha256 829f485dc4f2f51c2471b36a99e22f15ff214966e16b72cd79768b2338b4132b LICENSE diff --git a/package/nnn/nnn.mk b/package/nnn/nnn.mk new file mode 100644 index 0000000000..acbd0ce314 --- /dev/null +++ b/package/nnn/nnn.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# nnn +# +################################################################################ + +NNN_VERSION = 5.1 +NNN_LICENSE = BSD-2-Clause +NNN_LICENSE_FILES = LICENSE +NNN_SITE = $(call github,jarun,nnn,v$(NNN_VERSION)) +NNN_DEPENDENCIES = ncurses host-pkgconf + +NNN_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) +NNN_MAKE_FLAGS = \ + CFLAGS_OPTIMIZATION= \ + PREFIX=/usr + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +NNN_DEPENDENCIES += musl-fts +# Must be passed in env so it can be appended to by the Makefile +NNN_MAKE_ENV += LDLIBS="-lfts" +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +NNN_DEPENDENCIES += readline +NNN_MAKE_FLAGS += O_NORL=0 +else +NNN_MAKE_FLAGS += O_NORL=1 +endif + +define NNN_BUILD_CMDS + $(NNN_MAKE_ENV) $(MAKE) -C $(@D) $(NNN_MAKE_FLAGS) +endef + +define NNN_INSTALL_TARGET_CMDS + $(NNN_MAKE_ENV) $(MAKE) -C $(@D) $(NNN_MAKE_FLAGS) \ + DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 50d1360715..4048e18bd4 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -87,4 +87,11 @@ config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS endif +config BR2_PACKAGE_HAS_NODEJS + bool + +config BR2_PACKAGE_PROVIDES_NODEJS + string + default "nodejs-src" + source "package/nodejs/nodejs-src/Config.in" diff --git a/package/nodejs/nodejs-src/Config.in b/package/nodejs/nodejs-src/Config.in index 90b061f616..0428fe1f8a 100644 --- a/package/nodejs/nodejs-src/Config.in +++ b/package/nodejs/nodejs-src/Config.in @@ -1,2 +1,3 @@ config BR2_PACKAGE_NODEJS_SRC bool + select BR2_PACKAGE_HAS_NODEJS diff --git a/package/nodejs/nodejs-src/nodejs-src.mk b/package/nodejs/nodejs-src/nodejs-src.mk index 8f934202b0..30e72743a1 100644 --- a/package/nodejs/nodejs-src/nodejs-src.mk +++ b/package/nodejs/nodejs-src/nodejs-src.mk @@ -14,6 +14,7 @@ NODEJS_SRC_LICENSE_FILES = $(NODEJS_LICENSE_FILES) NODEJS_SRC_CPE_ID_VENDOR = $(NODEJS_CPE_ID_VENDOR) NODEJS_SRC_CPE_ID_PRODUCT = $(NODEJS_CPE_ID_PRODUCT) +NODEJS_SRC_PROVIDES = nodejs HOST_NODEJS_SRC_PROVIDES = host-nodejs NODEJS_SRC_DEPENDENCIES = \ diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index aaa9e4619a..e087d8a7f9 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.15.1/SHASUMS256.txt.asc -sha256 6031d04b98f59ff0f7cb98566f65b115ecd893d3b7870821171708cdbaf7ae6e node-v22.11.0-linux-arm64.tar.xz -sha256 9de0fdcfb1cccbe03f72f939e4e6f03867aef3da8223f90606cd93757704dae0 node-v22.11.0-linux-armv7l.tar.xz -sha256 d1d49d7d611b104b6d616e18ac439479d8296aa20e3741432de0e85f4735a81e node-v22.11.0-linux-ppc64le.tar.xz -sha256 83bf07dd343002a26211cf1fcd46a9d9534219aad42ee02847816940bf610a72 node-v22.11.0-linux-x64.tar.xz -sha256 bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35 node-v22.11.0.tar.xz +# From https://nodejs.org/dist/v22.15.1/SHASUMS256.txt.asc +sha256 f4ae8ddf7487dfaf7da92fef463ee55cc29d8772d62891361dc3fc8b8e469205 node-v22.15.1-linux-arm64.tar.xz +sha256 6947386b4c8373b625c6a49b5571bf2226dac7c7b560a9a561a1f81bf71a25ef node-v22.15.1-linux-armv7l.tar.xz +sha256 da07858c6404dbe7c627bd7baea33c7825640652ad24468a6feb23c770cf7ce4 node-v22.15.1-linux-ppc64le.tar.xz +sha256 7dca2ab34ec817aa4781e2e99dfd34d349eff9be86e5d5fbaa7e96cae8ee3179 node-v22.15.1-linux-x64.tar.xz +sha256 c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e node-v22.15.1.tar.xz # Locally calculated -sha256 f0cb1ad806ba5d681f378a8cc2e539fe4b54839290eda3c814ec8994af2b8422 LICENSE +sha256 1ae62e2015784ba438db7b04ebd33f3c4ff3efdb824c111c4ececd99945fd52d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index bf0764136e..310face2d2 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 22.11.0 +NODEJS_COMMON_VERSION = 22.15.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) @@ -32,8 +32,7 @@ PNPM = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/pnpm YARN = $(NODEJS_BIN_ENV) $(HOST_DIR)/bin/yarn endif -NODEJS_DEPENDENCIES = nodejs-src -$(eval $(generic-package)) +$(eval $(virtual-package)) $(eval $(host-virtual-package)) include $(sort $(wildcard package/nodejs/*/*.mk)) diff --git a/package/nss-pam-ldapd/0001-Fix-variable-name-bool-which-is-a-keyword-in-C23.patch b/package/nss-pam-ldapd/0001-Fix-variable-name-bool-which-is-a-keyword-in-C23.patch new file mode 100644 index 0000000000..a3812fcaff --- /dev/null +++ b/package/nss-pam-ldapd/0001-Fix-variable-name-bool-which-is-a-keyword-in-C23.patch @@ -0,0 +1,35 @@ +From 8ddb983a546f632986a84a784c4625110f7782a2 Mon Sep 17 00:00:00 2001 +From: Arthur de Jong +Date: Sun, 23 Feb 2025 15:22:38 +0100 +Subject: Fix variable name (bool) which is a keyword in C23 + +Closes https://bugs.debian.org/1097481 + +Upstream: https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=8ddb983a546f632986a84a784c4625110f7782a2 + +Signed-off-by: Bernd Kuhls +--- + nslcd/cfg.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nslcd/cfg.c b/nslcd/cfg.c +index ded797a..b984b0e 100644 +--- a/nslcd/cfg.c ++++ b/nslcd/cfg.c +@@ -207,10 +207,10 @@ static int get_boolean(const char *filename, int lnr, + return parse_boolean(filename, lnr, token); + } + +-static const char *print_boolean(int bool) ++static const char *print_boolean(int value) + { +- if (bool) return "yes"; +- else return "no"; ++ if (value) return "yes"; ++ else return "no"; + } + + #define TIME_MINUTES 60 +-- +cgit v1.2.3 + diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.hash b/package/nss-pam-ldapd/nss-pam-ldapd.hash index 3286f127dc..868c737ab3 100644 --- a/package/nss-pam-ldapd/nss-pam-ldapd.hash +++ b/package/nss-pam-ldapd/nss-pam-ldapd.hash @@ -1,5 +1,5 @@ -# From https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.12.tar.gz.md5 -md5 cc30ee0ab91d6c94b7a343ae09b5dc69 nss-pam-ldapd-0.9.12.tar.gz +# From https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.13.tar.gz.md5 +md5 f6fbb61e537029804c401741ecb76224 nss-pam-ldapd-0.9.13.tar.gz # Locally computed: -sha256 c6d661e74693cbf531a790631ca93b73f291fb23cc39465b09deb8da2bfb0e14 nss-pam-ldapd-0.9.12.tar.gz +sha256 e01784e17cb533bb66bd0601e205e785263445c3c2df7a6f90232ab4131c716d nss-pam-ldapd-0.9.13.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.mk b/package/nss-pam-ldapd/nss-pam-ldapd.mk index 60f6328496..92f9ef079e 100644 --- a/package/nss-pam-ldapd/nss-pam-ldapd.mk +++ b/package/nss-pam-ldapd/nss-pam-ldapd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NSS_PAM_LDAPD_VERSION = 0.9.12 +NSS_PAM_LDAPD_VERSION = 0.9.13 NSS_PAM_LDAPD_SITE = http://arthurdejong.org/nss-pam-ldapd NSS_PAM_LDAPD_LICENSE = LGPL-2.1+ NSS_PAM_LDAPD_LICENSE_FILES = COPYING diff --git a/package/ntp/0001-ntp-syscalls-fallback.patch b/package/ntp/0001-ntp-syscalls-fallback.patch index 46704b9d3f..445efd95e5 100644 --- a/package/ntp/0001-ntp-syscalls-fallback.patch +++ b/package/ntp/0001-ntp-syscalls-fallback.patch @@ -1,7 +1,6 @@ inline ntp syscalls fallback -Reference: - https://bugs.ntp.org/show_bug.cgi?id=769 +Upstream: https://bugs.ntp.org/show_bug.cgi?id=769 Signed-off-by: James Knight --- diff --git a/package/ntp/0005-fix-openssl-configure.patch b/package/ntp/0005-fix-openssl-configure.patch new file mode 100644 index 0000000000..0a213fcee6 --- /dev/null +++ b/package/ntp/0005-fix-openssl-configure.patch @@ -0,0 +1,18 @@ +Fix OpenSSL detection + +Upstream: https://bugs.ntp.org/show_bug.cgi?id=3985 + +Signed-off-by: Bernd Kuhls + +diff -uNr ntp-4.2.8p18.orig/sntp/m4/ntp_openssl.m4 ntp-4.2.8p18/sntp/m4/ntp_openssl.m4 +--- ntp-4.2.8p18.orig/sntp/m4/ntp_openssl.m4 2024-05-07 13:21:14.000000000 +0200 ++++ ntp-4.2.8p18/sntp/m4/ntp_openssl.m4 2025-07-06 08:37:14.140657598 +0200 +@@ -326,7 +326,7 @@ + not_found) ;; + *) + AC_MSG_NOTICE([Searching for libcrypto in $i]) +- LIBS="-L$i $NTPSSL_SAVED_LIBS" ++ LIBS="-L$i $ntp_ssl_libs_l $NTPSSL_SAVED_LIBS" + AC_CHECK_LIB( + [crypto], + [EVP_MD_CTX_new], diff --git a/package/ntp/0006-stime.patch b/package/ntp/0006-stime.patch new file mode 100644 index 0000000000..7707231cf8 --- /dev/null +++ b/package/ntp/0006-stime.patch @@ -0,0 +1,21 @@ +Fix stime build error with gcc-14: + +machines.c: In function 'ntp_set_tod': +machines.c:484:28: error: passing argument 1 of 'stime' from incompatible pointer type [-Wincompatible-pointer-types] + 484 | rc = stime(&tp); /* lie as bad as SysVR4 */ + +Upstream: https://bugs.ntp.org/show_bug.cgi?id=3981#c2 + +Signed-off-by: Bernd Kuhls + +--- a/libntp/machines.c 2025-05-26 18:21:43 +0000 ++++ a/libntp/machines.c 2025-05-26 18:21:43 +0000 +@@ -478,7 +478,7 @@ + #endif /* HAVE_SETTIMEOFDAY */ + #ifdef HAVE_STIME + if (rc && (SET_TOD_STIME == tod || !tod)) { +- long tp = tvp->tv_sec; ++ time_t tp = tvp->tv_sec; + + errno = 0; + rc = stime(&tp); /* lie as bad as SysVR4 */ diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 1a7c7e7937..f481c5d79b 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -29,7 +29,7 @@ NTP_CONF_OPTS = \ NTP_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) -NTP_CONF_OPTS += --with-crypto --enable-openssl-random +NTP_CONF_OPTS += --with-crypto --enable-openssl-random --enable-verbose-ssl NTP_DEPENDENCIES += openssl else NTP_CONF_OPTS += --without-crypto --disable-openssl-random diff --git a/package/ntpsec/0002-disable-PIE-support.patch b/package/ntpsec/0002-disable-PIE-support.patch new file mode 100644 index 0000000000..64eb559de0 --- /dev/null +++ b/package/ntpsec/0002-disable-PIE-support.patch @@ -0,0 +1,26 @@ +From 712675fbd2a736df817fecd7bfb39055946ef85b Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sun, 13 Aug 2023 13:48:03 +0200 +Subject: [PATCH] disable PIE support + +Signed-off-by: Waldemar Brodkorb +Upstream: N/A Not upstreamable +--- + wscript | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/wscript b/wscript +index 292e3a45b..105c7eac2 100644 +--- a/wscript ++++ b/wscript +@@ -299,7 +299,6 @@ def configure(ctx): + + cc_test_flags = [ + ('PIC', '-fPIC'), +- ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie + ('unused', '-Qunused-arguments'), + # This is a useless warning on any architecture with a barrel +-- +2.39.2 + diff --git a/package/ntpsec/0003-ntpd-refclock_gpsd.c-Add-missing-time.h-for-strptim.patch b/package/ntpsec/0003-ntpd-refclock_gpsd.c-Add-missing-time.h-for-strptim.patch new file mode 100644 index 0000000000..0a2ae6a259 --- /dev/null +++ b/package/ntpsec/0003-ntpd-refclock_gpsd.c-Add-missing-time.h-for-strptim.patch @@ -0,0 +1,47 @@ +From 904983bf9465017753c6f5b602fc9c98458615f7 Mon Sep 17 00:00:00 2001 +From: "Gary E. Miller" +Date: Mon, 27 Oct 2025 12:35:35 -0700 +Subject: [PATCH] ntpd/refclock_gpsd.c: Add missing time.h for strptime() + +Upstream: https://gitlab.com/NTPsec/ntpsec/-/commit/5137c155d8895cfc50fb577ee720b3b23589c662 + +Signed-off-by: Bernd Kuhls +--- + ntpd/refclock_gpsd.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ntpd/refclock_gpsd.c b/ntpd/refclock_gpsd.c +index 1dfec3103..0a2987d84 100644 +--- a/ntpd/refclock_gpsd.c ++++ b/ntpd/refclock_gpsd.c +@@ -100,20 +100,20 @@ typedef unsigned long int json_uint; + * header stuff we need + */ + +-#include +-#include +-#include +-#include + #include ++#include + #include ++#include ++#include ++#include // for strptime() ++#include + +-#include ++#include + #include + #include ++#include + #include + +-#include +- + #include "ntpd.h" + #include "ntp_io.h" + #include "ntp_refclock.h" +-- +2.47.3 + diff --git a/package/ntpsec/0004-refclock_gpsd-add-build-fix-for-gcc-14.x.patch b/package/ntpsec/0004-refclock_gpsd-add-build-fix-for-gcc-14.x.patch new file mode 100644 index 0000000000..821a34e966 --- /dev/null +++ b/package/ntpsec/0004-refclock_gpsd-add-build-fix-for-gcc-14.x.patch @@ -0,0 +1,32 @@ +From 55c230d61ece7213506f1dccac76c21aefbade9e Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 27 Oct 2025 19:18:13 +0100 +Subject: [PATCH] refclock_gpsd: add build fix for gcc => 14.x + +../../ntpd/refclock_gpsd.c:2076:14: error: implicit declaration of + function 'strptime'; did you mean 'strftime'? + [-Wimplicit-function-declaration] + +Upstream: https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1484 + +Signed-off-by: Bernd Kuhls +--- + ntpd/refclock_gpsd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ntpd/refclock_gpsd.c b/ntpd/refclock_gpsd.c +index a4a6f7095..a3995896a 100644 +--- a/ntpd/refclock_gpsd.c ++++ b/ntpd/refclock_gpsd.c +@@ -59,6 +59,8 @@ + */ + + ++#define _XOPEN_SOURCE ++#define _DEFAULT_SOURCE + #include "config.h" + #include "ntp.h" + #include "ntp_types.h" +-- +2.47.3 + diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index a3802c11ba..40c06d6926 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a9ec4416688a1c1c88833f3f6acc35518e3d63409af372eec010455002b33050 ntpsec-NTPsec_1_2_3.tar.bz2 +sha256 3abc1b057a252d214ef2e76aa375fe0d81432c626e75304b17850d68eee0c54f ntpsec-NTPsec_1_2_4.tar.bz2 sha256 074e6e32c86a4c0ef8b3ed25b721ca23aca83df277cd88106ef7177c354615ff LICENSES/Apache-2.0.txt sha256 991d8a58e0b4be84a174a9bd333a8ca33807a0c1ce6d23a2e25a21f7ece482d0 LICENSES/Beerware.txt sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2-Clause.txt diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index 3acf7745cf..d48bc5baa9 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTPSEC_VERSION = 1.2.3 +NTPSEC_VERSION = 1.2.4 NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = Apache-2.0, \ @@ -37,13 +37,15 @@ NTPSEC_DEPENDENCIES = \ libcap \ openssl +NTPSEC_CONF_ENV = \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" + # CC="$(HOSTCC)" is strange but needed to build some host tools, the # cross-compiler will properly be used to build target code thanks to # --cross-compiler NTPSEC_CONF_OPTS = \ - CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS)" \ - PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" \ --libdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/ntp \ --cross-compiler="$(TARGET_CC)" \ --cross-cflags="$(TARGET_CFLAGS) -std=gnu99" \ diff --git a/package/numactl/numactl.hash b/package/numactl/numactl.hash index c48df0ac69..8851c8c4f5 100644 --- a/package/numactl/numactl.hash +++ b/package/numactl/numactl.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b4fc0956317680579992d7815bc43d0538960dc73aa1dd8ca7e3806e30bc1274 numactl-2.0.18.tar.gz +sha256 f2672a0381cb59196e9c246bf8bcc43d5568bc457700a697f1a1df762b9af884 numactl-2.0.19.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index 512a5eb96a..134d03bc53 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.18 +NUMACTL_VERSION = 2.0.19 NUMACTL_SITE = \ https://github.com/numactl/numactl/releases/download/v$(NUMACTL_VERSION) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) diff --git a/package/nushell/nushell.hash b/package/nushell/nushell.hash index 8336054455..074bb694a6 100644 --- a/package/nushell/nushell.hash +++ b/package/nushell/nushell.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 592f3b74156be0e65f8ef01fbc2e947480b91407190f93761d7c9531f381bfac nushell-0.96.1-cargo2.tar.gz +sha256 3f4f31e1c4832c34dc4c6058a78e9a893595e165334bb9be6a241618ce2861ad nushell-0.96.1-cargo4.tar.gz sha256 2dc1f03f729c21902d869b4d8f8dc528fc730f4c6ad83fc128672bda0ad69196 LICENSE diff --git a/package/nut/nut.hash b/package/nut/nut.hash index 4c962ee9d8..0d78324818 100644 --- a/package/nut/nut.hash +++ b/package/nut/nut.hash @@ -1,7 +1,7 @@ -# From https://github.com/networkupstools/nut/releases/download/v2.8.2/nut-2.8.2.tar.gz.sha256 -sha256 e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d nut-2.8.2.tar.gz +# From https://github.com/networkupstools/nut/releases/download/v2.8.4/nut-2.8.4.tar.gz.sha256 +sha256 0130ba82ea79f04ba4f34c5249a85943977efd984ed7df6aec1a518d5a3594f8 nut-2.8.4.tar.gz # Locally computed -sha256 8a3de48b86daffcbe822dd94e514c8a77fe70f77c9005ffd9dcf1709dbdc80c7 COPYING +sha256 40885775f43463c404d74bbd00a59fac6c0fe73f838d4520472d721917412577 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE-GPL2 sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 LICENSE-GPL3 diff --git a/package/nut/nut.mk b/package/nut/nut.mk index 93522d017e..4fc461a993 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -4,7 +4,7 @@ # ################################################################################ -NUT_VERSION = 2.8.2 +NUT_VERSION = 2.8.4 NUT_SITE = https://github.com/networkupstools/nut/releases/download/v$(NUT_VERSION) NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client) NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3 @@ -24,6 +24,7 @@ NUT_CONF_OPTS = \ --with-group=nut NUT_CONF_ENV = \ + PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig \ ax_cv_check_cflags__Werror__Wno_unknown_warning_option=no \ ax_cv_check_cxxflags__Werror__Wno_unknown_warning_option=no \ ac_cv_func_strcasecmp=yes \ diff --git a/package/nvidia-persistenced/nvidia-persistenced.hash b/package/nvidia-persistenced/nvidia-persistenced.hash index 06c71b35f5..f564451015 100644 --- a/package/nvidia-persistenced/nvidia-persistenced.hash +++ b/package/nvidia-persistenced/nvidia-persistenced.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b84fb8eb86127a725d0134a2c64a64e7844e125dece137e7fe8adf8a33cbe817 nvidia-persistenced-515.48.07.tar.gz +sha256 ad4e54757c743256a8129c9b543eb6f2fb27cd6b7b20a5ac201330aed90aa1ab nvidia-persistenced-580.95.05.tar.gz sha256 279d814320adc07ca5a4ee101a0b428ddf22a6f3513b8c051f9eb7be47b2e797 COPYING diff --git a/package/nvidia-persistenced/nvidia-persistenced.mk b/package/nvidia-persistenced/nvidia-persistenced.mk index 662d4d4349..5dbc0c3b73 100644 --- a/package/nvidia-persistenced/nvidia-persistenced.mk +++ b/package/nvidia-persistenced/nvidia-persistenced.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVIDIA_PERSISTENCED_VERSION = 515.48.07 +NVIDIA_PERSISTENCED_VERSION = 580.95.05 NVIDIA_PERSISTENCED_SITE = $(call github,NVIDIA,nvidia-persistenced,$(NVIDIA_PERSISTENCED_VERSION)) NVIDIA_PERSISTENCED_LICENSE = MIT NVIDIA_PERSISTENCED_LICENSE_FILES = COPYING diff --git a/package/nvme/Config.in b/package/nvme/Config.in index dd8655fa1a..a27ddf50a9 100644 --- a/package/nvme/Config.in +++ b/package/nvme/Config.in @@ -1,7 +1,14 @@ config BR2_PACKAGE_NVME bool "nvme" + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_USE_MMU # libnvme + select BR2_PACKAGE_LIBNVME help NVME utility, a utility for interacting with standard NVM Express (optimized PCI Express SSD interface) devices. https://github.com/linux-nvme/nvme-cli + +comment "nvme needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + depends on BR2_USE_MMU diff --git a/package/nvme/nvme.hash b/package/nvme/nvme.hash index a7ce51ca74..c6fb9c9aa8 100644 --- a/package/nvme/nvme.hash +++ b/package/nvme/nvme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a75270e65a4a7a6add48f748ba216d8f68d78f90f8cb77e88e9753b74d527991 nvme-1.12.tar.gz +sha256 93282c426f22dd1ea6d172dec8af043c4e9ff80189becfbbb5378fe1ca0a74ad nvme-2.15.tar.gz sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE diff --git a/package/nvme/nvme.mk b/package/nvme/nvme.mk index 53f9dff753..9f2b086d2a 100644 --- a/package/nvme/nvme.mk +++ b/package/nvme/nvme.mk @@ -4,37 +4,17 @@ # ################################################################################ -NVME_VERSION = 1.12 +NVME_VERSION = 2.15 NVME_SITE = $(call github,linux-nvme,nvme-cli,v$(NVME_VERSION)) NVME_LICENSE = GPL-2.0+ NVME_LICENSE_FILES = LICENSE +NVME_DEPENDENCIES = libnvme -# Yes, LIBUUID=0 means libuuid support enabled. -# LIBUUID=1 means libuuid support disabled. -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -NVME_DEPENDENCIES += util-linux -NVME_MAKE_OPTS += LIBUUID=0 +ifeq ($(BR2_PACKAGE_JSON_C),y) +NVME_CONF_OPTS += -Djson-c=enabled +NVME_DEPENDENCIES += json-c else -NVME_MAKE_OPTS += LIBUUID=1 +NVME_CONF_OPTS += -Djson-c=disabled endif -# Yes, HAVE_SYSTEMD=0 means systemd support enabled. -# HAVE_SYSTEMD=1 means systemd support disabled. -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -NVME_DEPENDENCIES += systemd -NVME_MAKE_OPTS += HAVE_SYSTEMD=0 -else -NVME_MAKE_OPTS += HAVE_SYSTEMD=1 -endif - -define NVME_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - $(NVME_MAKE_OPTS) -C $(@D) -endef - -define NVME_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(NVME_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(TARGET_DIR) PREFIX=/usr install-bin -endef - -$(eval $(generic-package)) +$(eval $(meson-package)) diff --git a/package/nxp-bt-wifi-firmware/Config.in b/package/nxp-bt-wifi-firmware/Config.in new file mode 100644 index 0000000000..c707cd05cd --- /dev/null +++ b/package/nxp-bt-wifi-firmware/Config.in @@ -0,0 +1,75 @@ +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE + bool "nxp-bt-wifi-firmware" + help + Firmwares for NXP Bluetooth / WiFi chipsets based modules + + https://github.com/nxp-imx/imx-firmware + +if BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8801 + bool "8801 (SD)" + help + NXP 8801 module firmware files. + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8987 + bool "8987 (SD)" + help + NXP 8987 module firmware files. + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997 + bool "8997" + help + NXP 8997 module firmware files. + +if BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997 + +choice + prompt "8997 WiFi interface" + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997_SD + bool "SD" + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997_PCIE + bool "PCIe" + +endchoice + +endif + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_9098 + bool "9098" + help + NXP 9098 module firmware files. + +if BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_9098 + +choice + prompt "9098 WiFi interface" + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_9098_SD + bool "SD" + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_9098_PCIE + bool "PCIe" + +endchoice + +endif + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW416 + bool "IW416 (SD)" + help + NXP IW416 module firmware files. + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW610 + bool "IW610 (SD)" + help + NXP IW610 module firmware files. + +config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW612 + bool "IW612 (SD)" + help + NXP IW612 module firmware files. + +endif diff --git a/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash b/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash new file mode 100644 index 0000000000..60e1be03da --- /dev/null +++ b/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 444351eba2669772a0f62aadbff92b46adb370dcd5228f12e4f5ae2b58554951 nxp-bt-wifi-firmware-lf-6.6.52_2.2.0.tar.gz +sha256 601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7 LICENSE.txt diff --git a/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk b/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk new file mode 100644 index 0000000000..f0440ce32a --- /dev/null +++ b/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# nxp-bt-wifi-firmware +# +################################################################################ + +NXP_BT_WIFI_FIRMWARE_VERSION = lf-6.6.52_2.2.0 +NXP_BT_WIFI_FIRMWARE_SITE = $(call github,nxp-imx,imx-firmware,$(NXP_BT_WIFI_FIRMWARE_VERSION)) +NXP_BT_WIFI_FIRMWARE_LICENSE = NXP Software License Agreement +NXP_BT_WIFI_FIRMWARE_LICENSE_FILES = LICENSE.txt +NXP_BT_WIFI_FIRMWARE_REDISTRIBUTE = NO + +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8801) += FwImage_8801_SD +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8987) += FwImage_8987 +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997_SD) += FwImage_8997_SD +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997_PCIE) += FwImage_8997 +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_9098_SD) += FwImage_9098_SD +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_9098_PCIE) += FwImage_9098_PCIE +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW416) += FwImage_IW416_SD +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW610) += FwImage_IW610_SD +NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW612) += FwImage_IW612_SD + +define NXP_BT_WIFI_FIRMWARE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/nxp/wifi_mod_para.conf \ + $(TARGET_DIR)/lib/firmware/nxp/wifi_mod_para.conf + $(INSTALL) -m 0644 -D $(@D)/nxp/mfguart/helper_uart_3000000.bin \ + $(TARGET_DIR)/lib/firmware/nxp/helper_uart_3000000.bin + $(foreach f,$(NXP_BT_WIFI_FIRMWARE_FILES_y), \ + $(INSTALL) -m 0644 -D $(@D)/nxp/$(f)/* $(TARGET_DIR)/lib/firmware/nxp/ + ) +endef + +$(eval $(generic-package)) diff --git a/package/nxp-mwifiex/Config.in b/package/nxp-mwifiex/Config.in new file mode 100644 index 0000000000..7d55a1cc21 --- /dev/null +++ b/package/nxp-mwifiex/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_NXP_MWIFIEX + bool "nxp-mwifiex" + depends on !BR2_s390x + depends on BR2_LINUX_KERNEL + help + Linux kernel driver from NXP for WiFi chipsets + IW416 / IW610 / IW612 / W8801 / W8987 / W8997 / W9098. + + https://github.com/nxp-imx/mwifiex + +comment "nxp-mwifiex needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL diff --git a/package/nxp-mwifiex/nxp-mwifiex.hash b/package/nxp-mwifiex/nxp-mwifiex.hash new file mode 100644 index 0000000000..559e89cb37 --- /dev/null +++ b/package/nxp-mwifiex/nxp-mwifiex.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 dcffe6c48babf7db82aac4704b056cffc06a1f80008cd9c23ab0479fc890ba99 nxp-mwifiex-lf-6.6.52_2.2.0.tar.gz +sha256 67d461bc478d220fcdf99c59d8ea17fffbd1881718281aa4947eb608fcd568bb LICENSE diff --git a/package/nxp-mwifiex/nxp-mwifiex.mk b/package/nxp-mwifiex/nxp-mwifiex.mk new file mode 100644 index 0000000000..46678a2c91 --- /dev/null +++ b/package/nxp-mwifiex/nxp-mwifiex.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# nxp-mwifiex +# +################################################################################ + +NXP_MWIFIEX_VERSION = lf-6.6.52_2.2.0 +NXP_MWIFIEX_SITE = $(call github,nxp-imx,mwifiex,$(NXP_MWIFIEX_VERSION)) +NXP_MWIFIEX_LICENSE = GPL-2.0 +NXP_MWIFIEX_LICENSE_FILES = LICENSE + +NXP_MWIFIEX_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) + +define NXP_MWIFIEX_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) + $(call KCONFIG_ENABLE_OPT,CONFIG_PCI) + $(call KCONFIG_ENABLE_OPT,CONFIG_RTC_CLASS) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/obsidian-cursors/Config.in b/package/obsidian-cursors/Config.in deleted file mode 100644 index 49ec310170..0000000000 --- a/package/obsidian-cursors/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_OBSIDIAN_CURSORS - bool "obsidian-cursors" - help - Obsidian Cursors is a shiny and clean cursor set. - - http://kde-look.org/content/show.php/Obsidian+Cursors?content=73135 diff --git a/package/obsidian-cursors/obsidian-cursors.hash b/package/obsidian-cursors/obsidian-cursors.hash deleted file mode 100644 index a476a0ba05..0000000000 --- a/package/obsidian-cursors/obsidian-cursors.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3d38fe875f6feae8b7772e02cfda530fcf669479807915cd2c12c149da17cfb9 73135-Obsidian.tar.bz2 diff --git a/package/obsidian-cursors/obsidian-cursors.mk b/package/obsidian-cursors/obsidian-cursors.mk deleted file mode 100644 index 87a8d62f3e..0000000000 --- a/package/obsidian-cursors/obsidian-cursors.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# obsidian-cursors -# -################################################################################ - -OBSIDIAN_CURSORS_VERSION = 1.0 -OBSIDIAN_CURSORS_SITE = http://kde-look.org/CONTENT/content-files -OBSIDIAN_CURSORS_SOURCE = 73135-Obsidian.tar.bz2 -OBSIDIAN_CURSORS_LICENSE = GPL - -define OBSIDIAN_CURSORS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/cursors/xorg-x11/Obsidian - cp -a $(@D)/cursors \ - $(TARGET_DIR)/usr/share/cursors/xorg-x11/Obsidian -endef - -$(eval $(generic-package)) diff --git a/package/octave/Config.in b/package/octave/Config.in index 73e27f65e8..a969147adf 100644 --- a/package/octave/Config.in +++ b/package/octave/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_OCTAVE bool "octave" depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_TOOLCHAIN_HAS_FORTRAN # Some Bootlin x86_64 toolchains (like version # bleeding-edge-2021.11-1) has a file @@ -32,7 +32,7 @@ config BR2_PACKAGE_OCTAVE https://www.octave.org/ -comment "octave needs a toolchain w/ C++ and fortran, gcc >= 4.8" +comment "octave needs a toolchain w/ C++ and fortran, gcc >= 7" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_FORTRAN diff --git a/package/octave/octave.hash b/package/octave/octave.hash index d9313734f1..4ae6ad4684 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -# https://ftp.gnu.org/gnu/octave/octave-9.2.0.tar.lz.sig +# https://ftp.gnu.org/gnu/octave/octave-10.2.0.tar.lz.sig # using key DBD9C84E39FE1AAE99F04446B05F05B75D36644B -sha256 dcb2c098701cfcbc083f07e90e146261d15cdbf5e89c031032422112c89b47da octave-9.2.0.tar.lz +sha256 d0bf8992b6d4ac2bdae93590f8520882150a239cc260b43c632b4a9ad28e8991 octave-10.2.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 2e2fe0f989..2f9346138b 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,8 +4,8 @@ # ################################################################################ -OCTAVE_VERSION = 9.2.0 -OCTAVE_SITE = https://ftp.gnu.org/gnu/octave +OCTAVE_VERSION = 10.2.0 +OCTAVE_SITE = $(BR2_GNU_MIRROR)/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ OCTAVE_LICENSE_FILES = COPYING diff --git a/package/odb/Config.in.host b/package/odb/Config.in.host index e80a141be6..bff3142ee5 100644 --- a/package/odb/Config.in.host +++ b/package/odb/Config.in.host @@ -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 diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index 9e2fd413f9..31fae82eb9 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 5e13121c0f885a81ad882db065549ea13477abbcc219f150b38a8d2ac92521de ofono-2.2.tar.xz +sha256 f74c3bba7ebac488fed7bcfa6113b0e39e723d2e1a24b53f79c9f18a1c85dd00 ofono-2.18.tar.xz # Locally computed sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 1ff43092c4..ee6020ab2e 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,11 +4,12 @@ # ################################################################################ -OFONO_VERSION = 2.2 +OFONO_VERSION = 2.18 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 OFONO_LICENSE_FILES = COPYING +OFONO_CPE_ID_VALID = YES OFONO_DEPENDENCIES = \ host-pkgconf \ dbus \ diff --git a/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch b/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch deleted file mode 100644 index f236ef0957..0000000000 --- a/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From eb31017284f9a1c95602a9c06d606df6b558a691 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Thu, 14 Apr 2022 17:39:32 -0700 -Subject: [PATCH] ola: fix compilation with musl 1.2.3 - -musl 1.2.3 defines NULL as nullptr. cannot use reinterpret_cast with -nullptr. - -Signed-off-by: Rosen Penev -[Retrieved from: -https://github.com/OpenLightingProject/ola/pull/1773/commits/eb31017284f9a1c95602a9c06d606df6b558a691] -Signed-off-by: Fabrice Fontaine ---- - ola/AutoStart.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ola/AutoStart.cpp b/ola/AutoStart.cpp -index 89fa51f115..4dbe20d317 100644 ---- a/ola/AutoStart.cpp -+++ b/ola/AutoStart.cpp -@@ -110,11 +110,11 @@ TCPSocket *ConnectToServer(unsigned short port) { - // Try to start the server, we pass --daemon (fork into background) and - // --syslog (log to syslog). - execlp("olad", "olad", "--daemon", "--syslog", --#ifdef __FreeBSD__ -- reinterpret_cast(0)); -+#if __cplusplus >= 201103L -+ nullptr); - #else - reinterpret_cast(NULL)); --#endif // __FreeBSD__ -+#endif // __cplusplus >= 201103L - OLA_WARN << "Failed to exec: " << strerror(errno); - _exit(1); - } diff --git a/package/ola/Config.in b/package/ola/Config.in deleted file mode 100644 index dd0be6f35e..0000000000 --- a/package/ola/Config.in +++ /dev/null @@ -1,195 +0,0 @@ -comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - -menuconfig BR2_PACKAGE_OLA - bool "ola (open lighting architecture)" - depends on BR2_INSTALL_LIBSTDCPP # protobuf - depends on !BR2_STATIC_LIBS # protobuf - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf - select BR2_PACKAGE_PROTOBUF - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Open Lighting Architecture provides applications - with a mechanism to send and receive DMX512 & RDM - commands using hardware devices and DMX over IP protocols. - - https://www.openlighting.org/ola/ - -if BR2_PACKAGE_OLA - -comment "bindings and interface" - -config BR2_PACKAGE_OLA_WEB - bool "http interface" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd - select BR2_PACKAGE_LIBMICROHTTPD - help - Build OLA with browser interface. - -config BR2_PACKAGE_OLA_PYTHON_BINDINGS - bool "python bindings" - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_PROTOBUF - help - Build OLA with support for the Python language. - -comment "tests and examples" - -config BR2_PACKAGE_OLA_EXAMPLES - bool "examples" - select BR2_PACKAGE_NCURSES - help - Build OLA examples. - -config BR2_PACKAGE_OLA_RDM_TESTS - bool "rdm tests" - depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy - select BR2_PACKAGE_PYTHON_NUMPY - help - Build OLA RDM tests. - -comment "rdm tests needs a glibc or musl toolchain w/ gcc >= 9" - depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ - !BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL - -comment "plugin selections" - -config BR2_PACKAGE_OLA_PLUGIN_ARTNET - bool "artnet" - help - Build Artnet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_DUMMY - bool "dummy" - help - Build Dummy plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_E131 - bool "acn E131" - help - Build ACN E131 plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_ESPNET - bool "espnet" - help - Build EspNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX - bool "ftdidmx" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi1 -> libusb - select BR2_PACKAGE_LIBFTDI1 - help - Build FTDI USB DMX plugin for OLA. - -comment "ftdidmx needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -config BR2_PACKAGE_OLA_PLUGIN_GPIO - bool "GPIO" - help - Build GPIO plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_KARATE - bool "karate" - help - Build Karate plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_KINET - bool "kinet" - help - Build KiNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_MILINT - bool "Milford Instruments" - help - Build Milford Instruments 1-463 plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_OPENDMX - bool "Enttec Open DMX" - help - Build Enttec Open DMX plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL - bool "Open Pixel Control" - help - Build Open Pixel Control (OPC) plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_OSC - bool "osc" - select BR2_PACKAGE_LIBLO - help - Build Open Sound Control (OSC) plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_PATHPORT - bool "pathport" - help - Build Pathport plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_RENARD - bool "renard" - help - Build Renard plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_SANDNET - bool "sandnet" - help - Build SandNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_SHOWNET - bool "shownet" - help - Build ShowNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_SPI - bool "spi" - help - Build SPI plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI - bool "stageprofi" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - help - Build StageProfi plugin for OLA. - -comment "stageprofi needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -config BR2_PACKAGE_OLA_PLUGIN_UARTDMX - bool "uartdmx" - help - Build UART Native DMX plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_USBDMX - bool "usbdmx" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - help - Build USB DMX plugin for OLA. - -comment "usbdmx needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -config BR2_PACKAGE_OLA_PLUGIN_USBPRO - bool "usbpro" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb - select BR2_PACKAGE_LIBUSB - help - Build UsbPro plugin for OLA. - -comment "usbpro needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash deleted file mode 100644 index a1a5577ed3..0000000000 --- a/package/ola/ola.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Locally calculated -sha256 44073698c147fe641507398253c2e52ff8dc7eac8606cbf286c29f37939a4ebf ola-0.10.9.tar.gz - -# License files (locally computed) -sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING -sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL -sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL -sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk deleted file mode 100644 index efaa5b6e3e..0000000000 --- a/package/ola/ola.mk +++ /dev/null @@ -1,232 +0,0 @@ -################################################################################ -# -# ola -# -################################################################################ - -OLA_VERSION = 0.10.9 -OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) -OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) -OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE -OLA_INSTALL_STAGING = YES -# Bundled Makefile.in don't link correctly, regenerate with recent automake -OLA_AUTORECONF = YES - -# util-linux provides uuid lib -OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola - -OLA_CONF_OPTS = \ - ac_cv_have_pymod_google_protobuf=yes \ - --disable-fatal-warnings \ - --disable-gcov \ - --disable-ja-rule \ - --disable-java-libs \ - --disable-root-check \ - --disable-tcmalloc \ - --disable-unittests \ - --with-ola-protoc-plugin=$(HOST_DIR)/bin/ola_protoc_plugin - -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex - -# When building the host part, disable as much as possible to speed up -# the configure step and avoid missing host dependencies. -HOST_OLA_CONF_OPTS = \ - --disable-all-plugins \ - --disable-osc \ - --disable-uart \ - --disable-libusb \ - --disable-libftdi \ - --disable-http \ - --disable-examples \ - --disable-unittests \ - --disable-doxygen-html \ - --disable-doxygen-doc \ - --disable-fatal-warnings - -# On the host side, we only need ola_protoc_plugin, so build and install this -# only. -HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin -define HOST_OLA_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/bin/ola_protoc_plugin -endef - -# sets where to find python libs built for target and required by ola -OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -OLA_DEPENDENCIES += libexecinfo -OLA_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" -endif - -## OLA Bindings and Interface selections - -ifeq ($(BR2_PACKAGE_OLA_WEB),y) -OLA_CONF_OPTS += --enable-http -OLA_DEPENDENCIES += libmicrohttpd -else -OLA_CONF_OPTS += --disable-http -endif - -ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) -OLA_CONF_OPTS += --enable-python-libs -OLA_DEPENDENCIES += python3 python-protobuf -else -OLA_CONF_OPTS += --disable-python-libs -endif - -## OLA Examples and Tests - -ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) -OLA_CONF_OPTS += --enable-examples -OLA_DEPENDENCIES += ncurses -else -OLA_CONF_OPTS += --disable-examples -endif - -ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) -OLA_CONF_OPTS += --enable-rdm-tests -OLA_DEPENDENCIES += python-numpy -# needed as numpy builds some shared libraries and ola checks for -# numpy using a host python test program which fails with 'wrong ELF -# class'. -OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes -else -OLA_CONF_OPTS += --disable-rdm-tests -endif - -## OLA Plugin selections - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) -OLA_CONF_OPTS += --enable-artnet -else -OLA_CONF_OPTS += --disable-artnet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) -OLA_CONF_OPTS += --enable-dummy -else -OLA_CONF_OPTS += --disable-dummy -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) -OLA_CONF_OPTS += --enable-e131 -else -OLA_CONF_OPTS += --disable-e131 -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) -OLA_CONF_OPTS += --enable-espnet -else -OLA_CONF_OPTS += --disable-espnet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) -OLA_CONF_OPTS += --enable-ftdidmx -OLA_DEPENDENCIES += libftdi1 -else -OLA_CONF_OPTS += --disable-ftdidmx -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) -OLA_CONF_OPTS += --enable-gpio -else -OLA_CONF_OPTS += --disable-gpio -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) -OLA_CONF_OPTS += --enable-karate -else -OLA_CONF_OPTS += --disable-karate -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) -OLA_CONF_OPTS += --enable-kinet -else -OLA_CONF_OPTS += --disable-kinet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) -OLA_CONF_OPTS += --enable-milinst -else -OLA_CONF_OPTS += --disable-milinst -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) -OLA_CONF_OPTS += --enable-opendmx -else -OLA_CONF_OPTS += --disable-opendmx -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) -OLA_CONF_OPTS += --enable-openpixelcontrol -else -OLA_CONF_OPTS += --disable-openpixelcontrol -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) -OLA_CONF_OPTS += --enable-osc -OLA_DEPENDENCIES += liblo -else -OLA_CONF_OPTS += --disable-osc -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) -OLA_CONF_OPTS += --enable-pathport -else -OLA_CONF_OPTS += --disable-pathport -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) -OLA_CONF_OPTS += --enable-renard -else -OLA_CONF_OPTS += --disable-renard -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) -OLA_CONF_OPTS += --enable-sandnet -else -OLA_CONF_OPTS += --disable-sandnet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) -OLA_CONF_OPTS += --enable-shownet -else -OLA_CONF_OPTS += --disable-shownet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) -OLA_CONF_OPTS += --enable-spi -else -OLA_CONF_OPTS += --disable-spi -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) -OLA_CONF_OPTS += --enable-stageprofi --enable-libusb -OLA_DEPENDENCIES += libusb -else -OLA_CONF_OPTS += --disable-stageprofi -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) -OLA_CONF_OPTS += --enable-uartdmx -else -OLA_CONF_OPTS += --disable-uartdmx -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) -OLA_CONF_OPTS += --enable-usbdmx --enable-libusb -OLA_DEPENDENCIES += libusb -else -OLA_CONF_OPTS += --disable-usbdmx -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) -OLA_CONF_OPTS += --enable-usbpro --enable-libusb -OLA_DEPENDENCIES += libusb -else -OLA_CONF_OPTS += --disable-usbpro -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index 4ad88991f2..4b0968cd7d 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -8,8 +8,6 @@ OLSR_VERSION = 0.9.8 OLSR_SITE = $(call github,OLSR,olsrd,v$(OLSR_VERSION)) OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ mdns nameservice netjson poprouting p2pd pgraph secure txtinfo watchdog -# Doesn't really need quagga but not very useful without it -OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) OLSR_LICENSE = BSD-3-Clause OLSR_LICENSE_FILES = license.txt OLSR_DEPENDENCIES = host-flex host-bison diff --git a/package/oniguruma/oniguruma.hash b/package/oniguruma/oniguruma.hash index ac1d375b7a..be49a4d4e7 100644 --- a/package/oniguruma/oniguruma.hash +++ b/package/oniguruma/oniguruma.hash @@ -1,4 +1,4 @@ -# From https://github.com/kkos/oniguruma/releases/download/v6.9.9/onig-6.9.9.tar.gz.sha256 -sha256 60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf onig-6.9.9.tar.gz +# From https://github.com/kkos/oniguruma/releases/download/v6.9.10/onig-6.9.10.tar.gz.sha256 +sha256 2a5cfc5ae259e4e97f86b68dfffc152cdaffe94e2060b770cb827238d769fc05 onig-6.9.10.tar.gz # Hash for license file sha256 70ba5469ea0bab6e18a32d7009068f996503168d27be57747e08da34337ff26f COPYING diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index e056048cb5..32eff4cc75 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONIGURUMA_VERSION = 6.9.9 +ONIGURUMA_VERSION = 6.9.10 ONIGURUMA_SITE = \ https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz diff --git a/package/open-plc-utils/open-plc-utils.hash b/package/open-plc-utils/open-plc-utils.hash index 0ab661231a..bcb5253bb9 100644 --- a/package/open-plc-utils/open-plc-utils.hash +++ b/package/open-plc-utils/open-plc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4b1b55896939f178321ffe1ec2dc6937ea688d577b3671a5f0edb5c3326dfa3d open-plc-utils-1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2.tar.gz +sha256 e02ffc2d2abde6f31c183b0717742c243b5746d0dbe9ffaa38f6154f14a1bd4d open-plc-utils-46c3506453c15b873fd6ed3e76c9872cea5e143a.tar.gz sha256 3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921 LICENSE diff --git a/package/open-plc-utils/open-plc-utils.mk b/package/open-plc-utils/open-plc-utils.mk index 086552e09b..1c0d213278 100644 --- a/package/open-plc-utils/open-plc-utils.mk +++ b/package/open-plc-utils/open-plc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN_PLC_UTILS_VERSION = 1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2 +OPEN_PLC_UTILS_VERSION = 46c3506453c15b873fd6ed3e76c9872cea5e143a OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION)) OPEN_PLC_UTILS_LICENSE = BSD-3-Clause OPEN_PLC_UTILS_LICENSE_FILES = LICENSE diff --git a/package/open2300/open2300.hash b/package/open2300/open2300.hash index f8b1150694..94be6a47ea 100644 --- a/package/open2300/open2300.hash +++ b/package/open2300/open2300.hash @@ -1,4 +1,4 @@ -# Localy computed +# Locally computed sha256 ffa7f8d35b16abfbf5e52285cb21f2a7fc6afb901abb40c0c80eef9d23d08aab open2300-f21982e0b1f8321561e5ad1668307fde97700e1b.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/open62541/Config.in b/package/open62541/Config.in index 296be1578d..a5c07d5043 100644 --- a/package/open62541/Config.in +++ b/package/open62541/Config.in @@ -88,7 +88,7 @@ config BR2_PACKAGE_OPEN62541_PUBSUB_DELTAFRAMES The PubSub messages differentiate between keyframe (all published values contained) and deltaframe (only changed values contained) messages. Deltaframe messages creation - consumes some additional ressources. + consumes some additional resources. config BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL bool "publish/subscribe information model" diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 01ea652f92..3beead1a20 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dab44ad50b10cc5f9e9e1f44f0510e0c5f7a8226c6bba821babafc5a79acdc2d open62541-v1.3.12-git4.tar.gz +sha256 a8719f299505b144bd68bf557ad0b023fa28faf8862ff2d0b171381c8bd278c3 open62541-v1.3.15-git4.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 92ce3b852b..0d1abf724a 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.12 +OPEN62541_VERSION = v1.3.15 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES diff --git a/package/openal/Config.in b/package/openal/Config.in index 6b0e9973db..648b855471 100644 --- a/package/openal/Config.in +++ b/package/openal/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_OPENAL_ARCH_SUPPORTS config BR2_PACKAGE_OPENAL bool "openal" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 PR56019 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS help @@ -27,8 +27,8 @@ config BR2_PACKAGE_OPENAL http://kcat.strangesoft.net/openal.html -comment "openal needs a toolchain w/ NPTL, C++, gcc >= 4.9" +comment "openal needs a toolchain w/ NPTL, C++, gcc >= 7" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/openal/openal.hash b/package/openal/openal.hash index eae78b0582..ea4664c492 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 814831a8013d7365dfd1917b27f1fb6e723f3be3fe1c6a7ff4516425d8392f68 openal-1.22.0.tar.gz +sha256 7e1fecdeb45e7f78722b776c5cf30bd33934b961d7fd2a11e0494e064cc631ce openal-1.24.3.tar.gz sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING diff --git a/package/openal/openal.mk b/package/openal/openal.mk index 3d624139c2..d01a6f4b2f 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENAL_VERSION = 1.22.0 +OPENAL_VERSION = 1.24.3 OPENAL_SITE = $(call github,kcat,openal-soft,$(OPENAL_VERSION)) OPENAL_LICENSE = LGPL-2.0+ OPENAL_LICENSE_FILES = COPYING diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index 4439896b14..965d7458ba 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.28 -md5 0f54185b6ef804173c01b9a40520a0e8 openblas-0.3.28.tar.gz +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.30 +md5 8db3d57f4d4485c6ae3f21ea465660e7 openblas-0.3.30.tar.gz # Locally calculated -sha256 f1003466ad074e9b0c8d421a204121100b0751c96fc6fcf3d1456bd12f8a00a1 openblas-0.3.28.tar.gz +sha256 27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d openblas-0.3.30.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index a1f631e6b3..edab26493d 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.28 +OPENBLAS_VERSION = 0.3.30 OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 184444a53a..a8f56c5a43 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 22921fd23ca72a21ac5592861d64e7ea53cd8a705fccd73905911f8489519a0b opencl-clhpp-2024.05.08.tar.gz +sha256 c1031afde6e9eb042e6fcfbc17078f4b437a7e8d55482a1ca6e0fa762d262a89 opencl-clhpp-2025.07.22.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 2b5d5afa4b..dbe90f6b41 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,12 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2024.05.08 +# The opencl-headers, opencl-icd-loader, and opencl-clhpp packages +# must always be updated together to compatible versions. +# Version desynchronization may result in build or runtime errors. +# When updating one of them, make sure to check and update the others. + +OPENCL_CLHPP_VERSION = 2025.07.22 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in new file mode 100644 index 0000000000..677349f727 --- /dev/null +++ b/package/opencl-headers/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_OPENCL_HEADERS + bool "opencl-headers" + help + C language headers for the OpenCL API + + https://github.com/KhronosGroup/OpenCL-Headers diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash new file mode 100644 index 0000000000..535884f68e --- /dev/null +++ b/package/opencl-headers/opencl-headers.hash @@ -0,0 +1,3 @@ +#Locally generated +sha256 98f0a3ea26b4aec051e533cb1750db2998ab8e82eda97269ed6efe66ec94a240 OpenCL-Headers-2025.07.22.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk new file mode 100644 index 0000000000..92f6a7fb1a --- /dev/null +++ b/package/opencl-headers/opencl-headers.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# opencl-headers +# +################################################################################ + +# The opencl-headers, opencl-icd-loader, and opencl-clhpp packages +# must always be updated together to compatible versions. +# Version desynchronization may result in build or runtime errors. +# When updating one of them, make sure to check and update the others. + +OPENCL_HEADERS_VERSION = 2025.07.22 +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) +OPENCL_HEADERS_LICENSE = Apache-2.0 +OPENCL_HEADERS_LICENSE_FILES = LICENSE +OPENCL_HEADERS_INSTALL_STAGING = YES +OPENCL_HEADERS_INSTALL_TARGET = NO + +define OPENCL_HEADERS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/CL + $(INSTALL) -D -m 0644 $(@D)/CL/* \ + $(STAGING_DIR)/usr/include/CL +endef + +$(eval $(generic-package)) diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in new file mode 100644 index 0000000000..405dc5401a --- /dev/null +++ b/package/opencl-icd-loader/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_OPENCL_ICD_LOADER + bool "OpenCL-ICD-Loader" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBOPENCL + select BR2_PACKAGE_OPENCL_HEADERS + help + OpenCL defines an Installable Client Driver (ICD) mechanism to + allow developers to build applications against an Installable + Client Driver loader (ICD loader) rather than linking their + applications against a specific OpenCL implementation. + + https://github.com/KhronosGroup/OpenCL-ICD-Loader diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash new file mode 100644 index 0000000000..347cfe6e91 --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.hash @@ -0,0 +1,3 @@ +# locally generated +sha256 dff7a0b11ad5b63a669358e3476e3dc889a4a361674e5b69b267b944d0794142 OpenCL-ICD-Loader-2025.07.22.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk new file mode 100644 index 0000000000..222f051a75 --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# opencl-icd-loader +# +################################################################################ + +# The opencl-headers, opencl-icd-loader, and opencl-clhpp packages +# must always be updated together to compatible versions. +# Version desynchronization may result in build or runtime errors. +# When updating one of them, make sure to check and update the others. +OPENCL_ICD_LOADER_VERSION = 2025.07.22 +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE +OPENCL_ICD_LOADER_INSTALL_STAGING = YES + +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers + +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include + +$(eval $(cmake-package)) diff --git a/package/openconnect/openconnect.mk b/package/openconnect/openconnect.mk index 3fd9f990b0..73716d708e 100644 --- a/package/openconnect/openconnect.mk +++ b/package/openconnect/openconnect.mk @@ -9,6 +9,7 @@ OPENCONNECT_SITE = https://www.infradead.org/openconnect/download OPENCONNECT_DEPENDENCIES = host-pkgconf libxml2 zlib OPENCONNECT_LICENSE = LGPL-2.1 OPENCONNECT_LICENSE_FILES = COPYING.LGPL +OPENCONNECT_CPE_ID_VENDOR = infradead OPENCONNECT_CONF_OPTS = \ --disable-dsa-tests \ --with-vpnc-script=/etc/vpnc/vpnc-script \ diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash index 865580968b..52d07fefc4 100644 --- a/package/opencsd/opencsd.hash +++ b/package/opencsd/opencsd.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 1df9b61656ac96bc5cca082d8c32a9f25ed07ef684d7d666911280cf162b7d93 opencsd-1.5.5.tar.gz +sha256 e940e7ddd4e3c723c8dbe614e0728e20cb19729d44bb55cdb016abd6ad221bfd opencsd-1.6.1.tar.gz sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk index 9714bb970a..a7a24587ee 100644 --- a/package/opencsd/opencsd.mk +++ b/package/opencsd/opencsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCSD_VERSION = 1.5.5 +OPENCSD_VERSION = 1.6.1 OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) OPENCSD_LICENSE = BSD-3-Clause OPENCSD_LICENSE_FILES = LICENSE diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index 2ce548f095..c4c5d22a54 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -63,15 +63,6 @@ choice config BR2_PACKAGE_OPENCV3_GUI_NONE bool "none" -config BR2_PACKAGE_OPENCV3_WITH_GTK - bool "gtk2" - depends on BR2_PACKAGE_LIBGTK2 - -comment "gtk2 support needs libgtk2" - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK2 - config BR2_PACKAGE_OPENCV3_WITH_GTK3 bool "gtk3" depends on BR2_PACKAGE_LIBGTK3 @@ -290,14 +281,14 @@ config BR2_PACKAGE_OPENCV3_WITH_PNG config BR2_PACKAGE_OPENCV3_WITH_PROTOBUF bool "protobuf support" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF help Use shared protobuf from the target system. -comment "protobuf support needs a toolchain w/ gcc >= 4.8" +comment "protobuf support needs a toolchain w/ gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV3_WITH_TIFF bool "tiff support" diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 3d6fd2ed8a..b378e7050f 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz -sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE +sha256 b9eda448a08ba7b10bfd5bd45697056569ebdf7a02070947e1c1f3e8e69280cd opencv3-3.4.20.tar.gz +sha256 3f221dbe2ca9228d6470990ed28e55957e8506335df4620539c4db0dd27a6b4c LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 5064496ca6..8a862a47b1 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.19 +OPENCV3_VERSION = 3.4.20 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause @@ -215,6 +215,7 @@ OPENCV3_CONF_OPTS += \ -DWITH_GDAL=OFF \ -DWITH_GPHOTO2=OFF \ -DWITH_GSTREAMER_0_10=OFF \ + -DWITH_GTK_2_X=OFF \ -DWITH_LAPACK=OFF \ -DWITH_MATLAB=OFF \ -DWITH_OPENCL=OFF \ @@ -244,18 +245,11 @@ else OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK)$(BR2_PACKAGE_OPENCV3_WITH_GTK3),) -OPENCV3_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK),y) -OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON -OPENCV3_DEPENDENCIES += libgtk2 -endif - ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK3),y) -OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF +OPENCV3_CONF_OPTS += -DWITH_GTK=ON OPENCV3_DEPENDENCIES += libgtk3 +else +OPENCV3_CONF_OPTS += -DWITH_GTK=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_JASPER),y) diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash index 05c30ea250..dc9e810318 100644 --- a/package/opencv4-contrib/opencv4-contrib.hash +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 65597f8fb8dc2b876c1b45b928bbcc5f772ddbaf97539bf1b737623d0604cba1 opencv4-contrib-4.10.0.tar.gz +sha256 4197722b4c5ed42b476d42e29beb29a52b6b25c34ec7b4d589c3ae5145fee98e opencv4-contrib-4.12.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index ed00a317c9..c1273237aa 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -4,7 +4,8 @@ # ################################################################################ -OPENCV4_CONTRIB_VERSION = 4.10.0 +# When updating the version, please also update opencv4 +OPENCV4_CONTRIB_VERSION = 4.12.0 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index f6976d8fb5..a553411e1a 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -35,14 +35,16 @@ config BR2_PACKAGE_OPENCV4_LIB_DNN # dnn needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_OPENCV4_WITH_PROTOBUF help Include opencv_dnn (Deep Neural Networks) module into the OpenCV build. -comment "dnn needs a glibc or musl toolchain" +comment "dnn needs a glibc or musl toolchain, gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_LIB_FEATURES2D bool "features2d" @@ -79,15 +81,6 @@ choice config BR2_PACKAGE_OPENCV4_GUI_NONE bool "none" -config BR2_PACKAGE_OPENCV4_WITH_GTK - bool "gtk2" - depends on BR2_PACKAGE_LIBGTK2 - -comment "gtk2 support needs libgtk2" - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK2 - config BR2_PACKAGE_OPENCV4_WITH_GTK3 bool "gtk3" depends on BR2_PACKAGE_LIBGTK3 @@ -155,6 +148,7 @@ config BR2_PACKAGE_OPENCV4_LIB_OBJDETECT bool "objdetect" depends on !BR2_TOOLCHAIN_USES_UCLIBC # dnn support depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # dnn support + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # dnn support # opencv_core dependency is already enabled select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_DNN @@ -204,6 +198,7 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE config BR2_PACKAGE_OPENCV4_LIB_STITCHING bool "stitching" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # objdetect depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D @@ -333,6 +328,7 @@ config BR2_PACKAGE_OPENCV4_WITH_PNG config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF bool "protobuf support" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF help Use shared protobuf from the target system. diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index ae407e4381..a39b199166 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9 opencv4-4.10.0.tar.gz +sha256 44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d opencv4-4.12.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index 989d32b91b..9691eb78e8 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,8 @@ # ################################################################################ -OPENCV4_VERSION = 4.10.0 +# When updating the version, please also update opencv4-contrib +OPENCV4_VERSION = 4.12.0 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0 @@ -210,6 +211,7 @@ OPENCV4_CONF_OPTS += \ -DWITH_GDAL=OFF \ -DWITH_GPHOTO2=OFF \ -DWITH_GSTREAMER_0_10=OFF \ + -DWITH_GTK_2_X=OFF \ -DWITH_LAPACK=OFF \ -DWITH_MATLAB=OFF \ -DWITH_OPENCL=OFF \ @@ -315,18 +317,11 @@ else OPENCV4_CONF_OPTS += -DWITH_GSTREAMER=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK)$(BR2_PACKAGE_OPENCV4_WITH_GTK3),) -OPENCV4_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK),y) -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON -OPENCV4_DEPENDENCIES += libgtk2 -endif - ifeq ($(BR2_PACKAGE_OPENCV4_WITH_GTK3),y) -OPENCV4_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF +OPENCV4_CONF_OPTS += -DWITH_GTK=ON OPENCV4_DEPENDENCIES += libgtk3 +else +OPENCV4_CONF_OPTS += -DWITH_GTK=OFF endif ifeq ($(BR2_PACKAGE_OPENCV4_WITH_JPEG),y) diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk new file mode 100644 index 0000000000..e6c74cf6d8 --- /dev/null +++ b/package/openjdk-bin/openjdk-bin.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# host-openjdk-bin +# +################################################################################ + +ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 21 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.4 +HOST_OPENJDK_BIN_VERSION_BUILD = 7 +else +HOST_OPENJDK_BIN_VERSION_MAJOR = 17 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12 +HOST_OPENJDK_BIN_VERSION_BUILD = 7 +endif + +ifeq ($(HOSTARCH),x86_64) +HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME = x64 +endif +ifeq ($(HOSTARCH),aarch64) +HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME = aarch64 +endif + +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR)_$(HOST_OPENJDK_BIN_VERSION_BUILD) +HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_$(HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME)_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) + +HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception +HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION + +HOST_OPENJDK_BIN_ROOT_DIR = $(HOST_DIR)/lib/jvm + +# unpack200 has an invalid RPATH and relies on libzlib. When +# host-libzlib is installed on the system, the error "ERROR: package +# host-libzlib installs executables without proper RPATH: will occur. +# Because unpack200 is a deprecated tool, removing it to fix this +# issue is safe. +define HOST_OPENJDK_BIN_INSTALL_CMDS + mkdir -p $(HOST_OPENJDK_BIN_ROOT_DIR) + cp -dpfr $(@D)/* $(HOST_OPENJDK_BIN_ROOT_DIR) + $(RM) -f $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/unpack200 +endef + +$(eval $(host-generic-package)) + +# variables used by other packages +JAVAC = $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/javac diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 446e4aa3c2..6868ca191d 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,12 +6,15 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) OPENJDK_VERSION_MAJOR = 21 -OPENJDK_VERSION_MINOR = 0.4+7 +OPENJDK_VERSION_MINOR = 0.4 +OPENJDK_VERSION_BUILD = 7 + else OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.12+7 +OPENJDK_VERSION_MINOR = 0.12 +OPENJDK_VERSION_BUILD = 7 endif -OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)+$(OPENJDK_VERSION_BUILD) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) OPENJDK_LICENSE = GPL-2.0+ with exception @@ -106,8 +109,8 @@ OPENJDK_CONF_OPTS = \ --with-native-debug-symbols=none \ --without-version-pre \ --with-sysroot=$(STAGING_DIR) \ - --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ - --with-version-string="$(OPENJDK_VERSION_MAJOR)" + --with-version-build="$(OPENJDK_VERSION_BUILD)" \ + --with-version-string="$(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)" # If building for AArch64, use the provided CPU port. ifeq ($(BR2_aarch64),y) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index 1e72054724..3fda2a243b 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a openjpeg-2.5.2.tar.gz +sha256 a695fbe19c0165f295a8531b1e4e855cd94d0875d2f88ec4b61080677e27188a openjpeg-2.5.4.tar.gz sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index e7cb7505e9..bc5d8143a6 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENJPEG_VERSION = 2.5.2 +OPENJPEG_VERSION = 2.5.4 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 44c1160019..50f4dbe849 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 30510a365596372cc622f68452610a2150577e8b4416934e396683ad5de013c8 v10.2.1-package.zip +sha256 ff847580458b10c85dcb38699733368d67037f855fcb6a5fce46e6412737cf67 v10.5.0-package.zip sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 1abed9c6b5..e62ea35fd4 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 10.2.1 +OPENLAYERS_VERSION = 10.5.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 32bd83f349..69c3e978b1 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,5 +1,5 @@ # Verified by locally checking against the SHA3-512 hash available in -# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.18.sha3-512 +# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.19.sha3-512 # Locally computed -sha256 2670ae43d8d99dd6b1ba182101d982350d613d09c098eb1607ea6b36e6b51d3e openldap-2.5.18.tgz +sha256 56e2936c7169aa7547cfc93d5c87db46aa05e98dee6321590c3ada92e1fbb66c openldap-2.5.19.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 68cfb89c41..da67562a40 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.5.18 +OPENLDAP_VERSION = 2.5.19 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index 567ffe4833..78c60b2bf1 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ # From: https://www.open-mpi.org/software/ompi/v4.1/ -md5 bb045df2d600744c2231c78b31a20da3 openmpi-4.1.5.tar.bz2 -sha1 eba2e6f9ee0c39fbca0a8cf53a79c9ed29643284 openmpi-4.1.5.tar.bz2 -sha256 a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3 openmpi-4.1.5.tar.bz2 +md5 72e95168a62a5b951da9afe4f48b0be9 openmpi-4.1.8.tar.bz2 +sha1 821df691e2c37ecc40b2784237cfdfda734bf13a openmpi-4.1.8.tar.bz2 +sha256 466f68e3132a1dc02710cc2011fafced8336d98359fa2dae4dddcfd5719f12a9 openmpi-4.1.8.tar.bz2 # Locally computed sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 82a4b3eb1c..eab87b5987 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -5,7 +5,7 @@ ################################################################################ OPENMPI_VERSION_MAJOR = 4.1 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).5 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).8 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause diff --git a/package/openocd/0002-openocd-revert-workarounds-for-expr-syntax-change.patch b/package/openocd/0002-openocd-revert-workarounds-for-expr-syntax-change.patch new file mode 100644 index 0000000000..a80f5d57cf --- /dev/null +++ b/package/openocd/0002-openocd-revert-workarounds-for-expr-syntax-change.patch @@ -0,0 +1,131 @@ +From 95603fae18f81eebdafc5b318e70f9e2cdefab9e Mon Sep 17 00:00:00 2001 +From: Antonio Borneo +Date: Sun, 18 Dec 2022 19:15:57 +0100 +Subject: [PATCH] openocd: revert workarounds for 'expr' syntax change + +With OpenOCD v0.12.0 released, drop the workarounds for 'expr' +syntax change by reverting: +- commit 320043c054dc ("openocd: fix for polling during "expr" + computation"); +- commit c7eaaf620488 ("openocd: prepare for jimtcl 0.81 'expr' + syntax change"). + +Replace the call to target_call_timer_callbacks_now() with call +to target_call_timer_callbacks(). + +Change-Id: Iae5afc50e3f688e11176a52648efc9a6577a9a11 +Signed-off-by: Antonio Borneo +Reviewed-on: https://review.openocd.org/c/openocd/+/7405 +Tested-by: jenkins + +Upstream: https://github.com/openocd-org/openocd/commit/95603fae18f81eebdafc5b318e70f9e2cdefab9e + +Signed-off-by: Bernd Kuhls +--- + src/helper/command.c | 14 +---------- + src/openocd.c | 60 -------------------------------------------- + 2 files changed, 1 insertion(+), 73 deletions(-) + +diff --git a/src/helper/command.c b/src/helper/command.c +index 6898e2d7c6..ca66cf7dd1 100644 +--- a/src/helper/command.c ++++ b/src/helper/command.c +@@ -936,19 +936,7 @@ static int jim_command_dispatch(Jim_Interp *interp, int argc, Jim_Obj * const *a + if (!command_can_run(cmd_ctx, c, Jim_GetString(argv[0], NULL))) + return JIM_ERR; + +- /* +- * TODO: to be removed after v0.12.0 +- * workaround for https://sourceforge.net/p/openocd/tickets/362/ +- * After syntax change of "expr" in jimtcl 0.81 +- * the replacement of jimtcl "expr" with openocd version in +- * https://review.openocd.org/6510/ +- * introduces too many target polling during math expressions with +- * "expr" commands. +- * After v0.12.0 replace the following two lines with +- * target_call_timer_callbacks(); +- */ +- if (strcmp(c->name, "expr")) +- target_call_timer_callbacks_now(); ++ target_call_timer_callbacks(); + + /* + * Black magic of overridden current target: +diff --git a/src/openocd.c b/src/openocd.c +index bef084f980..875da5a62c 100644 +--- a/src/openocd.c ++++ b/src/openocd.c +@@ -230,65 +230,6 @@ static int openocd_register_commands(struct command_context *cmd_ctx) + return register_commands(cmd_ctx, NULL, openocd_command_handlers); + } + +-/* +- * TODO: to be removed after v0.12.0 +- * workaround for syntax change of "expr" in jimtcl 0.81 +- * replace "expr" with openocd version that prints the deprecated msg +- */ +-struct jim_scriptobj { +- void *token; +- Jim_Obj *filename_obj; +- int len; +- int subst_flags; +- int in_use; +- int firstline; +- int linenr; +- int missing; +-}; +- +-static int jim_expr_command(Jim_Interp *interp, int argc, Jim_Obj * const *argv) +-{ +- if (argc == 2) +- return Jim_EvalExpression(interp, argv[1]); +- +- if (argc > 2) { +- Jim_Obj *obj = Jim_ConcatObj(interp, argc - 1, argv + 1); +- Jim_IncrRefCount(obj); +- const char *s = Jim_String(obj); +- struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->currentScriptObj); +- if (interp->currentScriptObj == interp->emptyObj || +- strcmp(interp->currentScriptObj->typePtr->name, "script") || +- script->subst_flags || +- script->filename_obj == interp->emptyObj) +- LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s); +- else +- LOG_WARNING("DEPRECATED! (%s:%d) use 'expr { %s }' not 'expr %s'", +- Jim_String(script->filename_obj), script->linenr, s, s); +- int retcode = Jim_EvalExpression(interp, obj); +- Jim_DecrRefCount(interp, obj); +- return retcode; +- } +- +- Jim_WrongNumArgs(interp, 1, argv, "expression ?...?"); +- return JIM_ERR; +-} +- +-static const struct command_registration expr_handler[] = { +- { +- .name = "expr", +- .jim_handler = jim_expr_command, +- .mode = COMMAND_ANY, +- .help = "", +- .usage = "", +- }, +- COMMAND_REGISTRATION_DONE +-}; +- +-static int workaround_for_jimtcl_expr(struct command_context *cmd_ctx) +-{ +- return register_commands(cmd_ctx, NULL, expr_handler); +-} +- + struct command_context *global_cmd_ctx; + + static struct command_context *setup_command_handler(Jim_Interp *interp) +@@ -301,7 +242,6 @@ static struct command_context *setup_command_handler(Jim_Interp *interp) + /* register subsystem commands */ + typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value); + static const command_registrant_t command_registrants[] = { +- &workaround_for_jimtcl_expr, + &openocd_register_commands, + &server_register_commands, + &gdb_register_commands, diff --git a/package/openocd/0003-openocd-fix-build-with-jimtcl-0.83.patch b/package/openocd/0003-openocd-fix-build-with-jimtcl-0.83.patch new file mode 100644 index 0000000000..f7d2ffe065 --- /dev/null +++ b/package/openocd/0003-openocd-fix-build-with-jimtcl-0.83.patch @@ -0,0 +1,50 @@ +From 73390332d203f02aa5b9798a7550191d55650d97 Mon Sep 17 00:00:00 2001 +From: Antonio Borneo +Date: Fri, 27 Sep 2024 22:36:52 +0200 +Subject: [PATCH] openocd: fix build with jimtcl 0.83 + +In jimtcl 0.82, the include file jim.h included in turn stdio.h +This made redundant to include the former in openocd source files. +Since jimtcl 0.83, jim.h drops the include of stdio.h, causing +openocd build to fail. + +Include stdio.h in the files that need it. + +Change-Id: Ic81c9b273d7520f4d2d8c32bc3e0a6bcfffb67ed +Signed-off-by: Antonio Borneo +Reviewed-on: https://review.openocd.org/c/openocd/+/8512 +Reviewed-by: Jonathan McDowell +Tested-by: jenkins + +Upstream: https://github.com/openocd-org/openocd/commit/73390332d203f02aa5b9798a7550191d55650d97 + +Signed-off-by: Bernd Kuhls +--- + src/helper/configuration.h | 1 + + src/helper/jim-nvp.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/helper/configuration.h b/src/helper/configuration.h +index 295ea591d6..d646670eb3 100644 +--- a/src/helper/configuration.h ++++ b/src/helper/configuration.h +@@ -11,6 +11,7 @@ + #ifndef OPENOCD_HELPER_CONFIGURATION_H + #define OPENOCD_HELPER_CONFIGURATION_H + ++#include + #include + + int parse_cmdline_args(struct command_context *cmd_ctx, +diff --git a/src/helper/jim-nvp.c b/src/helper/jim-nvp.c +index e1ab64ae5b..cdd4d34291 100644 +--- a/src/helper/jim-nvp.c ++++ b/src/helper/jim-nvp.c +@@ -21,6 +21,7 @@ + #endif + + #include "jim-nvp.h" ++#include + #include + + int jim_get_nvp(Jim_Interp *interp, diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 6b9f5541cd..a563cc6a9e 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -33,6 +33,9 @@ OPENOCD_LICENSE_FILES = \ LICENSES/preferred/MIT \ LICENSES/stand-alone/GPL-3.0 +OPENOCD_CPE_ID_VENDOR = openocd +OPENOCD_CPE_ID_PRODUCT = open_on-chip_debugger + # 0001-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" @@ -55,7 +58,6 @@ OPENOCD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ - $(if $(BR2_PACKAGE_LIBHID),libhid) \ $(if $(BR2_PACKAGE_HIDAPI),hidapi) ifeq ($(BR2_PACKAGE_LIBGPIOD),y) diff --git a/package/openrc/0007-allow-setting-rc_libexecdir-path.patch b/package/openrc/0007-allow-setting-rc_libexecdir-path.patch index a11c789275..5787c26dde 100644 --- a/package/openrc/0007-allow-setting-rc_libexecdir-path.patch +++ b/package/openrc/0007-allow-setting-rc_libexecdir-path.patch @@ -4,12 +4,12 @@ Date: Wed, 8 Sep 2021 22:41:58 +0200 Subject: [PATCH] allow setting rc_libexecdir path - Allow to change the rc dir name of the rc_libexecdir path - - Introduce a librcdir option for override with value 'rc' + - Introduce a librcdir option for override with value 'rc'6 Upstream: https://github.com/OpenRC/openrc/pull/443 Signed-off-by: artoo -[Adam: update for 0.50] +[Adam: update for 0.56] Signed-off-by: Adam Duskett --- meson.build | 2 +- @@ -20,10 +20,10 @@ diff --git a/meson.build b/meson.build index 5b3f8fa..40d4be1 100644 --- a/meson.build +++ b/meson.build -@@ -102,7 +102,7 @@ if os == 'Linux' and libexecdir == 'libexec' - libexecdir = 'lib' - endif - libexecdir = rootprefix / libexecdir +@@ -85,7 +85,7 @@ bindir = get_option('prefix') / get_option('bindir') + libdir = get_option('prefix') / get_option('libdir') + pluginsdir = libdir / 'rc/plugins' + libexecdir = get_option('prefix') / get_option('libexecdir') -rc_libexecdir = libexecdir / 'rc' +rc_libexecdir = libexecdir / get_option('librcdir') rc_bindir = rc_libexecdir / 'bin' @@ -33,8 +33,8 @@ diff --git a/meson_options.txt b/meson_options.txt index 2c74152..d2f67e4 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -37,3 +37,5 @@ option('termcap', type : 'combo', - description : 'the termcap library to use') +@@ -26,3 +26,5 @@ option('sysvinit', type : 'boolean', value : false, + description : 'enable SysVinit compatibility (linux only)') option('zsh-completions', type : 'boolean', description : 'install zsh completions') +option('librcdir', type : 'string', value : 'rc', diff --git a/package/openrc/Config.in b/package/openrc/Config.in index 42d7347b0e..e1f004212b 100644 --- a/package/openrc/Config.in +++ b/package/openrc/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_OPENRC select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools select BR2_PACKAGE_KMOD # runtime select BR2_PACKAGE_KMOD_TOOLS # runtime + select BR2_PACKAGE_LIBCAP # runtime select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NCURSES help diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash index c1c16a8c45..85e869f82a 100644 --- a/package/openrc/openrc.hash +++ b/package/openrc/openrc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b911eee4e64ad5e6945c6fed572220d537dfd0108838fa6d6797a2d7ff9f052 openrc-0.52.1.tar.gz +sha256 a06b530290057637eab17fc943cbf79c0335eb734ba71ece38b9f3acd8a341d4 openrc-0.56.tar.gz sha256 6ac2bf77510808fbec7dc86cbfbca98dfc4c6b47dc99e4ca77b5370e097d8e70 LICENSE diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 69f5b3a121..67846ce0ea 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -4,22 +4,28 @@ # ################################################################################ -OPENRC_VERSION = 0.52.1 +OPENRC_VERSION = 0.56 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE OPENRC_CPE_ID_VALID = YES -OPENRC_DEPENDENCIES = ncurses +OPENRC_DEPENDENCIES = libcap ncurses OPENRC_CONF_OPTS = \ -Dos=Linux \ -Dlibrcdir=/usr/libexec/rc \ -Dpkgconfig=false \ -Dsysvinit=true \ - -Drootprefix=/ \ -Dbranding="\"Buildroot $(BR2_VERSION_FULL)\"" +ifeq ($(BR2_PACKAGE_AUDIT),y) +OPENRC_CONF_OPTS += -Daudit=enabled +OPENRC_DEPENDENCIES += audit +else +OPENRC_CONF_OPTS += -Daudit=disabled +endif + ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) OPENRC_CONF_OPTS += -Dbash-completions=true else @@ -44,12 +50,6 @@ else OPENRC_CONF_OPTS += -Dpam=false endif -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -OPENRC_CONF_OPTS += -Dsplit-usr=false -else -OPENRC_CONF_OPTS += -Dsplit-usr=true -endif - define OPENRC_INSTALL_SYSV_RCS_SCRIPT $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \ $(TARGET_DIR)/etc/init.d/sysv-rcs diff --git a/package/opensc/0001-pkcs11-tool-disable-wrap-unwrap-test-until-OpenSC-17.patch b/package/opensc/0001-pkcs11-tool-disable-wrap-unwrap-test-until-OpenSC-17.patch new file mode 100644 index 0000000000..9bf601370a --- /dev/null +++ b/package/opensc/0001-pkcs11-tool-disable-wrap-unwrap-test-until-OpenSC-17.patch @@ -0,0 +1,41 @@ +From 768c9bfcd91206f0d85cd4757fde48e00850a014 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 6 Jan 2025 22:36:10 +0100 +Subject: [PATCH] pkcs11-tool: disable wrap/unwrap test until OpenSC#1796 is + resolved + +Similar to ab74fae4d71d1705b77b9459141987a95dcfc91e ("pkcs11-tool: +disable wrap/unwrap test until OpenSC#1796 is resolved"), but for +0.26, since OpenSC#1796 is still open. + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/OpenSC/OpenSC/pull/3303 +--- + src/tools/pkcs11-tool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c +index d701d76d6..871a39977 100644 +--- a/src/tools/pkcs11-tool.c ++++ b/src/tools/pkcs11-tool.c +@@ -7681,7 +7681,7 @@ static int test_verify(CK_SESSION_HANDLE sess) + return errors; + } + +-#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 25 ++#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 26 + #else + #ifdef ENABLE_OPENSSL + static int wrap_unwrap(CK_SESSION_HANDLE session, +@@ -7805,7 +7805,7 @@ static int wrap_unwrap(CK_SESSION_HANDLE session, + */ + static int test_unwrap(CK_SESSION_HANDLE sess) + { +-#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 25 ++#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 26 + /* temporarily disable test, see https://github.com/OpenSC/OpenSC/issues/1796 */ + return 0; + #else +-- +2.47.1 + diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash index 232222062c..e12d2d4bfa 100644 --- a/package/opensc/opensc.hash +++ b/package/opensc/opensc.hash @@ -1,5 +1,5 @@ # Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ -sha256 24d03c69287291da32a30c4c38a304ad827f56cb85d83619e1f5403ab6480ef8 opensc-0.24.0.tar.gz +sha256 837baead45e1505260d868871056150ede6e73d35460a470f2595a9e5e75f82b opensc-0.26.0.tar.gz # Computed locally sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index 008de9d4c2..11d1507d45 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSC_VERSION = 0.24.0 +OPENSC_VERSION = 0.26.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING diff --git a/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch b/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch deleted file mode 100644 index 85ad5a538c..0000000000 --- a/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Wed, 25 Sep 2024 11:13:05 +1000 -Subject: [PATCH] build construct_utmp() when USE_BTMP is set - -Fixes compile error on Void Linux/Musl - -Upstream: https://anongit.mindrot.org/openssh.git/commit/?id=76a618d2842c34c16cd21a4efc7230e2f459008d -Signed-off-by: Fiona Klute (WIWA) ---- - loginrec.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/loginrec.c b/loginrec.c -index 45f13dee8b1f..7b1818b86753 100644 ---- a/loginrec.c -+++ b/loginrec.c -@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize) - ** into account. - **/ - --#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) -+#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) - - /* build the utmp structure */ - void -@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li, - } - # endif - } --#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */ -+#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */ - - /** - ** utmpx utility functions diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 5758ce4f36..154464d68a 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.9 -sha256 b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 openssh-9.9p1.tar.gz +# From https://www.openssh.com/txt/release-10.2 +sha256 ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2 openssh-10.2p1.tar.gz # Locally calculated sha256 5bb5b160726ef5756e4f32fe95b35249c294962419650f48d05134b486d27ccb LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 95c059e03d..bcbfc39755 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.9 +OPENSSH_VERSION_MAJOR = 10.2 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) @@ -119,6 +119,7 @@ define OPENSSH_INSTALL_SERVER_PROGRAMS $(INSTALL) -D -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd $(INSTALL) -D -m 0755 $(@D)/sshd-session $(TARGET_DIR)/usr/libexec/sshd-session $(INSTALL) -D -m 0755 $(@D)/sftp-server $(TARGET_DIR)/usr/libexec/sftp-server + $(INSTALL) -D -m 0755 $(@D)/sshd-auth $(TARGET_DIR)/usr/libexec/sshd-auth endef OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS diff --git a/package/openvmtools/0014-CVE-2025-22247-1100-1225-VGAuth-updates.patch b/package/openvmtools/0014-CVE-2025-22247-1100-1225-VGAuth-updates.patch new file mode 100644 index 0000000000..f47fabb71b --- /dev/null +++ b/package/openvmtools/0014-CVE-2025-22247-1100-1225-VGAuth-updates.patch @@ -0,0 +1,382 @@ +From 2a2607c6bd94ae22a937fd2adde7472d9a6d506c Mon Sep 17 00:00:00 2001 +From: John Wolfe +Date: Mon, 5 May 2025 16:10:07 -0700 +Subject: [PATCH] Validate user names and file paths + +Prevent usage of illegal characters in user names and file paths. +Also, disallow unexpected symlinks in file paths. + +This patch contains changes to common source files not applicable +to open-vm-tools. + +All files being updated should be consider to have the copyright to +be updated to: + + * Copyright (c) XXXX-2025 Broadcom. All Rights Reserved. + * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries. + +The 2025 Broadcom copyright information update is not part of this +patch set to allow the patch to be easily applied to previous +open-vm-tools source releases. + +Upstream: https://github.com/vmware/blob/CVE-2025-22247.patch/CVE-2025-22247-1100-1225-VGAuth-updates.patch +Signed-off-by: Peter Korsgaard +--- + vgauth/common/VGAuthUtil.c | 33 +++++++++ + vgauth/common/VGAuthUtil.h | 2 + + vgauth/common/prefs.h | 3 + + vgauth/common/usercheck.c | 28 +++++-- + vgauth/serviceImpl/alias.c | 74 ++++++++++++++++++- + vgauth/serviceImpl/service.c | 27 +++++++ + vgauth/serviceImpl/serviceInt.h | 1 + + 7 files changed, 160 insertions(+), 8 deletions(-) + +diff --git a/vgauth/common/VGAuthUtil.c b/vgauth/common/VGAuthUtil.c +index 76383c462..9c2adb8d0 100644 +--- a/vgauth/common/VGAuthUtil.c ++++ b/vgauth/common/VGAuthUtil.c +@@ -309,3 +309,36 @@ Util_Assert(const char *cond, + #endif + g_assert(0); + } ++ ++ ++/* ++ ****************************************************************************** ++ * Util_Utf8CaseCmp -- */ /** ++ * ++ * Case insensitive comparison for utf8 strings which can have non-ascii ++ * characters. ++ * ++ * @param[in] str1 Null terminated utf8 string. ++ * @param[in] str2 Null terminated utf8 string. ++ * ++ ****************************************************************************** ++ */ ++ ++int ++Util_Utf8CaseCmp(const gchar *str1, ++ const gchar *str2) ++{ ++ int ret; ++ gchar *str1Case; ++ gchar *str2Case; ++ ++ str1Case = g_utf8_casefold(str1, -1); ++ str2Case = g_utf8_casefold(str2, -1); ++ ++ ret = g_strcmp0(str1Case, str2Case); ++ ++ g_free(str1Case); ++ g_free(str2Case); ++ ++ return ret; ++} +diff --git a/vgauth/common/VGAuthUtil.h b/vgauth/common/VGAuthUtil.h +index f7f3aa216..ef32a91da 100644 +--- a/vgauth/common/VGAuthUtil.h ++++ b/vgauth/common/VGAuthUtil.h +@@ -105,4 +105,6 @@ gboolean Util_CheckExpiration(const GTimeVal *start, unsigned int duration); + + void Util_Assert(const char *cond, const char *file, int lineNum); + ++int Util_Utf8CaseCmp(const gchar *str1, const gchar *str2); ++ + #endif +diff --git a/vgauth/common/prefs.h b/vgauth/common/prefs.h +index ff116928c..7cddb3e17 100644 +--- a/vgauth/common/prefs.h ++++ b/vgauth/common/prefs.h +@@ -165,6 +165,9 @@ msgCatalog = /etc/vmware-tools/vgauth/messages + /** Where the localized version of the messages were installed. */ + #define VGAUTH_PREF_LOCALIZATION_DIR "msgCatalog" + ++/** If symlinks or junctions are allowed in alias store file path */ ++#define VGAUTH_PREF_ALLOW_SYMLINKS "allowSymlinks" ++ + /* + * Pref values + */ +diff --git a/vgauth/common/usercheck.c b/vgauth/common/usercheck.c +index 31eeb5a77..145f1f056 100644 +--- a/vgauth/common/usercheck.c ++++ b/vgauth/common/usercheck.c +@@ -78,6 +78,8 @@ + * Solaris as well, but that path is untested. + */ + ++#define MAX_USER_NAME_LEN 256 ++ + /* + * A single retry works for the LDAP case, but try more often in case NIS + * or something else has a related issue. Note that a bad username/uid won't +@@ -354,17 +356,29 @@ Usercheck_UsernameIsLegal(const gchar *userName) + * + */ + size_t len; +-#ifdef _WIN32 +- // allow '\' in for Windows domain usernames +- char *illegalChars = "<>/"; +-#else +- char *illegalChars = "\\<>/"; +-#endif ++ size_t i = 0; ++ int backSlashCnt = 0; ++ /* ++ * As user names are used to generate its alias store file name/path, it ++ * should not contain path traversal characters ('/' and '\'). ++ */ ++ char *illegalChars = "<>/\\"; + + len = strlen(userName); +- if (strcspn(userName, illegalChars) != len) { ++ if (len > MAX_USER_NAME_LEN) { + return FALSE; + } ++ ++ while ((i += strcspn(userName + i, illegalChars)) < len) { ++ /* ++ * One backward slash is allowed for domain\username separator. ++ */ ++ if (userName[i] != '\\' || ++backSlashCnt > 1) { ++ return FALSE; ++ } ++ ++i; ++ } ++ + return TRUE; + } + +diff --git a/vgauth/serviceImpl/alias.c b/vgauth/serviceImpl/alias.c +index b28351eea..687d1b373 100644 +--- a/vgauth/serviceImpl/alias.c ++++ b/vgauth/serviceImpl/alias.c +@@ -41,6 +41,7 @@ + #include "certverify.h" + #include "VGAuthProto.h" + #include "vmxlog.h" ++#include "VGAuthUtil.h" + + // puts the identity store in an easy to find place + #undef WIN_TEST_MODE +@@ -66,6 +67,7 @@ + #define ALIASSTORE_FILE_PREFIX "user-" + #define ALIASSTORE_FILE_SUFFIX ".xml" + ++static gboolean allowSymlinks = FALSE; + static gchar *aliasStoreRootDir = DEFAULT_ALIASSTORE_ROOT_DIR; + + #ifdef _WIN32 +@@ -252,6 +254,12 @@ mapping file layout: + + */ + ++#ifdef _WIN32 ++#define ISPATHSEP(c) ((c) == '\\' || (c) == '/') ++#else ++#define ISPATHSEP(c) ((c) == '/') ++#endif ++ + + /* + ****************************************************************************** +@@ -466,6 +474,7 @@ ServiceLoadFileContentsWin(const gchar *fileName, + gunichar2 *fileNameW = NULL; + BOOL ok; + DWORD bytesRead; ++ gchar *realPath = NULL; + + *fileSize = 0; + *contents = NULL; +@@ -622,6 +631,22 @@ ServiceLoadFileContentsWin(const gchar *fileName, + goto done; + } + ++ if (!allowSymlinks) { ++ /* ++ * Check if fileName is real path. ++ */ ++ if ((realPath = ServiceFileGetPathByHandle(hFile)) == NULL) { ++ err = VGAUTH_E_FAIL; ++ goto done; ++ } ++ if (Util_Utf8CaseCmp(realPath, fileName) != 0) { ++ Warning("%s: Real path (%s) is not same as file path (%s)\n", ++ __FUNCTION__, realPath, fileName); ++ err = VGAUTH_E_FAIL; ++ goto done; ++ } ++ } ++ + /* + * Now finally read the contents. + */ +@@ -650,6 +675,7 @@ done: + CloseHandle(hFile); + } + g_free(fileNameW); ++ g_free(realPath); + + return err; + } +@@ -672,6 +698,7 @@ ServiceLoadFileContentsPosix(const gchar *fileName, + gchar *buf; + gchar *bp; + int fd = -1; ++ gchar realPath[PATH_MAX] = { 0 }; + + *fileSize = 0; + *contents = NULL; +@@ -817,6 +844,23 @@ ServiceLoadFileContentsPosix(const gchar *fileName, + goto done; + } + ++ if (!allowSymlinks) { ++ /* ++ * Check if fileName is real path. ++ */ ++ if (realpath(fileName, realPath) == NULL) { ++ Warning("%s: realpath() failed. errno (%d)\n", __FUNCTION__, errno); ++ err = VGAUTH_E_FAIL; ++ goto done; ++ } ++ if (g_strcmp0(realPath, fileName) != 0) { ++ Warning("%s: Real path (%s) is not same as file path (%s)\n", ++ __FUNCTION__, realPath, fileName); ++ err = VGAUTH_E_FAIL; ++ goto done; ++ } ++ } ++ + /* + * All sanity checks passed; read the bits. + */ +@@ -2803,8 +2847,13 @@ ServiceAliasRemoveAlias(const gchar *reqUserName, + + /* + * We don't verify the user exists in a Remove operation, to allow +- * cleanup of deleted user's stores. ++ * cleanup of deleted user's stores, but we do check whether the ++ * user name is legal or not. + */ ++ if (!Usercheck_UsernameIsLegal(userName)) { ++ Warning("%s: Illegal user name '%s'\n", __FUNCTION__, userName); ++ return VGAUTH_E_FAIL; ++ } + + if (!CertVerify_IsWellFormedPEMCert(pemCert)) { + return VGAUTH_E_INVALID_CERTIFICATE; +@@ -3036,6 +3085,16 @@ ServiceAliasQueryAliases(const gchar *userName, + } + #endif + ++ /* ++ * We don't verify the user exists in a Query operation to allow ++ * cleaning up after a deleted user, but we do check whether the ++ * user name is legal or not. ++ */ ++ if (!Usercheck_UsernameIsLegal(userName)) { ++ Warning("%s: Illegal user name '%s'\n", __FUNCTION__, userName); ++ return VGAUTH_E_FAIL; ++ } ++ + err = AliasLoadAliases(userName, num, aList); + if (VGAUTH_E_OK != err) { + Warning("%s: failed to load Aliases for '%s'\n", __FUNCTION__, userName); +@@ -3294,6 +3353,7 @@ ServiceAliasInitAliasStore(void) + VGAuthError err = VGAUTH_E_OK; + gboolean saveBadDir = FALSE; + char *defaultDir = NULL; ++ size_t len; + + #ifdef _WIN32 + { +@@ -3324,6 +3384,10 @@ ServiceAliasInitAliasStore(void) + defaultDir = g_strdup(DEFAULT_ALIASSTORE_ROOT_DIR); + #endif + ++ allowSymlinks = Pref_GetBool(gPrefs, ++ VGAUTH_PREF_ALLOW_SYMLINKS, ++ VGAUTH_PREF_GROUP_NAME_SERVICE, ++ FALSE); + /* + * Find the alias store directory. This allows an installer to put + * it somewhere else if necessary. +@@ -3337,6 +3401,14 @@ ServiceAliasInitAliasStore(void) + VGAUTH_PREF_GROUP_NAME_SERVICE, + defaultDir); + ++ /* ++ * Remove the trailing separator if any from aliasStoreRootDir path. ++ */ ++ len = strlen(aliasStoreRootDir); ++ if (ISPATHSEP(aliasStoreRootDir[len - 1])) { ++ aliasStoreRootDir[len - 1] = '\0'; ++ } ++ + Log("Using '%s' for alias store root directory\n", aliasStoreRootDir); + + g_free(defaultDir); +diff --git a/vgauth/serviceImpl/service.c b/vgauth/serviceImpl/service.c +index d4716526c..e053ed0fa 100644 +--- a/vgauth/serviceImpl/service.c ++++ b/vgauth/serviceImpl/service.c +@@ -28,6 +28,7 @@ + #include "VGAuthUtil.h" + #ifdef _WIN32 + #include "winUtil.h" ++#include + #endif + + static ServiceStartListeningForIOFunc startListeningIOFunc = NULL; +@@ -283,9 +284,35 @@ static gchar * + ServiceUserNameToPipeName(const char *userName) + { + gchar *escapedName = ServiceEncodeUserName(userName); ++#ifdef _WIN32 ++ /* ++ * Adding below pragma only in windows to suppress the compile time warning ++ * about unavailability of g_uuid_string_random() since compiler flag ++ * GLIB_VERSION_MAX_ALLOWED is defined to GLIB_VERSION_2_34. ++ * TODO: Remove below pragma when GLIB_VERSION_MAX_ALLOWED is bumped up to ++ * or greater than GLIB_VERSION_2_52. ++ */ ++#pragma warning(suppress : 4996) ++ gchar *uuidStr = g_uuid_string_random(); ++ /* ++ * Add a unique suffix to avoid a name collision with an existing named pipe ++ * created by someone else (intentionally or by accident). ++ * This is not needed for Linux; name collisions on sockets are already ++ * avoided there since (1) file system paths to VGAuthService sockets are in ++ * a directory that is writable only by root and (2) VGAuthService unlinks a ++ * socket path before binding it to a newly created socket. ++ */ ++ gchar *pipeName = g_strdup_printf("%s-%s-%s", ++ SERVICE_PUBLIC_PIPE_NAME, ++ escapedName, ++ uuidStr); ++ ++ g_free(uuidStr); ++#else + gchar *pipeName = g_strdup_printf("%s-%s", + SERVICE_PUBLIC_PIPE_NAME, + escapedName); ++#endif + + g_free(escapedName); + return pipeName; +diff --git a/vgauth/serviceImpl/serviceInt.h b/vgauth/serviceImpl/serviceInt.h +index ef49f42c2..c37f42fa6 100644 +--- a/vgauth/serviceImpl/serviceInt.h ++++ b/vgauth/serviceImpl/serviceInt.h +@@ -441,6 +441,7 @@ VGAuthError ServiceFileVerifyAdminGroupOwnedByHandle(const HANDLE hFile); + VGAuthError ServiceFileVerifyEveryoneReadableByHandle(const HANDLE hFile); + VGAuthError ServiceFileVerifyUserAccessByHandle(const HANDLE hFile, + const char *userName); ++gchar *ServiceFileGetPathByHandle(HANDLE hFile); + #else + VGAuthError ServiceFileVerifyFileOwnerAndPerms(const char *fileName, + const char *userName, +-- +2.43.5 + diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index b62e5d0361..e6a2cd4a54 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_OPENVMTOOLS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Open Virtual Machine Tools for VMware guest OS diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk index 3106b9ecd6..58876c877a 100644 --- a/package/openvmtools/openvmtools.mk +++ b/package/openvmtools/openvmtools.mk @@ -13,9 +13,16 @@ OPENVMTOOLS_LICENSE_FILES = COPYING OPENVMTOOLS_CPE_ID_VENDOR = vmware OPENVMTOOLS_CPE_ID_PRODUCT = tools +# This CVE affects a Wordpress plugin. VMware information, +# previously connected to this CVE ID because of a typo, is at CVE-2022-31693 +OPENVMTOOLS_IGNORE_CVES += CVE-2021-31693 + # 0013-Properly-check-authorization-on-incoming-guestOps-re.patch OPENVMTOOLS_IGNORE_CVES += CVE-2022-31676 +# 0014-CVE-2025-22247-1100-1225-VGAuth-updates.patch +OPENVMTOOLS_IGNORE_CVES += CVE-2025-22247 + # configure.ac is patched OPENVMTOOLS_AUTORECONF = YES OPENVMTOOLS_CONF_OPTS = --with-dnet \ @@ -35,6 +42,10 @@ ifeq ($(BR2_PACKAGE_LIBTIRPC),y) OPENVMTOOLS_DEPENDENCIES += libtirpc endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +OPENVMTOOLS_DEPENDENCIES += libxcrypt +endif + # When libfuse is available, openvmtools can build vmblock-fuse, so # make sure that libfuse gets built first ifeq ($(BR2_PACKAGE_LIBFUSE),y) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 5aa2386d36..77afc9eaf4 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_OPENVPN select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help OpenVPN is a full-featured SSL VPN solution which can - accomodate a wide range of configurations, including road + accommodate a wide range of configurations, including road warrior access, home/office/campus telecommuting, WiFi security, secure branch office linking, and enterprise-scale remote access solutions with load balancing, failover, and diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 7ba3ea3f20..0123babe4b 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929 openvpn-2.6.12.tar.gz -sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL +sha256 05cb5fdf1ea33fcba719580b31a97feaa019c4a3050563e88bc3b34675e6fed4 openvpn-2.6.16.tar.gz +sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 4bf5b54656..0175c51d63 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.12 +OPENVPN_VERSION = 2.6.16 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in index 2973055baf..2123c1ff6c 100644 --- a/package/opkg-utils/Config.in +++ b/package/opkg-utils/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_OPKG_UTILS bool "opkg-utils" - depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX # binutils + depends on BR2_PACKAGE_BUSYBOX # binutils depends on BR2_USE_MMU # bash, python3 depends on BR2_USE_WCHAR # python3 depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi @@ -23,6 +23,6 @@ config BR2_PACKAGE_OPKG_UTILS https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library" - depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX + depends on BR2_PACKAGE_BUSYBOX depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk index 4922d8fc0f..42cd0956cd 100644 --- a/package/opkg/opkg.mk +++ b/package/opkg/opkg.mk @@ -44,6 +44,13 @@ else OPKG_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_LIBSOLV),y) +OPKG_DEPENDENCIES += libsolv +OPKG_CONF_OPTS += --with-libsolv +else +OPKG_CONF_OPTS += --without-libsolv +endif + ifeq ($(BR2_PACKAGE_LZ4),y) OPKG_DEPENDENCIES += lz4 OPKG_CONF_OPTS += --enable-lz4 diff --git a/package/oprofile/0003-Fix-autoconf-detection-of-perf_events.patch b/package/oprofile/0003-Fix-autoconf-detection-of-perf_events.patch new file mode 100644 index 0000000000..759aba5c4b --- /dev/null +++ b/package/oprofile/0003-Fix-autoconf-detection-of-perf_events.patch @@ -0,0 +1,40 @@ +From b0acf9f0c0aac93bf6f3e196d7a52c9632ff4475 Mon Sep 17 00:00:00 2001 +From: Tony Jones +Date: Fri, 8 Nov 2024 13:13:30 -0800 +Subject: [PATCH] Fix autoconf detection of perf_events + +The autoconf check for the presence of perf_events api began failing +on recent openSUSE builds. + +checking kernel supports perf_events... conftest.c: In function 'main': +conftest.c:37:39: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration] + 37 | pid = getpid(); + | ^~~~~~ +conftest.c:38:33: error: implicit declaration of function 'syscall' [-Wimplicit-function-declaration] + 38 | syscall(__NR_perf_event_open, &attr, pid, 0, -1, 0); + | ^~~~~~~ +no +Error: Your kernel does not appear to have the necessary support to run oprofile. + +Upstream: https://sourceforge.net/p/oprofile/oprofile/ci/b0acf9f0c0aac93bf6f3e196d7a52c9632ff4475/ + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index dc447f89..363bd440 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,6 +116,7 @@ if test "$kernel_may_have_perf_events_support" = "yes"; then + rm -f test-for-PERF_EVENT_OPEN + AC_LANG_CONFTEST( + [AC_LANG_PROGRAM([[#include ++ #include + #include + #include + #include +-- +2.47.3 + diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 590e63b4ac..72cdc856c3 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -13,6 +13,7 @@ OPROFILE_CONF_OPTS = \ --disable-account-check \ --with-kernel=$(STAGING_DIR)/usr # 0002-fix-static-build-with-binutils-2.40.patch +# 0003-Fix-autoconf-detection-of-perf_events.patch OPROFILE_AUTORECONF = YES define OPROFILE_CREATE_MISSING_FILES diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index 738d43f837..ac3b680743 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -19,12 +19,18 @@ if BR2_PACKAGE_OPTEE_CLIENT choice prompt "optee-client version" + default BR2_PACKAGE_OPTEE_CLIENT_AS_OS \ + if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION default BR2_PACKAGE_OPTEE_CLIENT_LATEST help Select the version of optee-client you want to use +config BR2_PACKAGE_OPTEE_CLIENT_AS_OS + bool "Same as optee-os being built" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + config BR2_PACKAGE_OPTEE_CLIENT_LATEST - bool "4.3.0" + bool "4.6.0" help Use the latest release tag from the optee-client official Git repository. @@ -52,7 +58,9 @@ endif config BR2_PACKAGE_OPTEE_CLIENT_VERSION string - default "4.3.0" if BR2_PACKAGE_OPTEE_CLIENT_LATEST + default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \ + if BR2_PACKAGE_OPTEE_CLIENT_AS_OS + default "4.6.0" if BR2_PACKAGE_OPTEE_CLIENT_LATEST default "custom" if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 8904c930ee..a5d98521a3 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,3 @@ -# From https://github.com/OP-TEE/optee_client/archive/4.3.0/optee-client-4.3.0.tar.gz -sha256 a9a91bdb433df795c87a6d15198effbd648e3671ae611f2a3f8b41229d61cce0 optee-client-4.3.0.tar.gz # Locally computed +sha256 a970338c9f69861901336716d89684646e4480b9970996a5b3581ae7d49fdaa3 optee-client-4.6.0.tar.gz sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index 52ef268ac4..702adc84db 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -31,12 +31,18 @@ if BR2_PACKAGE_OPTEE_EXAMPLES choice prompt "optee-examples version" + default BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS \ + if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION default BR2_PACKAGE_OPTEE_EXAMPLES_LATEST help Select the version of optee-examples you want to use +config BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS + bool "Same as optee-os being built" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST - bool "4.3.0" + bool "4.6.0" help Use the latest release tag from the optee-examples official Git repository. @@ -64,7 +70,9 @@ endif config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION string - default "4.3.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \ + if BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS + default "4.6.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST default "custom" if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL endif # BR2_PACKAGE_OPTEE_EXAMPLES diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index a6ecd2caec..54b98868d7 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,3 @@ -# From https://github.com/linaro-swg/optee_examples/archive/4.3.0/optee-examples-4.3.0.tar.gz -sha256 ee1576617365b5fe9d20d72c16cf6b39159eb79b1401189bd37a91ef03371820 optee-examples-4.3.0.tar.gz # Locally computed +sha256 6891390aefa2046d500d3ffec05c327d7763e89645b2e99ef2330b561ba645f5 optee-examples-4.6.0.tar.gz sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index a29eb355ac..dd1160ea48 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -36,12 +36,19 @@ if BR2_PACKAGE_OPTEE_TEST choice prompt "optee-test version" - default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + default BR2_PACKAGE_OPTEE_TEST_AS_OS \ + if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + default BR2_PACKAGE_OPTEE_TEST_LATEST \ + if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of optee-test you want to use +config BR2_PACKAGE_OPTEE_TEST_AS_OS + bool "Same as optee-os being built" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + config BR2_PACKAGE_OPTEE_TEST_LATEST - bool "4.3.0" + bool "4.6.0" help Use the latest release tag from the optee-test official Git repository. @@ -68,7 +75,9 @@ endif config BR2_PACKAGE_OPTEE_TEST_VERSION string - default "4.3.0" if BR2_PACKAGE_OPTEE_TEST_LATEST + default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \ + if BR2_PACKAGE_OPTEE_TEST_AS_OS + default "4.6.0" if BR2_PACKAGE_OPTEE_TEST_LATEST default "custom" if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL endif # BR2_PACKAGE_OPTEE_TEST diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5922487a62..058d95e29b 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,5 @@ -# From https://github.com/OP-TEE/optee_test/archive/4.3.0/optee-test-4.3.0.tar.gz -sha256 7bb181b74be88593df48321b816837acaad8e4d45e883f25a2e039978e5ec415 optee-test-4.3.0.tar.gz # Locally computed -sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md +sha256 db4de73fa955a7db70a64a2c4ad1d2c48ddcb54c369821aba670fec6131a6f61 optee-test-4.6.0.tar.gz +sha256 2b36458cd0292200e406a608efe7dfda17aae39646a86b730a2776b61d0fa410 LICENSE-BSD +sha256 a094472b51f57d0403953d087e410793519cb6f3a7cea2be34eb44e09a426a73 LICENSE-GPL +sha256 a562ab14c307d0e02b7bf6f1bdb0d1cf789409e6375a500e15dc7a0503e5c2c3 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index c250639d06..23874b51b9 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -6,7 +6,7 @@ OPTEE_TEST_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, -OPTEE_TEST_LICENSE_FILES = LICENSE.md +OPTEE_TEST_LICENSE_FILES = LICENSE-BSD LICENSE-GPL LICENSE.md ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL),y) OPTEE_TEST_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)) diff --git a/package/opus/opus.hash b/package/opus/opus.hash index 7569ee08d1..ef0226281d 100644 --- a/package/opus/opus.hash +++ b/package/opus/opus.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f opus-1.4.tar.gz +sha256 65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1 opus-1.5.2.tar.gz # Hash for license file -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 COPYING +sha256 01e1167d54a096d123cf6dfbbeb19587278845c6481d2d66d545669846079551 COPYING diff --git a/package/opus/opus.mk b/package/opus/opus.mk index cbc07a091b..1d3133bb58 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUS_VERSION = 1.4 +OPUS_VERSION = 1.5.2 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING diff --git a/package/orc/orc.hash b/package/orc/orc.hash index 1e584c1190..1becbca37f 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.34.tar.xz.sha256sum -sha256 8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f orc-0.4.34.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.41.tar.xz.sha256sum +sha256 cb1bfd4f655289cd39bc04642d597be9de5427623f0861c1fc19c08d98467fa2 orc-0.4.41.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index b2d2bb461b..6cd34df556 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,11 +4,12 @@ # ################################################################################ -ORC_VERSION = 0.4.34 +ORC_VERSION = 0.4.41 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause ORC_LICENSE_FILES = COPYING +ORC_CPE_ID_VENDOR = gstreamer ORC_INSTALL_STAGING = YES ORC_DEPENDENCIES = host-orc ORC_CONF_OPTS = \ diff --git a/package/ortp/Config.in b/package/ortp/Config.in deleted file mode 100644 index e296e82f7a..0000000000 --- a/package/ortp/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_ORTP - bool "oRTP" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox - select BR2_PACKAGE_BCTOOLBOX - help - oRTP, a Real-time Transport Protocol (RTP,RFC3550) library - - https://www.linphone.org/technical-corner/ortp - -comment "ortp needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "ortp needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/ortp/ortp.hash b/package/ortp/ortp.hash deleted file mode 100644 index 7853c63143..0000000000 --- a/package/ortp/ortp.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 9b1d43f676a35920e2837abc0eb4d600d4d3e47d2621fa3b0897777cf587ee8d ortp-4.4.8.tar.gz -sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk deleted file mode 100644 index 67bef9aebb..0000000000 --- a/package/ortp/ortp.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# ortp -# -################################################################################ - -ORTP_VERSION = 4.4.8 -ORTP_SITE = https://gitlab.linphone.org/BC/public/ortp/-/archive/$(ORTP_VERSION) -ORTP_LICENSE = GPL-3.0+ -ORTP_LICENSE_FILES = LICENSE.txt -ORTP_INSTALL_STAGING = YES -ORTP_DEPENDENCIES = bctoolbox -ORTP_CONF_OPTS = \ - -DENABLE_DOC=OFF \ - -DENABLE_STRICT=OFF - -ifeq ($(BR2_STATIC_LIBS),y) -ORTP_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -ORTP_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON -else ifeq ($(BR2_SHARED_LIBS),y) -ORTP_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -endif - -$(eval $(cmake-package)) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index cc0d91f98f..9f119d9c7d 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89 osm2pgsql-2.0.0.tar.gz +sha256 b9d5c95ccc928aafc3c6caccb8b5bc19c4d48a5d1640cada07388d0dbf171ecc osm2pgsql-2.0.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 7b54e4c0d2..f968a159d2 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,8 +4,8 @@ # ################################################################################ -OSM2PGSQL_VERSION = 2.0.0 -OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) +OSM2PGSQL_VERSION = 2.0.1 +OSM2PGSQL_SITE = $(call github,osm2pgsql-dev,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index 81d209b2c2..43a566a82c 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 d8ddce1bb7e898986f9d250ccae7c09ce14d82f1009046d202a0eb1b428b2adc p11-kit-0.25.3.tar.xz +sha256 04d0a86450cdb1be018f26af6699857171a188ac6d5b8c90786a60854e1198e5 p11-kit-0.25.5.tar.xz # Locally computed sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 53e953e070..42de3e1065 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,7 +4,7 @@ # ################################################################################ -P11_KIT_VERSION = 0.25.3 +P11_KIT_VERSION = 0.25.5 P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_INSTALL_STAGING = YES @@ -14,6 +14,12 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING P11_KIT_CPE_ID_VALID = YES +# Needed because the pre-generated ./configure script has an old +# broken expansion of AC_HEADER_STDBOOL, which incorrectly detects +# that cannot be used, causing breakage down the road. +P11_KIT_AUTORECONF = YES +# Needed for autoreconf +P11_KIT_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBFFI),y) P11_KIT_DEPENDENCIES += host-pkgconf libffi diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash index d359edf36e..8ca597c4f9 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 47c77e95609812da82feee30db435c3b7c720d4fd3147d466ead126e657b6d9c paho-mqtt-c-1.3.13.tar.gz +sha256 60ce2cfdc146fcb81c621cb8b45874d2eb1d4693105d048f60e31b8f3468be90 paho-mqtt-c-1.3.15.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk index ec4e96c77f..acff7d5cc3 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.13 +PAHO_MQTT_C_VERSION = 1.3.15 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE diff --git a/package/pahole/pahole.hash b/package/pahole/pahole.hash index a2d3d044da..efa1218468 100644 --- a/package/pahole/pahole.hash +++ b/package/pahole/pahole.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87223298d4f8f9ada9b3cc5cef1bedd7aeb447cd8295abc466e009a26accff13 pahole-1.27.tar.gz +sha256 9a319c214b38554be8430a672043d85735564e8e1e78db5a41cba7a03d038056 pahole-1.28.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pahole/pahole.mk b/package/pahole/pahole.mk index ffbe4ff925..150373fd7e 100644 --- a/package/pahole/pahole.mk +++ b/package/pahole/pahole.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHOLE_VERSION = 1.27 +PAHOLE_VERSION = 1.28 PAHOLE_SITE = https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot HOST_PAHOLE_DEPENDENCIES = \ host-elfutils \ diff --git a/package/panel-mipi-dbi-firmware/Config.in b/package/panel-mipi-dbi-firmware/Config.in new file mode 100644 index 0000000000..08ed51f594 --- /dev/null +++ b/package/panel-mipi-dbi-firmware/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE + bool "panel-mipi-dbi firmware" + help + Build and install firmware files for the panel-mipi-dbi DRM + driver. The driver requires firmware file(s) to provide + initialization commands for the specific display(s) in + use. The initialization commands are written in text form + and converted to the binary format during the build. + + If you select this package you will be prompted for the + initialization command file(s) to build firmware from. + + https://github.com/notro/panel-mipi-dbi + +if BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE + +config BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_SOURCE + string "Source files for panel-mipi-dbi firmware" + default "" + help + Space separated list of initialization command files for + displays used with the panel-mipi-dbi driver. The files will + be converted to binary format and installed to /lib/firmware + in the rootfs. The binary files will use the basenames of + the input files, plus a .bin ending. The basename of each + file must match the first element of the "compatible" device + tree property of the display the file is for. + +endif # BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE diff --git a/package/panel-mipi-dbi-firmware/panel-mipi-dbi-firmware.hash b/package/panel-mipi-dbi-firmware/panel-mipi-dbi-firmware.hash new file mode 100644 index 0000000000..cb06ae66ee --- /dev/null +++ b/package/panel-mipi-dbi-firmware/panel-mipi-dbi-firmware.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6d57b140dca0241079b186027e72a9168843bd1b6427536dcd422b7a9b6dc53f panel-mipi-dbi-firmware-1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e-git4.tar.gz +sha256 e3f98ddc0b15dae65c5661d6c8403a007f30e2f04bcb6170526da609e3fcfd05 mipi-dbi-cmd diff --git a/package/panel-mipi-dbi-firmware/panel-mipi-dbi-firmware.mk b/package/panel-mipi-dbi-firmware/panel-mipi-dbi-firmware.mk new file mode 100644 index 0000000000..859de027c0 --- /dev/null +++ b/package/panel-mipi-dbi-firmware/panel-mipi-dbi-firmware.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# panel-mipi-dbi-firmware +# +################################################################################ + +PANEL_MIPI_DBI_FIRMWARE_VERSION = 1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e +PANEL_MIPI_DBI_FIRMWARE_SITE = https://github.com/notro/panel-mipi-dbi.git +PANEL_MIPI_DBI_FIRMWARE_SITE_METHOD = git +PANEL_MIPI_DBI_FIRMWARE_LICENSE = CC0-1.0 +# license info is directly in the only source file +PANEL_MIPI_DBI_FIRMWARE_LICENSE_FILES = mipi-dbi-cmd + +PANEL_MIPI_DBI_FIRMWARE_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) + +BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_BIN = $(addsuffix .bin,$(basename $(notdir $(shell echo $(BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_SOURCE))))) + +define PANEL_MIPI_DBI_FIRMWARE_BUILD_CMDS + for source in $(shell echo $(BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_SOURCE)) ; do \ + PATH=$(BR_PATH) $(@D)/mipi-dbi-cmd "$(@D)/$$(basename $${source%.*}).bin" "$${source}" ; \ + done +endef + +define PANEL_MIPI_DBI_FIRMWARE_INSTALL_TARGET_CMDS + for bin in $(shell echo $(BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_BIN)); do \ + $(INSTALL) -m 0644 -D "$(@D)/$${bin}" "$(TARGET_DIR)/lib/firmware/$${bin}" ; \ + done +endef + +# installing firmware requires source, give a clear error message if missing +ifeq ($(BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE)$(call qstrip,$(BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_SOURCE)),y) +$(error No panel-mipi-dbi firmware source selected, check your BR2_PACKAGE_PANEL_MIPI_DBI_FIRMWARE_SOURCE setting) +endif + +$(eval $(generic-package)) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 9f321eea62..41aa793184 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pango/1.54/pango-1.54.0.sha256sum -sha256 8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8 pango-1.54.0.tar.xz +# From https://download.gnome.org/sources/pango/1.56/pango-1.56.4.sha256sum +sha256 17065e2fcc5f5a5bdbffc884c956bfc7c451a96e8c4fb2f8ad837c6413cb5a01 pango-1.56.4.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index df82b456fb..671705d0b3 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -4,14 +4,14 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.54 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).0 +PANGO_VERSION_MAJOR = 1.56 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).4 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING -PANGO_CPE_ID_VENDOR = pango +PANGO_CPE_ID_VENDOR = gnome PANGO_CONF_OPTS = -Dfontconfig=enabled HOST_PANGO_CONF_OPTS = -Dfontconfig=enabled -Dintrospection=disabled diff --git a/package/pangomm2_46/pangomm2_46.hash b/package/pangomm2_46/pangomm2_46.hash index 8d05dbc2ff..eb4e1c58e9 100644 --- a/package/pangomm2_46/pangomm2_46.hash +++ b/package/pangomm2_46/pangomm2_46.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.3.sha256sum -sha256 410fe04d471a608f3f0273d3a17d840241d911ed0ff2c758a9859c66c6f24379 pangomm-2.46.3.tar.xz +# From https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.4.sha256sum +sha256 b92016661526424de4b9377f1512f59781f41fb16c9c0267d6133ba1cd68db22 pangomm-2.46.4.tar.xz # Locally computed sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/pangomm2_46/pangomm2_46.mk b/package/pangomm2_46/pangomm2_46.mk index 1725158491..3640641af1 100644 --- a/package/pangomm2_46/pangomm2_46.mk +++ b/package/pangomm2_46/pangomm2_46.mk @@ -5,7 +5,7 @@ ################################################################################ PANGOMM2_46_VERSION_MAJOR = 2.46 -PANGOMM2_46_VERSION = $(PANGOMM2_46_VERSION_MAJOR).3 +PANGOMM2_46_VERSION = $(PANGOMM2_46_VERSION_MAJOR).4 PANGOMM2_46_SOURCE = pangomm-$(PANGOMM2_46_VERSION).tar.xz PANGOMM2_46_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM2_46_VERSION_MAJOR) PANGOMM2_46_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) diff --git a/package/parsec-tool/parsec-tool.hash b/package/parsec-tool/parsec-tool.hash index bd01bc4980..f84c64802d 100644 --- a/package/parsec-tool/parsec-tool.hash +++ b/package/parsec-tool/parsec-tool.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5b994e10305a682c22fb6f566b57874a22ed8b9120d9fd253f5fa17c40ff759a parsec-tool-0.7.0-cargo2.tar.gz +sha256 6ddb379cf9ab309a64c869cd64870d4e58414398f00fdb0ed1524f1e684db226 parsec-tool-0.7.0-cargo4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/parsec/0001-Fix-unnecessary-qualifications-error.patch b/package/parsec/0001-Fix-unnecessary-qualifications-error.patch new file mode 100644 index 0000000000..597c9c9f2c --- /dev/null +++ b/package/parsec/0001-Fix-unnecessary-qualifications-error.patch @@ -0,0 +1,48 @@ +From b76bebf839169fc831712b8a80db1e6ff7535dfd Mon Sep 17 00:00:00 2001 +From: Gowtham Suresh Kumar +Date: Thu, 29 Aug 2024 17:10:06 +0100 +Subject: [PATCH] Fix unnecessary qualifications error + +Upstream: https://github.com/parallaxsecond/parsec/commit/86d4d2ca2f1e873a29f9f4d4bba99fedee19a144 +Signed-off-by: Gowtham Suresh Kumar +Signed-off-by: Julien Olivain +--- + src/front/domain_socket.rs | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/front/domain_socket.rs b/src/front/domain_socket.rs +index 9fb8a0c..a0effa5 100644 +--- a/src/front/domain_socket.rs ++++ b/src/front/domain_socket.rs +@@ -239,15 +239,16 @@ pub mod peer_credentials { + pub mod impl_linux { + use super::UCred; + use libc::{c_void, getsockopt, socklen_t, ucred, SOL_SOCKET, SO_PEERCRED}; ++ use std::io; ++ use std::mem::size_of; + use std::os::unix::io::AsRawFd; + use std::os::unix::net::UnixStream; +- use std::{io, mem}; + + pub fn peer_cred(socket: &UnixStream) -> io::Result { +- let ucred_size = mem::size_of::(); ++ let ucred_size = size_of::(); + + // Trivial sanity checks. +- assert!(mem::size_of::() <= mem::size_of::()); ++ assert!(size_of::() <= size_of::()); + assert!(ucred_size <= u32::MAX as usize); + + let mut ucred_size = ucred_size as socklen_t; +@@ -266,7 +267,7 @@ pub mod peer_credentials { + &mut ucred_size, + ); + +- if ret == 0 && ucred_size as usize == mem::size_of::() { ++ if ret == 0 && ucred_size as usize == size_of::() { + Ok(UCred { + uid: ucred.uid, + gid: ucred.gid, +-- +2.47.1 + diff --git a/package/parsec/Config.in b/package/parsec/Config.in new file mode 100644 index 0000000000..378e8b58b4 --- /dev/null +++ b/package/parsec/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PARSEC + bool "parsec" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + Hardware/platform abstraction service for TPMs, HSMs, and + Root of Trust + PARSEC is the Platform AbstRaction for SECurity, an + open-source initiative to provide a common API to hardware + security and cryptographic services in a platform-agnostic + way. This abstraction layer keeps workloads decoupled from + physical platform details, enabling cloud-native delivery + flows within the data center and at the edge. + + https://github.com/parallaxsecond/parsec.git diff --git a/package/parsec/parsec.hash b/package/parsec/parsec.hash new file mode 100644 index 0000000000..c6d9ad8d01 --- /dev/null +++ b/package/parsec/parsec.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 1d12fc9718a8690790974348e8ac170bcee433c074c06ba5db7c0a15c372b30e parsec-1.4.1-cargo4.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/parsec/parsec.mk b/package/parsec/parsec.mk new file mode 100644 index 0000000000..eec9f4d7a3 --- /dev/null +++ b/package/parsec/parsec.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# parsec +# +################################################################################ + +PARSEC_VERSION = 1.4.1 +PARSEC_SITE = $(call github,parallaxsecond,parsec,$(PARSEC_VERSION)) +PARSEC_LICENSE = Apache-2.0 +PARSEC_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) diff --git a/package/parted/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch b/package/parted/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch new file mode 100644 index 0000000000..78709e07ad --- /dev/null +++ b/package/parted/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch @@ -0,0 +1,44 @@ +From 16343bda6ce0d41edf43f8dac368db3bbb63d271 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Wed, 20 Nov 2024 12:22:22 +0000 +Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration + +With gcc 15-20241117 compile fails with the below error, update the +do_version declaration to match the header in command.h + +../../parted/parted.c: In function '_init_commands': +../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types] + 2469 | do_version, + | ^~~~~~~~~~ + | | + | int (*)(void) +In file included from ../../parted/parted.c:28: +../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)' + 35 | int (*method) (PedDevice** dev, PedDisk** diskp), + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream: https://cgit.git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271 + +Signed-off-by: Rudi Heitbaum +Signed-off-by: Brian C. Lane +Signed-off-by: Yegor Yefremov +--- + parted/parted.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/parted/parted.c b/parted/parted.c +index 3abb52f..fc2aeba 100644 +--- a/parted/parted.c ++++ b/parted/parted.c +@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp) + } + + static int +-do_version () ++do_version (PedDevice** dev, PedDisk** diskp) + { + printf ("\n%s\n%s", + prog_name, +-- +2.34.1 + diff --git a/package/passt/Config.in b/package/passt/Config.in new file mode 100644 index 0000000000..a93a088670 --- /dev/null +++ b/package/passt/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PASST + bool "passt" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + help + passt: Plug A Simple Socket Transport + pasta: Pack A Subtle Tap Abstraction + + passt implements a translation layer between a Layer-2 + network interface and native Layer-4 sockets (TCP, UDP, + ICMP/ICMPv6 echo) on a host. It doesn't require any + capabilities or privileges, and it can be used as a simple + replacement for Slirp. + + pasta (same binary as passt, different command) offers + equivalent functionality, for network namespaces: traffic + is forwarded using a tap interface inside the namespace, + without the need to create further interfaces on the host, + hence not requiring any capabilities or privileges. + + https://passt.top/passt/about/ + +comment "passt needs a toolchain w/ headers >= 5.0" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/passt/passt.hash b/package/passt/passt.hash new file mode 100644 index 0000000000..af55658594 --- /dev/null +++ b/package/passt/passt.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 ac2562e4b589c518b6e30101daaa430691da2605ccc2988d0b704079c2aea4f3 passt-2025_06_11.0293c6f-git4.tar.gz +sha256 32dfe03d9985f5feb581da26a2fe6c84530cccb6b53ede0d8dab075cd048ac5b LICENSES/BSD-3-Clause.txt +sha256 aaf135472f81c5b4a0dca9367e5bb5e9750032b5bebe5442b36e4c0a47430df3 LICENSES/GPL-2.0-or-later.txt diff --git a/package/passt/passt.mk b/package/passt/passt.mk new file mode 100644 index 0000000000..8f9ab937b1 --- /dev/null +++ b/package/passt/passt.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# passt +# +################################################################################ + +PASST_VERSION = 2025_06_11.0293c6f +PASST_SITE = https://passt.top/passt +PASST_SITE_METHOD = git + +PASST_LICENSE = \ + BSD-3-Clause, \ + GPL-2.0-or-later +PASST_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GPL-2.0-or-later.txt + +define PASST_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) +endef + +define PASST_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) \ + prefix=/usr +endef + +define PASST_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + -C $(@D) \ + prefix=/usr \ + DESTDIR=$(TARGET_DIR) \ + install +endef + +$(eval $(generic-package)) diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash index f6a3f9eef6..9401d046cb 100644 --- a/package/pciutils/pciutils.hash +++ b/package/pciutils/pciutils.hash @@ -1,3 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 77f11f78298502634d1af50308f15a5788629f6cf45cba376f5009aea4cb4926 pciutils-3.13.0.tar.xz +sha256 e7713409882813991d2269d125e40dad1f54a019a52b78b3962941c1d4a6f86f pciutils-3.14.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index ea3c21db6a..bd205b1430 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCIUTILS_VERSION = 3.13.0 +PCIUTILS_VERSION = 3.14.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 30a8fbf0b6..38725ed8c8 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -5,7 +5,7 @@ ################################################################################ # Don't use the github helper, as pcm-tools uses git attributes that are -# replaced when gnerating the archive. +# replaced when generating the archive. # 93fc9193a70e2f1f054be554c48f4a4791be5032 is the hash of the 202110 tag. PCM_TOOLS_VERSION = 93fc9193a70e2f1f054be554c48f4a4791be5032 PCM_TOOLS_SITE = https://github.com/opcm/pcm diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in index 73b8c7c04c..a4522d88f4 100644 --- a/package/pcmanfm/Config.in +++ b/package/pcmanfm/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_PCMANFM bool "pcmanfm" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # libfm + depends on BR2_USE_WCHAR # libfm + depends on BR2_TOOLCHAIN_HAS_THREADS # libfm + depends on BR2_USE_MMU # libfm + depends on BR2_INSTALL_LIBSTDCPP # libfm + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libfm + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libfm + depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL # libfm + depends on BR2_PACKAGE_XORG7 # libfm + depends on BR2_PACKAGE_HAS_LIBGL # libfm select BR2_PACKAGE_LIBFM select BR2_PACKAGE_MENU_CACHE select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 + select BR2_PACKAGE_LIBGTK3 + select BR2_PACKAGE_LIBGTK3_X11 help PCMan File Manager (PCManFM) is a file manager application developed by Hong Jen Yee from Taiwan which is meant to be a @@ -18,10 +22,15 @@ config BR2_PACKAGE_PCMANFM http://wiki.lxde.org/en/PCManFM -comment "pcmanfm needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" +comment "pcmanfm a toolchain w/ wchar, threads, C++, gcc >= 4.9" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +comment "pcmanfm needs X.org with an OpenGL backend" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_PACKAGE_XORG7 || BR2_PACKAGE_HAS_LIBGL diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk index 9b233f614d..46d750b1e6 100644 --- a/package/pcmanfm/pcmanfm.mk +++ b/package/pcmanfm/pcmanfm.mk @@ -7,18 +7,11 @@ PCMANFM_VERSION = 1.3.2 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files -PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES) +PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm libgtk3 $(TARGET_NLS_DEPENDENCIES) PCMANFM_LICENSE = GPL-2.0+ PCMANFM_LICENSE_FILES = COPYING PCMANFM_CPE_ID_VALID = YES PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) - -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -PCMANFM_CONF_OPTS += --with-gtk=3 -PCMANFM_DEPENDENCIES += libgtk3 -else -PCMANFM_CONF_OPTS += --with-gtk=2 -PCMANFM_DEPENDENCIES += libgtk2 -endif +PCMANFM_CONF_OPTS = --with-gtk=3 $(eval $(autotools-package)) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index f2e17df753..17f15c0fdc 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2.sig -sha256 e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb pcre2-10.43.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.47/pcre2-10.47.tar.bz2.sig +sha256 47fe8c99461250d42f89e6e8fdaeba9da057855d06eb7fc08d9ca03fd08d7bc7 pcre2-10.47.tar.bz2 # Locally computed -sha256 030087e2e8dd7c1bdd26057d25d4ded8f45bbf01ad458d68665ad04b8b0fbedf LICENCE +sha256 197d8a73ffee0d6b09adba2f9c677b5f5aede24edf89258a68e48248d010d811 LICENCE.md +sha256 5f216505c0f6ea3273caec89e766eef93cdeb7bbb0c429f9360116d7c938feeb deps/sljit/LICENSE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 9641f22e81..f2b5608150 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,14 +4,17 @@ # ################################################################################ -PCRE2_VERSION = 10.43 +PCRE2_VERSION = 10.47 PCRE2_SITE = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause -PCRE2_LICENSE_FILES = LICENCE +PCRE2_LICENSE_FILES = LICENCE.md PCRE2_CPE_ID_VENDOR = pcre PCRE2_INSTALL_STAGING = YES PCRE2_CONFIG_SCRIPTS = pcre2-config +# Fixes build/relink failure ("ERROR: unsafe header/library path used in +# cross-compilation: '-L/usr/lib'") +PCRE2_AUTORECONF = YES PCRE2_CONF_OPTS += --enable-pcre2-8 PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_16),--enable-pcre2-16,--disable-pcre2-16) @@ -19,6 +22,8 @@ PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_32),--enable-pcre2-32,--disable-pcre ifeq ($(BR2_PACKAGE_PCRE2_JIT),y) PCRE2_CONF_OPTS += --enable-jit +PCRE2_LICENSE += BSD-2-Clause +PCRE2_LICENSE_FILES += deps/sljit/LICENSE else PCRE2_CONF_OPTS += --disable-jit endif diff --git a/package/pdmenu/pdmenu.mk b/package/pdmenu/pdmenu.mk index 2691a67ef6..72eb95bddc 100644 --- a/package/pdmenu/pdmenu.mk +++ b/package/pdmenu/pdmenu.mk @@ -11,4 +11,11 @@ PDMENU_LICENSE_FILES = doc/COPYING PDMENU_DEPENDENCIES = slang $(TARGET_NLS_DEPENDENCIES) PDMENU_INSTALL_TARGET_OPTS = INSTALL_PREFIX=$(TARGET_DIR) install +# gcc-15 defaults to -std=gnu23 which introduces build failures. +# We force "-std=gnu17" for gcc version supporting it. Earlier gcc +# versions will work, since they are using the older standard. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) +PDMENU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17" +endif + $(eval $(autotools-package)) diff --git a/package/perl-html-tagset/perl-html-tagset.hash b/package/perl-html-tagset/perl-html-tagset.hash index 648f75f649..2940ed6e59 100644 --- a/package/perl-html-tagset/perl-html-tagset.hash +++ b/package/perl-html-tagset/perl-html-tagset.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d2bfa18fe1904df7f683e96611e87437 HTML-Tagset-3.20.tar.gz -sha256 adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 HTML-Tagset-3.20.tar.gz +md5 f8db8974f5e7fe7df2a58263a7b00552 HTML-Tagset-3.24.tar.gz +sha256 eb89e145a608ed1f8f141a57472ee5f69e67592a432dcd2e8b1dbb445f2b230b HTML-Tagset-3.24.tar.gz # computed by scancpan -sha256 275cc182d78ac2db6856442c5d334c925350fb56fe83ee3577f5850317423419 README +sha256 ffe7dd5ca8da47fbbd00d35f57b2f17fffcc2b2eb91417d1e3df68fa1841262c README.md diff --git a/package/perl-html-tagset/perl-html-tagset.mk b/package/perl-html-tagset/perl-html-tagset.mk index c6b5f69134..c1a9210087 100644 --- a/package/perl-html-tagset/perl-html-tagset.mk +++ b/package/perl-html-tagset/perl-html-tagset.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_HTML_TAGSET_VERSION = 3.20 +PERL_HTML_TAGSET_VERSION = 3.24 PERL_HTML_TAGSET_SOURCE = HTML-Tagset-$(PERL_HTML_TAGSET_VERSION).tar.gz PERL_HTML_TAGSET_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PETDANCE PERL_HTML_TAGSET_LICENSE = Artistic or GPL-1.0+ -PERL_HTML_TAGSET_LICENSE_FILES = README +PERL_HTML_TAGSET_LICENSE_FILES = README.md PERL_HTML_TAGSET_DISTNAME = HTML-Tagset $(eval $(perl-package)) diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index 5b0e77294d..8269b06308 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,5 +1,5 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -sha256 0fa09a93a00f43ac91017a91628265ae7d47deb507e2770532bbb2597550d3d4 Mail-DKIM-1.20230630.tar.gz +sha256 45de46f5dc4d23bcb6ad6401759881dd43968eab20e73f6f79d9557467de20ee Mail-DKIM-1.20240923.tar.gz # computed by scancpan -sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE +sha256 c6a290f7f171362fae67166a1394374358237c37fd35cd7ae6ec1b116a797161 LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index 4f4d86ee10..4fd855aca8 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 1.20230630 +PERL_MAIL_DKIM_VERSION = 1.20240923 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-mailtools/perl-mailtools.hash b/package/perl-mailtools/perl-mailtools.hash index 317e020ac2..f34f98ae2e 100644 --- a/package/perl-mailtools/perl-mailtools.hash +++ b/package/perl-mailtools/perl-mailtools.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 69ee516d40011e7e92b77c6f06c0dc01 MailTools-2.21.tar.gz -sha256 4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb MailTools-2.21.tar.gz +md5 f41236db9af81d68e1ce8ecc401747f3 MailTools-2.22.tar.gz +sha256 3bf68bb212298fa699a52749dddff35583a74f36a92ca89c843b854f29d87c77 MailTools-2.22.tar.gz # computed by scancpan -sha256 f7558badc4f4875df247bcccb50a8f369bfe4a2c19361f1df7b26ddf6aaaaf6b README +sha256 cd861812aad88a61059bea4c9d17a5b6010d97774286bb5e9378cded6523289e README diff --git a/package/perl-mailtools/perl-mailtools.mk b/package/perl-mailtools/perl-mailtools.mk index 900ee41ff5..4a3ab85cf1 100644 --- a/package/perl-mailtools/perl-mailtools.mk +++ b/package/perl-mailtools/perl-mailtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAILTOOLS_VERSION = 2.21 +PERL_MAILTOOLS_VERSION = 2.22 PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV PERL_MAILTOOLS_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 9bd87d12c9..3a3693bea0 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 7a1c00ef78a6a000bfdf329f24cc5f31 Net-DNS-1.47.tar.gz -sha256 fec3dab10ac82dbac26b1ae2e367909256f420835d96cda7dc1b508e29938f0b Net-DNS-1.47.tar.gz +md5 1ca152f2eec8f66ef4ae7243697197cc Net-DNS-1.50.tar.gz +sha256 c660500b9d96e5aa2b16d9f4260b6f9f05b5602d3c4bea0ca39b45bcd02ba993 Net-DNS-1.50.tar.gz # computed by scancpan sha256 1e44fcf65509b47a251eda0ce1f8bd6aefa13517e38cb1e95b8d36120fb15452 LICENSE diff --git a/package/perl-net-dns/perl-net-dns.mk b/package/perl-net-dns/perl-net-dns.mk index fc8c77dd67..05924c1055 100644 --- a/package/perl-net-dns/perl-net-dns.mk +++ b/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.47 +PERL_NET_DNS_VERSION = 1.50 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT diff --git a/package/perl-net-ssleay/Config.in b/package/perl-net-ssleay/Config.in index d699e6671d..41c4669370 100644 --- a/package/perl-net-ssleay/Config.in +++ b/package/perl-net-ssleay/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PERL_NET_SSLEAY bool "perl-net-ssleay" depends on !BR2_STATIC_LIBS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help Perl extension for using OpenSSL. diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index fb70f0c266..b53479803b 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 34cf48b69c4fbcc40cfebac94af39424 URI-5.29.tar.gz -sha256 a34b9f626c3ff1e20c0d4a23ec5c8b7ae1de1fb674ecefed7e46791388137372 URI-5.29.tar.gz +md5 56aa2bc3efb180eceb4c143378ab4327 URI-5.32.tar.gz +sha256 9632067d34e14e0dae2da94631c4f25a387fcc48d06fa29330e8b3c04c4e913d URI-5.32.tar.gz # computed by scancpan sha256 a1730c55839ce3c9182c92e3387ba8f683ad6ab8b4a3257553a20c4db194c2cf LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d02a729dc2..671d1f5a07 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.29 +PERL_URI_VERSION = 5.32 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic-1.0-Perl or GPL-1.0+ diff --git a/package/perl/perl.hash b/package/perl/perl.hash index aba2844036..d581054bb5 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.40.0.tar.xz.{md5,sha1,sha256}.txt -md5 cfe14ef0709b9687f9c514042e8e1e82 perl-5.40.0.tar.xz -sha1 4a3af1f62afc611aa1552adc6c7ec389e9723bce perl-5.40.0.tar.xz -sha256 d5325300ad267624cb0b7d512cfdfcd74fa7fe00c455c5b51a6bd53e5e199ef9 perl-5.40.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.40.2.tar.xz.{md5,sha1,sha256}.txt +md5 9ad7a269dc4053cdbeecd4fde444291b perl-5.40.2.tar.xz +sha1 661fe9ee085ca0aec8ddd65e055bee922af12663 perl-5.40.2.tar.xz +sha256 0551c717458e703ef7972307ab19385edfa231198d88998df74e12226abf563b perl-5.40.2.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.6/perl-cross-1.6.hash -sha256 5abf198ee50ce9e69eb68fede68c87f65241caa744e4203e97490fa59b45ed69 perl-cross-1.6.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.6.2/perl-cross-1.6.2.hash +sha256 131f7496152ee32067dbac2bc9b44b2f582fc778140e545701b3b2faee782f1d perl-cross-1.6.2.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 05fcf86432bd78754c7e325d4be44a5968344c01cc08c004b685172ea508ec23 README +sha256 af805523b88a8ebb60afc009caaf247a498208502f7b8b3d9d3e329fcfb1dc3b README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 0f7038a048..34abb734d6 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 40 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.6 +PERL_CROSS_VERSION = 1.6.2 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz @@ -98,7 +98,9 @@ endef HOST_PERL_CONF_OPTS = \ -des \ -Dprefix="$(HOST_DIR)" \ - -Dcc="$(HOSTCC)" + -Dcc="$(HOSTCC)" \ + -Dccflags="$(HOST_CFLAGS)" \ + -Dldflags="$(HOST_LDFLAGS)" define HOST_PERL_CONFIGURE_CMDS (cd $(@D); $(HOST_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ diff --git a/package/petitboot/0001-ui-Fix-compile-with-curses-opaque-menu-headers.patch b/package/petitboot/0001-ui-Fix-compile-with-curses-opaque-menu-headers.patch new file mode 100644 index 0000000000..b6b6350034 --- /dev/null +++ b/package/petitboot/0001-ui-Fix-compile-with-curses-opaque-menu-headers.patch @@ -0,0 +1,67 @@ +Recent Debian ncurses is built with NCURSES_OPAQUE_MENU, which means +the menu item type can't be poked directly. Fix with accessors. + +One wrinkle is the item name can't be modified, new_item has to be used. + +Signed-off-by: Nicholas Piggin +Upstream: https://github.com/open-power/petitboot/issues/106 +Signed-off-by: Nathaniel Roach +--- + ui/ncurses/nc-menu.c | 12 ++++++++---- + ui/ncurses/nc-menu.h | 4 ++-- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c +index a90a02e..a1524b5 100644 +--- a/ui/ncurses/nc-menu.c ++++ b/ui/ncurses/nc-menu.c +@@ -141,9 +141,13 @@ int pmenu_item_update(struct pmenu_item *item, const char *name) + if (!label) + return -1; + +- i = item->nci; +- i->name.str = label; +- i->name.length = strncols(label); ++ i = new_item(label, NULL); ++ if (!i) { ++ talloc_free((char *)label); ++ return -1; ++ } ++ free_item(item->nci); ++ item->nci = i; + + return 0; + } +@@ -358,7 +362,7 @@ static int pmenu_item_get_index(const struct pmenu_item *item) + return i; + + pb_log_fn("not found: %p %s\n", item, +- (item ? item->nci->name.str : "(null)")); ++ (item ? item_name(item->nci) : "(null)")); + return -1; + } + +diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h +index eb568c8..550c7e1 100644 +--- a/ui/ncurses/nc-menu.h ++++ b/ui/ncurses/nc-menu.h +@@ -126,7 +126,7 @@ static inline struct pmenu *pmenu_from_scr(struct nc_scr *scr) + + static inline void pmenu_dump_item(const ITEM *item) + { +- pb_debug("%p %s\n", item, (item ? item->name.str : "(null)")); ++ pb_debug("%p %s\n", item, (item ? item_name(item) : "(null)")); + } + + static inline void pmenu_dump_items(ITEM *const *items, unsigned int count) +@@ -135,7 +135,7 @@ static inline void pmenu_dump_items(ITEM *const *items, unsigned int count) + + for (i = 0; i < count; i++) + pb_debug("%u: %p %s\n", i, items[i], +- (items[i] ? items[i]->name.str : "(null)")); ++ (items[i] ? item_name(items[i]) : "(null)")); + } + + #endif +-- +2.42.0 diff --git a/package/petitboot/0002-ui-Fix-curses-menu-item-label-leak.patch b/package/petitboot/0002-ui-Fix-curses-menu-item-label-leak.patch new file mode 100644 index 0000000000..f14f7ae24e --- /dev/null +++ b/package/petitboot/0002-ui-Fix-curses-menu-item-label-leak.patch @@ -0,0 +1,54 @@ +When a menu item name is updated, the old label is not freed. + +Signed-off-by: Nicholas Piggin +Upstream: https://github.com/open-power/petitboot/issues/106 +Signed-off-by: Nathaniel Roach +--- + ui/ncurses/nc-menu.c | 4 ++++ + ui/ncurses/nc-menu.h | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c +index a1524b5..70f2210 100644 +--- a/ui/ncurses/nc-menu.c ++++ b/ui/ncurses/nc-menu.c +@@ -82,6 +82,7 @@ static void pmenu_resize(struct nc_scr *scr) + static int pmenu_item_destructor(void *arg) + { + struct pmenu_item *item = arg; ++ talloc_free((char *)item->label); + free_item(item->nci); + return 0; + } +@@ -146,7 +147,9 @@ int pmenu_item_update(struct pmenu_item *item, const char *name) + talloc_free((char *)label); + return -1; + } ++ talloc_free((char *)item->label); + free_item(item->nci); ++ item->label = label; + item->nci = i; + + return 0; +@@ -168,6 +171,7 @@ struct pmenu_item *pmenu_item_create(struct pmenu *menu, const char *name) + + item->i_sig = pb_item_sig; + item->pmenu = menu; ++ item->label = label; + item->nci = new_item(label, NULL); + + if (!item->nci) { +diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h +index 550c7e1..7ba45bf 100644 +--- a/ui/ncurses/nc-menu.h ++++ b/ui/ncurses/nc-menu.h +@@ -46,6 +46,7 @@ struct pmenu; + + struct pmenu_item { + enum pb_nc_sig i_sig; ++ const char *label; + ITEM *nci; + struct pmenu *pmenu; + void *data; +-- +2.42.0 diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 50d5a4da70..76cbbe9c6d 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PETITBOOT depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS depends on BR2_USE_MMU # lvm2, agetty depends on BR2_USE_WCHAR # elfutils, kexec-lite - depends on !BR2_STATIC_LIBS # elfutils, kexec-lite, lvm2 + depends on !BR2_STATIC_LIBS # elfutils, kexec-lite, lvm2, nvme depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, kexec-lite, lvm2 depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || !BR2_PACKAGE_KEXEC_ARCH_SUPPORTS # kexec diff --git a/package/php-apcu/php-apcu.hash b/package/php-apcu/php-apcu.hash index 4a5eadf803..073d1ae6e9 100644 --- a/package/php-apcu/php-apcu.hash +++ b/package/php-apcu/php-apcu.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e apcu-5.1.22.tgz +sha256 1a2c37fcad2ae2a1aea779cd6ca9353d8b38d4e27dde2327c52ff3892dfadb3f apcu-5.1.27.tgz sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk index b8eeb9de7c..ce640c9c03 100644 --- a/package/php-apcu/php-apcu.mk +++ b/package/php-apcu/php-apcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_APCU_VERSION = 5.1.22 +PHP_APCU_VERSION = 5.1.27 PHP_APCU_SITE = http://pecl.php.net/get PHP_APCU_SOURCE = apcu-$(PHP_APCU_VERSION).tgz PHP_APCU_LICENSE = PHP-3.01 diff --git a/package/php-imagick/php-imagick.hash b/package/php-imagick/php-imagick.hash index 97c0b2f0e0..f6091c6b7e 100644 --- a/package/php-imagick/php-imagick.hash +++ b/package/php-imagick/php-imagick.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e imagick-3.7.0.tgz +sha256 bda67461c854f20d6105782b769c524fc37388b75d4481d951644d2167ffeec6 imagick-3.8.0.tgz sha256 b6e00df9cb3b91977c0d64a7c4db48cb6f5041f6eeda6583c236775f70a35b78 LICENSE diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk index 925423b12a..0223b6ae93 100644 --- a/package/php-imagick/php-imagick.mk +++ b/package/php-imagick/php-imagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_IMAGICK_VERSION = 3.7.0 +PHP_IMAGICK_VERSION = 3.8.0 PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz PHP_IMAGICK_SITE = http://pecl.php.net/get PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php-lua/0003-php8-Signature-of-write-properly-read-property-was-changed.patch b/package/php-lua/0003-php8-Signature-of-write-properly-read-property-was-changed.patch new file mode 100644 index 0000000000..82a6bbd0b2 --- /dev/null +++ b/package/php-lua/0003-php8-Signature-of-write-properly-read-property-was-changed.patch @@ -0,0 +1,77 @@ +From de1068d634519abf2461dac9427b5ff24b6603af Mon Sep 17 00:00:00 2001 +From: Mikhail Galanin +Date: Tue, 24 Aug 2021 08:28:47 +0100 +Subject: [PATCH] php8: Signature of write_property/read_property was changed + in https://github.com/php/php-src/commit/91ef4124e56 + +Upstream: upstream dead, taken from fork at https://github.com/badoo/php-lua/pull/8 +Signed-off-by: Alexis Lothoré +--- + lua.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lua.c b/lua.c +index edc2868..32c1471 100755 +--- a/lua.c ++++ b/lua.c +@@ -229,46 +229,46 @@ zend_object *php_lua_create_object(zend_class_entry *ce) + + /** {{{ static zval * php_lua_read_property(zval *object, zval *member, int type) + */ +-zval *php_lua_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv){ +- lua_State *L = (Z_LUAVAL_P(object))->L; +- zend_string *str_member; ++zval *php_lua_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv){ ++ lua_State *L = php_lua_obj_from_obj(object)->L; + + if (type != BP_VAR_R) { + ZVAL_NULL(rv); + return rv; + } + +- str_member = zval_get_string(member); + #if (LUA_VERSION_NUM < 502) +- lua_getfield(L, LUA_GLOBALSINDEX, ZSTR_VAL(str_member)); ++ lua_getfield(L, LUA_GLOBALSINDEX, ZSTR_VAL(member)); + #else +- lua_getglobal(L, ZSTR_VAL(str_member)); ++ lua_getglobal(L, ZSTR_VAL(member)); + #endif +- zend_string_release(str_member); + +- php_lua_get_zval_from_lua(L, -1, object, rv); ++ zval lua_zval_object; ++ ZVAL_OBJ(&lua_zval_object, object); ++ ++ php_lua_get_zval_from_lua(L, -1, &lua_zval_object, rv); + lua_pop(L, 1); ++ + return rv; + } + /* }}} */ + + /** {{{ static void php_lua_write_property(zval *object, zval *member, zval *value) + */ +-static void php_lua_write_property(zval *object, zval *member, zval *value, void ** key) { +- lua_State *L = (Z_LUAVAL_P(object))->L; +- zend_string *str_member = zval_get_string(member); ++static zval* php_lua_write_property(zend_object *object, zend_string *member, zval *value, void ** key) { ++ lua_State *L = php_lua_obj_from_obj(object)->L; + + #if (LUA_VERSION_NUM < 502) +- php_lua_send_zval_to_lua(L, member); ++ lua_pushlstring(L, ZSTR_VAL(val), ZSTR_LEN(val)); + php_lua_send_zval_to_lua(L, value); + + lua_settable(L, LUA_GLOBALSINDEX); + #else + php_lua_send_zval_to_lua(L, value); +- lua_setglobal(L, Z_STRVAL_P(member)); ++ lua_setglobal(L, ZSTR_VAL(member)); + #endif + +- zend_string_release(str_member); ++ return value; + } + /* }}} */ + diff --git a/package/php-lua/0004-lua.c-fix-ZSTR_VAL-usage-when-using-lua-5.2.patch b/package/php-lua/0004-lua.c-fix-ZSTR_VAL-usage-when-using-lua-5.2.patch new file mode 100644 index 0000000000..c5d99db7f5 --- /dev/null +++ b/package/php-lua/0004-lua.c-fix-ZSTR_VAL-usage-when-using-lua-5.2.patch @@ -0,0 +1,38 @@ +From 7bf334832ad36d1f2976406d680b35a168ffaa91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= +Date: Mon, 8 Sep 2025 17:20:12 +0200 +Subject: [PATCH] lua.c: fix ZSTR_VAL usage when using lua < 5.2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a lua interpreter with a version lower than 5.1, the +php_lua_write_property ends up calling the ZSTR_VAL with the wrong +variable (it is expected to receive "member", a zend_string variable, +but it is "value" that is passed, which is a zval). + +Fix php-lua compatibility with interpreters < 5.2 by passing the correct +variable + +Upstream: upstream dead, custom patch +Signed-off-by: Alexis Lothoré +--- + lua.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lua.c b/lua.c +index a40e5da442a4..5889bc7f83ea 100755 +--- a/lua.c ++++ b/lua.c +@@ -244,7 +244,7 @@ static zval* php_lua_write_property(zend_object *object, zend_string *member, zv + lua_State *L = php_lua_obj_from_obj(object)->L; + + #if (LUA_VERSION_NUM < 502) +- lua_pushlstring(L, ZSTR_VAL(val), ZSTR_LEN(val)); ++ lua_pushlstring(L, ZSTR_VAL(member), ZSTR_LEN(member)); + php_lua_send_zval_to_lua(L, value); + + lua_settable(L, LUA_GLOBALSINDEX); +-- +2.51.0 + diff --git a/package/php-pecl-dbus/php-pecl-dbus.hash b/package/php-pecl-dbus/php-pecl-dbus.hash index 122636913c..024b81aed3 100644 --- a/package/php-pecl-dbus/php-pecl-dbus.hash +++ b/package/php-pecl-dbus/php-pecl-dbus.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 652db988457479682ef1bbe00952d746b54150e77f06a4d75ffa3a696f5321ba php-pecl-dbus-b147624d480c3353e6c700e9a2d0c6f14d853941.tar.gz +sha256 d35dfe7c2be5602146803b374b295f24ae9aac5aa0efa5fa80021aa8da2d30df php-pecl-dbus-0.4.1.tar.gz sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE diff --git a/package/php-pecl-dbus/php-pecl-dbus.mk b/package/php-pecl-dbus/php-pecl-dbus.mk index 84cc373bb7..9efc923a2f 100644 --- a/package/php-pecl-dbus/php-pecl-dbus.mk +++ b/package/php-pecl-dbus/php-pecl-dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_PECL_DBUS_VERSION = b147624d480c3353e6c700e9a2d0c6f14d853941 +PHP_PECL_DBUS_VERSION = 0.4.1 PHP_PECL_DBUS_SITE = $(call github,derickr,pecl-dbus,$(PHP_PECL_DBUS_VERSION)) PHP_PECL_DBUS_LICENSE = PHP-3.01 PHP_PECL_DBUS_LICENSE_FILES = LICENSE diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 251b79ab77..9470a7d4e8 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4eb4ee270bbcc5f14195c38f6ee58580e007cf4886ce32e11430318ab5bc2315 xdebug-3.3.1.tgz +sha256 7592923501e3fdb9741ad35b90e08fc6b3c5dd31eadc4c83b7b3c9dda0627b24 xdebug-3.4.7.tgz sha256 bc2aee27f3f0806be39e329d284ddbbfb14602a49af261df305dd6122d988eb0 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 771b96534a..272d331f7b 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.3.1 +PHP_XDEBUG_VERSION = 3.4.7 PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash index 4fa5dfbc16..796e654659 100644 --- a/package/php-yaml/php-yaml.hash +++ b/package/php-yaml/php-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5937eb9722ddf6d64626799cfa024598ff2452ea157992e4e67331a253f90236 yaml-2.2.3.tgz +sha256 bc8404807a3a4dc896b310af21a7f8063aa238424ff77f27eb6ffa88b5874b8a yaml-2.3.0.tgz sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index e825e3146f..440b07afe4 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_YAML_VERSION = 2.2.3 +PHP_YAML_VERSION = 2.3.0 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz PHP_YAML_SITE = https://pecl.php.net/get PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ diff --git a/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/package/php/0001-acinclude.m4-don-t-unset-variables.patch index 9badbd1cc2..fe92fb4f55 100644 --- a/package/php/0001-acinclude.m4-don-t-unset-variables.patch +++ b/package/php/0001-acinclude.m4-don-t-unset-variables.patch @@ -9,8 +9,8 @@ Terminate them with extreme prejudice. Signed-off-by: Gustavo Zacarias Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 7.3.0] -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 8.1.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.4.13] --- build/php.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -19,7 +19,7 @@ diff --git a/build/php.m4 b/build/php.m4 index e91ef988..9586c490 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1580,8 +1580,6 @@ dnl PHP_CHECK_FUNC_LIB +@@ -1462,8 +1462,6 @@ dnl PHP_CHECK_FUNC_LIB dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -28,7 +28,7 @@ index e91ef988..9586c490 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1616,8 +1616,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1496,8 +1496,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ diff --git a/package/php/0002-iconv-tweak-iconv-detection.patch b/package/php/0002-iconv-tweak-iconv-detection.patch index 758dd6133b..536a69fd18 100644 --- a/package/php/0002-iconv-tweak-iconv-detection.patch +++ b/package/php/0002-iconv-tweak-iconv-detection.patch @@ -15,8 +15,8 @@ Signed-off-by: Gustavo Zacarias [Gustavo: update for 5.6.10] Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 8.0.7] -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.4.13] --- build/php.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -25,10 +25,10 @@ diff --git a/build/php.m4 b/build/php.m4 index 9586c490..8b3d47ed 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1976,7 +1976,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ - dnl Check external libs for iconv funcs. - if test "$found_iconv" = "no"; then +@@ -1839,7 +1839,7 @@ + dnl Check external libs for iconv funcs. + AS_VAR_IF([found_iconv], [no], [ - for i in $PHP_ICONV /usr/local /usr; do + for i in $PHP_ICONV; do if test -r $i/include/gnu-libiconv/iconv.h; then diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch index 6bfaf6640f..ebde912861 100644 --- a/package/php/0003-configure-disable-the-phar-tool.patch +++ b/package/php/0003-configure-disable-the-phar-tool.patch @@ -12,8 +12,8 @@ Signed-off-by: Gustavo Zacarias [Gustavo: update for autoreconf/configure.in] Signed-off-by: Adam Duskett [Aduskett: update for 8.0.7] -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.4.13] --- configure.ac | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 0dfab302..6026fb66 100644 --- a/configure.ac +++ b/configure.ac -@@ -1638,13 +1638,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1585,13 +1585,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" @@ -36,7 +36,7 @@ index 0dfab302..6026fb66 100644 +pharcmd= +pharcmd_install= - all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" + all_targets="\$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install" -- 2.14.3 diff --git a/package/php/0004-Call-apxs-with-correct-prefix.patch b/package/php/0004-Call-apxs-with-correct-prefix.patch index 3a1a580084..cf8fe2cbfd 100644 --- a/package/php/0004-Call-apxs-with-correct-prefix.patch +++ b/package/php/0004-Call-apxs-with-correct-prefix.patch @@ -17,6 +17,8 @@ To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure Signed-off-by: Fabrice Fontaine Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 8.0.7] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.4.13] --- sapi/apache2handler/config.m4 | 3 +++ 1 file changed, 3 insertions(+) @@ -25,20 +27,20 @@ diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 55c16179..68ce66c0 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 -@@ -63,10 +63,12 @@ if test "$PHP_APXS2" != "no"; then - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) - fi +@@ -68,10 +68,12 @@ + AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0], + [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])]) + APXS_PREFIX='$(INSTALL_ROOT)'/usr - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then + APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR) + if test -z $($APXS -q SYSCONFDIR); then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S PREFIX='$APXS_PREFIX' \ -i -n php" else - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` -@@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then + APXS_SYSCONFDIR='$(INSTALL_ROOT)'$($APXS -q SYSCONFDIR) +@@ -79,6 +81,7 @@ if test "$PHP_APXS2" != "no"; then \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \ diff --git a/package/php/0005-allow-opcache-cross-compiling.patch b/package/php/0005-allow-opcache-cross-compiling.patch index 468864b0a4..1031b45f19 100644 --- a/package/php/0005-allow-opcache-cross-compiling.patch +++ b/package/php/0005-allow-opcache-cross-compiling.patch @@ -13,8 +13,8 @@ CFLAGS when opcache is enabled: -DHAVE_SHM_MMAP_FILE Signed-off-by: Adam Duskett -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 8.1.7 & 8.3.3] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.4.13] --- ext/opcache/config.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -23,17 +23,20 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 5492fd92..10c150ff 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -315,10 +315,6 @@ int main() { - +@@ -346,13 +346,6 @@ + PHP_ADD_EXTENSION_DEP(opcache, date) PHP_ADD_EXTENSION_DEP(opcache, pcre) -- if test "$have_shm_ipc" != "yes" && test "$have_shm_mmap_posix" != "yes" && test "$have_shm_mmap_anon" != "yes"; then -- AC_MSG_ERROR([No supported shared memory caching support was found when configuring opcache. Check config.log for any errors or missing dependencies.]) +- if test "$php_cv_shm_ipc" != "yes" && test "$php_cv_shm_mmap_posix" != "yes" && test "$php_cv_shm_mmap_anon" != "yes"; then +- AC_MSG_FAILURE(m4_text_wrap([ +- No supported shared memory caching support was found when configuring +- opcache. +- ])) - fi - - if test "$PHP_OPCACHE_JIT" = "yes"; then - PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1) - PHP_ADD_MAKEFILE_FRAGMENT($ext_srcdir/jit/Makefile.frag) + AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [ + PHP_ADD_BUILD_DIR([ + $ext_builddir/jit -- 2.31.1 diff --git a/package/php/Config.ext b/package/php/Config.ext index d5f8659016..609cf17016 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -139,8 +139,10 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI config BR2_PACKAGE_PHP_EXT_PGSQL bool "PostgreSQL" depends on BR2_USE_MMU # postgresql - depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help @@ -174,8 +176,10 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL bool "PostgreSQL" depends on BR2_USE_MMU # postgresql - depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help diff --git a/package/php/php.hash b/package/php/php.hash index e3a1c6cf2f..0532adeed6 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ -# From https://www.php.net/downloads.php -sha256 58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7 php-8.3.14.tar.xz +# From https://www.php.net/downloads.php?source=Y +sha256 a060684f614b8344f9b34c334b6ba8db1177555997edb5b1aceab0a4b807da7e php-8.4.15.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 2f649dc6fb..cd48cd1bd9 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.14 +PHP_VERSION = 8.4.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -15,6 +15,9 @@ PHP_LICENSE = PHP-3.01 PHP_LICENSE_FILES = LICENSE PHP_CPE_ID_VENDOR = php +# Only affects the Windows operating system +PHP_IGNORE_CVES += CVE-2024-3566 + PHP_CONF_OPTS = \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ @@ -40,6 +43,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PHP_EXTRA_LIBS += -latomic endif +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +PHP_CONF_ENV += php_cv_func_copy_file_range=no +endif + ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) PHP_DEPENDENCIES += libucontext PHP_EXTRA_LIBS += -lucontext @@ -92,7 +99,7 @@ endif # php has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `umlal r2,r1,r0,r3' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) PHP_CFLAGS += -marm endif @@ -256,10 +263,10 @@ PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND ifeq ($(BR2_PACKAGE_PCRE2_JIT),y) PHP_CONF_OPTS += --with-pcre-jit=yes -PHP_CONF_ENV += ac_cv_have_pcre2_jit=yes +PHP_CONF_ENV += php_cv_have_pcre2_jit=yes else PHP_CONF_OPTS += --with-pcre-jit=no -PHP_CONF_ENV += ac_cv_have_pcre2_jit=no +PHP_CONF_ENV += php_cv_have_pcre2_jit=no endif ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y) @@ -379,5 +386,12 @@ HOST_PHP_DEPENDENCIES = \ host-pcre2 \ host-pkgconf +# PHP can't be AUTORECONFed the standard way unfortunately +HOST_PHP_DEPENDENCIES += host-autoconf host-automake host-libtool +define HOST_PHP_BUILDCONF + cd $(@D) ; $(HOST_MAKE_ENV) ./buildconf --force +endef +HOST_PHP_PRE_CONFIGURE_HOOKS += HOST_PHP_BUILDCONF + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/pigz/Config.in b/package/pigz/Config.in index af229060cf..c6db83d490 100644 --- a/package/pigz/Config.in +++ b/package/pigz/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_PIGZ processors and multiple cores to the hilt when compressing data. - http://www.zlib.net/pigz/ + https://www.zlib.net/pigz/ comment "pigz needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pigz/pigz.hash b/package/pigz/pigz.hash index d09930b62b..d63c5a5717 100644 --- a/package/pigz/pigz.hash +++ b/package/pigz/pigz.hash @@ -1,4 +1,4 @@ -# From http://zlib.net/pigz +# From https://zlib.net/pigz sha256 eb872b4f0e1f0ebe59c9f7bd8c506c4204893ba6a8492de31df416f0d5170fd0 pigz-2.8.tar.gz # Locally calculated diff --git a/package/pigz/pigz.mk b/package/pigz/pigz.mk index e3273c71c1..0708882a15 100644 --- a/package/pigz/pigz.mk +++ b/package/pigz/pigz.mk @@ -5,7 +5,7 @@ ################################################################################ PIGZ_VERSION = 2.8 -PIGZ_SITE = http://zlib.net/pigz +PIGZ_SITE = https://zlib.net/pigz PIGZ_DEPENDENCIES = zlib HOST_PIGZ_DEPENDENCIES = host-zlib PIGZ_LICENSE = Zlib diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in index bd5e3af5a1..dc8c9724d7 100644 --- a/package/pinentry/Config.in +++ b/package/pinentry/Config.in @@ -6,7 +6,6 @@ menuconfig BR2_PACKAGE_PINENTRY select BR2_PACKAGE_LIBGPG_ERROR # At least one backend is needed to avoid build breakage select BR2_PACKAGE_PINENTRY_NCURSES if \ - !BR2_PACKAGE_PINENTRY_GTK2 && \ !BR2_PACKAGE_PINENTRY_QT5 help A collection of simple PIN or pass-phrase entry dialogs @@ -46,27 +45,6 @@ config BR2_PACKAGE_PINENTRY_NCURSES help The pinentry-ncurses tool -config BR2_PACKAGE_PINENTRY_GTK2 - bool "pinentry-gtk2" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz - select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - The pinentry-gtk2 tool - -comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.9" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_PINENTRY_QT5 bool "pinentry-qt5" depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index 7482a93d02..ef17df7657 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -13,10 +13,12 @@ PINENTRY_DEPENDENCIES = \ libassuan libgpg-error \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ host-pkgconf +# --disable-libcap to avoid PAM dependency PINENTRY_CONF_OPTS += \ --with-libassuan-prefix=$(STAGING_DIR)/usr \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ - --without-libcap # requires PAM + --without-libcap \ + --disable-pinentry-gtk2 # Force the path to "gpgrt-config" (from the libgpg-error package) to # avoid using the one on host, if present. @@ -58,14 +60,6 @@ else PINENTRY_CONF_OPTS += --disable-ncurses endif -# pinentry-gtk2 backend -ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y) -PINENTRY_CONF_OPTS += --enable-pinentry-gtk2 -PINENTRY_DEPENDENCIES += libgtk2 -else -PINENTRY_CONF_OPTS += --disable-pinentry-gtk2 -endif - # pinentry-qt5 backend ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y) PINENTRY_CONF_OPTS += --enable-pinentry-qt diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 8ea3890675..2e6a9ae3aa 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b3817f7b9abf14a6dbcb6ea18b186ba8771f703cb395e4a38366b4e051c40054 pipewire-1.2.2.tar.bz2 +sha256 7670f617220cc053948fc8f2c1ff788192479ef5d4f373d878ac8a7cab76a71c pipewire-1.2.8.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index eb86a98494..c1dc2aa0cc 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 1.2.2 +PIPEWIRE_VERSION = 1.2.8 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) diff --git a/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch b/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch new file mode 100644 index 0000000000..ad1a0902e2 --- /dev/null +++ b/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch @@ -0,0 +1,44 @@ +From d0045f1fc32635d9629ea9e361631b07d9ca4140 Mon Sep 17 00:00:00 2001 +From: Charlie Jenkins +Date: Mon, 21 Apr 2025 13:08:50 -0700 +Subject: [PATCH] RISC-V: Only enable RVV on linux if hwcap headers are + available + +Linux 6.4 introduced COMPAT_HWCAP_ISA_V. When trying to compile pixman +against linux headers older than this, pixman will fail to compile +because it assumes COMPAT_HWCAP_ISA_V exists. + +During meson configuration, do not enable have_rvv if the platform is +Linux and COMPAT_HWCAP_ISA_V doesn't exist. + +Signed-off-by: Charlie Jenkins +Fixes: 0e424031bda2 ("RISC-V floating point operations") +Upstream: https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/149 +--- + meson.build | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index fdea28f..cb10931 100644 +--- a/meson.build ++++ b/meson.build +@@ -379,7 +379,15 @@ if not use_rvv.disabled() + } + ''', + args : rvv_flags, +- name : 'RISC-V Vector Intrinsic Support') ++ name : 'RISC-V Vector Intrinsic Support') and cc.compiles(''' ++ #if defined(__linux__) ++ #include ++ #include ++ COMPAT_HWCAP_ISA_V ++ #endif ++ ''', ++ args : rvv_flags, ++ name: 'RISC-V Vector Linux HWCAP Support') + have_rvv = true + endif + endif +-- +2.43.0 + diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index 78407bf048..c49b9c9e76 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-October/003228.html -sha256 5747d2ec498ad0f1594878cc897ef5eb6c29e91c53b899f7f71b506785fc1376 pixman-0.42.2.tar.xz -sha512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8 pixman-0.42.2.tar.xz +# From https://lists.cairographics.org/archives/cairo/2024-December/029586.html +sha512 b24907f9a0bf6a9aa3278d31986c562c5f2d68f8c178021497c8648aca9f91e4c6f1ecfacf93eb01ba4f03ce4cfc5970fc40bb0fe6724bac9210fc57da09cba4 pixman-0.44.2.tar.xz # Locally computed sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 8a4f16318f..76e72d6d96 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.42.2 +PIXMAN_VERSION = 0.44.2 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT @@ -15,14 +15,16 @@ PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf HOST_PIXMAN_DEPENDENCIES = host-pkgconf -# For 0001-Disable-tests.patch -PIXMAN_AUTORECONF = YES - # don't build gtk based demos PIXMAN_CONF_OPTS = \ - --disable-gtk \ - --disable-loongson-mmi \ - --disable-arm-iwmmxt + -Dloongson-mmi=disabled \ + -Dvmx=disabled \ + -Dmips-dspr2=disabled \ + -Dopenmp=disabled \ + -Dgnuplot=false \ + -Dgtk=disabled \ + -Dlibpng=disabled \ + -Dtests=disabled # Affects only tests, and we don't build tests (see # 0001-Disable-tests.patch). See @@ -31,21 +33,51 @@ PIXMAN_CONF_OPTS = \ # test executable". PIXMAN_IGNORE_CVES += CVE-2023-37769 +ifeq ($(BR2_X86_CPU_HAS_MMX),y) +PIXMAN_CONF_OPTS += -Dmmx=enabled +else +PIXMAN_CONF_OPTS += -Dmmx=disabled +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +PIXMAN_CONF_OPTS += -Dsse2=enabled +else +PIXMAN_CONF_OPTS += -Dsse2=disabled +endif + +ifeq ($(BR2_X86_CPU_HAS_SSSE3),y) +PIXMAN_CONF_OPTS += -Dssse3=enabled +else +PIXMAN_CONF_OPTS += -Dssse3=disabled +endif + # The ARM SIMD code from pixman requires a recent enough ARM core, but # there is a runtime CPU check that makes sure it doesn't get used if # the HW doesn't support it. The only case where the ARM SIMD code # cannot be *built* at all is when the platform doesn't support ARM # instructions at all, so we have to disable that explicitly. ifeq ($(BR2_ARM_CPU_HAS_ARM),y) -PIXMAN_CONF_OPTS += --enable-arm-simd +PIXMAN_CONF_OPTS += -Darm-simd=enabled else -PIXMAN_CONF_OPTS += --disable-arm-simd +PIXMAN_CONF_OPTS += -Darm-simd=disabled endif ifeq ($(BR2_ARM_CPU_HAS_ARM)$(BR2_ARM_CPU_HAS_NEON),yy) -PIXMAN_CONF_OPTS += --enable-arm-neon +PIXMAN_CONF_OPTS += -Dneon=enabled else -PIXMAN_CONF_OPTS += --disable-arm-neon +PIXMAN_CONF_OPTS += -Dneon=disabled +endif + +ifeq ($(BR2_aarch64)$(BR2_ARM_CPU_HAS_NEON),yy) +PIXMAN_CONF_OPTS += -Da64-neon=enabled +else +PIXMAN_CONF_OPTS += -Da64-neon=disabled +endif + +ifeq ($(BR2_RISCV_ISA_RVV),y) +PIXMAN_CONF_OPTS += -Drvv=enabled +else +PIXMAN_CONF_OPTS += -Drvv=disabled endif PIXMAN_CFLAGS = $(TARGET_CFLAGS) @@ -54,7 +86,5 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) PIXMAN_CFLAGS += -O0 endif -PIXMAN_CONF_OPTS += CFLAGS="$(PIXMAN_CFLAGS)" - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index f17186dfe4..16b21acb6d 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -74,6 +74,8 @@ define LIBTOOL_PATCH_HOOK else \ patch -i support/libtool/buildroot-libtool-v2.4.patch $${i}; \ fi \ + elif test $${ltmain_version} = "2.5"; then\ + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $${i}; \ fi \ done endef @@ -200,8 +202,6 @@ else define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_SRCDIR) && rm -rf config.cache; \ $$(HOST_CONFIGURE_OPTS) \ - CFLAGS="$$(HOST_CFLAGS)" \ - LDFLAGS="$$(HOST_LDFLAGS)" \ $$($$(PKG)_CONF_ENV) \ CONFIG_SITE=/dev/null \ ./configure \ diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index d94a19024e..47a6353f25 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -206,7 +206,7 @@ endif # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. If the license is unset, it is "unknown" -# so adding unknowns to some unknown is still some other unkown, +# so adding unknowns to some unknown is still some other unknown, # so don't append the blurb in that case. ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index c7032312fb..ba287d244a 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -102,6 +102,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ + $$(if $$(BR2_INSTALL_LIBSTDCPP),,CXX=/bin/false) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -G$$($$(PKG)_GENERATOR) \ -DCMAKE_MAKE_PROGRAM="$$($$(PKG)_GENERATOR_PROGRAM)" \ diff --git a/package/pkg-download.mk b/package/pkg-download.mk index ca01ff67a5..ef268f5c83 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -7,24 +7,12 @@ # ################################################################################ -# Download method commands -export CURL := $(call qstrip,$(BR2_CURL)) -export WGET := $(call qstrip,$(BR2_WGET)) -export SVN := $(call qstrip,$(BR2_SVN)) -export CVS := $(call qstrip,$(BR2_CVS)) -export BZR := $(call qstrip,$(BR2_BZR)) -export GIT := $(call qstrip,$(BR2_GIT)) -export HG := $(call qstrip,$(BR2_HG)) -export SCP := $(call qstrip,$(BR2_SCP)) -export SFTP := $(call qstrip,$(BR2_SFTP)) -export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) - # Version of the format of the archives we generate in the corresponding # download backend and post-process: BR_FMT_VERSION_git = -git4 BR_FMT_VERSION_svn = -svn5 BR_FMT_VERSION_go = -go2 -BR_FMT_VERSION_cargo = -cargo2 +BR_FMT_VERSION_cargo = -cargo4 DL_WRAPPER = support/download/dl-wrapper @@ -39,7 +27,7 @@ else BR2_DL_DIR = $(DL_DIR) endif -# ensure it exists and a absolute path, derefrecing symlinks +# ensure it exists and a absolute path, dereferencing symlinks DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd -P) # @@ -118,6 +106,16 @@ define DOWNLOAD $(Q)$(DOWNLOAD_SET_UMASK) $(EXTRA_ENV) \ $($(PKG)_DL_ENV) \ TAR="$(TAR)" \ + BZR="$(call qstrip,$(BR2_BZR))" \ + CURL="$(call qstrip,$(BR2_CURL))" \ + CVS="$(call qstrip,$(BR2_CVS))" \ + GIT="$(call qstrip,$(BR2_GIT))" \ + HG="$(call qstrip,$(BR2_HG))" \ + LOCALFILES="$(call qstrip,$(BR2_LOCALFILES))" \ + SCP="$(call qstrip,$(BR2_SCP))" \ + SFTP="$(call qstrip,$(BR2_SFTP))" \ + SVN="$(call qstrip,$(BR2_SVN))" \ + WGET="$(call qstrip,$(BR2_WGET))" \ BR_NO_CHECK_HASH_FOR="$(if $(BR2_DOWNLOAD_FORCE_CHECK_HASHES),,$(BR_NO_CHECK_HASH_FOR))" \ flock $($(PKG)_DL_DIR)/.lock $(DL_WRAPPER) \ -c '$($(PKG)_DL_VERSION)' \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 9ec84d0f45..0a1e29a04e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -231,29 +231,13 @@ $(BUILD_DIR)/%/.stamp_rsynced: $(Q)touch $@ # Patch -# -# The RAWNAME variable is the lowercased package name, which allows to -# find the package directory (typically package/) and the -# prefix of the patches -# -# For BR2_GLOBAL_PATCH_DIR, only generate if it is defined -$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR) -$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS += $(addsuffix /$(RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) $(BUILD_DIR)/%/.stamp_patched: @$(call step_start,patch) @$(call MESSAGE,"Patching") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(foreach p,$($(PKG)_PATCH),$(APPLY_PATCHES) $(@D) $($(PKG)_DL_DIR) $(notdir $(p))$(sep)) - $(Q)( \ - for D in $(PATCH_BASE_DIRS); do \ - if test -d $${D}; then \ - if test -d $${D}/$($(PKG)_VERSION); then \ - $(APPLY_PATCHES) $(@D) $${D}/$($(PKG)_VERSION) \*.patch || exit 1; \ - else \ - $(APPLY_PATCHES) $(@D) $${D} \*.patch || exit 1; \ - fi; \ - fi; \ - done; \ + $(foreach dir,$(call pkg-patches-dirs,$(PKG)),\ + $(Q)$(APPLY_PATCHES) $(@D) $(dir) \*.patch$(sep)\ ) $(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep)) @$(call step_end,patch) @@ -517,7 +501,7 @@ $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) $(2)_HASH_FILES = \ $$(strip \ - $$(foreach d, $$($(2)_PKGDIR) $$(addsuffix /$$($(2)_RAWNAME), $$(call qstrip,$$(BR2_GLOBAL_PATCH_DIR))),\ + $$(foreach d, $$(call pkg-patch-hash-dirs,$(2)),\ $$(if $$(wildcard $$(d)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash),\ $$(d)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash,\ $$(d)/$$($(2)_RAWNAME).hash\ @@ -744,7 +728,7 @@ ifeq ($$($(2)_CPE_ID_VALID),YES) ifdef $(3)_CPE_ID_UPDATE $(2)_CPE_ID_UPDATE = $$($(3)_CPE_ID_UPDATE) else - $(2)_CPE_ID_UPDATE = * + $(2)_CPE_ID_UPDATE = - endif endif @@ -878,7 +862,7 @@ $$(error "Package $(1) defines host variant before target variant!") endif endif -# Globaly remove following conflicting and useless files +# Globally remove following conflicting and useless files $(2)_DROP_FILES_OR_DIRS += /share/info/dir ifeq ($$($(2)_TYPE),host) @@ -1193,7 +1177,7 @@ else endif # other packages endif # redistribute - @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_VERSION),$$(subst $$(space)$$(comma),$$(comma),$$($(2)_LICENSE)),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) + @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_DL_VERSION),$$(subst $$(space)$$(comma),$$(comma),$$($(2)_LICENSE)),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) @@ -1242,6 +1226,9 @@ endif ifneq ($$($(2)_USERS),) PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif +ifneq ($$($(2)_BUSYBOX_CONFIG_FIXUPS),) +PACKAGES_BUSYBOX_CONFIG_FIXUPS += $$($(2)_BUSYBOX_CONFIG_FIXUPS)$$(sep) +endif ifneq ($$($(2)_LINUX_CONFIG_FIXUPS),) PACKAGES_LINUX_CONFIG_FIXUPS += $$($(2)_LINUX_CONFIG_FIXUPS)$$(sep) endif @@ -1273,7 +1260,7 @@ else ifeq ($$($(2)_SITE_METHOD),hg) DL_TOOLS_DEPENDENCIES += hg else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs -else ifneq ($(filter ftp ftps,$$($(2)_SITE_METHOD)),) +else ifneq ($(filter ftp ftps smb,$$($(2)_SITE_METHOD)),) DL_TOOLS_DEPENDENCIES += curl endif # SITE_METHOD diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 8e27602d41..ffd50adecc 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -40,6 +40,12 @@ GO_BIN = $(HOST_DIR)/bin/go define inner-golang-package +# Legacy +ifneq ($$($(2)_INSTALL_BINS),) +$$(error Package $(1) sets $(2)_INSTALL_BINS, which is no longer supported; \ +see the manual: https://buildroot.org/manual.html#migrating-golang-package ) +endif + $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ -modcacherw \ @@ -61,9 +67,16 @@ $(2)_BUILD_TARGETS ?= . # after each build target building them (below in _BUILD_CMDS). ifeq ($$($(2)_BUILD_TARGETS),.) $(2)_BIN_NAME ?= $$($(2)_RAWNAME) +$(2)_INSTALL_BINS ?= $$($(2)_BIN_NAME) +else ifeq ($$(words $$($(2)_BUILD_TARGETS)),1) +$(2)_BIN_NAME ?= $$(notdir $$($(2)_BUILD_TARGETS)) +$(2)_INSTALL_BINS ?= $$($(2)_BIN_NAME) +else +ifneq ($$($(2)_BIN_NAME),) +$$(error $(1) sets $(2)_BIN_NAME while there are multiple targets in $(2)_BUILD_TARGETS) +endif +$(2)_INSTALL_BINS ?= $$(notdir $$($(2)_BUILD_TARGETS)) endif - -$(2)_INSTALL_BINS ?= $$($(2)_RAWNAME) # Source files in Go usually use an import path resolved around # domain/vendor/software. We infer domain/vendor/software from the upstream URL @@ -79,8 +92,8 @@ $(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) # Generate a go.mod file if it doesn't exist. Note: Go is configured # to use the "vendor" dir and not make network calls. define $(2)_GEN_GOMOD - if [ ! -f $$(@D)/go.mod ]; then \ - printf "module $$($(2)_GOMOD)\n" > $$(@D)/go.mod; \ + if [ ! -f $$(@D)/$$($(2)_SUBDIR)/go.mod ]; then \ + printf "module $$($(2)_GOMOD)\n" > $$(@D)/$$($(2)_SUBDIR)/go.mod; \ fi endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD @@ -91,6 +104,11 @@ $(2)_DL_ENV += \ GOPROXY=direct \ $$($(2)_GO_ENV) +# If building in a sub directory, do the vendoring in there +ifneq ($$($(2)_SUBDIR),) +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -s$$($(2)_SUBDIR) +endif + # Because we append vendored info, we can't rely on the values being empty # once we eventually get into the generic-package infra. So, we duplicate # the heuristics here @@ -102,7 +120,7 @@ endif # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. If the license is unset, it is "unknown" -# so adding unknowns to some unknown is still some other unkown, +# so adding unknowns to some unknown is still some other unknown, # so don't append the blurb in that case. ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -114,14 +132,28 @@ ifndef $(2)_BUILD_CMDS ifeq ($(4),target) ifeq ($(BR2_STATIC_LIBS),y) -$(2)_LDFLAGS += -extldflags '-static' +$(2)_EXTLDFLAGS += -static $(2)_TAGS += osusergo netgo endif +ifeq ($(BR2_aarch64),y) +# Go forces use of the Gold linker on aarch64 due to a bug in BFD that +# is fixed in Binutils >= 2.41 (that includes all versions provided by +# Buildroot). Forcing Gold will break with toolchains that don't +# provide it (like the Buildroot toolchains), so override the flag and +# use BFD. +# See: https://github.com/golang/go/issues/22040 +$(2)_EXTLDFLAGS += -fuse-ld=bfd +endif + +ifneq ($$($(2)_EXTLDFLAGS),) +$(2)_LDFLAGS += -extldflags '$$($(2)_EXTLDFLAGS)' +endif + # Build package for target define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$(@D); \ + cd $$(@D)/$$($(2)_SUBDIR); \ $$(HOST_GO_TARGET_ENV) \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ @@ -133,7 +165,7 @@ else # Build package for host define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$(@D); \ + cd $$(@D)/$$($(2)_SUBDIR); \ $$(HOST_GO_HOST_ENV) \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ diff --git a/package/pkg-kernel-module.mk b/package/pkg-kernel-module.mk index 4f64a73f11..032874c3ca 100644 --- a/package/pkg-kernel-module.mk +++ b/package/pkg-kernel-module.mk @@ -62,6 +62,9 @@ $(2)_MAKE ?= $$(BR2_MAKE) # the root of the package. $(2)_MODULE_SUBDIRS ?= . +$(2)_LINUX_CONFIG_FIXUPS += \ + $$(sep)$$(call KCONFIG_DISABLE_OPT,CONFIG_TRIM_UNUSED_KSYMS) + # Build the kernel module(s) # Force PWD for those packages that want to use it to find their # includes and other support files (Booo!) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index bc805b799c..30271e35e5 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -147,12 +147,12 @@ $(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) # # define $(2)_CONFIGURE_CMDS - rm -rf $$($$(PKG)_SRCDIR)/build - mkdir -p $$($$(PKG)_SRCDIR)/build + rm -rf $$($$(PKG)_SRCDIR)/buildroot-build + mkdir -p $$($$(PKG)_SRCDIR)/buildroot-build sed -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ -e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \ $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS,$(2)_FCFLAGS) \ - > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf + > $$($$(PKG)_SRCDIR)/buildroot-build/cross-compilation.conf PATH=$$(BR_PATH) \ CC_FOR_BUILD="$$(HOSTCC)" \ CXX_FOR_BUILD="$$(HOSTCXX)" \ @@ -162,21 +162,21 @@ define $(2)_CONFIGURE_CMDS --libdir=lib \ --default-library=$(PKG_MESON_DEFAULT_LIBRARY) \ --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ - --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ + --cross-file=$$($$(PKG)_SRCDIR)/buildroot-build/cross-compilation.conf \ -Db_pie=false \ -Db_staticpic=$(if $(BR2_m68k_cf),false,true) \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ - $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build + $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/buildroot-build endef else # Configure package for host define $(2)_CONFIGURE_CMDS - rm -rf $$($$(PKG)_SRCDIR)/build - mkdir -p $$($$(PKG)_SRCDIR)/build + rm -rf $$($$(PKG)_SRCDIR)/buildroot-build + mkdir -p $$($$(PKG)_SRCDIR)/buildroot-build $$(HOST_CONFIGURE_OPTS) \ $$($$(PKG)_CONF_ENV) $$(MESON) setup \ --prefix=$$(HOST_DIR) \ @@ -188,7 +188,7 @@ define $(2)_CONFIGURE_CMDS --wrap-mode=nodownload \ -Dstrip=true \ $$($$(PKG)_CONF_OPTS) \ - $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build + $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/buildroot-build endef endif endif @@ -203,12 +203,12 @@ ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ - $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build endef else define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ - $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build endef endif endif @@ -220,7 +220,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ - $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build install endef endif @@ -231,7 +231,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ - $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build install endef endif @@ -242,7 +242,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ - $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build install + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/buildroot-build install endef endif diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index e8e508e334..288a202230 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -75,7 +75,7 @@ extractor-pkg-dependency = $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))) # extractor-system-dependency(filename): returns the name of the tool # needed to extract 'filename', and is meant to be used with -# DL_TOOLS_DEPENDENCIES, in order to check that the necesary tool is +# DL_TOOLS_DEPENDENCIES, in order to check that the necessary tool is # provided by the system Buildroot runs on. # # $(firstword) is used here because the extractor can have arguments, @@ -99,7 +99,7 @@ define yesno-to-bool endef # json-info -- return package or filesystem metadata formatted as an entry -# of a JSON dictionnary +# of a JSON dictionary # $(1): upper-case package or filesystem name define json-info "$($(1)_NAME)": { @@ -120,6 +120,7 @@ define _json-info-pkg "virtual": false$(comma) $(call _json-info-pkg-details,$(1)) \ ) + "package_dir": $(call mk-json-str,$(patsubst $(CURDIR)/%,%,$($(1)_PKGDIR))), "stamp_dir": $(call mk-json-str,$(patsubst $(CONFIG_DIR)/%,%,$($(1)_DIR))), "source_dir": $(call mk-json-str,$(patsubst $(CONFIG_DIR)/%,%,$($(1)_DIR))), "build_dir": $(call mk-json-str,$(patsubst $(CONFIG_DIR)/%,%,$($(1)_BUILDDIR))), @@ -156,6 +157,24 @@ define _json-info-pkg ) endef +# The RAWNAME variable is the lowercased package name, which allows to +# find the package directory (typically package/) and the +# prefix of the patches +pkg-patch-hash-dirs = \ + $($(1)_PKGDIR) $(addsuffix /$($(1)_RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) + +pkg-patches-dirs = \ + $(foreach dir, $(call pkg-patch-hash-dirs,$(1)),\ + $(wildcard $(if $($(1)_VERSION),\ + $(or $(wildcard $(dir)/$($(1)_VERSION)),$(dir)),\ + $(dir)))) + +pkg-patches-url = $(foreach patch,$($(1)_PATCH),\ + $(if $(findstring ://,$(patch)),$(patch),\ + $($(1)_SITE_METHOD)+$($(1)_SITE)/$(patch))) + +pkg-patches-list = $(foreach patchdir,$(call pkg-patches-dirs,$(1)),$(wildcard $(addsuffix /*.patch,$(patchdir)))) $(call pkg-patches-url,$(1)) + define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), @@ -178,6 +197,13 @@ define _json-info-pkg-details }, ) ], + "patches": [ + $(foreach patch, \ + $(call pkg-patches-list,$(1)), \ + $(call mk-json-str,$(patsubst $(CONFIG_DIR)/%,%,$(patch)))$(comma) \ + + ) + ], endef define _json-info-fs diff --git a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch index d25039ade2..986058d400 100644 --- a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch +++ b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch @@ -1,4 +1,4 @@ -From c1f9e60f46f2207f9dd07dd290ad5a2da05ad41d Mon Sep 17 00:00:00 2001 +From c912e9bb8d5be414fda74b2019deb2a6d2d041a0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Dec 2018 11:52:18 +0100 Subject: [PATCH] Only prefix with the sysroot a subset of variables @@ -22,15 +22,17 @@ Buildroot development. All other paths are not prefixed by the sysroot. Signed-off-by: Thomas Petazzoni [Updated to include gobject-introspection paths] Signed-off-by: Adam Duskett +[Dropped the pkgdatadir path] +Signed-off-by: Thomas Devoogdt --- - libpkgconf/tuple.c | 65 ++++++++++++++++++++++++++++++++-------------- - 1 file changed, 46 insertions(+), 19 deletions(-) + libpkgconf/tuple.c | 64 ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c -index 83f6a47..a2aa427 100644 +index 83f6a47..d56fcec 100644 --- a/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c -@@ -178,6 +178,21 @@ dequote(const char *value) +@@ -178,6 +178,20 @@ dequote(const char *value) return buf; } @@ -44,7 +46,6 @@ index 83f6a47..a2aa427 100644 + "includedir", + "libdir", + "mapdir", -+ "pkgdatadir", + "sdkdir", + NULL, +}; @@ -52,7 +53,7 @@ index 83f6a47..a2aa427 100644 static const char * find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars) { -@@ -237,14 +252,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch +@@ -237,14 +251,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch { char *dequote_value; pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t)); @@ -74,7 +75,7 @@ index 83f6a47..a2aa427 100644 else tuple->value = strdup(dequote_value); -@@ -294,22 +315,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c +@@ -294,22 +314,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c return NULL; } @@ -99,7 +100,7 @@ index 83f6a47..a2aa427 100644 { char buf[PKGCONF_BUFSIZE]; const char *ptr; -@@ -318,7 +325,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -318,7 +324,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) && (!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES))) { @@ -108,7 +109,7 @@ index 83f6a47..a2aa427 100644 bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); } -@@ -381,7 +388,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -381,7 +387,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const { size_t nlen; @@ -117,7 +118,7 @@ index 83f6a47..a2aa427 100644 nlen = pkgconf_strlcpy(bptr, parsekv, remain); free(parsekv); -@@ -432,6 +439,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -432,6 +438,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const return strdup(buf); } @@ -145,5 +146,5 @@ index 83f6a47..a2aa427 100644 * !doc * -- -2.34.1 +2.43.0 diff --git a/package/ply/ply.hash b/package/ply/ply.hash index b6a56aa909..ee9a57462b 100644 --- a/package/ply/ply.hash +++ b/package/ply/ply.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 99be1ed3942370699cbfc7f493bc3ffd4601312a81471215ac7ccb2e04a0a8b2 ply-2.3.0.tar.gz +sha256 f7c1461f3c570c91f28b1d33424846ead0d6e4429e4a9ce4429db8f2327283a5 ply-2.4.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ply/ply.mk b/package/ply/ply.mk index dc02fc5472..964765b918 100644 --- a/package/ply/ply.mk +++ b/package/ply/ply.mk @@ -4,7 +4,7 @@ # ################################################################################ -PLY_VERSION = 2.3.0 +PLY_VERSION = 2.4.0 PLY_SITE = $(call github,wkz,ply,$(PLY_VERSION)) PLY_AUTORECONF = YES PLY_LICENSE = GPL-2.0 diff --git a/package/pocketpy/Config.in b/package/pocketpy/Config.in new file mode 100644 index 0000000000..b0bd0cafe0 --- /dev/null +++ b/package/pocketpy/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_POCKETPY + bool "pocketpy" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS # dlfcn.h + help + pocketpy is a portable Python 3.x interpreter, + written in C11. + + https://github.com/pocketpy/pocketpy diff --git a/package/pocketpy/pocketpy.hash b/package/pocketpy/pocketpy.hash new file mode 100644 index 0000000000..51d7f9c0b8 --- /dev/null +++ b/package/pocketpy/pocketpy.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 3edf11645867fd41cf2e3cff24e3131a9ed9f6ccf8ada806dc2429f817e01f71 pocketpy-2.1.4.tar.gz +sha256 9dab6fe9086f93847540387be578edc94b6b280004db5ed7c850ccf8f086fd66 LICENSE diff --git a/package/pocketpy/pocketpy.mk b/package/pocketpy/pocketpy.mk new file mode 100644 index 0000000000..c4a9aea8d2 --- /dev/null +++ b/package/pocketpy/pocketpy.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# pocketpy +# +################################################################################ + +POCKETPY_VERSION = 2.1.4 +POCKETPY_SITE = $(call github,pocketpy,pocketpy,v$(POCKETPY_VERSION)) +POCKETPY_LICENSE = MIT +POCKETPY_LICENSE_FILES = LICENSE +POCKETPY_INSTALL_STAGING = YES + +POCKETPY_CONF_OPTS = -DPK_BUILD_SHARED_LIB=ON + +define POCKETPY_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/libpocketpy.so* $(TARGET_DIR)/usr/lib +endef + +define POCKETPY_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/libpocketpy.so* $(STAGING_DIR)/usr/lib + $(INSTALL) -m 755 -d $(STAGING_DIR)/usr/include/pocketpy + cp -r $(@D)/include/* $(STAGING_DIR)/usr/include/pocketpy +endef + +$(eval $(cmake-package)) diff --git a/package/poco/Config.in b/package/poco/Config.in index 9bdef125ad..fa23e6aa59 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_POCO depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_UTF8PROC select BR2_PACKAGE_ZLIB help The C++ Portable Components Libraries @@ -52,6 +53,10 @@ config BR2_PACKAGE_POCO_DATA_MYSQL config BR2_PACKAGE_POCO_DATA_PGSQL bool "Data/PostgreSQL" depends on BR2_USE_MMU # postgresql + depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_POSTGRESQL diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 0a1e900b3f..6979a9a1e4 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz +sha256 47394ea7ddb7b0a40e1a5be896f8f5dc77cfdc4f561d2e7131ecf582df5a0c3a poco-1.14.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 233252c67b..a471a24adf 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.13.2 +POCO_VERSION = 1.14.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -13,6 +13,7 @@ POCO_INSTALL_STAGING = YES POCO_DEPENDENCIES = \ pcre2 \ + utf8proc \ zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mariadb) \ @@ -48,7 +49,7 @@ POCO_CONF_OPTS += --no-fpenvironment --no-wstring endif # architectures missing some FE_* in their fenv.h -ifeq ($(BR2_sh4a)$(BR2_nios2),y) +ifeq ($(BR2_sh4a),y) POCO_CONF_OPTS += --no-fpenvironment endif diff --git a/package/podman/Config.in b/package/podman/Config.in new file mode 100644 index 0000000000..a6554a3ddc --- /dev/null +++ b/package/podman/Config.in @@ -0,0 +1,97 @@ +config BR2_PACKAGE_PODMAN + bool "podman" + depends on BR2_USE_MMU # fork() + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # netavark + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # shadow + depends on BR2_TOOLCHAIN_HAS_THREADS # conmon + depends on BR2_USE_WCHAR # conmon + select BR2_PACKAGE_HOST_GO + select BR2_PACKAGE_CA_CERTIFICATES # runtime + select BR2_PACKAGE_CGROUPFS_V2_MOUNT if !BR2_PACKAGE_CGROUPFS_MOUNT && !BR2_INIT_SYSTEMD # runtime + select BR2_PACKAGE_CONMON # runtime + select BR2_PACKAGE_CONTAINERS_IMAGE_CONFIG # runtime + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LIBSECCOMP + select BR2_PACKAGE_NETAVARK # runtime + # podman officially only supports crun, but compatible runtimes are + # also accepted. So we do the select the other way around, to match + # docker-engine's own select and thus avoid circular dependency + # issues. + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime + select BR2_PACKAGE_SHADOW + select BR2_PACKAGE_SHADOW_SUBORDINATE_IDS + help + The best free & open source container tools + + Manage containers, pods, and images with Podman. Seamlessly + work with containers and Kubernetes from your local + environment. + + https://podman.io/ + +if BR2_PACKAGE_PODMAN + +choice + bool "support podman-init" + default BR2_PACKAGE_PODMAN_INIT_CATATONIT + help + Support providing a minimal init process for containers. + Required to use "podman container run --init". + +config BR2_PACKAGE_PODMAN_INIT_NONE + bool "none" + help + Do not support docker-init. + +config BR2_PACKAGE_PODMAN_INIT_CATATONIT + bool "catatonit" + select BR2_PACKAGE_CATATONIT # runtime + help + Support providing a minimal init process for containers, + using catatonit. + +config BR2_PACKAGE_PODMAN_INIT_TINI + bool "tini" + select BR2_PACKAGE_TINI # runtime + help + Support providing a minimal init process for containers, + using tini. + +endchoice + +config BR2_PACKAGE_PODMAN_INIT_NAME + string + default "tini" if BR2_PACKAGE_PODMAN_INIT_TINI + default "catatonit" if BR2_PACKAGE_PODMAN_INIT_CATATONIT + +choice + bool "Network backend" + +config BR2_PACKAGE_PODMAN_NET_PASST + bool "passt/pasta" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 # passt + select BR2_PACKAGE_PASST # runtime + +comment "passt/pasta backend needs a toolchain w/ headers >= 5.0" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +config BR2_PACKAGE_PODMAN_NET_SLIRP4NETNS + bool "slirp4netns" + select BR2_PACKAGE_SLIRP4NETNS # runtime + +endchoice + +endif + +comment "podman needs a toolchain w/ headers >= 4.14, threads, wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_USE_WCHAR diff --git a/package/podman/podman.hash b/package/podman/podman.hash new file mode 100644 index 0000000000..ff6600ac8f --- /dev/null +++ b/package/podman/podman.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 60de04a48c0ecf5006fb8e26543e2275126833aeaf2b5ea02ba492965d96173f podman-v5.7.0-git4-go2.tar.gz +sha256 62fb8a3a9621dc2388174caaabe9c2317b694bb9a1d46c98bcf5655b68f51be3 LICENSE diff --git a/package/podman/podman.mk b/package/podman/podman.mk new file mode 100644 index 0000000000..31cc9ba349 --- /dev/null +++ b/package/podman/podman.mk @@ -0,0 +1,112 @@ +################################################################################ +# +# podman +# +################################################################################ + +PODMAN_VERSION = v5.7.0 +PODMAN_SITE = https://github.com/containers/podman +PODMAN_SITE_METHOD = git + +PODMAN_LICENSE = Apache-2.0 +PODMAN_LICENSE_FILES = LICENSE + +PODMAN_DEPENDENCIES = host-pkgconf libgpgme + +PODMAN_GOMOD = github.com/containers/podman/v5 +PODMAN_BUILD_TARGETS = cmd/podman +PODMAN_TAGS = selinux + +# https://podman.io/docs/installation#get-source-code mandates that flag be +# set, as device-mapper is not officially supported. +PODMAN_TAGS += exclude_graphdriver_devicemapper + +# This is supposedly optional, but a basic (busybox:latest) image does not +# even start without seccomp support, unless by passing extra options at +# runtime (--security-opt=seccomp=unconfined), which can't be made the default. +PODMAN_DEPENDENCIES += libseccomp +PODMAN_TAGS += seccomp + +# This is required for rootless containers, i.e containers started by non-root +PODMAN_DEPENDENCIES += shadow +PODMAN_TAGS += libsubid + +ifeq ($(BR2_PACKAGE_BTRFS_PROGS),y) +PODMAN_DEPENDENCIES += btrfs-progs +define PODMAN_LINUX_CONFIG_FIXUPS_BTRFS + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS_POSIX_ACL) +endef +else +PODMAN_TAGS += exclude_graphdriver_btrfs +endif + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +PODMAN_DEPENDENCIES += libapparmor +PODMAN_TAGS += apparmor +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +PODMAN_DEPENDENCIES += systemd +PODMAN_TAGS += systemd +endif + +PODMAN_INIT_NAME = $(call qstrip,$(BR2_PACKAGE_PODMAN_INIT_NAME)) +ifneq ($(PODMAN_INIT_NAME),) +PODMAN_INIT_PATH = /usr/libexec/podman/$(PODMAN_INIT_NAME) +define PODMAN_HELPER_INIT + $(Q)ln -sf ../../bin/$(PODMAN_INIT_NAME) $(TARGET_DIR)$(PODMAN_INIT_PATH) + $(Q)mkdir -p $(TARGET_DIR)/etc/containers/containers.conf.d + $(Q)printf '[containers]\ninit_path = "%s"\n' "$(PODMAN_INIT_PATH)" \ + >$(TARGET_DIR)/etc/containers/containers.conf.d/50-buildroot-init.conf +endef +endif + +ifeq ($(BR2_PACKAGE_PODMAN_NET_PASST),y) +define PODMAN_HELPER_PASST + $(Q)ln -sf ../../bin/pasta $(TARGET_DIR)/usr/libexec/podman/pasta +endef +else +define PODMAN_HELPER_SLIRP4NETNS + $(Q)ln -sf ../../bin/slirp4netns $(TARGET_DIR)/usr/libexec/podman/slirp4netns + $(Q)mkdir -p $(TARGET_DIR)/etc/containers/containers.conf.d + $(Q)printf '[network]\ndefault_rootless_network_cmd = "slirp4netns"\n' \ + >$(TARGET_DIR)/etc/containers/containers.conf.d/50-buildroot-net-backend.conf +endef +endif + +define PODMAN_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_SYSCALL) + $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PIDS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_BPF) + $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) + $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_USER_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_SECCOMP) + $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(PODMAN_LINUX_CONFIG_FIXUPS_BTRFS) +endef + +define PODMAN_HELPERS + $(Q)mkdir -p $(TARGET_DIR)/usr/libexec/podman + $(Q)ln -sf ../../bin/aardvark-dns $(TARGET_DIR)/usr/libexec/podman/aardvark-dns + $(Q)ln -sf ../../bin/netavark $(TARGET_DIR)/usr/libexec/podman/netavark + $(PODMAN_HELPER_INIT) + $(PODMAN_HELPER_PASST) + $(PODMAN_HELPER_SLIRP4NETNS) +endef +PODMAN_POST_INSTALL_TARGET_HOOKS += PODMAN_HELPERS + +$(eval $(golang-package)) diff --git a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch index 18f0001aef..e894987f49 100644 --- a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -32,7 +32,7 @@ index a3bbbe1..df675cf 100644 +AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) CFLAGS ?= -g -Werror -Wall -W - override LDLIBS += -lselinux -lsepol -lpthread + override CFLAGS += -I../../libselinux/include -- 2.13.6 diff --git a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch index 2daed57c97..6f838e8d54 100644 --- a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch +++ b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch @@ -48,7 +48,7 @@ index e86364a..20a64d4 100644 +AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y) CFLAGS ?= -Werror -Wall -W - override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" + override CFLAGS += -I../../libselinux/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -- 2.31.1 diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 07e171a53f..db9eb9f6b5 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -6,9 +6,10 @@ comment "policycoreutils needs a toolchain w/ threads, dynamic library, gcc >= 5 config BR2_PACKAGE_POLICYCOREUTILS bool "policycoreutils" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage - depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage, libsepol - depends on !BR2_STATIC_LIBS # libsemanage, libsepol + depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux, libsemanage, libsepol + depends on !BR2_STATIC_LIBS # libselinux, libsemanage, libsepol depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol + select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_LIBCAP_NG diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index 661c1285e8..7664be0b35 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 58fe4e481edfb4456c114925442e11389df17394925acdba3de211145ce5ea98 policycoreutils-3.7.tar.gz +sha256 44a294139876cf4c7969cb6a75d1932cb42543d74a7661760ded44a20bf7ebe8 policycoreutils-3.9.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 2b53c56e49..d0e1aae312 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,13 +4,13 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.7 +POLICYCOREUTILS_VERSION = 3.9 POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject -POLICYCOREUTILS_DEPENDENCIES = libsemanage libsepol libcap-ng $(TARGET_NLS_DEPENDENCIES) +POLICYCOREUTILS_DEPENDENCIES = libselinux libsemanage libsepol libcap-ng host-pkgconf $(TARGET_NLS_DEPENDENCIES) POLICYCOREUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) @@ -32,28 +32,19 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y endif -POLICYCOREUTILS_MAKE_DIRS = \ - load_policy newrole run_init \ - secon semodule sestatus setfiles \ - setsebool scripts - # We need to pass DESTDIR at build time because it's used by # policycoreutils build system to find headers and libraries. define POLICYCOREUTILS_BUILD_CMDS - $(foreach d,$(POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(POLICYCOREUTILS_MAKE_OPTS) \ - DESTDIR=$(STAGING_DIR) all - ) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(POLICYCOREUTILS_MAKE_OPTS) \ + DESTDIR=$(STAGING_DIR) all endef define POLICYCOREUTILS_INSTALL_TARGET_CMDS - $(foreach d,$(POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(POLICYCOREUTILS_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) install - ) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(POLICYCOREUTILS_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install endef -HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage +HOST_POLICYCOREUTILS_DEPENDENCIES = host-libselinux host-libsemanage host-libsepol host-pkgconf # We need to pass PREFIX because it defaults to $(DESTDIR)/usr HOST_POLICYCOREUTILS_MAKE_OPTS = \ @@ -62,22 +53,12 @@ HOST_POLICYCOREUTILS_MAKE_OPTS = \ ETCDIR=$(HOST_DIR)/etc \ SBINDIR=$(HOST_DIR)/sbin -# Note: We are only building the programs required by the refpolicy build -HOST_POLICYCOREUTILS_MAKE_DIRS = \ - load_policy newrole run_init \ - secon semodule sestatus setfiles \ - setsebool - define HOST_POLICYCOREUTILS_BUILD_CMDS - $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) all - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_POLICYCOREUTILS_MAKE_OPTS) all endef define HOST_POLICYCOREUTILS_INSTALL_CMDS - $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) install - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_POLICYCOREUTILS_MAKE_OPTS) install endef $(eval $(generic-package)) diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index a3855adecd..f8499f5ed2 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ea5cd6e6e2afa6bad938ee770bf0c2cd9317910f37956faeba2869adcf3747d1 polkit-125.tar.gz +sha256 2814a7281989f6baa9e57bd33bbc5e148827e2721ccef22aaf28ab2b376068e8 polkit-126.tar.gz sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index fb49f6ce2a..653a2819c4 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLKIT_VERSION = 125 +POLKIT_VERSION = 126 POLKIT_SITE = $(call github,polkit-org,polkit,$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING @@ -20,8 +20,7 @@ POLKIT_LDFLAGS = $(TARGET_NLS_LIBS) POLKIT_CONF_OPTS = \ -Dman=false \ -Dexamples=false \ - -Dsession_tracking=ConsoleKit \ - -Djs_engine=duktape + -Dsession_tracking=ConsoleKit ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) POLKIT_CONF_OPTS += -Dintrospection=true @@ -56,8 +55,8 @@ define POLKIT_USERS endef define POLKIT_PERMISSIONS - /etc/polkit-1/rules.d d 700 polkitd root - - - - - - /usr/share/polkit-1/rules.d d 700 polkitd root - - - - - + /etc/polkit-1/rules.d d 750 root polkitd - - - - - + /usr/share/polkit-1/rules.d d 750 root polkitd - - - - - /usr/bin/pkexec f 4755 root root - - - - - /usr/lib/polkit-1/polkit-agent-helper-1 f 4755 root root - - - - - endef diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index bb07b2ee6a..34f8bcd58f 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 poppler-22.12.0.tar.xz +# Locally calculated after verifying GPG signature +sha256 6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0 poppler-25.10.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 776fb4d566..08214d38b4 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,15 +4,13 @@ # ################################################################################ -POPPLER_VERSION = 22.12.0 +POPPLER_VERSION = 25.10.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_CPE_ID_VENDOR = freedesktop -# 0001-OutlineItem-open-Fix-crash-on-malformed-files.patch -POPPLER_IGNORE_CVES += CVE-2023-34872 POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = \ @@ -24,6 +22,7 @@ POPPLER_CONF_OPTS = \ -DBUILD_MANUAL_TESTS=OFF \ -DENABLE_GTK_DOC=OFF \ -DENABLE_QT6=OFF \ + -DENABLE_GPGME=OFF \ -DRUN_GPERF_IF_PRESENT=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -98,9 +97,9 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) POPPLER_DEPENDENCIES += zlib -POPPLER_CONF_OPTS += -DENABLE_ZLIB=ON +POPPLER_CONF_OPTS += -DENABLE_ZLIB_UNCOMPRESS=ON else -POPPLER_CONF_OPTS += -DENABLE_ZLIB=OFF +POPPLER_CONF_OPTS += -DENABLE_ZLIB_UNCOMPRESS=OFF endif ifeq ($(BR2_PACKAGE_CAIRO),y) @@ -112,9 +111,9 @@ endif ifeq ($(BR2_PACKAGE_TIFF),y) POPPLER_DEPENDENCIES += tiff -POPPLER_CONF_OPTS += -DWITH_TIFF=ON +POPPLER_CONF_OPTS += -DENABLE_LIBTIFF=ON else -POPPLER_CONF_OPTS += -DWITH_TIFF=OFF +POPPLER_CONF_OPTS += -DENABLE_LIBTIFF=OFF endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) @@ -126,9 +125,16 @@ endif ifeq ($(BR2_PACKAGE_LIBNSS),y) POPPLER_DEPENDENCIES += libnss -POPPLER_CONF_OPTS += -DWITH_NSS3=ON +POPPLER_CONF_OPTS += -DENABLE_NSS3=ON else -POPPLER_CONF_OPTS += -DWITH_NSS3=OFF +POPPLER_CONF_OPTS += -DENABLE_NSS3=OFF +endif + +ifeq ($(BR2_PACKAGE_LCMS2),y) +POPPLER_DEPENDENCIES += lcms2 +POPPLER_CONF_OPTS += -DENABLE_LCMS=ON +else +POPPLER_CONF_OPTS += -DENABLE_LCMS=OFF endif ifeq ($(BR2_SOFT_FLOAT),y) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 593c0dc1f3..a0f64bd76a 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_POSTGIS bool "postgis" depends on BR2_PACKAGE_POSTGRESQL_FULL depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # libgeos, proj select BR2_PACKAGE_LIBGEOS @@ -17,6 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, NPTL, wchar, gcc >= 4.9" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ +comment "postgis needs a toolchain w/ C++, NPTL, wchar, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 9e283f5ac7..2d205ff5b4 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ca698a22cc2b2b3467ac4e063b43a28413f3004ddd505bdccdd74c56a647f510 postgis-3.5.0.tar.gz +sha256 8caffef4b457ed70d5328bf4e5a21f9306b06c271662e03e1a65d30090e5f25f postgis-3.6.0.tar.gz sha256 81749eea887e78402c9b85896cd629b155bc29256927f818f01001f038146391 LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index a2b121e6f5..a3a2756593 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.5.0 +POSTGIS_VERSION = 3.6.0 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index 899907d6a5..06e8646119 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_POSTGRESQL bool "postgresql" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_ENABLE_LOCALE # locale_t + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # fails to build in a pure static linking scenario, and # postgresql is unlikely to be used in a pure statically # linked environment. @@ -32,9 +34,12 @@ config BR2_PACKAGE_POSTGRESQL_FULL endif -comment "postgresql needs a toolchain w/ dynamic library, wchar" +comment "postgresql needs a toolchain w/ dynamic library, wchar, locale" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on !BR2_USE_WCHAR + depends on !BR2_ENABLE_LOCALE + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_STATIC_LIBS comment "postgresql can't be built with Optimize for fast" depends on BR2_OPTIMIZE_FAST diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 88730dc353..efa1b5e751 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v16.6/postgresql-16.6.tar.bz2.sha256 -sha256 23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b postgresql-16.6.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v17.7/postgresql-17.7.tar.bz2.sha256 +sha256 ef9e343302eccd33112f1b2f0247be493cb5768313adeb558b02de8797a2e9b5 postgresql-17.7.tar.bz2 # License file, Locally calculated -sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT +sha256 5ed3ce5c9373dff7f98b1fae7a6c7ccd98df7d734d46d24c1bcebf1240be8307 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 4656eba3d8..86761bf939 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 16.6 +POSTGRESQL_VERSION = 17.7 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -13,59 +13,54 @@ POSTGRESQL_CPE_ID_VENDOR = postgresql POSTGRESQL_SELINUX_MODULES = postgresql POSTGRESQL_INSTALL_STAGING = YES POSTGRESQL_CONFIG_SCRIPTS = pg_config -POSTGRESQL_CONF_ENV = \ - ac_cv_type_struct_sockaddr_in6=yes \ - pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic=yes \ - LIBS=$(TARGET_NLS_LIBS) -POSTGRESQL_CONF_OPTS = --disable-rpath -POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +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 +POSTGRESQL_CONF_OPTS = \ + -Drpath=false \ + -Ddocs=disabled \ + -Ddocs_pdf=disabled \ + -DXMLLINT=/nowhere \ + -DXSLTPROC=/nowhere +POSTGRESQL_DEPENDENCIES = \ + $(TARGET_NLS_DEPENDENCIES) \ + host-bison \ + host-flex # CVE-2017-8806 is related to postgresql-common package # It is false positive for postgresql POSTGRESQL_IGNORE_CVES += CVE-2017-8806 -# https://www.postgresql.org/docs/11/static/install-procedure.html: -# "If you want to invoke the build from another makefile rather than -# manually, you must unset MAKELEVEL or set it to zero" -POSTGRESQL_MAKE_OPTS = MAKELEVEL=0 - ifeq ($(BR2_PACKAGE_POSTGRESQL_FULL),y) -POSTGRESQL_MAKE_OPTS += world +POSTGRESQL_NINJA_OPTS += world POSTGRESQL_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-world POSTGRESQL_INSTALL_STAGING_OPTS += DESTDIR=$(STAGING_DIR) install-world endif -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# PostgreSQL does not build against uClibc with locales -# enabled, due to an uClibc bug, see -# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html -# so overwrite automatic detection and disable locale support -POSTGRESQL_CONF_ENV += pgac_cv_type_locale_t=no -endif - -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) -POSTGRESQL_CONF_OPTS += --disable-thread-safety -endif - -ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_riscv)$(BR2_xtensa),y) -POSTGRESQL_CONF_OPTS += --disable-spinlocks +ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_riscv)$(BR2_xtensa),y) +POSTGRESQL_CONF_OPTS += -Dspinlocks=false +else +POSTGRESQL_CONF_OPTS += -Dspinlocks=true endif ifeq ($(BR2_PACKAGE_READLINE),y) POSTGRESQL_DEPENDENCIES += readline +POSTGRESQL_CONF_OPTS += -Dreadline=enabled else -POSTGRESQL_CONF_OPTS += --without-readline +POSTGRESQL_CONF_OPTS += -Dreadline=disabled endif ifeq ($(BR2_PACKAGE_ZLIB),y) POSTGRESQL_DEPENDENCIES += zlib +POSTGRESQL_CONF_OPTS += -Dzlib=enabled else -POSTGRESQL_CONF_OPTS += --without-zlib +POSTGRESQL_CONF_OPTS += -Dzlib=disabled endif ifeq ($(BR2_PACKAGE_TZDATA),y) POSTGRESQL_DEPENDENCIES += tzdata -POSTGRESQL_CONF_OPTS += --with-system-tzdata=/usr/share/zoneinfo +POSTGRESQL_CONF_OPTS += -Dsystem_tzdata=/usr/share/zoneinfo else POSTGRESQL_DEPENDENCIES += host-zic POSTGRESQL_CONF_ENV += ZIC="$(ZIC)" @@ -73,56 +68,53 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) POSTGRESQL_DEPENDENCIES += openssl -POSTGRESQL_CONF_OPTS += --with-openssl +POSTGRESQL_CONF_OPTS += -Dssl=openssl else -# PostgreSQL checks for /dev/urandom and fails if it's being cross-compiled and -# an SSL library isn't found. Since /dev/urandom is guaranteed to be provided -# on Linux systems, explicitly tell the configure script it's available. -POSTGRESQL_CONF_ENV += ac_cv_file__dev_urandom=yes +POSTGRESQL_CONF_OPTS += -Dssl=none endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) POSTGRESQL_DEPENDENCIES += openldap -POSTGRESQL_CONF_OPTS += --with-ldap +POSTGRESQL_CONF_OPTS += -Dldap=enabled else -POSTGRESQL_CONF_OPTS += --without-ldap +POSTGRESQL_CONF_OPTS += -Dldap=disabled endif ifeq ($(BR2_PACKAGE_ICU),y) POSTGRESQL_DEPENDENCIES += icu -POSTGRESQL_CONF_OPTS += --with-icu +POSTGRESQL_CONF_OPTS += -Dicu=enabled else -POSTGRESQL_CONF_OPTS += --without-icu +POSTGRESQL_CONF_OPTS += -Dicu=disabled endif ifeq ($(BR2_PACKAGE_LIBXML2),y) POSTGRESQL_DEPENDENCIES += libxml2 -POSTGRESQL_CONF_OPTS += --with-libxml +POSTGRESQL_CONF_OPTS += -Dlibxml=enabled POSTGRESQL_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config else -POSTGRESQL_CONF_OPTS += --without-libxml +POSTGRESQL_CONF_OPTS += -Dlibxml=disabled endif ifeq ($(BR2_PACKAGE_ZSTD),y) POSTGRESQL_DEPENDENCIES += host-pkgconf zstd -POSTGRESQL_CONF_OPTS += --with-zstd +POSTGRESQL_CONF_OPTS += -Dzstd=enabled else -POSTGRESQL_CONF_OPTS += --without-zstd +POSTGRESQL_CONF_OPTS += -Dzstd=disabled endif ifeq ($(BR2_PACKAGE_LZ4),y) POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 -POSTGRESQL_CONF_OPTS += --with-lz4 +POSTGRESQL_CONF_OPTS += -Dlz4=enabled else -POSTGRESQL_CONF_OPTS += --without-lz4 +POSTGRESQL_CONF_OPTS += -Dlz4=disabled endif # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd -POSTGRESQL_CONF_OPTS += --with-systemd +POSTGRESQL_CONF_OPTS += -Dsystemd=enabled else -POSTGRESQL_CONF_OPTS += --without-systemd +POSTGRESQL_CONF_OPTS += -Dsystemd=disabled endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) @@ -165,4 +157,4 @@ define POSTGRESQL_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/postgresql.service endef -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/pound/Config.in b/package/pound/Config.in index aa0f103273..9a42af2cc9 100644 --- a/package/pound/Config.in +++ b/package/pound/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_POUND depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help diff --git a/package/pound/pound.hash b/package/pound/pound.hash index c5b08891be..020e5cb605 100644 --- a/package/pound/pound.hash +++ b/package/pound/pound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f1a041e060124941b090ad2d4fec5a72be37a5f8a50f0e0ca821dcbbe4b5925b pound-4.8.tar.gz +sha256 b8759d94546027f0090dbb51455e2ff12ad2f95fe34edc4559a5a1dc07639a2e pound-4.17.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/pound/pound.mk b/package/pound/pound.mk index 7bd7eaef2a..6ed2fc656d 100644 --- a/package/pound/pound.mk +++ b/package/pound/pound.mk @@ -4,28 +4,26 @@ # ################################################################################ -POUND_VERSION = 4.8 +POUND_VERSION = 4.17 POUND_SITE = https://github.com/graygnuorg/pound/releases/download/v$(POUND_VERSION) POUND_LICENSE = GPL-3.0+ POUND_LICENSE_FILES = COPYING POUND_DEPENDENCIES = openssl host-openssl -# Force owner/group to us, otherwise it will try proxy:proxy by -# default. -POUND_CONF_OPTS = \ - --with-owner=$(shell id -un) \ - --with-group=$(shell id -gn) +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +POUND_DEPENDENCIES += libxcrypt +endif ifeq ($(BR2_PACKAGE_PCRE2),y) -POUND_CONF_OPTS += --enable-pcreposix=pcre2 +POUND_CONF_OPTS += --enable-pcre=2 POUND_CONF_ENV += \ ac_cv_path_PCRE2_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config POUND_DEPENDENCIES += pcre2 else ifeq ($(BR2_PACKAGE_PCRE),y) -POUND_CONF_OPTS += --enable-pcreposix=pcre1 +POUND_CONF_OPTS += --enable-pcre=1 POUND_DEPENDENCIES += pcre else -POUND_CONF_OPTS += --disable-pcreposix +POUND_CONF_OPTS += --disable-pcre endif $(eval $(autotools-package)) diff --git a/package/pppd/0002-pppd-Fix-building-session.c-with-GCC-15.patch b/package/pppd/0002-pppd-Fix-building-session.c-with-GCC-15.patch new file mode 100644 index 0000000000..4fcd492562 --- /dev/null +++ b/package/pppd/0002-pppd-Fix-building-session.c-with-GCC-15.patch @@ -0,0 +1,36 @@ +From fb769c380eeacf23b64cb3bf7860ba49a0e0eed5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Apr 2025 00:15:57 -0700 +Subject: [PATCH] pppd: Fix building session.c with GCC 15 (#553) + +Fixed building with GCC 15 which defaults to C23 +and find conflicting declration of getspnam() here +with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);) + +Fixes +../../ppp-2.5.2/pppd/session.c: In function 'session_start': +../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)' + 185 | struct spwd *getspnam(); + | ^~~~~~~~ + +Signed-off-by: Khem Raj + +Upstream: https://github.com/ppp-project/ppp/commit/fb769c380eeacf23b64cb3bf7860ba49a0e0eed5 + +Signed-off-by: Bernd Kuhls +--- + pppd/session.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pppd/session.c b/pppd/session.c +index f08d8e19..9cc75389 100644 +--- a/pppd/session.c ++++ b/pppd/session.c +@@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char + char *cbuf; + #ifdef HAVE_SHADOW_H + struct spwd *spwd; +- struct spwd *getspnam(); + long now = 0; + #endif /* #ifdef HAVE_SHADOW_H */ + #endif /* #ifdef PPP_WITH_PAM */ diff --git a/package/pppd/0003-pppdump-Fixed-building-with-GCC-15.patch b/package/pppd/0003-pppdump-Fixed-building-with-GCC-15.patch new file mode 100644 index 0000000000..ab7c94e506 --- /dev/null +++ b/package/pppd/0003-pppdump-Fixed-building-with-GCC-15.patch @@ -0,0 +1,76 @@ +From 05361692ee7d6260ce5c04c9fa0e5a1aa7565323 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= +Date: Thu, 27 Feb 2025 23:00:16 +0100 +Subject: [PATCH] pppdump: Fixed building with GCC 15 (#548) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 15 defaults to C23 which does not allow K&R declarations. + +Credit Yaakov Selkowitz in: +https://src.fedoraproject.org/rpms/ppp/pull-request/12 + +Signed-off-by: Jaroslav Škarvada + +Upstream: https://github.com/ppp-project/ppp/commit/05361692ee7d6260ce5c04c9fa0e5a1aa7565323 + +Signed-off-by: Bernd Kuhls +--- + pppdump/pppdump.c | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 deletions(-) + +diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c +index c24208af..1534036c 100644 +--- a/pppdump/pppdump.c ++++ b/pppdump/pppdump.c +@@ -42,14 +42,12 @@ int tot_sent, tot_rcvd; + extern int optind; + extern char *optarg; + +-void dumplog(); +-void dumpppp(); +-void show_time(); ++void dumplog(FILE *); ++void dumpppp(FILE *); ++void show_time(FILE *, int); + + int +-main(ac, av) +- int ac; +- char **av; ++main(int ac, char **av) + { + int i; + char *p; +@@ -97,8 +95,7 @@ main(ac, av) + } + + void +-dumplog(f) +- FILE *f; ++dumplog(FILE *f) + { + int c, n, k, col; + int nb, c2; +@@ -241,8 +238,7 @@ struct pkt { + unsigned char dbuf[8192]; + + void +-dumpppp(f) +- FILE *f; ++dumpppp(FILE *f) + { + int c, n, k; + int nb, nl, dn, proto, rv; +@@ -375,9 +371,7 @@ dumpppp(f) + } + + void +-show_time(f, c) +- FILE *f; +- int c; ++show_time(FILE *f, int c) + { + time_t t; + int n; diff --git a/package/pppd/Config.in b/package/pppd/Config.in index 88c2180a9b..14d3769a1d 100644 --- a/package/pppd/Config.in +++ b/package/pppd/Config.in @@ -11,6 +11,12 @@ config BR2_PACKAGE_PPPD if BR2_PACKAGE_PPPD +config BR2_PACKAGE_PPPD_CBCP + bool "CBCP (Callback Control Protocol)" + help + Enable Callback Control Protocol (CBCP) support in pppd. + https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-cbcp/. + config BR2_PACKAGE_PPPD_FILTER bool "filtering" select BR2_PACKAGE_LIBPCAP diff --git a/package/pppd/pppd.hash b/package/pppd/pppd.hash index 92f036df58..1aec3f037c 100644 --- a/package/pppd/pppd.hash +++ b/package/pppd/pppd.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c0537067bdff5f0b5d7a2fd1cca13c220f6dadc89183f23739a2cf9df49c68ca pppd-2.5.1.tar.gz +sha256 d7457f0ff409cb2d7a0d8382ef6302520d664895ac5568cb3dce727d71a2a1f5 pppd-2.5.2.tar.gz sha256 5d588eb3b157d52112afea935c88a7ff9efddc1e2d95a42c25d3b96ad9055008 LICENSE.BSD sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2 diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 4b65cf08d1..24dcb85387 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -6,8 +6,8 @@ # The tarball provided at https://download.samba.org/pub/ppp/ does not # include the license files yet so we use the github tarball. -PPPD_VERSION = 2.5.1 -PPPD_SITE = $(call github,ppp-project,ppp,ppp-$(PPPD_VERSION)) +PPPD_VERSION = 2.5.2 +PPPD_SITE = $(call github,ppp-project,ppp,v$(PPPD_VERSION)) PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = LICENSE.BSD LICENSE.GPL-2 PPPD_CPE_ID_VENDOR = point-to-point_protocol_project @@ -39,6 +39,12 @@ PPPD_CONF_OPTS += \ --without-openssl endif +ifeq ($(BR2_PACKAGE_PPPD_CBCP),y) +PPPD_CONF_OPTS += --enable-cbcp +else +PPPD_CONF_OPTS += --disable-cbcp +endif + ifeq ($(BR2_PACKAGE_PPPD_FILTER),y) PPPD_CONF_OPTS += --with-pcap=$(STAGING_DIR)/usr PPPD_DEPENDENCIES += libpcap diff --git a/package/prboom/0003-gcc-warnings-const-myargv-instead-of-const-char-const-myargv.patch b/package/prboom/0003-gcc-warnings-const-myargv-instead-of-const-char-const-myargv.patch new file mode 100644 index 0000000000..b102175d59 --- /dev/null +++ b/package/prboom/0003-gcc-warnings-const-myargv-instead-of-const-char-const-myargv.patch @@ -0,0 +1,140 @@ +From 92d44b6383a3e053feac2c820b8114873fcd798e Mon Sep 17 00:00:00 2001 +From: entryway +Date: Fri, 10 Jun 2011 19:59:18 +0000 +Subject: [PATCH] gcc warnings: 'const **myargv' instead of 'const char * const + * myargv' + +Upstream: https://github.com/coelckers/prboom-plus/commit/92d44b6383a3e053feac2c820b8114873fcd798e +[thomas: backport to 2.5.0] +Signed-off-by: Thomas Perale +--- + src/SDL/i_main.c | 3 ++- + src/d_main.c | 20 ++++++++++++-------- + src/m_argv.c | 3 +-- + src/m_argv.h | 2 +- + 4 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/src/SDL/i_main.c b/src/SDL/i_main.c +index 05cd655..1c19ef0 100644 +--- a/src/SDL/i_main.c ++++ b/src/SDL/i_main.c +@@ -356,7 +356,8 @@ int main(int argc, char **argv) + #endif + + myargc = argc; +- myargv = argv; ++ myargv = malloc(sizeof(myargv[0]) * myargc); ++ memcpy(myargv, argv, sizeof(myargv[0]) * myargc); + + #ifdef _WIN32 + if (!M_CheckParm("-nodraw")) { +diff --git a/src/d_main.c b/src/d_main.c +index 6d8493e..320e07a 100644 +--- a/src/d_main.c ++++ b/src/d_main.c +@@ -870,7 +870,7 @@ static void FindResponseFile (void) + int indexinfile; + byte *file = NULL; + const char **moreargs = malloc(myargc * sizeof(const char*)); +- const char **newargv; ++ char **newargv; + // proff 04/05/2000: Added for searching responsefile + char fname[PATH_MAX+1]; + +@@ -904,14 +904,15 @@ static void FindResponseFile (void) + int k; + lprintf(LO_ERROR,"\nResponse file empty!\n"); + +- newargv = calloc(sizeof(char *),MAXARGVS); ++ newargv = calloc(sizeof(newargv[0]),myargc); + newargv[0] = myargv[0]; + for (k = 1,index = 1;k < myargc;k++) + { + if (i!=k) + newargv[index++] = myargv[k]; + } +- myargc = index; myargv = newargv; ++ myargc = index; ++ myargv = newargv; + return; + } + +@@ -919,8 +920,8 @@ static void FindResponseFile (void) + memcpy((void *)moreargs,&myargv[i+1],(index = myargc - i - 1) * sizeof(myargv[0])); + + { +- const char *firstargv = myargv[0]; +- newargv = calloc(sizeof(char *),MAXARGVS); ++ char *firstargv = myargv[0]; ++ newargv = calloc(sizeof(newargv[0]), 1); + newargv[0] = firstargv; + } + +@@ -949,16 +950,19 @@ static void FindResponseFile (void) + + // Terminate string, realloc and add to argv + *p = 0; ++ newargv = realloc(newargv, sizeof(newargv[0]) * (indexinfile + 1)); + newargv[indexinfile++] = realloc(s,strlen(s)+1); + } + } while(size > 0); + } + free(file); + ++ newargv = realloc(newargv, sizeof(newargv[0]) * (indexinfile + index)); + memcpy((void *)&newargv[indexinfile],moreargs,index*sizeof(moreargs[0])); + free((void *)moreargs); + +- myargc = indexinfile+index; myargv = newargv; ++ myargc = indexinfile+index; ++ myargv = newargv; + + // DISPLAY ARGS + //jff 9/3/98 use logical output routine +@@ -999,7 +1003,7 @@ static void DoLooseFiles(void) + int lmpcount = 0; + int dehcount = 0; + int i,j,p; +- const char **tmyargv; // use these to recreate the argv array ++ char **tmyargv; // use these to recreate the argv array + int tmyargc; + boolean skip[MAXARGVS]; // CPhipps - should these be skipped at the end + +@@ -1060,7 +1064,7 @@ static void DoLooseFiles(void) + + // Now go back and redo the whole myargv array with our stuff in it. + // First, create a new myargv array to copy into +- tmyargv = calloc(sizeof(char *),MAXARGVS); ++ tmyargv = calloc(sizeof(tmyargv[0]),MAXARGVS); + tmyargv[0] = myargv[0]; // invocation + tmyargc = 1; + +diff --git a/src/m_argv.c b/src/m_argv.c +index 9392840..4fa1ed8 100644 +--- a/src/m_argv.c ++++ b/src/m_argv.c +@@ -37,8 +37,7 @@ + #include "m_argv.h" + + int myargc; +-const char * const * myargv; // CPhipps - not sure if ANSI C allows you to +-// modify contents of argv, but I can't imagine it does. ++char **myargv; + + // + // M_CheckParm +diff --git a/src/m_argv.h b/src/m_argv.h +index 5340c15..b1d5907 100644 +--- a/src/m_argv.h ++++ b/src/m_argv.h +@@ -39,7 +39,7 @@ + * MISC + */ + extern int myargc; +-extern const char * const * myargv; /* CPhipps - const * const * */ ++extern char **myargv; + + /* Returns the position of the given parameter in the arg list (0 if not found). */ + int M_CheckParm(const char *check); +-- +2.50.1 diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index c1ba05ff70..ab9ab09913 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -18,6 +18,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) PRBOOM_CFLAGS += -O0 endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_15),y) +PRBOOM_CFLAGS += -std=gnu18 +endif + PRBOOM_CONF_ENV += CFLAGS="$(PRBOOM_CFLAGS)" ifeq ($(BR2_PACKAGE_LIBPNG),y) @@ -40,7 +44,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 diff --git a/package/privoxy/Config.in b/package/privoxy/Config.in index accb48dfc2..4138c0d281 100644 --- a/package/privoxy/Config.in +++ b/package/privoxy/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PRIVOXY bool "privoxy" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 if !BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help A non-caching web proxy with advanced filtering capabilities diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index 67a44f2c94..3c96c5644e 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.34%20%28stable%29/ -sha1 e65298c4ee235320ea9ddfb689187bda29a63bbb privoxy-3.0.34-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/4.0.0%20%28stable%29/ +sha1 d302cb0bf23536e67a1b5505d01486a335d9c4c0 privoxy-4.0.0-stable-src.tar.gz # Locally computed -sha256 e6ccbca1656f4e616b4657f8514e33a70f6697e9d7294356577839322a3c5d2c privoxy-3.0.34-stable-src.tar.gz +sha256 c08e2ba0049307017bf9d8a63dd2a0dfb96aa0cdeb34ae007776e63eba62a26f privoxy-4.0.0-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index e1353ef0c7..64e8fb24db 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,12 +4,12 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.34 +PRIVOXY_VERSION = 4.0.0 PRIVOXY_SITE = https://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped PRIVOXY_AUTORECONF = YES -PRIVOXY_DEPENDENCIES = pcre zlib +PRIVOXY_DEPENDENCIES = $(if $(BR2_PACKAGE_PCRE2),pcre2,pcre) zlib PRIVOXY_LICENSE = GPL-2.0+ PRIVOXY_LICENSE_FILES = LICENSE PRIVOXY_CPE_ID_VENDOR = privoxy diff --git a/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch b/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch deleted file mode 100644 index 4a8b2a6a8b..0000000000 --- a/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 788248ee631b3b5f82073c36320fc3f4a3c8f9ba Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 31 Aug 2023 22:24:23 +1000 -Subject: [PATCH] build-sys: Add systemd/elogind to w - -Depending on the compiler flags, w needs to be explictly linked -to libsystemd or elogind even though libproc2 is linked to it. - -Signed-off-by: Craig Small -Upstream: https://gitlab.com/procps-ng/procps/-/commit/ca004d4657d5e8b468a4552ede429be53193a3a9 -Signed-off-by: Hugo Cornelis ---- - Makefile.am | 7 +++++++ - NEWS | 3 +++ - 2 files changed, 10 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index f70c8fb1..ddfc0141 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -149,6 +149,13 @@ endif - - dist_man_MANS += man/w.1 - src_w_SOURCES = src/w.c local/fileutils.c -+src_w_LDADD = $(LDADD) -+if WITH_SYSTEMD -+src_w_LDADD += @SYSTEMD_LIBS@ -+endif -+if WITH_ELOGIND -+src_w_LDADD += @ELOGIND_LIBS@ -+endif - else - EXTRA_DIST += man/w.1 - endif -diff --git a/NEWS b/NEWS -index 3f2158d4..4ad9f74e 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,6 @@ -+procps-ng-NEXT -+--------------- -+ - procps-ng-4.0.4 - --------------- - * library (API & ABI unchanged) --- -2.34.1 - diff --git a/package/procps-ng/0001-pgrep-provide-definition-for-nr-pidfd_open.patch b/package/procps-ng/0001-pgrep-provide-definition-for-nr-pidfd_open.patch new file mode 100644 index 0000000000..9c83124311 --- /dev/null +++ b/package/procps-ng/0001-pgrep-provide-definition-for-nr-pidfd_open.patch @@ -0,0 +1,57 @@ +From 90a0ddcd64c2d43dc2c2c856b1b42b5cae6b8a44 Mon Sep 17 00:00:00 2001 +From: Markus Mayer +Date: Wed, 11 Dec 2024 14:53:33 -0800 +Subject: [PATCH] pgrep: provide definition for __NR_pidfd_open if needed + +We already implement pidfd_open() ourselves if libc doesn't provide it. +Let's also provide our own definition of __NR_pidfd_open in case the +kernel headers don't contain it. + +This way, pgrep can provide its full capabilities after being built +against older kernel headers (for increased compatibility) but being run +on systems with newer kernels. + +Signed-off-by: Markus Mayer +Upstream: https://gitlab.com/procps-ng/procps/-/commit/90a0ddcd64c2d43dc2c2c856b1b42b5cae6b8a44 +Signed-off: Michael Nosthoff +--- + configure.ac | 2 +- + src/pgrep.c | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1e984b12..14ba3ad7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -325,7 +325,7 @@ AS_IF([[test "x$enable_pidwait" = xyes -a "x$have_pidfd_open" = xno]], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include + #ifndef __NR_pidfd_open +-#error __NR_pidfd_open not defined ++#warning __NR_pidfd_open not defined; using our definition + #endif + ])], + AC_MSG_RESULT([yes]), +diff --git a/src/pgrep.c b/src/pgrep.c +index 2c6b06b8..6fc25dd4 100644 +--- a/src/pgrep.c ++++ b/src/pgrep.c +@@ -874,6 +874,15 @@ static int signal_option(int *argc, char **argv) + } + + #if defined(ENABLE_PIDWAIT) && !defined(HAVE_PIDFD_OPEN) ++ ++#ifndef __NR_pidfd_open ++#ifdef __alpha__ ++#define __NR_pidfd_open 544 ++#else ++#define __NR_pidfd_open 434 ++#endif ++#endif ++ + static int pidfd_open (pid_t pid, unsigned int flags) + { + return syscall(__NR_pidfd_open, pid, flags); +-- +GitLab + diff --git a/package/procps-ng/0002-fix-ncurses-h-include.patch b/package/procps-ng/0002-fix-ncurses-h-include.patch deleted file mode 100644 index 619126b863..0000000000 --- a/package/procps-ng/0002-fix-ncurses-h-include.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 263fe04f9ed6f3f40fdb7ce249221e03dc926c9b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 24 Jul 2024 09:51:00 +0200 -Subject: [PATCH] fix ncurses.h include - -Commit 58559a5b64a3634460536d6397ca382a54b599f0 was not backported from -3.3.17 to 4.0.0 resulting in the following build failure when ncursesw -headers are not installed in ../usr/include/ncursesw/..: - -src/watch.c:56:11: fatal error: ncursesw/ncurses.h: No such file or directory - 56 | # include - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/b7573be2e78f3d224f48cb3f52087e3d227d58e3 - -Signed-off-by: Fabrice Fontaine - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/263fe04f9ed6f3f40fdb7ce249221e03dc926c9b - -Signed-off-by: Bernd Kuhls -[Bernd: backported to version 4.0.4] ---- - configure.ac | 2 +- - src/watch.c | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d433901f..38350aaf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ PROCPS_PROG_PO4A - - # Checks for header files. - AC_HEADER_MAJOR --AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) -+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h ncursesw/ncurses.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_CHECK_HEADER_STDBOOL -diff --git a/src/watch.c b/src/watch.c -index ef638e00..7ec634b6 100644 ---- a/src/watch.c -+++ b/src/watch.c -@@ -53,6 +53,8 @@ - # define _XOPEN_SOURCE_EXTENDED 1 - # include - # include -+#endif -+#ifdef HAVE_NCURSESW_NCURSES_H - # include - #else - # include --- -GitLab diff --git a/package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch b/package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch deleted file mode 100644 index fc7e092347..0000000000 --- a/package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f37d178d5c25c547835d054fbb1eda32c25034b3 Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Mon, 30 Sep 2024 17:26:01 +1000 -Subject: [PATCH] build-sys: Fix pidfd_open checking - -The previous build setup would check for pidfd_open using -AC_CHECK_FUNC and would be incorrectly reported as true. - -Also, if pidfd_open() and __NR_pidfd_open were not present, -pidwait would silently not be built. - -So, changes: - compile a small programin using pidfd_open to test it properly - conditionally try to find NR_pidfd_open if the function fails - complain if neither are present - have --disable-pidwait configure option so you are explicit in - not wanting and knowing you wont get pidwait - -References: - #352 - commit d9c3e3676d86094abaa239b3218f57bf49d70b4f - commit 17f94796a9b3c4f1ff28829107a82107dcb362b4 - -Signed-off-by: Craig Small - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/2507bc475782ff5e0541d37c780dff1e293c9553 - -Signed-off-by: Scott Fan -[Scott: backported to version 4.0.4] ---- - configure.ac | 45 ++++++++++++++++++++++++++++++--------------- - 1 file changed, 30 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fec27e3f..0719fcd1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,21 +170,6 @@ AC_TRY_COMPILE([#include ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - --AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [ -- AC_MSG_CHECKING([for __NR_pidfd_open]) -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ --#include --#ifndef __NR_pidfd_open --#error __NR_pidfd_open not defined --#endif -- ])], [enable_pidwait=yes], [enable_pidwait=no]) -- AC_MSG_RESULT([$enable_pidwait]) --]) --if test "$enable_pidwait" = yes; then -- AC_DEFINE([ENABLE_PIDWAIT], [1], [Enable pidwait]) --fi --AM_CONDITIONAL([BUILD_PIDWAIT], [test x$enable_pidwait = xyes]) -- - dnl watch8bit must be before the AC_ARG_WITH set as it sets up ncurses - AC_SUBST([WITH_WATCH8BIT]) - AC_ARG_ENABLE([watch8bit], -@@ -321,6 +306,36 @@ AC_ARG_ENABLE([pidof], - ) - AM_CONDITIONAL(BUILD_PIDOF, test "x$enable_pidof" = xyes) - -+# If pidwait is enabled, we need either pidfd_open() or __NR_pidfd_open need to be defined -+# Cannot use AC_CHECK_FUNC as it (incorrectly) passes with pidfd_open missing -+AC_ARG_ENABLE([pidwait], -+ AS_HELP_STRING([--disable-pidwait], [do not build pidwait]), -+ [], [ -+ enable_pidwait=yes -+ AC_DEFINE(ENABLE_PIDWAIT, 1, [enable pidwait]) -+ ] -+) -+AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes) -+AC_MSG_CHECKING([for pidfd_open()]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])], -+ have_pidfd_open=yes; AC_MSG_RESULT([yes]) , -+ have_pidfd_open=no; AC_MSG_RESULT([no]) -+ ) -+ -+AS_IF([[test "x$enable_pidwait" = xyes -a "x$have_pidfd_open" = xno]], -+ AC_MSG_CHECKING([for __NR_pidfd_open]) -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+#include -+#ifndef __NR_pidfd_open -+#error __NR_pidfd_open not defined -+#endif -+ ])], -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Neither pidfd_open or __NR_pidfd_open found. Disable pidwait with configure option --disable-pidwait]) -+ ) -+ ,[]) -+ - AC_ARG_ENABLE([kill], - AS_HELP_STRING([--disable-kill], [do not build kill]), - [], [enable_kill=yes] --- -2.43.0 - diff --git a/package/procps-ng/0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch b/package/procps-ng/0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch deleted file mode 100644 index aa65df7706..0000000000 --- a/package/procps-ng/0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1e2d53e1d86cb75e8f39b42b9a5c409e5d3261ed Mon Sep 17 00:00:00 2001 -From: oli-ben <24815225-oli-ben@users.noreply.gitlab.com> -Date: Wed, 27 Nov 2024 20:17:11 +0000 -Subject: [PATCH] build-sys: Fix define of HAVE_PIDFD_OPEN - -Fix cross-compilation issues when using GCC-12.3 -* configure fails to detect that the sysroot does support the pidfd_open - syscall wrapper -* configure fails to define HAVE_PIDFD_OPEN which is used in pgrep.c, - so it fails building, because __NR_pidfd_open is then undefined - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/587efb47df7ddbfda4e6abdd1e7792a2531a238f - -Signed-off-by: Scott Fan -[Scott: backported to version 4.0.4] ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0719fcd1..6242a8f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -317,8 +317,8 @@ AC_ARG_ENABLE([pidwait], - ) - AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes) - AC_MSG_CHECKING([for pidfd_open()]) --AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])], -- have_pidfd_open=yes; AC_MSG_RESULT([yes]) , -+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[pidfd_open(1,1)]])], -+ have_pidfd_open=yes; AC_DEFINE(HAVE_PIDFD_OPEN, 1, [pidfd_open is defined]) AC_MSG_RESULT([yes]), - have_pidfd_open=no; AC_MSG_RESULT([no]) - ) - --- -2.43.0 - diff --git a/package/procps-ng/0005-pgrep-Include-sys-syscall.h-if-making-pidwait.patch b/package/procps-ng/0005-pgrep-Include-sys-syscall.h-if-making-pidwait.patch deleted file mode 100644 index 74f93c8e49..0000000000 --- a/package/procps-ng/0005-pgrep-Include-sys-syscall.h-if-making-pidwait.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 81ded587d2484b6f470f2d5c837c5591491377ce Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 28 Nov 2024 07:20:42 +1100 -Subject: [PATCH] pgrep: Include sys/syscall.h if making pidwait - -sys/syscall.h would only be included if pidwait was made -and we found pidfd_open() The previous commit fixed the -finding part, but in fact we want sys/syscall.h either -way because syscall() is defined there too. - -Most of the time the header is included by other headers -but adding it explicitly means if that header is removed or -changed it still works. - -Signed-off-by: Craig Small - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/5acbb5dc1587d688de646d739a97251eb893bbb0 - -Signed-off-by: Scott Fan -[Scott: backported to version 4.0.4] ---- - src/pgrep.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/pgrep.c b/src/pgrep.c -index d8e57dff..a2607532 100644 ---- a/src/pgrep.c -+++ b/src/pgrep.c -@@ -44,9 +44,7 @@ - - #ifdef ENABLE_PIDWAIT - #include --#ifndef HAVE_PIDFD_OPEN - #include --#endif /* !HAVE_PIDFD_OPEN */ - #endif - - /* EXIT_SUCCESS is 0 */ --- -2.43.0 - diff --git a/package/procps-ng/Config.in b/package/procps-ng/Config.in index 7af0e97fb4..2b97096f00 100644 --- a/package/procps-ng/Config.in +++ b/package/procps-ng/Config.in @@ -1,7 +1,13 @@ +comment "procps-ng needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_PROCPS_NG bool "procps-ng" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_USE_WCHAR select BR2_PACKAGE_NCURSES help Standard informational utilities and process-handling tools. diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index 0d9cd9a835..21c661192c 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 2f747fc7df8ccf402d03e375c565cf96 procps-ng-4.0.4.tar.xz -sha1 2b859acd7060e9898ac457dbd26dbebf563cc44b procps-ng-4.0.4.tar.xz +md5 90803e64f51f192f3325d25c3335d057 procps-ng-4.0.5.tar.xz +sha1 a36b8ab95950addb4b34251fcf23195c45a63eda procps-ng-4.0.5.tar.xz # Locally calculated after checking signature -# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.4.tar.xz.asc -sha256 22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e procps-ng-4.0.4.tar.xz +# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.5.tar.xz.asc +sha256 c2e6d193cc78f84cd6ddb72aaf6d5c6a9162f0470e5992092057f5ff518562fa procps-ng-4.0.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 9200b6faa6..56fe1790c3 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCPS_NG_VERSION = 4.0.4 +PROCPS_NG_VERSION = 4.0.5 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) @@ -14,10 +14,7 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) -# Applying 0001-build-sys-Add-systemd-elogind-to-w.patch touches Makefile.am -# Applying 0002-fix-ncurses-h-include.patch touches configure.ac -# Applying 0003-build-sys-Fix-pidfd_open-checking.patch touches configure.ac -# Applying 0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch touches configure.ac +# Applying 0001-pgrep-provide-definition-for-nr-pidfd_open.patch touches configure.ac PROCPS_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_SYSTEMD),y) diff --git a/package/procrank_linux/Config.in b/package/procrank_linux/Config.in deleted file mode 100644 index 59d462b6d4..0000000000 --- a/package/procrank_linux/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PROCRANK_LINUX - bool "procrank_linux" - help - procrank is a tool commonly used by Android platform - developers to find out how much memory is really being used. - - https://github.com/csimmonds/procrank_linux diff --git a/package/procrank_linux/procrank_linux.hash b/package/procrank_linux/procrank_linux.hash deleted file mode 100644 index cc9c403a0e..0000000000 --- a/package/procrank_linux/procrank_linux.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 1c3592b549b6793b29ab561568f493d0edbfe288ea2aed59afa689eaa26b5d9e procrank_linux-21c30ab4514a5b15ac6e813e21bee0d3d714cb08.tar.gz -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a NOTICE diff --git a/package/procrank_linux/procrank_linux.mk b/package/procrank_linux/procrank_linux.mk deleted file mode 100644 index 415a4e41b7..0000000000 --- a/package/procrank_linux/procrank_linux.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# procrank_linux -# -################################################################################ - -PROCRANK_LINUX_VERSION = 21c30ab4514a5b15ac6e813e21bee0d3d714cb08 -PROCRANK_LINUX_SITE = $(call github,csimmonds,procrank_linux,$(PROCRANK_LINUX_VERSION)) -PROCRANK_LINUX_LICENSE = Apache-2.0 -PROCRANK_LINUX_LICENSE_FILES = NOTICE - -define PROCRANK_LINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" \ - LOCAL_CFLAGS="$(TARGET_CFLAGS)" -endef - -define PROCRANK_LINUX_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/procrank \ - $(TARGET_DIR)/usr/bin/procrank -endef - -$(eval $(generic-package)) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index da6b4377e2..35f1f6d2f4 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 86715967bd378a4c0330708e11714bda2c8ce9f757fb3006073238d77e83e6e1 procs-0.14.5-cargo2.tar.gz +sha256 09f2faee76bad885af50bf2977ea34b64810645a0b781699f8c822311211575e procs-0.14.10-cargo4.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index 019e69a1de..c85c521341 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.5 +PROCS_VERSION = 0.14.10 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 9d99ff70c4..1f8f2bd305 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -16,6 +16,13 @@ config BR2_PACKAGE_PROFTPD_MOD_CAP help Compile ProFTPD with mod_cap support +config BR2_PACKAGE_PROFTPD_MOD_LANG + bool "mod_lang support" + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + The mod_lang module enables ProFTPD support for RFC 2640 LANG + and OPTS UTF8 commands. + config BR2_PACKAGE_PROFTPD_MOD_REWRITE bool "mod_rewrite support" help diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index 5a7d153a31..88b5906945 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 proftpd-1.3.8b.tar.gz +sha256 42ba40d8d5a5a9f28c9dcd7f15aa6b5368fe5efceaacb999041311b170f076d5 proftpd-1.3.8d.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 72a0fe9354..d450489cb0 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.8b +PROFTPD_VERSION = 1.3.8d PROFTPD_SITE = https://github.com/proftpd/proftpd/archive/v$(PROFTPD_VERSION) PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING @@ -27,6 +27,14 @@ PROFTPD_CONF_OPTS = \ --with-gnu-ld \ --without-openssl-cmdline +# source code contains a number of variables named 'bool', which +# conflicts with the C23 keyword. Fixed upstream in 1.3.9 with +# https://github.com/proftpd/proftpd/commit/61be7eb14f200b97804a3cfa85fed51661067c62 +# so can be dropped when bumping to that +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_15),y) +PROFTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu18" +endif + ifeq ($(BR2_PACKAGE_LIBIDN2),y) PROFTPD_DEPENDENCIES += libidn2 endif @@ -49,6 +57,13 @@ else PROFTPD_CONF_OPTS += --disable-cap endif +ifeq ($(BR2_PACKAGE_PROFTPD_MOD_LANG),y) +PROFTPD_CONF_OPTS += --enable-nls +ifneq ($(BR2_ENABLE_LOCALE),y) +PROFTPD_DEPENDENCIES += libiconv +endif +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y) PROFTPD_MODULES += mod_rewrite endif diff --git a/package/proj/Config.in b/package/proj/Config.in index 6d172e2ee9..86966a4d10 100644 --- a/package/proj/Config.in +++ b/package/proj/Config.in @@ -14,6 +14,18 @@ config BR2_PACKAGE_PROJ http://proj4.org/ +if BR2_PACKAGE_PROJ + +config BR2_PACKAGE_PROJ_APPS + bool "build apps" + select BR2_PACKAGE_LIBCURL + help + Build and install proj command line apps. Those command line + applications are: cct, cs2cs, geod, gie, invgeod, invproj, + proj, projinfo, projsync. + +endif + comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ diff --git a/package/proj/proj.hash b/package/proj/proj.hash index 8a1650ade5..5249f52c10 100644 --- a/package/proj/proj.hash +++ b/package/proj/proj.hash @@ -1,5 +1,5 @@ -# Fetched from https://download.osgeo.org/proj/proj-9.5.0.tar.gz.md5 -md5 ac46b4e31562890d012ea6b31e579cf6 proj-9.5.0.tar.gz +# Fetched from https://download.osgeo.org/proj/proj-9.5.1.tar.gz.md5 +md5 07c44ca4a65a0664ce823c8448707c78 proj-9.5.1.tar.gz # Locally calculated -sha256 659af0d558f7c5618c322fde2d3392910806faee8684687959339021fa207d99 proj-9.5.0.tar.gz +sha256 a8395f9696338ffd46b0feb603edbb730fad6746fba77753c77f7f997345e3d3 proj-9.5.1.tar.gz sha256 6a8f30793e877d32e3f88b972f0970a051a3b5a26cd057d3993cb51e21c43319 COPYING diff --git a/package/proj/proj.mk b/package/proj/proj.mk index a17a0a1feb..361c1e50b1 100644 --- a/package/proj/proj.mk +++ b/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 9.5.0 +PROJ_VERSION = 9.5.1 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING @@ -20,7 +20,7 @@ PROJ_CXXFLAGS += -O0 endif PROJ_CONF_OPTS = \ - -DBUILD_APPS=OFF \ + -DBUILD_APPS=$(if $(BR2_PACKAGE_PROJ_APPS),ON,OFF) \ -DCMAKE_C_FLAGS="$(PROJ_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(PROJ_CXXFLAGS)" diff --git a/package/protobuf-c/protobuf-c.hash b/package/protobuf-c/protobuf-c.hash index aafd98416a..c7eee9e7e1 100644 --- a/package/protobuf-c/protobuf-c.hash +++ b/package/protobuf-c/protobuf-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98 protobuf-c-1.5.0.tar.gz -sha256 ad28bbf89340b86d15aad1ff62c4f4590025d836415307dc66cf0338235cc2f4 LICENSE +sha256 e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24 protobuf-c-1.5.2.tar.gz +sha256 2d1d028bd27f8c85bc970d720519d2069ca6213fcb26b9dea444a7c39d24bbb3 LICENSE diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index 2b3e86a1bc..3df6a2edad 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.5.0 +PROTOBUF_C_VERSION = 1.5.2 PROTOBUF_C_SITE = https://github.com/protobuf-c/protobuf-c/releases/download/v$(PROTOBUF_C_VERSION) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index 47e987fa2b..633201b38c 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -37,6 +37,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS default y if BR2_sparc64 default y if BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() config BR2_PACKAGE_PROTOBUF @@ -44,8 +45,9 @@ config BR2_PACKAGE_PROTOBUF depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBABSEIL_CPP help Protocol buffers are Google's language-neutral, platform-neutral, extensible mechanism for serializing @@ -53,7 +55,7 @@ config BR2_PACKAGE_PROTOBUF https://developers.google.com/protocol-buffers -comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index b092c9303f..98159ad897 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz +sha256 008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e protobuf-29.3.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 8cd4e99e06..4540443702 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,45 +7,53 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.12 -PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz +PROTOBUF_VERSION = 29.3 PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE PROTOBUF_CPE_ID_VENDOR = google # N.B. Need to use host protoc during cross compilation. -PROTOBUF_DEPENDENCIES = host-protobuf -PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/bin/protoc +PROTOBUF_DEPENDENCIES = host-protobuf libabseil-cpp +PROTOBUF_CONF_OPTS = \ + -Dprotobuf_ABSL_PROVIDER=package \ + -Dprotobuf_ALLOW_CCACHE=ON \ + -Dprotobuf_BUILD_CONFORMANCE=OFF \ + -Dprotobuf_BUILD_LIBPROTOC=OFF \ + -Dprotobuf_BUILD_LIBUPB=ON \ + -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \ + -Dprotobuf_BUILD_PROTOC_BINARIES=OFF \ + -Dprotobuf_BUILD_TESTS=OFF \ + -Dprotobuf_DISABLE_RTTI=OFF \ + -Dprotobuf_INSTALL=ON \ + -DWITH_PROTOC=$(HOST_DIR)/bin/protoc -PROTOBUF_CXXFLAGS = $(TARGET_CXXFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -PROTOBUF_CXXFLAGS += -O0 -endif - -ifeq ($(BR2_or1k),y) -PROTOBUF_CXXFLAGS += -mcmodel=large -endif - -PROTOBUF_CONF_ENV = CXXFLAGS="$(PROTOBUF_CXXFLAGS)" +HOST_PROTOBUF_DEPENDENCIES = host-libabseil-cpp +HOST_PROTOBUF_CONF_OPTS = \ + -Dprotobuf_ABSL_PROVIDER=package \ + -Dprotobuf_ALLOW_CCACHE=ON \ + -Dprotobuf_BUILD_CONFORMANCE=OFF \ + -Dprotobuf_BUILD_LIBPROTOC=ON \ + -Dprotobuf_BUILD_LIBUPB=OFF \ + -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \ + -Dprotobuf_BUILD_PROTOC_BINARIES=ON \ + -Dprotobuf_BUILD_TESTS=OFF \ + -Dprotobuf_DISABLE_RTTI=OFF \ + -Dprotobuf_INSTALL=ON \ + -Dprotobuf_WITH_ZLIB=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -PROTOBUF_CONF_ENV += LIBS=-latomic +PROTOBUF_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif PROTOBUF_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ZLIB),y) PROTOBUF_DEPENDENCIES += zlib +PROTOBUF_CONF_OPTS += -Dprotobuf_WITH_ZLIB=ON +else +PROTOBUF_CONF_OPTS += -Dprotobuf_WITH_ZLIB=OFF endif -define PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES - rm -rf $(TARGET_DIR)/usr/bin/protoc - rm -rf $(TARGET_DIR)/usr/lib/libprotoc.so* -endef - -PROTOBUF_POST_INSTALL_TARGET_HOOKS += PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/protozero/Config.in b/package/protozero/Config.in index e6347e6f7f..b2c253c5a0 100644 --- a/package/protozero/Config.in +++ b/package/protozero/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PROTOZERO bool "protozero" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 help Minimalistic protocol buffer decoder and encoder in C++. Designed for high performance. Suitable for writing zero copy diff --git a/package/protozero/protozero.hash b/package/protozero/protozero.hash index f0b8e39009..917746af35 100644 --- a/package/protozero/protozero.hash +++ b/package/protozero/protozero.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 27e0017d5b3ba06d646a3ec6391d5ccc8500db821be480aefd2e4ddc3de5ff99 protozero-1.7.1.tar.gz -sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE.md +sha256 6c7a896f1dc08435e8cd4f3780ff688cd0bfce6890599b755f6f3cb36398dc25 protozero-1.8.1.tar.gz +sha256 254c0e9f18d261bfc55ff277cf12e3c1ca25839d56af17fba65d142396021466 LICENSE.md sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.from_folly diff --git a/package/protozero/protozero.mk b/package/protozero/protozero.mk index a46e37d69b..c5c4285955 100644 --- a/package/protozero/protozero.mk +++ b/package/protozero/protozero.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOZERO_VERSION = 1.7.1 +PROTOZERO_VERSION = 1.8.1 PROTOZERO_SITE = $(call github,mapbox,protozero,v$(PROTOZERO_VERSION)) PROTOZERO_LICENSE = BSD-2-Clause, Apache-2.0 PROTOZERO_LICENSE_FILES = LICENSE.md LICENSE.from_folly diff --git a/package/psimd/Config.in b/package/psimd/Config.in new file mode 100644 index 0000000000..c5c51ca2ef --- /dev/null +++ b/package/psimd/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PSIMD + bool "psimd" + help + Portable 128-bit SIMD intrinsics. + + https://github.com/Maratyszcza/psimd diff --git a/package/psimd/psimd.hash b/package/psimd/psimd.hash new file mode 100644 index 0000000000..5692e79bd6 --- /dev/null +++ b/package/psimd/psimd.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 f6c4dab91ae9a03b3019e7cab0572743afd0e1b6e75b97fcca50259c737c924e psimd-072586a71b55b7f8c584153d223e95687148a900.tar.gz +# License files, locally calculated +sha256 984ce1e0b8ee89d234e28b960381f240e03a07a8031f35012f9c3256f56964e2 LICENSE diff --git a/package/psimd/psimd.mk b/package/psimd/psimd.mk new file mode 100644 index 0000000000..be0090a32f --- /dev/null +++ b/package/psimd/psimd.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# psimd +# +################################################################################ + +PSIMD_VERSION = 072586a71b55b7f8c584153d223e95687148a900 +PSIMD_SITE = $(call github,Maratyszcza,psimd,$(PSIMD_VERSION)) +PSIMD_LICENSE = MIT +PSIMD_LICENSE_FILES = LICENSE +PSIMD_INSTALL_STAGING = YES +# Only installs a header +PSIMD_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/package/psplash/Config.in b/package/psplash/Config.in index da99b264e0..118801e8ef 100644 --- a/package/psplash/Config.in +++ b/package/psplash/Config.in @@ -35,6 +35,23 @@ config BR2_PACKAGE_PSPLASH_IMAGE Use a personalized png image as boot splash. Let it empty if you want to keep the psplash default image. +config BR2_PACKAGE_PSPLASH_PROGRESS_BAR + bool "enable progress bar" + default y + help + Enable progress bar management via the "PROGRESS" command. + +config BR2_PACKAGE_PSPLASH_STARTUP_MSG + bool "enable startup message" + default y + help + Enable text banner output on startup. + +config BR2_PACKAGE_PSPLASH_FULL_SCREEN + bool "use fullscreen mode" + help + Enable displaying the psplash image in fullscreen mode. + endif comment "psplash needs a toolchain w/ wchar" diff --git a/package/psplash/psplash.hash b/package/psplash/psplash.hash index 61514f57c0..e28f35b4f3 100644 --- a/package/psplash/psplash.hash +++ b/package/psplash/psplash.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 06def825088f44422fad8a885077d917db6f47688457d4a0953c2ff6f6036378 psplash-44afb7506d43cca15582b4c5b90ba5580344d75d-git4.tar.gz +sha256 18efa5f56e5b2ff4e8916b7632e7da59122e33f79bb514a8e225e12931e3ef20 psplash-53ae74a36bf17675228552abb927d2f981940a6a-git4.tar.gz sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk index 69f9bf386d..ea57d884d5 100644 --- a/package/psplash/psplash.mk +++ b/package/psplash/psplash.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSPLASH_VERSION = 44afb7506d43cca15582b4c5b90ba5580344d75d +PSPLASH_VERSION = 53ae74a36bf17675228552abb927d2f981940a6a PSPLASH_SITE = https://git.yoctoproject.org/psplash PSPLASH_SITE_METHOD = git PSPLASH_LICENSE = GPL-2.0+ @@ -19,6 +19,24 @@ else PSPLASH_CONF_OPTS += --without-systemd endif +ifeq ($(BR2_PACKAGE_PSPLASH_PROGRESS_BAR),y) +PSPLASH_CONF_OPTS += --enable-progress-bar +else +PSPLASH_CONF_OPTS += --disable-progress-bar +endif + +ifeq ($(BR2_PACKAGE_PSPLASH_STARTUP_MSG),y) +PSPLASH_CONF_OPTS += --enable-startup-msg +else +PSPLASH_CONF_OPTS += --disable-startup-msg +endif + +ifeq ($(BR2_PACKAGE_PSPLASH_FULL_SCREEN),y) +PSPLASH_CONF_OPTS += --enable-img-fullscreen +else +PSPLASH_CONF_OPTS += --disable-img-fullscreen +endif + PSPLASH_IMAGE = $(call qstrip,$(BR2_PACKAGE_PSPLASH_IMAGE)) ifneq ($(PSPLASH_IMAGE),) diff --git a/package/pthreadpool/Config.in b/package/pthreadpool/Config.in new file mode 100644 index 0000000000..8d163b16de --- /dev/null +++ b/package/pthreadpool/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PTHREADPOOL + bool "pthreadpool" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_FXDIV + help + Pthreadpool is a portable and efficient thread pool + implementation. + + https://github.com/Maratyszcza/pthreadpool + +comment "pthreadpool needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pthreadpool/pthreadpool.hash b/package/pthreadpool/pthreadpool.hash new file mode 100644 index 0000000000..4adc1507f9 --- /dev/null +++ b/package/pthreadpool/pthreadpool.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 8d8ebab96df6aa12922643060e72c43bfdca9fd80cf5aacaf7391bc6850560a3 pthreadpool-560c60d342a76076f0557a3946924c6478470044.tar.gz +# License files, locally calculated +sha256 57814a606b4d0fb087d9a534919084b6c11b58a4174cb5a4aef200187780dc3a LICENSE diff --git a/package/pthreadpool/pthreadpool.mk b/package/pthreadpool/pthreadpool.mk new file mode 100644 index 0000000000..6a05256461 --- /dev/null +++ b/package/pthreadpool/pthreadpool.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# pthreadpool +# +################################################################################ + +PTHREADPOOL_VERSION = 560c60d342a76076f0557a3946924c6478470044 +PTHREADPOOL_SITE = $(call github,Maratyszcza,pthreadpool,$(PTHREADPOOL_VERSION)) +PTHREADPOOL_LICENSE = BSD-2-Clause +PTHREADPOOL_LICENSE_FILES = LICENSE +PTHREADPOOL_INSTALL_STAGING = YES +PTHREADPOOL_DEPENDENCIES = fxdiv + +PTHREADPOOL_CFLAGS = $(TARGET_CFLAGS) +PTHREADPOOL_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_CPUINFO),y) +PTHREADPOOL_DEPENDENCIES += cpuinfo +PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 +PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=1 +else +PTHREADPOOL_CFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 +PTHREADPOOL_CXXFLAGS += -DPTHREADPOOL_USE_CPUINFO=0 +endif + +PTHREADPOOL_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(PTHREADPOOL_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(PTHREADPOOL_CXXFLAGS)" \ + -DFXDIV_SOURCE_DIR="$(FXDIV_DIR)" \ + -DPTHREADPOOL_BUILD_TESTS=OFF \ + -DPTHREADPOOL_BUILD_BENCHMARKS=OFF + +$(eval $(cmake-package)) diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index f122551b9f..b1f9dc25d7 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -1,40 +1,40 @@ config BR2_PACKAGE_PULSEVIEW bool "pulseview" - depends on BR2_PACKAGE_QT5 - # libsigrok->libglib2: - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem + depends on BR2_USE_WCHAR # libsigrok, qt5 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 depends on BR2_INSTALL_LIBSTDCPP - # libsigrok->libzip - depends on !BR2_STATIC_LIBS - # libsigrok - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 - depends on BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS # libsigrok, qt5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigrok + depends on BR2_HOST_GCC_AT_LEAST_5 # qt5 + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_SERIALIZATION + select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_LIBSIGROK select BR2_PACKAGE_LIBSIGROKCXX - select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_PNG + select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_SERIALIZATION help PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok. http://sigrok.org/wiki/PulseView -comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 7, host gcc >= 4.9" +comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 7, host gcc >= 5" depends on BR2_USE_MMU - depends on BR2_PACKAGE_QT5 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ - !BR2_HOST_GCC_AT_LEAST_4_9 + depends on !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_ENABLE_LOCALE \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_HOST_GCC_AT_LEAST_5 diff --git a/package/putty/putty.mk b/package/putty/putty.mk index 617518e647..ec65991f41 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -14,8 +14,6 @@ PUTTY_CONF_OPTS = -DPUTTY_GSSAPI=OFF ifeq ($(BR2_PACKAGE_LIBGTK3),y) PUTTY_DEPENDENCIES += libgtk3 -else ifeq ($(BR2_PACKAGE_LIBGTK2),y) -PUTTY_DEPENDENCIES += libgtk2 endif ifeq ($(BR2_STATIC_LIBS),y) diff --git a/package/python-aerich/Config.in b/package/python-aerich/Config.in index 3aa39e176d..9b6d8f16c6 100644 --- a/package/python-aerich/Config.in +++ b/package/python-aerich/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_AERICH bool "python-aerich" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core - select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_ANYIO # runtime + select BR2_PACKAGE_PYTHON_ASYNCCLICK # runtime select BR2_PACKAGE_PYTHON_DICTDIFFER # runtime - select BR2_PACKAGE_PYTHON_PYDANTIC # runtime - select BR2_PACKAGE_PYTHON_TOMLKIT # runtime select BR2_PACKAGE_PYTHON_TORTOISE_ORM # runtime help A database migrations tool for Tortoise ORM. diff --git a/package/python-aerich/python-aerich.hash b/package/python-aerich/python-aerich.hash index c104c3d58e..7990532a2e 100644 --- a/package/python-aerich/python-aerich.hash +++ b/package/python-aerich/python-aerich.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aerich/json -md5 26a99a2c6c604a370b228b74e12c7981 aerich-0.7.2.tar.gz -sha256 31d67de7b96184636b89de99062e059e5e6204b6251d24c33eb21fc9cf982e09 aerich-0.7.2.tar.gz +md5 e4c7fcf3593c22d58c372595ca3d2e6c aerich-0.9.2.tar.gz +sha256 02d58658714eebe396fe7bd9f9401db3a60a44dc885910ad3990920d0357317d aerich-0.9.2.tar.gz # Locally computed sha256 checksums sha256 4cc00f0e33ac8e089b37d8a1474be441b26311bdc16fe035c75b51201515f617 LICENSE diff --git a/package/python-aerich/python-aerich.mk b/package/python-aerich/python-aerich.mk index 6df3dc4f6e..916279be78 100644 --- a/package/python-aerich/python-aerich.mk +++ b/package/python-aerich/python-aerich.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_AERICH_VERSION = 0.7.2 +PYTHON_AERICH_VERSION = 0.9.2 PYTHON_AERICH_SOURCE = aerich-$(PYTHON_AERICH_VERSION).tar.gz -PYTHON_AERICH_SITE = https://files.pythonhosted.org/packages/ca/cd/ae9c60ffc21e2d41e22c62cbf24a60dfad937222d880489703842d179746 -PYTHON_AERICH_SETUP_TYPE = poetry +PYTHON_AERICH_SITE = https://files.pythonhosted.org/packages/c4/60/5d3885f531fab2cecec67510e7b821efc403940ed9eefd034b2c21350f3c +PYTHON_AERICH_SETUP_TYPE = pep517 PYTHON_AERICH_LICENSE = Apache-2.0 PYTHON_AERICH_LICENSE_FILES = LICENSE +PYTHON_AERICH_DEPENDENCIES = host-python-pdm-backend $(eval $(python-package)) diff --git a/package/python-aexpect/python-aexpect.hash b/package/python-aexpect/python-aexpect.hash index ff30c765e3..8ca28a2e71 100644 --- a/package/python-aexpect/python-aexpect.hash +++ b/package/python-aexpect/python-aexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aexpect/json -md5 bb05319c277cfe97114780579d251c30 aexpect-1.7.0.tar.gz -sha256 11bfeea78ef6147ac8f6e29c2a720bd332598383d88274cdca5e6413c2070d52 aexpect-1.7.0.tar.gz +md5 46eb96cf409cd59c8d39ca5c092b734e aexpect-1.8.0.tar.gz +sha256 97b753e4b0aa08d455bd64d2486c97d6bf6a18a9b8c26315519ec61448400b78 aexpect-1.8.0.tar.gz # Locally computed sha256 checksums sha256 7be26abf35e531a226dc742d2379d42d372cb61f027a6e26477c0e2f1a03bfcb LICENSE diff --git a/package/python-aexpect/python-aexpect.mk b/package/python-aexpect/python-aexpect.mk index 1cfcc9ffaf..066f8d0480 100644 --- a/package/python-aexpect/python-aexpect.mk +++ b/package/python-aexpect/python-aexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AEXPECT_VERSION = 1.7.0 +PYTHON_AEXPECT_VERSION = 1.8.0 PYTHON_AEXPECT_SOURCE = aexpect-$(PYTHON_AEXPECT_VERSION).tar.gz -PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/dd/32/738b5190adb5ed387d3e755885f646b714fbf9c22adbda7ff988db7ede49 +PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/a3/74/837acfcdb3187cb931aa2edc4979e64aa9954092e4fd36b1161f65d65fdb PYTHON_AEXPECT_SETUP_TYPE = setuptools PYTHON_AEXPECT_LICENSE = GPL-2.0+ PYTHON_AEXPECT_LICENSE_FILES = LICENSE diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index 33895b2387..dfe0d02c80 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 09a0cce4b192d861d2becf216f0769fc aiocoap-0.4.11.tar.gz -sha256 2603b8ec61caedf008b4a153a94f337262bf89f26d1c030f12c492d085e875f7 aiocoap-0.4.11.tar.gz +md5 028b0ce02cb94317a24d31adbb22150c aiocoap-0.4.14.tar.gz +sha256 01a34233b6f9a97df9a61f30bc64c0399bac498eaa160189a7f1f48f89d18717 aiocoap-0.4.14.tar.gz # Locally computed sha256 checksums -sha256 c59b1339031e4495b336555be42b8b488eacfb037a23fadf2d5e2c8abd0e6366 doc/LICENSE.rst +sha256 8baefb820ca33d8176df8d0430ce05d15764617cd07ec04238c56d641273f472 doc/LICENSE.rst sha256 51d56d9e6f9755df590a329e73ca58663605a182a8e80f0166fff65203a1185a LICENSES/BSD-3-Clause.txt sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/MIT.txt diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index a69722232c..26909e7dd1 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.11 +PYTHON_AIOCOAP_VERSION = 0.4.14 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/50/b3/2ea6d3a294ec094da3175aceaa2ad1c2644eab162b48676267e992d4c651 +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/28/76/de52f7fa51ddbb5255f7b80d8965903bfa718420ac5d21b0852f5d81c1b1 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = BSD-3-Clause, MIT PYTHON_AIOCOAP_LICENSE_FILES = doc/LICENSE.rst LICENSES/BSD-3-Clause.txt LICENSES/MIT.txt diff --git a/package/python-aiodns/python-aiodns.hash b/package/python-aiodns/python-aiodns.hash index 3f4d911db7..e0c73c2039 100644 --- a/package/python-aiodns/python-aiodns.hash +++ b/package/python-aiodns/python-aiodns.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiodns/json -md5 0bfcd1b040912744badd2771a33a32fc aiodns-3.2.0.tar.gz -sha256 62869b23409349c21b072883ec8998316b234c9a9e36675756e8e317e8768f72 aiodns-3.2.0.tar.gz +md5 30623b233a06bd318478e39828a771d2 aiodns-3.5.0.tar.gz +sha256 11264edbab51896ecf546c18eb0dd56dff0428c6aa6d2cd87e643e07300eb310 aiodns-3.5.0.tar.gz # Locally computed sha256 checksums -sha256 eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97 LICENSE +sha256 3e91cfa76821ab70d22998136d674d20ae888463a7e8a7f377166cfe1ee64feb LICENSE diff --git a/package/python-aiodns/python-aiodns.mk b/package/python-aiodns/python-aiodns.mk index 9c1bea601c..87aa8830aa 100644 --- a/package/python-aiodns/python-aiodns.mk +++ b/package/python-aiodns/python-aiodns.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIODNS_VERSION = 3.2.0 +PYTHON_AIODNS_VERSION = 3.5.0 PYTHON_AIODNS_SOURCE = aiodns-$(PYTHON_AIODNS_VERSION).tar.gz -PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/e7/84/41a6a2765abc124563f5380e76b9b24118977729e25a84112f8dfb2b33dc +PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/17/0a/163e5260cecc12de6abc259d158d9da3b8ec062ab863107dcdb1166cdcef PYTHON_AIODNS_SETUP_TYPE = setuptools PYTHON_AIODNS_LICENSE = MIT PYTHON_AIODNS_LICENSE_FILES = LICENSE diff --git a/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash index 85938c1084..10d3d5cadc 100644 --- a/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash +++ b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohappyeyeballs/json -md5 dcc0ba52e3c350f4edc8a8475d1892d6 aiohappyeyeballs-2.4.3.tar.gz -sha256 75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586 aiohappyeyeballs-2.4.3.tar.gz +md5 2fa845a1ce2f7730045fa763aa9987f8 aiohappyeyeballs-2.6.1.tar.gz +sha256 c3f9d0113123803ccadfdf3f0faa505bc78e6a72d1cc4806cbd719826e943558 aiohappyeyeballs-2.6.1.tar.gz # Locally computed sha256 checksums sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk index 2a2c10fb37..8dcc59a77b 100644 --- a/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk +++ b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHAPPYEYEBALLS_VERSION = 2.4.3 +PYTHON_AIOHAPPYEYEBALLS_VERSION = 2.6.1 PYTHON_AIOHAPPYEYEBALLS_SOURCE = aiohappyeyeballs-$(PYTHON_AIOHAPPYEYEBALLS_VERSION).tar.gz -PYTHON_AIOHAPPYEYEBALLS_SITE = https://files.pythonhosted.org/packages/bc/69/2f6d5a019bd02e920a3417689a89887b39ad1e350b562f9955693d900c40 +PYTHON_AIOHAPPYEYEBALLS_SITE = https://files.pythonhosted.org/packages/26/30/f84a107a9c4331c14b2b586036f40965c128aa4fee4dda5d3d51cb14ad54 PYTHON_AIOHAPPYEYEBALLS_SETUP_TYPE = poetry PYTHON_AIOHAPPYEYEBALLS_LICENSE = PSF-2.0 PYTHON_AIOHAPPYEYEBALLS_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-cors/python-aiohttp-cors.hash b/package/python-aiohttp-cors/python-aiohttp-cors.hash index 29ae2d7909..5428fc826e 100644 --- a/package/python-aiohttp-cors/python-aiohttp-cors.hash +++ b/package/python-aiohttp-cors/python-aiohttp-cors.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp_cors/json -md5 de3940a901b269be82c8bd9f28d53ff0 aiohttp-cors-0.7.0.tar.gz -sha256 4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d aiohttp-cors-0.7.0.tar.gz +md5 bef1294f1ab08844eb35a56c7157026d aiohttp_cors-0.8.1.tar.gz +sha256 ccacf9cb84b64939ea15f859a146af1f662a6b1d68175754a07315e305fb1403 aiohttp_cors-0.8.1.tar.gz # Locally computed sha256 checksums -sha256 86cb2262ff825ce1c8b8fb9ea9f5174318badc3912639b9275fc25d0e305c556 LICENSE +sha256 c20f93f9891ddab8de9a4db5415d39c1d7d782174fe218b4c38ad78a771706e2 LICENSE diff --git a/package/python-aiohttp-cors/python-aiohttp-cors.mk b/package/python-aiohttp-cors/python-aiohttp-cors.mk index 27443540d0..5e5ae92645 100644 --- a/package/python-aiohttp-cors/python-aiohttp-cors.mk +++ b/package/python-aiohttp-cors/python-aiohttp-cors.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_CORS_VERSION = 0.7.0 -PYTHON_AIOHTTP_CORS_SOURCE = aiohttp-cors-$(PYTHON_AIOHTTP_CORS_VERSION).tar.gz -PYTHON_AIOHTTP_CORS_SITE = https://files.pythonhosted.org/packages/44/9e/6cdce7c3f346d8fd487adf68761728ad8cd5fbc296a7b07b92518350d31f +PYTHON_AIOHTTP_CORS_VERSION = 0.8.1 +PYTHON_AIOHTTP_CORS_SOURCE = aiohttp_cors-$(PYTHON_AIOHTTP_CORS_VERSION).tar.gz +PYTHON_AIOHTTP_CORS_SITE = https://files.pythonhosted.org/packages/6f/6d/d89e846a5444b3d5eb8985a6ddb0daef3774928e1bfbce8e84ec97b0ffa7 PYTHON_AIOHTTP_CORS_SETUP_TYPE = setuptools PYTHON_AIOHTTP_CORS_LICENSE = Apache-2.0 PYTHON_AIOHTTP_CORS_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index 8b8337e68e..1a69e55ca6 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/c2/c4/d73a PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE -PYTHON_AIOHTTP_SESSION_CPE_ID_VENDOR = aiohttp-session_project +PYTHON_AIOHTTP_SESSION_CPE_ID_VENDOR = aio-libs PYTHON_AIOHTTP_SESSION_CPE_ID_PRODUCT = aiohttp-session $(eval $(python-package)) diff --git a/package/python-aiohttp-sse-client/0001-setup.py-remove-pytest-runner-requirement.patch b/package/python-aiohttp-sse-client/0001-setup.py-remove-pytest-runner-requirement.patch new file mode 100644 index 0000000000..59fc775f0f --- /dev/null +++ b/package/python-aiohttp-sse-client/0001-setup.py-remove-pytest-runner-requirement.patch @@ -0,0 +1,37 @@ +From fdba1f12843d0fdbd5094144a8081244b71b2cf0 Mon Sep 17 00:00:00 2001 +From: Arno Messiaen +Date: Wed, 22 Nov 2023 08:12:08 +0100 +Subject: [PATCH] setup.py: remove pytest-runner requirement + +setup.py: pytest-runner is not required to install the package + +Upstream: N/A, Buildroot packaging related +Signed-off-by: Arno Messiaen +--- + setup.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 062bb08..f19bc0a 100644 +--- a/setup.py ++++ b/setup.py +@@ -13,8 +13,6 @@ with open('HISTORY.rst') as history_file: + + requirements = ['aiohttp>=3', 'attrs', 'multidict', 'yarl', ] + +-setup_requirements = ['pytest-runner', ] +- + test_requirements = ['pytest', ] + + setup( +@@ -41,7 +39,6 @@ setup( + keywords='aiohttp_sse_client', + name='aiohttp-sse-client', + packages=find_packages(include=['aiohttp_sse_client']), +- setup_requires=setup_requirements, + test_suite='tests', + tests_require=test_requirements, + url='https://github.com/rtfol/aiohttp-sse-client', +-- +2.40.1 + diff --git a/package/python-aiohttp-sse-client/Config.in b/package/python-aiohttp-sse-client/Config.in new file mode 100644 index 0000000000..2a89791b99 --- /dev/null +++ b/package/python-aiohttp-sse-client/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_AIOHTTP_SSE_CLIENT + bool "python-aiohttp-sse-client" + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + select BR2_PACKAGE_PYTHON_YARL # runtime + help + Server-sent events client support for aiohttp. + + https://github.com/rtfol/aiohttp-sse-client diff --git a/package/python-aiohttp-sse-client/python-aiohttp-sse-client.hash b/package/python-aiohttp-sse-client/python-aiohttp-sse-client.hash new file mode 100644 index 0000000000..5a1d240777 --- /dev/null +++ b/package/python-aiohttp-sse-client/python-aiohttp-sse-client.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiohttp-sse-client/json +md5 d9065bf151fbb485a175ae453a9a5f9f aiohttp-sse-client-0.2.1.tar.gz +sha256 5004e29271624af586158dc7166cb0687a7a5997aab5b808f4b53400e1b72e3b aiohttp-sse-client-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 44c346abc42b39f1390e4747adfd60a3ca349e01462965e5750ae531299b8ff1 LICENSE diff --git a/package/python-aiohttp-sse-client/python-aiohttp-sse-client.mk b/package/python-aiohttp-sse-client/python-aiohttp-sse-client.mk new file mode 100644 index 0000000000..4feae517ae --- /dev/null +++ b/package/python-aiohttp-sse-client/python-aiohttp-sse-client.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiohttp-sse-client +# +################################################################################ + +PYTHON_AIOHTTP_SSE_CLIENT_VERSION = 0.2.1 +PYTHON_AIOHTTP_SSE_CLIENT_SOURCE = aiohttp-sse-client-$(PYTHON_AIOHTTP_SSE_CLIENT_VERSION).tar.gz +PYTHON_AIOHTTP_SSE_CLIENT_SITE = https://files.pythonhosted.org/packages/71/c3/4825c5f37909a70c8018924b3d521847dd7acf1fce7e1054574bafed2271 +PYTHON_AIOHTTP_SSE_CLIENT_SETUP_TYPE = setuptools +PYTHON_AIOHTTP_SSE_CLIENT_LICENSE = Apache-2.0 +PYTHON_AIOHTTP_SSE_CLIENT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 01a1ed8a3d..08883316d8 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP select BR2_PACKAGE_PYTHON_BROTLI # runtime select BR2_PACKAGE_PYTHON_FROZENLIST # runtime select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + select BR2_PACKAGE_PYTHON_PROPCACHE # runtime select BR2_PACKAGE_PYTHON_YARL # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index fd3ca7d72a..0aa8dbd3bc 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 fa0526dab4bf4b755537ae5718a43e25 aiohttp-3.10.10.tar.gz -sha256 0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a aiohttp-3.10.10.tar.gz +md5 4ed66dcec63108ae3a7c01d0415b4dd9 aiohttp-3.12.14.tar.gz +sha256 6e06e120e34d93100de448fd941522e11dafa78ef1a893c179901b7d66aa29f2 aiohttp-3.12.14.tar.gz # Locally computed sha256 checksums sha256 9f80d0db7d755a941db4572172c270ecbd8f082ba215ddd095985942ed94a9eb LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 17eeae72b3..7070d00cec 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,13 +4,15 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.10.10 +PYTHON_AIOHTTP_VERSION = 3.12.14 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/17/7e/16e57e6cf20eb62481a2f9ce8674328407187950ccc602ad07c685279141 +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/e6/0b/e39ad954107ebf213a2325038a3e7a506be3d98e1435e1f82086eec4cde2 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp +PYTHON_AIOHTTP_DEPENDENCIES = host-python-pkgconfig + $(eval $(python-package)) diff --git a/package/python-aiojobs/python-aiojobs.hash b/package/python-aiojobs/python-aiojobs.hash index d5721dc6d0..b37c0c2a8c 100644 --- a/package/python-aiojobs/python-aiojobs.hash +++ b/package/python-aiojobs/python-aiojobs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiojobs/json -md5 efad80daa647b6346258f1027da44c8b aiojobs-1.3.0.tar.gz -sha256 03074c884b3dc388b8d798c0de24ec17d72b2799018497fda8062c0431a494b5 aiojobs-1.3.0.tar.gz +md5 62057a870d80ed0d9ebe951ba3457cff aiojobs-1.4.0.tar.gz +sha256 463665c75d1fcc46c78d44375c1034abf5e3f087894b0fc5ec4dd16ef90fdc98 aiojobs-1.4.0.tar.gz # Locally computed sha256 checksums sha256 1803dc89455114eefad3b827543343edc2452432fdac29b5edc66c8b66d4cbf3 LICENSE diff --git a/package/python-aiojobs/python-aiojobs.mk b/package/python-aiojobs/python-aiojobs.mk index e8ada82305..e0dff3fbe8 100644 --- a/package/python-aiojobs/python-aiojobs.mk +++ b/package/python-aiojobs/python-aiojobs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOJOBS_VERSION = 1.3.0 +PYTHON_AIOJOBS_VERSION = 1.4.0 PYTHON_AIOJOBS_SOURCE = aiojobs-$(PYTHON_AIOJOBS_VERSION).tar.gz -PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/c4/0b/d612a769c28bd22bcc52b369a9a10c63eb6e7b5e2e0cfb35e3be7357fe29 +PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/03/54/751969398e2039b4dc458fa153dc066a0f7337a5b480d58944f59b7b38ae PYTHON_AIOJOBS_SETUP_TYPE = setuptools PYTHON_AIOJOBS_LICENSE = Apache-2.0 PYTHON_AIOJOBS_LICENSE_FILES = LICENSE diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in index 9f3787f9b3..dbe0f133dc 100644 --- a/package/python-aiomonitor/Config.in +++ b/package/python-aiomonitor/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_AIOMONITOR select BR2_PACKAGE_PYTHON_JANUS # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime + select BR2_PACKAGE_PYTHON_TELNETLIB3 # runtime select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime select BR2_PACKAGE_PYTHON_TRAFARET # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-aiomonitor/python-aiomonitor.hash b/package/python-aiomonitor/python-aiomonitor.hash index f1c0e37667..fb8300fd0d 100644 --- a/package/python-aiomonitor/python-aiomonitor.hash +++ b/package/python-aiomonitor/python-aiomonitor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiomonitor/json -md5 75fc8f84c0ff385931d76c46265cfc0d aiomonitor-0.7.0.tar.gz -sha256 109b9ad309a44c0c5db1219d106f4062615151ad3f0e288a0c104fbb004d0398 aiomonitor-0.7.0.tar.gz +md5 e5b17b3baccb6e2b709bd85ab3faee32 aiomonitor-0.7.1.tar.gz +sha256 beb1f14429bc4a3135bbac32381d242fe2019d74fcf9c86d3f4bd7405dc562e4 aiomonitor-0.7.1.tar.gz # Locally computed sha256 checksums sha256 98397c300949e0cc1ddc68b0e48e67b10f2d0a4ffada4903d891a1315fe04156 LICENSE diff --git a/package/python-aiomonitor/python-aiomonitor.mk b/package/python-aiomonitor/python-aiomonitor.mk index 8eaddcbfa6..824208ac79 100644 --- a/package/python-aiomonitor/python-aiomonitor.mk +++ b/package/python-aiomonitor/python-aiomonitor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOMONITOR_VERSION = 0.7.0 +PYTHON_AIOMONITOR_VERSION = 0.7.1 PYTHON_AIOMONITOR_SOURCE = aiomonitor-$(PYTHON_AIOMONITOR_VERSION).tar.gz -PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/50/30/1d903b716489c2b5d0a92baccf172f972e97c2de94d4ea41c154287e9b60 +PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/28/0a/805797608db4e30ab588b283137b5b2a735655c20df72f2f9bac41da789e PYTHON_AIOMONITOR_SETUP_TYPE = setuptools PYTHON_AIOMONITOR_LICENSE = Apache-2.0 PYTHON_AIOMONITOR_LICENSE_FILES = LICENSE diff --git a/package/python-aiomqtt/python-aiomqtt.hash b/package/python-aiomqtt/python-aiomqtt.hash index 12ea86d538..eab5a1938f 100644 --- a/package/python-aiomqtt/python-aiomqtt.hash +++ b/package/python-aiomqtt/python-aiomqtt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiomqtt/json -md5 e23feb8ad69a1ae3a9701fb1f3c03a3c aiomqtt-2.3.0.tar.gz -sha256 312feebe20bc76dc7c20916663011f3bd37aa6f42f9f687a19a1c58308d80d47 aiomqtt-2.3.0.tar.gz +md5 9ded3fea036dc979d7855a6b3fd1dc33 aiomqtt-2.4.0.tar.gz +sha256 ab0f18fc5b7ffaa57451c407417d674db837b00a9c7d953cccd02be64f046c17 aiomqtt-2.4.0.tar.gz # Locally computed sha256 checksums sha256 2cdee9e997c759749069649dfb9060fdb885da82bc50c0dcb4841b1dcab0b032 LICENSE diff --git a/package/python-aiomqtt/python-aiomqtt.mk b/package/python-aiomqtt/python-aiomqtt.mk index 291547f11f..c5b932838d 100644 --- a/package/python-aiomqtt/python-aiomqtt.mk +++ b/package/python-aiomqtt/python-aiomqtt.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_AIOMQTT_VERSION = 2.3.0 +PYTHON_AIOMQTT_VERSION = 2.4.0 PYTHON_AIOMQTT_SOURCE = aiomqtt-$(PYTHON_AIOMQTT_VERSION).tar.gz -PYTHON_AIOMQTT_SITE = https://files.pythonhosted.org/packages/db/c9/168e78bd35b21d9bdbb26178db33a8f265e4a69bb4193e72434e7cb3d1cd -PYTHON_AIOMQTT_SETUP_TYPE = pep517 +PYTHON_AIOMQTT_SITE = https://files.pythonhosted.org/packages/45/9a/863bc34c64bc4acb9720a9950bfc77d6f324640cdf1f420bb5d9ee624975 +PYTHON_AIOMQTT_SETUP_TYPE = hatch PYTHON_AIOMQTT_LICENSE = BSD-3-Clause PYTHON_AIOMQTT_LICENSE_FILES = LICENSE -PYTHON_AIOMQTT_DEPENDENCIES = host-python-poetry-dynamic-versioning $(eval $(python-package)) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index 50a670280f..6ba5269c16 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 669ff2887392cfa393205cea23661c2f aiorwlock-1.4.0.tar.gz -sha256 4cea5bec4e9d03533a26919299394822a1422aa519bca9dd09178ec490f8d1cc aiorwlock-1.4.0.tar.gz +md5 094d8676f4fa812ab35225e3737edbc8 aiorwlock-1.5.0.tar.gz +sha256 b529da24da659bdedcf68faf216595bde00db228c905197ac554773620e7fd2f aiorwlock-1.5.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index 4209ae407c..7f41b50442 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.4.0 +PYTHON_AIORWLOCK_VERSION = 1.5.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/ba/c5/882b4c89d71d6f9c7d0d8dee18d267025e71d4c3241eb3b16ab39105a0d1 -PYTHON_AIORWLOCK_SETUP_TYPE = setuptools +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/c5/bf/d1ddcd676be027a963b3b01fdf9915daf4590b4dfd03bf1c8c2858aac7e3 +PYTHON_AIORWLOCK_SETUP_TYPE = poetry PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index 061816a66e..d4e5f9ad5f 100644 --- a/package/python-aiosignal/python-aiosignal.hash +++ b/package/python-aiosignal/python-aiosignal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosignal/json -md5 2a15f4008b899377590cef4773020902 aiosignal-1.3.1.tar.gz -sha256 54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc aiosignal-1.3.1.tar.gz +md5 9c692735b1422a94f16bd066ebf1fb7c aiosignal-1.4.0.tar.gz +sha256 f47eecd9468083c2029cc99945502cb7708b082c232f9aca65da147157b251c7 aiosignal-1.4.0.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-aiosignal/python-aiosignal.mk b/package/python-aiosignal/python-aiosignal.mk index ffd581cfba..f143558d70 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.3.1 +PYTHON_AIOSIGNAL_VERSION = 1.4.0 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ae/67/0952ed97a9793b4958e5736f6d2b346b414a2cd63e82d05940032f45b32f +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/61/62/06741b579156360248d1ec624842ad0edf697050bbaf7c3e46394e106ad1 PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash index 52c78a7630..eed222f80f 100644 --- a/package/python-aiosqlite/python-aiosqlite.hash +++ b/package/python-aiosqlite/python-aiosqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiosqlite/json -md5 22620fe09bc9d9df3bffef19919eed7f aiosqlite-0.20.0.tar.gz -sha256 6d35c8c256637f4672f843c31021464090805bf925385ac39473fb16eaaca3d7 aiosqlite-0.20.0.tar.gz +md5 693b491a6ad7caa281618a83bf83ddc6 aiosqlite-0.21.0.tar.gz +sha256 131bb8056daa3bc875608c631c678cda73922a2d4ba8aec373b19f18c17e7aa3 aiosqlite-0.21.0.tar.gz # Locally computed sha256 checksums sha256 ab0c171dc3ef8bf325a84bb77d855421f2611335ddf6e08816b2922c4edc0f76 LICENSE diff --git a/package/python-aiosqlite/python-aiosqlite.mk b/package/python-aiosqlite/python-aiosqlite.mk index a48d676c69..bdb222001e 100644 --- a/package/python-aiosqlite/python-aiosqlite.mk +++ b/package/python-aiosqlite/python-aiosqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOSQLITE_VERSION = 0.20.0 +PYTHON_AIOSQLITE_VERSION = 0.21.0 PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz -PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/0d/3a/22ff5415bf4d296c1e92b07fd746ad42c96781f13295a074d58e77747848 +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/13/7d/8bca2bf9a247c2c5dfeec1d7a5f40db6518f88d314b8bca9da29670d2671 PYTHON_AIOSQLITE_SETUP_TYPE = flit PYTHON_AIOSQLITE_LICENSE = MIT PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index 5f20b18be0..a8ed0dc92e 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 a12686c41704218fdb29f140be75cdfd alembic-1.14.0.tar.gz -sha256 b00892b53b3642d0b8dbedba234dbf1924b69be83a9a769d5a624b01094e304b alembic-1.14.0.tar.gz +md5 5499d3918aec406a1903aed530f7e2a4 alembic-1.16.4.tar.gz +sha256 efab6ada0dd0fae2c92060800e0bf5c1dc26af15a10e02fb4babff164b4725e2 alembic-1.16.4.tar.gz # Locally computed sha256 checksums -sha256 ce19e7ba2b77ca584b82a6792856e138eb30b311c896b076c09a405ee45fbee9 LICENSE +sha256 35ea9c3419b261faf1be448c4f47d9255281bf6b36b5ffea55052227d4ba54de LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index 5050765db1..8dbbd0c7d8 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.14.0 +PYTHON_ALEMBIC_VERSION = 1.16.4 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/00/1e/8cb8900ba1b6360431e46fb7a89922916d3a1b017a8908a7c0499cc7e5f6 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/83/52/72e791b75c6b1efa803e491f7cbab78e963695e76d4ada05385252927e76 PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE diff --git a/package/python-aniso8601/Config.in b/package/python-aniso8601/Config.in new file mode 100644 index 0000000000..234c36d0a3 --- /dev/null +++ b/package/python-aniso8601/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ANISO8601 + bool "python-aniso8601" + help + A library for parsing ISO 8601 strings. + + https://codeberg.org/nielsenb-jf/aniso8601 diff --git a/package/python-aniso8601/python-aniso8601.hash b/package/python-aniso8601/python-aniso8601.hash new file mode 100644 index 0000000000..9a33f9f9d4 --- /dev/null +++ b/package/python-aniso8601/python-aniso8601.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aniso8601/json +md5 ea9bb2b816aa448078d91aea3ce43d55 aniso8601-10.0.1.tar.gz +sha256 25488f8663dd1528ae1f54f94ac1ea51ae25b4d531539b8bc707fed184d16845 aniso8601-10.0.1.tar.gz +# Locally computed sha256 checksums +sha256 c3cca0b9a74fd29668bd99b5dcf0274d53be904de6778916dc852708f407b0f0 LICENSE diff --git a/package/python-aniso8601/python-aniso8601.mk b/package/python-aniso8601/python-aniso8601.mk new file mode 100644 index 0000000000..ed0230a0c3 --- /dev/null +++ b/package/python-aniso8601/python-aniso8601.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aniso8601 +# +################################################################################ + +PYTHON_ANISO8601_VERSION = 10.0.1 +PYTHON_ANISO8601_SOURCE = aniso8601-$(PYTHON_ANISO8601_VERSION).tar.gz +PYTHON_ANISO8601_SITE = https://files.pythonhosted.org/packages/8b/8d/52179c4e3f1978d3d9a285f98c706642522750ef343e9738286130423730 +PYTHON_ANISO8601_SETUP_TYPE = setuptools +PYTHON_ANISO8601_LICENSE = BSD-3-Clause +PYTHON_ANISO8601_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-anyio/python-anyio.hash b/package/python-anyio/python-anyio.hash index cfd65ee92f..f93986fb9d 100644 --- a/package/python-anyio/python-anyio.hash +++ b/package/python-anyio/python-anyio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/anyio/json -md5 3aae01d9007bd08538158c7a7fa18c39 anyio-4.6.2.post1.tar.gz -sha256 4c8bc31ccdb51c7f7bd251f51c609e038d63e34219b44aa86e47576389880b4c anyio-4.6.2.post1.tar.gz +md5 9bbd9262979f576a9023389e48204037 anyio-4.11.0.tar.gz +sha256 82a8d0b81e318cc5ce71a5f1f8b5c4e63619620b63141ef8c995fa0db95a57c4 anyio-4.11.0.tar.gz # Locally computed sha256 checksums sha256 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0 LICENSE diff --git a/package/python-anyio/python-anyio.mk b/package/python-anyio/python-anyio.mk index 74c49c2e73..431eb5f286 100644 --- a/package/python-anyio/python-anyio.mk +++ b/package/python-anyio/python-anyio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ANYIO_VERSION = 4.6.2.post1 +PYTHON_ANYIO_VERSION = 4.11.0 PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz -PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/9f/09/45b9b7a6d4e45c6bcb5bf61d19e3ab87df68e0601fa8c5293de3542546cc +PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/c6/78/7d432127c41b50bccba979505f272c16cbcadcc33645d5fa3a738110ae75 PYTHON_ANYIO_SETUP_TYPE = setuptools PYTHON_ANYIO_LICENSE = MIT PYTHON_ANYIO_LICENSE_FILES = LICENSE diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash index ee6c422433..ecf9b56954 100644 --- a/package/python-apispec/python-apispec.hash +++ b/package/python-apispec/python-apispec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/apispec/json -md5 0ace01922cd42fc19da5e597df73b631 apispec-6.7.1.tar.gz -sha256 c01b8b6ff40ffedf55b79a67f9dd920e9b2fc3909aae116facf6c8372a08b933 apispec-6.7.1.tar.gz +md5 aaec05af7368f2e19f562a63f00e2e74 apispec-6.8.1.tar.gz +sha256 f4916cbb7be156963b18f5929a0e42bd2349135834b680a81b12432bcfaa9a39 apispec-6.8.1.tar.gz # Locally computed sha256 checksums sha256 f345555ff39d6b573342781a6346a5202a8f14bce424fee41f910c6c5379cc7d LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk index 168d3890ce..3b87ccdced 100644 --- a/package/python-apispec/python-apispec.mk +++ b/package/python-apispec/python-apispec.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_APISPEC_VERSION = 6.7.1 +PYTHON_APISPEC_VERSION = 6.8.1 PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz -PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/96/26/ef0e72400707469058a7536f64d4e00e1a1c07a179acd00fb7e424dc9330 +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/74/38/62499ad75cf085f5268458c09ae97007082ed85aec1a9cd9e38f7685fbb0 PYTHON_APISPEC_SETUP_TYPE = flit PYTHON_APISPEC_LICENSE = MIT PYTHON_APISPEC_LICENSE_FILES = LICENSE diff --git a/package/python-appdirs/python-appdirs.mk b/package/python-appdirs/python-appdirs.mk index 222aadbb29..3ecf281db0 100644 --- a/package/python-appdirs/python-appdirs.mk +++ b/package/python-appdirs/python-appdirs.mk @@ -12,3 +12,4 @@ PYTHON_APPDIRS_LICENSE = MIT PYTHON_APPDIRS_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-apscheduler/Config.in b/package/python-apscheduler/Config.in new file mode 100644 index 0000000000..ebb9b13cfa --- /dev/null +++ b/package/python-apscheduler/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_APSCHEDULER + bool "python-apscheduler" + select BR2_PACKAGE_PYTHON_TZLOCAL # runtime + help + Task scheduling library for Python. + + https://apscheduler.readthedocs.io diff --git a/package/python-apscheduler/python-apscheduler.hash b/package/python-apscheduler/python-apscheduler.hash new file mode 100644 index 0000000000..1f2ba1f82e --- /dev/null +++ b/package/python-apscheduler/python-apscheduler.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/apscheduler/json +md5 1705663d09aeb1b174f964780c57520a apscheduler-3.11.0.tar.gz +sha256 4c622d250b0955a65d5d0eb91c33e6d43fd879834bf541e0a18661ae60460133 apscheduler-3.11.0.tar.gz +# Locally computed sha256 checksums +sha256 6163f7987dfb38d6bc320ce2b70b2f02b862bc41126516d552ef1cd43247e758 LICENSE.txt diff --git a/package/python-apscheduler/python-apscheduler.mk b/package/python-apscheduler/python-apscheduler.mk new file mode 100644 index 0000000000..c5d89c5c2d --- /dev/null +++ b/package/python-apscheduler/python-apscheduler.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-apscheduler +# +################################################################################ + +PYTHON_APSCHEDULER_VERSION = 3.11.0 +PYTHON_APSCHEDULER_SOURCE = apscheduler-$(PYTHON_APSCHEDULER_VERSION).tar.gz +PYTHON_APSCHEDULER_SITE = https://files.pythonhosted.org/packages/4e/00/6d6814ddc19be2df62c8c898c4df6b5b1914f3bd024b780028caa392d186 +PYTHON_APSCHEDULER_SETUP_TYPE = setuptools +PYTHON_APSCHEDULER_DEPENDENCIES = host-python-setuptools-scm +PYTHON_APSCHEDULER_LICENSE = MIT +PYTHON_APSCHEDULER_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-argcomplete/python-argcomplete.hash b/package/python-argcomplete/python-argcomplete.hash index 73ee60f268..2ff7631eba 100644 --- a/package/python-argcomplete/python-argcomplete.hash +++ b/package/python-argcomplete/python-argcomplete.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/argcomplete/json -md5 d41f3c39f4be81d29bb6166e8e57116a argcomplete-3.5.1.tar.gz -sha256 eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4 argcomplete-3.5.1.tar.gz +md5 28fb9dace31a5d6ff98c686d9914d3b7 argcomplete-3.5.3.tar.gz +sha256 c12bf50eded8aebb298c7b7da7a5ff3ee24dffd9f5281867dfe1424b58c55392 argcomplete-3.5.3.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.rst diff --git a/package/python-argcomplete/python-argcomplete.mk b/package/python-argcomplete/python-argcomplete.mk index 0118cbb9d6..1c78d880c8 100644 --- a/package/python-argcomplete/python-argcomplete.mk +++ b/package/python-argcomplete/python-argcomplete.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_ARGCOMPLETE_VERSION = 3.5.1 +PYTHON_ARGCOMPLETE_VERSION = 3.5.3 PYTHON_ARGCOMPLETE_SOURCE = argcomplete-$(PYTHON_ARGCOMPLETE_VERSION).tar.gz -PYTHON_ARGCOMPLETE_SITE = https://files.pythonhosted.org/packages/5f/39/27605e133e7f4bb0c8e48c9a6b87101515e3446003e0442761f6a02ac35e -PYTHON_ARGCOMPLETE_SETUP_TYPE = setuptools +PYTHON_ARGCOMPLETE_SITE = https://files.pythonhosted.org/packages/0c/be/6c23d80cb966fb8f83fb1ebfb988351ae6b0554d0c3a613ee4531c026597 +PYTHON_ARGCOMPLETE_SETUP_TYPE = hatch PYTHON_ARGCOMPLETE_LICENSE = Apache-2.0 PYTHON_ARGCOMPLETE_LICENSE_FILES = LICENSE.rst -PYTHON_ARGCOMPLETE_DEPENDENCIES = host-python-setuptools-scm +PYTHON_ARGCOMPLETE_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-asgiref/Config.in b/package/python-asgiref/Config.in index d0b816c369..c56de97e6b 100644 --- a/package/python-asgiref/Config.in +++ b/package/python-asgiref/Config.in @@ -11,4 +11,4 @@ config BR2_PACKAGE_PYTHON_ASGIREF - Server base classes, asgiref.server - A WSGI-to-ASGI adapter, in asgiref.wsgi - http://github.com/django/asgiref/ + https://github.com/django/asgiref/ diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index e3157c3e11..4605835abb 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 fb2927e26ea34c97e0a4c89612e80562 asgiref-3.8.1.tar.gz -sha256 c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590 asgiref-3.8.1.tar.gz +md5 6799fce19314e0aaeb789a6d0f6d45fa asgiref-3.10.0.tar.gz +sha256 d89f2d8cd8b56dada7d52fa7dc8075baa08fb836560710d38c292a7a3f78c04e asgiref-3.10.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index 0725ad6e38..3bd9c8f937 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.8.1 +PYTHON_ASGIREF_VERSION = 3.10.0 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/29/38/b3395cc9ad1b56d2ddac9970bc8f4141312dbaec28bc7c218b0dfafd0f42 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/46/08/4dfec9b90758a59acc6be32ac82e98d1fbfc321cb5cfa410436dbacf821c PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/package/python-asttokens/Config.in b/package/python-asttokens/Config.in index 2732b8124b..66c46bb013 100644 --- a/package/python-asttokens/Config.in +++ b/package/python-asttokens/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASTTOKENS bool "python-asttokens" - select BR2_PACKAGE_PYTHON_SIX # runtime help Annotate AST trees with source code positions. diff --git a/package/python-asttokens/python-asttokens.hash b/package/python-asttokens/python-asttokens.hash index 9042c3002d..a8b552913b 100644 --- a/package/python-asttokens/python-asttokens.hash +++ b/package/python-asttokens/python-asttokens.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asttokens/json -md5 c353679585a40f43c24ca60fca33bbf6 asttokens-2.4.1.tar.gz -sha256 b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0 asttokens-2.4.1.tar.gz +md5 7d99c4c80190c3ba64839138ea827970 asttokens-3.0.0.tar.gz +sha256 0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7 asttokens-3.0.0.tar.gz # Locally computed sha256 checksums sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/python-asttokens/python-asttokens.mk b/package/python-asttokens/python-asttokens.mk index 4806d17915..327ee6af91 100644 --- a/package/python-asttokens/python-asttokens.mk +++ b/package/python-asttokens/python-asttokens.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASTTOKENS_VERSION = 2.4.1 +PYTHON_ASTTOKENS_VERSION = 3.0.0 PYTHON_ASTTOKENS_SOURCE = asttokens-$(PYTHON_ASTTOKENS_VERSION).tar.gz -PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/45/1d/f03bcb60c4a3212e15f99a56085d93093a497718adf828d050b9d675da81 +PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/4a/e7/82da0a03e7ba5141f05cce0d302e6eed121ae055e0456ca228bf693984bc PYTHON_ASTTOKENS_SETUP_TYPE = setuptools PYTHON_ASTTOKENS_LICENSE = Apache-2.0 PYTHON_ASTTOKENS_LICENSE_FILES = LICENSE diff --git a/package/python-async-lru/python-async-lru.hash b/package/python-async-lru/python-async-lru.hash index 0a7cd03be9..8f296ce1ee 100644 --- a/package/python-async-lru/python-async-lru.hash +++ b/package/python-async-lru/python-async-lru.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-lru/json -md5 cd57e4d7f51bcbe2b940c523a5851b40 async-lru-2.0.4.tar.gz -sha256 b8a59a5df60805ff63220b2a0c5b5393da5521b113cd5465a44eb037d81a5627 async-lru-2.0.4.tar.gz +md5 c972e8755626506ca019085e0620e192 async_lru-2.0.5.tar.gz +sha256 481d52ccdd27275f42c43a928b4a50c3bfb2d67af4e78b170e3e0bb39c66e5bb async_lru-2.0.5.tar.gz # Locally computed sha256 checksums sha256 ea65975679bc2093be925d520358e41096bd96fddedee3e929160a5faadcf573 LICENSE diff --git a/package/python-async-lru/python-async-lru.mk b/package/python-async-lru/python-async-lru.mk index 16c6a32ffd..d80a8dfb6c 100644 --- a/package/python-async-lru/python-async-lru.mk +++ b/package/python-async-lru/python-async-lru.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_LRU_VERSION = 2.0.4 -PYTHON_ASYNC_LRU_SOURCE = async-lru-$(PYTHON_ASYNC_LRU_VERSION).tar.gz -PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/80/e2/2b4651eff771f6fd900d233e175ddc5e2be502c7eb62c0c42f975c6d36cd +PYTHON_ASYNC_LRU_VERSION = 2.0.5 +PYTHON_ASYNC_LRU_SOURCE = async_lru-$(PYTHON_ASYNC_LRU_VERSION).tar.gz +PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/b2/4d/71ec4d3939dc755264f680f6c2b4906423a304c3d18e96853f0a595dfe97 PYTHON_ASYNC_LRU_SETUP_TYPE = setuptools PYTHON_ASYNC_LRU_LICENSE = MIT PYTHON_ASYNC_LRU_LICENSE_FILES = LICENSE diff --git a/package/python-asyncclick/Config.in b/package/python-asyncclick/Config.in new file mode 100644 index 0000000000..7147803d23 --- /dev/null +++ b/package/python-asyncclick/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ASYNCCLICK + bool "python-asyncclick" + help + Composable command line interface toolkit, async version. + + https://palletsprojects.com/p/click/ diff --git a/package/python-asyncclick/python-asyncclick.hash b/package/python-asyncclick/python-asyncclick.hash new file mode 100644 index 0000000000..1a2603d2aa --- /dev/null +++ b/package/python-asyncclick/python-asyncclick.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/asyncclick/json +md5 3c8af1a8b6151c24a102e5ed891d19d1 asyncclick-8.2.2.2.tar.gz +sha256 014f6b7bfb1ef34a2215bc36aebd5150d5d2e50668b12eceb749961e32c24660 asyncclick-8.2.2.2.tar.gz +# Locally computed sha256 checksums +sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.txt diff --git a/package/python-asyncclick/python-asyncclick.mk b/package/python-asyncclick/python-asyncclick.mk new file mode 100644 index 0000000000..d413242def --- /dev/null +++ b/package/python-asyncclick/python-asyncclick.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-asyncclick +# +################################################################################ + +PYTHON_ASYNCCLICK_VERSION = 8.2.2.2 +PYTHON_ASYNCCLICK_SOURCE = asyncclick-$(PYTHON_ASYNCCLICK_VERSION).tar.gz +PYTHON_ASYNCCLICK_SITE = https://files.pythonhosted.org/packages/35/51/b01dd77c9a14fb0b312d799fd8c10b145b882535dbaa9ac055a52515b390 +PYTHON_ASYNCCLICK_SETUP_TYPE = flit +PYTHON_ASYNCCLICK_LICENSE = BSD-3-Clause +PYTHON_ASYNCCLICK_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-asyncssh/python-asyncssh.hash b/package/python-asyncssh/python-asyncssh.hash index d3c2f642bd..e484386cab 100644 --- a/package/python-asyncssh/python-asyncssh.hash +++ b/package/python-asyncssh/python-asyncssh.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/asyncssh/json -md5 9c61e713b1630f62aa1a690744573e1b asyncssh-2.18.0.tar.gz -sha256 1a322161c01f60b9719dc8f39f80db71e61f3f5e04abbc3420ce503126d87123 asyncssh-2.18.0.tar.gz +md5 367f96d0ad12d7a3a44d6b1c4e7c6b8b asyncssh-2.21.1.tar.gz +sha256 9943802955e2131536c2b1e71aacc68f56973a399937ed0b725086d7461c990c asyncssh-2.21.1.tar.gz # Locally computed sha256 checksums sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 LICENSE sha256 68c286b0cf4507bec8922103efe861adb0bd3218003b1ec1b25e2e64bdd76bd3 COPYRIGHT diff --git a/package/python-asyncssh/python-asyncssh.mk b/package/python-asyncssh/python-asyncssh.mk index 60a559f0b9..6fad7924c3 100644 --- a/package/python-asyncssh/python-asyncssh.mk +++ b/package/python-asyncssh/python-asyncssh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNCSSH_VERSION = 2.18.0 +PYTHON_ASYNCSSH_VERSION = 2.21.1 PYTHON_ASYNCSSH_SOURCE = asyncssh-$(PYTHON_ASYNCSSH_VERSION).tar.gz -PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/25/69/8ea398f5aa6ae8fa7d007feb262d83aa9304e4a6a1accf7a104b37fef97e +PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/6b/b8/065c20bb5c9b8991648c0f25b13e445b4f51556cc3fdd0ad13ce4787c156 PYTHON_ASYNCSSH_SETUP_TYPE = setuptools PYTHON_ASYNCSSH_LICENSE = EPL-2.0 or GPL-2.0+ PYTHON_ASYNCSSH_LICENSE_FILES = LICENSE COPYRIGHT diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 5cd15dbed7..95b0a63bca 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 031a41b703d7fc47ec204d0369b68dcd attrs-24.2.0.tar.gz -sha256 5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 attrs-24.2.0.tar.gz +md5 338069d6f69126086d589b2cb44f4c73 attrs-25.1.0.tar.gz +sha256 1c97078a80c814273a76b2a298a932eb681c87415c11dee0a6921de7f1b02c3e attrs-25.1.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index c0725cf847..74d0c2f8d1 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 24.2.0 +PYTHON_ATTRS_VERSION = 25.1.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/fc/0f/aafca9af9315aee06a89ffde799a10a582fe8de76c563ee80bbcdc08b3fb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/49/7c/fdf464bcc51d23881d110abd74b512a42b3d5d376a55a831b44c603ae17f PYTHON_ATTRS_SETUP_TYPE = hatch PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE diff --git a/package/python-autocommand/0001-Remove-license-declaration-and-rely-instead-on-Trove.patch b/package/python-autocommand/0001-Remove-license-declaration-and-rely-instead-on-Trove.patch new file mode 100644 index 0000000000..9e00269cb0 --- /dev/null +++ b/package/python-autocommand/0001-Remove-license-declaration-and-rely-instead-on-Trove.patch @@ -0,0 +1,29 @@ +From 4e54dc74f2d6f735cb187343f01c44693ea86f59 Mon Sep 17 00:00:00 2001 +From: "Jason R. Coombs" +Date: Thu, 4 Apr 2024 17:23:20 -0400 +Subject: [PATCH] Remove license declaration and rely instead on Trove + classifiers and LICENSE being included. + +Closes #32. + +Upstream: https://github.com/Lucretiel/autocommand/pull/33 +Signed-off-by: Thomas Petazzoni +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 41f86a1..d154562 100644 +--- a/setup.py ++++ b/setup.py +@@ -13,7 +13,6 @@ setup( + ], + package_dir={'': 'src'}, + platforms='any', +- license='LGPLv3', + author='Nathan West', + url='https://github.com/Lucretiel/autocommand', + description='A library to create a command-line program from a function', +-- +2.47.0 + diff --git a/package/python-automat/python-automat.hash b/package/python-automat/python-automat.hash index 4edc9f3f09..562c15dc63 100644 --- a/package/python-automat/python-automat.hash +++ b/package/python-automat/python-automat.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/automat/json -md5 c023f8848366053a76f99cffba3ea34e automat-24.8.1.tar.gz -sha256 b34227cf63f6325b8ad2399ede780675083e439b20c323d376373d8ee6306d88 automat-24.8.1.tar.gz +md5 a725256be8545c32048eb12239caeebb automat-25.4.16.tar.gz +sha256 0017591a5477066e90d26b0e696ddc143baafd87b588cfac8100bc6be9634de0 automat-25.4.16.tar.gz # Locally computed sha256 checksums sha256 b2201301678d0a937d938543827ca1360712eb34e23de8ee3f3bfffbd4c0e376 LICENSE diff --git a/package/python-automat/python-automat.mk b/package/python-automat/python-automat.mk index 85bc890fc5..807846b4af 100644 --- a/package/python-automat/python-automat.mk +++ b/package/python-automat/python-automat.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_AUTOMAT_VERSION = 24.8.1 +PYTHON_AUTOMAT_VERSION = 25.4.16 PYTHON_AUTOMAT_SOURCE = automat-$(PYTHON_AUTOMAT_VERSION).tar.gz -PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/8d/2d/ede4ad7fc34ab4482389fa3369d304f2fa22e50770af706678f6a332fa82 -PYTHON_AUTOMAT_SETUP_TYPE = setuptools +PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/e3/0f/d40bbe294bbf004d436a8bcbcfaadca8b5140d39ad0ad3d73d1a8ba15f14 +PYTHON_AUTOMAT_SETUP_TYPE = hatch PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE -PYTHON_AUTOMAT_DEPENDENCIES = host-python-setuptools-scm +PYTHON_AUTOMAT_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-bcrypt/python-bcrypt.hash b/package/python-bcrypt/python-bcrypt.hash index 6855047de6..029baab0ea 100644 --- a/package/python-bcrypt/python-bcrypt.hash +++ b/package/python-bcrypt/python-bcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 2385fd07301cf6d01befc1245d9310a97790492be76e388dd7c0d8de0409806f python-bcrypt-4.2.0-cargo2.tar.gz +sha256 f33b38de3883c173e1eb9426c99aca1379708ef5feac46bf749f4d36ecf9ed98 python-bcrypt-4.2.1-cargo4.tar.gz # Locally computed sha256 checksums sha256 8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90 LICENSE diff --git a/package/python-bcrypt/python-bcrypt.mk b/package/python-bcrypt/python-bcrypt.mk index 0654ea4730..cbbc7bcecf 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 4.2.0 +PYTHON_BCRYPT_VERSION = 4.2.1 PYTHON_BCRYPT_SOURCE_PYPI = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE_PYPI = https://files.pythonhosted.org/packages/e4/7e/d95e7d96d4828e965891af92e43b52a4cd3395dc1c1ef4ee62748d0471d0 +PYTHON_BCRYPT_SITE_PYPI = https://files.pythonhosted.org/packages/56/8c/dd696962612e4cd83c40a9e6b3db77bfe65a830f4b9af44098708584686c PYTHON_BCRYPT_SITE = $(PYTHON_BCRYPT_SITE_PYPI)/$(PYTHON_BCRYPT_SOURCE_PYPI)?buildroot-path=filename PYTHON_BCRYPT_SETUP_TYPE = setuptools-rust PYTHON_BCRYPT_LICENSE = Apache-2.0 diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk index 0fc43e86a2..4fbed23863 100644 --- a/package/python-betterproto/python-betterproto.mk +++ b/package/python-betterproto/python-betterproto.mk @@ -10,5 +10,6 @@ PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/4e/94/930a1368 PYTHON_BETTERPROTO_SETUP_TYPE = poetry PYTHON_BETTERPROTO_LICENSE = MIT PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md +PYTHON_BETTERPROTO_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash index 1a75424e02..bcde731b60 100644 --- a/package/python-bitarray/python-bitarray.hash +++ b/package/python-bitarray/python-bitarray.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitarray/json -md5 2a23854c5c9c777625996456c9c88883 bitarray-3.0.0.tar.gz -sha256 a2083dc20f0d828a7cdf7a16b20dae56aab0f43dc4f347a3b3039f6577992b03 bitarray-3.0.0.tar.gz +md5 043d05ace953a31bee06a00f2c6c3a3d bitarray-3.7.2.tar.gz +sha256 27a59bb7c64c0d094057a3536e15fdd693f8520771ee75d9344b82d0a5ade2d0 bitarray-3.7.2.tar.gz # Locally computed sha256 checksums -sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE +sha256 a554c25090ad5a5ea8ad35629dacffbb4d887234b011550218a5a1f9090e5274 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk index 5f47976a41..1aec908619 100644 --- a/package/python-bitarray/python-bitarray.mk +++ b/package/python-bitarray/python-bitarray.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITARRAY_VERSION = 3.0.0 +PYTHON_BITARRAY_VERSION = 3.7.2 PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz -PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/85/62/dcfac53d22ef7e904ed10a8e710a36391d2d6753c34c869b51bfc5e4ad54 +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/e8/c1/644ea86b6f1a0864f656a3b3ee5bf8c29daa895cb3233942315fe065ea3a PYTHON_BITARRAY_SETUP_TYPE = setuptools PYTHON_BITARRAY_LICENSE = Python-2.0 PYTHON_BITARRAY_LICENSE_FILES = LICENSE diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index e1b66c76b0..517db883fb 100644 --- a/package/python-bitstring/python-bitstring.hash +++ b/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 5edecacd8fa0356601f7035977d0749e bitstring-4.2.3.tar.gz -sha256 e0c447af3fda0d114f77b88c2d199f02f97ee7e957e6d719f40f41cf15fbb897 bitstring-4.2.3.tar.gz +md5 83984560794188b0f1183e115890dd91 bitstring-4.3.1.tar.gz +sha256 a08bc09d3857216d4c0f412a1611056f1cc2b64fd254fb1e8a0afba7cfa1a95a bitstring-4.3.1.tar.gz # Locally computed sha256 checksums -sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE +sha256 4110041ff5b99a3b0f64d4aa0c426fb9bb4fb3de69cd4c847e634f8e99b2c6f0 LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index fcb40365d4..dc3796a829 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 4.2.3 +PYTHON_BITSTRING_VERSION = 4.3.1 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/d8/d0/d6f57409bb50f54fe2894ec5a50b5c04cb41aa814c3bdb8a7eeb4a0f7697 +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/15/a8/a80c890db75d5bdd5314b5de02c4144c7de94fd0cefcae51acaeb14c6a3f PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE diff --git a/package/python-bluezero/python-bluezero.hash b/package/python-bluezero/python-bluezero.hash index 150a384223..6cf334b08c 100644 --- a/package/python-bluezero/python-bluezero.hash +++ b/package/python-bluezero/python-bluezero.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bluezero/json -md5 8bace06486618fceca632aedc2733027 bluezero-0.9.0.tar.gz -sha256 2512935e094e3afd21ca9d4cb1b9aaa88a524e9538ae81305b2086f09f0eee17 bluezero-0.9.0.tar.gz +md5 2c567d4a6bf2bf03c9131b69695700ac bluezero-0.9.1.tar.gz +sha256 82488a9dc264f6114bb9727cc7e8939fa3a8d08fd71384cdab31419a80d25f97 bluezero-0.9.1.tar.gz # Locally computed sha256 checksums sha256 59319e80b4caa94ace4817c9f84aa16abc9d4d2b5f7866251b5fda92e87ccdef LICENSE diff --git a/package/python-bluezero/python-bluezero.mk b/package/python-bluezero/python-bluezero.mk index 81e7363fc7..071085c644 100644 --- a/package/python-bluezero/python-bluezero.mk +++ b/package/python-bluezero/python-bluezero.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLUEZERO_VERSION = 0.9.0 +PYTHON_BLUEZERO_VERSION = 0.9.1 PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz -PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/7b/9c/bfb3e1f92dd39bf3de8fc483a102bfae763fbf156177b77ed96b8a38bbb1 +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/ca/09/2aec91949397d15acb794648d65646e27f0e9f999a0da962e73023198663 PYTHON_BLUEZERO_SETUP_TYPE = setuptools PYTHON_BLUEZERO_LICENSE = MIT PYTHON_BLUEZERO_LICENSE_FILES = LICENSE diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index c274da5540..6a90235be8 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 ec76b10d3c22a3ff81420a3d443c3492 boto3-1.35.57.tar.gz -sha256 db58348849a5af061f0f5ec9c3b699da5221ca83354059fdccb798e3ddb6b62a boto3-1.35.57.tar.gz +md5 087797c051098511747e710a15f1ff5f boto3-1.40.50.tar.gz +sha256 ae34363e8f34a49ab130d10c507a611926c1101d5d14d70be5598ca308e13266 boto3-1.40.50.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index d0984f9f24..e343126e23 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.35.57 +PYTHON_BOTO3_VERSION = 1.40.50 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/c5/73/fb880ce301129a7116ff47b1aab1ca7427c7d63a163676701abc168309eb +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/ba/41/d4d73f55b367899ee377cd77c228748c18698ea3507c2a95b328f9152017 PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index 1076a748b2..2a4b75c67a 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 d317006e6032155bfd46a949cddbac72 botocore-1.35.57.tar.gz -sha256 d96306558085baf0bcb3b022d7a8c39c93494f031edb376694d2b2dcd0e81327 botocore-1.35.57.tar.gz +md5 26ac199c10a225d078ad4faf97398812 botocore-1.40.50.tar.gz +sha256 1d3d5b5759c9cb30202cd5ad231ec8afb1abe5be0c088a1707195c2cbae0e742 botocore-1.40.50.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index d8d410aea5..b81bca5ad8 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.35.57 +PYTHON_BOTOCORE_VERSION = 1.40.50 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/61/17/65b0a3bb507b19a7a1c6cc7c63e374906891798986f0ba2b6ad174ece86a +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/5b/66/21d9ac0d37e5c4e55171466351cfc77404d8d664ccc17d4add6dba1dee99 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-bsdiff4/python-bsdiff4.hash b/package/python-bsdiff4/python-bsdiff4.hash index 4b09dd132b..2ea2e83be6 100644 --- a/package/python-bsdiff4/python-bsdiff4.hash +++ b/package/python-bsdiff4/python-bsdiff4.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bsdiff4/json -md5 6fae66687d99305e2bf15887c9f80cf9 bsdiff4-1.2.5.tar.gz -sha256 cdd83f820ecb8f1ef67a4e5f0b152c61d327caf7abf35aa9a763413915b21368 bsdiff4-1.2.5.tar.gz +md5 7150cf7e21905b47f169a27355dfb529 bsdiff4-1.2.6.tar.gz +sha256 2ab57d01a78b39e29e5accc9cfead4130982ded9dccbc4261bd0e9c51d6b751d bsdiff4-1.2.6.tar.gz # Locally computed sha256 checksums -sha256 c6c921c90383f1c43beb53c49a652d28309a410a7c394c729fd8870271451cf0 LICENSE +sha256 44a0326b645fc642428a3978568d3a5c1061b503ce7fb7ef18fbc20be5476e2b LICENSE diff --git a/package/python-bsdiff4/python-bsdiff4.mk b/package/python-bsdiff4/python-bsdiff4.mk index 2b48bdb646..1b10b63913 100644 --- a/package/python-bsdiff4/python-bsdiff4.mk +++ b/package/python-bsdiff4/python-bsdiff4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BSDIFF4_VERSION = 1.2.5 +PYTHON_BSDIFF4_VERSION = 1.2.6 PYTHON_BSDIFF4_SOURCE = bsdiff4-$(PYTHON_BSDIFF4_VERSION).tar.gz -PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/43/49/262497fc308aa998d7431130cb8526b16aa43f2cca500d0182fb68689d99 +PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/53/b9/4559ede9a4c8c4451688303544da84654643fdc7f28790aca85be80b4b7c PYTHON_BSDIFF4_LICENSE = BSD-2-Clause, BSD-Protection (core.c) PYTHON_BSDIFF4_LICENSE_FILES = LICENSE PYTHON_BSDIFF4_CPE_ID_VENDOR = pypi diff --git a/package/python-cachelib/Config.in b/package/python-cachelib/Config.in new file mode 100644 index 0000000000..c17454c4be --- /dev/null +++ b/package/python-cachelib/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CACHELIB + bool "python-cachelib" + help + A collection of cache libraries in the same API interface. + + https://github.com/pallets-eco/cachelib/ diff --git a/package/python-cachelib/python-cachelib.hash b/package/python-cachelib/python-cachelib.hash new file mode 100644 index 0000000000..6a50350aa1 --- /dev/null +++ b/package/python-cachelib/python-cachelib.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/cachelib/json +md5 fc25e9c9165cd5fd42ce282c2ba540fd cachelib-0.13.0.tar.gz +sha256 209d8996e3c57595bee274ff97116d1d73c4980b2fd9a34c7846cd07fd2e1a48 cachelib-0.13.0.tar.gz +# Locally computed sha256 checksums +sha256 cd418120812dc2626281ae027e81b648229d166b5aca7472cecd510038d36e7d LICENSE.rst +sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-cachelib/python-cachelib.mk b/package/python-cachelib/python-cachelib.mk new file mode 100644 index 0000000000..7361a21f4f --- /dev/null +++ b/package/python-cachelib/python-cachelib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cachelib +# +################################################################################ + +PYTHON_CACHELIB_VERSION = 0.13.0 +PYTHON_CACHELIB_SOURCE = cachelib-$(PYTHON_CACHELIB_VERSION).tar.gz +PYTHON_CACHELIB_SITE = https://files.pythonhosted.org/packages/1d/69/0b5c1259e12fbcf5c2abe5934b5c0c1294ec0f845e2b4b2a51a91d79a4fb +PYTHON_CACHELIB_SETUP_TYPE = setuptools +PYTHON_CACHELIB_LICENSE = BSD-3-Clause +PYTHON_CACHELIB_LICENSE_FILES = LICENSE.rst docs/license.rst + +$(eval $(python-package)) diff --git a/package/python-cachetools/python-cachetools.hash b/package/python-cachetools/python-cachetools.hash index fb16cb492b..5831c2acba 100644 --- a/package/python-cachetools/python-cachetools.hash +++ b/package/python-cachetools/python-cachetools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cachetools/json -md5 d589387a314eed031e97348a73b8cf91 cachetools-5.5.0.tar.gz -sha256 2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a cachetools-5.5.0.tar.gz +md5 34b0025a306749e0b3619662362a76e2 cachetools-6.2.1.tar.gz +sha256 3f391e4bd8f8bf0931169baf7456cc822705f4e2a31f840d218f445b9a854201 cachetools-6.2.1.tar.gz # Locally computed sha256 checksums -sha256 2f4d2ff05f05c5da3879f40292b7600332d775dc7ed320d43dd42f3cd7d92c9b LICENSE +sha256 23c4eff7a1c027a977a0b79c4497e17582c334c5f17ef6ac8ca0b52d1e7d8417 LICENSE diff --git a/package/python-cachetools/python-cachetools.mk b/package/python-cachetools/python-cachetools.mk index 38a2313d59..576202a650 100644 --- a/package/python-cachetools/python-cachetools.mk +++ b/package/python-cachetools/python-cachetools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CACHETOOLS_VERSION = 5.5.0 +PYTHON_CACHETOOLS_VERSION = 6.2.1 PYTHON_CACHETOOLS_SOURCE = cachetools-$(PYTHON_CACHETOOLS_VERSION).tar.gz -PYTHON_CACHETOOLS_SITE = https://files.pythonhosted.org/packages/c3/38/a0f315319737ecf45b4319a8cd1f3a908e29d9277b46942263292115eee7 +PYTHON_CACHETOOLS_SITE = https://files.pythonhosted.org/packages/cc/7e/b975b5814bd36faf009faebe22c1072a1fa1168db34d285ef0ba071ad78c PYTHON_CACHETOOLS_SETUP_TYPE = setuptools PYTHON_CACHETOOLS_LICENSE = MIT PYTHON_CACHETOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 479935b2f0..d3c86c4eae 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-can/json -md5 20133a1b73b58c976bba6b0af8581f32 python_can-4.4.2.tar.gz -sha256 1c46c0935f39f7a9c3e76b03249af0580689ebf7a1844195e92f87257f009df5 python_can-4.4.2.tar.gz +md5 98a1f02a9983f7c117a23bfc444ae524 python_can-4.6.1.tar.gz +sha256 290fea135d04b8504ebff33889cc6d301e2181a54099116609f940825ffe5005 python_can-4.6.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index bc67be4f8c..c1f27d6709 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.4.2 +PYTHON_CAN_VERSION = 4.6.1 PYTHON_CAN_SOURCE = python_can-$(PYTHON_CAN_VERSION).tar.gz -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/a3/17/57c38abbf00993ac5ec306de0c00271685d1372ef3d907b107eb63ab13a8 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/74/f9/a9d99d36dd33be5badb747801c9255c3c526171a5542092eaacc73350fb8 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt +PYTHON_CAN_DEPENDENCIES = host-python-setuptools-scm ifneq ($(BR2_PACKAGE_PYTHON_CAN_VIEWER),y) define PYTHON_CAN_REMOVE_VIEWER diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index 8a38dc16a3..ac7a3d325f 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/canopen/json -md5 808c04aa0394210be9eeb46fb6e3bf96 canopen-2.3.0.tar.gz -sha256 792084a93c138d5b2a406ddd2d4eb5ce208f03bd8fda60f81ad2bb8d56c6b827 canopen-2.3.0.tar.gz +md5 8d79bea6f61915c300f619cc32cfc7a9 canopen-2.4.1.tar.gz +sha256 20a84bc498b34dadd79cece467d3bbe19591c1c02a8f39331bcc6065c4d8b2eb canopen-2.4.1.tar.gz # Locally computed sha256 checksums sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index e9747dcdf2..b36acf8c0b 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 2.3.0 +PYTHON_CANOPEN_VERSION = 2.4.1 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/1a/b3/733e5f98c995d7f3e82853bc5ee2f0677df6203d51d8a4387af188322523 +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/be/ea/f2654cb432988dfe9ab93140ff502f7e2e7eaa1835e8aaa4ee5a935af736 PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 6f8e0241b5..ef0e0d4ca5 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 f842fc7a8ef562539e07873475eed593 certifi-2024.8.30.tar.gz -sha256 bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9 certifi-2024.8.30.tar.gz +md5 7fe97b2e79933430062935f3759a09b0 certifi-2025.10.5.tar.gz +sha256 47c09d31ccf2acf0be3f701ea53595ee7e0b8fa08801c6624be771df09ae7b43 certifi-2025.10.5.tar.gz # Locally computed sha256 checksums sha256 e93716da6b9c0d5a4a1df60fe695b370f0695603d21f6f83f053e42cfc10caf7 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 7cdd65941a..ad85d44bbc 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2024.8.30 +PYTHON_CERTIFI_VERSION = 2025.10.5 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/b0/ee/9b19140fe824b367c04c5e1b369942dd754c4c5462d5674002f75c4dedc1 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/4c/5b/b6ce21586237c77ce67d01dc5507039d444b630dd76611bbca2d8e5dcd91 PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 2847d38b55..347a6f3ede 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 4336ca58b2df0cc3b163884d5fa2e5e2 cffi-1.17.1.tar.gz -sha256 1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824 cffi-1.17.1.tar.gz +md5 5e897f6251e614f6bd128a73e81801a4 cffi-2.0.0.tar.gz +sha256 44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529 cffi-2.0.0.tar.gz # Locally computed sha256 checksums -sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE +sha256 5ba24ddc57067f9249add644c3afc41a5d6dc37e23433ef759d95df370b0af63 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 152009e8ca..ab9068b101 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.17.1 +PYTHON_CFFI_VERSION = 2.0.0 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846 PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi -PYTHON_CFFI_LICENSE = MIT +PYTHON_CFFI_LICENSE = MIT-0 PYTHON_CFFI_LICENSE_FILES = LICENSE # This host package uses pkg-config to find libffi, so we have to diff --git a/package/python-changelog-chug/Config.in b/package/python-changelog-chug/Config.in new file mode 100644 index 0000000000..5eb9beca55 --- /dev/null +++ b/package/python-changelog-chug/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CHANGELOG_CHUG + bool "python-changelog-chug" + help + changelog-chug is a parser for project Change Log documents. + + https://pypi.org/project/changelog-chug diff --git a/package/python-changelog-chug/python-changelog-chug.hash b/package/python-changelog-chug/python-changelog-chug.hash new file mode 100644 index 0000000000..848a74cf37 --- /dev/null +++ b/package/python-changelog-chug/python-changelog-chug.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/changelog-chug/json +md5 4ccd595cfa9e929bfa04b7e64de3663c changelog_chug-0.0.3.tar.gz +sha256 98ee1e8be75b6e9d512c35292c3c293a124541a4ec2014a6ec3cf33a3d265d2d changelog_chug-0.0.3.tar.gz +# Locally computed sha256 checksums +sha256 aa0c846d25b7f2bf4ee44e607666bc318eea1ad5bf6f8cfdf50fc350d1085c1c COPYING diff --git a/package/python-changelog-chug/python-changelog-chug.mk b/package/python-changelog-chug/python-changelog-chug.mk new file mode 100644 index 0000000000..ae5ed7287d --- /dev/null +++ b/package/python-changelog-chug/python-changelog-chug.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-changelog-chug +# +################################################################################ + +PYTHON_CHANGELOG_CHUG_VERSION = 0.0.3 +PYTHON_CHANGELOG_CHUG_SOURCE = changelog_chug-$(PYTHON_CHANGELOG_CHUG_VERSION).tar.gz +PYTHON_CHANGELOG_CHUG_SITE = https://files.pythonhosted.org/packages/fc/6d/f08e0f600f88c69923c692d486096ca7d2eae5d657516ec134fb45ed0ab0 +PYTHON_CHANGELOG_CHUG_SETUP_TYPE = setuptools +PYTHON_CHANGELOG_CHUG_LICENSE = AGPL-3.0+ +PYTHON_CHANGELOG_CHUG_LICENSE_FILES = COPYING +PYTHON_CHANGELOG_CHUG_DEPENDENCIES = host-python-semver host-python-docutils +HOST_PYTHON_CHANGELOG_CHUG_DEPENDENCIES = host-python-semver host-python-docutils + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-channels-redis/python-channels-redis.hash b/package/python-channels-redis/python-channels-redis.hash index 6b62d0d6a2..3fc82ebb5c 100644 --- a/package/python-channels-redis/python-channels-redis.hash +++ b/package/python-channels-redis/python-channels-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/channels-redis/json -md5 e43a397dd3049f382a9c8b91d0f62c79 channels_redis-4.2.0.tar.gz -sha256 01c26c4d5d3a203f104bba9e5585c0305a70df390d21792386586068162027fd channels_redis-4.2.0.tar.gz +md5 a6d2eafea6e44440bb30f0a62de5d089 channels_redis-4.2.1.tar.gz +sha256 8375e81493e684792efe6e6eca60ef3d7782ef76c6664057d2e5c31e80d636dd channels_redis-4.2.1.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels-redis/python-channels-redis.mk b/package/python-channels-redis/python-channels-redis.mk index 7ca065ce0e..f91e96c849 100644 --- a/package/python-channels-redis/python-channels-redis.mk +++ b/package/python-channels-redis/python-channels-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_REDIS_VERSION = 4.2.0 +PYTHON_CHANNELS_REDIS_VERSION = 4.2.1 PYTHON_CHANNELS_REDIS_SOURCE = channels_redis-$(PYTHON_CHANNELS_REDIS_VERSION).tar.gz -PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/fd/c8/d8e4d369a4cbce5dc86e84a559993001d471327f1ef57c13ffc82bdc9efa +PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/c7/6d/c379c9feea4522cbdb4eba9b3d23a6270ba8cbd94e847b21834d898109d6 PYTHON_CHANNELS_REDIS_SETUP_TYPE = setuptools PYTHON_CHANNELS_REDIS_LICENSE = BSD-3-Clause PYTHON_CHANNELS_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-channels/python-channels.hash b/package/python-channels/python-channels.hash index 8f0a529460..8b402cdcd2 100644 --- a/package/python-channels/python-channels.hash +++ b/package/python-channels/python-channels.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/channels/json -md5 bfbc466f2e0a06a8834a4be10856ce8c channels-4.1.0.tar.gz -sha256 e0ed375719f5c1851861f05ed4ce78b0166f9245ca0ecd836cb77d4bb531489d channels-4.1.0.tar.gz +md5 f1c7e533a0afa026b61dd3cf228dbd18 channels-4.3.1.tar.gz +sha256 97413ffd674542db08e16a9ef09cd86ec0113e5f8125fbd33cf0854adcf27cdb channels-4.3.1.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels/python-channels.mk b/package/python-channels/python-channels.mk index 0e00e7ea4e..cafabf2676 100644 --- a/package/python-channels/python-channels.mk +++ b/package/python-channels/python-channels.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_VERSION = 4.1.0 +PYTHON_CHANNELS_VERSION = 4.3.1 PYTHON_CHANNELS_SOURCE = channels-$(PYTHON_CHANNELS_VERSION).tar.gz -PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/7d/73/da9e496657b242308d68cf79c937be125fcca4af61a620d98adfdde66fab +PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/12/a0/46450fcf9e56af18a6b0440ba49db6635419bb7bc84142c35f4143b1a66c PYTHON_CHANNELS_SETUP_TYPE = setuptools PYTHON_CHANNELS_LICENSE = BSD-3-Clause PYTHON_CHANNELS_LICENSE_FILES = LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index ebed9d19d7..dd10c11e73 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.hash +++ b/package/python-charset-normalizer/python-charset-normalizer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/charset-normalizer/json -md5 8e0d0f33219087c2cd2d01b1d6ff11b6 charset_normalizer-3.4.0.tar.gz -sha256 223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e charset_normalizer-3.4.0.tar.gz +md5 3c73a3c5c05a896c1169d8b5298dc4e5 charset_normalizer-3.4.4.tar.gz +sha256 94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a charset_normalizer-3.4.4.tar.gz # Locally computed sha256 checksums -sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE +sha256 6d0d41bfe170ac6c7dc248c9a63e254d0fb45a60d50a8257d0af92c6e249b887 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index ee04bf8968..8b9c954bce 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 3.4.0 +PYTHON_CHARSET_NORMALIZER_VERSION = 3.4.4 PYTHON_CHARSET_NORMALIZER_SOURCE = charset_normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE +PYTHON_CHARSET_NORMALIZER_DEPENDENCIES = host-python-mypy +PYTHON_CHARSET_NORMALIZER_ENV = CHARSET_NORMALIZER_USE_MYPYC=1 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index 2d63dd9651..cb3119def9 100644 --- a/package/python-cheroot/python-cheroot.hash +++ b/package/python-cheroot/python-cheroot.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cheroot/json -md5 0fce2608fcb31c16c81945c73e283724 cheroot-10.0.1.tar.gz -sha256 e0b82f797658d26b8613ec8eb563c3b08e6bd6a7921e9d5089bd1175ad1b1740 cheroot-10.0.1.tar.gz +md5 5299bba86f892b2a8e7f1678e45b96ff cheroot-11.0.0.tar.gz +sha256 dd414eda6bdb15140e864bc1d1c9625030375d14cbe0b290092867368924a52f cheroot-11.0.0.tar.gz # Locally computed sha256 checksums sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 3d39eac7a0..b0086b93df 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 10.0.1 +PYTHON_CHEROOT_VERSION = 11.0.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/63/e2/f85981a51281bd30525bf664309332faa7c81782bb49e331af603421dbd1 +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/f4/01/5ef06df932a974d016ab9d7f93e78740b572c4020016794fd4799cdc09c6 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools diff --git a/package/python-click/Config.in b/package/python-click/Config.in index c026998677..247cd4e973 100644 --- a/package/python-click/Config.in +++ b/package/python-click/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_CLICK bool "python-click" help - A simple wrapper around optparse for powerful command line - utilities. + Python composable command line interface toolkit. - https://pypi.python.org/pypi/click + https://click.palletsprojects.com/ diff --git a/package/python-click/python-click.hash b/package/python-click/python-click.hash index 0fc04d638a..df8528a786 100644 --- a/package/python-click/python-click.hash +++ b/package/python-click/python-click.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/click/json -md5 7c3b52c56fd30699f453a7dc7b42cecb click-8.1.7.tar.gz -sha256 ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de click-8.1.7.tar.gz +md5 fa228744ff03a339957e847fb7890823 click-8.3.0.tar.gz +sha256 e7b8232224eba16f4ebe410c25ced9f7875cb5f3263ffc93cc3e8da705e229c4 click-8.3.0.tar.gz # Locally computed sha256 checksums -sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.rst +sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.txt diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index 0e29ff034e..ef22c27439 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_CLICK_VERSION = 8.1.7 +PYTHON_CLICK_VERSION = 8.3.0 PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/96/d3/f04c7bfcf5c1862a2a5b845c6b2b360488cf47af55dfa79c98f6a6bf98b5 +PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/46/61/de6cd827efad202d7057d93e0fed9294b96952e188f7384832791c7b2254 +PYTHON_CLICK_SETUP_TYPE = flit PYTHON_CLICK_LICENSE = BSD-3-Clause -PYTHON_CLICK_LICENSE_FILES = LICENSE.rst -PYTHON_CLICK_SETUP_TYPE = setuptools +PYTHON_CLICK_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python-contourpy/python-contourpy.hash b/package/python-contourpy/python-contourpy.hash index 8902607ec8..aef7c3de74 100644 --- a/package/python-contourpy/python-contourpy.hash +++ b/package/python-contourpy/python-contourpy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/contourpy/json -md5 81447a2ceaf933b28db04d02086a22ed contourpy-1.3.0.tar.gz -sha256 7ffa0db17717a8ffb127efd0c95a4362d996b892c2904db72428d5b52e1938a4 contourpy-1.3.0.tar.gz +md5 06a4ae6ab30b855514797cac7073ed08 contourpy-1.3.1.tar.gz +sha256 dfd97abd83335045a913e3bcc4a09c0ceadbe66580cf573fe961f4a825efa699 contourpy-1.3.1.tar.gz # Locally computed sha256 checksums sha256 c7d0a153bffaa104044463ebc633793d451722efd3138b5ffd2527b40f1505a2 LICENSE diff --git a/package/python-contourpy/python-contourpy.mk b/package/python-contourpy/python-contourpy.mk index 3804fce8c3..08c45f3805 100644 --- a/package/python-contourpy/python-contourpy.mk +++ b/package/python-contourpy/python-contourpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CONTOURPY_VERSION = 1.3.0 +PYTHON_CONTOURPY_VERSION = 1.3.1 PYTHON_CONTOURPY_SOURCE = contourpy-$(PYTHON_CONTOURPY_VERSION).tar.gz -PYTHON_CONTOURPY_SITE = https://files.pythonhosted.org/packages/f5/f6/31a8f28b4a2a4fa0e01085e542f3081ab0588eff8e589d39d775172c9792 +PYTHON_CONTOURPY_SITE = https://files.pythonhosted.org/packages/25/c2/fc7193cc5383637ff390a712e88e4ded0452c9fbcf84abe3de5ea3df1866 PYTHON_CONTOURPY_LICENSE = BSD-3-Clause PYTHON_CONTOURPY_LICENSE_FILES = LICENSE PYTHON_CONTOURPY_DEPENDENCIES = python-pybind host-python-meson-python diff --git a/package/python-cppy/python-cppy.hash b/package/python-cppy/python-cppy.hash index 45b78eab8e..f8fb8b9568 100644 --- a/package/python-cppy/python-cppy.hash +++ b/package/python-cppy/python-cppy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cppy/json -md5 7c1f825c43dd66454440932a35b9969c cppy-1.2.1.tar.gz -sha256 83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b cppy-1.2.1.tar.gz +md5 d62122f9d03d1f2cea5d911fe8b17216 cppy-1.3.1.tar.gz +sha256 55b5307c11874f242ea135396f398cb67a5bbde4fab3e3c3294ea5fce43a6d68 cppy-1.3.1.tar.gz # Locally computed sha256 checksums sha256 db7a008bff1e63ccec397cfa033109740c4dc6cb12070a70d0cfe69aba27c4df LICENSE diff --git a/package/python-cppy/python-cppy.mk b/package/python-cppy/python-cppy.mk index 5bfd5a0f16..28b77963f7 100644 --- a/package/python-cppy/python-cppy.mk +++ b/package/python-cppy/python-cppy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CPPY_VERSION = 1.2.1 +PYTHON_CPPY_VERSION = 1.3.1 PYTHON_CPPY_SOURCE = cppy-$(PYTHON_CPPY_VERSION).tar.gz -PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/c5/7e/6cc5acd93752ee52d2f0423046072a2ce3ae16dfcd44373b9fe2a0222204 +PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/45/ed/b35645a1b285bce356f30cc0fe77a042375c385660ccd61e0cdc4c1f7c44 PYTHON_CPPY_LICENSE = BSD-3-Clause PYTHON_CPPY_LICENSE_FILES = LICENSE PYTHON_CPPY_SETUP_TYPE = setuptools diff --git a/package/python-crc/Config.in b/package/python-crc/Config.in new file mode 100644 index 0000000000..7f5fb72307 --- /dev/null +++ b/package/python-crc/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CRC + bool "python-crc" + help + Pure Python CRC library. + + https://github.com/Nicoretti/crc diff --git a/package/python-crc/python-crc.hash b/package/python-crc/python-crc.hash new file mode 100644 index 0000000000..f54044af5b --- /dev/null +++ b/package/python-crc/python-crc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/crc/json +md5 cca626fb7bc30b4c468216ca67ee21c2 crc-7.1.0.tar.gz +sha256 99dd540909a37ae4f62c65441df8ecb4e7f9af014fecaf4f331052a41d66c07d crc-7.1.0.tar.gz +# Locally computed sha256 checksums +sha256 803152006c87fdfd8b30b087734fd590e7a8d871df1a6de40a8fbdd27673907f LICENSE.txt diff --git a/package/python-crc/python-crc.mk b/package/python-crc/python-crc.mk new file mode 100644 index 0000000000..afee463092 --- /dev/null +++ b/package/python-crc/python-crc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-crc +# +################################################################################ + +PYTHON_CRC_VERSION = 7.1.0 +PYTHON_CRC_SOURCE = crc-$(PYTHON_CRC_VERSION).tar.gz +PYTHON_CRC_SITE = https://files.pythonhosted.org/packages/7e/e6/c3488c35ecae290751466252e5ea01ef50fc67bfc1a9aba43983329b7025 +PYTHON_CRC_SETUP_TYPE = poetry +PYTHON_CRC_LICENSE = BSD-2-Clause +PYTHON_CRC_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-crccheck/python-crccheck.hash b/package/python-crccheck/python-crccheck.hash new file mode 100644 index 0000000000..3fb58a7299 --- /dev/null +++ b/package/python-crccheck/python-crccheck.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/project/crccheck/#crccheck-1.3.1.tar.gz +sha256 1544c0110bf0a697d875d4f29dc40d7079f9d4d402a9317383f55f90ca72563a crccheck-1.3.1.tar.gz +# Locally calculated +sha256 1237ab8ea60caa782d77d9d2ac0cdccd765475e3848b0b91b5751d3f299e9d31 LICENSE.txt diff --git a/package/python-crccheck/python-crccheck.mk b/package/python-crccheck/python-crccheck.mk new file mode 100644 index 0000000000..32c1341d32 --- /dev/null +++ b/package/python-crccheck/python-crccheck.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-crccheck +# +################################################################################ + +PYTHON_CRCCHECK_VERSION = 1.3.1 +PYTHON_CRCCHECK_SOURCE = crccheck-$(PYTHON_CRCCHECK_VERSION).tar.gz +PYTHON_CRCCHECK_SITE = https://files.pythonhosted.org/packages/3c/d1/a943f4f1ca899917cc3fe1cb89d59348edd1b407503e4b02608e8d6b421e +PYTHON_CRCCHECK_LICENSE = MIT +PYTHON_CRCCHECK_LICENSE_FILES = LICENSE.txt +PYTHON_CRCCHECK_SETUP_TYPE = setuptools +HOST_PYTHON_CRCCHECK_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(host-python-package)) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 61d9ca598e..02b2b891e2 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 72c5686ee70cf37075e2fdea332066e4e2351fab8beaa4a22268983f092bca4e python-cryptography-43.0.3-cargo2.tar.gz +sha256 9c070a97c37b4cc487737fa7a1fec27c2d44ba54c39f1c2cc558b2b9878283f9 python-cryptography-45.0.7-cargo4.tar.gz # Locally computed sha256 checksums sha256 3e0c7c091a948b82533ba98fd7cbb40432d6f1a9acbf85f5922d2f99a93ae6bb LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 7feb4076cd..e60c5d848d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,24 +4,28 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 43.0.3 +PYTHON_CRYPTOGRAPHY_VERSION = 45.0.7 PYTHON_CRYPTOGRAPHY_SOURCE_PYPI = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE_PYPI = https://files.pythonhosted.org/packages/0d/05/07b55d1fa21ac18c3a8c79f764e2514e6f6a9698f1be44994f5adf0d29db +PYTHON_CRYPTOGRAPHY_SITE_PYPI = https://files.pythonhosted.org/packages/a7/35/c495bffc2056f2dadb32434f1feedd79abde2a7f8363e1974afa9c33c7e2 PYTHON_CRYPTOGRAPHY_SITE = $(PYTHON_CRYPTOGRAPHY_SITE_PYPI)/$(PYTHON_CRYPTOGRAPHY_SOURCE_PYPI)?buildroot-path=filename PYTHON_CRYPTOGRAPHY_SETUP_TYPE = maturin PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project +PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography.io PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_CARGO_MANIFEST_PATH = src/rust/Cargo.toml PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-pkgconf \ host-python-cffi \ host-python-setuptools \ openssl HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-pkgconf \ host-python-cffi \ host-python-setuptools \ host-openssl +PYTHON_CRYPTOGRAPHY_ENV = OPENSSL_NO_VENDOR=1 +HOST_PYTHON_CRYPTOGRAPHY_ENV = OPENSSL_NO_VENDOR=1 PYTHON_CRYPTOGRAPHY_BUILD_OPTS = --skip-dependency-check HOST_PYTHON_CRYPTOGRAPHY_BUILD_OPTS = --skip-dependency-check diff --git a/package/python-cssselect/python-cssselect.hash b/package/python-cssselect/python-cssselect.hash index df2523265f..d9b89d1c61 100644 --- a/package/python-cssselect/python-cssselect.hash +++ b/package/python-cssselect/python-cssselect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect/json -md5 27fbafacce5447cb867acb240d35002a cssselect-1.2.0.tar.gz -sha256 666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc cssselect-1.2.0.tar.gz +md5 e0148abb13430399cbdbc173c3fa1c80 cssselect-1.3.0.tar.gz +sha256 57f8a99424cfab289a1b6a816a43075a4b00948c86b4dcf3ef4ee7e15f7ab0c7 cssselect-1.3.0.tar.gz # Locally computed sha256 checksums sha256 5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892 LICENSE diff --git a/package/python-cssselect/python-cssselect.mk b/package/python-cssselect/python-cssselect.mk index 96f6f98737..1a5087f495 100644 --- a/package/python-cssselect/python-cssselect.mk +++ b/package/python-cssselect/python-cssselect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSSELECT_VERSION = 1.2.0 +PYTHON_CSSSELECT_VERSION = 1.3.0 PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz -PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/d1/91/d51202cc41fbfca7fa332f43a5adac4b253962588c7cc5a54824b019081c +PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/72/0a/c3ea9573b1dc2e151abfe88c7fe0c26d1892fe6ed02d0cdb30f0d57029d5 PYTHON_CSSSELECT_SETUP_TYPE = setuptools PYTHON_CSSSELECT_LICENSE = BSD-3-Clause PYTHON_CSSSELECT_LICENSE_FILES = LICENSE diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index cd320eaa2a..08972cd035 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 388b85b7c23f501320d19d991b169f5d cython-3.0.11.tar.gz -sha256 7146dd2af8682b4ca61331851e6aebce9fe5158e75300343f80c07ca80b1faff cython-3.0.11.tar.gz +md5 f508595cc0951a77b70c07100df1b4ff cython-3.1.3.tar.gz +sha256 10ee785e42328924b78f75a74f66a813cb956b4a9bc91c44816d089d5934c089 cython-3.1.3.tar.gz # Locally computed sha256 checksums sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 51086bedab..50e2e6e1cc 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 3.0.11 +PYTHON_CYTHON_VERSION = 3.1.3 PYTHON_CYTHON_SOURCE = cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/84/4d/b720d6000f4ca77f030bd70f12550820f0766b568e43f11af7f7ad9061aa +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/18/ab/915337fb39ab4f4539a313df38fc69938df3bf14141b90d61dfd5c2919de PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python-daemon/python-daemon.hash b/package/python-daemon/python-daemon.hash index 695b8fb9b3..f2834279ce 100644 --- a/package/python-daemon/python-daemon.hash +++ b/package/python-daemon/python-daemon.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/python-daemon/json -md5 4c369b8c6d3de956d8f9dfb2c872c284 python-daemon-3.0.1.tar.gz -sha256 6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5 python-daemon-3.0.1.tar.gz +md5 d42ee28735506ea1cb51c348530d6d94 python_daemon-3.1.2.tar.gz +sha256 f7b04335adc473de877f5117e26d5f1142f4c9f7cd765408f0877757be5afbf4 python_daemon-3.1.2.tar.gz # Locally computed sha256 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.ASF-2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/package/python-daemon/python-daemon.mk b/package/python-daemon/python-daemon.mk index f4d4205a31..ef380bfe3b 100644 --- a/package/python-daemon/python-daemon.mk +++ b/package/python-daemon/python-daemon.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_DAEMON_VERSION = 3.0.1 -PYTHON_DAEMON_SITE = https://files.pythonhosted.org/packages/84/50/97b81327fccbb70eb99f3c95bd05a0c9d7f13fb3f4cfd975885110d1205a +PYTHON_DAEMON_VERSION = 3.1.2 +PYTHON_DAEMON_SOURCE = python_daemon-$(PYTHON_DAEMON_VERSION).tar.gz +PYTHON_DAEMON_SITE = https://files.pythonhosted.org/packages/3d/37/4f10e37bdabc058a32989da2daf29e57dc59dbc5395497f3d36d5f5e2694 PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPL-3.0+ (test, build) PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3 PYTHON_DAEMON_SETUP_TYPE = setuptools -PYTHON_DAEMON_DEPENDENCIES = host-python-docutils +PYTHON_DAEMON_DEPENDENCIES = host-python-changelog-chug host-python-docutils $(eval $(python-package)) diff --git a/package/python-daphne/python-daphne.hash b/package/python-daphne/python-daphne.hash index 194b73a0e4..e0619c6463 100644 --- a/package/python-daphne/python-daphne.hash +++ b/package/python-daphne/python-daphne.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/daphne/json -md5 6a00ce30210105fcd0f756d4dc5505f9 daphne-4.1.2.tar.gz -sha256 fcbcace38eb86624ae247c7ffdc8ac12f155d7d19eafac4247381896d6f33761 daphne-4.1.2.tar.gz +md5 10ce77cd61e3b048bac7fe4539800f37 daphne-4.2.1.tar.gz +sha256 5f898e700a1fda7addf1541d7c328606415e96a7bd768405f0463c312fcb31b3 daphne-4.2.1.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-daphne/python-daphne.mk b/package/python-daphne/python-daphne.mk index 097a195821..69f5a9f466 100644 --- a/package/python-daphne/python-daphne.mk +++ b/package/python-daphne/python-daphne.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DAPHNE_VERSION = 4.1.2 +PYTHON_DAPHNE_VERSION = 4.2.1 PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz -PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/1a/c1/aedf180beb12395835cba791ce7239b8880009d9d37564d72b7590cde605 +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/cd/9d/322b605fdc03b963cf2d33943321c8f4405e8d82e698bf49d1eed1ca40c4 PYTHON_DAPHNE_SETUP_TYPE = setuptools # https://github.com/django/daphne/blob/master/LICENSE PYTHON_DAPHNE_LICENSE = BSD-3-Clause diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index ee5644a7ff..49ce188898 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dataproperty/json -md5 aca50cd5f543b7831d8a48ab1c02a152 DataProperty-1.0.1.tar.gz -sha256 723e5729fa6e885e127a771a983ee1e0e34bb141aca4ffe1f0bfa7cde34650a4 DataProperty-1.0.1.tar.gz +md5 b10a82d8c35a1e69f58b921aa7d7f063 dataproperty-1.1.0.tar.gz +sha256 b038437a4097d1a1c497695c3586ea34bea67fdd35372b9a50f30bf044d77d04 dataproperty-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +sha256 36289157e371aaae5b5d3ba4be87359ed07548cdc7a9f19ff61dc67cfc536a9c LICENSE diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 6cac4f27e5..060de7cab5 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 1.0.1 -PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/48/e2/31ffb67d2a9ab4ff70b106e08ad01a3e7696f8d409457042d1eb18244f82 +PYTHON_DATAPROPERTY_VERSION = 1.1.0 +PYTHON_DATAPROPERTY_SOURCE = dataproperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/0b/81/8c8b64ae873cb9014815214c07b63b12e3b18835780fb342223cfe3fe7d8 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE +PYTHON_DATAPROPERTY_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index 4234fc0501..7ff243ebda 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 3d7ef3e3ae2691d45dcf3d07511eca4f dbus_fast-2.24.3.tar.gz -sha256 9042a1b565ecac4f8e04df79376de1d1d31e4c82eddb6e71e8b8d82d0c94dd3d dbus_fast-2.24.3.tar.gz +md5 ea8420ccd0c90ea8f3dda3df5b0a7a01 dbus_fast-2.44.3.tar.gz +sha256 962b36abbe885159e31135c57a7d9659997c61a13d55ecb070a61dc502dbd87e dbus_fast-2.44.3.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index 60d0b7e9af..6f629c0cc6 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 2.24.3 +PYTHON_DBUS_FAST_VERSION = 2.44.3 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/0a/37/a27e7f2dc6a18b5dcee70ffb08013a33770c2154a51fb5e2c04a7f4169fa +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/00/f2/8a3f2345452f4aa8e9899544ba6dfdf699cef39ecfb04238fdad381451c8 PYTHON_DBUS_FAST_SETUP_TYPE = poetry PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 +PYTHON_DBUS_FAST_BUILD_OPTS = --skip-dependency-check PYTHON_DBUS_FAST_DEPENDENCIES = \ host-python-cython \ host-python-setuptools diff --git a/package/python-decorator/python-decorator.hash b/package/python-decorator/python-decorator.hash index e12d34e7ed..5980427454 100644 --- a/package/python-decorator/python-decorator.hash +++ b/package/python-decorator/python-decorator.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/decorator/json -md5 a6b34700dcac8a4bb04efd55e99626c1 decorator-5.1.1.tar.gz -sha256 637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 decorator-5.1.1.tar.gz +md5 984649ae1fd174f9a82369e7c9cc56e6 decorator-5.2.1.tar.gz +sha256 65f266143752f734b0a7cc83c46f4618af75b8c5911b00ccb61d0ac9b6da0360 decorator-5.2.1.tar.gz # Locally computed sha256 checksums -sha256 fd11660cabf0532082c45706862fafc294907ec7f8e217818240a4999806782e LICENSE.txt +sha256 914ee6ed78a5efc173bda698f2708444ca9d140fcc4080c60d0503d40db39da6 LICENSE.txt diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index 5dba8cc915..d08696e773 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DECORATOR_VERSION = 5.1.1 +PYTHON_DECORATOR_VERSION = 5.2.1 PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz -PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/66/0c/8d907af351aa16b42caae42f9d6aa37b900c67308052d10fdce809f8d952 +PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/43/fa/6d96a0978d19e17b68d634497769987b16c8f4cd0a7a05048bec693caa6b PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python diff --git a/package/python-distlib/python-distlib.hash b/package/python-distlib/python-distlib.hash index 6cf3715865..d31ab90f09 100644 --- a/package/python-distlib/python-distlib.hash +++ b/package/python-distlib/python-distlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/distlib/json -md5 958df85785458fa326a07af4f9c1c328 distlib-0.3.9.tar.gz -sha256 a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403 distlib-0.3.9.tar.gz +md5 555fd6076016da3a89ff9b959677eaa6 distlib-0.4.0.tar.gz +sha256 feec40075be03a04501a973d81f633735b4b69f98b05450592310c0f401a4e0d distlib-0.4.0.tar.gz # Locally computed sha256 checksums sha256 808e10c8a6ab8deb149ff9b3fb19f447a808094606d712a9ca57fead3552599d LICENSE.txt diff --git a/package/python-distlib/python-distlib.mk b/package/python-distlib/python-distlib.mk index e95c28c518..d71896237d 100644 --- a/package/python-distlib/python-distlib.mk +++ b/package/python-distlib/python-distlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DISTLIB_VERSION = 0.3.9 +PYTHON_DISTLIB_VERSION = 0.4.0 PYTHON_DISTLIB_SOURCE = distlib-$(PYTHON_DISTLIB_VERSION).tar.gz -PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/0d/dd/1bec4c5ddb504ca60fc29472f3d27e8d4da1257a854e1d96742f15c1d02d +PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/96/8e/709914eb2b5749865801041647dc7f4e6d00b549cfe88b65ca192995f07c PYTHON_DISTLIB_SETUP_TYPE = setuptools PYTHON_DISTLIB_LICENSE = PSF-2.0 PYTHON_DISTLIB_LICENSE_FILES = LICENSE.txt diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 656d9eee9a..448e98613b 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,15 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 3f556d14e7999a9700a27a325efc0833 Django-5.1.3.tar.gz -sha256 c0fa0e619c39325a169208caef234f90baa925227032ad3f44842ba14d75234a Django-5.1.3.tar.gz +md5 0268c52cb99bb764490fdd90502def32 django-5.2.8.tar.gz +sha256 23254866a5bb9a2cfa6004e8b809ec6246eba4b58a7589bc2772f1bcc8456c7f django-5.2.8.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +sha256 dcac1c86cb7ab491702bdb4c41be680fafde51536748cc8aaee3840eec53ed17 django/contrib/gis/measure.py +sha256 570a045a8372b6cd6a00e30ebafe8e3e8dfc0a7fe3d4ef2cc5f16d419eb63aeb django/contrib/gis/gdal/LICENSE +sha256 08bf24b7551238ae325295245425b1caeb9ad0f42f9e2d303c7b353502632045 django/contrib/gis/geos/LICENSE +sha256 d48633adb736dac091477ec2206feebeee88e3e6e486aedb21c584e4b49be0ec django/contrib/admin/static/admin/js/inlines.js +sha256 d4db9ebe6f29f5168eac45ad713f055623ac5d0dcd5ba92da23d650ae012020d django/contrib/admin/static/admin/js/vendor/jquery/LICENSE.txt +sha256 4ee0cbc51370afde358652a0f977972053729ed578b6a42f5e2a037d114f0b39 django/contrib/admin/static/admin/js/vendor/select2/LICENSE.md +sha256 73af2949bff9296cb0f816c3be19a4da4e95adc94c1f924796e8bad3f03f2f29 django/contrib/admin/static/admin/js/vendor/xregexp/LICENSE.txt +sha256 d114faff3488c16c319b3235dc41f90239d3d63d9853733033d8f7535f5c0004 django/contrib/admin/static/admin/img/LICENSE +sha256 54004c4b606964ebc163af16d04607c16e428f8a78a026fecb53f70c09f4a94f django/dispatch/license.txt +sha256 9f37277d682cf06369041e60fb6fda5a85dfcf118d9176489087a3d40293f015 django/utils/archive.py diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 6588acc31d..920fd8a577 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,15 +4,24 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.1.3 -PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz +PYTHON_DJANGO_VERSION = 5.2.8 +PYTHON_DJANGO_SOURCE = django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/c6/85/ba2c2b83ba8b95354f99ed8344405d9571109ce0175028876209d6b93fba -PYTHON_DJANGO_LICENSE = BSD-3-Clause -PYTHON_DJANGO_LICENSE_FILES = LICENSE +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/05/a2/933dbbb3dd9990494960f6e64aca2af4c0745b63b7113f59a822df92329e +PYTHON_DJANGO_LICENSE = BSD-3-Clause, MIT (jquery, utils/archive.py), BSD-2-Clause (inlines.js) +PYTHON_DJANGO_LICENSE_FILES = LICENSE \ + django/contrib/gis/measure.py \ + django/contrib/gis/gdal/LICENSE \ + django/contrib/gis/geos/LICENSE \ + django/contrib/admin/static/admin/js/inlines.js \ + django/contrib/admin/static/admin/js/vendor/jquery/LICENSE.txt \ + django/contrib/admin/static/admin/js/vendor/select2/LICENSE.md \ + django/contrib/admin/static/admin/js/vendor/xregexp/LICENSE.txt \ + django/contrib/admin/static/admin/img/LICENSE \ + django/dispatch/license.txt \ + django/utils/archive.py PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject PYTHON_DJANGO_CPE_ID_PRODUCT = django PYTHON_DJANGO_SETUP_TYPE = setuptools -PYTHON_DJANGO_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) diff --git a/package/python-dotenv/python-dotenv.hash b/package/python-dotenv/python-dotenv.hash index 710922fba3..5b4be41206 100644 --- a/package/python-dotenv/python-dotenv.hash +++ b/package/python-dotenv/python-dotenv.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dotenv/json -md5 68abb78e05460ce558ca255de550e1ea python-dotenv-1.0.1.tar.gz -sha256 e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca python-dotenv-1.0.1.tar.gz +md5 b3e9652d1974f8c7574c43f719799f3a python_dotenv-1.1.1.tar.gz +sha256 a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab python_dotenv-1.1.1.tar.gz # Locally computed sha256 checksums sha256 80619b7049f08c81683ad0e01f08f257a840652dd71ee83146d36658c7d2c2b9 LICENSE diff --git a/package/python-dotenv/python-dotenv.mk b/package/python-dotenv/python-dotenv.mk index 324eea239e..8f11c5de8d 100644 --- a/package/python-dotenv/python-dotenv.mk +++ b/package/python-dotenv/python-dotenv.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_DOTENV_VERSION = 1.0.1 -PYTHON_DOTENV_SITE = https://files.pythonhosted.org/packages/bc/57/e84d88dfe0aec03b7a2d4327012c1627ab5f03652216c63d49846d7a6c58 +PYTHON_DOTENV_VERSION = 1.1.1 +PYTHON_DOTENV_SOURCE = python_dotenv-$(PYTHON_DOTENV_VERSION).tar.gz +PYTHON_DOTENV_SITE = https://files.pythonhosted.org/packages/f6/b0/4bc07ccd3572a2f9df7e6782f52b0c6c90dcbb803ac4a167702d7d0dfe1e PYTHON_DOTENV_SETUP_TYPE = setuptools PYTHON_DOTENV_LICENSE = BSD-3-Clause PYTHON_DOTENV_LICENSE_FILES = LICENSE diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index b53830f4cb..29463ff5da 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 e4ecd1925af81376865ce0169dc1146a dtschema-2024.11.tar.gz -sha256 bb7dd36ff9406ec89607b893cfc5e1ffa7ead76fd5c48df77eafc9b4d4196047 dtschema-2024.11.tar.gz +md5 7d568f4e631d1f2f5ec32aea7851859c dtschema-2025.8.tar.gz +sha256 3c63b643fa76215b32cc6cbea9fd0dc7627dc71c67f3dca14fc04d70a7e1235e dtschema-2025.8.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index 13ccc16e95..28b7ac3cdf 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2024.11 +PYTHON_DTSCHEMA_VERSION = 2025.8 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/b7/e2/260c0429118b1555ddc2d0d465b7ab36e76ab2454a3d1a916ef06dffccca +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/96/0d/ae12436b8de0d06cf5aa07787679bcefd24ba0c7a556edd5cdaef4a38022 PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt diff --git a/package/python-email-validator/python-email-validator.hash b/package/python-email-validator/python-email-validator.hash index f7a7ed8a33..16fb9518f9 100644 --- a/package/python-email-validator/python-email-validator.hash +++ b/package/python-email-validator/python-email-validator.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/email-validator/json -md5 593073eca56ac1e947d47b9b314f2f11 email_validator-2.2.0.tar.gz -sha256 cb690f344c617a714f22e66ae771445a1ceb46821152df8e165c5f9a364582b7 email_validator-2.2.0.tar.gz +md5 379aa34f196a66e16c5c0dd0c2abb2da email_validator-2.3.0.tar.gz +sha256 9fc05c37f2f6cf439ff414f8fc46d917929974a82244c20eb10231ba60c54426 email_validator-2.3.0.tar.gz # Locally computed sha256 checksums sha256 672179752e109134a3fb2bdd0780b29fdb7a03974f0f586a13aead5129562d4c LICENSE diff --git a/package/python-email-validator/python-email-validator.mk b/package/python-email-validator/python-email-validator.mk index 35881c13a3..e54387869b 100644 --- a/package/python-email-validator/python-email-validator.mk +++ b/package/python-email-validator/python-email-validator.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EMAIL_VALIDATOR_VERSION = 2.2.0 +PYTHON_EMAIL_VALIDATOR_VERSION = 2.3.0 PYTHON_EMAIL_VALIDATOR_SOURCE = email_validator-$(PYTHON_EMAIL_VALIDATOR_VERSION).tar.gz -PYTHON_EMAIL_VALIDATOR_SITE = https://files.pythonhosted.org/packages/48/ce/13508a1ec3f8bb981ae4ca79ea40384becc868bfae97fd1c942bb3a001b1 +PYTHON_EMAIL_VALIDATOR_SITE = https://files.pythonhosted.org/packages/f5/22/900cb125c76b7aaa450ce02fd727f452243f2e91a61af068b40adba60ea9 PYTHON_EMAIL_VALIDATOR_SETUP_TYPE = setuptools PYTHON_EMAIL_VALIDATOR_LICENSE = Unlicense PYTHON_EMAIL_VALIDATOR_LICENSE_FILES = LICENSE diff --git a/package/python-emailproxy/Config.in b/package/python-emailproxy/Config.in new file mode 100644 index 0000000000..f1a349ce94 --- /dev/null +++ b/package/python-emailproxy/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_EMAILPROXY + bool "python-emailproxy" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime + select BR2_PACKAGE_PYTHON_PYASYNCORE # runtime + help + An IMAP/POP/SMTP proxy that transparently adds OAuth 2.0 + authentication for email clients that don't support this + method. + + https://github.com/simonrob/email-oauth2-proxy diff --git a/package/python-emailproxy/python-emailproxy.hash b/package/python-emailproxy/python-emailproxy.hash new file mode 100644 index 0000000000..6c534834ca --- /dev/null +++ b/package/python-emailproxy/python-emailproxy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/emailproxy/json +md5 8cdcbe1f2e0956facf27cf2ed160e227 emailproxy-2025.10.4.tar.gz +sha256 28efbc446df0319d9641b0b7a35440bae91863bf70471c8cedaafbefb1b50915 emailproxy-2025.10.4.tar.gz +# Locally computed sha256 checksums +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-emailproxy/python-emailproxy.mk b/package/python-emailproxy/python-emailproxy.mk new file mode 100644 index 0000000000..603e58fe7c --- /dev/null +++ b/package/python-emailproxy/python-emailproxy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-emailproxy +# +################################################################################ + +PYTHON_EMAILPROXY_VERSION = 2025.10.4 +PYTHON_EMAILPROXY_SOURCE = emailproxy-$(PYTHON_EMAILPROXY_VERSION).tar.gz +PYTHON_EMAILPROXY_SITE = https://files.pythonhosted.org/packages/4f/0d/045028f891c4a83ea7d616a81f0b9af8d290316eb0c958d572b6445232f9 +PYTHON_EMAILPROXY_SETUP_TYPE = setuptools +PYTHON_EMAILPROXY_LICENSE = Apache-2.0 +PYTHON_EMAILPROXY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index ecf4d2898e..764da93f83 100644 --- a/package/python-engineio/python-engineio.hash +++ b/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 3e45a23dd8df2d611681cb6970c1fd27 python_engineio-4.10.1.tar.gz -sha256 166cea8dd7429638c5c4e3a4895beae95196e860bc6f29ed0b9fe753d1ef2072 python_engineio-4.10.1.tar.gz +md5 3ef6c195d98209d6d0daf0fe728c98ec python_engineio-4.11.2.tar.gz +sha256 145bb0daceb904b4bb2d3eb2d93f7dbb7bb87a6a0c4f20a94cc8654dec977129 python_engineio-4.11.2.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index 49d5e298fe..5bc9906ec5 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 4.10.1 +PYTHON_ENGINEIO_VERSION = 4.11.2 PYTHON_ENGINEIO_SOURCE = python_engineio-$(PYTHON_ENGINEIO_VERSION).tar.gz -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/9e/d2/b985b0affc5944620e1f812969322f40204f75297c5087fc4cdd44f1a14e +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/52/e0/a9e0fe427ce7f1b7dbf9531fa00ffe4b557c4a7bc8e71891c115af123170 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 6eab790901..af517e0844 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 c7d41d4c89ffa0fa0a9d490439358b27 esptool-4.8.1.tar.gz -sha256 dc4ef26b659e1a8dcb019147c0ea6d94980b34de99fbe09121c7941c8b254531 esptool-4.8.1.tar.gz +md5 fc9cea4910ecfb6fbbb2942e44c835bd esptool-5.1.0.tar.gz +sha256 2ea9bcd7eb263d380a4fe0170856a10e4c65e3f38c757ebdc73584c8dd8322da esptool-5.1.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index a4922c1e5b..eda9d024c6 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.8.1 +PYTHON_ESPTOOL_VERSION = 5.1.0 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/5c/6b/3ce9bb7f36bdef3d6ae71646a1d3b7d59826a478f3ed8a783a93a2f8f537 +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/c2/03/d7d79a77dd787dbe6029809c5f81ad88912340a131c88075189f40df3aba PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE diff --git a/package/python-evdev/python-evdev.hash b/package/python-evdev/python-evdev.hash index afa74c792b..c72a132277 100644 --- a/package/python-evdev/python-evdev.hash +++ b/package/python-evdev/python-evdev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/evdev/json -md5 c20a623d2d05fd87c1f46d736ee9c3cc evdev-1.7.1.tar.gz -sha256 0c72c370bda29d857e188d931019c32651a9c1ea977c08c8d939b1ced1637fde evdev-1.7.1.tar.gz +md5 7f0ec85ff4bda28ee25e400ec30adff4 evdev-1.9.2.tar.gz +sha256 5d3278892ce1f92a74d6bf888cc8525d9f68af85dbe336c95d1c87fb8f423069 evdev-1.9.2.tar.gz # Locally computed sha256 checksums -sha256 55fd76d7b3f90d312f161d318631b93c58a0e69d662d07c4f5aca2c6c9ecc85e LICENSE +sha256 d4554960d6496150c88c1fd02d7973121a9a57b961ea58fe349fbf8ada3816b2 LICENSE diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index 269b290dca..1bf95fb8c7 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EVDEV_VERSION = 1.7.1 +PYTHON_EVDEV_VERSION = 1.9.2 PYTHON_EVDEV_SOURCE = evdev-$(PYTHON_EVDEV_VERSION).tar.gz -PYTHON_EVDEV_SITE = https://files.pythonhosted.org/packages/12/bb/f622a8a5e64d46ca83020a761877c0ead19140903c9aaf1431f3c531fdf6 +PYTHON_EVDEV_SITE = https://files.pythonhosted.org/packages/63/fe/a17c106a1f4061ce83f04d14bcedcfb2c38c7793ea56bfb906a6fadae8cb PYTHON_EVDEV_SETUP_TYPE = setuptools PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE diff --git a/package/python-executing/python-executing.hash b/package/python-executing/python-executing.hash index 8f02628485..d9220c224d 100644 --- a/package/python-executing/python-executing.hash +++ b/package/python-executing/python-executing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/executing/json -md5 e64dd9916bb0a6c89f88295f4867c1b6 executing-2.1.0.tar.gz -sha256 8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab executing-2.1.0.tar.gz +md5 02588d10820c930874def80b2fb60c4e executing-2.2.1.tar.gz +sha256 3632cc370565f6648cc328b32435bd120a1e4ebb20c77e3fdde9a13cd1e533c4 executing-2.2.1.tar.gz # Locally computed sha256 checksums sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-executing/python-executing.mk b/package/python-executing/python-executing.mk index d13da22be3..0545941d5e 100644 --- a/package/python-executing/python-executing.mk +++ b/package/python-executing/python-executing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EXECUTING_VERSION = 2.1.0 +PYTHON_EXECUTING_VERSION = 2.2.1 PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz -PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8c/e3/7d45f492c2c4a0e8e0fad57d081a7c8a0286cdd86372b070cca1ec0caa1e +PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/cc/28/c14e053b6762b1044f34a13aab6859bbf40456d37d23aa286ac24cfd9a5d PYTHON_EXECUTING_SETUP_TYPE = setuptools PYTHON_EXECUTING_LICENSE = MIT PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt diff --git a/package/python-expandvars/python-expandvars.hash b/package/python-expandvars/python-expandvars.hash index 0123ed5420..cd091f75b0 100644 --- a/package/python-expandvars/python-expandvars.hash +++ b/package/python-expandvars/python-expandvars.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/expandvars/json -md5 8091f578a547e2b4b9df59100a179266 expandvars-0.12.0.tar.gz -sha256 7d1adfa55728cf4b5d812ece3d087703faea953e0c0a1a78415de9df5024d844 expandvars-0.12.0.tar.gz +md5 6afc7c8f9c35241333408f34e598f458 expandvars-1.1.2.tar.gz +sha256 6c5822b7b756a99a356b915dd1267f52ab8a4efaa135963bd7f4bd5d368f71d7 expandvars-1.1.2.tar.gz # Locally computed sha256 checksums sha256 b8a43c35080fc5855e4f8171e4d0d002f6ff1633d8cfc0b5dee0ac4ced2deac7 LICENSE diff --git a/package/python-expandvars/python-expandvars.mk b/package/python-expandvars/python-expandvars.mk index 0a72601b5a..33dc09e181 100644 --- a/package/python-expandvars/python-expandvars.mk +++ b/package/python-expandvars/python-expandvars.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EXPANDVARS_VERSION = 0.12.0 +PYTHON_EXPANDVARS_VERSION = 1.1.2 PYTHON_EXPANDVARS_SOURCE = expandvars-$(PYTHON_EXPANDVARS_VERSION).tar.gz -PYTHON_EXPANDVARS_SITE = https://files.pythonhosted.org/packages/2b/a5/46d1f58edcae1d632fafdfee313e378240e002ae45d26502bac938bd8751 +PYTHON_EXPANDVARS_SITE = https://files.pythonhosted.org/packages/9c/64/a9d8ea289d663a44b346203a24bf798507463db1e76679eaa72ee6de1c7a PYTHON_EXPANDVARS_SETUP_TYPE = hatch PYTHON_EXPANDVARS_LICENSE = MIT PYTHON_EXPANDVARS_LICENSE_FILES = LICENSE diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 8b2fdb0f47..fb5d4dca71 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 779e94857aed44e78536a9d36268e76c falcon-4.0.2.tar.gz -sha256 58f4b9c9da4c9b1e2c9f396ad7ef897701b3c7c7c87227f0bd1aee40c7fbc525 falcon-4.0.2.tar.gz +md5 062a6d925bdf9c0be791d736ab6b0e82 falcon-4.1.0.tar.gz +sha256 dbc3fa642b43e7662f121d0a7b5d7ea42a1a31fb22ae63572c42ee3ecd1f79d0 falcon-4.1.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index f5ab76655f..91bcd1dd18 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 4.0.2 +PYTHON_FALCON_VERSION = 4.1.0 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/37/4f/d317952294dee1982cd930c8ee2b8b7fbf04140473882801061b3346c713 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/90/85/a4abc8357f6bc6b6b0b3d80e2c319c895900c518a3528279a222d7a53b7e PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in index d4a527c601..21997daf9a 100644 --- a/package/python-fastapi/Config.in +++ b/package/python-fastapi/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_PYTHON_FASTAPI FastAPI framework, high performance, easy to learn, fast to code, ready for production. - https://github.com/tiangolo/fastapi + https://github.com/fastapi/fastapi diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 6c7451ebd0..34bfe22c87 100644 --- a/package/python-fastapi/python-fastapi.hash +++ b/package/python-fastapi/python-fastapi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastapi/json -md5 feecf6d0db305d63ee9e6fcb77c81673 fastapi-0.115.4.tar.gz -sha256 db653475586b091cb8b2fec2ac54a680ac6a158e07406e1abae31679e8826349 fastapi-0.115.4.tar.gz +md5 5d539db8065d3579430ed00577e8a86b fastapi-0.119.1.tar.gz +sha256 a5e3426edce3fe221af4e1992c6d79011b247e3b03cc57999d697fe76cbf8ae0 fastapi-0.119.1.tar.gz # Locally computed sha256 checksums sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index 95eb565b23..4a067494a7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.115.4 +PYTHON_FASTAPI_VERSION = 0.119.1 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/a9/db/5781f19bd30745885e0737ff3fdd4e63e7bc691710f9da691128bb0dc73b +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/a6/f4/152127681182e6413e7a89684c434e19e7414ed7ac0c632999c3c6980640 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -PYTHON_FASTAPI_CPE_ID_VENDOR = fastapi_project +PYTHON_FASTAPI_CPE_ID_VENDOR = tiangolo PYTHON_FASTAPI_CPE_ID_PRODUCT = fastapi PYTHON_FASTAPI_DEPENDENCIES = host-python-pdm-backend diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index c81d016f8e..a266762eea 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 4c66a5abfc4004cbb0cc30d22e472031 filelock-3.16.1.tar.gz -sha256 c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435 filelock-3.16.1.tar.gz +md5 32624573c1dcea186f907c78e4fb80a2 filelock-3.17.0.tar.gz +sha256 ee4e77401ef576ebb38cd7f13b9b28893194acc20a8e68e18730ba9c0e54660e filelock-3.17.0.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index f26030a9e4..44599ee865 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.16.1 +PYTHON_FILELOCK_VERSION = 3.17.0 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/9d/db/3ef5bb276dae18d6ec2124224403d1d67bccdbefc17af4cc8f553e341ab1 +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/dc/9c/0b15fb47b464e1b663b1acd1253a062aa5feecb07d4e597daea542ebd2b5 PYTHON_FILELOCK_SETUP_TYPE = hatch PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index 375b5c8c03..b197ea9542 100644 --- a/package/python-fire/python-fire.hash +++ b/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 4f2da2e8111c45e60b8806529949fda0 fire-0.7.0.tar.gz -sha256 961550f07936eaf65ad1dc8360f2b2bf8408fad46abbfa4d2a3794f8d2a95cdf fire-0.7.0.tar.gz +md5 182fc2764d8e891964ae3ad2861102dd fire-0.7.1.tar.gz +sha256 3b208f05c736de98fb343310d090dcc4d8c78b2a89ea4f32b837c586270a9cbf fire-0.7.1.tar.gz # Locally computed sha256 checksums sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 4318707321..7f035493b8 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.7.0 +PYTHON_FIRE_VERSION = 0.7.1 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/6b/b6/82c7e601d6d3c3278c40b7bd35e17e82aa227f050aa9f66cb7b7fce29471 +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/c0/00/f8d10588d2019d6d6452653def1ee807353b21983db48550318424b5ff18 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE diff --git a/package/python-flask-caching/Config.in b/package/python-flask-caching/Config.in new file mode 100644 index 0000000000..ad8c617f7a --- /dev/null +++ b/package/python-flask-caching/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_FLASK_CACHING + bool "python-flask-caching" + select BR2_PACKAGE_PYTHON_CACHELIB # runtime + select BR2_PACKAGE_PYTHON_FLASK # runtime + help + Adds caching support to Flask applications. + + https://github.com/pallets-eco/flask-caching diff --git a/package/python-flask-caching/python-flask-caching.hash b/package/python-flask-caching/python-flask-caching.hash new file mode 100644 index 0000000000..ee3f669934 --- /dev/null +++ b/package/python-flask-caching/python-flask-caching.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/flask-caching/json +md5 026d06167ba7353ac65c861950ad5696 flask_caching-2.3.1.tar.gz +sha256 65d7fd1b4eebf810f844de7de6258254b3248296ee429bdcb3f741bcbf7b98c9 flask_caching-2.3.1.tar.gz +# Locally computed sha256 checksums +sha256 1f3c445faa26eb32d90291228510e2d8594bd1fe15463f5d70c87d44f38872fd LICENSE +sha256 7729328f7b1ce664dbf630f077581cdfe97379b58b49e9a4f20c63912a5e5c09 docs/license.rst diff --git a/package/python-flask-caching/python-flask-caching.mk b/package/python-flask-caching/python-flask-caching.mk new file mode 100644 index 0000000000..db305d3dde --- /dev/null +++ b/package/python-flask-caching/python-flask-caching.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-caching +# +################################################################################ + +PYTHON_FLASK_CACHING_VERSION = 2.3.1 +PYTHON_FLASK_CACHING_SOURCE = flask_caching-$(PYTHON_FLASK_CACHING_VERSION).tar.gz +PYTHON_FLASK_CACHING_SITE = https://files.pythonhosted.org/packages/e2/80/74846c8af58ed60972d64f23a6cd0c3ac0175677d7555dff9f51bf82c294 +PYTHON_FLASK_CACHING_SETUP_TYPE = setuptools +PYTHON_FLASK_CACHING_LICENSE = BSD-3-Clause +PYTHON_FLASK_CACHING_LICENSE_FILES = LICENSE docs/license.rst + +$(eval $(python-package)) diff --git a/package/python-flask-cors/python-flask-cors.hash b/package/python-flask-cors/python-flask-cors.hash index 41c232df36..974d4a7a9e 100644 --- a/package/python-flask-cors/python-flask-cors.hash +++ b/package/python-flask-cors/python-flask-cors.hash @@ -1,5 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flask-cors/json -md5 a6e8202cc008ef6f70ce75a7ae7f8d9d flask_cors-5.0.0.tar.gz -sha256 5aadb4b950c4e93745034594d9f3ea6591f734bb3662e16e255ffbf5e89c88ef flask_cors-5.0.0.tar.gz -# Locally computed sha256 checksums -sha256 6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d LICENSE +md5 2879503d54f25a4cacb62f7060b96e14 flask_cors-6.0.1.tar.gz +sha256 d81bcb31f07b0985be7f48406247e9243aced229b7747219160a0559edd678db flask_cors-6.0.1.tar.gz diff --git a/package/python-flask-cors/python-flask-cors.mk b/package/python-flask-cors/python-flask-cors.mk index 1119648370..c7bc338867 100644 --- a/package/python-flask-cors/python-flask-cors.mk +++ b/package/python-flask-cors/python-flask-cors.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_FLASK_CORS_VERSION = 5.0.0 +PYTHON_FLASK_CORS_VERSION = 6.0.1 PYTHON_FLASK_CORS_SOURCE = flask_cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz -PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/4f/d0/d9e52b154e603b0faccc0b7c2ad36a764d8755ef4036acbf1582a67fb86b +PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/76/37/bcfa6c7d5eec777c4c7cf45ce6b27631cebe5230caf88d85eadd63edd37a PYTHON_FLASK_CORS_SETUP_TYPE = setuptools PYTHON_FLASK_CORS_LICENSE = MIT -PYTHON_FLASK_CORS_LICENSE_FILES = LICENSE PYTHON_FLASK_CORS_CPE_ID_VENDOR = flask-cors_project PYTHON_FLASK_CORS_CPE_ID_PRODUCT = flask-cors diff --git a/package/python-flask-restx/Config.in b/package/python-flask-restx/Config.in new file mode 100644 index 0000000000..efae7a0aeb --- /dev/null +++ b/package/python-flask-restx/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_FLASK_RESTX + bool "python-flask-restx" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-jsonschema, python-referencing -> python-rpds-py + select BR2_PACKAGE_PYTHON_ANISO8601 # runtime + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime + select BR2_PACKAGE_PYTHON_REFERENCING # runtime + select BR2_PACKAGE_PYTHON_WERKZEUG # runtime + help + Fully featured framework for fast, easy and documented API + development with Flask. + + https://github.com/python-restx/flask-restx diff --git a/package/python-flask-restx/python-flask-restx.hash b/package/python-flask-restx/python-flask-restx.hash new file mode 100644 index 0000000000..5bbe0dfa93 --- /dev/null +++ b/package/python-flask-restx/python-flask-restx.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flask-restx/json +md5 3fe0cd948ae1a0ebcbca569daf069586 flask-restx-1.3.2.tar.gz +sha256 0ae13d77e7d7e4dce513970cfa9db45364aef210e99022de26d2b73eb4dbced5 flask-restx-1.3.2.tar.gz +# Locally computed sha256 checksums +sha256 d736fc20d979831ab5c380973d01542de97857d975b60a4cf03efbd9e4e38997 LICENSE diff --git a/package/python-flask-restx/python-flask-restx.mk b/package/python-flask-restx/python-flask-restx.mk new file mode 100644 index 0000000000..f8e8ef133a --- /dev/null +++ b/package/python-flask-restx/python-flask-restx.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-restx +# +################################################################################ + +PYTHON_FLASK_RESTX_VERSION = 1.3.2 +PYTHON_FLASK_RESTX_SOURCE = flask-restx-$(PYTHON_FLASK_RESTX_VERSION).tar.gz +PYTHON_FLASK_RESTX_SITE = https://files.pythonhosted.org/packages/43/89/9b9ca58cbb8e9ec46f4a510ba93878e0c88d518bf03c350e3b1b7ad85cbe +PYTHON_FLASK_RESTX_SETUP_TYPE = setuptools +PYTHON_FLASK_RESTX_LICENSE = BSD-3-Clause +PYTHON_FLASK_RESTX_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index 415e2068b0..17564e8587 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/flask/json -md5 4658b022a07f6d8df51ef24c717fe162 flask-3.0.3.tar.gz -sha256 ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842 flask-3.0.3.tar.gz +md5 59dc1b0772bab098aff83e8008e97af6 flask-3.1.1.tar.gz +sha256 284c7b8f2f58cb737f0cf1c30fd7eaf0ccfcde196099d24ecede3fc2005aa59e flask-3.1.1.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.txt sha256 1e07e9c25f2618a040560b70e63f42259eab24e558d0f3532e6163d751cb4eea docs/license.rst diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index a4a19efba0..2269b05d29 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 3.0.3 +PYTHON_FLASK_VERSION = 3.1.1 PYTHON_FLASK_SOURCE = flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/41/e1/d104c83026f8d35dfd2c261df7d64738341067526406b40190bc063e829a +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/c0/de/e47735752347f4128bcf354e0da07ef311a78244eba9e3dc1d4a5ab21a98 PYTHON_FLASK_SETUP_TYPE = flit PYTHON_FLASK_LICENSE = BSD-3-Clause PYTHON_FLASK_LICENSE_FILES = LICENSE.txt docs/license.rst diff --git a/package/python-flatbuffers/python-flatbuffers.hash b/package/python-flatbuffers/python-flatbuffers.hash index ccc754f9be..1d046fb3f4 100644 --- a/package/python-flatbuffers/python-flatbuffers.hash +++ b/package/python-flatbuffers/python-flatbuffers.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flatbuffers/json -md5 3391732d344155cc070892fae5f7166c flatbuffers-2.0.7.tar.gz -sha256 0ae7d69c5b82bf41962ca5fde9cc43033bc9501311d975fd5a25e8a7d29c1245 flatbuffers-2.0.7.tar.gz +md5 a0f1d5a1ae9f0a99b38c15041f2e1739 flatbuffers-25.9.23.tar.gz +sha256 676f9fa62750bb50cf531b42a0a2a118ad8f7f797a511eda12881c016f093b12 flatbuffers-25.9.23.tar.gz diff --git a/package/python-flatbuffers/python-flatbuffers.mk b/package/python-flatbuffers/python-flatbuffers.mk index 65f3d0955c..8b9c06df52 100644 --- a/package/python-flatbuffers/python-flatbuffers.mk +++ b/package/python-flatbuffers/python-flatbuffers.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLATBUFFERS_VERSION = 2.0.7 +PYTHON_FLATBUFFERS_VERSION = 25.9.23 PYTHON_FLATBUFFERS_SOURCE = flatbuffers-$(PYTHON_FLATBUFFERS_VERSION).tar.gz -PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/d1/90/0532e737a11e1dc50e9e352c3ccc97338cb75991f83279c2edbc9234e022 +PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/9d/1f/3ee70b0a55137442038f2a33469cc5fddd7e0ad2abf83d7497c18a2b6923 PYTHON_FLATBUFFERS_LICENSE = Apache-2.0 PYTHON_FLATBUFFERS_SETUP_TYPE = setuptools diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index f8e71bf398..580a99edf0 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 a3381dd58e23e9826c5199b1f70318b0 flit_core-3.10.1.tar.gz -sha256 66e5b87874a0d6e39691f0e22f09306736b633548670ad3c09ec9db03c5662f7 flit_core-3.10.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/flit-core/json +md5 c538415c1f27bd69cbbbf3cdd5135d39 flit_core-3.12.0.tar.gz +sha256 18f63100d6f94385c6ed57a72073443e1a71a4acb4339491615d0f16d6ff01b2 flit_core-3.12.0.tar.gz # Locally computed sha256 checksums sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index bfa80af3e3..ee958cece5 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.10.1 +PYTHON_FLIT_CORE_VERSION = 3.12.0 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/d5/ae/09427bea9227a33ec834ed5461432752fd5d02b14f93dd68406c91684622 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/69/59/b6fc2188dfc7ea4f936cd12b49d707f66a1cb7a1d2c16172963534db741b PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 3c691fbd89..b83663e8fb 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 ed2b78a3c9b7982608ee605f1fd952b0 fonttools-4.54.1.tar.gz -sha256 957f669d4922f92c171ba01bef7f29410668db09f6c02111e22b2bce446f3285 fonttools-4.54.1.tar.gz +md5 55a7d3d40e191410bbe604d0d795baa4 fonttools-4.61.0.tar.gz +sha256 ec520a1f0c7758d7a858a00f090c1745f6cde6a7c5e76fb70ea4044a15f712e7 fonttools-4.61.0.tar.gz # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index ebb7f14302..592ef51354 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.54.1 +PYTHON_FONTTOOLS_VERSION = 4.61.0 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).tar.gz -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/11/1d/70b58e342e129f9c0ce030029fb4b2b0670084bbbfe1121d008f6a1e361c +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/33/f9/0e84d593c0e12244150280a630999835a64f2852276161b62a0f98318de0 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-fs/python-fs.hash b/package/python-fs/python-fs.hash new file mode 100644 index 0000000000..5ebb49128d --- /dev/null +++ b/package/python-fs/python-fs.hash @@ -0,0 +1,5 @@ +# From https://pypi.org/project/fs/#fs-2.4.16.tar.gz +sha256 ae97c7d51213f4b70b6a958292530289090de3a7e15841e108fbe144f069d313 fs-2.4.16.tar.gz + +# Locally calculated +sha256 bcc1fbae1da071a15d17fd7609519af1160a3d72c65622047b61e19ba63e780d LICENSE diff --git a/package/python-fs/python-fs.mk b/package/python-fs/python-fs.mk new file mode 100644 index 0000000000..8d684e6ebd --- /dev/null +++ b/package/python-fs/python-fs.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-fs +# +################################################################################ + +PYTHON_FS_VERSION = 2.4.16 +PYTHON_FS_SOURCE = fs-$(PYTHON_FS_VERSION).tar.gz +PYTHON_FS_SITE = https://files.pythonhosted.org/packages/5d/a9/af5bfd5a92592c16cdae5c04f68187a309be8a146b528eac3c6e30edbad2 +PYTHON_FS_SETUP_TYPE = setuptools +PYTHON_FS_LICENSE = MIT +PYTHON_FS_LICENSE_FILES = LICENSE +HOST_PYTHON_FS_DEPENDENCIES = host-python-six host-python-appdirs + +$(eval $(host-python-package)) diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 698863a13d..6276440c40 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -10,5 +10,6 @@ PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/a7/b2/4140c69c6a664 PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt +PYTHON_FUTURE_CPE_ID_VENDOR = pythoncharmers $(eval $(python-package)) diff --git a/package/python-git/python-git.hash b/package/python-git/python-git.hash index 44b91662dd..aac8b3fab0 100644 --- a/package/python-git/python-git.hash +++ b/package/python-git/python-git.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/gitpython/json -md5 350a6dd0d1d560e0af82733592e8dbb3 GitPython-3.1.43.tar.gz -sha256 35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c GitPython-3.1.43.tar.gz +md5 14e2083b71e235ba4d81fa485ce9153d gitpython-3.1.44.tar.gz +sha256 c87e30b26253bf5418b01b0660f818967f3c503193838337fe5e573331249269 gitpython-3.1.44.tar.gz # Locally computed sha256 checksums sha256 86fc94c321a9afbc11514713511bafded225f25100dcc0f7350e82bc231b8beb LICENSE diff --git a/package/python-git/python-git.mk b/package/python-git/python-git.mk index 9975af9198..318cb614f0 100644 --- a/package/python-git/python-git.mk +++ b/package/python-git/python-git.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GIT_VERSION = 3.1.43 -PYTHON_GIT_SOURCE = GitPython-$(PYTHON_GIT_VERSION).tar.gz -PYTHON_GIT_SITE = https://files.pythonhosted.org/packages/b6/a1/106fd9fa2dd989b6fb36e5893961f82992cf676381707253e0bf93eb1662 +PYTHON_GIT_VERSION = 3.1.44 +PYTHON_GIT_SOURCE = gitpython-$(PYTHON_GIT_VERSION).tar.gz +PYTHON_GIT_SITE = https://files.pythonhosted.org/packages/c0/89/37df0b71473153574a5cdef8f242de422a0f5d26d7a9e231e6f169b4ad14 PYTHON_GIT_LICENSE = BSD-3-Clause PYTHON_GIT_LICENSE_FILES = LICENSE PYTHON_GIT_SETUP_TYPE = setuptools diff --git a/package/python-gitdb2/python-gitdb2.hash b/package/python-gitdb2/python-gitdb2.hash index c70c1aade9..74a7c6ead8 100644 --- a/package/python-gitdb2/python-gitdb2.hash +++ b/package/python-gitdb2/python-gitdb2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/gitdb/json -md5 6071755f2899cd4882b83a070b045bac gitdb-4.0.11.tar.gz -sha256 bf5421126136d6d0af55bc1e7c1af1c397a34f5b7bd79e776cd3e89785c2b04b gitdb-4.0.11.tar.gz +md5 13bf7fcb906ead5236d1edc6e6656924 gitdb-4.0.12.tar.gz +sha256 5ef71f855d191a3326fcfbc0d5da835f26b13fbcba60c32c21091c349ffdb571 gitdb-4.0.12.tar.gz # Locally computed sha256 checksums sha256 efd29f596a08e8857e68e7694a50bcda72839792da7c3f041bcbff5f18009239 LICENSE diff --git a/package/python-gitdb2/python-gitdb2.mk b/package/python-gitdb2/python-gitdb2.mk index 424f37f8f4..55ec0fc6d5 100644 --- a/package/python-gitdb2/python-gitdb2.mk +++ b/package/python-gitdb2/python-gitdb2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GITDB2_VERSION = 4.0.11 +PYTHON_GITDB2_VERSION = 4.0.12 PYTHON_GITDB2_SOURCE = gitdb-$(PYTHON_GITDB2_VERSION).tar.gz -PYTHON_GITDB2_SITE = https://files.pythonhosted.org/packages/19/0d/bbb5b5ee188dec84647a4664f3e11b06ade2bde568dbd489d9d64adef8ed +PYTHON_GITDB2_SITE = https://files.pythonhosted.org/packages/72/94/63b0fc47eb32792c7ba1fe1b694daec9a63620db1e313033d18140c2320a PYTHON_GITDB2_SETUP_TYPE = setuptools PYTHON_GITDB2_LICENSE = BSD-3-Clause PYTHON_GITDB2_LICENSE_FILES = LICENSE diff --git a/package/python-glslang/python-glslang.hash b/package/python-glslang/python-glslang.hash index df9127939e..16b399e542 100644 --- a/package/python-glslang/python-glslang.hash +++ b/package/python-glslang/python-glslang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162 python-glslang-11.13.0.tar.gz -sha256 adb783e734e906d1f46db5df29991dbde84bdb0ceab502ac2febb44fe3c2b5f4 LICENSE.txt +sha256 172385478520335147d3b03a1587424af0935398184095f24beab128a254ecc7 python-glslang-16.0.0.tar.gz +sha256 17e70c676e1521ff3e4686f04a2053d93a7e28a33be8de7ec37ab0ff72feb677 LICENSE.txt diff --git a/package/python-glslang/python-glslang.mk b/package/python-glslang/python-glslang.mk index 94f480e30a..48e5531600 100644 --- a/package/python-glslang/python-glslang.mk +++ b/package/python-glslang/python-glslang.mk @@ -4,10 +4,14 @@ # ################################################################################ -PYTHON_GLSLANG_VERSION = 11.13.0 +PYTHON_GLSLANG_VERSION = 16.0.0 PYTHON_GLSLANG_SITE = $(call github,KhronosGroup,glslang,$(PYTHON_GLSLANG_VERSION)) PYTHON_GLSLANG_LICENSE = BSD-3-Clause PYTHON_GLSLANG_LICENSE_FILES = LICENSE.txt -PYTHON_GLSLANG_DEPENDENCIES = host-python3 +HOST_PYTHON_GLSLANG_DEPENDENCIES = host-python3 host-spirv-tools + +HOST_PYTHON_GLSLANG_CONF_OPTS += \ + -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ + -DGLSLANG_TESTS=OFF $(eval $(host-cmake-package)) diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash index 5d722a1b95..9f3ba63721 100644 --- a/package/python-gnupg/python-gnupg.hash +++ b/package/python-gnupg/python-gnupg.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-gnupg/json -md5 48c77a551bed992d19f7a99e3c6fb9d6 python-gnupg-0.5.3.tar.gz -sha256 290d8ddb9cd63df96cfe9284b9b265f19fd6e145e5582dc58fd7271f026d0a47 python-gnupg-0.5.3.tar.gz +md5 8358b54f2c76b714545f04df3f33df28 python-gnupg-0.5.4.tar.gz +sha256 f2fdb5fb29615c77c2743e1cb3d9314353a6e87b10c37d238d91ae1c6feae086 python-gnupg-0.5.4.tar.gz # Locally computed sha256 checksums sha256 4104ca980dbca7603fc553078378eb14566a76f819d033d7bff89fd6a97e181b LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index 00c1b9edde..ae5548660f 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_GNUPG_VERSION = 0.5.3 -PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/85/61/2df3cd6f49dbb2d4a6a567cac1d803e3a50d86207e196d0f9e67a48664f7 +PYTHON_GNUPG_VERSION = 0.5.4 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/f1/3e/ba0dc69c9f4e0aeb24d93175230ef057c151790a7516012f61014918992d PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt PYTHON_GNUPG_CPE_ID_VENDOR = python diff --git a/package/python-gobject/Config.in b/package/python-gobject/Config.in index 3354535637..d9d73cc5e3 100644 --- a/package/python-gobject/Config.in +++ b/package/python-gobject/Config.in @@ -4,17 +4,17 @@ config BR2_PACKAGE_PYTHON_GOBJECT depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu - depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # gobject-introspection select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBGLIB2 help Python bindings for the GLib/GObject library - https://wiki.gnome.org/action/show/Projects/PyGObject + https://pygobject.gnome.org/ -comment "python-gobject needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" +comment "python-gobject needs a glibc or musl toolchain, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_HOST_GCC_AT_LEAST_8 diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 2fb9d38ab0..be19fc1900 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from https://download.gnome.org/sources/pygobject/3.42/pygobject-3.42.2.sha256sum -sha256 ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957 pygobject-3.42.2.tar.xz -sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING +# from https://download.gnome.org/sources/pygobject/3.54/pygobject-3.54.2.sha256sum +sha256 03cffeb49d8a1879b621d8f606ac904218019a0ae699b1cd3780a8ee611e696b pygobject-3.54.2.tar.gz +sha256 f4cac31434b287b10a70b81c62cfa973d250417f8f248c4c1b5566d061ecfb2f COPYING diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index a12ce5c107..0d96c299cf 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOBJECT_VERSION_MAJOR = 3.42 +PYTHON_GOBJECT_VERSION_MAJOR = 3.54 PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).2 -PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz +PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.gz PYTHON_GOBJECT_SITE = https://download.gnome.org/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ PYTHON_GOBJECT_LICENSE_FILES = COPYING diff --git a/package/python-google-api-core/python-google-api-core.hash b/package/python-google-api-core/python-google-api-core.hash index 397ce7cb40..16845addb4 100644 --- a/package/python-google-api-core/python-google-api-core.hash +++ b/package/python-google-api-core/python-google-api-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/google-api-core/json -md5 b69067b81abd55aa7eecc22858ea326c google_api_core-2.22.0.tar.gz -sha256 26f8d76b96477db42b55fd02a33aae4a42ec8b86b98b94969b7333a2c828bf35 google_api_core-2.22.0.tar.gz +md5 160d95edde90db1d72b6de58b673c993 google_api_core-2.26.0.tar.gz +sha256 e6e6d78bd6cf757f4aee41dcc85b07f485fbb069d5daa3afb126defba1e91a62 google_api_core-2.26.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-google-api-core/python-google-api-core.mk b/package/python-google-api-core/python-google-api-core.mk index b48d934e73..c88fb2ec28 100644 --- a/package/python-google-api-core/python-google-api-core.mk +++ b/package/python-google-api-core/python-google-api-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLE_API_CORE_VERSION = 2.22.0 +PYTHON_GOOGLE_API_CORE_VERSION = 2.26.0 PYTHON_GOOGLE_API_CORE_SOURCE = google_api_core-$(PYTHON_GOOGLE_API_CORE_VERSION).tar.gz -PYTHON_GOOGLE_API_CORE_SITE = https://files.pythonhosted.org/packages/00/c2/425f97c2087affbd452a05d3faa08d97de333f2ca554733e1becab55ee4e +PYTHON_GOOGLE_API_CORE_SITE = https://files.pythonhosted.org/packages/32/ea/e7b6ac3c7b557b728c2d0181010548cbbdd338e9002513420c5a354fa8df PYTHON_GOOGLE_API_CORE_SETUP_TYPE = setuptools PYTHON_GOOGLE_API_CORE_LICENSE = Apache-2.0 PYTHON_GOOGLE_API_CORE_LICENSE_FILES = LICENSE diff --git a/package/python-google-auth/python-google-auth.hash b/package/python-google-auth/python-google-auth.hash index ef0ceaeb60..37641a7a90 100644 --- a/package/python-google-auth/python-google-auth.hash +++ b/package/python-google-auth/python-google-auth.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/google-auth/json -md5 8dba1c171af4d945fb479ab27a0aac38 google_auth-2.36.0.tar.gz -sha256 545e9618f2df0bcbb7dcbc45a546485b1212624716975a1ea5ae8149ce769ab1 google_auth-2.36.0.tar.gz +md5 cf398efdf51cd3885eef521198a202a5 google_auth-2.41.1.tar.gz +sha256 b76b7b1f9e61f0cb7e88870d14f6a94aeef248959ef6992670efee37709cbfd2 google_auth-2.41.1.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-google-auth/python-google-auth.mk b/package/python-google-auth/python-google-auth.mk index f2ccc2e3de..e649569b37 100644 --- a/package/python-google-auth/python-google-auth.mk +++ b/package/python-google-auth/python-google-auth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLE_AUTH_VERSION = 2.36.0 +PYTHON_GOOGLE_AUTH_VERSION = 2.41.1 PYTHON_GOOGLE_AUTH_SOURCE = google_auth-$(PYTHON_GOOGLE_AUTH_VERSION).tar.gz -PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/6a/71/4c5387d8a3e46e3526a8190ae396659484377a73b33030614dd3b28e7ded +PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/a8/af/5129ce5b2f9688d2fa49b463e544972a7c82b0fdb50980dafee92e121d9f PYTHON_GOOGLE_AUTH_SETUP_TYPE = setuptools PYTHON_GOOGLE_AUTH_LICENSE = Apache-2.0 PYTHON_GOOGLE_AUTH_LICENSE_FILES = LICENSE diff --git a/package/python-googleapis-common-protos/python-googleapis-common-protos.hash b/package/python-googleapis-common-protos/python-googleapis-common-protos.hash index 408f07994d..a00b871bb8 100644 --- a/package/python-googleapis-common-protos/python-googleapis-common-protos.hash +++ b/package/python-googleapis-common-protos/python-googleapis-common-protos.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/googleapis-common-protos/json -md5 cdb94d19ca05b4f16da10bbf39da2347 googleapis_common_protos-1.65.0.tar.gz -sha256 334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0 googleapis_common_protos-1.65.0.tar.gz +md5 fca59b82ad99d5dc1da6a94e5ec6e819 googleapis_common_protos-1.70.0.tar.gz +sha256 0e1b44e0ea153e6594f9f394fef15193a68aaaea2d843f83e2742717ca753257 googleapis_common_protos-1.70.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-googleapis-common-protos/python-googleapis-common-protos.mk b/package/python-googleapis-common-protos/python-googleapis-common-protos.mk index 3f43f1516e..6afd1ea740 100644 --- a/package/python-googleapis-common-protos/python-googleapis-common-protos.mk +++ b/package/python-googleapis-common-protos/python-googleapis-common-protos.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION = 1.65.0 +PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION = 1.70.0 PYTHON_GOOGLEAPIS_COMMON_PROTOS_SOURCE = googleapis_common_protos-$(PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION).tar.gz -PYTHON_GOOGLEAPIS_COMMON_PROTOS_SITE = https://files.pythonhosted.org/packages/53/3b/1599ceafa875ffb951480c8c74f4b77646a6b80e80970698f2aa93c216ce +PYTHON_GOOGLEAPIS_COMMON_PROTOS_SITE = https://files.pythonhosted.org/packages/39/24/33db22342cf4a2ea27c9955e6713140fedd51e8b141b5ce5260897020f1a PYTHON_GOOGLEAPIS_COMMON_PROTOS_SETUP_TYPE = setuptools PYTHON_GOOGLEAPIS_COMMON_PROTOS_LICENSE = Apache-2.0 PYTHON_GOOGLEAPIS_COMMON_PROTOS_LICENSE_FILES = LICENSE diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 7ed4ff13a3..3f444fb8cb 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 13a71396abdf249280fa25d258acf435 greenlet-3.1.1.tar.gz -sha256 4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467 greenlet-3.1.1.tar.gz +md5 9aed26a4881c49d5f56c3f32f73e8572 greenlet-3.2.4.tar.gz +sha256 0dca0d95ff849f9a364385f36ab49f50065d76964944638be9691e1832e9f86d greenlet-3.2.4.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 5575ddaff5..bfe8f5d851 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 3.1.1 +PYTHON_GREENLET_VERSION = 3.2.4 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/2f/ff/df5fede753cc10f6a5be0931204ea30c35fa2f2ea7a35b25bdaf4fe40e46 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/03/b8/704d753a5a45507a7aab61f18db9509302ed3d0a27ac7e0359ec2905b1a6 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF diff --git a/package/python-grpc-requests/python-grpc-requests.hash b/package/python-grpc-requests/python-grpc-requests.hash index aeb5336a4c..6933b3d4c9 100644 --- a/package/python-grpc-requests/python-grpc-requests.hash +++ b/package/python-grpc-requests/python-grpc-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpc-requests/json -md5 6d63bed1f4a80fc3e59191ce69903d31 grpc_requests-0.1.20.tar.gz -sha256 a76744d781c5a7bf3abde8dc778d24c4e17deb39d173d85096ff3caee3d15250 grpc_requests-0.1.20.tar.gz +md5 e933897ca5e3ad723b17e2e46a957f84 grpc_requests-0.1.21.tar.gz +sha256 9525bcbc5439f334b39248b9bd867313631e74530cfde1aaf43e76be0298bf20 grpc_requests-0.1.21.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-grpc-requests/python-grpc-requests.mk b/package/python-grpc-requests/python-grpc-requests.mk index 7fecdf5a3c..1830c4dbab 100644 --- a/package/python-grpc-requests/python-grpc-requests.mk +++ b/package/python-grpc-requests/python-grpc-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPC_REQUESTS_VERSION = 0.1.20 +PYTHON_GRPC_REQUESTS_VERSION = 0.1.21 PYTHON_GRPC_REQUESTS_SOURCE = grpc_requests-$(PYTHON_GRPC_REQUESTS_VERSION).tar.gz -PYTHON_GRPC_REQUESTS_SITE = https://files.pythonhosted.org/packages/92/84/f5a3874a6e10448d8c198253d2c79f7b34a23fb4a96b78a648dc468913a6 +PYTHON_GRPC_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/58/7e2be40bad0964f7d6f1c11f72be941c19575ab426c10e1b97e17aa1e42f PYTHON_GRPC_REQUESTS_SETUP_TYPE = setuptools PYTHON_GRPC_REQUESTS_LICENSE = Apache-2.0 PYTHON_GRPC_REQUESTS_LICENSE_FILES = LICENSE diff --git a/package/python-grpcio-reflection/python-grpcio-reflection.hash b/package/python-grpcio-reflection/python-grpcio-reflection.hash index a64fbeae54..badabd1926 100644 --- a/package/python-grpcio-reflection/python-grpcio-reflection.hash +++ b/package/python-grpcio-reflection/python-grpcio-reflection.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpcio-reflection/json -md5 e9a0f06f8886b5f95da4e599b0960ef5 grpcio_reflection-1.67.1.tar.gz -sha256 507d9785a72032816e9bb5add4a660c655813a6bc1537b957822c652c88bf458 grpcio_reflection-1.67.1.tar.gz +md5 4ae2aa3781881acd8df23793965407e4 grpcio_reflection-1.70.0.tar.gz +sha256 af46ce13e57fd7602deaef5b1d1903f6644f8982cc00f62fa9fa5b928acf6a49 grpcio_reflection-1.70.0.tar.gz # Locally computed sha256 checksums sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/python-grpcio-reflection/python-grpcio-reflection.mk b/package/python-grpcio-reflection/python-grpcio-reflection.mk index 4e8c3e8dc3..4339e31abe 100644 --- a/package/python-grpcio-reflection/python-grpcio-reflection.mk +++ b/package/python-grpcio-reflection/python-grpcio-reflection.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPCIO_REFLECTION_VERSION = 1.67.1 +PYTHON_GRPCIO_REFLECTION_VERSION = 1.70.0 PYTHON_GRPCIO_REFLECTION_SOURCE = grpcio_reflection-$(PYTHON_GRPCIO_REFLECTION_VERSION).tar.gz -PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/17/61/618d56bd1f7069dea5fee8fa6efb5e6548b6edb52000ef1a7b242c0c1b04 +PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/42/98/f76681980ec7e9813e010d2778f4109816650760f6839661ae378286b3b5 PYTHON_GRPCIO_REFLECTION_SETUP_TYPE = setuptools PYTHON_GRPCIO_REFLECTION_LICENSE = Apache-2.0 PYTHON_GRPCIO_REFLECTION_LICENSE_FILES = LICENSE diff --git a/package/python-grpcio/python-grpcio.hash b/package/python-grpcio/python-grpcio.hash index 5784e4758c..c57ece77ca 100644 --- a/package/python-grpcio/python-grpcio.hash +++ b/package/python-grpcio/python-grpcio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpcio/json -md5 f1e17b3bf215880d87fb8d853bd5dc4c grpcio-1.67.1.tar.gz -sha256 3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732 grpcio-1.67.1.tar.gz +md5 ad83dd7166a99b20c0e004b538eb5ad9 grpcio-1.70.0.tar.gz +sha256 8d1584a68d5922330025881e63a6c1b54cc8117291d382e4fa69339b6d914c56 grpcio-1.70.0.tar.gz # Locally computed sha256 checksums sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/python-grpcio/python-grpcio.mk b/package/python-grpcio/python-grpcio.mk index ed854b5098..24c0a08cae 100644 --- a/package/python-grpcio/python-grpcio.mk +++ b/package/python-grpcio/python-grpcio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPCIO_VERSION = 1.67.1 +PYTHON_GRPCIO_VERSION = 1.70.0 PYTHON_GRPCIO_SOURCE = grpcio-$(PYTHON_GRPCIO_VERSION).tar.gz -PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/20/53/d9282a66a5db45981499190b77790570617a604a38f3d103d0400974aeb5 +PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/69/e1/4b21b5017c33f3600dcc32b802bb48fe44a4d36d6c066f52650c7c2690fa PYTHON_GRPCIO_SETUP_TYPE = setuptools PYTHON_GRPCIO_LICENSE = Apache-2.0 PYTHON_GRPCIO_LICENSE_FILES = LICENSE diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash index cc65209138..31ff505fdb 100644 --- a/package/python-grpclib/python-grpclib.hash +++ b/package/python-grpclib/python-grpclib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpclib/json -md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz -sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +md5 c37be825d02fa3f3f488f172c784ca71 grpclib-0.4.8.tar.gz +sha256 d8823763780ef94fed8b2c562f7485cf0bbee15fc7d065a640673667f7719c9a grpclib-0.4.8.tar.gz # Locally computed sha256 checksums sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk index 0bec0a1879..4f8406ee69 100644 --- a/package/python-grpclib/python-grpclib.mk +++ b/package/python-grpclib/python-grpclib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_VERSION = 0.4.8 PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz -PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/19/75/0f0d3524b38b35e5cd07334b754aa9bd0570140ad982131b04ebfa3b0374 PYTHON_GRPCLIB_SETUP_TYPE = setuptools PYTHON_GRPCLIB_LICENSE = BSD-3-Clause PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt diff --git a/package/python-h11/python-h11.hash b/package/python-h11/python-h11.hash index 0c65a11d00..1ea92278dd 100644 --- a/package/python-h11/python-h11.hash +++ b/package/python-h11/python-h11.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h11/json -md5 84c33fc0aa1f868928114c4d02c43dc2 h11-0.14.0.tar.gz -sha256 8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d h11-0.14.0.tar.gz +md5 af51401a776fd654cfd98a197af9f21f h11-0.16.0.tar.gz +sha256 4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1 h11-0.16.0.tar.gz # Locally computed sha256 checksums sha256 37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361 LICENSE.txt diff --git a/package/python-h11/python-h11.mk b/package/python-h11/python-h11.mk index d7dca5244b..4e4685ea5a 100644 --- a/package/python-h11/python-h11.mk +++ b/package/python-h11/python-h11.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H11_VERSION = 0.14.0 +PYTHON_H11_VERSION = 0.16.0 PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz -PYTHON_H11_SITE = https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03 +PYTHON_H11_SITE = https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963 PYTHON_H11_SETUP_TYPE = setuptools PYTHON_H11_LICENSE = MIT PYTHON_H11_LICENSE_FILES = LICENSE.txt diff --git a/package/python-h2/python-h2.hash b/package/python-h2/python-h2.hash index 2f9c8f647f..5adfc86f52 100644 --- a/package/python-h2/python-h2.hash +++ b/package/python-h2/python-h2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/h2/json -md5 4274f9619c0a43bb4ae01b6b02bf0c99 h2-4.1.0.tar.gz -sha256 a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb h2-4.1.0.tar.gz +md5 b4781bbaaae609aa759565585718e0d7 h2-4.3.0.tar.gz +sha256 6c59efe4323fa18b47a632221a1888bd7fde6249819beda254aeca909f221bf1 h2-4.3.0.tar.gz # Locally computed sha256 checksums sha256 7a65a5af0cbabf1c16251c7c6b2b7cb46d16a7222e79975b9b61fcd66a2e3f28 LICENSE diff --git a/package/python-h2/python-h2.mk b/package/python-h2/python-h2.mk index 699e8baece..d9cfbdbf92 100644 --- a/package/python-h2/python-h2.mk +++ b/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 4.1.0 +PYTHON_H2_VERSION = 4.3.0 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://files.pythonhosted.org/packages/2a/32/fec683ddd10629ea4ea46d206752a95a2d8a48c22521edd70b142488efe1 +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/1d/17/afa56379f94ad0fe8defd37d6eb3f89a25404ffc71d4d848893d270325fc PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash index e3a6363eb7..e2d22cb287 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatch-fancy-pypi-readme/json -md5 f5f9e639f066c91f8e623ec6231beae9 hatch_fancy_pypi_readme-24.1.0.tar.gz -sha256 44dd239f1a779b9dcf8ebc9401a611fd7f7e3e14578dcf22c265dfaf7c1514b8 hatch_fancy_pypi_readme-24.1.0.tar.gz +md5 8e1ed2416887685adc1c909ed4fb63cb hatch_fancy_pypi_readme-25.1.0.tar.gz +sha256 9c58ed3dff90d51f43414ce37009ad1d5b0f08ffc9fc216998a06380f01c0045 hatch_fancy_pypi_readme-25.1.0.tar.gz # Locally computed sha256 checksums sha256 e69ea57f96e599e617f61af3e85bf326b87e833994709fb5e5908a81197730a2 LICENSE.txt diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk index 0857864965..5e658239b1 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_FANCY_PYPI_README_VERSION = 24.1.0 +PYTHON_HATCH_FANCY_PYPI_README_VERSION = 25.1.0 PYTHON_HATCH_FANCY_PYPI_README_SOURCE = hatch_fancy_pypi_readme-$(PYTHON_HATCH_FANCY_PYPI_README_VERSION).tar.gz -PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/b4/c2/c9094283a07dd96c5a8f7a5f1910259d40d2e29223b95dd875a6ca13b58f +PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/f3/0f/aed57c301f339936eb91cb4d8c1e5088a101081854bd3ec18a889df32365 PYTHON_HATCH_FANCY_PYPI_README_LICENSE = MIT PYTHON_HATCH_FANCY_PYPI_README_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = hatch diff --git a/package/python-hatch-vcs/python-hatch-vcs.hash b/package/python-hatch-vcs/python-hatch-vcs.hash index 55cd3b3e5a..16f08bcc4a 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.hash +++ b/package/python-hatch-vcs/python-hatch-vcs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatch_vcs/json -md5 d801fe7c3e5955307748f2790bbb3488 hatch_vcs-0.4.0.tar.gz -sha256 093810748fe01db0d451fabcf2c1ac2688caefd232d4ede967090b1c1b07d9f7 hatch_vcs-0.4.0.tar.gz +md5 9a22a9f7203783e526959d34510a9672 hatch_vcs-0.5.0.tar.gz +sha256 0395fa126940340215090c344a2bf4e2a77bcbe7daab16f41b37b98c95809ff9 hatch_vcs-0.5.0.tar.gz # Locally computed sha256 checksums sha256 117aa5006d8475562f04442ab06dd2a4c501af3a77255eae0deef1f0c2499a1a LICENSE.txt diff --git a/package/python-hatch-vcs/python-hatch-vcs.mk b/package/python-hatch-vcs/python-hatch-vcs.mk index f63d8b26fe..1fc2a19706 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.mk +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_VCS_VERSION = 0.4.0 +PYTHON_HATCH_VCS_VERSION = 0.5.0 PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz -PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/f5/c9/54bb4fa27b4e4a014ef3bb17710cdf692b3aa2cbc7953da885f1bf7e06ea +PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/6b/b0/4cc743d38adbee9d57d786fa496ed1daadb17e48589b6da8fa55717a0746 PYTHON_HATCH_VCS_LICENSE = MIT PYTHON_HATCH_VCS_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_VCS_SETUP_TYPE = hatch diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index b01d3df254..bb19d63561 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 ac265366ccd17365db319dc95a9e5bc5 hatchling-1.25.0.tar.gz -sha256 7064631a512610b52250a4d3ff1bd81551d6d1431c4eb7b72e734df6c74f4262 hatchling-1.25.0.tar.gz +md5 6ffb3087c9b6a9ffbfc1bb394f7ed1a8 hatchling-1.27.0.tar.gz +sha256 971c296d9819abb3811112fc52c7a9751c8d381898f36533bb16f9791e941fd6 hatchling-1.27.0.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index 2ca2caf67c..57fd34530b 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.25.0 +PYTHON_HATCHLING_VERSION = 1.27.0 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/a3/51/8a4a67a8174ce59cf49e816e38e9502900aea9b4af672d0127df8e10d3b0 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/8f/8a/cc1debe3514da292094f1c3a700e4ca25442489731ef7c0814358816bb03 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 diff --git a/package/python-hid/python-hid.hash b/package/python-hid/python-hid.hash index d03757771b..b990a2a9f8 100644 --- a/package/python-hid/python-hid.hash +++ b/package/python-hid/python-hid.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hid/json -md5 1954df0dce4e15afd89197e898039e92 hid-1.0.6.tar.gz -sha256 48d764d7ae9746ba123b96dbf457893ca80268b7791c4b1d2e051310eeb83860 hid-1.0.6.tar.gz +md5 231df641df11d452dae6b579ba2ccf6a hid-1.0.8.tar.gz +sha256 5ca129a7b9434ace5e3e429c1092a16792feffaf067a46b666e9c586872cdcfe hid-1.0.8.tar.gz # Locally computed sha256 checksums sha256 5524b425acacdfedeca3f959980f0cd38b00176ebbb292e4a96c520d6074353d LICENSE diff --git a/package/python-hid/python-hid.mk b/package/python-hid/python-hid.mk index 2f65bd1412..1e422dc97b 100644 --- a/package/python-hid/python-hid.mk +++ b/package/python-hid/python-hid.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HID_VERSION = 1.0.6 +PYTHON_HID_VERSION = 1.0.8 PYTHON_HID_SOURCE = hid-$(PYTHON_HID_VERSION).tar.gz -PYTHON_HID_SITE = https://files.pythonhosted.org/packages/50/b8/5f470948262b6cdda8e1b2382b19f67c57eacda1e07a14322807b911e0ce +PYTHON_HID_SITE = https://files.pythonhosted.org/packages/29/42/9cd3eab530ffae5e0ff880c575fd18cfdfe292b71f1e9872c392329f35fd PYTHON_HID_SETUP_TYPE = setuptools PYTHON_HID_LICENSE = MIT PYTHON_HID_LICENSE_FILES = LICENSE diff --git a/package/python-hiredis/python-hiredis.hash b/package/python-hiredis/python-hiredis.hash index d4d98d85df..e0215cb389 100644 --- a/package/python-hiredis/python-hiredis.hash +++ b/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 c0b7f7def9f945e8a900a4275df2d3af hiredis-3.0.0.tar.gz -sha256 fed8581ae26345dea1f1e0d1a96e05041a727a45e7d8d459164583e23c6ac441 hiredis-3.0.0.tar.gz +md5 3bef98b3714e3944e452a158c7d61f39 hiredis-3.2.1.tar.gz +sha256 5a5f64479bf04dd829fe7029fad0ea043eac4023abc6e946668cbbec3493a78d hiredis-3.2.1.tar.gz # Locally computed sha256 checksums sha256 3256b5b77e98aa34ff31a4d2c2c10f7f177b0f3058753a6044430a168987353b LICENSE sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/package/python-hiredis/python-hiredis.mk b/package/python-hiredis/python-hiredis.mk index 59e036c845..6b365b8dc4 100644 --- a/package/python-hiredis/python-hiredis.mk +++ b/package/python-hiredis/python-hiredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 3.0.0 +PYTHON_HIREDIS_VERSION = 3.2.1 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/8b/80/740fb0dfa7a42416ce8376490f41dcdb1e5deed9c3739dfe4200fad865a9 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/f7/08/24b72f425b75e1de7442fb1740f69ca66d5820b9f9c0e2511ff9aadab3b7 PYTHON_HIREDIS_SETUP_TYPE = setuptools PYTHON_HIREDIS_LICENSE = MIT, BSD-3-Clause PYTHON_HIREDIS_LICENSE_FILES = LICENSE vendor/hiredis/COPYING diff --git a/package/python-hpack/python-hpack.hash b/package/python-hpack/python-hpack.hash index 988cbaae0b..aaaa3bcbbb 100644 --- a/package/python-hpack/python-hpack.hash +++ b/package/python-hpack/python-hpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hpack/json -md5 27e01514ef06dc9fa0798d3dcb7de47c hpack-4.0.0.tar.gz -sha256 fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095 hpack-4.0.0.tar.gz +md5 16e7423c5b5078c1997fa3eedd2e5935 hpack-4.1.0.tar.gz +sha256 ec5eca154f7056aa06f196a557655c5b009b382873ac8d1e66e79e87535f1dca hpack-4.1.0.tar.gz # Locally computed sha256 checksums sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index 4b581c1001..2655a6b4ad 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HPACK_VERSION = 4.0.0 +PYTHON_HPACK_VERSION = 4.1.0 PYTHON_HPACK_SOURCE = hpack-$(PYTHON_HPACK_VERSION).tar.gz -PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db19b0f6b370e79d586b3e8528b20252c729c476a2c02954 +PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/2c/48/71de9ed269fdae9c8057e5a4c0aa7402e8bb16f2c6e90b3aa53327b113f8 PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE diff --git a/package/python-httpcore/python-httpcore.hash b/package/python-httpcore/python-httpcore.hash index 68c0450f94..2060762866 100644 --- a/package/python-httpcore/python-httpcore.hash +++ b/package/python-httpcore/python-httpcore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpcore/json -md5 458f9b56367cf547425bf2347bffd784 httpcore-1.0.6.tar.gz -sha256 73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f httpcore-1.0.6.tar.gz +md5 5157e7240632c2984cfda1f7ac54dfc7 httpcore-1.0.9.tar.gz +sha256 6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8 httpcore-1.0.9.tar.gz # Locally computed sha256 checksums sha256 fdcb59154c74cbaba16a11242f7740bea9f23d6feb5547917d8c5f94a80392a5 LICENSE.md diff --git a/package/python-httpcore/python-httpcore.mk b/package/python-httpcore/python-httpcore.mk index a432433884..957641916a 100644 --- a/package/python-httpcore/python-httpcore.mk +++ b/package/python-httpcore/python-httpcore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPCORE_VERSION = 1.0.6 +PYTHON_HTTPCORE_VERSION = 1.0.9 PYTHON_HTTPCORE_SOURCE = httpcore-$(PYTHON_HTTPCORE_VERSION).tar.gz -PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/b6/44/ed0fa6a17845fb033bd885c03e842f08c1b9406c86a2e60ac1ae1b9206a6 +PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb PYTHON_HTTPCORE_SETUP_TYPE = hatch PYTHON_HTTPCORE_LICENSE = BSD-3-Clause PYTHON_HTTPCORE_LICENSE_FILES = LICENSE.md diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash index cfbf55a4b0..5d18967a6d 100644 --- a/package/python-httplib2/python-httplib2.hash +++ b/package/python-httplib2/python-httplib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httplib2/json -md5 7ca0a2bfd95ba4ab4b6e28804cdb94ed httplib2-0.22.0.tar.gz -sha256 d7a10bc5ef5ab08322488bde8c726eeee5c8618723fdb399597ec58f3d82df81 httplib2-0.22.0.tar.gz +md5 b413de41724354a543f3cd33c0e75361 httplib2-0.31.0.tar.gz +sha256 ac7ab497c50975147d4f7b1ade44becc7df2f8954d42b38b3d69c515f531135c httplib2-0.31.0.tar.gz # Locally computed sha256 checksums sha256 589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4 LICENSE diff --git a/package/python-httplib2/python-httplib2.mk b/package/python-httplib2/python-httplib2.mk index 9d7061cfac..5609a25a54 100644 --- a/package/python-httplib2/python-httplib2.mk +++ b/package/python-httplib2/python-httplib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.22.0 +PYTHON_HTTPLIB2_VERSION = 0.31.0 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/3d/ad/2371116b22d616c194aa25ec410c9c6c37f23599dcd590502b74db197584 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/52/77/6653db69c1f7ecfe5e3f9726fdadc981794656fcd7d98c4209fecfea9993 PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT PYTHON_HTTPLIB2_LICENSE_FILES = LICENSE diff --git a/package/python-httpx/Config.in b/package/python-httpx/Config.in index 592cd559cd..0d20e6ca06 100644 --- a/package/python-httpx/Config.in +++ b/package/python-httpx/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_HTTPX select BR2_PACKAGE_PYTHON_CERTIFI # runtime select BR2_PACKAGE_PYTHON_HTTPCORE # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_SNIFFIO # runtime help The next generation HTTP client. diff --git a/package/python-httpx/python-httpx.hash b/package/python-httpx/python-httpx.hash index 3ffd491c9e..b2609c9b5c 100644 --- a/package/python-httpx/python-httpx.hash +++ b/package/python-httpx/python-httpx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpx/json -md5 f29763f29da610b185d2ca33937c572f httpx-0.27.2.tar.gz -sha256 f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2 httpx-0.27.2.tar.gz +md5 774cf32b9cd94a44189fbe5871026664 httpx-0.28.1.tar.gz +sha256 75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc httpx-0.28.1.tar.gz # Locally computed sha256 checksums sha256 4ec59d544f12b5f539a3a716fd321ac58ccd8030b465221f2c880200cdf28d8d LICENSE.md diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk index 21bbd48a58..aef46a33bf 100644 --- a/package/python-httpx/python-httpx.mk +++ b/package/python-httpx/python-httpx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPX_VERSION = 0.27.2 +PYTHON_HTTPX_VERSION = 0.28.1 PYTHON_HTTPX_SOURCE = httpx-$(PYTHON_HTTPX_VERSION).tar.gz -PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/78/82/08f8c936781f67d9e6b9eeb8a0c8b4e406136ea4c3d1f89a5db71d42e0e6 +PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956 PYTHON_HTTPX_SETUP_TYPE = hatch PYTHON_HTTPX_LICENSE = BSD-3-Clause PYTHON_HTTPX_LICENSE_FILES = LICENSE.md diff --git a/package/python-hyperframe/python-hyperframe.hash b/package/python-hyperframe/python-hyperframe.hash index b39ab51a72..a3abf27b15 100644 --- a/package/python-hyperframe/python-hyperframe.hash +++ b/package/python-hyperframe/python-hyperframe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hyperframe/json -md5 153c064e8ac654aaf136b3388c36de48 hyperframe-6.0.1.tar.gz -sha256 ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914 hyperframe-6.0.1.tar.gz +md5 fda90f638a3db3e8f1837c2e0ade8f08 hyperframe-6.1.0.tar.gz +sha256 f630908a00854a7adeabd6382b43923a4c4cd4b821fcb527e6ab9e15382a3b08 hyperframe-6.1.0.tar.gz # Locally computed sha256 checksums sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/package/python-hyperframe/python-hyperframe.mk b/package/python-hyperframe/python-hyperframe.mk index 4b13ca51a3..3ebbf4cee5 100644 --- a/package/python-hyperframe/python-hyperframe.mk +++ b/package/python-hyperframe/python-hyperframe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERFRAME_VERSION = 6.0.1 +PYTHON_HYPERFRAME_VERSION = 6.1.0 PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz -PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/5a/2a/4747bff0a17f7281abe73e955d60d80aae537a5d203f417fa1c2e7578ebb +PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/02/e7/94f8232d4a74cc99514c13a9f995811485a6903d48e5d952771ef6322e30 PYTHON_HYPERFRAME_SETUP_TYPE = setuptools PYTHON_HYPERFRAME_LICENSE = MIT PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE diff --git a/package/python-immutabledict/python-immutabledict.hash b/package/python-immutabledict/python-immutabledict.hash index 8232bc6e0e..1dd4a79597 100644 --- a/package/python-immutabledict/python-immutabledict.hash +++ b/package/python-immutabledict/python-immutabledict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/immutabledict/json -md5 6796be00860cc5cf45ae839b9ed2de52 immutabledict-4.2.0.tar.gz -sha256 e003fd81aad2377a5a758bf7e1086cf3b70b63e9a5cc2f46bce8d0a2b4727c5f immutabledict-4.2.0.tar.gz +md5 ac3ce87a7507d3e7d44a24a6b6bdb4a7 immutabledict-4.2.1.tar.gz +sha256 d91017248981c72eb66c8ff9834e99c2f53562346f23e7f51e7a5ebcf66a3bcc immutabledict-4.2.1.tar.gz # Locally computed sha256 checksums sha256 347f918d37d4e0556a0695d34b9fb87fa9bbe808d54949851789c6c1fc91c61f LICENSE diff --git a/package/python-immutabledict/python-immutabledict.mk b/package/python-immutabledict/python-immutabledict.mk index 99089f0d6a..902352a5d0 100644 --- a/package/python-immutabledict/python-immutabledict.mk +++ b/package/python-immutabledict/python-immutabledict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IMMUTABLEDICT_VERSION = 4.2.0 +PYTHON_IMMUTABLEDICT_VERSION = 4.2.1 PYTHON_IMMUTABLEDICT_SOURCE = immutabledict-$(PYTHON_IMMUTABLEDICT_VERSION).tar.gz -PYTHON_IMMUTABLEDICT_SITE = https://files.pythonhosted.org/packages/55/f4/710c84db4d77767176342913ac6b25f43aaed6d0a0bdb9168a8d2936d9c7 +PYTHON_IMMUTABLEDICT_SITE = https://files.pythonhosted.org/packages/e0/c5/4240186fbabc58fba41bbe17c5f0cd37ffd4c0b85a5029ab104f946df175 PYTHON_IMMUTABLEDICT_SETUP_TYPE = poetry PYTHON_IMMUTABLEDICT_LICENSE = MIT PYTHON_IMMUTABLEDICT_LICENSE_FILES = LICENSE diff --git a/package/python-inflect/python-inflect.hash b/package/python-inflect/python-inflect.hash index 8b373b8a7e..1538bfa178 100644 --- a/package/python-inflect/python-inflect.hash +++ b/package/python-inflect/python-inflect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/inflect/json -md5 7201084aafe65ed5925a8f055f9281a7 inflect-7.4.0.tar.gz -sha256 904baa17cc2cb74827a6c27b95692e95670dadc72b208b3e8c1c05aeed47026b inflect-7.4.0.tar.gz +md5 2b4c0c942b110c587d8cc1acfb606882 inflect-7.5.0.tar.gz +sha256 faf19801c3742ed5a05a8ce388e0d8fe1a07f8d095c82201eb904f5d27ad571f inflect-7.5.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-inflect/python-inflect.mk b/package/python-inflect/python-inflect.mk index 926f2c43ef..21e87aea35 100644 --- a/package/python-inflect/python-inflect.mk +++ b/package/python-inflect/python-inflect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLECT_VERSION = 7.4.0 +PYTHON_INFLECT_VERSION = 7.5.0 PYTHON_INFLECT_SOURCE = inflect-$(PYTHON_INFLECT_VERSION).tar.gz -PYTHON_INFLECT_SITE = https://files.pythonhosted.org/packages/e1/dc/02614acece4d578e709c606594c989cfd9f15cf6401444e5603e60df9b26 +PYTHON_INFLECT_SITE = https://files.pythonhosted.org/packages/78/c6/943357d44a21fd995723d07ccaddd78023eace03c1846049a2645d4324a3 PYTHON_INFLECT_SETUP_TYPE = setuptools PYTHON_INFLECT_LICENSE = MIT PYTHON_INFLECT_LICENSE_FILES = LICENSE diff --git a/package/python-iniconfig/python-iniconfig.hash b/package/python-iniconfig/python-iniconfig.hash index 541ae3e3f3..7e5884bb7c 100644 --- a/package/python-iniconfig/python-iniconfig.hash +++ b/package/python-iniconfig/python-iniconfig.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iniconfig/json -md5 3c030b3f51dcc3aca585de05635600e4 iniconfig-2.0.0.tar.gz -sha256 2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 iniconfig-2.0.0.tar.gz +md5 437ede5b20b0ab2e76ca08f02b5c49dd iniconfig-2.1.0.tar.gz +sha256 3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7 iniconfig-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE +sha256 3409fa91f7ace557894632676656e32264fe5ef7581535725dc9a23774551bd4 LICENSE diff --git a/package/python-iniconfig/python-iniconfig.mk b/package/python-iniconfig/python-iniconfig.mk index 7c6cd14907..3276032fd3 100644 --- a/package/python-iniconfig/python-iniconfig.mk +++ b/package/python-iniconfig/python-iniconfig.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INICONFIG_VERSION = 2.0.0 +PYTHON_INICONFIG_VERSION = 2.1.0 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz -PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913 +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/f2/97/ebf4da567aa6827c909642694d71c9fcf53e5b504f2d96afea02718862f3 PYTHON_INICONFIG_SETUP_TYPE = hatch PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index ca2b0ea16c..8186b5c09d 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 728e73b95f7a3078fcbce50e64396bc3 ipython-8.29.0.tar.gz -sha256 40b60e15b22591450eef73e40a027cf77bd652e757523eebc5bd7c7c498290eb ipython-8.29.0.tar.gz +md5 5c629ec6cc81a8d5eecea3956e670d54 ipython-8.31.0.tar.gz +sha256 b6a2274606bec6166405ff05e54932ed6e5cfecaca1fc05f2cacde7bb074d70b ipython-8.31.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 7e7806b12d..2bc4b54ef7 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.29.0 +PYTHON_IPYTHON_VERSION = 8.31.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/85/e0/a3f36dde97e12121106807d80485423ae4c5b27ce60d40d4ab0bab18a9db +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/01/35/6f90fdddff7a08b7b715fccbd2427b5212c9525cd043d26fdc45bee0708d PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 9cdf8fdde7..d7d0ce401b 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 0e3053f8b41e447e3cabed4075ac9116 janus-1.1.0.tar.gz -sha256 0634df8b2b31f8afda4311abcf7fea912686fef717d13769eeaa01ae08d2b84c janus-1.1.0.tar.gz +md5 7c8ec257be4e90abc47a7df47df88436 janus-2.0.0.tar.gz +sha256 0970f38e0e725400496c834a368a67ee551dc3b5ad0a257e132f5b46f2e77770 janus-2.0.0.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index a6cbfc86db..12ec7d6c48 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 1.1.0 +PYTHON_JANUS_VERSION = 2.0.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/45/50/112a19f28a11b545c4c95de29c50a06fa9381a2432eaabbf9316bbd4e046 +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/d8/7f/69884b6618be4baf6ebcacc716ee8680a842428a19f403db6d1c0bb990aa PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash index 75d64da7bf..d2eb47d41c 100644 --- a/package/python-jc/python-jc.hash +++ b/package/python-jc/python-jc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jc/json -md5 7e9454e01eafa7c8c6e415fddc7d2638 jc-1.25.3.tar.gz -sha256 fa3140ceda6cba1210d1362f363cd79a0514741e8a1dd6167db2b2e2d5f24f7b jc-1.25.3.tar.gz +md5 f3fbc012843d192e446462e45ab2ebe1 jc-1.25.6.tar.gz +sha256 27f58befc7ae0a4c63322926c5f1ec892e3eac4a065eff3b07cfe420a6924a07 jc-1.25.6.tar.gz # Locally computed sha256 checksums sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk index 202884f3dc..0404275277 100644 --- a/package/python-jc/python-jc.mk +++ b/package/python-jc/python-jc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JC_VERSION = 1.25.3 +PYTHON_JC_VERSION = 1.25.6 PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz -PYTHON_JC_SITE = https://files.pythonhosted.org/packages/a5/82/bfb1ec7d9667bc2f922254bc62e12fd460a5de3b711518f5089df0a17180 +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/7c/fa/f174bfb1ecfd3bdc6259b2de32052f09cccba11c9a1b733aedf618fadd05 PYTHON_JC_SETUP_TYPE = setuptools PYTHON_JC_LICENSE = MIT, BSD-3-Clause (bundled pbPlist) PYTHON_JC_LICENSE_FILES = LICENSE.md diff --git a/package/python-jedi/python-jedi.hash b/package/python-jedi/python-jedi.hash index 99034d20bb..7ecce429aa 100644 --- a/package/python-jedi/python-jedi.hash +++ b/package/python-jedi/python-jedi.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jedi/json -md5 0951191b506b660bfdb90c3dcd5b3254 jedi-0.19.1.tar.gz -sha256 cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd jedi-0.19.1.tar.gz +md5 bc2dfcc3fdcd7a1384867b5c6f5bf519 jedi-0.19.2.tar.gz +sha256 4770dc3de41bde3966b02eb84fbcf557fb33cce26ad23da12c742fb50ecb11f0 jedi-0.19.2.tar.gz # Locally computed sha256 checksums sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt sha256 235e993965d399a25e7d493d25c8622f78718510884b9c051f1f1866b6f34e9d jedi/third_party/django-stubs/LICENSE.txt diff --git a/package/python-jedi/python-jedi.mk b/package/python-jedi/python-jedi.mk index 5d54642a07..7cd69f9053 100644 --- a/package/python-jedi/python-jedi.mk +++ b/package/python-jedi/python-jedi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JEDI_VERSION = 0.19.1 +PYTHON_JEDI_VERSION = 0.19.2 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz -PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/d6/99/99b493cec4bf43176b678de30f81ed003fd6a647a301b9c927280c600f0a +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/72/3a/79a912fbd4d8dd6fbb02bf69afd3bb72cf0c729bb3063c6f4498603db17a PYTHON_JEDI_SETUP_TYPE = setuptools PYTHON_JEDI_LICENSE = MIT, Apache-2.0 (typeshed) PYTHON_JEDI_LICENSE_FILES = LICENSE.txt jedi/third_party/django-stubs/LICENSE.txt jedi/third_party/typeshed/LICENSE diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index 2b32f5cce4..ffd0bc55c2 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 02ca9a6364c92e83d14b037bef4732bc jinja2-3.1.4.tar.gz -sha256 4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 jinja2-3.1.4.tar.gz +md5 66d4c25ff43d1deaf9637ccda523dec8 jinja2-3.1.6.tar.gz +sha256 0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d jinja2-3.1.6.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.txt diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 780b693281..74360ec258 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.1.4 +PYTHON_JINJA2_VERSION = 3.1.6 PYTHON_JINJA2_SOURCE = jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/ed/55/39036716d19cab0747a5020fc7e907f362fbf48c984b14e62127f7e68e5d +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b PYTHON_JINJA2_SETUP_TYPE = flit PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.txt diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index 55295ab7ab..e6543d08d8 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" # python-secretstorage -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime select BR2_PACKAGE_PYTHON_JARACO_CONTEXT # runtime select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index ddbe52fb35..dd0714d55e 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 abbca9e5a78bdb506d3ba0bfa3fe3642 keyring-25.5.0.tar.gz -sha256 4c753b3ec91717fe713c4edd522d625889d8973a349b0e582622f49766de58e6 keyring-25.5.0.tar.gz +md5 afe7f534c80dc29927f5211fcb925ed4 keyring-25.6.0.tar.gz +sha256 0b39998aa941431eb3d9b0d4b2460bc773b9df6fed7621c2dfb291a7e0187a66 keyring-25.6.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 1972f5f6de..eb2b62d96c 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 25.5.0 +PYTHON_KEYRING_VERSION = 25.6.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/f6/24/64447b13df6a0e2797b586dad715766d756c932ce8ace7f67bd384d76ae0 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/70/09/d904a6e96f76ff214be59e7aa6ef7190008f52a0ab6689760a98de0bf37d PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.hash b/package/python-kiwisolver/python-kiwisolver.hash index c4ae255377..ded337b823 100644 --- a/package/python-kiwisolver/python-kiwisolver.hash +++ b/package/python-kiwisolver/python-kiwisolver.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/kiwisolver/json -md5 3e1406c57a4fdce3804096f57a9b4855 kiwisolver-1.4.7.tar.gz -sha256 9893ff81bd7107f7b685d3017cc6583daadb4fc26e4a888350df530e41980a60 kiwisolver-1.4.7.tar.gz +md5 2eb55aab42272292a732411bb6c79dee kiwisolver-1.4.8.tar.gz +sha256 23d5f023bdc8c7e54eb65f03ca5d5bb25b601eac4d7f1a042888a1f45237987e kiwisolver-1.4.8.tar.gz # Locally computed sha256 checksums sha256 238e69906d7e507a94832b9831131862c4176d58c002b388e2e99db5d83677d2 LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.mk b/package/python-kiwisolver/python-kiwisolver.mk index 4220e1c890..cbdb5c3aee 100644 --- a/package/python-kiwisolver/python-kiwisolver.mk +++ b/package/python-kiwisolver/python-kiwisolver.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KIWISOLVER_VERSION = 1.4.7 +PYTHON_KIWISOLVER_VERSION = 1.4.8 PYTHON_KIWISOLVER_SOURCE = kiwisolver-$(PYTHON_KIWISOLVER_VERSION).tar.gz -PYTHON_KIWISOLVER_SITE = https://files.pythonhosted.org/packages/85/4d/2255e1c76304cbd60b48cee302b66d1dde4468dc5b1160e4b7cb43778f2a +PYTHON_KIWISOLVER_SITE = https://files.pythonhosted.org/packages/82/59/7c91426a8ac292e1cdd53a63b6d9439abd573c875c3f92c146767dd33faf PYTHON_KIWISOLVER_LICENSE = BSD-3-Clause PYTHON_KIWISOLVER_LICENSE_FILES = LICENSE PYTHON_KIWISOLVER_SETUP_TYPE = setuptools diff --git a/package/python-lark/python-lark.hash b/package/python-lark/python-lark.hash index 35ee842a4a..4536f24e62 100644 --- a/package/python-lark/python-lark.hash +++ b/package/python-lark/python-lark.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lark/json -md5 99760ed81904c56b2db2b7ab7723063e lark-1.2.2.tar.gz -sha256 ca807d0162cd16cef15a8feecb862d7319e7a09bdb13aef927968e45040fed80 lark-1.2.2.tar.gz +md5 06c2015b9996beafc714cba8b7ae62dc lark-1.3.0.tar.gz +sha256 9a3839d0ca5e1faf7cfa3460e420e859b66bcbde05b634e73c369c8244c5fa48 lark-1.3.0.tar.gz # Locally computed sha256 checksums sha256 2eee60f52d4e11357bf89e72b034d050e285e47fda1361e5662fb322ee27d771 LICENSE diff --git a/package/python-lark/python-lark.mk b/package/python-lark/python-lark.mk index 1a85b49bd3..b5f195eff4 100644 --- a/package/python-lark/python-lark.mk +++ b/package/python-lark/python-lark.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LARK_VERSION = 1.2.2 +PYTHON_LARK_VERSION = 1.3.0 PYTHON_LARK_SOURCE = lark-$(PYTHON_LARK_VERSION).tar.gz -PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/af/60/bc7622aefb2aee1c0b4ba23c1446d3e30225c8770b38d7aedbfb65ca9d5a +PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/1d/37/a13baf0135f348af608c667633cbe5d13aa2c5c15a56ae9ad3e6cba45ae3 PYTHON_LARK_SETUP_TYPE = setuptools PYTHON_LARK_LICENSE = MIT PYTHON_LARK_LICENSE_FILES = LICENSE diff --git a/package/python-legacy-cgi/python-legacy-cgi.hash b/package/python-legacy-cgi/python-legacy-cgi.hash index 063483a1e8..53af4ef691 100644 --- a/package/python-legacy-cgi/python-legacy-cgi.hash +++ b/package/python-legacy-cgi/python-legacy-cgi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/legacy-cgi/json -md5 82a61ea4905ec03f07cf24c586623fa7 legacy_cgi-2.6.1.tar.gz -sha256 f2ada99c747c3d72a473a6aaff6259a61f226b06fe9f3106e495ab83fd8f7a42 legacy_cgi-2.6.1.tar.gz +md5 5750721070ad829796ef830308e76907 legacy_cgi-2.6.2.tar.gz +sha256 9952471ceb304043b104c22d00b4f333cac27a6abe446d8a528fc437cf13c85f legacy_cgi-2.6.2.tar.gz # Locally computed sha256 checksums sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE diff --git a/package/python-legacy-cgi/python-legacy-cgi.mk b/package/python-legacy-cgi/python-legacy-cgi.mk index 8e6e3e7bd4..457463d9dd 100644 --- a/package/python-legacy-cgi/python-legacy-cgi.mk +++ b/package/python-legacy-cgi/python-legacy-cgi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LEGACY_CGI_VERSION = 2.6.1 +PYTHON_LEGACY_CGI_VERSION = 2.6.2 PYTHON_LEGACY_CGI_SOURCE = legacy_cgi-$(PYTHON_LEGACY_CGI_VERSION).tar.gz -PYTHON_LEGACY_CGI_SITE = https://files.pythonhosted.org/packages/48/96/ff14ad0f759f2297a2e61db9c5384d248a6b38c6c1d4452c07d7419676a2 +PYTHON_LEGACY_CGI_SITE = https://files.pythonhosted.org/packages/ad/2e/e1860989bc6cfdecba66db37f2f783636b97a1248ac25fbe864b6e931c22 PYTHON_LEGACY_CGI_SETUP_TYPE = poetry PYTHON_LEGACY_CGI_LICENSE = PSF-2.0 PYTHON_LEGACY_CGI_LICENSE_FILES = LICENSE diff --git a/package/python-libevdev/python-libevdev.hash b/package/python-libevdev/python-libevdev.hash index 2799078cc8..c48ddbf716 100644 --- a/package/python-libevdev/python-libevdev.hash +++ b/package/python-libevdev/python-libevdev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/libevdev/json -md5 34b48098c1fba26de79a0d67a17a588a libevdev-0.11.tar.gz -sha256 e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f libevdev-0.11.tar.gz +md5 9bf8acc011c72d1466ae8f0b8f2c5fac libevdev-0.12.tar.gz +sha256 02e952632ec6c249cbb9c66f6fa00012ea448b06606c77cd139133bc2fe46b08 libevdev-0.12.tar.gz # Locally computed sha256 checksums sha256 a547b196da4e5bb9588a6e24f1f36ae9e2349ca5375e2cf9c315186e237d9f6d COPYING diff --git a/package/python-libevdev/python-libevdev.mk b/package/python-libevdev/python-libevdev.mk index e5256064c9..cc40adc874 100644 --- a/package/python-libevdev/python-libevdev.mk +++ b/package/python-libevdev/python-libevdev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LIBEVDEV_VERSION = 0.11 +PYTHON_LIBEVDEV_VERSION = 0.12 PYTHON_LIBEVDEV_SOURCE = libevdev-$(PYTHON_LIBEVDEV_VERSION).tar.gz -PYTHON_LIBEVDEV_SITE = https://files.pythonhosted.org/packages/b0/49/2fe589ce1fa6ca0f05ae0b1717923650f2cc6eec6307c71fbc7789738902 +PYTHON_LIBEVDEV_SITE = https://files.pythonhosted.org/packages/61/6b/e0193f4ba0c3b7d20f8f1b961793d39df5538451c0959abb115020d4ec2d PYTHON_LIBEVDEV_SETUP_TYPE = setuptools PYTHON_LIBEVDEV_LICENSE = MIT PYTHON_LIBEVDEV_LICENSE_FILES = COPYING diff --git a/package/python-libusb1/python-libusb1.hash b/package/python-libusb1/python-libusb1.hash index effecd8531..cf270a2d3d 100644 --- a/package/python-libusb1/python-libusb1.hash +++ b/package/python-libusb1/python-libusb1.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/libusb1/json -md5 7b4f094786d1dfc8d011c7649d8ccb97 libusb1-3.1.0.tar.gz -sha256 4ee9b0a55f8bd0b3ea7017ae919a6c1f439af742c4a4b04543c5fd7af89b828c libusb1-3.1.0.tar.gz +md5 617502b66841e601c28c668c20c1d843 libusb1-3.2.0.tar.gz +sha256 a11a6095e718cd49418a96329314da271cca6be7b4317a142724523371ac8961 libusb1-3.2.0.tar.gz # Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/python-libusb1/python-libusb1.mk b/package/python-libusb1/python-libusb1.mk index 39fd7e40d3..7d68377f51 100644 --- a/package/python-libusb1/python-libusb1.mk +++ b/package/python-libusb1/python-libusb1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LIBUSB1_VERSION = 3.1.0 +PYTHON_LIBUSB1_VERSION = 3.2.0 PYTHON_LIBUSB1_SOURCE = libusb1-$(PYTHON_LIBUSB1_VERSION).tar.gz -PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/af/19/53ecbfb96d6832f2272d13b84658c360802fcfff7c0c497ab8f6bf15ac40 +PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/d9/b7/9e833af6cb52fa2aece1c6a1378667ca0172bead14f63ffccc3cb9862df3 PYTHON_LIBUSB1_SETUP_TYPE = setuptools PYTHON_LIBUSB1_LICENSE = LGPL-2.1+ PYTHON_LIBUSB1_LICENSE_FILES = COPYING.LESSER diff --git a/package/python-lmdb/Config.in b/package/python-lmdb/Config.in index b63af96ec4..a94badbe76 100644 --- a/package/python-lmdb/Config.in +++ b/package/python-lmdb/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_LMDB bool "python-lmdb" + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_PYTHON_PATCH_NG # runtime help Universal Python binding for the LMDB 'Lightning' Database. diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index 064c76fb58..525c434f2a 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 bdd78148e8374cb0001af06cc64bfefb lmdb-1.5.1.tar.gz -sha256 717c255827d331e02f7242b44051aa06466c90f6d732ecb07b31edfb1e06c67a lmdb-1.5.1.tar.gz +md5 0996b2df3b8019b76ce1fa37913e41f0 lmdb-1.7.5.tar.gz +sha256 f0604751762cb097059d5412444c4057b95f386c7ed958363cf63f453e5108da lmdb-1.7.5.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 7105fd1464..3f92ef066f 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.5.1 +PYTHON_LMDB_VERSION = 1.7.5 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/67/2c/0cc9375341121ca1f4b31a2137f955dc24550e095d733c9b42ea94113ba1 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/c7/a3/3756f2c6adba4a1413dba55e6c81a20b38a868656517308533e33cb59e1c PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_DEPENDENCIES = host-python-cffi host-python-patch-ng PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools diff --git a/package/python-log-rate-limit/Config.in b/package/python-log-rate-limit/Config.in new file mode 100644 index 0000000000..06b8a42e68 --- /dev/null +++ b/package/python-log-rate-limit/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LOG_RATE_LIMIT + bool "python-log-rate-limit" + help + Limit excessive log output with Python's standard logging + framework. + + https://github.com/samuller/log-rate-limit diff --git a/package/python-log-rate-limit/python-log-rate-limit.hash b/package/python-log-rate-limit/python-log-rate-limit.hash new file mode 100644 index 0000000000..80bd5d7290 --- /dev/null +++ b/package/python-log-rate-limit/python-log-rate-limit.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/log-rate-limit/json +md5 07ff9e57864b1e005e7272f47d92892f log_rate_limit-1.4.2.tar.gz +sha256 06963abe6e1c498d16cb302b5f92d864f41bbe09ea4c898cd4e3a7d675b99de8 log_rate_limit-1.4.2.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-log-rate-limit/python-log-rate-limit.mk b/package/python-log-rate-limit/python-log-rate-limit.mk new file mode 100644 index 0000000000..8b2d423de0 --- /dev/null +++ b/package/python-log-rate-limit/python-log-rate-limit.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-log-rate-limit +# +################################################################################ + +PYTHON_LOG_RATE_LIMIT_VERSION = 1.4.2 +PYTHON_LOG_RATE_LIMIT_SOURCE = log_rate_limit-$(PYTHON_LOG_RATE_LIMIT_VERSION).tar.gz +PYTHON_LOG_RATE_LIMIT_SITE = https://files.pythonhosted.org/packages/0d/c2/d3c67f59b934d0edfc00a7cfcac56d17fa9b9832ba8e353217c93187e506 +PYTHON_LOG_RATE_LIMIT_SETUP_TYPE = poetry +PYTHON_LOG_RATE_LIMIT_LICENSE = Apache-2.0 +PYTHON_LOG_RATE_LIMIT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 059238ffab..a58aa720b5 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,6 +1,7 @@ -# From https://pypi.org/project/lxml/ -sha256 4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f lxml-5.3.0.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/lxml/json +md5 ac9a945976227fd854d3e9e034e52ca1 lxml-6.0.2.tar.gz +sha256 cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62 lxml-6.0.2.tar.gz +# Locally computed sha256 checksums sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 8604b5783a..d12f65dd8c 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 5.3.0 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e7/6b/20c3a4b24751377aaa6307eb230b66701024012c29dd374999cc92983269 +PYTHON_LXML_VERSION = 6.0.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/aa/88/262177de60548e5a2bfc46ad28232c9e9cbde697bd94132aeb80364675cb PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. diff --git a/package/python-m2crypto/Config.in b/package/python-m2crypto/Config.in deleted file mode 100644 index af710d5351..0000000000 --- a/package/python-m2crypto/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_M2CRYPTO - bool "python-m2crypto" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON3_SSL # runtime - help - M2Crypto: A Python crypto and SSL toolkit. - - https://gitlab.com/m2crypto/m2crypto diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash deleted file mode 100644 index 98307af0cf..0000000000 --- a/package/python-m2crypto/python-m2crypto.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/m2crypto/json -md5 75c50150857eb60e4f447b04d13ff507 m2crypto-0.43.0.tar.gz -sha256 6c2c1c7bb0e8aa768f7ca803da7dbc2666d4003b26bd7adf70233afc59d8cf33 m2crypto-0.43.0.tar.gz -# Locally computed sha256 checksums -sha256 4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0 LICENCE diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk deleted file mode 100644 index b5142c9bb2..0000000000 --- a/package/python-m2crypto/python-m2crypto.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python-m2crypto -# -################################################################################ - -PYTHON_M2CRYPTO_VERSION = 0.43.0 -PYTHON_M2CRYPTO_SOURCE = m2crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz -PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/ff/1b/4771f0ecfdd9df6752ae5d0cf040545bb3cfe8a504af87e05c9ac4a6a499 -PYTHON_M2CRYPTO_SETUP_TYPE = setuptools -PYTHON_M2CRYPTO_LICENSE = MIT -PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE -PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project -PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto -PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_ENV = OPENSSL_PATH="$(STAGING_DIR)/usr" - -$(eval $(python-package)) diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash index 5512537c62..fd02bcc758 100644 --- a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json -md5 8e45d8943628d9c618e8801b8005725e magic-wormhole-mailbox-server-0.5.0.tar.gz -sha256 1f194edf88c6df746ba980c6a8c837c1e1d90f3afb3c7b0e501fce752aabceda magic-wormhole-mailbox-server-0.5.0.tar.gz +md5 bb9f84e7ecddc43413b4287b7b20d285 magic-wormhole-mailbox-server-0.5.1.tar.gz +sha256 a007a03672293204657681dbf502045d6d5817c57f9aae2f2226e6ea1a008ca1 magic-wormhole-mailbox-server-0.5.1.tar.gz # Locally computed sha256 checksums sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk index 04cd65e3e5..7525054167 100644 --- a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.5.0 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.5.1 PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SOURCE = magic-wormhole-mailbox-server-$(PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION).tar.gz -PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/1f/0b/0b6fda78c8a90d6c600da614c5a1962a4f24275e76d2e1bf763ee8df0b70 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SITE = https://files.pythonhosted.org/packages/9d/5c/71566147af3f28017035ebe69ce7253ea26917225ae7c39b964578541bff PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in index bb1cbb546a..57db1bde78 100644 --- a/package/python-magic-wormhole/Config.in +++ b/package/python-magic-wormhole/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE select BR2_PACKAGE_PYTHON_HUMANIZE # runtime select BR2_PACKAGE_PYTHON_ITERABLE_IO # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_QRCODE # runtime select BR2_PACKAGE_PYTHON_SPAKE2 # runtime select BR2_PACKAGE_PYTHON_TQDM # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash index 38ac016f0d..8ba2c04993 100644 --- a/package/python-magic-wormhole/python-magic-wormhole.hash +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/magic-wormhole/json -md5 61143e1480353de7b502d1b904837fb0 magic_wormhole-0.17.0.tar.gz -sha256 142c7a271684b0b04470792601848f6b0ade0d8bf54fbcb30c6259d75edd9d06 magic_wormhole-0.17.0.tar.gz +md5 37fdc279a6b55f52945098850a381708 magic_wormhole-0.19.2.tar.gz +sha256 b2b4a78acf09ff4cfc503a238f674394a5e735fa08dcd54519243ffc67f97c71 magic_wormhole-0.19.2.tar.gz # Locally computed sha256 checksums sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole/python-magic-wormhole.mk b/package/python-magic-wormhole/python-magic-wormhole.mk index 37fddf6c21..ce146181f7 100644 --- a/package/python-magic-wormhole/python-magic-wormhole.mk +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAGIC_WORMHOLE_VERSION = 0.17.0 +PYTHON_MAGIC_WORMHOLE_VERSION = 0.19.2 PYTHON_MAGIC_WORMHOLE_SOURCE = magic_wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz -PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/1b/a8/32a54e75643206665f569dac6ab19727aefb508b148882f1d05dff003667 +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/e0/5b/4aff155b8e8ead4bc7c6aa3d1c19dc75aac2315e0c9b12f4e2f246b40141 PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools PYTHON_MAGIC_WORMHOLE_LICENSE = MIT PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index 0a39db7db9..b6706aa1ad 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 ca119a43eb3eff532bd5d55d585d1caa mako-1.3.6.tar.gz -sha256 9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d mako-1.3.6.tar.gz +md5 c9dfb2bf42827459dd505c60f2262a7c mako-1.3.10.tar.gz +sha256 99579a6f39583fa7e5630a28c3c1f440e4e97a414b80372649c0ce338da2ea28 mako-1.3.10.tar.gz # Locally computed sha256 checksums -sha256 15627b36b38d0729cdd686df9abf606503d99d624b2f5ec5cb254a75d5afa891 LICENSE +sha256 68d7064e53e3ffa8e9f420a9e604bd2e2059d9c330492fa6ebd4eb3d48111689 LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 68cfc98bc2..1dc59f002c 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.3.6 +PYTHON_MAKO_VERSION = 1.3.10 PYTHON_MAKO_SOURCE = mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/fa/0b/29bc5a230948bf209d3ed3165006d257e547c02c3c2a96f6286320dfe8dc +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/9e/38/bd5b78a920a64d708fe6bc8e0a2c075e1389d53bef8413725c63ba041535 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE diff --git a/package/python-markdown/python-markdown.hash b/package/python-markdown/python-markdown.hash index 9a452bb4f7..25725b3c8e 100644 --- a/package/python-markdown/python-markdown.hash +++ b/package/python-markdown/python-markdown.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown/json -md5 de4cdc6db368c7386f733d6dd8c858b1 markdown-3.7.tar.gz -sha256 2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 markdown-3.7.tar.gz +md5 46aaa9fe3d42144f185368e819b7e720 markdown-3.9.tar.gz +sha256 d2900fe1782bd33bdbbd56859defef70c2e78fc46668f8eb9df3128138f2cb6a markdown-3.9.tar.gz # Locally computed sha256 checksums sha256 7ba4eb6d10b32b2d11dce13821340351cdbbb30ba8ccc67841db2ffd86e79aca LICENSE.md diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk index 4cacee24f8..6fcdd6b830 100644 --- a/package/python-markdown/python-markdown.mk +++ b/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 3.7 +PYTHON_MARKDOWN_VERSION = 3.9 PYTHON_MARKDOWN_SOURCE = markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/54/28/3af612670f82f4c056911fbbbb42760255801b3068c48de792d354ff4472 +PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/8d/37/02347f6d6d8279247a5837082ebc26fc0d5aaeaf75aa013fcbb433c777ab PYTHON_MARKDOWN_LICENSE = BSD-3-Clause PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md PYTHON_MARKDOWN_SETUP_TYPE = setuptools diff --git a/package/python-markdown2/python-markdown2.hash b/package/python-markdown2/python-markdown2.hash index f5c2adb0e1..c412c6c012 100644 --- a/package/python-markdown2/python-markdown2.hash +++ b/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 1b6f79fa3baea447e6b4dda5132e2fbc markdown2-2.5.1.tar.gz -sha256 12fc04ea5a87f7bb4b65acf5bf3af1183b20838cc7d543b74c92ec7eea4bbc74 markdown2-2.5.1.tar.gz +md5 b61518f0e66d3f35d404ed595252853c markdown2-2.5.4.tar.gz +sha256 a09873f0b3c23dbfae589b0080587df52ad75bb09a5fa6559147554736676889 markdown2-2.5.4.tar.gz # Locally computed sha256 checksums sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index 228c5d0eff..a8737b5b49 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.5.1 +PYTHON_MARKDOWN2_VERSION = 2.5.4 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/05/92/22e3645e352562ea9bfc89aeaeb9a76feb79e20907b18bc25d5ca340b50f +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/42/f8/b2ae8bf5f28f9b510ae097415e6e4cb63226bb28d7ee01aec03a755ba03b PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash index 68892165f5..d91dca88b5 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json -md5 1cdbefa0aa35a1205d7e3bb3674743bb marshmallow_sqlalchemy-1.1.0.tar.gz -sha256 2ab092da269dafa8a05d51a58409af71a8d2183958ba47143127dd239e0359d8 marshmallow_sqlalchemy-1.1.0.tar.gz +md5 a037666fa3558f984dcc4b2b443378df marshmallow_sqlalchemy-1.4.0.tar.gz +sha256 ca169a26171077af8afa25789e9781680de0e9187563c422f1f67d0a0133433a marshmallow_sqlalchemy-1.4.0.tar.gz # Locally computed sha256 checksums sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk index a334bec1f5..6ce354a252 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 1.1.0 +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 1.4.0 PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow_sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz -PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/82/f8/2e565045b17dd60b38aafc3242ac44f5403315df08963501d07463d089ac +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/6d/0c/89544d2b3aeae4af61ecd9df347d61d36768a67563e47b98423a853e8470 PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = flit PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/package/python-marshmallow/python-marshmallow.hash b/package/python-marshmallow/python-marshmallow.hash index 8a6a3cf85b..0f5db0e2ef 100644 --- a/package/python-marshmallow/python-marshmallow.hash +++ b/package/python-marshmallow/python-marshmallow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow/json -md5 45f26839a3486cac60f6aa043e5035dd marshmallow-3.23.1.tar.gz -sha256 3a8dfda6edd8dcdbf216c0ede1d1e78d230a6dc9c5a088f58c4083b974a0d468 marshmallow-3.23.1.tar.gz +md5 3a8decf54fd2a6a10352b9de70b70136 marshmallow-3.26.0.tar.gz +sha256 eb36762a1cc76d7abf831e18a3a1b26d3d481bbc74581b8e532a3d3a8115e1cb marshmallow-3.26.0.tar.gz # Locally computed sha256 checksums sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index 2c2e7f1ee3..6e84ca039e 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARSHMALLOW_VERSION = 3.23.1 +PYTHON_MARSHMALLOW_VERSION = 3.26.0 PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz -PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/6d/30/14d8609f65c8aeddddd3181c06d2c9582da6278f063b27c910bbf9903441 +PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/ed/3a/b392ca6582ce5c2e515a8ca365f89b6e631d864a80ecdc72e0bc1bf3aec6 PYTHON_MARSHMALLOW_SETUP_TYPE = flit PYTHON_MARSHMALLOW_LICENSE = MIT PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE docs/license.rst diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index 2882997b8a..c862860b06 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/matplotlib/json -md5 bb92dfd3c1e9c816100b91008be5e300 matplotlib-3.9.2.tar.gz -sha256 96ab43906269ca64a6366934106fa01534454a69e471b7bf3d79083981aaab92 matplotlib-3.9.2.tar.gz +md5 9c9a5c3ced2bba7b5b2f8dab68ae4b06 matplotlib-3.10.0.tar.gz +sha256 b886d02a581b96704c9d1ffe55709e49b4d2d52709ccebc4be42db856e511278 matplotlib-3.10.0.tar.gz # Locally computed sha256 checksums sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 7312d2b1ec..49fbd76bdb 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATPLOTLIB_VERSION = 3.9.2 +PYTHON_MATPLOTLIB_VERSION = 3.10.0 PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/9e/d8/3d7f706c69e024d4287c1110d74f7dabac91d9843b99eadc90de9efc8869 +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/68/dd/fa2e1a45fce2d09f4aea3cee169760e672c8262325aa5796c49d543dc7e6 PYTHON_MATPLOTLIB_LICENSE = Python-2.0 PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE PYTHON_MATPLOTLIB_DEPENDENCIES = \ diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 218b789295..f439f5d9b9 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 1595a7bdc135888ed0f2c595819f010738196392e3d42569af4bdfe718654899 python-maturin-1.7.4-cargo2.tar.gz +sha256 32ed28b14691d95daf862ec78cc26fcf01ce55eafd4b22b0c27c02f8d4530806 python-maturin-1.9.4-cargo4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 2e59538212..aab4ccef6f 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,13 +4,12 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 1.7.4 +PYTHON_MATURIN_VERSION = 1.9.4 PYTHON_MATURIN_SOURCE_PYPI = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE_PYPI = https://files.pythonhosted.org/packages/51/28/31a650d9209d873b6aec759c944bd284155154d7a01f7f541786d7c435ca +PYTHON_MATURIN_SITE_PYPI = https://files.pythonhosted.org/packages/13/7c/b11b870fc4fd84de2099906314ce45488ae17be32ff5493519a6cddc518a PYTHON_MATURIN_SITE = $(PYTHON_MATURIN_SITE_PYPI)/$(PYTHON_MATURIN_SOURCE_PYPI)?buildroot-path=filename PYTHON_MATURIN_SETUP_TYPE = setuptools-rust PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit -HOST_PYTHON_MATURIN_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.hash b/package/python-mbstrdecoder/python-mbstrdecoder.hash index 2943ef293f..aa278d4590 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.hash +++ b/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mbstrdecoder/json -md5 33522a4bd9217dae46ebd0761e1a1e7c mbstrdecoder-1.1.3.tar.gz -sha256 dcfd2c759322eb44fe193a9e0b1b86c5b87f3ec5ea8e1bb43b3e9ae423f1e8fe mbstrdecoder-1.1.3.tar.gz +md5 c9d9514be421c358ca75faea3a430672 mbstrdecoder-1.1.4.tar.gz +sha256 8105ef9cf6b7d7d69fe7fd6b68a2d8f281ca9b365d7a9b670be376b2e6c81b21 mbstrdecoder-1.1.4.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.mk b/package/python-mbstrdecoder/python-mbstrdecoder.mk index 566420a60e..6f51b36103 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 1.1.3 +PYTHON_MBSTRDECODER_VERSION = 1.1.4 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/70/8f/dd5d4efbe3f90d2d38c948f0ca5c698e2d6cedc58ead2f5b90272cbcb4fa +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/31/ab/05ae008357c8bdb6245ebf8a101d99f26c096e0ea20800b318153da23796 PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE +PYTHON_MBSTRDECODER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-meson-python/python-meson-python.hash b/package/python-meson-python/python-meson-python.hash index 11f1807144..fa1ac831c7 100644 --- a/package/python-meson-python/python-meson-python.hash +++ b/package/python-meson-python/python-meson-python.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/meson-python/json -md5 bf1299782f02e4bb590a437bd140fd12 meson_python-0.17.1.tar.gz -sha256 efb91f69f2e19eef7bc9a471ed2a4e730088cc6b39eacaf3e49fc4f930eb5f83 meson_python-0.17.1.tar.gz +md5 b4d7f9ef6f09deb8dc8a7e5cbf16778e meson_python-0.18.0.tar.gz +sha256 c56a99ec9df669a40662fe46960321af6e4b14106c14db228709c1628e23848d meson_python-0.18.0.tar.gz # Locally computed sha256 checksums sha256 8f82ea9ef9a55b47f4170536d02e48b5bc33fc5135e5b4a1b5f8d6404833ec9b LICENSE diff --git a/package/python-meson-python/python-meson-python.mk b/package/python-meson-python/python-meson-python.mk index be8ab00c6a..542b64943d 100644 --- a/package/python-meson-python/python-meson-python.mk +++ b/package/python-meson-python/python-meson-python.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MESON_PYTHON_VERSION = 0.17.1 +PYTHON_MESON_PYTHON_VERSION = 0.18.0 PYTHON_MESON_PYTHON_SOURCE = meson_python-$(PYTHON_MESON_PYTHON_VERSION).tar.gz -PYTHON_MESON_PYTHON_SITE = https://files.pythonhosted.org/packages/67/66/91d242ea8dd1729addd36069318ba2cd03874872764f316c3bb51b633ed2 +PYTHON_MESON_PYTHON_SITE = https://files.pythonhosted.org/packages/26/bd/fdb26366443620f1a8a4d4ec7bfa37d1fbbe7bf737b257c205bbcf95ba95 PYTHON_MESON_PYTHON_SETUP_TYPE = pep517 PYTHON_MESON_PYTHON_LICENSE = MIT PYTHON_MESON_PYTHON_LICENSE_FILES = LICENSE diff --git a/package/python-mistune/python-mistune.hash b/package/python-mistune/python-mistune.hash index 7dee76cfa2..c790096af8 100644 --- a/package/python-mistune/python-mistune.hash +++ b/package/python-mistune/python-mistune.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mistune/json -md5 8c02b3476d0343e0a4c75a2321729f01 mistune-3.0.2.tar.gz -sha256 fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8 mistune-3.0.2.tar.gz +md5 47bd96502dcf22434a329b1814769480 mistune-3.1.4.tar.gz +sha256 b5a7f801d389f724ec702840c11d8fc48f2b33519102fc7ee739e8177b672164 mistune-3.1.4.tar.gz # Locally computed sha256 checksums sha256 539013fd8e19f744f8bf0e27a532bbff54cd689ecef7a800f56ae5dc824be870 LICENSE diff --git a/package/python-mistune/python-mistune.mk b/package/python-mistune/python-mistune.mk index ac900c82ba..b5ec61e3a3 100644 --- a/package/python-mistune/python-mistune.mk +++ b/package/python-mistune/python-mistune.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MISTUNE_VERSION = 3.0.2 +PYTHON_MISTUNE_VERSION = 3.1.4 PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz -PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/ef/c8/f0173fe3bf85fd891aee2e7bcd8207dfe26c2c683d727c5a6cc3aec7b628 +PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/d7/02/a7fb8b21d4d55ac93cdcde9d3638da5dd0ebdd3a4fed76c7725e10b81cbe PYTHON_MISTUNE_LICENSE = BSD-3-Clause PYTHON_MISTUNE_LICENSE_FILES = LICENSE PYTHON_MISTUNE_SETUP_TYPE = setuptools diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash index e11ae88abf..9f81056cd0 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.hash +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json -md5 0d4d585a69dc36ce685c487c99fcc59a ml_dtypes-0.5.0.tar.gz -sha256 3e7d3a380fe73a63c884f06136f8baa7a5249cc8e9fdec677997dd78549f8128 ml_dtypes-0.5.0.tar.gz +md5 410474c03a1754e6b5197a24040e3f3c ml_dtypes-0.5.1.tar.gz +sha256 ac5b58559bb84a95848ed6984eb8013249f90b6bab62aa5acbad876e256002c9 ml_dtypes-0.5.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk index 060fe555c5..ab50069696 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.mk +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ML_DTYPES_VERSION = 0.5.0 +PYTHON_ML_DTYPES_VERSION = 0.5.1 PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/ab/79/717c5e22ad25d63ce3acdfe8ff8d64bdedec18914256c59b838218708b16 +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/32/49/6e67c334872d2c114df3020e579f3718c333198f8312290e09ec0216703a PYTHON_ML_DTYPES_LICENSE = Apache-2.0 PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE PYTHON_ML_DTYPES_SETUP_TYPE = setuptools diff --git a/package/python-modbus-tk/python-modbus-tk.hash b/package/python-modbus-tk/python-modbus-tk.hash index c7f4ac2dd4..c60733b02d 100644 --- a/package/python-modbus-tk/python-modbus-tk.hash +++ b/package/python-modbus-tk/python-modbus-tk.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/modbus-tk/json -md5 2e66c361d3e4591a19be1259ef50fdf7 modbus_tk-1.1.3.tar.gz -sha256 690fa7bb86ea978992465d2d61c8b5acc639ce0e8b833a0aa96d4dd172c5644a modbus_tk-1.1.3.tar.gz +md5 03873278a842535c9069cc0dd352f520 modbus_tk-1.1.4.tar.gz +sha256 68977766eb10469973dd56a2814bd981b85dd180b79043248786d88008f2593b modbus_tk-1.1.4.tar.gz # Locally computed sha256 checksums sha256 3b6a7f9c478ac1982e86cdadb45eb4788241b95839500eb26839d5053b74a24a license.txt sha256 aa7ca42152a13db6a27b31944f99851efc3b9ee813912ff21d7d6ceadca62e6f copying.txt diff --git a/package/python-modbus-tk/python-modbus-tk.mk b/package/python-modbus-tk/python-modbus-tk.mk index d8552e57a6..2e15354b04 100644 --- a/package/python-modbus-tk/python-modbus-tk.mk +++ b/package/python-modbus-tk/python-modbus-tk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MODBUS_TK_VERSION = 1.1.3 +PYTHON_MODBUS_TK_VERSION = 1.1.4 PYTHON_MODBUS_TK_SOURCE = modbus_tk-$(PYTHON_MODBUS_TK_VERSION).tar.gz -PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/8d/9f/5963e30dba160dbc646b76c59ca8136709c7fe9002bbaaa3cf1e1bb0404b +PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/78/40/9ae5c428b1867bfccd3c184dcf18cfef04e3d9c5b9dc22b8e9eb8d480651 PYTHON_MODBUS_TK_SETUP_TYPE = setuptools PYTHON_MODBUS_TK_LICENSE = LGPL-2.1+ PYTHON_MODBUS_TK_LICENSE_FILES = license.txt copying.txt diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index a7983a4449..a9b5d00f6b 100644 --- a/package/python-more-itertools/python-more-itertools.hash +++ b/package/python-more-itertools/python-more-itertools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/more-itertools/json -md5 43150affe17a010264115f2caea5de70 more-itertools-10.5.0.tar.gz -sha256 5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6 more-itertools-10.5.0.tar.gz +md5 48da05632079828fd2e89e238192bb69 more-itertools-10.6.0.tar.gz +sha256 2cd7fad1009c31cc9fb6a035108509e6547547a7a738374f10bd49a09eb3ee3b more-itertools-10.6.0.tar.gz # Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/package/python-more-itertools/python-more-itertools.mk b/package/python-more-itertools/python-more-itertools.mk index 8fac2abac2..8c520c790a 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 10.5.0 +PYTHON_MORE_ITERTOOLS_VERSION = 10.6.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/51/78/65922308c4248e0eb08ebcbe67c95d48615cc6f27854b6f2e57143e9178f +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/88/3b/7fa1fe835e2e93fd6d7b52b2f95ae810cf5ba133e1845f726f5a992d62c2 PYTHON_MORE_ITERTOOLS_SETUP_TYPE = flit PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-msgpack/Config.in b/package/python-msgpack/Config.in index 2050d4f078..82b8c08417 100644 --- a/package/python-msgpack/Config.in +++ b/package/python-msgpack/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_PYTHON_MSGPACK This package provides a pure python library for reading and writing MessagePack data. - https://pypi.python.org/pypi/msgpack-python/ + https://pypi.org/project/msgpack/ diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index acacd6c664..6cc5bb14c6 100644 --- a/package/python-msgpack/python-msgpack.hash +++ b/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 e5769d4ab610491ac561c84fde4cf4a7 msgpack-1.1.0.tar.gz -sha256 dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e msgpack-1.1.0.tar.gz +md5 abcd18fded80a89c486c0446f112eb06 msgpack-1.1.1.tar.gz +sha256 77b79ce34a2bdab2594f490c8e80dd62a02d650b91a75159a63ec413b8d104cd msgpack-1.1.1.tar.gz # Locally computed sha256 checksums sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 92d3516186..d61e0963a1 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.1.0 +PYTHON_MSGPACK_VERSION = 1.1.1 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/cb/d0/7555686ae7ff5731205df1012ede15dd9d927f6227ea151e901c7406af4f +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/45/b1/ea4f68038a18c77c9467400d166d74c4ffa536f34761f7983a104357e614 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 3230ac9b56..cade81514b 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 2c8cf03b6e92e1b9c335de56b606c2fc multidict-6.1.0.tar.gz -sha256 22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a multidict-6.1.0.tar.gz +md5 cba8e65b4c65d889395672fd62de5183 multidict-6.7.0.tar.gz +sha256 c6e99d9a65ca282e578dfea819cfa9c0a62b2499d8677392e09feaf305e9e6f5 multidict-6.7.0.tar.gz # Locally computed sha256 checksums sha256 93d11a968e2f0f36373c40811ff6d20e173f58c3cab5884cd6617bbfd795492a LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 6b952244bc..4de38b9ab6 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.1.0 +PYTHON_MULTIDICT_VERSION = 6.7.0 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/d6/be/504b89a5e9ca731cd47487e91c469064f8ae5af93b7259758dcfc2b9c848 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/80/1e/5492c365f222f907de1039b91f922b93fa4f764c713ee858d235495d8f50 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/package/python-multipart/python-multipart.hash b/package/python-multipart/python-multipart.hash index d68be9e0e3..594c7cd497 100644 --- a/package/python-multipart/python-multipart.hash +++ b/package/python-multipart/python-multipart.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-multipart/json -md5 7051f07d9645d3f2e72c0a889329057b python_multipart-0.0.17.tar.gz -sha256 41330d831cae6e2f22902704ead2826ea038d0419530eadff3ea80175aec5538 python_multipart-0.0.17.tar.gz +md5 fa3ee0a8ee83e24b66ab40a841922244 python_multipart-0.0.20.tar.gz +sha256 8dd0cab45b8e23064ae09147625994d090fa46f5b0d1e13af944c331a7fa9d13 python_multipart-0.0.20.tar.gz # Locally computed sha256 checksums sha256 a8e833176cd617daf00b9d6d39fa15ca8edebc6d1643079cd2f4893c0c289be2 LICENSE.txt diff --git a/package/python-multipart/python-multipart.mk b/package/python-multipart/python-multipart.mk index 1f8d581d68..8e11f5f6cd 100644 --- a/package/python-multipart/python-multipart.mk +++ b/package/python-multipart/python-multipart.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_MULTIPART_VERSION = 0.0.17 +PYTHON_MULTIPART_VERSION = 0.0.20 PYTHON_MULTIPART_SOURCE = python_multipart-$(PYTHON_MULTIPART_VERSION).tar.gz -PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/40/22/edea41c2d4a22e666c0c7db7acdcbf7bc8c1c1f7d3b3ca246ec982fec612 +PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/f3/87/f44d7c9f274c7ee665a29b885ec97089ec5dc034c7f3fafa03da9e39a09e PYTHON_MULTIPART_SETUP_TYPE = hatch PYTHON_MULTIPART_LICENSE = Apache-2.0 PYTHON_MULTIPART_LICENSE_FILES = LICENSE.txt +PYTHON_MULTIPART_CPE_ID_VENDOR = fastapiexpert $(eval $(python-package)) diff --git a/package/python-mypy-extensions/python-mypy-extensions.hash b/package/python-mypy-extensions/python-mypy-extensions.hash index 5e3763bd63..6db4ca35b0 100644 --- a/package/python-mypy-extensions/python-mypy-extensions.hash +++ b/package/python-mypy-extensions/python-mypy-extensions.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mypy_extensions/json -md5 5b77a3cafc7e9749a0157533c0915b5d mypy_extensions-1.0.0.tar.gz -sha256 75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782 mypy_extensions-1.0.0.tar.gz +md5 f59bfd7f9dca73f36c8feed12f9e8eba mypy_extensions-1.1.0.tar.gz +sha256 52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558 mypy_extensions-1.1.0.tar.gz # Locally computed sha256 checksums sha256 a50450da1d53cd777b80ced77c58ff96abe0ccd879706bd142c3ec20e245f0b4 LICENSE diff --git a/package/python-mypy-extensions/python-mypy-extensions.mk b/package/python-mypy-extensions/python-mypy-extensions.mk index 494a03ac2c..cf0f7c681c 100644 --- a/package/python-mypy-extensions/python-mypy-extensions.mk +++ b/package/python-mypy-extensions/python-mypy-extensions.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_MYPY_EXTENSIONS_VERSION = 1.0.0 +PYTHON_MYPY_EXTENSIONS_VERSION = 1.1.0 PYTHON_MYPY_EXTENSIONS_SOURCE = mypy_extensions-$(PYTHON_MYPY_EXTENSIONS_VERSION).tar.gz -PYTHON_MYPY_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/98/a4/1ab47638b92648243faf97a5aeb6ea83059cc3624972ab6b8d2316078d3f -PYTHON_MYPY_EXTENSIONS_SETUP_TYPE = setuptools +PYTHON_MYPY_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b +PYTHON_MYPY_EXTENSIONS_SETUP_TYPE = flit PYTHON_MYPY_EXTENSIONS_LICENSE = MIT PYTHON_MYPY_EXTENSIONS_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-mypy/Config.in b/package/python-mypy/Config.in new file mode 100644 index 0000000000..6c58bc4fc1 --- /dev/null +++ b/package/python-mypy/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_MYPY + bool "python-mypy" + select BR2_PACKAGE_PYTHON_MYPY_EXTENSIONS # runtime + select BR2_PACKAGE_PYTHON_PATHSPEC # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + Optional static typing for Python. + + https://www.mypy-lang.org/ diff --git a/package/python-mypy/python-mypy.hash b/package/python-mypy/python-mypy.hash new file mode 100644 index 0000000000..9f1656ddce --- /dev/null +++ b/package/python-mypy/python-mypy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/mypy/json +md5 9ea329f0a99bb98554683680b988c5ea mypy-1.18.2.tar.gz +sha256 06a398102a5f203d7477b2923dda3634c36727fa5c237d8f859ef90c42a9924b mypy-1.18.2.tar.gz +# Locally computed sha256 checksums +sha256 de341f6e031d021aab9eb27bdf713cc6fb844dee832ef3bcd4688bff5517220b LICENSE diff --git a/package/python-mypy/python-mypy.mk b/package/python-mypy/python-mypy.mk new file mode 100644 index 0000000000..ba07ef5b9c --- /dev/null +++ b/package/python-mypy/python-mypy.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# python-mypy +# +################################################################################ + +PYTHON_MYPY_VERSION = 1.18.2 +PYTHON_MYPY_SOURCE = mypy-$(PYTHON_MYPY_VERSION).tar.gz +PYTHON_MYPY_SITE = https://files.pythonhosted.org/packages/c0/77/8f0d0001ffad290cef2f7f216f96c814866248a0b92a722365ed54648e7e +PYTHON_MYPY_SETUP_TYPE = setuptools +PYTHON_MYPY_LICENSE = Apache-2.0, Python-2.0.1 +PYTHON_MYPY_LICENSE_FILES = LICENSE +PYTHON_MYPY_DEPENDENCIES = \ + host-python-mypy-extensions \ + host-python-pathspec \ + host-python-types-psutil \ + host-python-types-setuptools \ + host-python-typing-extensions +HOST_PYTHON_MYPY_DEPENDENCIES = \ + host-python-mypy-extensions \ + host-python-pathspec \ + host-python-types-psutil \ + host-python-types-setuptools \ + host-python-typing-extensions + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index 5433192a73..bd8326f104 100644 --- a/package/python-networkx/python-networkx.hash +++ b/package/python-networkx/python-networkx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/networkx/json -md5 b6cde64de26aca58aa8431c0b232512f networkx-3.4.2.tar.gz -sha256 307c3669428c5362aab27c8a1260aa8f47c4e91d3891f48be0141738d8d053e1 networkx-3.4.2.tar.gz +md5 9d5221bbc2eca0190663e887b91e75c6 networkx-3.5.tar.gz +sha256 d4c6f9cf81f52d69230866796b82afbccdec3db7ae4fbd1b65ea750feed50037 networkx-3.5.tar.gz # Locally computed sha256 checksums -sha256 5b433b90f755eb9bbd06feff1d1a4f5f232c5208a185694199e45fa95d762792 LICENSE.txt +sha256 3cf7c3a179d817b23b8b8568211769fefdf93797d207d984b8b2fa24d0220b33 LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 37780ef36a..41d33f1560 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 3.4.2 +PYTHON_NETWORKX_VERSION = 3.5 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/fd/1d/06475e1cd5264c0b870ea2cc6fdb3e37177c1e565c43f56ff17a10e3937f +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/6c/4f/ccdb8ad3a38e583f214547fd2f7ff1fc160c43a75af88e6aec213404b96a PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python diff --git a/package/python-numpy/0001-MNT-do-not-use-long-type.patch b/package/python-numpy/0001-MNT-do-not-use-long-type.patch new file mode 100644 index 0000000000..d813a4d51b --- /dev/null +++ b/package/python-numpy/0001-MNT-do-not-use-long-type.patch @@ -0,0 +1,34 @@ +From 6dc2fd31f8a5a4ef502cb7734f004f5bce94e671 Mon Sep 17 00:00:00 2001 +From: Thomas A Caswell +Date: Sat, 18 Nov 2023 16:46:52 -0500 +Subject: [PATCH] MNT: do not use `long` type +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Removed as type at language level 3 in ed7e95912b6ed7d20e190fbf1aecb9f2a997d479 +in cython + +Upstream: https://github.com/numpy/numpy/commit/6dc2fd31f8a5a4ef502cb7734f004f5bce94e671 + +Signed-off-by: Sébastien Szymanski +--- + numpy/random/_generator.pyx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/random/_generator.pyx b/numpy/random/_generator.pyx +index d067e795eb5c..ae481d69d696 100644 +--- a/numpy/random/_generator.pyx ++++ b/numpy/random/_generator.pyx +@@ -3757,7 +3757,7 @@ def multivariate_normal(self, mean, cov, size=None, check_valid='warn', + + if size is None: + shape = [] +- elif isinstance(size, (int, long, np.integer)): ++ elif isinstance(size, (int, np.integer)): + shape = [size] + else: + shape = size +-- +2.49.1 + diff --git a/package/python-oauthlib/python-oauthlib.hash b/package/python-oauthlib/python-oauthlib.hash index 6a2ad003e1..5ee9a0ce05 100644 --- a/package/python-oauthlib/python-oauthlib.hash +++ b/package/python-oauthlib/python-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/oauthlib/json -md5 2f7b898cc1af8c1409cc329e8843ea8f oauthlib-3.2.2.tar.gz -sha256 9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 oauthlib-3.2.2.tar.gz +md5 856bc51662afb26ac58b1d7742606b2e oauthlib-3.3.1.tar.gz +sha256 0f0f8aa759826a193cf66c12ea1af1637f87b9b4622d46e866952bb022e538c9 oauthlib-3.3.1.tar.gz # Locally computed sha256 checksums -sha256 3d1e12d8ac52c0b6c148af6d291f72400b8720ed16c0ac4a89868b6d14b1c939 LICENSE +sha256 0028aa4763a8a0b09ca4c68d585263474cf9aaa6ec69ffbef3a31a9eccdd3b91 LICENSE diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index eb0ccbf46f..bbf59acedb 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OAUTHLIB_VERSION = 3.2.2 +PYTHON_OAUTHLIB_VERSION = 3.3.1 PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz -PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf4001037904031639e6bfbfc02badfc7e12f137a8afa254df6c4c8a670 +PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/0b/5f/19930f824ffeb0ad4372da4812c50edbd1434f678c90c2733e1188edfc63 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index ddea73f629..54594749fe 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 144d268da63c96d800f5aa0c0901cf09c9337a6dc5372a4539415d2cf7f45b2d python-orjson-3.10.11-cargo2.tar.gz +sha256 b4a77b2489f8ffe81f9b1037f1c17fd6bf89291b82888f176dbeac00e9cdc0f9 python-orjson-3.10.15-cargo4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index 85ad6c3248..29325e2f67 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.10.11 +PYTHON_ORJSON_VERSION = 3.10.15 PYTHON_ORJSON_SOURCE_PYPI = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE_PYPI = https://files.pythonhosted.org/packages/db/3a/10320029954badc7eaa338a15ee279043436f396e965dafc169610e4933f +PYTHON_ORJSON_SITE_PYPI = https://files.pythonhosted.org/packages/ae/f9/5dea21763eeff8c1590076918a446ea3d6140743e0e36f58f369928ed0f4 PYTHON_ORJSON_SITE = $(PYTHON_ORJSON_SITE_PYPI)/$(PYTHON_ORJSON_SOURCE_PYPI)?buildroot-path=filename PYTHON_ORJSON_SETUP_TYPE = maturin PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 1d1956e2ba..f1910a7ad2 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 97dbaca91e00d6b9fd86866e8c7897ae packaging-24.2.tar.gz -sha256 c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f packaging-24.2.tar.gz +md5 ab0ef21ddebe09d1803575120d3f99f8 packaging-25.0.tar.gz +sha256 d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f packaging-25.0.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index 14d9c5ea4c..9d6847426d 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 24.2 +PYTHON_PACKAGING_VERSION = 25.0 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD diff --git a/package/python-parso/python-parso.hash b/package/python-parso/python-parso.hash index 83224a28bf..d0c8b3861a 100644 --- a/package/python-parso/python-parso.hash +++ b/package/python-parso/python-parso.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/parso/json -md5 f83b2e4164f6589ccae39b16c30ed5de parso-0.8.4.tar.gz -sha256 eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d parso-0.8.4.tar.gz +md5 e0b327d04ff11e429737465f2716c232 parso-0.8.5.tar.gz +sha256 034d7354a9a018bdce352f48b2a8a450f05e9d6ee85db84764e9b6bd96dafe5a parso-0.8.5.tar.gz # Locally computed sha256 checksums sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE diff --git a/package/python-parso/python-parso.mk b/package/python-parso/python-parso.mk index 65d10ebfc0..1cbc1f1e89 100644 --- a/package/python-parso/python-parso.mk +++ b/package/python-parso/python-parso.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARSO_VERSION = 0.8.4 +PYTHON_PARSO_VERSION = 0.8.5 PYTHON_PARSO_SOURCE = parso-$(PYTHON_PARSO_VERSION).tar.gz -PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/66/94/68e2e17afaa9169cf6412ab0f28623903be73d1b32e208d9e8e541bb086d +PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/d4/de/53e0bcf53d13e005bd8c92e7855142494f41171b34c2536b86187474184d PYTHON_PARSO_SETUP_TYPE = setuptools PYTHON_PARSO_LICENSE = MIT, Python-2.0, BSD-3-Clause (flask theme) PYTHON_PARSO_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE test/normalizer_issue_files/LICENSE diff --git a/package/python-patch-ng/Config.in b/package/python-patch-ng/Config.in new file mode 100644 index 0000000000..60c50cbb85 --- /dev/null +++ b/package/python-patch-ng/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PATCH_NG + bool "python-patch-ng" + help + Library to parse and apply unified diffs. + + https://github.com/conan-io/python-patch diff --git a/package/python-patch-ng/python-patch-ng.hash b/package/python-patch-ng/python-patch-ng.hash new file mode 100644 index 0000000000..f832552c30 --- /dev/null +++ b/package/python-patch-ng/python-patch-ng.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/patch-ng/json +md5 208be456725a65cb570ffd3e3589f6ba patch-ng-1.19.0.tar.gz +sha256 27484792f4ac1c15fe2f3e4cecf74bb9833d33b75c715b71d199f7e1e7d1f786 patch-ng-1.19.0.tar.gz +# Locally computed sha256 checksums +sha256 d807f69dbc4f24153544ac011b741015ea47231c69fe16b1e74759f299349a78 LICENSE diff --git a/package/python-patch-ng/python-patch-ng.mk b/package/python-patch-ng/python-patch-ng.mk new file mode 100644 index 0000000000..fe24b0bc95 --- /dev/null +++ b/package/python-patch-ng/python-patch-ng.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-patch-ng +# +################################################################################ + +PYTHON_PATCH_NG_VERSION = 1.19.0 +PYTHON_PATCH_NG_SOURCE = patch-ng-$(PYTHON_PATCH_NG_VERSION).tar.gz +PYTHON_PATCH_NG_SITE = https://files.pythonhosted.org/packages/65/bb/ebd7c6058dcfbf634986f9a8b3fb638f3269501c73701a48b7530042da5b +PYTHON_PATCH_NG_SETUP_TYPE = setuptools +PYTHON_PATCH_NG_LICENSE = MIT +PYTHON_PATCH_NG_LICENSE_FILES = LICENSE + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-path/python-path.hash b/package/python-path/python-path.hash index 9a0d1a3681..117d225e75 100644 --- a/package/python-path/python-path.hash +++ b/package/python-path/python-path.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/path/json -md5 b970d0bcde985133cae6926a02e496b9 path-17.0.0.tar.gz -sha256 e1540261d22df1416fb1b498b3b1ed5353a371a48fe197d66611bb01e7fab2d5 path-17.0.0.tar.gz +md5 3f03cdccfa0fdd9dee34c445701d4a31 path-17.1.0.tar.gz +sha256 d41e05ed4fa1d4f6d702df3c1e0a1a255d7b544287432456455dc7c51e5f98e9 path-17.1.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-path/python-path.mk b/package/python-path/python-path.mk index 6e094aaad5..1ebaccd099 100644 --- a/package/python-path/python-path.mk +++ b/package/python-path/python-path.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATH_VERSION = 17.0.0 +PYTHON_PATH_VERSION = 17.1.0 PYTHON_PATH_SOURCE = path-$(PYTHON_PATH_VERSION).tar.gz -PYTHON_PATH_SITE = https://files.pythonhosted.org/packages/ff/a3/5dac44ce60ad6543578736a5729c5c2130cdac1c3117c61aad0583c2e3c6 +PYTHON_PATH_SITE = https://files.pythonhosted.org/packages/ed/51/127cd9fa2baae5715e24839d6fb73c6fa6eca7b84a52fc7ce8195d830802 PYTHON_PATH_SETUP_TYPE = setuptools PYTHON_PATH_LICENSE = MIT PYTHON_PATH_LICENSE_FILES = LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index dc6a1999e0..c9cde9d906 100644 --- a/package/python-pathvalidate/python-pathvalidate.hash +++ b/package/python-pathvalidate/python-pathvalidate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathvalidate/json -md5 cc99f63c6f835eae4fe8643c79b8ca68 pathvalidate-3.2.1.tar.gz -sha256 f5d07b1e2374187040612a1fcd2bcb2919f8db180df254c9581bb90bf903377d pathvalidate-3.2.1.tar.gz +md5 eb93289da5c87fc28af52e8536f417bc pathvalidate-3.3.1.tar.gz +sha256 b18c07212bfead624345bb8e1d6141cdcf15a39736994ea0b94035ad2b1ba177 pathvalidate-3.3.1.tar.gz # Locally computed sha256 checksums -sha256 36289157e371aaae5b5d3ba4be87359ed07548cdc7a9f19ff61dc67cfc536a9c LICENSE +sha256 130a35b917df1951aefbf366120491d5124045a87ded123f20ded21521f4e3a2 LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index f5eb257cc1..5d5baa5731 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 3.2.1 +PYTHON_PATHVALIDATE_VERSION = 3.3.1 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/b4/8c/8713d8dcd8e357b9358695b441ee974580a8addfaea4f01437df07577052 +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/fa/2a/52a8da6fe965dea6192eb716b357558e103aea0a1e9a8352ad575a8406ca PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE diff --git a/package/python-pbr/python-pbr.hash b/package/python-pbr/python-pbr.hash index 02db9aca02..58503eaf11 100644 --- a/package/python-pbr/python-pbr.hash +++ b/package/python-pbr/python-pbr.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pbr/json -md5 06361b83d178fb62dcd1b4ba9a9b418c pbr-6.1.0.tar.gz -sha256 788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24 pbr-6.1.0.tar.gz +md5 64cd498740ec05994ef0592c73c351c5 pbr-7.0.1.tar.gz +sha256 3ecbcb11d2b8551588ec816b3756b1eb4394186c3b689b17e04850dfc20f7e57 pbr-7.0.1.tar.gz # Locally computed sha256 checksums sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 LICENSE sha256 eb4a8c8791f6caab1cf36df26db2b6f4e2ddda52657b060ff7f02abc63910aef pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pbr/python-pbr.mk b/package/python-pbr/python-pbr.mk index 993e748a2b..ec530ded04 100644 --- a/package/python-pbr/python-pbr.mk +++ b/package/python-pbr/python-pbr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PBR_VERSION = 6.1.0 +PYTHON_PBR_VERSION = 7.0.1 PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz -PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/b2/35/80cf8f6a4f34017a7fe28242dc45161a1baa55c41563c354d8147e8358b2 +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/ad/8d/23253ab92d4731eb34383a69b39568ca63a1685bec1e9946e91a32fc87ad PYTHON_PBR_SETUP_TYPE = setuptools PYTHON_PBR_LICENSE = Apache-2.0 (module), BSD-3-Clause (test package) PYTHON_PBR_LICENSE_FILES = LICENSE pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pdm-backend/python-pdm-backend.hash b/package/python-pdm-backend/python-pdm-backend.hash index 9e33849329..3c7a23b79a 100644 --- a/package/python-pdm-backend/python-pdm-backend.hash +++ b/package/python-pdm-backend/python-pdm-backend.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pdm-backend/json -md5 3aad60c8b253336b09129551677912ad pdm_backend-2.4.3.tar.gz -sha256 dbd9047a7ac10d11a5227e97163b617ad5d665050476ff63867d971758200728 pdm_backend-2.4.3.tar.gz +md5 6e05613e331b4cb95a973ff99f642bc9 pdm_backend-2.4.5.tar.gz +sha256 56c019c440308adad5d057c08cbb777e65f43b991a3b0920749781258972fe5b pdm_backend-2.4.5.tar.gz # Locally computed sha256 checksums sha256 1da058ed0440fea5df1765b19a1418800439b18fd6f1c13c7d429cb81e9c6d47 LICENSE diff --git a/package/python-pdm-backend/python-pdm-backend.mk b/package/python-pdm-backend/python-pdm-backend.mk index 0565de5b8c..60299df9a9 100644 --- a/package/python-pdm-backend/python-pdm-backend.mk +++ b/package/python-pdm-backend/python-pdm-backend.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PDM_BACKEND_VERSION = 2.4.3 +PYTHON_PDM_BACKEND_VERSION = 2.4.5 PYTHON_PDM_BACKEND_SOURCE = pdm_backend-$(PYTHON_PDM_BACKEND_VERSION).tar.gz -PYTHON_PDM_BACKEND_SITE = https://files.pythonhosted.org/packages/d9/bf/d75d568521cef171ae9138d9ab55c169a98ee803853ca87b7096e4636d5b +PYTHON_PDM_BACKEND_SITE = https://files.pythonhosted.org/packages/4d/f2/59135ddc68636a33179a37c002abcb162a9811c9ce14469258e486bec012 PYTHON_PDM_BACKEND_SETUP_TYPE = pep517 PYTHON_PDM_BACKEND_LICENSE = MIT PYTHON_PDM_BACKEND_LICENSE_FILES = LICENSE diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 0ef6ebc820..d9077daaf7 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 22912b3db645a51ab4b4ff036b559ca8 pillow-11.0.0.tar.gz -sha256 72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739 pillow-11.0.0.tar.gz +md5 9464f92bed3be9c68293cb399ec1ec1a pillow-11.3.0.tar.gz +sha256 3828ee7586cd0b2091b6209e5ad53e20d0649bbe87164a459d0676e035e8f523 pillow-11.3.0.tar.gz # Locally computed sha256 checksums -sha256 cf234c27a3f275f5a050f4df3946f8855704226fe4e7ca8b33928cbcecbced37 LICENSE +sha256 17f240ae101143707e5e7303a5d800450d9ccc7475b463cedb555cefdb3c6ece LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 9626268b6e..80961b92a5 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 11.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/a5/26/0d95c04c868f6bdb0c447e3ee2de5564411845e36a858cfd63766bc7b563 +PYTHON_PILLOW_VERSION = 11.3.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/f3/0d/d0d6dea55cd152ce3d6767bb38a8fc10e33796ba4ba210cbab9354b6d238 PYTHON_PILLOW_SOURCE = pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 9ecdcbace4..ad70f0da7b 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 ddc01fbcc66b449a9c8dc78d9c13e4df pip-24.3.1.tar.gz -sha256 ebcb60557f2aefabc2e0f918751cd24ea0d56d8ec5445fe1807f1d2109660b99 pip-24.3.1.tar.gz +md5 6d109857fa69274dacfc1d6528471eb5 pip-25.2.tar.gz +sha256 578283f006390f85bb6282dffb876454593d637f5d1be494b5202ce4877e71f2 pip-25.2.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 7fe70c9bc1..02d7da6fe9 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 24.3.1 +PYTHON_PIP_VERSION = 25.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/f4/b1/b422acd212ad7eedddaf7981eee6e5de085154ff726459cf2da7c5a184c1 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/20/16/650289cd3f43d5a2fadfd98c68bd1e1e7f2550a1a5326768cddfbcedb2c5 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pluggy/python-pluggy.hash b/package/python-pluggy/python-pluggy.hash index 522c1e3b6c..94a20accf1 100644 --- a/package/python-pluggy/python-pluggy.hash +++ b/package/python-pluggy/python-pluggy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pluggy/json -md5 ac0870be78ba0ee227a5c3955efeba59 pluggy-1.5.0.tar.gz -sha256 2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 pluggy-1.5.0.tar.gz +md5 54391218af778acb006c2d915085d469 pluggy-1.6.0.tar.gz +sha256 7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 pluggy-1.6.0.tar.gz # Locally computed sha256 checksums sha256 d6b65e6c213a5d0b577911d34d6e5949b9f59d76c238c5071a2f3fc16cfb2606 LICENSE diff --git a/package/python-pluggy/python-pluggy.mk b/package/python-pluggy/python-pluggy.mk index f8a0b729b5..a5d8f5e94b 100644 --- a/package/python-pluggy/python-pluggy.mk +++ b/package/python-pluggy/python-pluggy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PLUGGY_VERSION = 1.5.0 +PYTHON_PLUGGY_VERSION = 1.6.0 PYTHON_PLUGGY_SOURCE = pluggy-$(PYTHON_PLUGGY_VERSION).tar.gz -PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6 +PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779 PYTHON_PLUGGY_SETUP_TYPE = setuptools PYTHON_PLUGGY_LICENSE = MIT PYTHON_PLUGGY_LICENSE_FILES = LICENSE diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash index eaed4dc728..888f220e96 100644 --- a/package/python-poetry-core/python-poetry-core.hash +++ b/package/python-poetry-core/python-poetry-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/poetry-core/json -md5 64e2c60933b5647f274151ebb1c968f0 poetry_core-1.9.1.tar.gz -sha256 7a2d49214bf58b4f17f99d6891d947a9836c9899a67a5069f52d7b67217f61b8 poetry_core-1.9.1.tar.gz +md5 dd09886c53c482680536e8ce8ffd483e poetry_core-2.2.0.tar.gz +sha256 b4033b71b99717a942030e074fec7e3082e5fde7a8ed10f02cd2413bdf940b1f poetry_core-2.2.0.tar.gz # Locally computed sha256 checksums sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk index 107ad1bebb..eac7f75a9f 100644 --- a/package/python-poetry-core/python-poetry-core.mk +++ b/package/python-poetry-core/python-poetry-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POETRY_CORE_VERSION = 1.9.1 +PYTHON_POETRY_CORE_VERSION = 2.2.0 PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz -PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/c7/5c/3609519b7d890ced542fe327ea26a7c8ea55ef298c323c46cca2a011c1cb +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/6c/73/8cc4cdc3992d9e03a749dd0ef7438093042a1ed197df8fcfc9dc9502ef0b PYTHON_POETRY_CORE_SETUP_TYPE = pep517 PYTHON_POETRY_CORE_LICENSE = MIT PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE diff --git a/package/python-posix-ipc/Config.in b/package/python-posix-ipc/Config.in index 2c62678679..59200de66c 100644 --- a/package/python-posix-ipc/Config.in +++ b/package/python-posix-ipc/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_PYTHON_POSIX_IPC on systems that support the POSIX Realtime Extensions a.k.a. POSIX 1003.1b-1993. - http://semanchuk.com/philip/posix_ipc/ + https://github.com/osvenskan/posix_ipc/ comment "python-posix-ipc needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 427e4c7b55..1f1d98bcb4 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/posix-ipc/json -md5 523a31c4dbd56e0d4fd677f33e126e5d posix_ipc-1.1.1.tar.gz -sha256 e2456ba0cfb2ee5ba14121450e8d825b3c4a1461fca0761220aab66d4111cbb7 posix_ipc-1.1.1.tar.gz +md5 2488e63c881311f2bb697a0344ba9070 posix_ipc-1.3.0.tar.gz +sha256 6e559ac5bb5f6f233c396103f4868e383bbd8f4e54d20876910896f47d353448 posix_ipc-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE +sha256 3f65e6e3d932adabcc6176dad775c6e538711483ef8de45a3ec47a12525f56b3 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index bdd2f1d4af..48d6588310 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 1.1.1 +PYTHON_POSIX_IPC_VERSION = 1.3.0 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/07/7f/b954f224a226960a4aa98b6c5fa3d4f3fafb20bb8461446e41b563aee863 +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/2b/a1/16d4b5a7dfc3dbb5965debe0415b6dc4866d4c94a1229f5b12cde7b78de8 PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = setuptools diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index ee8237c7b0..a9fa1ffe3e 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 2448470c36f2f250c9decefcc337b9f7 prompt_toolkit-3.0.48.tar.gz -sha256 d6623ab0477a80df74e646bdbc93621143f5caf104206aa29294d53de1a03d90 prompt_toolkit-3.0.48.tar.gz +md5 8d75b89a1478259c17130d4fab6de475 prompt_toolkit-3.0.52.tar.gz +sha256 28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855 prompt_toolkit-3.0.52.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index a03f76dcad..280a6561e2 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.48 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.52 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/2d/4f/feb5e137aff82f7c7f3248267b97451da3644f6cdc218edfe549fb354127 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE diff --git a/package/python-propcache/python-propcache.hash b/package/python-propcache/python-propcache.hash index 56a491433f..6e89eac6aa 100644 --- a/package/python-propcache/python-propcache.hash +++ b/package/python-propcache/python-propcache.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/propcache/json -md5 70b121a9845a0da06eccfbc42ff74335 propcache-0.2.0.tar.gz -sha256 df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70 propcache-0.2.0.tar.gz +md5 1c073b491620a9f6d568276d61f80277 propcache-0.3.2.tar.gz +sha256 20d7d62e4e7ef05f221e0db2856b979540686342e7dd9973b815599c7057e168 propcache-0.3.2.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-propcache/python-propcache.mk b/package/python-propcache/python-propcache.mk index 37ceec731d..e1050c4919 100644 --- a/package/python-propcache/python-propcache.mk +++ b/package/python-propcache/python-propcache.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROPCACHE_VERSION = 0.2.0 +PYTHON_PROPCACHE_VERSION = 0.3.2 PYTHON_PROPCACHE_SOURCE = propcache-$(PYTHON_PROPCACHE_VERSION).tar.gz -PYTHON_PROPCACHE_SITE = https://files.pythonhosted.org/packages/a9/4d/5e5a60b78dbc1d464f8a7bbaeb30957257afdc8512cbb9dfd5659304f5cd +PYTHON_PROPCACHE_SITE = https://files.pythonhosted.org/packages/a6/16/43264e4a779dd8588c21a70f0709665ee8f611211bdd2c87d952cfa7c776 PYTHON_PROPCACHE_SETUP_TYPE = setuptools PYTHON_PROPCACHE_LICENSE = Apache-2.0 PYTHON_PROPCACHE_LICENSE_FILES = LICENSE diff --git a/package/python-proto-plus/python-proto-plus.hash b/package/python-proto-plus/python-proto-plus.hash index ebf3426886..b55ac8bca0 100644 --- a/package/python-proto-plus/python-proto-plus.hash +++ b/package/python-proto-plus/python-proto-plus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/proto-plus/json -md5 f1465151dcad7bb3c4ec3271e4afbc3d proto_plus-1.25.0.tar.gz -sha256 fbb17f57f7bd05a68b7707e745e26528b0b3c34e378db91eef93912c54982d91 proto_plus-1.25.0.tar.gz +md5 631b92558563874de67630333450e08f proto_plus-1.26.1.tar.gz +sha256 21a515a4c4c0088a773899e23c7bbade3d18f9c66c73edd4c7ee3816bc96a012 proto_plus-1.26.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-proto-plus/python-proto-plus.mk b/package/python-proto-plus/python-proto-plus.mk index 734c6b2003..b024e9952f 100644 --- a/package/python-proto-plus/python-proto-plus.mk +++ b/package/python-proto-plus/python-proto-plus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROTO_PLUS_VERSION = 1.25.0 +PYTHON_PROTO_PLUS_VERSION = 1.26.1 PYTHON_PROTO_PLUS_SOURCE = proto_plus-$(PYTHON_PROTO_PLUS_VERSION).tar.gz -PYTHON_PROTO_PLUS_SITE = https://files.pythonhosted.org/packages/7e/05/74417b2061e1bf1b82776037cad97094228fa1c1b6e82d08a78d3fb6ddb6 +PYTHON_PROTO_PLUS_SITE = https://files.pythonhosted.org/packages/f4/ac/87285f15f7cce6d4a008f33f1757fb5a13611ea8914eb58c3d0d26243468 PYTHON_PROTO_PLUS_SETUP_TYPE = setuptools PYTHON_PROTO_PLUS_LICENSE = Apache-2.0 PYTHON_PROTO_PLUS_LICENSE_FILES = LICENSE diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index e7af678b97..1e1833980c 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz +# md5, sha256 from https://pypi.org/pypi/protobuf/json +md5 26ee22a630b0dbfce4de03adc5600fbc protobuf-5.29.3.tar.gz +sha256 5da0f41edaf117bde316404bad1a486cb4ededf8e4a54891296f648e8e076620 protobuf-5.29.3.tar.gz +# Locally computed sha256 checksums sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk index df90254670..898a133d37 100644 --- a/package/python-protobuf/python-protobuf.mk +++ b/package/python-protobuf/python-protobuf.mk @@ -5,12 +5,11 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = protobuf-python-4.$(PYTHON_PROTOBUF_VERSION).tar.gz -PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) +PYTHON_PROTOBUF_SOURCE = protobuf-5.$(PYTHON_PROTOBUF_VERSION).tar.gz +PYTHON_PROTOBUF_SITE = https://files.pythonhosted.org/packages/f7/d1/e0a911544ca9993e0f17ce6d3cc0932752356c1b0a834397f28e63479344 PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf PYTHON_PROTOBUF_SETUP_TYPE = setuptools -PYTHON_PROTOBUF_SUBDIR = python $(eval $(python-package)) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 0b7c3f6bed..0ba261a7a8 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 2baae02411c42c185e129c3f26030079 psutil-6.1.0.tar.gz -sha256 353815f59a7f64cdaca1c0307ee13558a0512f6db064e92fe833784f08539c7a psutil-6.1.0.tar.gz +md5 26dc8499f435198ab3f907edf9e7d7b4 psutil-7.1.0.tar.gz +sha256 655708b3c069387c8b77b072fc429a57d0e214221d01c0a772df7dfedcb3bcd2 psutil-7.1.0.tar.gz # Locally computed sha256 checksums sha256 b89c063b3786e28e0c0a38f1931db61fed35e69dd2a2966fbecffee0f46c8d10 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 73f54231b6..41fd92fe37 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 6.1.0 +PYTHON_PSUTIL_VERSION = 7.1.0 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/26/10/2a30b13c61e7cf937f4adf90710776b7918ed0a9c434e2c38224732af310 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b3/31/4723d756b59344b643542936e37a31d1d3204bcdc42a7daa8ee9eb06fb50 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE diff --git a/package/python-psycopg2/Config.in b/package/python-psycopg2/Config.in index 6b07b0c06c..8eeeb42692 100644 --- a/package/python-psycopg2/Config.in +++ b/package/python-psycopg2/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 bool "python-psycopg2" depends on BR2_USE_MMU # postgresql depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL diff --git a/package/python-pyaml/python-pyaml.hash b/package/python-pyaml/python-pyaml.hash index 06e99448d0..c1029bba59 100644 --- a/package/python-pyaml/python-pyaml.hash +++ b/package/python-pyaml/python-pyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyaml/json -md5 1301f53ad68626ac295c2663315b1804 pyaml-24.9.0.tar.gz -sha256 e78dee8b0d4fed56bb9fa11a8a7858e6fade1ec70a9a122cee6736efac3e69b5 pyaml-24.9.0.tar.gz +md5 b5b6dc631c2c117ba3373faecf6d72f5 pyaml-25.7.0.tar.gz +sha256 e113a64ec16881bf2b092e2beb84b7dcf1bd98096ad17f5f14e8fb782a75d99b pyaml-25.7.0.tar.gz # Locally computed sha256 checksums sha256 dc1342cc1cb49e24c1c9e8a495acc9625ce2e04146c116279af0ab0949cd829c COPYING diff --git a/package/python-pyaml/python-pyaml.mk b/package/python-pyaml/python-pyaml.mk index e908aa089a..a39f6d5568 100644 --- a/package/python-pyaml/python-pyaml.mk +++ b/package/python-pyaml/python-pyaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYAML_VERSION = 24.9.0 +PYTHON_PYAML_VERSION = 25.7.0 PYTHON_PYAML_SOURCE = pyaml-$(PYTHON_PYAML_VERSION).tar.gz -PYTHON_PYAML_SITE = https://files.pythonhosted.org/packages/fd/a6/5b51160ff7ce60b0c60ec825359c0e818b0ce4a2504fa3dd1470f42f9b10 +PYTHON_PYAML_SITE = https://files.pythonhosted.org/packages/c4/01/41f63d66a801a561c9e335523516bd5f761bc43cc61f8b75918306bf2da8 PYTHON_PYAML_SETUP_TYPE = setuptools PYTHON_PYAML_LICENSE = WTFPL PYTHON_PYAML_LICENSE_FILES = COPYING diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.hash b/package/python-pyasn1-modules/python-pyasn1-modules.hash index fd7b732791..7d45c7c9af 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ b/package/python-pyasn1-modules/python-pyasn1-modules.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 2cb6c7001ac5caa2ead3ad2d28c9a43e pyasn1_modules-0.4.1.tar.gz -sha256 c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c pyasn1_modules-0.4.1.tar.gz +md5 799696cd892940f63904dcd9b0fa96bf pyasn1_modules-0.4.2.tar.gz +sha256 677091de870a80aae844b1ca6134f54652fa2c8c5a52aa396440ac3106e941e6 pyasn1_modules-0.4.2.tar.gz # Locally computed sha256 checksums sha256 2aad5fc00f705c4a1addb83eed10a6a75d286a3779f0cf8519d87e62bc4735fd LICENSE.txt diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.mk b/package/python-pyasn1-modules/python-pyasn1-modules.mk index 7087d5c44d..4398e1350e 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ b/package/python-pyasn1-modules/python-pyasn1-modules.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_MODULES_VERSION = 0.4.1 +PYTHON_PYASN1_MODULES_VERSION = 0.4.2 PYTHON_PYASN1_MODULES_SOURCE = pyasn1_modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/1d/67/6afbf0d507f73c32d21084a79946bfcfca5fbc62a72057e9c23797a737c9 +PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/e9/e6/78ebbb10a8c8e4b61a59249394a4a594c1a7af95593dc933a349c8d00964 PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyasn1/Config.in b/package/python-pyasn1/Config.in index fea63813b9..fb576ffb71 100644 --- a/package/python-pyasn1/Config.in +++ b/package/python-pyasn1/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_PYASN1 help ASN.1 types and codecs. - https://github.com/etingof/pyasn1 + https://github.com/pyasn1/pyasn1 diff --git a/package/python-pyasn1/python-pyasn1.hash b/package/python-pyasn1/python-pyasn1.hash index 4347a43c46..4268d82c38 100644 --- a/package/python-pyasn1/python-pyasn1.hash +++ b/package/python-pyasn1/python-pyasn1.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1/json -md5 dffae4ff9f997a83324b3f33fe62be54 pyasn1-0.4.8.tar.gz -sha256 aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba pyasn1-0.4.8.tar.gz +md5 75cdc260597f112fdfefec85379e710d pyasn1-0.6.1.tar.gz +sha256 6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034 pyasn1-0.6.1.tar.gz # Locally computed sha256 checksums -sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.rst +sha256 2aad5fc00f705c4a1addb83eed10a6a75d286a3779f0cf8519d87e62bc4735fd LICENSE.rst diff --git a/package/python-pyasn1/python-pyasn1.mk b/package/python-pyasn1/python-pyasn1.mk index 60050bef18..7a5cde40fb 100644 --- a/package/python-pyasn1/python-pyasn1.mk +++ b/package/python-pyasn1/python-pyasn1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_VERSION = 0.4.8 +PYTHON_PYASN1_VERSION = 0.6.1 PYTHON_PYASN1_SOURCE = pyasn1-$(PYTHON_PYASN1_VERSION).tar.gz -PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/a4/db/fffec68299e6d7bad3d504147f9094830b704527a7fc098b721d38cc7fa7 +PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/ba/e9/01f1a64245b89f039897cb0130016d79f77d52669aae6ee7b159a6c4c018 PYTHON_PYASN1_SETUP_TYPE = setuptools PYTHON_PYASN1_LICENSE = BSD-2-Clause PYTHON_PYASN1_LICENSE_FILES = LICENSE.rst diff --git a/package/python-pyasynchat/Config.in b/package/python-pyasynchat/Config.in index bf11cc5b39..17204a1b30 100644 --- a/package/python-pyasynchat/Config.in +++ b/package/python-pyasynchat/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_PYTHON_PYASYNCHAT Make asynchat available for Python 3.12 onwards. This is a compatibility package using the code removed from - the standard libary, upstream does not intend any + the standard library, upstream does not intend any maintenance. https://github.com/simonrob/pyasynchat diff --git a/package/python-pyasyncore/Config.in b/package/python-pyasyncore/Config.in index ad1376a243..09318baa58 100644 --- a/package/python-pyasyncore/Config.in +++ b/package/python-pyasyncore/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PYTHON_PYASYNCORE Make asyncore available for Python 3.12 onwards. This is a compatibility package using the code removed from - the standard libary, upstream does not intend any + the standard library, upstream does not intend any maintenance. https://github.com/simonrob/pyasyncore diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index fa24c1ec66..179288f694 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 ff4e54e91e32484b189b1e28758ec8c7 pycares-4.4.0.tar.gz -sha256 f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b30733e1c2 pycares-4.4.0.tar.gz +md5 230e5133767e84f5d99c93dd07fea611 pycares-4.11.0.tar.gz +sha256 c863d9003ca0ce7df26429007859afd2a621d3276ed9fef154a9123db9252557 pycares-4.11.0.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index fe6916445d..0f42bc591b 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.4.0 +PYTHON_PYCARES_VERSION = 4.11.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/1b/8f/daf60bbc06f4a3cd1cfb0ab807057151287df6f5c78f2e0d298acc9193ac +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/8d/ad/9d1e96486d2eb5a2672c4d9a2dd372d015b8d7a332c6ac2722c4c8e6bbbf PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE diff --git a/package/python-pycparser/python-pycparser.hash b/package/python-pycparser/python-pycparser.hash index 3ec1862b75..b93c6ac906 100644 --- a/package/python-pycparser/python-pycparser.hash +++ b/package/python-pycparser/python-pycparser.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycparser/json -md5 8922b0b1b53b419e3a38fba4aa43a348 pycparser-2.22.tar.gz -sha256 491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 pycparser-2.22.tar.gz +md5 bb4946a7b0d83569f5d29f566a55180a pycparser-2.23.tar.gz +sha256 78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2 pycparser-2.23.tar.gz # Locally computed sha256 checksums sha256 0c846399369ea76ddd7b5c44fe6d16497415fcf015f5cbb508c24bf98b81c5b1 LICENSE diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 6d01844fb3..7194347e78 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCPARSER_VERSION = 2.22 +PYTHON_PYCPARSER_VERSION = 2.23 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c +PYTHON_PYCPARSER_SITE = https://files.pythonhosted.org/packages/fe/cf/d2d3b9f5699fb1e4615c8e32ff220203e43b248e1dfcc6736ad9057731ca PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3-Clause PYTHON_PYCPARSER_LICENSE_FILES = LICENSE diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash index e86f16a8b2..85ec6c6588 100644 --- a/package/python-pycrate/python-pycrate.hash +++ b/package/python-pycrate/python-pycrate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycrate/json -md5 d5bc1e0e801ebfe27e2cae35ea45bc95 pycrate-0.7.7.tar.gz -sha256 72f86a9a50497342fb2a940b1398a46e0aa2401a90cf77405074f2264b0e3734 pycrate-0.7.7.tar.gz +md5 7227ba1e2124dc84818adee804de42fe pycrate-0.7.11.tar.gz +sha256 23dc1c19b148a17637fea73166b801c767ae738cc4cb3d8b1f74a29e469d7c02 pycrate-0.7.11.tar.gz # Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk index a6f3dccc5f..ac0e5e1cca 100644 --- a/package/python-pycrate/python-pycrate.mk +++ b/package/python-pycrate/python-pycrate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRATE_VERSION = 0.7.7 +PYTHON_PYCRATE_VERSION = 0.7.11 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz -PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/45/26/04cc9fd3df1a03a5f046e72d35f268c4dfebd278fcad228e81701576ca9d +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/42/70/64a5b11e831dab532b4b61e684c5807a68daeb93b2bd4853975acaaf968e PYTHON_PYCRATE_SETUP_TYPE = setuptools PYTHON_PYCRATE_LICENSE = LGPL-2.1+ PYTHON_PYCRATE_LICENSE_FILES = license.txt diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 357d9e8c2b..af67a1639a 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 1f75ba3b07402102857b5ed496f48718 pycryptodomex-3.21.0.tar.gz -sha256 222d0bd05381dd25c32dd6065c071ebf084212ab79bab4599ba9e6a3e0009e6c pycryptodomex-3.21.0.tar.gz +md5 c54ba32585587dd47087a8cf8032d72b pycryptodomex-3.23.0.tar.gz +sha256 71909758f010c82bc99b0abf4ea12012c98962fbf0583c2164f8b84533c2e4da pycryptodomex-3.23.0.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index 96a55050e6..9b367227c8 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.21.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.23.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/11/dc/e66551683ade663b5f07d7b3bc46434bf703491dbd22ee12d1f979ca828f +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/c9/85/e24bf90972a30b0fcd16c73009add1d7d7cd9140c2498a68252028899e41 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index ae4e1bab2f..d5934d2099 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydal/json -md5 7e6e1e955750752715f0f135a9f5cd4f pydal-20241027.1.tar.gz -sha256 8f7e9eeb5806d4433dcebda53efca1954eafd5c776fa19ee91e3efad1b9ff414 pydal-20241027.1.tar.gz +md5 f596df168df88de7599b5b6721d2e1e9 pydal-20250922.1.tar.gz +sha256 b88a0fad430ff62f840d32576e819d692541bd9edaaa05578b134bb2cd251727 pydal-20250922.1.tar.gz # Locally computed sha256 checksums sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 4eff89b0d7..006f4ed346 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20241027.1 +PYTHON_PYDAL_VERSION = 20250922.1 PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/31/7c/aa20d1d25f22d575e180181feeae4a077ff36414e0547060434c398d159a +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/f9/94/bf35afe3eaf94e2c411be204b8421b3abb34a24a260513fd9bc0e45c05e4 PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools diff --git a/package/python-pydantic-core/Config.in b/package/python-pydantic-core/Config.in index 3eeb1844a2..3f985ae4da 100644 --- a/package/python-pydantic-core/Config.in +++ b/package/python-pydantic-core/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_PYDANTIC_CORE depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help - Core validation logic for pydantic written in rust. + Core functionality for Pydantic validation and + serialization. https://github.com/pydantic/pydantic-core diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index 76e05eb20e..f61ab7a8e4 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 c9a9e5970fbe54f24023635743dfe0f9a0adbebafb467729b674399f06a2d0b5 python-pydantic-core-2.26.0-cargo2.tar.gz +sha256 8c31786f387bc0ce4a0fdfb500dbee7b102358616633b37159b389d5c53efa64 python-pydantic-core-2.41.4-cargo4.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 865c7d0c84..9eb0510278 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_PYDANTIC_CORE_VERSION = 2.26.0 +# python-pydantic pins an exact version of pydantic-core in pyproject.toml, +# make sure to sync pydantic-core to this version when updating pydantic +PYTHON_PYDANTIC_CORE_VERSION = 2.41.4 PYTHON_PYDANTIC_CORE_SOURCE_PYPI = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/98/85/0ac4f8fc632fa1bb3f473e4dfb1cd520ede11179f76a028edfd2ca989ed4 PYTHON_PYDANTIC_CORE_SITE = $(PYTHON_PYDANTIC_CORE_SITE_PYPI)/$(PYTHON_PYDANTIC_CORE_SOURCE_PYPI)?buildroot-path=filename +PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/df/18/d0944e8eaaa3efd0a91b0f1fc537d3be55ad35091b6a87638211ba691964 PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE -PYTHON_PYDANTIC_CORE_DEPENDENCIES = host-python-typing-extensions $(eval $(python-package)) diff --git a/package/python-pydantic-settings/Config.in b/package/python-pydantic-settings/Config.in index 0e8dbc29b5..76cf564f0c 100644 --- a/package/python-pydantic-settings/Config.in +++ b/package/python-pydantic-settings/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_PYDANTIC_SETTINGS depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core select BR2_PACKAGE_PYTHON_DOTENV # runtime select BR2_PACKAGE_PYTHON_PYDANTIC # runtime + select BR2_PACKAGE_PYTHON_TYPING_INSPECTION # runtime help Settings management using Pydantic. diff --git a/package/python-pydantic-settings/python-pydantic-settings.hash b/package/python-pydantic-settings/python-pydantic-settings.hash index c1acb00dc2..3d0f053968 100644 --- a/package/python-pydantic-settings/python-pydantic-settings.hash +++ b/package/python-pydantic-settings/python-pydantic-settings.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic-settings/json -md5 eb50e2f88dfb5229d7319be57dcc4ed0 pydantic_settings-2.6.1.tar.gz -sha256 e0f92546d8a9923cb8941689abf85d6601a8c19a23e97a34b2964a2e3f813ca0 pydantic_settings-2.6.1.tar.gz +md5 bfd7d2cc366483b19181428756e6a58a pydantic_settings-2.11.0.tar.gz +sha256 d0e87a1c7d33593beb7194adb8470fc426e95ba02af83a0f23474a04c9a08180 pydantic_settings-2.11.0.tar.gz # Locally computed sha256 checksums sha256 eb355a753e020346d33d83bf9769135b89fc610568ac531a01c295bcee7fd998 LICENSE diff --git a/package/python-pydantic-settings/python-pydantic-settings.mk b/package/python-pydantic-settings/python-pydantic-settings.mk index 90e982b3ff..ab5205b7e1 100644 --- a/package/python-pydantic-settings/python-pydantic-settings.mk +++ b/package/python-pydantic-settings/python-pydantic-settings.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_SETTINGS_VERSION = 2.6.1 +PYTHON_PYDANTIC_SETTINGS_VERSION = 2.11.0 PYTHON_PYDANTIC_SETTINGS_SOURCE = pydantic_settings-$(PYTHON_PYDANTIC_SETTINGS_VERSION).tar.gz -PYTHON_PYDANTIC_SETTINGS_SITE = https://files.pythonhosted.org/packages/b5/d4/9dfbe238f45ad8b168f5c96ee49a3df0598ce18a0795a983b419949ce65b +PYTHON_PYDANTIC_SETTINGS_SITE = https://files.pythonhosted.org/packages/20/c5/dbbc27b814c71676593d1c3f718e6cd7d4f00652cefa24b75f7aa3efb25e PYTHON_PYDANTIC_SETTINGS_SETUP_TYPE = hatch PYTHON_PYDANTIC_SETTINGS_LICENSE = MIT PYTHON_PYDANTIC_SETTINGS_LICENSE_FILES = LICENSE diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in index e9cd2e6780..eebfb3a1f7 100644 --- a/package/python-pydantic/Config.in +++ b/package/python-pydantic/Config.in @@ -4,8 +4,8 @@ config BR2_PACKAGE_PYTHON_PYDANTIC select BR2_PACKAGE_PYTHON_ANNOTATED_TYPES # runtime select BR2_PACKAGE_PYTHON_PYDANTIC_CORE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + select BR2_PACKAGE_PYTHON_TYPING_INSPECTION # runtime help - Data validation and settings management using python 3.6 - type hinting. + Data validation using Python type hints. https://github.com/pydantic/pydantic diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index b0db8ab4ef..12604059d6 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 84624d794e7d2b528fe1d34eeeeb481a pydantic-2.9.2.tar.gz -sha256 d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f pydantic-2.9.2.tar.gz +md5 d01464f3a5256144116a8de55e2974b8 pydantic-2.12.3.tar.g +sha256 1da1c82b0fc140bb0103bc1441ffe062154c8d38491189751ee00fd8ca65ce74 pydantic-2.12.3.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 2b9cd6c38a..b0cb1f1ce0 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.9.2 +PYTHON_PYDANTIC_VERSION = 2.12.3 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/a9/b7/d9e3f12af310e1120c21603644a1cd86f59060e040ec5c3a80b8f05fae30 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/f3/1e/4f0a3233767010308f2fd6bd0814597e3f63f1dc98304a9112b8759df4ff PYTHON_PYDANTIC_SETUP_TYPE = hatch PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash index 0c848cdca6..7c0867afbe 100644 --- a/package/python-pyelftools/python-pyelftools.hash +++ b/package/python-pyelftools/python-pyelftools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyelftools/json -md5 abd09b11e10bf32bfa6cf968b7a41e57 pyelftools-0.31.tar.gz -sha256 c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99 pyelftools-0.31.tar.gz +md5 240cf39dc5dad992f25cb5a4e4244f88 pyelftools-0.32.tar.gz +sha256 6de90ee7b8263e740c8715a925382d4099b354f29ac48ea40d840cf7aa14ace5 pyelftools-0.32.tar.gz # Locally computed sha256 checksums sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 9c46419e41..19fef11515 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.31 +PYTHON_PYELFTOOLS_VERSION = 0.32 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/88/56/0f2d69ed9a0060da009f672ddec8a71c041d098a66f6b1d80264bf6bbdc0 +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/b9/ab/33968940b2deb3d92f5b146bc6d4009a5f95d1d06c148ea2f9ee965071af PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-pyfatfs/0001-pyproject.toml-relax-version-constraints.patch b/package/python-pyfatfs/0001-pyproject.toml-relax-version-constraints.patch new file mode 100644 index 0000000000..791401f876 --- /dev/null +++ b/package/python-pyfatfs/0001-pyproject.toml-relax-version-constraints.patch @@ -0,0 +1,45 @@ +From 9d40ef086d25c8434adcf6552de1d8bb5022a277 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 22 Sep 2025 23:27:47 +0200 +Subject: [PATCH] pyproject.toml: relax version constraints + +The version constraints defined with ~= in pyproject.toml are too +strict, and don't allow using pyfatfs with newer versions. + +We have successfully tested with: + +- setuptools 80.9.0 +- setuptools-scm 8.3.1 +- python 3.13 +- fs 2.4.16 + +Upstream: https://github.com/nathanhi/pyfatfs/pull/47 +Signed-off-by: Thomas Petazzoni +--- + pyproject.toml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 9649c10..a6eb198 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,13 +1,13 @@ + [build-system] +-requires = ["setuptools ~= 67.8", "setuptools_scm[toml] ~= 7.1"] ++requires = ["setuptools >= 67.8", "setuptools_scm[toml] >= 7.1"] + build-backend = "setuptools.build_meta" + + [project] + name = "pyfatfs" + description = "FAT12/FAT16/FAT32 implementation with VFAT support" + readme = "README.rst" +-requires-python = "~=3.8" +-dependencies = ["fs~=2.4"] ++requires-python = ">=3.8" ++dependencies = ["fs>=2.4"] + keywords = ["filesystem", "PyFilesystem2", "FAT12", "FAT16", "FAT32", "VFAT", "LFN"] + license = {file = "LICENSE"} + classifiers = [ +-- +2.51.0 + diff --git a/package/python-pyfatfs/python-pyfatfs.hash b/package/python-pyfatfs/python-pyfatfs.hash new file mode 100644 index 0000000000..05e940779e --- /dev/null +++ b/package/python-pyfatfs/python-pyfatfs.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/project/pyfatfs/#pyfatfs-1.1.0.tar.gz +sha256 9725ccd0a4da1c09c27358abbf10f08c043ac84210af576803e087f51a2b30e0 pyfatfs-1.1.0.tar.gz +# Locally calculated +sha256 df8f053d3cbf23fe7002e6a34b06580653a74d40dc2e54f3b717a963ea9b70cb LICENSE diff --git a/package/python-pyfatfs/python-pyfatfs.mk b/package/python-pyfatfs/python-pyfatfs.mk new file mode 100644 index 0000000000..a61fb1afb2 --- /dev/null +++ b/package/python-pyfatfs/python-pyfatfs.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-pyfatfs +# +################################################################################ + +PYTHON_PYFATFS_VERSION = 1.1.0 +PYTHON_PYFATFS_SOURCE = pyfatfs-$(PYTHON_PYFATFS_VERSION).tar.gz +PYTHON_PYFATFS_SITE = https://files.pythonhosted.org/packages/44/3f/d08f1dbc44a7eef9c7fb355b83423fbd15bb3e487c250479a2c179cb39bf +PYTHON_PYFATFS_LICENSE = MIT +PYTHON_PYFATFS_LICENSE_FILES = LICENSE +PYTHON_PYFATFS_SETUP_TYPE = setuptools +# host-python-fs is not a build time dependency, but is needed at +# runtime for host-python-pyfatfs to work +HOST_PYTHON_PYFATFS_DEPENDENCIES = host-python-setuptools-scm host-python-fs + +$(eval $(host-python-package)) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index a463e98d7f..6c15528bf7 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 16bbc0f0e06964a7da16e88de5f38e20 pyftpdlib-2.0.1.tar.gz -sha256 ef0d172a82bfae10e2dec222e87533514609d41bf4b0fd0f07e29d4380fb96bf pyftpdlib-2.0.1.tar.gz +md5 68632ce84491dfc2d2a4cc1426fd4d14 pyftpdlib-2.1.0.tar.gz +sha256 5e92e7ba37c3e458ec458e5c201e2deb992cb6011c963e6a8512a634d8d80116 pyftpdlib-2.1.0.tar.gz # Locally computed sha256 checksums sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index 85be95da57..337d979503 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 2.0.1 +PYTHON_PYFTPDLIB_VERSION = 2.1.0 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/b4/0c/32bf0a7c88efe147bc3bc6586216d92269d196c59f149b05efa973834946 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/fc/67/3299ce20585601d21e05153eb9275cb799ae408fe15ab93e48e4582ea9fe PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 0b5d2cfe72..894b6c39d3 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 fbb7976df756f832f3391008778e8999 pygments-2.18.0.tar.gz -sha256 786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 pygments-2.18.0.tar.gz +md5 5e6e00a0f63b9f3b63edfa260f71b1b5 pygments-2.19.1.tar.gz +sha256 61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f pygments-2.19.1.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index d3e6624ad4..e94c9dc908 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.18.0 +PYTHON_PYGMENTS_VERSION = 2.19.1 PYTHON_PYGMENTS_SOURCE = pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31 +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/7c/2d/c3338d48ea6cc0feb8446d8e6937e1408088a72a39937982cc6111d17f84 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index a765897601..afd14437ce 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyicu/json -md5 7ec5ad0d62a2a27f919ca8a775352a71 PyICU-2.14.tar.gz -sha256 acc7eb92bd5c554ed577249c6978450a4feda0aa6f01470152b3a7b382a02132 PyICU-2.14.tar.gz +md5 6ae2145f2a98433f461b128c3ebef233 pyicu-2.15.3.tar.gz +sha256 f32e78e1cb64d0aeb14f027e037a8944861d3114548818a6adf0081ef51aefc3 pyicu-2.15.3.tar.gz # Locally computed sha256 checksums sha256 00da5bf22f2386c4f6f07c734490e9b818c4dcf70e6ca49f594e9cec636b9c40 LICENSE diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 413f595414..5025bd649b 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 2.14 -PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/52/21/4e9b0a3ace3027fc63107fa2b5d6e66e321e104da071d787856962fbad52 +PYTHON_PYICU_VERSION = 2.15.3 +PYTHON_PYICU_SOURCE = pyicu-$(PYTHON_PYICU_VERSION).tar.gz +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/88/b0/c8b61bac55424e2ff80e20d7251c3f002baff3c07c34cee3849e3505d8f5 PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index a6c8d90853..8eaf7ece50 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 88c9dbeb3e6302c7db813195e202420a pyjwt-2.9.0.tar.gz -sha256 7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c pyjwt-2.9.0.tar.gz +md5 f3273aaf736c24795e78ac48adbab111 pyjwt-2.10.1.tar.gz +sha256 3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953 pyjwt-2.10.1.tar.gz # Locally computed sha256 checksums sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index 084d4ac802..18e84b7838 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.9.0 +PYTHON_PYJWT_VERSION = 2.10.1 PYTHON_PYJWT_SOURCE = pyjwt-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/fb/68/ce067f09fca4abeca8771fe667d89cc347d1e99da3e093112ac329c6020e +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/e7/46/bd74733ff231675599650d3e47f361794b22ef3e3770998dda30d3b63726 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index 00cee048f4..fd7d9f17b0 100644 --- a/package/python-pylibftdi/python-pylibftdi.hash +++ b/package/python-pylibftdi/python-pylibftdi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pylibftdi/json -md5 a1d3039e8e09b3fb73cb03f1d6f3119b pylibftdi-0.22.0.tar.gz -sha256 85a6aab438f765342843aa2d59bb28fbb0d30847a621fb9800985185990f01af pylibftdi-0.22.0.tar.gz +md5 c3f06a398c7e7e2bc9d6ff8476378d5e pylibftdi-0.23.0.tar.gz +sha256 bf5b4c6ba73d79a6f6df849c345b00ba763d023201bed9ba51d876a4397b16d8 pylibftdi-0.23.0.tar.gz # Locally computed sha256 checksums -sha256 b8a7b113cfaa2c01d0701183de16ba653465692b1e29e0229244eee42fb3a9a8 LICENSE.txt +sha256 d42da8dcd174be0b5a20366aa3427b6c7570528a1992d50df9c6597cb3ecb898 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 1085c4879a..e6c138bbf1 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.22.0 +PYTHON_PYLIBFTDI_VERSION = 0.23.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/74/b3/a3c333a250143d204a0bb60de7c1e5f841543231f04c71ff4fa65e5b90c2 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/9d/f0/551ccbd8e989e898707e0e0859344fcf538c2310521847a1035ad3e9b164 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_SETUP_TYPE = poetry diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 7e3cadce70..7fbcfb0e13 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 0371a857e08b555cabf3935044675f39 pymodbus-3.7.4.tar.gz -sha256 573c370aea04523403eea1e159616a583cd7b93cfc5c81b07340d3cccd52c99f pymodbus-3.7.4.tar.gz +md5 18a9929a065d545205ee62d8300884a7 pymodbus-3.11.3.tar.gz +sha256 10c2902838ad5a233baefb64b1c1fb064fa762b22b221bf35191bf39f01449a8 pymodbus-3.11.3.tar.gz # Locally computed sha256 checksums -sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE +sha256 572a4d6fa7541553f70cc6d494fbcbee7eb7d3f2fbd16080d39b20cccda26f0b LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 0bd99cc3da..16e8323c97 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.7.4 +PYTHON_PYMODBUS_VERSION = 3.11.3 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/0b/bc/f98789706351e778676a3e84ed6203160c4f581092e298eb075bc9e08230 +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/2e/3b/599f812b03147f1eee357f0eb62f1753ff5bfc099da9aced63ecf6f32560 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash index 85a7447b32..f78299953b 100644 --- a/package/python-pynacl/python-pynacl.hash +++ b/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/PyNaCl/json -md5 93989045e25f1111452cfdf5e021814d PyNaCl-1.5.0.tar.gz -sha256 8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba PyNaCl-1.5.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/pynacl/json +md5 297e50e469abf0b5ea18b3a158312ba5 pynacl-1.6.0.tar.gz +sha256 cb36deafe6e2bce3b286e5d1f3e1c246e0ccdb8808ddb4550bb2792f2df298f2 pynacl-1.6.0.tar.gz # Locally computed sha256 checksums sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk index bd2571c3ad..10163afa7a 100644 --- a/package/python-pynacl/python-pynacl.mk +++ b/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.5.0 -PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/a7/22/27582568be639dfe22ddb3902225f91f2f17ceff88ce80e4db396c8986da +PYTHON_PYNACL_VERSION = 1.6.0 +PYTHON_PYNACL_SOURCE = pynacl-$(PYTHON_PYNACL_VERSION).tar.gz +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/06/c6/a3124dee667a423f2c637cfd262a54d67d8ccf3e160f3c50f622a85b7723 PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index 6c968eff16..b42719e3ca 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 4e41c41b8a14ac141dde132c348aaf5d pyopenssl-24.2.1.tar.gz -sha256 4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95 pyopenssl-24.2.1.tar.gz +md5 d755732945157fb8ca98c2d66a55755d pyopenssl-25.3.0.tar.gz +sha256 c981cb0a3fd84e8602d7afc209522773b94c1c2446a3c710a75b06fe1beae329 pyopenssl-25.3.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 077322131f..2dee55d8cc 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 24.2.1 +PYTHON_PYOPENSSL_VERSION = 25.3.0 PYTHON_PYOPENSSL_SOURCE = pyopenssl-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/5d/70/ff56a63248562e77c0c8ee4aefc3224258f1856977e0c1472672b62dadb8 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/80/be/97b83a464498a79103036bc74d1038df4a7ef0e402cfaf4d5e113fb14759 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl diff --git a/package/python-pypa-build/python-pypa-build.hash b/package/python-pypa-build/python-pypa-build.hash index e4e6a8f181..a259fd2d5e 100644 --- a/package/python-pypa-build/python-pypa-build.hash +++ b/package/python-pypa-build/python-pypa-build.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/build/json -md5 f80cc64db8e7fd8f8403a5e8a0562d4d build-1.2.2.tar.gz -sha256 119b2fb462adef986483438377a13b2f42064a2a3a4161f24a0cca698a07ac8c build-1.2.2.tar.gz +md5 48f7fbc11051430eab3c1abe216bed7a build-1.3.0.tar.gz +sha256 698edd0ea270bde950f53aed21f3a0135672206f3911e0176261a31e0e07b397 build-1.3.0.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pypa-build/python-pypa-build.mk b/package/python-pypa-build/python-pypa-build.mk index 9404f08302..45ae7818c4 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 1.2.2 +PYTHON_PYPA_BUILD_VERSION = 1.3.0 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/dd/bb/4a1b7e3a7520e310cf7bfece43788071604e1ccf693a7f0c4638c59068d6 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/25/1c/23e33405a7c9eac261dff640926b8b5adaed6a6eb3e1767d441ed611d0c0 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE PYTHON_PYPA_BUILD_SETUP_TYPE = flit-bootstrap diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 458da62888..b6ca80b040 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyparsing/json -md5 c9fb29820d6bf6e83651a0bd7411f02c pyparsing-3.2.0.tar.gz -sha256 cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c pyparsing-3.2.0.tar.gz +md5 0af29922e2f22dbc2569b88917b44f52 pyparsing-3.2.1.tar.gz +sha256 61980854fd66de3a90028d679a954d5f2623e83144b5afe5ee86f43d762e5f0a pyparsing-3.2.1.tar.gz # Locally computed sha256 checksums sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index 20faa35d38..cb19f54ca1 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.2.0 +PYTHON_PYPARSING_VERSION = 3.2.1 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/8c/d5/e5aeee5387091148a19e1145f63606619cb5f20b83fccb63efae6474e7b2 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/8b/1a/3544f4f299a47911c2ab3710f534e52fea62a633c96806995da5d25be4b2 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = flit diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index d37b906910..3c65c068e0 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 acb06fb5953d2b5435fa8d1428d6652f pyphen-0.17.0.tar.gz -sha256 1d13acd1ce37a384d7612954ae6c7801bb4c5316da0e2b937b2127ba702a3da4 pyphen-0.17.0.tar.gz +md5 ce57c010cca3a3b67275b393d2a8b6f2 pyphen-0.17.2.tar.gz +sha256 f60647a9c9b30ec6c59910097af82bc5dd2d36576b918e44148d8b07ef3b4aa3 pyphen-0.17.2.tar.gz # Locally computed sha256 checksums sha256 4fd1c78fcec632bc872ba7b42ba04be330029cfffa411039b48a4f2262bb8240 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 61f050c8c9..8db0518aa4 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.17.0 +PYTHON_PYPHEN_VERSION = 0.17.2 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/66/46/3dd0ae4b52016496069af6c4fca3b5918b0281fc92678f739edb8f3eb377 +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/69/56/e4d7e1bd70d997713649c5ce530b2d15a5fc2245a74ca820fc2d51d89d4d PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.hash b/package/python-pypika-tortoise/python-pypika-tortoise.hash index 5c78509af2..7e9f397638 100644 --- a/package/python-pypika-tortoise/python-pypika-tortoise.hash +++ b/package/python-pypika-tortoise/python-pypika-tortoise.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pypika-tortoise/json -md5 69e74ea7ee7236de921c662a3b0940bc pypika_tortoise-0.2.1.tar.gz -sha256 979bbb9d60fe9f6e4129a25c44ee008aab4a4e97b296350be9983dcaa2766354 pypika_tortoise-0.2.1.tar.gz +md5 5b5c1be4096c75dd6994336f71936383 pypika_tortoise-0.6.2.tar.gz +sha256 f95ab59d9b6454db2e8daa0934728458350a1f3d56e81d9d1debc8eebeff26b3 pypika_tortoise-0.6.2.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.mk b/package/python-pypika-tortoise/python-pypika-tortoise.mk index ba4845e100..7fa451f67d 100644 --- a/package/python-pypika-tortoise/python-pypika-tortoise.mk +++ b/package/python-pypika-tortoise/python-pypika-tortoise.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYPIKA_TORTOISE_VERSION = 0.2.1 +PYTHON_PYPIKA_TORTOISE_VERSION = 0.6.2 PYTHON_PYPIKA_TORTOISE_SOURCE = pypika_tortoise-$(PYTHON_PYPIKA_TORTOISE_VERSION).tar.gz -PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/30/af/b4a6035611cf6f3990879385cf6d077013c1bdf7ea294d6ceebfa14c8d08 -PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = poetry +PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/1a/7b/0a31165e22e599ba149ba35d4323d343205a70d91a4f6e8c6565f5b4fa08 +PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = pep517 PYTHON_PYPIKA_TORTOISE_LICENSE = Apache-2.0 PYTHON_PYPIKA_TORTOISE_LICENSE_FILES = LICENSE +PYTHON_PYPIKA_TORTOISE_DEPENDENCIES = host-python-pdm-backend $(eval $(python-package)) diff --git a/package/python-pyproj/Config.in b/package/python-pyproj/Config.in new file mode 100644 index 0000000000..19bdd82d43 --- /dev/null +++ b/package/python-pyproj/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_PYTHON_PYPROJ + bool "python-pyproj" + depends on BR2_INSTALL_LIBSTDCPP # proj + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj + depends on BR2_USE_WCHAR # proj + select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PROJ # runtime + help + Python interface to PROJ (cartographic projections and + coordinate transformations library). + + https://github.com/pyproj4/pyproj + +comment "python-pyproj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/python-pyproj/python-pyproj.hash b/package/python-pyproj/python-pyproj.hash new file mode 100644 index 0000000000..e42c371469 --- /dev/null +++ b/package/python-pyproj/python-pyproj.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyproj/json +md5 1c0501d6055ff26565dae8fe2e6083c5 pyproj-3.7.2.tar.gz +sha256 39a0cf1ecc7e282d1d30f36594ebd55c9fae1fda8a2622cee5d100430628f88c pyproj-3.7.2.tar.gz +# Locally computed sha256 checksums +sha256 a652687151814d4c4715445912fcb49e7e58f5b248d47a1a88b859a8815e0822 LICENSE diff --git a/package/python-pyproj/python-pyproj.mk b/package/python-pyproj/python-pyproj.mk new file mode 100644 index 0000000000..ccb5c659d0 --- /dev/null +++ b/package/python-pyproj/python-pyproj.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-pyproj +# +################################################################################ + +PYTHON_PYPROJ_VERSION = 3.7.2 +PYTHON_PYPROJ_SOURCE = pyproj-$(PYTHON_PYPROJ_VERSION).tar.gz +PYTHON_PYPROJ_SITE = https://files.pythonhosted.org/packages/04/90/67bd7260b4ea9b8b20b4f58afef6c223ecb3abf368eb4ec5bc2cdef81b49 +PYTHON_PYPROJ_SETUP_TYPE = setuptools +PYTHON_PYPROJ_LICENSE = MIT +PYTHON_PYPROJ_LICENSE_FILES = LICENSE +PYTHON_PYPROJ_DEPENDENCIES = host-python-cython proj +PYTHON_PYPROJ_ENV = \ + PROJ_DIR=$(HOST_DIR)/bin/ \ + PROJ_INCDIR=$(HOST_DIR)/include/ \ + PROJ_LIBDIR=$(TARGET_DIR)/usr/lib/ \ + PROJ_VERSION=$(PROJ_VERSION) + +$(eval $(python-package)) diff --git a/package/python-pyproject-metadata/python-pyproject-metadata.hash b/package/python-pyproject-metadata/python-pyproject-metadata.hash index 90f51c8c28..b29e00e6c7 100644 --- a/package/python-pyproject-metadata/python-pyproject-metadata.hash +++ b/package/python-pyproject-metadata/python-pyproject-metadata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyproject-metadata/json -md5 d947b3c632f4aee9cf23bb5950ac02f9 pyproject_metadata-0.9.0.tar.gz -sha256 8511c00a4cad96686af6a6b4143433298beb96105a9379afdc9b0328f4f260c9 pyproject_metadata-0.9.0.tar.gz +md5 d897e16dca18204e421f912487730668 pyproject_metadata-0.9.1.tar.gz +sha256 b8b2253dd1b7062b78cf949a115f02ba7fa4114aabe63fa10528e9e1a954a816 pyproject_metadata-0.9.1.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pyproject-metadata/python-pyproject-metadata.mk b/package/python-pyproject-metadata/python-pyproject-metadata.mk index 7429ba8af3..6cac09c376 100644 --- a/package/python-pyproject-metadata/python-pyproject-metadata.mk +++ b/package/python-pyproject-metadata/python-pyproject-metadata.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPROJECT_METADATA_VERSION = 0.9.0 +PYTHON_PYPROJECT_METADATA_VERSION = 0.9.1 PYTHON_PYPROJECT_METADATA_SOURCE = pyproject_metadata-$(PYTHON_PYPROJECT_METADATA_VERSION).tar.gz -PYTHON_PYPROJECT_METADATA_SITE = https://files.pythonhosted.org/packages/c0/79/406a9f56c435caaaca4a1c66397e4f63ecd48a72a6c4fc1d9ecdaac66acb +PYTHON_PYPROJECT_METADATA_SITE = https://files.pythonhosted.org/packages/64/ae/5fa065b049e97f96880de0611dbba513f0ee313b6edd0a64664c7b46a8e8 PYTHON_PYPROJECT_METADATA_SETUP_TYPE = flit PYTHON_PYPROJECT_METADATA_LICENSE = MIT PYTHON_PYPROJECT_METADATA_LICENSE_FILES = LICENSE diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 54b7f201b8..bee0c529ca 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -139,7 +139,7 @@ endef # The file "qt.conf" can be used to override the hard-coded paths that are # compiled into the Qt library. We need it to make "qmake" relocatable and -# tweak the per-package install pathes +# tweak the per-package install paths PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP PYTHON_PYQT5_CONF_OPTS = \ diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in index 9e685f9d1e..2e667165a8 100644 --- a/package/python-pyroute2/Config.in +++ b/package/python-pyroute2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYROUTE2 bool "python-pyroute2" select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_SSL # runtime help Python netlink library - Linux network / netns / wireless / ipset configuration. diff --git a/package/python-pyroute2/python-pyroute2.hash b/package/python-pyroute2/python-pyroute2.hash index e346ca4f66..87402b9dbb 100644 --- a/package/python-pyroute2/python-pyroute2.hash +++ b/package/python-pyroute2/python-pyroute2.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyroute2/json -md5 04e3b1a6550840c2eaa75da16b83f62b pyroute2-0.7.12.tar.gz -sha256 54d226fc3ff2732f49bac9b26853c50c9d05be05a4d9daf09c7cf6d77301eff3 pyroute2-0.7.12.tar.gz +md5 225d6899da226df8899efcff2557204a pyroute2-0.9.4.tar.gz +sha256 3cbccbe1af0c2b2aeae81b327e0e91aa94c81ab19f851e74b26bef70202f3070 pyroute2-0.9.4.tar.gz # Locally computed sha256 checksums sha256 4739b32a2478e9c204bf010bad5d565d188e59ff905e3c8f71fe3398098b7093 LICENSE.Apache-2.0 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0-or-later diff --git a/package/python-pyroute2/python-pyroute2.mk b/package/python-pyroute2/python-pyroute2.mk index a4029c7321..efe8d73f52 100644 --- a/package/python-pyroute2/python-pyroute2.mk +++ b/package/python-pyroute2/python-pyroute2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYROUTE2_VERSION = 0.7.12 +PYTHON_PYROUTE2_VERSION = 0.9.4 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/39/16/323b947c34530436658331e2cf393b72ebcbd923a75154a7efb28feefd5d +PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/b0/5e/fc64e211cce0078555c6db98aaf14348aed527565f3c4876913a290a5b2c PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+ PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache-2.0 LICENSE.GPL-2.0-or-later README.license.rst PYTHON_PYROUTE2_SETUP_TYPE = setuptools diff --git a/package/python-pysnmp/python-pysnmp.hash b/package/python-pysnmp/python-pysnmp.hash index 1081f44512..cae02270b3 100644 --- a/package/python-pysnmp/python-pysnmp.hash +++ b/package/python-pysnmp/python-pysnmp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pysnmp/json -md5 ce0165cfb056a1c71f6b4fe73044cae9 pysnmp-7.1.13.tar.gz -sha256 535b275e6703e37d5a65328ee32ece2d28c876482f83de781785b550b1f5cfe3 pysnmp-7.1.13.tar.gz +md5 a6c2189839202b7ab76144743d7824b8 pysnmp-7.1.16.tar.gz +sha256 51581c70e410e456eb3faa24c42a094c82acfa961d16ad659b57c5818379dfcb pysnmp-7.1.16.tar.gz # Locally computed sha256 checksums sha256 4954453957449b5e6f797d070f4d91024dceb3e056c99d72350795b71db0fc70 LICENSE.rst diff --git a/package/python-pysnmp/python-pysnmp.mk b/package/python-pysnmp/python-pysnmp.mk index a1d03f785c..a04c3e4be7 100644 --- a/package/python-pysnmp/python-pysnmp.mk +++ b/package/python-pysnmp/python-pysnmp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSNMP_VERSION = 7.1.13 +PYTHON_PYSNMP_VERSION = 7.1.16 PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz -PYTHON_PYSNMP_SITE = https://files.pythonhosted.org/packages/d2/de/b766b1dc85e02c99835e05518d5efe9b2f1c875d406079584b4799d02db9 +PYTHON_PYSNMP_SITE = https://files.pythonhosted.org/packages/a2/b1/c94dac49a002eed96e2cb7aeb1d148b1c98826e5cd1f6e8eebb4a20f8d49 PYTHON_PYSNMP_SETUP_TYPE = poetry PYTHON_PYSNMP_LICENSE = BSD-2-Clause PYTHON_PYSNMP_LICENSE_FILES = LICENSE.rst diff --git a/package/python-pysocks/python-pysocks.mk b/package/python-pysocks/python-pysocks.mk index ccb70fc5db..1925220d23 100644 --- a/package/python-pysocks/python-pysocks.mk +++ b/package/python-pysocks/python-pysocks.mk @@ -12,3 +12,4 @@ PYTHON_PYSOCKS_LICENSE_FILES = LICENSE PYTHON_PYSOCKS_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index 59e5463096..dd8203088a 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 f13229784747c05d880c25880872f856 pyspnego-0.11.1.tar.gz -sha256 e92ed8b0a62765b9d6abbb86a48cf871228ddb97678598dc01c9c39a626823f6 pyspnego-0.11.1.tar.gz +md5 8d138eeb84bba8ea48b3287dfb3b9ed1 pyspnego-0.11.2.tar.gz +sha256 994388d308fb06e4498365ce78d222bf4f3570b6df4ec95738431f61510c971b pyspnego-0.11.2.tar.gz # Locally computed sha256 checksums sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 166e1ec85b..4dccc57fad 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.11.1 +PYTHON_PYSPNEGO_VERSION = 0.11.2 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/46/f5/1f938a781742d18475ac43a101ec8a9499e1655da0984e08b59e20012c04 +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/6b/f8/53f1fc851dab776a183ffc9f29ebde244fbb467f5237f3ea809519fc4b2e PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index d4432ee121..82185edb37 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytablewriter/json -md5 4e3d421d026f30fadec4ac1670e524ee pytablewriter-1.2.0.tar.gz -sha256 0204a4bb684a22140d640f2599f09e137bcdc18b3dd49426f4a555016e246b46 pytablewriter-1.2.0.tar.gz +md5 2522e6719d47f315684800d8631cfb9f pytablewriter-1.2.1.tar.gz +sha256 7bd0f4f397e070e3b8a34edcf1b9257ccbb18305493d8350a5dbc9957fced959 pytablewriter-1.2.1.tar.gz # Locally computed sha256 checksums -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +sha256 130a35b917df1951aefbf366120491d5124045a87ded123f20ded21521f4e3a2 LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index d8bc3615dd..6c22d750a0 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 1.2.0 +PYTHON_PYTABLEWRITER_VERSION = 1.2.1 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/cc/a9/76aa4430d32ae10b23e4347006dc4c67a3e2a00621e4bb38a60c1a77f15e +PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/f6/a1/617730f290f04d347103ab40bf67d317df6691b14746f6e1ea039fb57062 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE +PYTHON_PYTABLEWRITER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index a88d1c5841..a9b33e0ebc 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 510ca6136236bba0f0581aa46060ae03 pytest_asyncio-0.24.0.tar.gz -sha256 d081d828e576d85f875399194281e92bf8a68d60d72d1a2faf2feddb6c46b276 pytest_asyncio-0.24.0.tar.gz +md5 84f54204d53c46291c412bce27562480 pytest_asyncio-1.0.0.tar.gz +sha256 d15463d13f4456e1ead2594520216b225a16f781e144f8fdf6c5bb4667c48b3f pytest_asyncio-1.0.0.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index ae0934e00f..f8d1e87e64 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.24.0 +PYTHON_PYTEST_ASYNCIO_VERSION = 1.0.0 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest_asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/52/6d/c6cf50ce320cf8611df7a1254d86233b3df7cc07f9b5f5cbcb82e08aa534 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/d0/d4/14f53324cb1a6381bef29d698987625d80052bb33932d8e7cbf9b337b17c PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index 912dc4949b..681133d5e0 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_INICONFIG # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime + select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 15ac04a6ea..4e400947ce 100644 --- a/package/python-pytest/python-pytest.hash +++ b/package/python-pytest/python-pytest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest/json -md5 71466867181a5a7aefdb298b7146bcad pytest-8.3.3.tar.gz -sha256 70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181 pytest-8.3.3.tar.gz +md5 a1b847e1f079dfc5d26a63bc02f47fb7 pytest-8.4.2.tar.gz +sha256 86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01 pytest-8.4.2.tar.gz # Locally computed sha256 checksums sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 256b6954f0..8007036575 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 8.3.3 +PYTHON_PYTEST_VERSION = 8.4.2 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/8b/6c/62bbd536103af674e227c41a8f3dcd022d591f6eed5facb5a0f31ee33bbc +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash index b72acfbe47..b0a0b04258 100644 --- a/package/python-pythran/python-pythran.hash +++ b/package/python-pythran/python-pythran.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pythran/json -md5 b754bc4c5cf37c4f0c4a3ae38009e799 pythran-0.17.0.tar.gz -sha256 3b77d6d970a6cf5b448facc7d4f6229c3e73909ac27ea2480c843afdadbad0fb pythran-0.17.0.tar.gz +md5 829c5cba97e1339556251b631f4faeca pythran-0.18.0.tar.gz +sha256 5c003e8cbedf6dbb68c2869c49fc110ce8b5e8982993078a4a819f1dadc4fc6a pythran-0.18.0.tar.gz # Locally computed sha256 checksums sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk index b9b1faee85..358b0c9ec1 100644 --- a/package/python-pythran/python-pythran.mk +++ b/package/python-pythran/python-pythran.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTHRAN_VERSION = 0.17.0 +PYTHON_PYTHRAN_VERSION = 0.18.0 PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz -PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/34/2d/4ac363a2eecd68c372b058d1b95a5f262c70776e107619cdcb5a4b68e1a3 +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/94/0a/95a72f09f25dae48f41e367959075ed4c7a0ff02dd3f54eec111501d648a PYTHON_PYTHRAN_SETUP_TYPE = setuptools PYTHON_PYTHRAN_LICENSE = BSD-3-Clause PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index ca64cb7d79..2779cebed4 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 efcb554763a36b3e18acee074f44d1a5 pytz-2024.2.tar.gz -sha256 2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a pytz-2024.2.tar.gz +md5 6a7760c71e38b6c75577b34b18b89d5b pytz-2025.2.tar.gz +sha256 360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3 pytz-2025.2.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 1d37d09ab1..4ad946cd65 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2024.2 +PYTHON_PYTZ_VERSION = 2025.2 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/3a/31/3c70bf7603cc2dca0f19bdc53b4537a797747a58875b552c8c413d963a3f +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/f8/bf/abbd3cdfb8fbc7fb3d4d38d320f2441b1e7cbe29be4f23797b4a2b5d8aac PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch index 26f1ef6390..f8c9497de3 100644 --- a/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch +++ b/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch @@ -15,6 +15,8 @@ Signed-off-by: Yegor Yefremov Signed-off-by: Marcin Niestroj [Fabrice: Use %-formatting instead of f-string for python 2] Signed-off-by: Fabrice Fontaine +[Bernd: rebased for version 0.24.4] +Signed-off-by: Bernd Kuhls --- src/pyudev/_ctypeslib/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -23,7 +25,7 @@ diff --git a/src/pyudev/_ctypeslib/utils.py b/src/pyudev/_ctypeslib/utils.py index 9dffb3c..aa9942f 100644 --- a/src/pyudev/_ctypeslib/utils.py +++ b/src/pyudev/_ctypeslib/utils.py -@@ -28,7 +28,7 @@ +@@ -24,7 +24,7 @@ """ # isort: STDLIB @@ -32,7 +34,7 @@ index 9dffb3c..aa9942f 100644 from ctypes.util import find_library -@@ -50,10 +50,10 @@ def load_ctypes_library(name, signatures, error_checkers): +@@ -46,10 +46,10 @@ def load_ctypes_library(name, signatures, error_checkers): :rtype: ctypes.CDLL :raises ImportError: if the library is not found """ @@ -41,7 +43,7 @@ index 9dffb3c..aa9942f 100644 + try: + lib = cdll.LoadLibrary('lib%s.so' % name) + except OSError: - raise ImportError("No library named %s" % name) + raise ImportError(f"No library named {name}") - lib = CDLL(library_name, use_errno=True) # Add function signatures for funcname, signature in signatures.items(): diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash index e9596b7b43..799499a2ac 100644 --- a/package/python-pyudev/python-pyudev.hash +++ b/package/python-pyudev/python-pyudev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyudev/json -md5 07bbe9111308d2509645705b8321c416 pyudev-0.24.3.tar.gz -sha256 2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7 pyudev-0.24.3.tar.gz +md5 2d2e6f68b60c3bf3ffc2b7c8df8d18ac pyudev-0.24.4.tar.gz +sha256 e788bb983700b1a84efc2e88862b0a51af2a995d5b86bc9997546505cf7b36bc pyudev-0.24.4.tar.gz # Locally computed sha256 checksums sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk index fa11ce5040..a83fe70a48 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.24.3 +PYTHON_PYUDEV_VERSION = 0.24.4 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/c4/5c/6cc034da13830e3da123ccf9a30910bc868fa16670362f004e4b788d0df1 +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/5e/1d/8bdbf651de1002e8b58fbe817bee22b1e8bfcdd24341d42c3238ce9a75f4 PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index f08b212b3e..286cb3e209 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyusb/json -md5 880008dff32dac8f58076b4e534492d9 pyusb-1.2.1.tar.gz -sha256 a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9 pyusb-1.2.1.tar.gz +md5 d510d4480f0c3b64bdd32ebdcf033133 pyusb-1.3.1.tar.gz +sha256 3af070b607467c1c164f49d5b0caabe8ac78dbed9298d703a8dbf9df4052d17e pyusb-1.3.1.tar.gz # Locally computed sha256 checksums sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index 2f4f9581b6..cce48e0df8 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.2.1 +PYTHON_PYUSB_VERSION = 1.3.1 PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/d9/6e/433a5614132576289b8643fe598dd5d51b16e130fd591564be952e15bb45 +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/00/6b/ce3727395e52b7b76dfcf0c665e37d223b680b9becc60710d4bc08b7b7cb PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = setuptools PYTHON_PYUSB_DEPENDENCIES = host-python-setuptools-scm libusb +HOST_PYTHON_PYUSB_DEPENDENCIES = host-python-setuptools-scm host-libusb $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index 47bd6d1ef9..96450f0858 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 9600ee49b2b4e1a0237cf4173b6dc594 pyyaml-6.0.2.tar.gz -sha256 d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e pyyaml-6.0.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyyaml/json +md5 dbc6f815cd75160ccf12e470be1c8d6e pyyaml-6.0.3.tar.gz +sha256 d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f pyyaml-6.0.3.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 1101b59276..bfbf5276a6 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYYAML_VERSION = 6.0.2 +PYTHON_PYYAML_VERSION = 6.0.3 PYTHON_PYYAML_SOURCE = pyyaml-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17 +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2 PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE diff --git a/package/python-qrcode/python-qrcode.hash b/package/python-qrcode/python-qrcode.hash index ceeaf05f49..21076091d7 100644 --- a/package/python-qrcode/python-qrcode.hash +++ b/package/python-qrcode/python-qrcode.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/qrcode/json -md5 29561c9082864010f884d2fc5b3e62de qrcode-8.0.tar.gz -sha256 025ce2b150f7fe4296d116ee9bad455a6643ab4f6e7dce541613a4758cbce347 qrcode-8.0.tar.gz +md5 c1dd482e98405aa0aaf4d5cf5685f57a qrcode-8.2.tar.gz +sha256 35c3f2a4172b33136ab9f6b3ef1c00260dd2f66f858f24d88418a015f446506c qrcode-8.2.tar.gz # Locally computed sha256 checksums sha256 40dfb903c94ee3f789500131311186548ecba5cefd3557623d7700e2522ab994 LICENSE diff --git a/package/python-qrcode/python-qrcode.mk b/package/python-qrcode/python-qrcode.mk index 8222ceac8e..72c54b5339 100644 --- a/package/python-qrcode/python-qrcode.mk +++ b/package/python-qrcode/python-qrcode.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_QRCODE_VERSION = 8.0 +PYTHON_QRCODE_VERSION = 8.2 PYTHON_QRCODE_SOURCE = qrcode-$(PYTHON_QRCODE_VERSION).tar.gz -PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/d7/db/6fc9631cac1327f609d2c8ae3680ecd987a2e97472437f2de7ead1235156 +PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/8f/b2/7fc2931bfae0af02d5f53b174e9cf701adbb35f39d69c2af63d4a39f81a9 PYTHON_QRCODE_SETUP_TYPE = poetry PYTHON_QRCODE_LICENSE = BSD-3-Clause PYTHON_QRCODE_LICENSE_FILES = LICENSE diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 57d8557156..b6bee68ca2 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 a3210ca8428bd0ac9691789c08b14478 redis-5.2.0.tar.gz -sha256 0b1087665a771b1ff2e003aa5bdd354f15a70c9e25d5a7dbf9c722c16528a7b0 redis-5.2.0.tar.gz +md5 6e57c67eab7537b789c7a0f4a3068510 redis-5.2.1.tar.gz +sha256 16f2e22dff21d5125e8481515e386711a34cbec50f0e44413dd7d9c060a54e0f redis-5.2.1.tar.gz # Locally computed sha256 checksums sha256 a57b250a5bf03d7afe55b74063313f2adb7b00d546c0ab149a89398333fe3cc8 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 2c1734151d..d02d4bd44b 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 5.2.0 +PYTHON_REDIS_VERSION = 5.2.1 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/17/2f4a87ffa4cd93714cf52edfa3ea94589e9de65f71e9f99cbcfa84347a53 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/47/da/d283a37303a995cd36f8b92db85135153dc4f7a8e4441aa827721b442cfb PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-referencing/python-referencing.hash b/package/python-referencing/python-referencing.hash index a19dd4a24b..9cbd5e60a5 100644 --- a/package/python-referencing/python-referencing.hash +++ b/package/python-referencing/python-referencing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/referencing/json -md5 4cd2bdcefd1f9a9db2d1ea31338b4ae3 referencing-0.35.1.tar.gz -sha256 25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c referencing-0.35.1.tar.gz +md5 9d116186b2c5225c4e55254b94b2cd8e referencing-0.36.2.tar.gz +sha256 df2e89862cd09deabbdba16944cc3f10feb6b3e6f18e902f7cc25609a34775aa referencing-0.36.2.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index ce0e895548..cabc9afa23 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REFERENCING_VERSION = 0.35.1 +PYTHON_REFERENCING_VERSION = 0.36.2 PYTHON_REFERENCING_SOURCE = referencing-$(PYTHON_REFERENCING_VERSION).tar.gz -PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/99/5b/73ca1f8e72fff6fa52119dbd185f73a907b1989428917b24cff660129b6d +PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/2f/db/98b5c277be99dd18bfd91dd04e1b759cad18d1a338188c936e92f921c7e2 PYTHON_REFERENCING_SETUP_TYPE = pep517 PYTHON_REFERENCING_LICENSE = MIT PYTHON_REFERENCING_LICENSE_FILES = COPYING diff --git a/package/python-remi/Config.in b/package/python-remi/Config.in index da2c2f4cfb..2ecd310bf2 100644 --- a/package/python-remi/Config.in +++ b/package/python-remi/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" select BR2_PACKAGE_PYTHON3_SSL # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_LEGACY_CGI # runtime help Remi is a GUI library for Python applications which transpiles an application's interface into HTML to be rendered in a web diff --git a/package/python-remi/python-remi.hash b/package/python-remi/python-remi.hash index e7937c3914..edae17e21c 100644 --- a/package/python-remi/python-remi.hash +++ b/package/python-remi/python-remi.hash @@ -1,4 +1,3 @@ -# sha256 from https://pypi.org/pypi/remi/json -sha256 542df88e174bbd58fe763c49e5c2116f2c8413c1a934731069ed8c17bb9cd64c remi-2022.7.27.tar.gz # Locally computed sha256 -sha256 3df7d3ad8904d7e99fc0810366483a7cbe5a43c13f7f913f1d7e5023f2ff7657 LICENSE +sha256 8a84941a58952657c7940db2fd3adc6d1ae10a186a02ddc0f1963c353e6108b3 python-remi-2022.7.27-37-g18505f6439849c6e01695dd90dbf680d5ffb0a14.tar.gz +sha256 bc198f9846c1da3a1c1b1fa2b12909b021365d1e7fe9b4039245edfcec3b7f7f LICENSE diff --git a/package/python-remi/python-remi.mk b/package/python-remi/python-remi.mk index 419a3441a7..532c37c6c9 100644 --- a/package/python-remi/python-remi.mk +++ b/package/python-remi/python-remi.mk @@ -4,9 +4,8 @@ # ################################################################################ -PYTHON_REMI_VERSION = 2022.7.27 -PYTHON_REMI_SOURCE = remi-$(PYTHON_REMI_VERSION).tar.gz -PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/b7/5c/fca9d9273fc9d5f4ca0bc2f387ca19f8ba9979dcb75617d094e575dc2337 +PYTHON_REMI_VERSION = 2022.7.27-37-g18505f6439849c6e01695dd90dbf680d5ffb0a14 +PYTHON_REMI_SITE = $(call github,rawpython,remi,$(PYTHON_REMI_VERSION)) PYTHON_REMI_LICENSE = Apache-2.0 PYTHON_REMI_LICENSE_FILES = LICENSE diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in index 94a44682f4..929b99657c 100644 --- a/package/python-requests/Config.in +++ b/package/python-requests/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_PYTHON_REQUESTS Requests is an Apache2 Licensed HTTP library, written in Python, for human beings. - http://www.python-requests.org/ + https://requests.readthedocs.io diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 2764a0f2d2..1bc440667b 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 fa3ee5ac3f1b3f4368bd74ab530d3f0f requests-2.32.3.tar.gz -sha256 55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 requests-2.32.3.tar.gz +md5 cb3d3c58f07cf23f12c345f2c96a6f12 requests-2.32.5.tar.gz +sha256 dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf requests-2.32.5.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index fc8f51fd1f..e5aa7006ee 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.32.3 +PYTHON_REQUESTS_VERSION = 2.32.5 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index a2b36b8d06..6e1d0860a4 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 a2bafde869e0a9e6390de8b1d1144a4c874850b016898c71fd5313c027ba709e python-rpds-py-0.21.0-cargo2.tar.gz +sha256 08c2362d2d127e27a7c0a501c917b6d404edac93fdd4b6ccf46ea9448b04fe5e python-rpds-py-0.22.3-cargo4.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 87172cdc59..b539453d37 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.21.0 +PYTHON_RPDS_PY_VERSION = 0.22.3 PYTHON_RPDS_PY_SOURCE_PYPI = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE_PYPI = https://files.pythonhosted.org/packages/23/80/afdf96daf9b27d61483ef05b38f282121db0e38f5fd4e89f40f5c86c2a4f +PYTHON_RPDS_PY_SITE_PYPI = https://files.pythonhosted.org/packages/01/80/cce854d0921ff2f0a9fa831ba3ad3c65cee3a46711addf39a2af52df2cfd PYTHON_RPDS_PY_SITE = $(PYTHON_RPDS_PY_SITE_PYPI)/$(PYTHON_RPDS_PY_SOURCE_PYPI)?buildroot-path=filename PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash index dae1badcf3..54aba0c849 100644 --- a/package/python-rtoml/python-rtoml.hash +++ b/package/python-rtoml/python-rtoml.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 python-rtoml-0.10.0-cargo2.tar.gz +sha256 9174c3af184cbd94e67ac99f63a54c5f8ecea95421b36f15204f6eab762af047 python-rtoml-0.10.0-cargo4.tar.gz # Locally computed sha256 checksums sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash index 2bb726819c..fdafa0b28c 100644 --- a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/ruamel.yaml.clib/json -md5 53fa5737bbe5a07fac7db3d1a083fee9 ruamel.yaml.clib-0.2.12.tar.gz -sha256 6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f ruamel.yaml.clib-0.2.12.tar.gz +# md5, sha256 from https://pypi.org/pypi/ruamel-yaml-clib/json +md5 70ca03596450ed0ad19393620c51a4c2 ruamel.yaml.clib-0.2.14.tar.gz +sha256 803f5044b13602d58ea378576dd75aa759f52116a0232608e8fdada4da33752e ruamel.yaml.clib-0.2.14.tar.gz # Locally computed sha256 checksums -sha256 99f72489621ceea1254f9f0ea7c6e8a5e8e38b62edd1d983e6e1cb20d533f0a6 LICENSE +sha256 f8ad7efe71dde909f2d694f7dc69470d3dbe07c001c0b30c6bd9951e472077fa LICENSE diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk index 2a4d8a98d1..b44bbf5187 100644 --- a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.12 +PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.14 PYTHON_RUAMEL_YAML_CLIB_SOURCE = ruamel.yaml.clib-$(PYTHON_RUAMEL_YAML_CLIB_VERSION).tar.gz -PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/20/84/80203abff8ea4993a87d823a5f632e4d92831ef75d404c9fc78d0176d2b5 +PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/d8/e9/39ec4d4b3f91188fad1842748f67d4e749c77c37e353c4e545052ee8e893 PYTHON_RUAMEL_YAML_CLIB_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_CLIB_LICENSE = MIT PYTHON_RUAMEL_YAML_CLIB_LICENSE_FILES = LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 94a0d43544..bda0946e33 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json -md5 964a8e48646e26533d8e5f03cff99dde ruamel.yaml-0.18.6.tar.gz -sha256 8b27e6a217e786c6fbe5634d8f3f11bc63e0f80f6a5890f28863d9c45aac311b ruamel.yaml-0.18.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/ruamel-yaml/json +md5 ee73a2076f7ca2ee7258af129a7ef8da ruamel.yaml-0.18.15.tar.gz +sha256 dbfca74b018c4c3fba0b9cc9ee33e53c371194a9000e694995e620490fd40700 ruamel.yaml-0.18.15.tar.gz # Locally computed sha256 checksums -sha256 e84ff196f03668af751abae0c4cbd9169aa365121f50c30bb9a329666ab6260a LICENSE +sha256 0ce9ad6a9d4f0829296a72c77d07795dd67f42751e2922be56c051d39ae1c011 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index 83a4aa12e8..1d3619caea 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.18.6 +PYTHON_RUAMEL_YAML_VERSION = 0.18.15 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/29/81/4dfc17eb6ebb1aac314a3eb863c1325b907863a1b8b1382cdffcb6ac0ed9 +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/3e/db/f3950f5e5031b618aae9f423a39bf81a55c148aecd15a34527898e752cf4 PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE diff --git a/package/python-s3transfer/python-s3transfer.hash b/package/python-s3transfer/python-s3transfer.hash index 9b2c7d6282..0ebf07473a 100644 --- a/package/python-s3transfer/python-s3transfer.hash +++ b/package/python-s3transfer/python-s3transfer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/s3transfer/json -md5 3c81bf7128a462187e9a88d9f400b5b4 s3transfer-0.10.3.tar.gz -sha256 4f50ed74ab84d474ce614475e0b8d5047ff080810aac5d01ea25231cfc944b0c s3transfer-0.10.3.tar.gz +md5 7ae51a57b7d5703ecf9d348b6f8a20ed s3transfer-0.14.0.tar.gz +sha256 eff12264e7c8b4985074ccce27a3b38a485bb7f7422cc8046fee9be4983e4125 s3transfer-0.14.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-s3transfer/python-s3transfer.mk b/package/python-s3transfer/python-s3transfer.mk index dad4033c02..48590fdf0f 100644 --- a/package/python-s3transfer/python-s3transfer.mk +++ b/package/python-s3transfer/python-s3transfer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_S3TRANSFER_VERSION = 0.10.3 +PYTHON_S3TRANSFER_VERSION = 0.14.0 PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz -PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/a0/a8/e0a98fd7bd874914f0608ef7c90ffde17e116aefad765021de0f012690a2 +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/62/74/8d69dcb7a9efe8baa2046891735e5dfe433ad558ae23d9e3c14c633d1d58 PYTHON_S3TRANSFER_SETUP_TYPE = setuptools PYTHON_S3TRANSFER_LICENSE = Apache-2.0 PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-scp/Config.in b/package/python-scp/Config.in new file mode 100644 index 0000000000..28a649e406 --- /dev/null +++ b/package/python-scp/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_SCP + bool "python-scp" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-paramiko -> python-cryptography, python-bcrypt + select BR2_PACKAGE_PYTHON_PARAMIKO # runtime + help + scp module for paramiko. + + https://github.com/jbardin/scp.py diff --git a/package/python-scp/python-scp.hash b/package/python-scp/python-scp.hash new file mode 100644 index 0000000000..4ec4e6a41a --- /dev/null +++ b/package/python-scp/python-scp.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/scp/json +md5 54c0e3b6cc52620ce3a81362fa8bb29d scp-0.15.0.tar.gz +sha256 f1b22e9932123ccf17eebf19e0953c6e9148f589f93d91b872941a696305c83f scp-0.15.0.tar.gz +# Locally computed sha256 checksums +sha256 2455cf0fc78e13772bf10ef5f209e7eb8625706d671b2f420cc8add37d548c1c LICENSE.txt diff --git a/package/python-scp/python-scp.mk b/package/python-scp/python-scp.mk new file mode 100644 index 0000000000..d223b16290 --- /dev/null +++ b/package/python-scp/python-scp.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-scp +# +################################################################################ + +PYTHON_SCP_VERSION = 0.15.0 +PYTHON_SCP_SOURCE = scp-$(PYTHON_SCP_VERSION).tar.gz +PYTHON_SCP_SITE = https://files.pythonhosted.org/packages/d6/1c/d213e1c6651d0bd37636b21b1ba9b895f276e8057f882c9f944931e4f002 +PYTHON_SCP_SETUP_TYPE = setuptools +PYTHON_SCP_LICENSE = LGPL-2.1+ +PYTHON_SCP_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-sdbus-modemmanager/Config.in b/package/python-sdbus-modemmanager/Config.in new file mode 100644 index 0000000000..bf2759b4fc --- /dev/null +++ b/package/python-sdbus-modemmanager/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_SDBUS_MODEMMANAGER + bool "python-sdbus-modemmanager" + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_PACKAGE_MODEM_MANAGER # runtime + select BR2_PACKAGE_PYTHON_SDBUS # runtime + help + ModemManager bindings for sdbus. + + https://github.com/zhanglongqi/python-sdbus-modemmanager + +comment "python-sdbus-modemmanager needs systemd and modem-manager" + depends on !BR2_PACKAGE_SYSTEMD || !BR2_PACKAGE_MODEM_MANAGER diff --git a/package/python-sdbus-modemmanager/python-sdbus-modemmanager.hash b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.hash new file mode 100644 index 0000000000..980568cb0d --- /dev/null +++ b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sdbus-modemmanager/json +md5 720d59e444d84d77c184bc73844cfebd sdbus_modemmanager-1.0.2.tar.gz +sha256 80ed83a158eeb8d9b0e0c1e5110c5f71307df87523245e4d0e79ebe200932fc6 sdbus_modemmanager-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/python-sdbus-modemmanager/python-sdbus-modemmanager.mk b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.mk new file mode 100644 index 0000000000..2821453270 --- /dev/null +++ b/package/python-sdbus-modemmanager/python-sdbus-modemmanager.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sdbus-modemmanager +# +################################################################################ + +PYTHON_SDBUS_MODEMMANAGER_VERSION = 1.0.2 +PYTHON_SDBUS_MODEMMANAGER_SOURCE = sdbus_modemmanager-$(PYTHON_SDBUS_MODEMMANAGER_VERSION).tar.gz +PYTHON_SDBUS_MODEMMANAGER_SITE = https://files.pythonhosted.org/packages/af/99/a17942d9abda13ad1f27f39e900e39852a6215b70e30b682b777dfeff818 +PYTHON_SDBUS_MODEMMANAGER_SETUP_TYPE = setuptools +PYTHON_SDBUS_MODEMMANAGER_LICENSE = LGPL-2.1+ +PYTHON_SDBUS_MODEMMANAGER_LICENSE_FILES = COPYING.LESSER + +$(eval $(python-package)) diff --git a/package/python-sdbus/Config.in b/package/python-sdbus/Config.in index b2d3990ab4..24ea16901f 100644 --- a/package/python-sdbus/Config.in +++ b/package/python-sdbus/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_PYTHON_SDBUS Modern Python D-Bus library. Based on sd-bus from libsystemd. - https://github.com/igo95862/python-sdbus + https://github.com/python-sdbus/python-sdbus comment "python-sdbus needs systemd" depends on !BR2_PACKAGE_SYSTEMD diff --git a/package/python-sdbus/python-sdbus.hash b/package/python-sdbus/python-sdbus.hash index 62a4587628..bb3834dfb4 100644 --- a/package/python-sdbus/python-sdbus.hash +++ b/package/python-sdbus/python-sdbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sdbus/json -md5 ea63ebfd0499940dc32878b0ffb9601c sdbus-0.13.0.tar.gz -sha256 801bd46608ee82614d42960c8ba8ae9300edb1bf5bbeb534bc8fd21f13d2c20e sdbus-0.13.0.tar.gz +md5 48ba3d23852b3d3f4f0623194f637872 sdbus-0.14.1.post0.tar.gz +sha256 ae3915ab3e3f0a116632e1e5876df992b9529e82b0b492006eb22f8791ed6deb sdbus-0.14.1.post0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-sdbus/python-sdbus.mk b/package/python-sdbus/python-sdbus.mk index 111c4bd648..9a72b23776 100644 --- a/package/python-sdbus/python-sdbus.mk +++ b/package/python-sdbus/python-sdbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SDBUS_VERSION = 0.13.0 +PYTHON_SDBUS_VERSION = 0.14.1.post0 PYTHON_SDBUS_SOURCE = sdbus-$(PYTHON_SDBUS_VERSION).tar.gz -PYTHON_SDBUS_SITE = https://files.pythonhosted.org/packages/4f/c7/8740ff78e9ffdbb9a28e7722e145795015c62ea7ce812242f5968073511c +PYTHON_SDBUS_SITE = https://files.pythonhosted.org/packages/b9/4f/549089131ba4ba5379517655cdcbfe3925fd1cc0eafd93aac5f73c2a6d40 PYTHON_SDBUS_SETUP_TYPE = setuptools PYTHON_SDBUS_LICENSE = LGPL-2.1+ PYTHON_SDBUS_LICENSE_FILES = COPYING diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash index c3dd0879cd..47a5b7be67 100644 --- a/package/python-selenium/python-selenium.hash +++ b/package/python-selenium/python-selenium.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 0c7bbef3f83aa48e1786ecc089e8d6a23c35164e7e9b02917697eca7a23628a2 python-selenium-4.26.1-cargo2.tar.gz +sha256 b5a238e9712d8f41c78c27759ec14c761acecc14505399c020b69de8bc38e51c python-selenium-4.35.0-cargo4.tar.gz # Locally computed sha256 checksums -sha256 de658a7d3761e92b471e2f630ea99eeb3389b27820809b1e4853baabd5fbadb7 LICENSE +sha256 1ee8454a0696ac46b0d5b67f85b2a0e3af2b7726e1b82cd182af60fd285bcba3 LICENSE diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk index 8f5f2c3598..2dc3b9fa22 100644 --- a/package/python-selenium/python-selenium.mk +++ b/package/python-selenium/python-selenium.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SELENIUM_VERSION = 4.26.1 +PYTHON_SELENIUM_VERSION = 4.35.0 PYTHON_SELENIUM_SOURCE_PYPI = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz -PYTHON_SELENIUM_SITE_PYPI = https://files.pythonhosted.org/packages/3f/b1/e9efcb88d5682e802cf03bdee4886f854d75bdb2859d1e72cb74041b4ef6 +PYTHON_SELENIUM_SITE_PYPI = https://files.pythonhosted.org/packages/75/67/9016942b5781843cfea6f5bc1383cea852d9fa08f85f55a0547874525b5c PYTHON_SELENIUM_SITE = $(PYTHON_SELENIUM_SITE_PYPI)/$(PYTHON_SELENIUM_SOURCE_PYPI)?buildroot-path=filename PYTHON_SELENIUM_SETUP_TYPE = setuptools-rust PYTHON_SELENIUM_LICENSE = Apache-2.0 diff --git a/package/python-semver/python-semver.hash b/package/python-semver/python-semver.hash index 1e06167610..50d30dd2fb 100644 --- a/package/python-semver/python-semver.hash +++ b/package/python-semver/python-semver.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semver/json -md5 0bbc4d74959c9f1522f75ffb4ae0934d semver-3.0.2.tar.gz -sha256 6253adb39c70f6e51afed2fa7152bcd414c411286088fb4b9effb133885ab4cc semver-3.0.2.tar.gz +md5 a0d76b528e489bf7ce1255a0a1486123 semver-3.0.4.tar.gz +sha256 afc7d8c584a5ed0a11033af086e8af226a9c0b206f313e0301f8dd7b6b589602 semver-3.0.4.tar.gz # Locally computed sha256 checksums -sha256 cda490c32e61d3884dc17791fc8078f2a3e564fba98dd18b4dc64eb2720b2b6f LICENSE.txt +sha256 cc10179de9ced8655d7765bd3a8ac46438a61e663de7cf1c48d502d2baf9f3d5 LICENSE.txt diff --git a/package/python-semver/python-semver.mk b/package/python-semver/python-semver.mk index 29d7ba46b1..3e4b167848 100644 --- a/package/python-semver/python-semver.mk +++ b/package/python-semver/python-semver.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_SEMVER_VERSION = 3.0.2 +PYTHON_SEMVER_VERSION = 3.0.4 PYTHON_SEMVER_SOURCE = semver-$(PYTHON_SEMVER_VERSION).tar.gz -PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/41/6c/a536cc008f38fd83b3c1b98ce19ead13b746b5588c9a0cb9dd9f6ea434bc +PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/72/d1/d3159231aec234a59dd7d601e9dd9fe96f3afff15efd33c1070019b26132 PYTHON_SEMVER_SETUP_TYPE = setuptools PYTHON_SEMVER_LICENSE = BSD-3-Clause PYTHON_SEMVER_LICENSE_FILES = LICENSE.txt PYTHON_SEMVER_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SEMVER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 6243632685..a9aedca54e 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 d68e388f9a261c00515e0f758303240f sentry_sdk-2.18.0.tar.gz -sha256 0dc21febd1ab35c648391c664df96f5f79fb0d92d7d4225cd9832e53a617cafd sentry_sdk-2.18.0.tar.gz +md5 1bb1e892b8d7e675cd26c36fd85e105f sentry_sdk-2.41.0.tar.gz +sha256 e7af3f4d7f8bac4c56fbaf95adb0d111f061cce58d5df91cfcd4e69782759b10 sentry_sdk-2.41.0.tar.gz # Locally computed sha256 checksums -sha256 6d7ec62dc20e8b92cb88b89fb3b55ee8576505f3e1afa57952548f6eea5d008e LICENSE +sha256 2a140d660f462812fa290bc740d04633126c5ec45d84b79b569e127b0eeddd0b LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index e2cbdcf405..3c10723bb2 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 2.18.0 +PYTHON_SENTRY_SDK_VERSION = 2.41.0 PYTHON_SENTRY_SDK_SOURCE = sentry_sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/24/cc/0d87cc8246f52d92228aa6718a24e1988a2893f4abe2f64ec5a8bcba4185 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/68/47/aea50a61d85bc07a34e6e7145aad7bd96c5671a86a32618059bad0cbc73b PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = MIT PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash index f60595bf6c..3520520df8 100644 --- a/package/python-setproctitle/python-setproctitle.hash +++ b/package/python-setproctitle/python-setproctitle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setproctitle/json -md5 1c042d6717212de791c4f9b63e7b544e setproctitle-1.3.3.tar.gz -sha256 c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae setproctitle-1.3.3.tar.gz +md5 422cd04321b1aa0f4b56d51d10ae5bb8 setproctitle-1.3.7.tar.gz +sha256 bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e setproctitle-1.3.7.tar.gz # Locally computed sha256 checksums -sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT +sha256 4bb8a954b08857aaecf1da3ecd722ab810d3899f2ab386052bbe27f5ff24a02a LICENSE diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk index ca2d0ffbc6..7821eb5225 100644 --- a/package/python-setproctitle/python-setproctitle.mk +++ b/package/python-setproctitle/python-setproctitle.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SETPROCTITLE_VERSION = 1.3.3 +PYTHON_SETPROCTITLE_VERSION = 1.3.7 PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/ff/e1/b16b16a1aa12174349d15b73fd4b87e641a8ae3fb1163e80938dbbf6ae98 +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/8d/48/49393a96a2eef1ab418b17475fb92b8fcfad83d099e678751b05472e69de PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause -PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT +PYTHON_SETPROCTITLE_LICENSE_FILES = LICENSE PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index fbaa515863..daba4fb28e 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.hash +++ b/package/python-setuptools-rust/python-setuptools-rust.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-rust/json -md5 755ce9ab3d5e7b9f420992ca891a3965 setuptools_rust-1.10.2.tar.gz -sha256 5d73e7eee5f87a6417285b617c97088a7c20d1a70fcea60e3bdc94ff567c29dc setuptools_rust-1.10.2.tar.gz +md5 cc5c2cf6828af473951295d9f33bcf33 setuptools_rust-1.11.1.tar.gz +sha256 7dabc4392252ced314b8050d63276e05fdc5d32398fc7d3cce1f6a6ac35b76c0 setuptools_rust-1.11.1.tar.gz # Locally computed sha256 checksums sha256 b20668c1590582b3882854050ccfbdb7aee1f71a1ffe9eacc4c5aeb08a14161b LICENSE diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index ab1023ea4a..01cd04867a 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_RUST_VERSION = 1.10.2 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.11.1 PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools_rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/d3/6b/99a1588d826ceb108694ba00f78bc6afda10ed5d72d550ae8f256af1f7b4 +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/e0/92/bf8589b1a2b6107cf9ec8daa9954c0b7620643fe1f37d31d75e572d995f5 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index f2bdf8a208..9a1c6f0262 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 d8046dce093a94dc382b68b45f6a6257 setuptools_scm-8.1.0.tar.gz -sha256 42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7 setuptools_scm-8.1.0.tar.gz +md5 35e09656d091a94b27f9c50b383b32c5 setuptools_scm-8.3.1.tar.gz +sha256 3d555e92b75dacd037d32bafdf94f97af51ea29ae8c7b234cf94b7a5bd242a63 setuptools_scm-8.3.1.tar.gz # Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index e646147785..8bf879082e 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 8.1.0 +PYTHON_SETUPTOOLS_SCM_VERSION = 8.3.1 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4f/a4/00a9ac1b555294710d4a68d2ce8dfdf39d72aa4d769a7395d05218d88a42 +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/b9/19/7ae64b70b2429c48c3a7a4ed36f50f94687d3bfcd0ae2f152367b6410dff PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = pep517 HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ host-python-packaging \ - host-python-setuptools \ - host-python-typing-extensions + host-python-setuptools $(eval $(host-python-package)) diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch index cd3cb66a5b..aaef27ed75 100644 --- a/package/python-setuptools/0001-add-executable.patch +++ b/package/python-setuptools/0001-add-executable.patch @@ -1,4 +1,4 @@ -From aa232855cf717835a5d16954f1fd8ead315a5fa6 Mon Sep 17 00:00:00 2001 +From 6fe6747c7d7509cc1af9667e1dae610657e5ccdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 7 Dec 2015 01:14:33 +0100 Subject: [PATCH] add executable @@ -22,10 +22,10 @@ Signed-off-by: James Hilliard 2 files changed, 11 insertions(+) diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index e2ec1abdd..e78ace3d4 100644 +index 19ca60145..c4bb536b9 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py -@@ -26,6 +26,7 @@ class install(orig.install): +@@ -35,6 +35,7 @@ class install(orig.install): distribution: Distribution # override distutils.dist.Distribution with setuptools.dist.Distribution user_options = orig.install.user_options + [ @@ -33,7 +33,7 @@ index e2ec1abdd..e78ace3d4 100644 ('old-and-unmanageable', None, "Try not to use this!"), ( 'single-version-externally-managed', -@@ -60,6 +61,7 @@ class install(orig.install): +@@ -67,6 +68,7 @@ class install(orig.install): ) super().initialize_options() @@ -42,11 +42,11 @@ index e2ec1abdd..e78ace3d4 100644 self.single_version_externally_managed = None diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index 7b90611d1..216cadf80 100644 +index 537181e32..6893e6a8c 100644 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py @@ -18,6 +18,13 @@ class install_scripts(orig.install_scripts): - def initialize_options(self): + def initialize_options(self) -> None: orig.install_scripts.initialize_options(self) self.no_ep = False + self.executable = None @@ -59,13 +59,13 @@ index 7b90611d1..216cadf80 100644 def run(self) -> None: self.run_command("egg_info") -@@ -45,6 +52,8 @@ class install_scripts(orig.install_scripts): - ) +@@ -39,6 +46,8 @@ class install_scripts(orig.install_scripts): + dist = metadata.Distribution.at(path=ei_cmd.egg_info) bs_cmd = self.get_finalized_command('build_scripts') exec_param = getattr(bs_cmd, 'executable', None) + if self.executable is not None: + exec_param = self.executable - writer = ei.ScriptWriter + writer = _scripts.ScriptWriter if exec_param == sys.executable: # In case the path to the Python executable contains a space, wrap -- diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index e99fc7d9b2..d0ed270e9c 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools/json -md5 ca5ea2d5e9622d6a7b9f6c6664821853 setuptools-75.3.0.tar.gz -sha256 fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686 setuptools-75.3.0.tar.gz +md5 82e1d67883b713f9493659b50d13b436 setuptools-80.9.0.tar.gz +sha256 f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c setuptools-80.9.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index d6b65a2b9e..e013000c57 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 75.3.0 +PYTHON_SETUPTOOLS_VERSION = 80.9.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ed/22/a438e0caa4576f8c383fa4d35f1cc01655a46c75be358960d815bfbb12bd +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/18/5d/3bf57dcd21979b887f014ea83c24ae194cfcd12b9e0fda66b957c69d1fca PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash index 79a34056dc..4ed2464260 100644 --- a/package/python-sh/python-sh.hash +++ b/package/python-sh/python-sh.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sh/json -md5 eba6bd8ec843a707bdc481577835980d sh-2.1.0.tar.gz -sha256 7e27301c574bec8ca5bf6f211851357526455ee97cd27a7c4c6cc5e2375399cb sh-2.1.0.tar.gz +md5 d1bc1f56e6a99109fb0f589aba574cf2 sh-2.2.1.tar.gz +sha256 287021ae84183dea49787985e33797dda7fe769e4f95f2c94dff8e245ab4cb00 sh-2.2.1.tar.gz # Locally computed sha256 checksums sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index a59c6f1324..84ad1aec63 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 2.1.0 +PYTHON_SH_VERSION = 2.2.1 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/52/12/b7965006c5adc57ba5459385358bd27c4983cd490884a75be86eb1d3efeb +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/bd/30/abf254f7b56ba7bcae938767e3ee0f54d220d931a35a8721de350b76dec5 PYTHON_SH_SETUP_TYPE = poetry PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-simple-pid/Config.in b/package/python-simple-pid/Config.in new file mode 100644 index 0000000000..d3985efe73 --- /dev/null +++ b/package/python-simple-pid/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_SIMPLE_PID + bool "python-simple-pid" + help + A simple, easy to use PID controller. + + https://github.com/m-lundberg/simple-pid diff --git a/package/python-simple-pid/python-simple-pid.hash b/package/python-simple-pid/python-simple-pid.hash new file mode 100644 index 0000000000..1e36ace439 --- /dev/null +++ b/package/python-simple-pid/python-simple-pid.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/simple-pid/json +md5 79fc6af22bb66553674026a3e4b7cf74 simple_pid-2.0.1.tar.gz +sha256 5771761c54541c900e597d6c2e4ea93fd2cc98f4e48cb9eca265fba2e65be99e simple_pid-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 a065b200f76a198209b41194d4f620f50e06181d275cbd58146a9632bbcc183a LICENSE.md diff --git a/package/python-simple-pid/python-simple-pid.mk b/package/python-simple-pid/python-simple-pid.mk new file mode 100644 index 0000000000..ed3bbb329f --- /dev/null +++ b/package/python-simple-pid/python-simple-pid.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-simple-pid +# +################################################################################ + +PYTHON_SIMPLE_PID_VERSION = 2.0.1 +PYTHON_SIMPLE_PID_SOURCE = simple_pid-$(PYTHON_SIMPLE_PID_VERSION).tar.gz +PYTHON_SIMPLE_PID_SITE = https://files.pythonhosted.org/packages/78/0a/c670a4f4dea4b21c0b074b193c54698e5e047479e688c8d5495d264c9921 +PYTHON_SIMPLE_PID_SETUP_TYPE = setuptools +PYTHON_SIMPLE_PID_LICENSE = MIT +PYTHON_SIMPLE_PID_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 52e927edbb..748af3ccca 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 a198e17c5dcc426ff83ec4a02190eae5 simplejson-3.19.3.tar.gz -sha256 8e086896c36210ab6050f2f9f095a5f1e03c83fa0e7f296d6cba425411364680 simplejson-3.19.3.tar.gz +md5 2b51376ed91109e4041a056a8f59ee73 simplejson-3.20.2.tar.gz +sha256 5fe7a6ce14d1c300d80d08695b7f7e633de6cd72c80644021874d985b3393649 simplejson-3.20.2.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 8a0acf545d..c42acc4196 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.19.3 +PYTHON_SIMPLEJSON_VERSION = 3.20.2 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/3d/29/085111f19717f865eceaf0d4397bf3e76b08d60428b076b64e2a1903706d +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/41/f4/a1ac5ed32f7ed9a088d62a59d410d4c204b3b3815722e2ccfb491fa8251b PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project diff --git a/package/python-simplesqlite/python-simplesqlite.hash b/package/python-simplesqlite/python-simplesqlite.hash index 8060437718..71c5fbf0a9 100644 --- a/package/python-simplesqlite/python-simplesqlite.hash +++ b/package/python-simplesqlite/python-simplesqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplesqlite/json -md5 a907352592539345bf8145c3e39015cb SimpleSQLite-1.5.2.tar.gz -sha256 f9a25b9e43d7aa28f551d170a42cfae10139c5c81a1bcb8776f857816ef5ae0f SimpleSQLite-1.5.2.tar.gz +md5 4daaf3678d4d20589d917043881951fb simplesqlite-1.5.4.tar.gz +sha256 7007d2abed75f2f9b0f1e544a9af2b6d0bd341d8b5519446708e6595ea092d4c simplesqlite-1.5.4.tar.gz # Locally computed sha256 checksums -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +sha256 130a35b917df1951aefbf366120491d5124045a87ded123f20ded21521f4e3a2 LICENSE diff --git a/package/python-simplesqlite/python-simplesqlite.mk b/package/python-simplesqlite/python-simplesqlite.mk index d8efe23a6c..bf08426310 100644 --- a/package/python-simplesqlite/python-simplesqlite.mk +++ b/package/python-simplesqlite/python-simplesqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLESQLITE_VERSION = 1.5.2 -PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz -PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/c8/07/92e3291fda6f1bbf6e7ff4721d87566e1615572d9c205ef64398c5d22efe +PYTHON_SIMPLESQLITE_VERSION = 1.5.4 +PYTHON_SIMPLESQLITE_SOURCE = simplesqlite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz +PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/1a/73/94ee1a1711ca04c7269f2d32472d10ad8cdc85ebf32c42e1cfc6924d39d8 PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools PYTHON_SIMPLESQLITE_LICENSE = MIT PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash index 17615e8699..bb636c9634 100644 --- a/package/python-six/python-six.hash +++ b/package/python-six/python-six.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/six/json -md5 a7c927740e4964dd29b72cebfc1429bb six-1.16.0.tar.gz -sha256 1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 six-1.16.0.tar.gz +md5 a0387fe15662c71057b4fb2b7aa9056a six-1.17.0.tar.gz +sha256 ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81 six-1.17.0.tar.gz # Locally computed sha256 checksums -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE +sha256 4375ba20e2b9c6c4e7cad2940a628fd90e95cc3d50ee92aae755715d8ba1fbd0 LICENSE diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk index 9e3e5fcf50..84ba78161e 100644 --- a/package/python-six/python-six.mk +++ b/package/python-six/python-six.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIX_VERSION = 1.16.0 +PYTHON_SIX_VERSION = 1.17.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz -PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e +PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2 PYTHON_SIX_SETUP_TYPE = setuptools PYTHON_SIX_LICENSE = MIT PYTHON_SIX_LICENSE_FILES = LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash index e3de9e87d3..ad0c547d7a 100644 --- a/package/python-smbprotocol/python-smbprotocol.hash +++ b/package/python-smbprotocol/python-smbprotocol.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/smbprotocol/json -md5 ca5c38cbe82d7995ed2147021a7d2950 smbprotocol-1.14.0.tar.gz -sha256 4918ba10a0b0b344308e7a043c1c6741bf7282c3937059a5852de702d3b684da smbprotocol-1.14.0.tar.gz +md5 3ff374488f4760f2f40e799e69671c40 smbprotocol-1.15.0.tar.gz +sha256 3c892f4c22ab147d0576a3a8d34279831b26ab4695b7df911a334bc41f6d652a smbprotocol-1.15.0.tar.gz # Locally computed sha256 checksums sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk index fc464fcbd3..6b35cb170e 100644 --- a/package/python-smbprotocol/python-smbprotocol.mk +++ b/package/python-smbprotocol/python-smbprotocol.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMBPROTOCOL_VERSION = 1.14.0 +PYTHON_SMBPROTOCOL_VERSION = 1.15.0 PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz -PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/41/0d/d178f651591de45607d6dfc5637e7dcd8c5190b137275303cda005d9a13a +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/c7/b4/68d75ae0c2f925976c7a58dd9bd26741378c79c6d56d57c72fabcbe595c4 PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools PYTHON_SMBPROTOCOL_LICENSE = MIT PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE diff --git a/package/python-smbus2/Config.in b/package/python-smbus2/Config.in new file mode 100644 index 0000000000..fdacae6da1 --- /dev/null +++ b/package/python-smbus2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_SMBUS2 + bool "python-smbus2" + help + smbus2 is a drop-in replacement for smbus-cffi/smbus-python + in pure Python. + + https://github.com/kplindegaard/smbus2 diff --git a/package/python-smbus2/python-smbus2.hash b/package/python-smbus2/python-smbus2.hash new file mode 100644 index 0000000000..65f9eefaf6 --- /dev/null +++ b/package/python-smbus2/python-smbus2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/smbus2/json +md5 5708a6cbf052f45a3ad6dd83c00902a6 smbus2-0.5.0.tar.gz +sha256 4a5946fd82277870c2878befdb1a29bb28d15cda14ea4d8d2d54cf3d4bdcb035 smbus2-0.5.0.tar.gz +# Locally computed sha256 checksums +sha256 6ee9cf18c3a75dd76fb549a4b607ae34eedc31a796c48157895e2ad28d66ce79 LICENSE diff --git a/package/python-smbus2/python-smbus2.mk b/package/python-smbus2/python-smbus2.mk new file mode 100644 index 0000000000..c416a55005 --- /dev/null +++ b/package/python-smbus2/python-smbus2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-smbus2 +# +################################################################################ + +PYTHON_SMBUS2_VERSION = 0.5.0 +PYTHON_SMBUS2_SOURCE = smbus2-$(PYTHON_SMBUS2_VERSION).tar.gz +PYTHON_SMBUS2_SITE = https://files.pythonhosted.org/packages/10/c9/6d85aa809e107adf85303010a59b340be109c8f815cbedc5c08c73bcffef +PYTHON_SMBUS2_SETUP_TYPE = setuptools +PYTHON_SMBUS2_LICENSE = MIT +PYTHON_SMBUS2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-smmap2/python-smmap2.hash b/package/python-smmap2/python-smmap2.hash index ee9c1ec570..6b040519ae 100644 --- a/package/python-smmap2/python-smmap2.hash +++ b/package/python-smmap2/python-smmap2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/smmap/json -md5 9779723a7cbd7498d07b2c17b0d0442b smmap-5.0.1.tar.gz -sha256 dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62 smmap-5.0.1.tar.gz +md5 1b691646da8ef92e9e178bd9b23c2540 smmap-5.0.2.tar.gz +sha256 26ea65a03958fa0c8a1c7e8c7a58fdc77221b8910f6be2131affade476898ad5 smmap-5.0.2.tar.gz # Locally computed sha256 checksums sha256 88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235 LICENSE diff --git a/package/python-smmap2/python-smmap2.mk b/package/python-smmap2/python-smmap2.mk index e43296912d..23517c3958 100644 --- a/package/python-smmap2/python-smmap2.mk +++ b/package/python-smmap2/python-smmap2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMMAP2_VERSION = 5.0.1 +PYTHON_SMMAP2_VERSION = 5.0.2 PYTHON_SMMAP2_SOURCE = smmap-$(PYTHON_SMMAP2_VERSION).tar.gz -PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/88/04/b5bf6d21dc4041000ccba7eb17dd3055feb237e7ffc2c20d3fae3af62baa +PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/44/cd/a040c4b3119bbe532e5b0732286f805445375489fceaec1f48306068ee3b PYTHON_SMMAP2_SETUP_TYPE = setuptools PYTHON_SMMAP2_LICENSE = BSD-3-Clause PYTHON_SMMAP2_LICENSE_FILES = LICENSE diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash index 709278fd5f..3535c00819 100644 --- a/package/python-socketio/python-socketio.hash +++ b/package/python-socketio/python-socketio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-socketio/json -md5 d55f0439cf7d056c0dca99fe13ad8054 python_socketio-5.11.4.tar.gz -sha256 8b0b8ff2964b2957c865835e936310190639c00310a47d77321a594d1665355e python_socketio-5.11.4.tar.gz +md5 fa264f1d5086cda8df1e01e7feb4a09c python_socketio-5.12.1.tar.gz +sha256 0299ff1f470b676c09c1bfab1dead25405077d227b2c13cf217a34dadc68ba9c python_socketio-5.12.1.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-socketio/python-socketio.mk b/package/python-socketio/python-socketio.mk index bc6cef6fc6..b07e6a689c 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 5.11.4 +PYTHON_SOCKETIO_VERSION = 5.12.1 PYTHON_SOCKETIO_SOURCE = python_socketio-$(PYTHON_SOCKETIO_VERSION).tar.gz -PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/32/31/4ba0d9d86c645ba335d645f49167ca58b0874ca0e421682f97964e8adb42 +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/ce/d0/40ed38076e8aee94785d546d3e3a1cae393da5806a8530be877187e2875f PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE diff --git a/package/python-spidev/python-spidev.hash b/package/python-spidev/python-spidev.hash index cd8a24eb72..166a36faba 100644 --- a/package/python-spidev/python-spidev.hash +++ b/package/python-spidev/python-spidev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/spidev/json -md5 83a73279d6e823a9030c4315577bfae3 spidev-3.6.tar.gz -sha256 14dbc37594a4aaef85403ab617985d3c3ef464d62bc9b769ef552db53701115b spidev-3.6.tar.gz +md5 1c44b18936bfb8d519f11ef9fe15fc73 spidev-3.8.tar.gz +sha256 2bc02fb8c6312d519ebf1f4331067427c0921d3f77b8bcaf05189a2e8b8382c0 spidev-3.8.tar.gz # Locally computed sha256 checksums sha256 510129bc8174c0fa81fa6d653691d1bd5d3555f7f38979ec45b5fc5bbff5377b LICENSE diff --git a/package/python-spidev/python-spidev.mk b/package/python-spidev/python-spidev.mk index f48b5b0832..2f7f7f23fc 100644 --- a/package/python-spidev/python-spidev.mk +++ b/package/python-spidev/python-spidev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.6 +PYTHON_SPIDEV_VERSION = 3.8 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/c7/d9/401c0a7be089e02826cf2c201f489876b601f15be100fe391ef9c2faed83 +PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/67/87/039b6eeea781598015b538691bc174cc0bf77df9d4d2d3b8bf9245c0de8c PYTHON_SPIDEV_SETUP_TYPE = setuptools PYTHON_SPIDEV_LICENSE = MIT PYTHON_SPIDEV_LICENSE_FILES = LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 4e38d4ec58..6b7351f6ce 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 7a4444524e4930a29f22dbca0cb16d4b sqlalchemy-2.0.36.tar.gz -sha256 7f2767680b6d2398aea7082e45a774b2b0767b5c8d8ffb9c8b683088ea9b29c5 sqlalchemy-2.0.36.tar.gz +md5 7659edd862c2b507f9fc4b466d319a4d sqlalchemy-2.0.44.tar.gz +sha256 0ae7454e1ab1d780aee69fd2aae7d6b8670a581d8847f2d1e0f7ddfbf47e5a22 sqlalchemy-2.0.44.tar.gz # Locally computed sha256 checksums -sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE +sha256 9821720b58d4a565b61321007a8ad43ab6991a3959e66cd5db4dd9eae69c7dfc LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 1bc2f3929a..0a7371188e 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.36 +PYTHON_SQLALCHEMY_VERSION = 2.0.44 PYTHON_SQLALCHEMY_SOURCE = sqlalchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/50/65/9cbc9c4c3287bed2499e05033e207473504dc4df999ce49385fb1f8b058a +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/f0/f2/840d7b9496825333f532d2e3976b8eadbf52034178aac53630d09fe6e1ef PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash index 7fe8ee925d..f235662313 100644 --- a/package/python-sqliteschema/python-sqliteschema.hash +++ b/package/python-sqliteschema/python-sqliteschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqliteschema/json -md5 b7fd543b82ad709f70cdc06c4ec8639a sqliteschema-2.0.0.tar.gz -sha256 fe6cedddf10de8934ec1ace8319340a2256667e4a1a36f3da4fd1c0956124dc8 sqliteschema-2.0.0.tar.gz +md5 909372921bf08a9215b3d1a09a7f29df sqliteschema-2.0.1.tar.gz +sha256 d70a02d80f5c09d321632213bf957467909593fd462e5a37df66244ab6304c33 sqliteschema-2.0.1.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk index 4b224048f9..a55ae8a0e0 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 2.0.0 +PYTHON_SQLITESCHEMA_VERSION = 2.0.1 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/29/e7/4482eebf6d8ff7923bb3fd0e9239d3e634f67125cfda3001c88506b939b9 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/90/ad/0d7010b15899d25ee832b89d0d79b501c4d0c7d0d03c06e84c1cd1383326 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE +PYTHON_SQLITESCHEMA_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-sqlparse/python-sqlparse.hash b/package/python-sqlparse/python-sqlparse.hash index 1fe8429724..3e54d227f4 100644 --- a/package/python-sqlparse/python-sqlparse.hash +++ b/package/python-sqlparse/python-sqlparse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlparse/json -md5 969a64f03d7da1144fc74aad390f9db4 sqlparse-0.5.1.tar.gz -sha256 bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e sqlparse-0.5.1.tar.gz +md5 9764a42264c9a3102526c87260e73d11 sqlparse-0.5.3.tar.gz +sha256 09f67787f56a0b16ecdbde1bfc7f5d9c3371ca683cfeaa8e6ff60b4807ec9272 sqlparse-0.5.3.tar.gz # Locally computed sha256 checksums sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index de5ee15bee..0140961393 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLPARSE_VERSION = 0.5.1 +PYTHON_SQLPARSE_VERSION = 0.5.3 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz -PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/73/82/dfa23ec2cbed08a801deab02fe7c904bfb00765256b155941d789a338c68 +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/e5/40/edede8dd6977b0d3da179a342c198ed100dd2aba4be081861ee5911e4da4 PYTHON_SQLPARSE_SETUP_TYPE = hatch PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE diff --git a/package/python-starlette/Config.in b/package/python-starlette/Config.in index 90f590689a..64f8345a92 100644 --- a/package/python-starlette/Config.in +++ b/package/python-starlette/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_STARLETTE help The little ASGI library that shines. - https://github.com/encode/starlette + https://github.com/Kludex/starlette diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index f422e6cfe0..9b84774c86 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 97321ad76438c1106ddd817baddcda06 starlette-0.41.2.tar.gz -sha256 9834fd799d1a87fd346deb76158668cfa0b0d56f85caefe8268e2d97c3468b62 starlette-0.41.2.tar.gz +md5 f3479ed026aeaffb43af371d3b7db527 starlette-0.50.0.tar.gz +sha256 a2a17b22203254bcbc2e1f926d2d55f3f9497f769416b3190768befe598fa3ca starlette-0.50.0.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 3caa136987..af8a49e0fd 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.41.2 +PYTHON_STARLETTE_VERSION = 0.50.0 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/3e/da/1fb4bdb72ae12b834becd7e1e7e47001d32f91ec0ce8d7bc1b618d9f0bd9 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/ba/b8/73a0e6a6e079a9d9cfa64113d771e421640b6f679a52eeb9b32f72d871a1 PYTHON_STARLETTE_SETUP_TYPE = hatch PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md diff --git a/package/python-sympy/python-sympy.hash b/package/python-sympy/python-sympy.hash index 09cb0bfd71..efd09d7196 100644 --- a/package/python-sympy/python-sympy.hash +++ b/package/python-sympy/python-sympy.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/sympy/json -md5 0902c1a6a7399c8a5ed1bbe95d559c10 sympy-1.13.3.tar.gz -sha256 b27fd2c6530e0ab39e275fc9b683895367e51d5da91baa8d3d64db2565fec4d9 sympy-1.13.3.tar.gz +md5 9872deb5bd7816dfbc89bec086b9e522 sympy-1.14.0.tar.gz +sha256 d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517 sympy-1.14.0.tar.gz # Locally computed sha256 checksums sha256 07a5e9819f727b4986ad2829c7a29a6320d42575f720eb24d71b7fef573a0286 LICENSE sha256 596639d3681fdb67bb2f05a9fcd2503d88bc549471a89b2e500cd9759ae2a3fa data/TeXmacs/LICENSE diff --git a/package/python-sympy/python-sympy.mk b/package/python-sympy/python-sympy.mk index 246da3b219..817b56ddee 100644 --- a/package/python-sympy/python-sympy.mk +++ b/package/python-sympy/python-sympy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SYMPY_VERSION = 1.13.3 +PYTHON_SYMPY_VERSION = 1.14.0 PYTHON_SYMPY_SOURCE = sympy-$(PYTHON_SYMPY_VERSION).tar.gz -PYTHON_SYMPY_SITE = https://files.pythonhosted.org/packages/11/8a/5a7fd6284fa8caac23a26c9ddf9c30485a48169344b4bd3b0f02fef1890f +PYTHON_SYMPY_SITE = https://files.pythonhosted.org/packages/83/d3/803453b36afefb7c2bb238361cd4ae6125a569b4db67cd9e79846ba2d68c PYTHON_SYMPY_SETUP_TYPE = setuptools PYTHON_SYMPY_LICENSE = BSD-3-Clause PYTHON_SYMPY_LICENSE_FILES = LICENSE data/TeXmacs/LICENSE sympy/parsing/latex/LICENSE.txt diff --git a/package/python-tabledata/python-tabledata.hash b/package/python-tabledata/python-tabledata.hash index 19fd4ea9c5..fb3471af95 100644 --- a/package/python-tabledata/python-tabledata.hash +++ b/package/python-tabledata/python-tabledata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tabledata/json -md5 579c4e7454a837d252d4977b73556aae tabledata-1.3.3.tar.gz -sha256 c90daaba9a408e4397934b3ff2f6c06797d5289676420bf520c741ad43e6ff91 tabledata-1.3.3.tar.gz +md5 c0efbc178462c94920c02c52da56bf18 tabledata-1.3.4.tar.gz +sha256 e9649cab129d718f3bff4150083b77f8a78c30f6634a30caf692b10fdc60cb97 tabledata-1.3.4.tar.gz # Locally computed sha256 checksums -sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE +sha256 4434f353a12dd0236a99e5d3fd07fe3b3a453f9164fe10c57a11d6ca86b50c08 LICENSE diff --git a/package/python-tabledata/python-tabledata.mk b/package/python-tabledata/python-tabledata.mk index 43e22d45d1..bf845b7a7b 100644 --- a/package/python-tabledata/python-tabledata.mk +++ b/package/python-tabledata/python-tabledata.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TABLEDATA_VERSION = 1.3.3 +PYTHON_TABLEDATA_VERSION = 1.3.4 PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz -PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/48/6a/7f78fbf883f325b70ba9ce5c10d97652f5c371e224940097c2cea9d0f456 +PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/b2/35/171c8977162f1163368406deddde4c59673b62bd0cb2f34948a02effb075 PYTHON_TABLEDATA_SETUP_TYPE = setuptools PYTHON_TABLEDATA_LICENSE = MIT PYTHON_TABLEDATA_LICENSE_FILES = LICENSE +PYTHON_TABLEDATA_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-tcolorpy/python-tcolorpy.hash b/package/python-tcolorpy/python-tcolorpy.hash index 0bba6e47fe..30cdda9f69 100644 --- a/package/python-tcolorpy/python-tcolorpy.hash +++ b/package/python-tcolorpy/python-tcolorpy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tcolorpy/json -md5 a4a8404d2b6ecfae4eeca8c71e4634c6 tcolorpy-0.1.6.tar.gz -sha256 8cea0bf5f8cf03f77528a9acfbf312df935573892ba5ea3b2516e61fa54de9a5 tcolorpy-0.1.6.tar.gz +md5 6232d098c4531507e2aa04fe34fb8cd3 tcolorpy-0.1.7.tar.gz +sha256 0fbf6bf238890bbc2e32662aa25736769a29bf6d880328f310c910a327632614 tcolorpy-0.1.7.tar.gz # Locally computed sha256 checksums -sha256 f41a0456d5f2bba25fd4d7e50b51a95de304770ff1db5a79515d03397a914d8d LICENSE +sha256 a26e357cfe6ba55f8d8e1e9d82c928ee7ed3c1ecd351b29455ca7a3f5d5a664d LICENSE diff --git a/package/python-tcolorpy/python-tcolorpy.mk b/package/python-tcolorpy/python-tcolorpy.mk index bdc66f61bc..062c218ef7 100644 --- a/package/python-tcolorpy/python-tcolorpy.mk +++ b/package/python-tcolorpy/python-tcolorpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TCOLORPY_VERSION = 0.1.6 +PYTHON_TCOLORPY_VERSION = 0.1.7 PYTHON_TCOLORPY_SOURCE = tcolorpy-$(PYTHON_TCOLORPY_VERSION).tar.gz -PYTHON_TCOLORPY_SITE = https://files.pythonhosted.org/packages/af/f6/b17885354c5addfb93c14f3ed7172c33494f989dd5f83c0340d2c8fa3b69 +PYTHON_TCOLORPY_SITE = https://files.pythonhosted.org/packages/80/cc/44f2d81d8f9093aad81c3467a5bf5718d2b5f786e887b6e4adcfc17ec6b9 PYTHON_TCOLORPY_SETUP_TYPE = setuptools PYTHON_TCOLORPY_LICENSE = MIT PYTHON_TCOLORPY_LICENSE_FILES = LICENSE diff --git a/package/python-telnetlib3/Config.in b/package/python-telnetlib3/Config.in new file mode 100644 index 0000000000..487258c272 --- /dev/null +++ b/package/python-telnetlib3/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TELNETLIB3 + bool "python-telnetlib3" + help + Python 3 asyncio Telnet server and client Protocol library. + + http://telnetlib3.rtfd.org/ diff --git a/package/python-telnetlib3/python-telnetlib3.hash b/package/python-telnetlib3/python-telnetlib3.hash new file mode 100644 index 0000000000..135b985625 --- /dev/null +++ b/package/python-telnetlib3/python-telnetlib3.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/telnetlib3/json +md5 effe967417ede0c7dadcc3ccd3263d5f telnetlib3-2.0.8.tar.gz +sha256 08a2a7a3a6790f89617442b7d491da8b531d87706fffd6a33eeff57ac440b752 telnetlib3-2.0.8.tar.gz +# Locally computed sha256 checksums +sha256 df4b9fddd41b5811d9ba61952c7513ab3b0ca1d00efe611d19c51eda756f5dd1 LICENSE.txt diff --git a/package/python-telnetlib3/python-telnetlib3.mk b/package/python-telnetlib3/python-telnetlib3.mk new file mode 100644 index 0000000000..d8968d4f15 --- /dev/null +++ b/package/python-telnetlib3/python-telnetlib3.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-telnetlib3 +# +################################################################################ + +PYTHON_TELNETLIB3_VERSION = 2.0.8 +PYTHON_TELNETLIB3_SOURCE = telnetlib3-$(PYTHON_TELNETLIB3_VERSION).tar.gz +PYTHON_TELNETLIB3_SITE = https://files.pythonhosted.org/packages/b7/12/305101cfdec4863c088e520cbb698b08ebd3396904ecfe0062612db77c66 +PYTHON_TELNETLIB3_SETUP_TYPE = setuptools +PYTHON_TELNETLIB3_LICENSE = ISC +PYTHON_TELNETLIB3_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in index 3f4481422a..1e496faa27 100644 --- a/package/python-tempora/Config.in +++ b/package/python-tempora/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_TEMPORA bool "python-tempora" + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime - select BR2_PACKAGE_PYTHON_PYTZ # runtime help Objects and routines pertaining to date and time. diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index 9d3487d67b..15bdaaf783 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 e4ca48a06f4c8b9aa21b8081937353f2 tempora-5.7.0.tar.gz -sha256 888190a2dbe3255ff26dfa9fcecb25f4d38434c0f1943cd61de98bb41c410c50 tempora-5.7.0.tar.gz +md5 ca7fb7c9523fb5232b734a19dae05c6a tempora-5.8.0.tar.gz +sha256 1e9606e65a3f2063460961d68515dee07bdaca0859305a8d3e6604168175fef1 tempora-5.8.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index aeb2e4687c..3b6c644b53 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.7.0 +PYTHON_TEMPORA_VERSION = 5.8.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/5d/52/b4ff0ca21695a4f8ac0f158d884587b5eba08b0e95356b0ea210e00446ac +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/c3/f2/bbd6d2178791eaf8bac06857cb0ee39840e69f7b64ecb0c414bf8f46daff PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools diff --git a/package/python-tftpy/python-tftpy.hash b/package/python-tftpy/python-tftpy.hash index 1fae4fdeef..3a040a456a 100644 --- a/package/python-tftpy/python-tftpy.hash +++ b/package/python-tftpy/python-tftpy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2bfbf6377f6e3b6ba647f0ac614e9cbc225d1cc35b52991860ba6ea1ec58ef9d python-tftpy-0.8.2.tar.gz +sha256 fc1460bf698c4207a255fffb446ce21d44cb0d9a8f2ee5ad705cd40969800050 python-tftpy-0.8.5.tar.gz sha256 4616f0c71e62ce2e0f6cdd3aef6d3c285f8730c9304b88a9f3ce3f14c2e6f756 LICENSE diff --git a/package/python-tftpy/python-tftpy.mk b/package/python-tftpy/python-tftpy.mk index fd3c601496..322d514f1f 100644 --- a/package/python-tftpy/python-tftpy.mk +++ b/package/python-tftpy/python-tftpy.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TFTPY_VERSION = 0.8.2 +PYTHON_TFTPY_VERSION = 0.8.5 PYTHON_TFTPY_SITE = $(call github,msoulier,tftpy,$(PYTHON_TFTPY_VERSION)) PYTHON_TFTPY_LICENSE = MIT PYTHON_TFTPY_LICENSE_FILES = LICENSE PYTHON_TFTPY_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-thrift/python-thrift.hash b/package/python-thrift/python-thrift.hash index 042c801b88..c6fea735c1 100644 --- a/package/python-thrift/python-thrift.hash +++ b/package/python-thrift/python-thrift.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/thrift/json -md5 1e7f196bad9e3ce3f9092a38f5287d9f thrift-0.21.0.tar.gz -sha256 5e6f7c50f936ebfa23e924229afc95eb219f8c8e5a83202dd4a391244803e402 thrift-0.21.0.tar.gz +md5 d900f4b437b1ffba7258c58c3fde40db thrift-0.22.0.tar.gz +sha256 42e8276afbd5f54fe1d364858b6877bc5e5a4a5ed69f6a005b94ca4918fe1466 thrift-0.22.0.tar.gz # Locally computed sha256 checksums sha256 35e2508f171c3ac2529f402c123c12f3b2ac91643f2e52b334f71f8c861be321 README.md diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk index ebfcff0e3c..d0c7896f8e 100644 --- a/package/python-thrift/python-thrift.mk +++ b/package/python-thrift/python-thrift.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.21.0 +PYTHON_THRIFT_VERSION = 0.22.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/33/1c/418058b4750176b638ab60b4d5a554a2969dcd2363ae458519d0f747adff +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/b2/c2/db648cc10dd7d15560f2eafd92a27cd280811924696e0b4a87175fb28c94 PYTHON_THRIFT_SETUP_TYPE = setuptools PYTHON_THRIFT_LICENSE = Apache-2.0 PYTHON_THRIFT_LICENSE_FILES = README.md diff --git a/package/python-tomli-w/python-tomli-w.hash b/package/python-tomli-w/python-tomli-w.hash index 1d0bbf881e..61b5baf9a8 100644 --- a/package/python-tomli-w/python-tomli-w.hash +++ b/package/python-tomli-w/python-tomli-w.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tomli-w/json -md5 8a074845fdcbb1fb6855bec753f0f94e tomli_w-1.1.0.tar.gz -sha256 49e847a3a304d516a169a601184932ef0f6b61623fe680f836a2aa7128ed0d33 tomli_w-1.1.0.tar.gz +md5 bfc49ccce117afc20bcaf50e80fcecfe tomli_w-1.2.0.tar.gz +sha256 2dd14fac5a47c27be9cd4c976af5a12d87fb1f0b4512f81d69cce3b35ae25021 tomli_w-1.2.0.tar.gz # Locally computed sha256 checksums sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli-w/python-tomli-w.mk b/package/python-tomli-w/python-tomli-w.mk index a6ca0cfbbc..b8881eb15b 100644 --- a/package/python-tomli-w/python-tomli-w.mk +++ b/package/python-tomli-w/python-tomli-w.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TOMLI_W_VERSION = 1.1.0 +PYTHON_TOMLI_W_VERSION = 1.2.0 PYTHON_TOMLI_W_SOURCE = tomli_w-$(PYTHON_TOMLI_W_VERSION).tar.gz -PYTHON_TOMLI_W_SITE = https://files.pythonhosted.org/packages/d4/19/b65f1a088ee23e37cdea415b357843eca8b1422a7b11a9eee6e35d4ec273 +PYTHON_TOMLI_W_SITE = https://files.pythonhosted.org/packages/19/75/241269d1da26b624c0d5e110e8149093c759b7a286138f4efd61a60e75fe PYTHON_TOMLI_W_SETUP_TYPE = flit PYTHON_TOMLI_W_LICENSE = MIT PYTHON_TOMLI_W_LICENSE_FILES = LICENSE diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash index 8ee4939af0..ec30f06db2 100644 --- a/package/python-tomli/python-tomli.hash +++ b/package/python-tomli/python-tomli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tomli/json -md5 e65b234adc4513d94792c69bb025b622 tomli-2.0.2.tar.gz -sha256 d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed tomli-2.0.2.tar.gz +md5 1e0e2fb2e29f3d77f0507bee71fb4ab4 tomli-2.2.1.tar.gz +sha256 cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff tomli-2.2.1.tar.gz # Locally computed sha256 checksums sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 3c3d4dc182..c23ae94758 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TOMLI_VERSION = 2.0.2 +PYTHON_TOMLI_VERSION = 2.2.1 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz -PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/35/b9/de2a5c0144d7d75a57ff355c0c24054f965b2dc3036456ae03a51ea6264b +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE PYTHON_TOMLI_SETUP_TYPE = flit diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index f8ac0ceaf3..0c8e401ff0 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 07ebd88a2a7acee1b819738f3f4ca7ef tornado-6.4.1.tar.gz -sha256 92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9 tornado-6.4.1.tar.gz +md5 dbf1f706f0a1efd9ed3dad8d82b7e865 tornado-6.5.2.tar.gz +sha256 ab53c8f9a0fa351e2c0741284e06c7a45da86afb544133201c5cc8578eb076a0 tornado-6.5.2.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index c5e5a2ca0c..800a5d775d 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.4.1 +PYTHON_TORNADO_VERSION = 6.5.2 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/ee/66/398ac7167f1c7835406888a386f6d0d26ee5dbf197d8a571300be57662d3 +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/09/ce/1eb500eae19f4648281bb2186927bb062d2438c2e5093d1360391afd2f90 PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb diff --git a/package/python-tortoise-orm/python-tortoise-orm.hash b/package/python-tortoise-orm/python-tortoise-orm.hash index 5e97c6302f..8e99e815df 100644 --- a/package/python-tortoise-orm/python-tortoise-orm.hash +++ b/package/python-tortoise-orm/python-tortoise-orm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tortoise-orm/json -md5 328373e7e6112eab38984d6c1c7caf41 tortoise_orm-0.21.7.tar.gz -sha256 8a790a931828aa37ac364b344c561e603422aced2af5e403f6790575da0f19c5 tortoise_orm-0.21.7.tar.gz +md5 ef8df163a207f40230c618efa18ca32b tortoise_orm-0.25.1.tar.gz +sha256 4d5bfd13d5750935ffe636a6b25597c5c8f51c47e5b72d7509d712eda1a239fe tortoise_orm-0.25.1.tar.gz # Locally computed sha256 checksums sha256 f955d347b975d5867ee364f978476b3012878a706d468571b9758cac74de6041 LICENSE.txt diff --git a/package/python-tortoise-orm/python-tortoise-orm.mk b/package/python-tortoise-orm/python-tortoise-orm.mk index 0a8f173c86..32327bae38 100644 --- a/package/python-tortoise-orm/python-tortoise-orm.mk +++ b/package/python-tortoise-orm/python-tortoise-orm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORTOISE_ORM_VERSION = 0.21.7 +PYTHON_TORTOISE_ORM_VERSION = 0.25.1 PYTHON_TORTOISE_ORM_SOURCE = tortoise_orm-$(PYTHON_TORTOISE_ORM_VERSION).tar.gz -PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/e8/0e/ad8e7554b0259072887d602617a67ef21055e1d8aa061936e381ecc1a9a5 +PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/d7/9b/de966810021fa773fead258efd8deea2bb73bb12479e27f288bd8ceb8763 PYTHON_TORTOISE_ORM_SETUP_TYPE = poetry PYTHON_TORTOISE_ORM_LICENSE = Apache-2.0 PYTHON_TORTOISE_ORM_LICENSE_FILES = LICENSE.txt diff --git a/package/python-tqdm/python-tqdm.hash b/package/python-tqdm/python-tqdm.hash index 7bbb37e5ba..1395fa2e99 100644 --- a/package/python-tqdm/python-tqdm.hash +++ b/package/python-tqdm/python-tqdm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tqdm/json -md5 3495f2a40a26a4f1caea279630f13521 tqdm-4.67.0.tar.gz -sha256 fe5a6f95e6fe0b9755e9469b77b9c3cf850048224ecaa8293d7d2d31f97d869a tqdm-4.67.0.tar.gz +md5 aca803dd7ac5c4ae233977aff41b7f7c tqdm-4.67.1.tar.gz +sha256 f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2 tqdm-4.67.1.tar.gz # Locally computed sha256 checksums sha256 dc33252e829015e3b150086fb9b3a40f6ad6fb32c2f4610ce812fa677d35986a LICENCE diff --git a/package/python-tqdm/python-tqdm.mk b/package/python-tqdm/python-tqdm.mk index 4c2db7f249..b03e19ccda 100644 --- a/package/python-tqdm/python-tqdm.mk +++ b/package/python-tqdm/python-tqdm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TQDM_VERSION = 4.67.0 +PYTHON_TQDM_VERSION = 4.67.1 PYTHON_TQDM_SOURCE = tqdm-$(PYTHON_TQDM_VERSION).tar.gz -PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/e8/4f/0153c21dc5779a49a0598c445b1978126b1344bab9ee71e53e44877e14e0 +PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/a8/4b/29b4ef32e036bb34e4ab51796dd745cdba7ed47ad142a9f4a1eb8e0c744d PYTHON_TQDM_SETUP_TYPE = setuptools PYTHON_TQDM_LICENSE = MPL-2.0, MIT PYTHON_TQDM_LICENSE_FILES = LICENCE diff --git a/package/python-trio-websocket/python-trio-websocket.hash b/package/python-trio-websocket/python-trio-websocket.hash index b7e8302b58..3c73f33f37 100644 --- a/package/python-trio-websocket/python-trio-websocket.hash +++ b/package/python-trio-websocket/python-trio-websocket.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/trio-websocket/json -md5 3d9bb51b62f562dbdbc2ec067132c4a6 trio-websocket-0.11.1.tar.gz -sha256 18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f trio-websocket-0.11.1.tar.gz +md5 d46fc1eddcd2b3bcb704d4cba65ad663 trio_websocket-0.12.2.tar.gz +sha256 22c72c436f3d1e264d0910a3951934798dcc5b00ae56fc4ee079d46c7cf20fae trio_websocket-0.12.2.tar.gz # Locally computed sha256 checksums sha256 2d5e3fc506b6c87ad93b77b9aa76009a58fea72be5fb56e6803bc08cb2887999 LICENSE diff --git a/package/python-trio-websocket/python-trio-websocket.mk b/package/python-trio-websocket/python-trio-websocket.mk index 3e79bb7108..f4a9304f15 100644 --- a/package/python-trio-websocket/python-trio-websocket.mk +++ b/package/python-trio-websocket/python-trio-websocket.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRIO_WEBSOCKET_VERSION = 0.11.1 -PYTHON_TRIO_WEBSOCKET_SOURCE = trio-websocket-$(PYTHON_TRIO_WEBSOCKET_VERSION).tar.gz -PYTHON_TRIO_WEBSOCKET_SITE = https://files.pythonhosted.org/packages/dd/36/abad2385853077424a11b818d9fd8350d249d9e31d583cb9c11cd4c85eda +PYTHON_TRIO_WEBSOCKET_VERSION = 0.12.2 +PYTHON_TRIO_WEBSOCKET_SOURCE = trio_websocket-$(PYTHON_TRIO_WEBSOCKET_VERSION).tar.gz +PYTHON_TRIO_WEBSOCKET_SITE = https://files.pythonhosted.org/packages/d1/3c/8b4358e81f2f2cfe71b66a267f023a91db20a817b9425dd964873796980a PYTHON_TRIO_WEBSOCKET_SETUP_TYPE = setuptools PYTHON_TRIO_WEBSOCKET_LICENSE = MIT PYTHON_TRIO_WEBSOCKET_LICENSE_FILES = LICENSE diff --git a/package/python-trio/python-trio.hash b/package/python-trio/python-trio.hash index 35de5d6c3b..35f582311a 100644 --- a/package/python-trio/python-trio.hash +++ b/package/python-trio/python-trio.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/trio/json -md5 81c1aa4eefa98e1b2895a85369211d24 trio-0.27.0.tar.gz -sha256 1dcc95ab1726b2da054afea8fd761af74bad79bd52381b84eae408e983c76831 trio-0.27.0.tar.gz +md5 26bb7f0669385e47347e4d8177552653 trio-0.31.0.tar.gz +sha256 f71d551ccaa79d0cb73017a33ef3264fde8335728eb4c6391451fe5d253a9d5b trio-0.31.0.tar.gz # Locally computed sha256 checksums sha256 418d025e1284311f2690263e6efa6bf51585e5741818ece63e5862487e505bb9 LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 diff --git a/package/python-trio/python-trio.mk b/package/python-trio/python-trio.mk index dace4eec9e..8d8720be36 100644 --- a/package/python-trio/python-trio.mk +++ b/package/python-trio/python-trio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRIO_VERSION = 0.27.0 +PYTHON_TRIO_VERSION = 0.31.0 PYTHON_TRIO_SOURCE = trio-$(PYTHON_TRIO_VERSION).tar.gz -PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/17/d1/a83dee5be404da7afe5a71783a33b8907bacb935a6dc8c69ab785e4a3eed +PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/76/8f/c6e36dd11201e2a565977d8b13f0b027ba4593c1a80bed5185489178e257 PYTHON_TRIO_SETUP_TYPE = setuptools PYTHON_TRIO_LICENSE = Apache-2.0 or MIT PYTHON_TRIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT diff --git a/package/python-trove-classifiers/python-trove-classifiers.hash b/package/python-trove-classifiers/python-trove-classifiers.hash index 02ea021527..008c3a0b3e 100644 --- a/package/python-trove-classifiers/python-trove-classifiers.hash +++ b/package/python-trove-classifiers/python-trove-classifiers.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/trove-classifiers/json -md5 c2820cfbb09e91d84ade85e0e65d87ae trove_classifiers-2024.10.21.16.tar.gz -sha256 17cbd055d67d5e9d9de63293a8732943fabc21574e4c7b74edf112b4928cf5f3 trove_classifiers-2024.10.21.16.tar.gz +md5 769cd978e6756c423958bbfe76f130d8 trove_classifiers-2025.9.11.17.tar.gz +sha256 931ca9841a5e9c9408bc2ae67b50d28acf85bef56219b56860876dd1f2d024dd trove_classifiers-2025.9.11.17.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-trove-classifiers/python-trove-classifiers.mk b/package/python-trove-classifiers/python-trove-classifiers.mk index ab2421cbe5..a556cbd3dd 100644 --- a/package/python-trove-classifiers/python-trove-classifiers.mk +++ b/package/python-trove-classifiers/python-trove-classifiers.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TROVE_CLASSIFIERS_VERSION = 2024.10.21.16 +PYTHON_TROVE_CLASSIFIERS_VERSION = 2025.9.11.17 PYTHON_TROVE_CLASSIFIERS_SOURCE = trove_classifiers-$(PYTHON_TROVE_CLASSIFIERS_VERSION).tar.gz -PYTHON_TROVE_CLASSIFIERS_SITE = https://files.pythonhosted.org/packages/99/85/92c2667cf221b37648041ce9319427f92fa76cbec634aad844e67e284706 +PYTHON_TROVE_CLASSIFIERS_SITE = https://files.pythonhosted.org/packages/ca/9a/778622bc06632529817c3c524c82749a112603ae2bbcf72ee3eb33a2c4f1 PYTHON_TROVE_CLASSIFIERS_SETUP_TYPE = setuptools PYTHON_TROVE_CLASSIFIERS_LICENSE = Apache-2.0 PYTHON_TROVE_CLASSIFIERS_LICENSE_FILES = LICENSE diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 03c637c9ed..436f4c48a7 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 bbe77df51bb6375ac61b9be634ff59f3 twisted-24.10.0.tar.gz -sha256 02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e twisted-24.10.0.tar.gz +md5 a21b5326a74079a92d7bc4748b419280 twisted-24.11.0.tar.gz +sha256 695d0556d5ec579dcc464d2856b634880ed1319f45b10d19043f2b57eb0115b5 twisted-24.11.0.tar.gz # Locally computed sha256 checksums sha256 78d059391dddba18a695c1998ac9dde68160a1df1635f34adcfb3ecba4564802 LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 424efdadba..b7217da6e4 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 24.10.0 +PYTHON_TWISTED_VERSION = 24.11.0 PYTHON_TWISTED_SOURCE = twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/b2/0f/2d0b0dcd52a849db64ff63619aead94ae1091fe4d4d7e100371efe513585 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/1c/e07af0df31229250ab58a943077e4adbd5e227d9f2ac826920416b3e5fa2 PYTHON_TWISTED_SETUP_TYPE = hatch PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE -PYTHON_TWISTED_CPE_ID_VENDOR = twistedmatrix +PYTHON_TWISTED_CPE_ID_VENDOR = twisted PYTHON_TWISTED_CPE_ID_PRODUCT = twisted PYTHON_TWISTED_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ diff --git a/package/python-typepy/python-typepy.hash b/package/python-typepy/python-typepy.hash index 0b73f9f4df..5cf3daded9 100644 --- a/package/python-typepy/python-typepy.hash +++ b/package/python-typepy/python-typepy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typepy/json -md5 2637fdf609b8a7b9b8ec722852efc706 typepy-1.3.2.tar.gz -sha256 b69fd48b9f50cdb3809906eef36b855b3134ff66c8893a4f8580abddb0b39517 typepy-1.3.2.tar.gz +md5 f7ba433b3ea79aa36699be634b36aef1 typepy-1.3.4.tar.gz +sha256 89c1f66de6c6133209c43a94d23431d320ba03ef5db18f241091ea594035d9de typepy-1.3.4.tar.gz # Locally computed sha256 checksums -sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE +sha256 4434f353a12dd0236a99e5d3fd07fe3b3a453f9164fe10c57a11d6ca86b50c08 LICENSE diff --git a/package/python-typepy/python-typepy.mk b/package/python-typepy/python-typepy.mk index cd67d4e888..03760f1d5f 100644 --- a/package/python-typepy/python-typepy.mk +++ b/package/python-typepy/python-typepy.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TYPEPY_VERSION = 1.3.2 +PYTHON_TYPEPY_VERSION = 1.3.4 PYTHON_TYPEPY_SOURCE = typepy-$(PYTHON_TYPEPY_VERSION).tar.gz -PYTHON_TYPEPY_SITE = https://files.pythonhosted.org/packages/cc/86/9672794fb1c87a17b839666976ed4c8cb779ce05d471bed3166a39a53c4d +PYTHON_TYPEPY_SITE = https://files.pythonhosted.org/packages/79/59/4c39942077d7de285f762a91024dbda731be693591732977358f77d120fb PYTHON_TYPEPY_SETUP_TYPE = setuptools PYTHON_TYPEPY_LICENSE = MIT PYTHON_TYPEPY_LICENSE_FILES = LICENSE +PYTHON_TYPEPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-types-psutil/python-types-psutil.hash b/package/python-types-psutil/python-types-psutil.hash new file mode 100644 index 0000000000..a1d673f2b1 --- /dev/null +++ b/package/python-types-psutil/python-types-psutil.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/types-psutil/json +md5 411972eff624e78ca26706d297cde546 types_psutil-6.1.0.20241221.tar.gz +sha256 600f5a36bd5e0eb8887f0e3f3ff2cf154d90690ad8123c8a707bba4ab94d3185 types_psutil-6.1.0.20241221.tar.gz +# Locally computed sha256 checksums +sha256 295f8538c94ae5c3043301cf7cff1c852dab6a786a8ddee471e061b40d5ecabe LICENSE diff --git a/package/python-types-psutil/python-types-psutil.mk b/package/python-types-psutil/python-types-psutil.mk new file mode 100644 index 0000000000..50ae884c85 --- /dev/null +++ b/package/python-types-psutil/python-types-psutil.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-types-psutil +# +################################################################################ + +PYTHON_TYPES_PSUTIL_VERSION = 6.1.0.20241221 +PYTHON_TYPES_PSUTIL_SOURCE = types_psutil-$(PYTHON_TYPES_PSUTIL_VERSION).tar.gz +PYTHON_TYPES_PSUTIL_SITE = https://files.pythonhosted.org/packages/44/8c/5f82cd554cc5bb79d137f082e4c9f8d22e85c8c08dabee4971d422a9abdd +PYTHON_TYPES_PSUTIL_SETUP_TYPE = setuptools +PYTHON_TYPES_PSUTIL_LICENSE = Apache-2.0 +PYTHON_TYPES_PSUTIL_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) diff --git a/package/python-types-python-dateutil/python-types-python-dateutil.hash b/package/python-types-python-dateutil/python-types-python-dateutil.hash index 6143f7bb2d..321e7f56c5 100644 --- a/package/python-types-python-dateutil/python-types-python-dateutil.hash +++ b/package/python-types-python-dateutil/python-types-python-dateutil.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/types-python-dateutil/json -md5 986aa3f3706c4b38dfcd141572a4f515 types-python-dateutil-2.9.0.20241003.tar.gz -sha256 58cb85449b2a56d6684e41aeefb4c4280631246a0da1a719bdbe6f3fb0317446 types-python-dateutil-2.9.0.20241003.tar.gz +md5 75621f393711ce76bb7a7e46902384db types_python_dateutil-2.9.0.20241206.tar.gz +sha256 18f493414c26ffba692a72369fea7a154c502646301ebfe3d56a04b3767284cb types_python_dateutil-2.9.0.20241206.tar.gz +# Locally computed sha256 checksums +sha256 295f8538c94ae5c3043301cf7cff1c852dab6a786a8ddee471e061b40d5ecabe LICENSE diff --git a/package/python-types-python-dateutil/python-types-python-dateutil.mk b/package/python-types-python-dateutil/python-types-python-dateutil.mk index 53d16de74c..f07e327b86 100644 --- a/package/python-types-python-dateutil/python-types-python-dateutil.mk +++ b/package/python-types-python-dateutil/python-types-python-dateutil.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TYPES_PYTHON_DATEUTIL_VERSION = 2.9.0.20241003 -PYTHON_TYPES_PYTHON_DATEUTIL_SOURCE = types-python-dateutil-$(PYTHON_TYPES_PYTHON_DATEUTIL_VERSION).tar.gz -PYTHON_TYPES_PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/31/f8/f6ee4c803a7beccffee21bb29a71573b39f7037c224843eff53e5308c16e +PYTHON_TYPES_PYTHON_DATEUTIL_VERSION = 2.9.0.20241206 +PYTHON_TYPES_PYTHON_DATEUTIL_SOURCE = types_python_dateutil-$(PYTHON_TYPES_PYTHON_DATEUTIL_VERSION).tar.gz +PYTHON_TYPES_PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/a9/60/47d92293d9bc521cd2301e423a358abfac0ad409b3a1606d8fbae1321961 PYTHON_TYPES_PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_TYPES_PYTHON_DATEUTIL_LICENSE = Apache-2.0 +PYTHON_TYPES_PYTHON_DATEUTIL_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-types-setuptools/python-types-setuptools.hash b/package/python-types-setuptools/python-types-setuptools.hash new file mode 100644 index 0000000000..de273aa77e --- /dev/null +++ b/package/python-types-setuptools/python-types-setuptools.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/types-setuptools/json +md5 8df05b03cbdda63e797f38543483138e types_setuptools-75.6.0.20241223.tar.gz +sha256 d9478a985057ed48a994c707f548e55aababa85fe1c9b212f43ab5a1fffd3211 types_setuptools-75.6.0.20241223.tar.gz +# Locally computed sha256 checksums +sha256 295f8538c94ae5c3043301cf7cff1c852dab6a786a8ddee471e061b40d5ecabe LICENSE diff --git a/package/python-types-setuptools/python-types-setuptools.mk b/package/python-types-setuptools/python-types-setuptools.mk new file mode 100644 index 0000000000..4c7df27139 --- /dev/null +++ b/package/python-types-setuptools/python-types-setuptools.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-types-setuptools +# +################################################################################ + +PYTHON_TYPES_SETUPTOOLS_VERSION = 75.6.0.20241223 +PYTHON_TYPES_SETUPTOOLS_SOURCE = types_setuptools-$(PYTHON_TYPES_SETUPTOOLS_VERSION).tar.gz +PYTHON_TYPES_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/53/48/a89068ef20e3bbb559457faf0fd3c18df6df5df73b4b48ebf466974e1f54 +PYTHON_TYPES_SETUPTOOLS_SETUP_TYPE = setuptools +PYTHON_TYPES_SETUPTOOLS_LICENSE = Apache-2.0 +PYTHON_TYPES_SETUPTOOLS_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) diff --git a/package/python-typing-extensions/Config.in b/package/python-typing-extensions/Config.in index b59693282f..e1d46b60c0 100644 --- a/package/python-typing-extensions/Config.in +++ b/package/python-typing-extensions/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS bool "python-typing-extensions" help - Backported and Experimental Type Hints for Python 3.5+. + Backported and experimental type hints for Python. - https://github.com/python/typing/blob/master/typing_extensions/README.rst + https://github.com/python/typing_extensions diff --git a/package/python-typing-extensions/python-typing-extensions.hash b/package/python-typing-extensions/python-typing-extensions.hash index 8e2c405929..c86b6716a8 100644 --- a/package/python-typing-extensions/python-typing-extensions.hash +++ b/package/python-typing-extensions/python-typing-extensions.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing-extensions/json -md5 cf64c2313f5fa5eb04c1deb3fc93abe9 typing_extensions-4.12.2.tar.gz -sha256 1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8 typing_extensions-4.12.2.tar.gz +md5 079e529d0b271647f3ec2720aee8fc65 typing_extensions-4.15.0.tar.gz +sha256 0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 typing_extensions-4.15.0.tar.gz # Locally computed sha256 checksums sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 66f8872bf5..d181b973a5 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_EXTENSIONS_VERSION = 4.12.2 +PYTHON_TYPING_EXTENSIONS_VERSION = 4.15.0 PYTHON_TYPING_EXTENSIONS_SOURCE = typing_extensions-$(PYTHON_TYPING_EXTENSIONS_VERSION).tar.gz -PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557 +PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = flit PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE diff --git a/package/python-typing-inspection/Config.in b/package/python-typing-inspection/Config.in new file mode 100644 index 0000000000..bedfb21fbc --- /dev/null +++ b/package/python-typing-inspection/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TYPING_INSPECTION + bool "python-typing-inspection" + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + Runtime typing introspection tools. + + https://github.com/pydantic/typing-inspection diff --git a/package/python-typing-inspection/python-typing-inspection.hash b/package/python-typing-inspection/python-typing-inspection.hash new file mode 100644 index 0000000000..71ee5943a8 --- /dev/null +++ b/package/python-typing-inspection/python-typing-inspection.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/typing-inspection/json +md5 9271faadd8476a3600e9cf9d428d812c typing_inspection-0.4.2.tar.gz +sha256 ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464 typing_inspection-0.4.2.tar.gz +# Locally computed sha256 checksums +sha256 804b59b25f2c31bd278f9202a19ae49a3945aa2664387e2d0a128c7cacc61ec3 LICENSE diff --git a/package/python-typing-inspection/python-typing-inspection.mk b/package/python-typing-inspection/python-typing-inspection.mk new file mode 100644 index 0000000000..c0af54056d --- /dev/null +++ b/package/python-typing-inspection/python-typing-inspection.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-typing-inspection +# +################################################################################ + +PYTHON_TYPING_INSPECTION_VERSION = 0.4.2 +PYTHON_TYPING_INSPECTION_SOURCE = typing_inspection-$(PYTHON_TYPING_INSPECTION_VERSION).tar.gz +PYTHON_TYPING_INSPECTION_SITE = https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655 +PYTHON_TYPING_INSPECTION_SETUP_TYPE = hatch +PYTHON_TYPING_INSPECTION_LICENSE = MIT +PYTHON_TYPING_INSPECTION_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-tzlocal/Config.in b/package/python-tzlocal/Config.in new file mode 100644 index 0000000000..6a2959325e --- /dev/null +++ b/package/python-tzlocal/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_PYTHON_TZLOCAL + bool "python-tzlocal" + help + A Python module that tries to figure out what your + local timezone is. diff --git a/package/python-tzlocal/python-tzlocal.hash b/package/python-tzlocal/python-tzlocal.hash new file mode 100644 index 0000000000..838e6ded21 --- /dev/null +++ b/package/python-tzlocal/python-tzlocal.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tzlocal/json +md5 f8eb4bf0eb262ba422741d032d6cfedf tzlocal-5.3.1.tar.gz +sha256 cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd tzlocal-5.3.1.tar.gz +# Locally computed sha256 checksums +sha256 d99ab209aeb16aad2c25c90ffd83c1a981e290ffff76a420a2ab03e03f041b8c LICENSE.txt diff --git a/package/python-tzlocal/python-tzlocal.mk b/package/python-tzlocal/python-tzlocal.mk new file mode 100644 index 0000000000..2c1e5ff87a --- /dev/null +++ b/package/python-tzlocal/python-tzlocal.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tzlocal +# +################################################################################ + +PYTHON_TZLOCAL_VERSION = 5.3.1 +PYTHON_TZLOCAL_SOURCE = tzlocal-$(PYTHON_TZLOCAL_VERSION).tar.gz +PYTHON_TZLOCAL_SITE = https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5 +PYTHON_TZLOCAL_SETUP_TYPE = setuptools +PYTHON_TZLOCAL_LICENSE = MIT +PYTHON_TZLOCAL_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 7f4a7505a9..76fe4e5fc9 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 d65de4f0effae2b52669246f0aab0a91 urllib3-2.2.3.tar.gz -sha256 e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9 urllib3-2.2.3.tar.gz +md5 838e0ffee00ec870a3ba6727a7832ab8 urllib3-2.6.2.tar.gz +sha256 016f9c98bb7e98085cb2b4b17b87d2c702975664e4f060c6532e64d1c1a5e797 urllib3-2.6.2.tar.gz # Locally computed sha256 checksums sha256 130e3a64d5fdd5d096a752694634a7d9df284469de86e5732100268041e3d686 LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index fdd75317d4..d57473566b 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 2.2.3 +PYTHON_URLLIB3_VERSION = 2.6.2 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ed/63/22ba4ebfe7430b76388e7cd448d5478814d3032121827c12a2cc287e2260 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/1e/24/a2a2ed9addd907787d7aa0355ba36a6cadf1768b934c652ea78acbd59dcd PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python diff --git a/package/python-urwid/python-urwid.hash b/package/python-urwid/python-urwid.hash index 871cafccd4..1612070c3f 100644 --- a/package/python-urwid/python-urwid.hash +++ b/package/python-urwid/python-urwid.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urwid/json -md5 214f9cea321ccae131cecfaef2a4aa9a urwid-2.6.16.tar.gz -sha256 93ad239939e44c385e64aa00027878b9e5c486d59e855ec8ab5b1e1adcdb32a2 urwid-2.6.16.tar.gz +md5 0ed7f3cf33545912b9ad0d8f2200863b urwid-3.0.3.tar.gz +sha256 300804dd568cda5aa1c5b204227bd0cfe7a62cef2d00987c5eb2e4e64294ed9b urwid-3.0.3.tar.gz # Locally computed sha256 checksums sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/python-urwid/python-urwid.mk b/package/python-urwid/python-urwid.mk index 411727660f..0ca1b79c55 100644 --- a/package/python-urwid/python-urwid.mk +++ b/package/python-urwid/python-urwid.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URWID_VERSION = 2.6.16 +PYTHON_URWID_VERSION = 3.0.3 PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz -PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/98/21/ad23c9e961b2d36d57c63686a6f86768dd945d406323fb58c84f09478530 +PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/bb/d3/09683323e2290732a39dc92ca5031d5e5ddda56f8d236f885a400535b29a PYTHON_URWID_LICENSE = LGPL-2.1+ PYTHON_URWID_LICENSE_FILES = COPYING PYTHON_URWID_SETUP_TYPE = setuptools diff --git a/package/python-uswid/python-uswid.hash b/package/python-uswid/python-uswid.hash index b6bf09c713..3385fc58a0 100644 --- a/package/python-uswid/python-uswid.hash +++ b/package/python-uswid/python-uswid.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uswid/json -md5 e43ff6d49ddcda0c95338d3271694b91 uswid-0.5.0.tar.gz -sha256 bdcd7ee5afac1da60ee688c357aa12f5f8d74bc28012446b10e2b4a9cf52fc6d uswid-0.5.0.tar.gz +md5 3d4295821faf35512528381716126c03 uswid-0.5.2.tar.gz +sha256 1d6c53acf160edc9b42e4ba535343b3567f2f341d289b9e63ca6a84372c2c518 uswid-0.5.2.tar.gz # Locally computed sha256 checksums sha256 98bc07f3fb70d05b01ff740e8191b9f29c080159f01588991fbd872c611236f9 LICENSE diff --git a/package/python-uswid/python-uswid.mk b/package/python-uswid/python-uswid.mk index 2092a06f52..8596307938 100644 --- a/package/python-uswid/python-uswid.mk +++ b/package/python-uswid/python-uswid.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_USWID_VERSION = 0.5.0 +PYTHON_USWID_VERSION = 0.5.2 PYTHON_USWID_SOURCE = uswid-$(PYTHON_USWID_VERSION).tar.gz -PYTHON_USWID_SITE = https://files.pythonhosted.org/packages/dc/bf/05291df12037befeacda2083c798e98691043978e07ca4a00b4eb94aeb61 +PYTHON_USWID_SITE = https://files.pythonhosted.org/packages/15/64/d200424bf8f87ef25b516d438d745b03aa4ec381756d86cc3ff6bf29393c PYTHON_USWID_SETUP_TYPE = setuptools PYTHON_USWID_LICENSE = BSD-2-Clause-Patent PYTHON_USWID_LICENSE_FILES = LICENSE diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index c84f54781f..f4ac466227 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_PYTHON_UVICORN help The lightning-fast ASGI server. - https://www.uvicorn.org/ + https://uvicorn.dev/ diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index 42f29766db..dd8c2bbabe 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 ec8e5bbfecd14029c81730c0a42ed731 uvicorn-0.32.0.tar.gz -sha256 f78b36b143c16f54ccdb8190d0a26b5f1901fe5a3c777e1ab29f26391af8551e uvicorn-0.32.0.tar.gz +md5 ee4fbbe43a1e58e6624adb2763161bee uvicorn-0.38.0.tar.gz +sha256 fd97093bdd120a2609fc0d3afe931d4d4ad688b6e75f0f929fde1bc36fe0e91d uvicorn-0.38.0.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 35eb6f42c0..ba27cd8052 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.32.0 +PYTHON_UVICORN_VERSION = 0.38.0 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e0/fc/1d785078eefd6945f3e5bab5c076e4230698046231eb0f3747bc5c8fa992 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/cb/ce/f06b84e2697fef4688ca63bdb2fdf113ca0a3be33f94488f2cadb690b0cf PYTHON_UVICORN_SETUP_TYPE = hatch PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md diff --git a/package/python-uvloop/python-uvloop.hash b/package/python-uvloop/python-uvloop.hash index 24111e759b..78165c2f68 100644 --- a/package/python-uvloop/python-uvloop.hash +++ b/package/python-uvloop/python-uvloop.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/uvloop/json -md5 adedf20cf065ff49a96813b783ec1d29 uvloop-0.21.0.tar.gz -sha256 3bf12b0fda68447806a7ad847bfa591613177275d35b6724b1ee573faa3704e3 uvloop-0.21.0.tar.gz +md5 3fdd58ac1b7c2a520ed05e3151a64515 uvloop-0.22.1.tar.gz +sha256 6c84bae345b9147082b17371e3dd5d42775bddce91f885499017f4607fdaf39f uvloop-0.22.1.tar.gz # Locally computed sha256 checksums sha256 377025287798f9dcd819e1f826fa5fc5e2f382528691ab0528c5cf8c8c282c27 LICENSE-APACHE sha256 6dd4c399f26de043d77a2ad7e31db4cb5bf08ea8368b0a42d6e158635cc8ab62 LICENSE-MIT diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index fbdf74769e..419ee33062 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.21.0 +PYTHON_UVLOOP_VERSION = 0.22.1 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/af/c0/854216d09d33c543f12a44b393c402e89a920b1a0a7dc634c42de91b9cf6 +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/06/f0/18d39dbd1971d6d62c4629cc7fa67f74821b0dc1f5a77af43719de7936a7 PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash index e60f540f7d..94825df32f 100644 --- a/package/python-validators/python-validators.hash +++ b/package/python-validators/python-validators.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/validators/json -md5 8cae932ff53da1607ed2ca354a93ba54 validators-0.34.0.tar.gz -sha256 647fe407b45af9a74d245b943b18e6a816acf4926974278f6dd617778e1e781f validators-0.34.0.tar.gz +md5 8376f37ec2028053cee8f4789dadd947 validators-0.35.0.tar.gz +sha256 992d6c48a4e77c81f1b4daba10d16c3a9bb0dbb79b3a19ea847ff0928e70497a validators-0.35.0.tar.gz # Locally computed sha256 checksums -sha256 9d10adf59f4505a733162ff7de6887645dcef1fb495b8070d8b207da0f6b3a16 LICENSE.txt +sha256 43f5c5d4ed194818baae8b6e2d2d09e9630752392efaa4b3f8da673d9a1a844a LICENSE.txt diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk index 7db6d98546..3135b288ee 100644 --- a/package/python-validators/python-validators.mk +++ b/package/python-validators/python-validators.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.34.0 +PYTHON_VALIDATORS_VERSION = 0.35.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/64/07/91582d69320f6f6daaf2d8072608a4ad8884683d4840e7e4f3a9dbdcc639 +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/53/66/a435d9ae49850b2f071f7ebd8119dd4e84872b01630d6736761e6e7fd847 PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE.txt diff --git a/package/python-waitress/Config.in b/package/python-waitress/Config.in new file mode 100644 index 0000000000..7d8c73a650 --- /dev/null +++ b/package/python-waitress/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WAITRESS + bool "python-waitress" + help + Waitress WSGI server. + + Waitress is a production-quality pure-Python WSGI server + with very acceptable performance. It has no dependencies + except ones which live in the Python standard library. + It supports HTTP/1.0 and HTTP/1.1. + + https://github.com/Pylons/waitress diff --git a/package/python-waitress/python-waitress.hash b/package/python-waitress/python-waitress.hash new file mode 100644 index 0000000000..40564457dd --- /dev/null +++ b/package/python-waitress/python-waitress.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/waitress/json +md5 da30daf4544fafe0f43e1ba4a1830bf5 waitress-3.0.2.tar.gz +sha256 682aaaf2af0c44ada4abfb70ded36393f0e307f4ab9456a215ce0020baefc31f waitress-3.0.2.tar.gz +# Locally computed sha256 checksums +sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-waitress/python-waitress.mk b/package/python-waitress/python-waitress.mk new file mode 100644 index 0000000000..660f839a4d --- /dev/null +++ b/package/python-waitress/python-waitress.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-waitress +# +################################################################################ + +PYTHON_WAITRESS_VERSION = 3.0.2 +PYTHON_WAITRESS_SOURCE = waitress-$(PYTHON_WAITRESS_VERSION).tar.gz +PYTHON_WAITRESS_SITE = https://files.pythonhosted.org/packages/bf/cb/04ddb054f45faa306a230769e868c28b8065ea196891f09004ebace5b184 +PYTHON_WAITRESS_SETUP_TYPE = setuptools +PYTHON_WAITRESS_LICENSE = ZPL-2.1 +PYTHON_WAITRESS_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-wcwidth/python-wcwidth.hash b/package/python-wcwidth/python-wcwidth.hash index 7883ef44de..8c43b3729c 100644 --- a/package/python-wcwidth/python-wcwidth.hash +++ b/package/python-wcwidth/python-wcwidth.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wcwidth/json -md5 5ce8dd9e6993dae268142feb1e605cd8 wcwidth-0.2.13.tar.gz -sha256 72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5 wcwidth-0.2.13.tar.gz +md5 c179ab1aff6e3b48ac9617cf19f580d4 wcwidth-0.2.14.tar.gz +sha256 4d478375d31bc5395a3c55c40ccdf3354688364cd61c4f6adacaa9215d0b3605 wcwidth-0.2.14.tar.gz # Locally computed sha256 checksums sha256 70b98a95a2144eb70af8017fa8c6d95ce247e40867436e8bc649e137fe13d21a LICENSE diff --git a/package/python-wcwidth/python-wcwidth.mk b/package/python-wcwidth/python-wcwidth.mk index 75199974fa..15b5f495e8 100644 --- a/package/python-wcwidth/python-wcwidth.mk +++ b/package/python-wcwidth/python-wcwidth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WCWIDTH_VERSION = 0.2.13 +PYTHON_WCWIDTH_VERSION = 0.2.14 PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://files.pythonhosted.org/packages/6c/63/53559446a878410fc5a5974feb13d31d78d752eb18aeba59c7fef1af7598 +PYTHON_WCWIDTH_SITE = https://files.pythonhosted.org/packages/24/30/6b0809f4510673dc723187aeaf24c7f5459922d01e2f794277a3dfb90345 PYTHON_WCWIDTH_SETUP_TYPE = setuptools PYTHON_WCWIDTH_LICENSE = MIT PYTHON_WCWIDTH_LICENSE_FILES = LICENSE diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 3e27405846..9c51ad95a3 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 3c9e76bdee0db8aaef391d658cbdcb7c weasyprint-63.0.tar.gz -sha256 ec24c64fdcc63e4168b2c24eb89b1ee8a711281a7d7fdb3eed3f54995489c9d1 weasyprint-63.0.tar.gz +md5 9e87ec00619aad446c51f679117be676 weasyprint-64.0.tar.gz +sha256 1ceb3ea6306db4a3d06df0eafae3a5a6e879c35c40091aa8ceb5bcb143e80b29 weasyprint-64.0.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 2619351cde..7edb9f28da 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 63.0 +PYTHON_WEASYPRINT_VERSION = 64.0 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/78/57/213cd566b7e14130d62babd91c5c5c2b94cbdbcdc0c7a0936a236bc88db0 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/e3/04/c73f99531bce81d4ced5cd18a159855de261f83843a5633acd67ae327933 PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index e4308634a0..0c141d9fc5 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -17,7 +17,6 @@ if BR2_PACKAGE_PYTHON_WEB2PY config BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN bool "install admin panel application" default y - select BR2_PACKAGE_HOST_PYTHON3 # web2py will use pydal to generate the password (below), and that # uses hashlib.pbkdf2_hmac(), which is only available when python # is built with openssl since 3.12 (previously, there was a slow diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index ce3896a1ad..098f8dc490 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 2221840e4ef2c1e3810017921b2a72f2d5d1f888ca1f771cf7263bfead60570c python-web2py-2.27.1.tar.gz -sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE +sha256 12669396396044f68a3f0ae9c44137f1a3b327c26e963f52b5e8b2bb20c51561 python-web2py-v3.0.11-git4.tar.gz +sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE.web2py.txt diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index ed10333f53..9e1de5c932 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,10 +4,12 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.27.1 -PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) +PYTHON_WEB2PY_VERSION = v3.0.11 +PYTHON_WEB2PY_SITE = https://github.com/web2py/web2py.git +PYTHON_WEB2PY_SITE_METHOD = git +PYTHON_WEB2PY_GIT_SUBMODULES = YES PYTHON_WEB2PY_LICENSE = LGPL-3.0 -PYTHON_WEB2PY_LICENSE_FILES = LICENSE +PYTHON_WEB2PY_LICENSE_FILES = LICENSE.web2py.txt PYTHON_WEB2PY_CPE_ID_VENDOR = web2py PYTHON_WEB2PY_CPE_ID_PRODUCT = web2py PYTHON_WEB2PY_DEPENDENCIES = host-python3 python3 \ diff --git a/package/python-webpy/0001-Address-CVE-2025-3818.patch b/package/python-webpy/0001-Address-CVE-2025-3818.patch new file mode 100644 index 0000000000..d8373cbac6 --- /dev/null +++ b/package/python-webpy/0001-Address-CVE-2025-3818.patch @@ -0,0 +1,42 @@ +From 3ba1b40e5a828a26a1df1b49cdc87395f3274c81 Mon Sep 17 00:00:00 2001 +From: Mek +Date: Wed, 7 May 2025 15:14:44 -0400 +Subject: [PATCH] Address CVE-2025-3818 (#807) + +* Address CVE-2025-3818 + +Co-authored-by: Scott Barnes + +Upstream: https://github.com/webpy/webpy/commit/3ba1b40e5a828a26a1df1b49cdc87395f3274c81 + +Fixes CVE-2025-3818: https://github.com/advisories/GHSA-9g47-36rw-gjh2 + +Signed-off-by: Bernd Kuhls +--- + web/db.py | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/web/db.py b/web/db.py +index 5284f8d0..ba3e12c5 100644 +--- a/web/db.py ++++ b/web/db.py +@@ -1198,10 +1198,18 @@ def _process_insert_query(self, query, tablename, seqname): + seqname = None + + if seqname: +- query += "; SELECT currval('%s')" % seqname ++ query += self.get_sequence_query(seqname) + + return query + ++ def get_sequence_query(self, seqname): ++ import re ++ # Ensure the sequence name is valid ++ if not re.match(r'^[a-zA-Z_][a-zA-Z0-9_$]*$', seqname): ++ raise ValueError(f"Invalid sequence name: {seqname}") ++ return SQLQuery("; SELECT currval(%s)", seqname) ++ ++ + def _get_all_sequences(self): + """Query postgres to find names of all sequences used in this database.""" + if self._sequences is None: diff --git a/package/python-webpy/python-webpy.hash b/package/python-webpy/python-webpy.hash index 540771a244..0fb39170c7 100644 --- a/package/python-webpy/python-webpy.hash +++ b/package/python-webpy/python-webpy.hash @@ -1,3 +1,2 @@ -# md5, sha256 from https://pypi.org/pypi/web.py/json -md5 cd2c0296ceffa1acb96ae5315214eb42 web.py-0.62.tar.gz -sha256 5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e web.py-0.62.tar.gz +# Locally computed +sha256 eee36e423b5e85463145159d94735e3c3a4c1c8078555042d8139348350b0022 python-webpy-0.70.tar.gz diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk index 06d4ae039b..62b2331c08 100644 --- a/package/python-webpy/python-webpy.mk +++ b/package/python-webpy/python-webpy.mk @@ -4,9 +4,8 @@ # ################################################################################ -PYTHON_WEBPY_VERSION = 0.62 -PYTHON_WEBPY_SOURCE = web.py-$(PYTHON_WEBPY_VERSION).tar.gz -PYTHON_WEBPY_SITE = https://files.pythonhosted.org/packages/cd/6e/338a060bb5b52ee8229bdada422eaa5f71b13f8d33467f37f870ed2cae4b +PYTHON_WEBPY_VERSION = 0.70 +PYTHON_WEBPY_SITE = $(call github,webpy,webpy,webpy-$(PYTHON_WEBPY_VERSION)) PYTHON_WEBPY_SETUP_TYPE = setuptools PYTHON_WEBPY_LICENSE = Public Domain diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 373906c3dc..a966a7e441 100644 --- a/package/python-websocket-client/python-websocket-client.hash +++ b/package/python-websocket-client/python-websocket-client.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websocket-client/json -md5 9cffbda9eefb0a17e9c4cda3b7884493 websocket_client-1.8.0.tar.gz -sha256 3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da websocket_client-1.8.0.tar.gz +md5 3e6fd932858e9123d6ef5161e9ce7c46 websocket_client-1.9.0.tar.gz +sha256 9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98 websocket_client-1.9.0.tar.gz # Locally computed sha256 checksums -sha256 453e6a69427ed9ff92a03ef2d7b21ef1db41fdf56d62307a49ba85059f7a0c62 LICENSE +sha256 d7ad8d0966aa363d45c7b16b0838cadcd51676acdf215ad967307d581b47872c LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index ce582e89b7..f735782cf8 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 1.8.0 +PYTHON_WEBSOCKET_CLIENT_VERSION = 1.9.0 PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/e6/30/fba0d96b4b5fbf5948ed3f4681f7da2f9f64512e1d303f94b4cc174c24a5 +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools PYTHON_WEBSOCKET_CLIENT_LICENSE = Apache-2.0 PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 5d24d5f6c4..13659d2634 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 ff1293b549e8177a5272e54208659d0d websockets-13.1.tar.gz -sha256 a3b3366087c1bc0a2795111edcadddb8b3b59509d5db5d7ea3fdd69f954a8878 websockets-13.1.tar.gz +md5 08f8a430c20d75ffe44faafb95f6f7cc websockets-15.0.1.tar.gz +sha256 82544de02076bafba038ce055ee6412d68da13ab47f0c60cab827346de828dee websockets-15.0.1.tar.gz # Locally computed sha256 checksums sha256 3d6a0c050d8bec52fabad502e45fb25bd02bcadbd70dea34d447b6a0ff4e6da8 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 6fbdf983e9..cdac2485ab 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 13.1 +PYTHON_WEBSOCKETS_VERSION = 15.0.1 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/e2/73/9223dbc7be3dcaf2a7bbf756c351ec8da04b1fa573edaf545b95f6b0c7fd +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/21/e6/26d09fab466b7ca9c7737474c52be4f76a40301b08362eb2dbc19dcc16c1 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/package/python-wheel/python-wheel.hash b/package/python-wheel/python-wheel.hash index 35bee60b72..40836a5d1c 100644 --- a/package/python-wheel/python-wheel.hash +++ b/package/python-wheel/python-wheel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wheel/json -md5 3d1f79ff04a1252fa709dec58aa7249b wheel-0.45.0.tar.gz -sha256 a57353941a3183b3d5365346b567a260a0602a0f8a635926a7dede41b94c674a wheel-0.45.0.tar.gz +md5 dddc505d0573d03576c7c6c5a4fe0641 wheel-0.45.1.tar.gz +sha256 661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 wheel-0.45.1.tar.gz # Locally computed sha256 checksums sha256 30c23618679108f3e8ea1d2a658c7ca417bdfc891c98ef1a89fa4ff0c9828654 LICENSE.txt diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk index 21060cfc66..417db7c167 100644 --- a/package/python-wheel/python-wheel.mk +++ b/package/python-wheel/python-wheel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WHEEL_VERSION = 0.45.0 +PYTHON_WHEEL_VERSION = 0.45.1 PYTHON_WHEEL_SOURCE = wheel-$(PYTHON_WHEEL_VERSION).tar.gz -PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/e7/52/fd4516fb8f7d11a08e3f9cd69eb1558f098ab67e79f32d920c4974ee550f +PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/8a/98/2d9906746cdc6a6ef809ae6338005b3f21bb568bea3165cfc6a243fdc25c PYTHON_WHEEL_SETUP_TYPE = flit PYTHON_WHEEL_LICENSE = MIT PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt diff --git a/package/python-whitenoise/Config.in b/package/python-whitenoise/Config.in new file mode 100644 index 0000000000..47df3ad5bf --- /dev/null +++ b/package/python-whitenoise/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WHITENOISE + bool "python-whitenoise" + help + Radically simplified static file serving for WSGI + applications. + + https://github.com/evansd/whitenoise diff --git a/package/python-whitenoise/python-whitenoise.hash b/package/python-whitenoise/python-whitenoise.hash new file mode 100644 index 0000000000..1659961825 --- /dev/null +++ b/package/python-whitenoise/python-whitenoise.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/whitenoise/json +md5 212cafd7f8d972a5d6740bfc88b3f17b whitenoise-6.11.0.tar.gz +sha256 0f5bfce6061ae6611cd9396a8231e088722e4fc67bc13a111be74c738d99375f whitenoise-6.11.0.tar.gz +# Locally computed sha256 checksums +sha256 ebfd469b4fb6b5adada547747e1e8da725ecf20595d54aced043275d4f4a3600 LICENSE diff --git a/package/python-whitenoise/python-whitenoise.mk b/package/python-whitenoise/python-whitenoise.mk new file mode 100644 index 0000000000..91f3b6d2d7 --- /dev/null +++ b/package/python-whitenoise/python-whitenoise.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-whitenoise +# +################################################################################ + +PYTHON_WHITENOISE_VERSION = 6.11.0 +PYTHON_WHITENOISE_SOURCE = whitenoise-$(PYTHON_WHITENOISE_VERSION).tar.gz +PYTHON_WHITENOISE_SITE = https://files.pythonhosted.org/packages/15/95/8c81ec6b6ebcbf8aca2de7603070ccf37dbb873b03f20708e0f7c1664bc6 +PYTHON_WHITENOISE_SETUP_TYPE = setuptools +PYTHON_WHITENOISE_LICENSE = MIT +PYTHON_WHITENOISE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-wrapt/python-wrapt.hash b/package/python-wrapt/python-wrapt.hash index b89c805bf6..69a464ff49 100644 --- a/package/python-wrapt/python-wrapt.hash +++ b/package/python-wrapt/python-wrapt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wrapt/json -md5 3e370b4bc08f7dcc518cf8895673b19c wrapt-1.16.0.tar.gz -sha256 5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d wrapt-1.16.0.tar.gz +md5 bdc6d3460db4cdee3383dfe318b5c317 wrapt-2.0.0.tar.gz +sha256 35a542cc7a962331d0279735c30995b024e852cf40481e384fd63caaa391cbb9 wrapt-2.0.0.tar.gz # Locally computed sha256 checksums -sha256 5974efbbc8b626b2050810d63c3a907ee21c92bf64b3740fc623ad05eb3448ab LICENSE +sha256 9abc41aa6b8690c07ede9b44b7c6233d014290ed1e3b5ccc37e292295b5d058f LICENSE diff --git a/package/python-wrapt/python-wrapt.mk b/package/python-wrapt/python-wrapt.mk index ed4a911e14..8fff0cf3fa 100644 --- a/package/python-wrapt/python-wrapt.mk +++ b/package/python-wrapt/python-wrapt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WRAPT_VERSION = 1.16.0 +PYTHON_WRAPT_VERSION = 2.0.0 PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/95/4c/063a912e20bcef7124e0df97282a8af3ff3e4b603ce84c481d6d7346be0a +PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/49/19/5e5bcd855d808892fe02d49219f97a50f64cd6d8313d75df3494ee97b1a3 PYTHON_WRAPT_SETUP_TYPE = setuptools PYTHON_WRAPT_LICENSE = BSD-2-Clause PYTHON_WRAPT_LICENSE_FILES = LICENSE diff --git a/package/python-ws4py/python-ws4py.hash b/package/python-ws4py/python-ws4py.hash index 1e809fee0a..fc14748b8d 100644 --- a/package/python-ws4py/python-ws4py.hash +++ b/package/python-ws4py/python-ws4py.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ws4py/json -md5 68e0cfae9659dd059ff7e7a8218af548 ws4py-0.5.1.tar.gz -sha256 29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483 ws4py-0.5.1.tar.gz +md5 373750c014b6a5e225aad4cf5b0a5721 ws4py-0.6.0.tar.gz +sha256 9f87b19b773f0a0744a38f3afa36a803286dd3197f0bb35d9b75293ec7002d19 ws4py-0.6.0.tar.gz # Locally computed sha256 checksums sha256 3c98d9e820de01b1ae3be846419700ab9cefa22b09aa0ef441b3bfd5613c3ba1 LICENSE diff --git a/package/python-ws4py/python-ws4py.mk b/package/python-ws4py/python-ws4py.mk index edfd5d0df1..c76c636d8b 100644 --- a/package/python-ws4py/python-ws4py.mk +++ b/package/python-ws4py/python-ws4py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WS4PY_VERSION = 0.5.1 +PYTHON_WS4PY_VERSION = 0.6.0 PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz -PYTHON_WS4PY_SITE = https://files.pythonhosted.org/packages/53/20/4019a739b2eefe9282d3822ef6a225250af964b117356971bd55e274193c +PYTHON_WS4PY_SITE = https://files.pythonhosted.org/packages/cb/55/dd8a5e1f975d1549494fe8692fc272602f17e475fe70de910cdd53aec902 PYTHON_WS4PY_SETUP_TYPE = setuptools PYTHON_WS4PY_LICENSE = BSD-3-Clause PYTHON_WS4PY_LICENSE_FILES = LICENSE diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 859fd19532..92c3dee1d3 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xlsxwriter/json -md5 86f1c46dc20ca2b87aacbb2e1fc9c1ea XlsxWriter-3.2.0.tar.gz -sha256 9977d0c661a72866a61f9f7a809e25ebbb0fb7036baa3b9fe74afcfca6b3cb8c XlsxWriter-3.2.0.tar.gz +md5 9b577c64f83dec8e357dab62be575e5a xlsxwriter-3.2.9.tar.gz +sha256 254b1c37a368c444eac6e2f867405cc9e461b0ed97a3233b2ac1e574efb4140c xlsxwriter-3.2.9.tar.gz # Locally computed sha256 checksums -sha256 272e8fbd91096feeea0a250775ed83dfed17143ee4acd5d9567a1e42104c038f LICENSE.txt +sha256 cf08b60a4ded986b58a617cb8304373bda5c4eff42fb4e30d7597b616e116e87 LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index eb8c692e06..e6a8fe4adf 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.2.0 -PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/a6/c3/b36fa44a0610a0f65d2e65ba6a262cbe2554b819f1449731971f7c16ea3c +PYTHON_XLSXWRITER_VERSION = 3.2.9 +PYTHON_XLSXWRITER_SOURCE = xlsxwriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/46/2c/c06ef49dc36e7954e55b802a8b231770d286a9758b3d936bd1e04ce5ba88 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-xmltodict/python-xmltodict.hash b/package/python-xmltodict/python-xmltodict.hash index 9bd8ec6878..a61b1aabf1 100644 --- a/package/python-xmltodict/python-xmltodict.hash +++ b/package/python-xmltodict/python-xmltodict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xmltodict/json -md5 6e0d94bf858b3c2ff3daeed487eedc2a xmltodict-0.14.2.tar.gz -sha256 201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553 xmltodict-0.14.2.tar.gz +md5 82d8cb5a934a057e6a8a3449b1d87cce xmltodict-1.0.2.tar.gz +sha256 54306780b7c2175a3967cad1db92f218207e5bc1aba697d887807c0fb68b7649 xmltodict-1.0.2.tar.gz # Locally computed sha256 checksums sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE diff --git a/package/python-xmltodict/python-xmltodict.mk b/package/python-xmltodict/python-xmltodict.mk index 1a041e05d4..fe320dd799 100644 --- a/package/python-xmltodict/python-xmltodict.mk +++ b/package/python-xmltodict/python-xmltodict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XMLTODICT_VERSION = 0.14.2 +PYTHON_XMLTODICT_VERSION = 1.0.2 PYTHON_XMLTODICT_SOURCE = xmltodict-$(PYTHON_XMLTODICT_VERSION).tar.gz -PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/50/05/51dcca9a9bf5e1bce52582683ce50980bcadbc4fa5143b9f2b19ab99958f +PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/6a/aa/917ceeed4dbb80d2f04dbd0c784b7ee7bba8ae5a54837ef0e5e062cd3cfb PYTHON_XMLTODICT_SETUP_TYPE = setuptools PYTHON_XMLTODICT_LICENSE = MIT PYTHON_XMLTODICT_LICENSE_FILES = LICENSE diff --git a/package/python-xmodem/python-xmodem.mk b/package/python-xmodem/python-xmodem.mk index d7040f7245..1ef5f53bec 100644 --- a/package/python-xmodem/python-xmodem.mk +++ b/package/python-xmodem/python-xmodem.mk @@ -12,3 +12,4 @@ PYTHON_XMODEM_LICENSE = MIT PYTHON_XMODEM_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-yamllint/python-yamllint.hash b/package/python-yamllint/python-yamllint.hash index d80e0fdf42..3287d4f2b2 100644 --- a/package/python-yamllint/python-yamllint.hash +++ b/package/python-yamllint/python-yamllint.hash @@ -1,3 +1,3 @@ # Locally computed sha256 checksums -sha256 7a003809f88324fd2c877734f2d575ee7881dd9043360657cc8049c809eba6cd yamllint-1.35.1.tar.gz +sha256 81f7c0c5559becc8049470d86046b36e96113637bcbe4753ecef06977c00245d yamllint-1.37.1.tar.gz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/package/python-yamllint/python-yamllint.mk b/package/python-yamllint/python-yamllint.mk index 29344a1408..835ee2ffb2 100644 --- a/package/python-yamllint/python-yamllint.mk +++ b/package/python-yamllint/python-yamllint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YAMLLINT_VERSION = 1.35.1 +PYTHON_YAMLLINT_VERSION = 1.37.1 PYTHON_YAMLLINT_SOURCE = yamllint-$(PYTHON_YAMLLINT_VERSION).tar.gz -PYTHON_YAMLLINT_SITE = https://files.pythonhosted.org/packages/da/06/d8cee5c3dfd550cc0a466ead8b321138198485d1034130ac1393cc49d63e +PYTHON_YAMLLINT_SITE = https://files.pythonhosted.org/packages/46/f2/cd8b7584a48ee83f0bc94f8a32fea38734cefcdc6f7324c4d3bfc699457b PYTHON_YAMLLINT_SETUP_TYPE = setuptools PYTHON_YAMLLINT_LICENSE = GPL-3.0 PYTHON_YAMLLINT_LICENSE_FILES = LICENSE diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index 3918383548..43ba31f81f 100644 --- a/package/python-yarl/python-yarl.hash +++ b/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 d356afad18b20095b766ad47bedcb34a yarl-1.17.1.tar.gz -sha256 067a63fcfda82da6b198fa73079b1ca40b7c9b7994995b6ee38acda728b64d47 yarl-1.17.1.tar.gz +md5 23352fbc2b165825d4a33682c91788bc yarl-1.20.1.tar.gz +sha256 d017a4997ee50c91fd5466cef416231bb82177b93b029906cefc542ce14c35ac yarl-1.20.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index c7d846521f..4f25394c8b 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.17.1 +PYTHON_YARL_VERSION = 1.20.1 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/54/9c/9c0a9bfa683fc1be7fdcd9687635151544d992cccd48892dc5e0a5885a29 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/3c/fb/efaa23fa4e45537b827620f04cf8f3cd658b76642205162e072703a5b963 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools diff --git a/package/python-zeroconf/python-zeroconf.hash b/package/python-zeroconf/python-zeroconf.hash index a40bbacb5e..cf49e6f21e 100644 --- a/package/python-zeroconf/python-zeroconf.hash +++ b/package/python-zeroconf/python-zeroconf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zeroconf/json -md5 f72c481e45177fa6811822d65881b95c zeroconf-0.136.0.tar.gz -sha256 7a82c7bd0327266ef9f04a5272b0bb79812ddcefccf944320b5f3519586bbc82 zeroconf-0.136.0.tar.gz +md5 13003da434beff520db50460d8d603bd zeroconf-0.141.0.tar.gz +sha256 c0c41cfe1331cf885f132dd2400e4091f59ae0a571cae14f3db66919a055489b zeroconf-0.141.0.tar.gz # Locally computed sha256 checksums sha256 4d1d974999ae8655ee47afb47ac3b327cd1baeea3509aecb35341ba1a1a53c94 COPYING diff --git a/package/python-zeroconf/python-zeroconf.mk b/package/python-zeroconf/python-zeroconf.mk index 973339b418..7f14651b86 100644 --- a/package/python-zeroconf/python-zeroconf.mk +++ b/package/python-zeroconf/python-zeroconf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZEROCONF_VERSION = 0.136.0 +PYTHON_ZEROCONF_VERSION = 0.141.0 PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/82/e4/17075a9f1951b031dfd92d57916505574e0d1eab3f2fb7deecabd2be581e +PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/d1/36/78f2cc563958d55b079c977ad2d4ae5d8b182f2dab9f1224d89c9b1311d3 PYTHON_ZEROCONF_SETUP_TYPE = poetry PYTHON_ZEROCONF_LICENSE = LGPL-2.1+ PYTHON_ZEROCONF_LICENSE_FILES = COPYING diff --git a/package/python-zipstream-ng/python-zipstream-ng.hash b/package/python-zipstream-ng/python-zipstream-ng.hash index 6feb23834d..4360cd07b3 100644 --- a/package/python-zipstream-ng/python-zipstream-ng.hash +++ b/package/python-zipstream-ng/python-zipstream-ng.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zipstream-ng/json -md5 f30b8347aaceee3f4ddc01bda851790a zipstream_ng-1.8.0.tar.gz -sha256 b7129d2c15d26934b3e1cb22256593b6bdbd03c553c26f4199a5bf05110642bc zipstream_ng-1.8.0.tar.gz +md5 eb08f32b64b28005d5d3846cf49aabd3 zipstream_ng-1.9.0.tar.gz +sha256 a0d94030822d137efbf80dfdc680603c42f804696f41147bb3db895df667daea zipstream_ng-1.9.0.tar.gz # Locally computed sha256 checksums sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 LICENSE diff --git a/package/python-zipstream-ng/python-zipstream-ng.mk b/package/python-zipstream-ng/python-zipstream-ng.mk index 289e03b10a..35e03d041b 100644 --- a/package/python-zipstream-ng/python-zipstream-ng.mk +++ b/package/python-zipstream-ng/python-zipstream-ng.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZIPSTREAM_NG_VERSION = 1.8.0 +PYTHON_ZIPSTREAM_NG_VERSION = 1.9.0 PYTHON_ZIPSTREAM_NG_SOURCE = zipstream_ng-$(PYTHON_ZIPSTREAM_NG_VERSION).tar.gz -PYTHON_ZIPSTREAM_NG_SITE = https://files.pythonhosted.org/packages/ac/16/5d9224baf640214255c34a0a0e9528c8403d2b89e2ba7df9d7cada58beb1 +PYTHON_ZIPSTREAM_NG_SITE = https://files.pythonhosted.org/packages/11/f2/690a35762cf8366ce6f3b644805de970bd6a897ca44ce74184c7b2bc94e7 PYTHON_ZIPSTREAM_NG_SETUP_TYPE = setuptools PYTHON_ZIPSTREAM_NG_LICENSE = LGPL-3.0 PYTHON_ZIPSTREAM_NG_LICENSE_FILES = LICENSE diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index a580b5dff7..480d572355 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zope-interface/json -md5 38f56d8efc8eda2cc40c206d7fd2a016 zope.interface-7.1.1.tar.gz -sha256 4284d664ef0ff7b709836d4de7b13d80873dc5faeffc073abdb280058bfac5e3 zope.interface-7.1.1.tar.gz +md5 dd3e8e7b18c0845f9590a13b2ef66a46 zope_interface-8.0.1.tar.gz +sha256 eba5610d042c3704a48222f7f7c6ab5b243ed26f917e2bc69379456b115e02d1 zope_interface-8.0.1.tar.gz # Locally computed sha256 checksums sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index b2e3b8a561..e6425ecc4b 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 7.1.1 -PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/3c/f5/1079cab32302359cc09bd1dca9656e680601e0e8af9397322ab0fe85f368 +PYTHON_ZOPE_INTERFACE_VERSION = 8.0.1 +PYTHON_ZOPE_INTERFACE_SOURCE = zope_interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/88/3a/7fcf02178b8fad0a51e67e32765cd039ae505d054d744d76b8c2bbcba5ba PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index b35b06216c..30ad4146c5 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 5d0f69ce7fc05adbd3c71e113c11da0aedbca33a Mon Sep 17 00:00:00 2001 +From 52bb6f2a3ef352cda16d95a588a0356da562de8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -6,41 +6,45 @@ Subject: [PATCH] Make the build of pyc files conditional This commit adds a new configure option --disable-pyc-build to disable the compilation of pyc. +Upstream: N/A + Signed-off-by: Thomas Petazzoni [ Andrey Smrinov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.12.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 2 ++ - configure.ac | 6 ++++++ - 2 files changed, 8 insertions(+) + configure.ac | 7 +++++++ + 2 files changed, 9 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4a957fb004..9c5f3c031a 100644 +index a7dc9709d62..a1d460b36f4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2329,6 +2329,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c - $(DESTDIR)$(LIBDEST); \ - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt +@@ -2570,6 +2570,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c + patch --force --reject-file "$(abs_builddir)/app-store-compliance.rej" --strip 2 --directory "$(DESTDIR)$(LIBDEST)" --input "$(abs_srcdir)/$(APP_STORE_COMPLIANCE_PATCH)" || true ; \ + fi @ # Build PYC files for the 3 optimization levels (0, 1, 2) +ifeq (@PYC_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \ -@@ -2338,6 +2339,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c +@@ -2579,6 +2580,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + + # bpo-21536: Misc/python-config.sh is generated in the build directory + # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 8a32cb58f4..611c33949a 100644 +index 597a44b331a..edac73ec5d3 100644 --- a/configure.ac +++ b/configure.ac -@@ -1479,6 +1479,12 @@ fi +@@ -1513,6 +1513,13 @@ fi AC_MSG_CHECKING([LDLIBRARY]) @@ -50,9 +54,10 @@ index 8a32cb58f4..611c33949a 100644 + AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]), + [ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ]) + - # MacOSX framework builds need more magic. LDLIBRARY is the dynamic ++ + # Apple framework builds need more magic. LDLIBRARY is the dynamic # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.34.1 +2.50.1 diff --git a/package/python3/0003-Add-an-option-to-disable-pydoc.patch b/package/python3/0002-Add-an-option-to-disable-pydoc.patch similarity index 75% rename from package/python3/0003-Add-an-option-to-disable-pydoc.patch rename to package/python3/0002-Add-an-option-to-disable-pydoc.patch index 01ce235afd..6692561971 100644 --- a/package/python3/0003-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0002-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From f910bdee70b07792c136aaced3850a08eaaafdee Mon Sep 17 00:00:00 2001 +From 8ba9dc9a12687d37454dd949409599f108f1ce44 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -6,6 +6,8 @@ Subject: [PATCH] Add an option to disable pydoc It removes 0.5 MB of data from the target plus the pydoc script itself. +Upstream: N/A + Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] @@ -14,34 +16,36 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett [ Adam Duskett: ported to Python 3.12.1 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 9 ++++++++- configure.ac | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9c5f3c031a..2243a658a9 100644 +index a1d460b36f4..81f3fd54ee4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2050,7 +2050,9 @@ bininstall: commoninstall altbininstall +@@ -2281,7 +2281,9 @@ bininstall: commoninstall altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 +ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) +endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -2102,7 +2104,6 @@ LIBSUBDIRS= asyncio \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \ + rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ +@@ -2331,7 +2333,6 @@ LIBSUBDIRS= asyncio \ logging \ multiprocessing multiprocessing/dummy \ + pathlib \ - pydoc_data \ re \ site-packages \ sqlite3 \ -@@ -2257,6 +2258,10 @@ TESTSUBDIRS= idlelib/idle_test \ +@@ -2490,6 +2491,10 @@ TESTSUBDIRS= idlelib/idle_test \ COMPILEALL_OPTS=-j0 @@ -52,9 +56,9 @@ index 9c5f3c031a..2243a658a9 100644 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall -@@ -2471,7 +2476,9 @@ libainstall: all scripts +@@ -2717,7 +2722,9 @@ libainstall: all scripts + $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config - $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) +ifeq (@PYDOC@,yes) $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) @@ -63,10 +67,10 @@ index 9c5f3c031a..2243a658a9 100644 "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ echo; echo "Installing support files for building shared extension modules on AIX:"; \ diff --git a/configure.ac b/configure.ac -index 059ac2f883..1a2dd28d1e 100644 +index edac73ec5d3..7ed4fa578f3 100644 --- a/configure.ac +++ b/configure.ac -@@ -4511,6 +4511,12 @@ AS_VAR_IF([posix_threads], [stub], [ +@@ -4749,6 +4749,12 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) @@ -80,5 +84,5 @@ index 059ac2f883..1a2dd28d1e 100644 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) -- -2.34.1 +2.50.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch deleted file mode 100644 index e774e442dc..0000000000 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3a0d7824f7ddd4dd0336c8419cb4246ba936d711 Mon Sep 17 00:00:00 2001 -From: Vanya Sergeev -Date: Wed, 23 Dec 2015 11:30:33 +0100 -Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling - with IPv6 support - -Signed-off-by: Vanya Sergeev ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 611c33949a..059ac2f883 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5428,7 +5428,7 @@ fi])) - dnl if ac_cv_func_getaddrinfo - ]) - --if test "$ac_cv_func_getaddrinfo" = no -o "$ac_cv_buggy_getaddrinfo" = yes -+if test "$ac_cv_func_getaddrinfo" = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes - then - AS_VAR_IF([ipv6], [yes], [ - AC_MSG_ERROR([m4_normalize([ --- -2.34.1 - diff --git a/package/python3/0005-Add-an-option-to-disable-IDLE.patch b/package/python3/0003-Add-an-option-to-disable-IDLE.patch similarity index 68% rename from package/python3/0005-Add-an-option-to-disable-IDLE.patch rename to package/python3/0003-Add-an-option-to-disable-IDLE.patch index e9218af1c8..afef612d30 100644 --- a/package/python3/0005-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0003-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From ffa7fbceb54918eb518474c8f821fda0a58cf181 Mon Sep 17 00:00:00 2001 +From 463c64020b288b8ddfd32a63c4a23ab7369b9669 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -6,6 +6,8 @@ Subject: [PATCH] Add an option to disable IDLE IDLE is an IDE embedded into python, written using Tk, so it doesn't make much sense to have it into our build. +Upstream: N/A + Signed-off-by: Maxime Ripard [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov @@ -13,16 +15,18 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett [ Adam Duskett: ported to Python 3.12.1 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 9 ++++++++- configure.ac | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3f314d1354..5fad7f82fb 100644 +index 81f3fd54ee4..2d067730633 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2048,7 +2048,9 @@ bininstall: commoninstall altbininstall +@@ -2279,7 +2279,9 @@ bininstall: commoninstall altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -32,7 +36,7 @@ index 3f314d1354..5fad7f82fb 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -2100,7 +2102,6 @@ LIBSUBDIRS= asyncio \ +@@ -2327,7 +2329,6 @@ LIBSUBDIRS= asyncio \ ensurepip ensurepip/_bundled \ html \ http \ @@ -40,8 +44,8 @@ index 3f314d1354..5fad7f82fb 100644 importlib importlib/resources importlib/metadata \ json \ logging \ -@@ -2267,6 +2268,10 @@ TESTSUBDIRS += test/test_lib2to3 \ - test/test_lib2to3/data/fixers/myfixes +@@ -2495,6 +2496,10 @@ ifeq (@PYDOC@,yes) + LIBSUBDIRS += pydoc_data endif +ifeq (@IDLE@,yes) @@ -51,10 +55,10 @@ index 3f314d1354..5fad7f82fb 100644 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall -@@ -2484,7 +2489,9 @@ libainstall: all scripts - ifeq (@LIB2TO3@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) - endif +@@ -2721,7 +2726,9 @@ libainstall: all scripts + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh + $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config +ifeq (@IDLE@,yes) $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) +endif @@ -62,12 +66,12 @@ index 3f314d1354..5fad7f82fb 100644 $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) endif diff --git a/configure.ac b/configure.ac -index f0354c580d..43086962e9 100644 +index 7ed4fa578f3..d5dac4bf8bc 100644 --- a/configure.ac +++ b/configure.ac -@@ -7567,6 +7567,12 @@ AC_ARG_ENABLE(lib2to3, - AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), - [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) +@@ -7927,6 +7927,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_d + # substitute multiline block, must come after last PY_STDLIB_MOD() + AC_SUBST([MODULE_BLOCK]) +AC_SUBST(IDLE) + @@ -79,5 +83,5 @@ index f0354c580d..43086962e9 100644 AC_CONFIG_FILES(m4_normalize([ Makefile.pre -- -2.34.1 +2.50.1 diff --git a/package/python3/0004-Add-an-option-to-disable-lib2to3.patch b/package/python3/0004-Add-an-option-to-disable-lib2to3.patch deleted file mode 100644 index cc21cbd0b5..0000000000 --- a/package/python3/0004-Add-an-option-to-disable-lib2to3.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 572f3164d1dce13db30e897ab0be7c706fa7b731 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:15:31 -0800 -Subject: [PATCH] Add an option to disable lib2to3 - -lib2to3 is a library to convert Python 2.x code to Python 3.x. As -such, it is probably not very useful on embedded system targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov -[ Adam Duskett: ported to Python 3.10.0 ] -Signed-off-by: Adam Duskett -[ Bernd Kuhls: ported to Python 3.11.4] -Signed-off-by: Bernd Kuhls -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett ---- - Makefile.pre.in | 19 ++++++++++++++----- - configure.ac | 6 ++++++ - 2 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2243a658a9..3f314d1354 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -2054,7 +2054,9 @@ ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) - endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 -+ifeq (@LIB2TO3@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) -+endif - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ - rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -2101,7 +2103,6 @@ LIBSUBDIRS= asyncio \ - idlelib idlelib/Icons \ - importlib importlib/resources importlib/metadata \ - json \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - logging \ - multiprocessing multiprocessing/dummy \ - re \ -@@ -2207,10 +2208,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_importlib/resources/zipdata02 \ - test/test_importlib/source \ - test/test_json \ -- test/test_lib2to3 \ -- test/test_lib2to3/data \ -- test/test_lib2to3/data/fixers \ -- test/test_lib2to3/data/fixers/myfixes \ - test/test_module \ - test/test_peg_generator \ - test/test_pydoc \ -@@ -2262,6 +2259,14 @@ ifeq (@PYDOC@,yes) - LIBSUBDIRS += pydoc_data - endif - -+ifeq (@LIB2TO3@,yes) -+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += test/test_lib2to3 \ -+ test/test_lib2to3/data \ -+ test/test_lib2to3/data/fixers \ -+ test/test_lib2to3/data/fixers/myfixes -+endif -+ - TEST_MODULES=@TEST_MODULES@ - - .PHONY: libinstall -@@ -2345,10 +2350,12 @@ ifeq (@PYC_BUILD@,yes) - -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - endif -+ifeq (@LIB2TO3@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -+endif - - # bpo-21536: Misc/python-config.sh is generated in the build directory - # from $(srcdir)Misc/python-config.sh.in. -@@ -2474,7 +2481,9 @@ libainstall: all scripts - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config -+ifeq (@LIB2TO3@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) -+endif - $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) - ifeq (@PYDOC@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) -diff --git a/configure.ac b/configure.ac -index 1a2dd28d1e..f0354c580d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7561,6 +7561,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu - # substitute multiline block, must come after last PY_STDLIB_MOD() - AC_SUBST([MODULE_BLOCK]) - -+AC_SUBST(LIB2TO3) -+ -+AC_ARG_ENABLE(lib2to3, -+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), -+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) -+ - # generate output files - AC_CONFIG_FILES(m4_normalize([ - Makefile.pre --- -2.34.1 - diff --git a/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch b/package/python3/0004-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch similarity index 62% rename from package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch rename to package/python3/0004-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch index e594e6cd63..c52ff62831 100644 --- a/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch +++ b/package/python3/0004-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch @@ -1,4 +1,4 @@ -From 267516c76208e63b5a3ec7d4dead6c329d8763bb Mon Sep 17 00:00:00 2001 +From 930c4763ac46d180880615eceeb68698e9b35e85 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 6 Feb 2024 22:46:59 +0100 Subject: [PATCH] configure.ac: move PY_STDLIB_MOD_SET_NA further up @@ -6,19 +6,24 @@ Subject: [PATCH] configure.ac: move PY_STDLIB_MOD_SET_NA further up We will need PY_STDLIB_MOD_SET_NA in next patches further up in the configure.ac script. +Upstream: N/A + Signed-off-by: Thomas Petazzoni +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + configure.ac | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 43086962e9..561e33f550 100644 +index d5dac4bf8bc..6635aaa134d 100644 --- a/configure.ac +++ b/configure.ac -@@ -95,6 +95,11 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [ +@@ -95,6 +95,12 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [ AS_VAR_POPDEF([py_libs]) ]) ++# stdlib +AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ + m4_foreach([mod], [$@], [ + AS_VAR_SET([py_cv_module_]mod, [n/a])]) @@ -27,10 +32,12 @@ index 43086962e9..561e33f550 100644 AC_SUBST([BASECPPFLAGS]) if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then # If we're building out-of-tree, we need to make sure the following -@@ -7258,11 +7263,6 @@ AC_ARG_ENABLE([test-modules], - AC_MSG_RESULT([$TEST_MODULES]) - AC_SUBST([TEST_MODULES]) +@@ -7595,13 +7601,6 @@ AS_VAR_IF([ac_cv_libatomic_needed], [yes], + LIBATOMIC=${LIBATOMIC-"-latomic"}]) + _RESTORE_VAR([CPPFLAGS]) +- +-# stdlib -AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ - m4_foreach([mod], [$@], [ - AS_VAR_SET([py_cv_module_]mod, [n/a])]) @@ -38,7 +45,7 @@ index 43086962e9..561e33f550 100644 - # stdlib not available dnl Modules that are not available on some platforms - dnl AIX has shadow passwords, but access is not via getspent() + AS_CASE([$ac_sys_system], -- -2.34.1 +2.50.1 diff --git a/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0005-Add-option-to-disable-the-sqlite3-module.patch similarity index 76% rename from package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch rename to package/python3/0005-Add-option-to-disable-the-sqlite3-module.patch index f26091ebfb..df79837145 100644 --- a/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0005-Add-option-to-disable-the-sqlite3-module.patch @@ -1,8 +1,10 @@ -From a8566f6ee2a2b859ba5562f2d9f06cb4d271f277 Mon Sep 17 00:00:00 2001 +From 8f6beca556599479705444af7cc7c49b2b964af8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 6 Feb 2024 22:12:20 +0100 Subject: [PATCH] Add option to disable the sqlite3 module +Upstream: N/A + Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] @@ -10,24 +12,26 @@ Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 5 ++++- configure.ac | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5fad7f82fb..7b6c9811a6 100644 +index 2d067730633..a45a76cce45 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \ - multiprocessing multiprocessing/dummy \ +@@ -2336,7 +2336,6 @@ LIBSUBDIRS= asyncio \ + pathlib \ re \ site-packages \ - sqlite3 \ + sysconfig \ tkinter \ tomllib \ - turtledemo \ -@@ -2272,6 +2271,10 @@ ifeq (@IDLE@,yes) +@@ -2500,6 +2499,10 @@ ifeq (@IDLE@,yes) LIBSUBDIRS += idlelib idlelib/Icons endif @@ -39,10 +43,10 @@ index 5fad7f82fb..7b6c9811a6 100644 .PHONY: libinstall diff --git a/configure.ac b/configure.ac -index 561e33f550..d1c54bd67c 100644 +index 6635aaa134d..8153b738b2f 100644 --- a/configure.ac +++ b/configure.ac -@@ -4516,6 +4516,13 @@ AS_VAR_IF([posix_threads], [stub], [ +@@ -4755,6 +4755,13 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) @@ -57,5 +61,5 @@ index 561e33f550..d1c54bd67c 100644 AC_ARG_ENABLE(pydoc, -- -2.34.1 +2.50.1 diff --git a/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0006-Add-an-option-to-disable-the-tk-module.patch similarity index 71% rename from package/python3/0008-Add-an-option-to-disable-the-tk-module.patch rename to package/python3/0006-Add-an-option-to-disable-the-tk-module.patch index 97ee2d717c..e67f06f78c 100644 --- a/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0006-Add-an-option-to-disable-the-tk-module.patch @@ -1,8 +1,10 @@ -From c1ec9fa46cd7679fd009f66a3ebed8de95d84f10 Mon Sep 17 00:00:00 2001 +From b53a2758ac431bc2493a460e6c886561e2397518 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module +Upstream: N/A + Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] @@ -13,42 +15,46 @@ Signed-off-by: Adam Duskett Signed-off-by: Bernd Kuhls [ Adam Duskett: ported to Python 3.12.1 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio +[ Vincent Fazio: fix Python 3.13.3 conflict ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 8 +++++--- configure.ac | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7b6c9811a6..6d9527ddd0 100644 +index a45a76cce45..76d67ce7185 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \ - multiprocessing multiprocessing/dummy \ +@@ -2337,7 +2337,6 @@ LIBSUBDIRS= asyncio \ re \ site-packages \ + sysconfig \ - tkinter \ tomllib \ turtledemo \ unittest \ -@@ -2212,7 +2211,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_peg_generator \ +@@ -2445,7 +2444,6 @@ TESTSUBDIRS= idlelib/idle_test \ test/test_pydoc \ + test/test_pyrepl \ test/test_sqlite3 \ - test/test_tkinter \ test/test_tomllib \ test/test_tomllib/data \ test/test_tomllib/data/invalid \ -@@ -2232,7 +2230,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_tomllib/data/valid/dates-and-times \ - test/test_tomllib/data/valid/multiline-basic-str \ +@@ -2467,7 +2465,6 @@ TESTSUBDIRS= idlelib/idle_test \ test/test_tools \ + test/test_tools/i18n_data \ + test/test_tools/msgfmt_data \ - test/test_ttk \ test/test_unittest \ test/test_unittest/testmock \ test/test_warnings \ -@@ -2253,6 +2250,11 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_multiprocessing_forkserver \ - test/test_multiprocessing_spawn +@@ -2489,6 +2486,11 @@ TESTSUBDIRS= idlelib/idle_test \ + test/xmltestdata/c14n-20 \ + test/zipimport_data +ifeq (@TK@,yes) +LIBSUBDIRS += tkinter @@ -59,10 +65,10 @@ index 7b6c9811a6..6d9527ddd0 100644 ifeq (@PYDOC@,yes) diff --git a/configure.ac b/configure.ac -index d1c54bd67c..4c5cbe4153 100644 +index 8153b738b2f..0cf06a50c71 100644 --- a/configure.ac +++ b/configure.ac -@@ -4529,6 +4529,13 @@ AC_ARG_ENABLE(pydoc, +@@ -4768,6 +4768,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -77,5 +83,5 @@ index d1c54bd67c..4c5cbe4153 100644 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) -- -2.34.1 +2.50.1 diff --git a/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0007-Add-an-option-to-disable-the-curses-module.patch similarity index 78% rename from package/python3/0009-Add-an-option-to-disable-the-curses-module.patch rename to package/python3/0007-Add-an-option-to-disable-the-curses-module.patch index 139bf1544b..05bb126ba7 100644 --- a/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0007-Add-an-option-to-disable-the-curses-module.patch @@ -1,24 +1,28 @@ -From d7ea122e8ae506019761b92987b141fe7ea55f76 Mon Sep 17 00:00:00 2001 +From baef276faa676d1b0faf64a91fa627b5f8fcc5e0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module +Upstream: N/A + Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 5 ++++- configure.ac | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6d9527ddd0..283ca1bd60 100644 +index 76d67ce7185..bfb6cb65354 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2095,7 +2095,6 @@ LIBSUBDIRS= asyncio \ +@@ -2322,7 +2322,6 @@ LIBSUBDIRS= asyncio \ concurrent concurrent/futures \ csv \ ctypes ctypes/macholib \ @@ -26,7 +30,7 @@ index 6d9527ddd0..283ca1bd60 100644 dbm \ email email/mime \ encodings \ -@@ -2255,6 +2254,10 @@ LIBSUBDIRS += tkinter +@@ -2491,6 +2490,10 @@ LIBSUBDIRS += tkinter TESTSUBDIRS += test/test_tkinter test/test_ttk endif @@ -38,10 +42,10 @@ index 6d9527ddd0..283ca1bd60 100644 ifeq (@PYDOC@,yes) diff --git a/configure.ac b/configure.ac -index 4c5cbe4153..92d663ed40 100644 +index 0cf06a50c71..0895dc57808 100644 --- a/configure.ac +++ b/configure.ac -@@ -4523,6 +4523,13 @@ AC_ARG_ENABLE(sqlite3, +@@ -4762,6 +4762,13 @@ AC_ARG_ENABLE(sqlite3, AS_IF([test "$SQLITE3" = "no"], [PY_STDLIB_MOD_SET_NA([_sqlite3])]) @@ -56,5 +60,5 @@ index 4c5cbe4153..92d663ed40 100644 AC_ARG_ENABLE(pydoc, -- -2.34.1 +2.50.1 diff --git a/package/python3/0010-Add-an-option-to-disable-expat.patch b/package/python3/0008-Add-an-option-to-disable-expat.patch similarity index 85% rename from package/python3/0010-Add-an-option-to-disable-expat.patch rename to package/python3/0008-Add-an-option-to-disable-expat.patch index 2363aeb01d..8f3143d61b 100644 --- a/package/python3/0010-Add-an-option-to-disable-expat.patch +++ b/package/python3/0008-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From d1701f1c89e9d2319ede200052319183fbb4ae18 Mon Sep 17 00:00:00 2001 +From 2a7412e43554830ffbc831454de8df903e765b73 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -9,22 +9,26 @@ whether we want to use the system expat (already installed), the expat builtin the Python sources, or no expat at all (which disables the installation of XML modules). +Upstream: N/A + Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: ported to Python 3.13.2 ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 5 ++++- configure.ac | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 283ca1bd60..13f7512f42 100644 +index bfb6cb65354..7a662ea4b32 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2113,7 +2113,6 @@ LIBSUBDIRS= asyncio \ +@@ -2342,7 +2342,6 @@ LIBSUBDIRS= asyncio \ urllib \ venv venv/scripts venv/scripts/common venv/scripts/posix \ wsgiref \ @@ -32,7 +36,7 @@ index 283ca1bd60..13f7512f42 100644 xmlrpc \ zipfile zipfile/_path \ zoneinfo \ -@@ -2280,6 +2279,10 @@ ifeq (@SQLITE3@,yes) +@@ -2508,6 +2507,10 @@ ifeq (@SQLITE3@,yes) LIBSUBDIRS += sqlite3 endif @@ -44,10 +48,10 @@ index 283ca1bd60..13f7512f42 100644 .PHONY: libinstall diff --git a/configure.ac b/configure.ac -index 92d663ed40..1cb95f41fd 100644 +index 0895dc57808..34e4d5dd244 100644 --- a/configure.ac +++ b/configure.ac -@@ -3823,17 +3823,19 @@ LIBS="$withval $LIBS" +@@ -4058,17 +4058,19 @@ LIBS="$withval $LIBS" [AC_MSG_RESULT([no])]) # Check for use of the system expat library @@ -79,5 +83,5 @@ index 92d663ed40..1cb95f41fd 100644 LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"} LIBEXPAT_INTERNAL= -- -2.34.1 +2.50.1 diff --git a/package/python3/0009-configure.ac-detect-unusable-termio-operations.patch b/package/python3/0009-configure.ac-detect-unusable-termio-operations.patch new file mode 100644 index 0000000000..1a11caeb49 --- /dev/null +++ b/package/python3/0009-configure.ac-detect-unusable-termio-operations.patch @@ -0,0 +1,99 @@ +From 2d336d1fedb692350a1e4f131246f60a1195cd93 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 7 Dec 2025 13:57:06 +0100 +Subject: [PATCH] configure.ac: detect unusable termio operations + +Some termio operations are not actually usable on some +architectures. For example, the TCGETA, TCSETA, TCSETAF and TCSETAW +are defined with a reference to "struct termio" on alpha, hppa and +sparc64, but "struct termio" is no longer defined since glibc 2.42, +causing a build failure. + +Instead of using those operations as soon as they are defined, this +commit checks more carefully that they are actually usable. This is +done using a new m4 macro PY_CHECK_IOCTL. + +Upstream: https://github.com/python/cpython/pull/142380 +Signed-off-by: Thomas Petazzoni +--- + Modules/termios.c | 8 ++++---- + configure.ac | 26 ++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+), 4 deletions(-) + +diff --git a/Modules/termios.c b/Modules/termios.c +index f2c5a4bafa7..dbfe922d1e8 100644 +--- a/Modules/termios.c ++++ b/Modules/termios.c +@@ -1115,7 +1115,7 @@ static struct constant { + #ifdef TCFLSH + {"TCFLSH", TCFLSH}, + #endif +-#ifdef TCGETA ++#if defined(HAVE_TCGETA) + {"TCGETA", TCGETA}, + #endif + #ifdef TCGETS +@@ -1127,13 +1127,13 @@ static struct constant { + #ifdef TCSBRKP + {"TCSBRKP", TCSBRKP}, + #endif +-#ifdef TCSETA ++#if defined(HAVE_TCSETA) + {"TCSETA", TCSETA}, + #endif +-#ifdef TCSETAF ++#if defined(HAVE_TCSETAF) + {"TCSETAF", TCSETAF}, + #endif +-#ifdef TCSETAW ++#if defined(HAVE_TCSETAW) + {"TCSETAW", TCSETAW}, + #endif + #ifdef TCSETS +diff --git a/configure.ac b/configure.ac +index 34e4d5dd244..646aa24ecf3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,6 +101,26 @@ AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ + AS_VAR_SET([py_cv_module_]mod, [n/a])]) + ]) + ++dnl PY_CHECK_IOCTL(IOCTL_SYMBOL) ++AC_DEFUN([PY_CHECK_IOCTL], ++[ ++ AC_MSG_CHECKING([for $1]) ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ]], ++ [[ ++ /* Test whether $1 is declared */ ++ long val = $1; ++ return 0; ++ ]] ++ )], ++ [AC_MSG_RESULT([yes]) ++ AC_DEFINE([HAVE_$1], [1], ++ [Define this if $1 termio operation is usable])], ++ [AC_MSG_RESULT([no])] ++ ) ++]) ++ + AC_SUBST([BASECPPFLAGS]) + if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then + # If we're building out-of-tree, we need to make sure the following +@@ -7955,6 +7975,12 @@ AC_ARG_ENABLE(idle3, + AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), + [ IDLE="${enableval}" ], [ IDLE=yes ]) + ++# ioctls used by Modules/termios.c but not usable on all platforms ++PY_CHECK_IOCTL([TCGETA]) ++PY_CHECK_IOCTL([TCSETA]) ++PY_CHECK_IOCTL([TCSETAF]) ++PY_CHECK_IOCTL([TCSETAW]) ++ + # generate output files + AC_CONFIG_FILES(m4_normalize([ + Makefile.pre +-- +2.51.1 + diff --git a/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch deleted file mode 100644 index a92f78fe57..0000000000 --- a/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3eccbd53df3c51c1c6ece217d19f1d01eb9575a7 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Fri, 2 Aug 2019 15:53:16 +0200 -Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for - musl/uclibc GCC 8+ toolchains - -GCC commit 6834b83784dcf0364eb820e8 (multiarch support for non-glibc linux -systems), which is part of GCC 8+, changed the multiarch logic to use -$arch-linux-musl / $arch-linux-uclibc rather than $arch-linux-gnu. - -This then causes the python3 configure script to error out: - -checking for the platform triplet based on compiler characteristics... powerpc-linux-gnu -configure: error: internal configure error for the platform triplet, please file a bug report - -http://autobuild.buildroot.net/results/cb4/cb49c539501342e45cbe5ade82e588fcdf51f05b - -As it requires that the --print-multiarch output (if not empty) matches the -deduced triplet (which always uses -linux-gnu). - -It isn't quite clear why --print-multiarch returns something for a -non-multiarch toolchain on some architectures (E.G. PowerPC), but as a -workaround, rewrite the --print-multiarch output to match older GCC versions -to keep the configure script happy. - -Signed-off-by: Peter Korsgaard -[Peter: updated for 3.10.2] -Signed-off-by: Vincent Fazio -[Vincent: fixup offsets for 3.12.4] ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1cb95f41fd..d142af404a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1128,7 +1128,11 @@ AC_MSG_CHECKING([for multiarch]) - AS_CASE([$ac_sys_system], - [Darwin*], [MULTIARCH=""], - [FreeBSD*], [MULTIARCH=""], -- [MULTIARCH=$($CC --print-multiarch 2>/dev/null)] -+ [ -+ # GCC 8+ returns $arch-linux-{musl,uclibc} for musl/uClibc based -+ # toolchains confusing python. Fix that up -+ MULTIARCH=$($CC --print-multiarch 2>/dev/null | sed -E 's/-linux-(musl|uclibc)*$/-linux-gnu/') -+ ] - ) - AC_SUBST([MULTIARCH]) - AC_MSG_RESULT([$MULTIARCH]) --- -2.34.1 - diff --git a/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch deleted file mode 100644 index 5a7949b2fd..0000000000 --- a/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch +++ /dev/null @@ -1,140 +0,0 @@ -From e7fa6023be567251b409527bd005b93335914501 Mon Sep 17 00:00:00 2001 -From: Vincent Fazio <5265893+vfazio@users.noreply.github.com> -Date: Wed, 28 Feb 2024 13:55:04 -0600 -Subject: [PATCH] gh-115382: Fix cross compiles when host and target use same - SOABI - -Previously, when a build was configured to use a host interpreter via ---with-build-python, the PYTHON_FOR_BUILD config value included a path -in PYTHONPATH that pointed to the target's built external modules. - -For "normal" foreign architecture cross compiles, when loading compiled -external libraries, the target libraries were processed first due to -their precedence in sys.path. These libraries were then ruled out due to -a mismatch in the SOABI so the import mechanism continued searching -until it found the host's native modules. - -However, if the host interpreter and the target python were on the same -version + SOABI combination, the host interpreter would attempt to load -the target's external modules due to their precedence in sys.path. - -Despite the "match", the target build may have been linked against a -different libc or may include unsupported instructions so loading or -executing the target's external modules can lead to crashes. - -Now, the path to the target's external modules is no longer defined in -PYTHONPATH to prevent accidentally loading these foreign modules. - -One caveat is that during certain build stages, the target's sysconfig -module requires higher precedence than the host's version in order to -accurately query the target build's configuration. - -This worked previously due to the target's sysconfig data module having -precedence over the host's (see above). In order to keep this desired -behavior, a new environment variable, _PYTHON_SYSCONFIGDATA_PATH, has -been defined so sysconfig can search this directory for the target's -sysconfig data. - -Signed-off-by: Vincent Fazio -Upstream-issue: https://github.com/python/cpython/issues/115382 -Upstream: https://github.com/python/cpython/pull/116294 ---- - Lib/sysconfig.py | 15 ++++++++++++++- - Lib/test/libregrtest/main.py | 1 + - Lib/test/pythoninfo.py | 1 + - Tools/scripts/run_tests.py | 1 + - configure | 2 +- - configure.ac | 2 +- - 6 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441bd1..260aec3127 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -533,7 +533,20 @@ def _init_posix(vars): - """Initialize the module as appropriate for POSIX systems.""" - # _sysconfigdata is generated at build time, see _generate_posix_vars() - name = _get_sysconfigdata_name() -- _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) -+ -+ # For cross builds, the path to the target's sysconfigdata must be specified -+ # so it can be imported. It cannot be in PYTHONPATH, as foreign modules in -+ # sys.path can cause crashes when loaded by the host interpreter. -+ # Rely on truthiness as a valueless env variable is still an empty string. -+ # See OS X note in _generate_posix_vars re _sysconfigdata. -+ if (path := os.environ.get('_PYTHON_SYSCONFIGDATA_PATH')): -+ from importlib.machinery import FileFinder, SourceFileLoader, SOURCE_SUFFIXES -+ from importlib.util import module_from_spec -+ spec = FileFinder(path, (SourceFileLoader, SOURCE_SUFFIXES)).find_spec(name) -+ _temp = module_from_spec(spec) -+ spec.loader.exec_module(_temp) -+ else: -+ _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) - build_time_vars = _temp.build_time_vars - vars.update(build_time_vars) - -diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py -index e41646d2d1..f54e570728 100644 ---- a/Lib/test/libregrtest/main.py -+++ b/Lib/test/libregrtest/main.py -@@ -576,6 +576,7 @@ def _add_cross_compile_opts(self, regrtest_opts): - '_PYTHON_PROJECT_BASE', - '_PYTHON_HOST_PLATFORM', - '_PYTHON_SYSCONFIGDATA_NAME', -+ "_PYTHON_SYSCONFIGDATA_PATH", - 'PYTHONPATH' - } - old_environ = os.environ -diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py -index 6efeaad812..d43e52c9e4 100644 ---- a/Lib/test/pythoninfo.py -+++ b/Lib/test/pythoninfo.py -@@ -326,6 +326,7 @@ def format_groups(groups): - "_PYTHON_HOST_PLATFORM", - "_PYTHON_PROJECT_BASE", - "_PYTHON_SYSCONFIGDATA_NAME", -+ "_PYTHON_SYSCONFIGDATA_PATH", - "__PYVENV_LAUNCHER__", - - # Sanitizer options -diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py -index 445a34ae3e..4077a83424 100644 ---- a/Tools/scripts/run_tests.py -+++ b/Tools/scripts/run_tests.py -@@ -42,6 +42,7 @@ def main(regrtest_args): - '_PYTHON_PROJECT_BASE', - '_PYTHON_HOST_PLATFORM', - '_PYTHON_SYSCONFIGDATA_NAME', -+ "_PYTHON_SYSCONFIGDATA_PATH", - 'PYTHONPATH' - } - environ = { -diff --git a/configure b/configure -index 6dc8a66e48..a69346db8c 100755 ---- a/configure -+++ b/configure -@@ -3689,7 +3689,7 @@ fi - fi - ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python - PYTHON_FOR_FREEZE="$with_build_python" -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 - printf "%s\n" "$with_build_python" >&6; } - -diff --git a/configure.ac b/configure.ac -index 1cb95f41fd..de420dde2c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -169,7 +169,7 @@ AC_ARG_WITH([build-python], - dnl Build Python interpreter is used for regeneration and freezing. - ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python - PYTHON_FOR_FREEZE="$with_build_python" -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python - AC_MSG_RESULT([$with_build_python]) - ], [ - AS_VAR_IF([cross_compiling], [yes], --- -2.34.1 - diff --git a/package/python3/Config.in b/package/python3/Config.in index 38f0580aa4..cfc08bad86 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_PYTHON3 depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS + select BR2_PACKAGE_HOST_PYTHON3 help The python language interpreter. diff --git a/package/python3/python3.hash b/package/python3/python3.hash index ad73a85a7f..fddfcc1a4d 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3127/ -md5 c6c933c1a0db52597cb45a7910490f93 Python-3.12.7.tar.xz +# From https://www.python.org/downloads/release/python-31311/ +md5 4c3517dd8b1fd76377dcb3e5e8f71ad6 Python-3.13.11.tar.xz # Locally computed -sha256 24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550 Python-3.12.7.tar.xz -sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE +sha256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 Python-3.13.11.tar.xz +sha256 78b12c3a81360b357002334f0e70ea0e92eebf7a9b358805c03c48484945f3bb LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index d029d3dbbc..0189a505b4 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +PYTHON3_VERSION_MAJOR = 3.13 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).11 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -176,6 +176,7 @@ endif PYTHON3_CONF_ENV += \ ac_cv_have_long_long_format=yes \ + ac_cv_buggy_getaddrinfo=no \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ ac_cv_working_tzset=yes \ @@ -188,6 +189,15 @@ else PYTHON3_CONF_ENV += ac_cv_big_endian_double=yes endif +PYTHON3_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_121567),y) +PYTHON3_CFLAGS += -O1 +endif + +PYTHON3_CONF_ENV += \ + CFLAGS="$(PYTHON3_CFLAGS)" + ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) PYTHON3_DEPENDENCIES += gettext endif @@ -305,3 +315,11 @@ define PYTHON3_REMOVE_OPTIMIZED_PYC_FILES xargs -0 --no-run-if-empty rm -f endef PYTHON3_TARGET_FINALIZE_HOOKS += PYTHON3_REMOVE_OPTIMIZED_PYC_FILES + +# uClibc without time64 support (i.e. when linux headers < 5.1) causes +# a runtime assertion in Python. Encoding this as a dependency in Config.in +# causes too many problems for propagating reverse dependencies. Therefore +# instead we do a build time check. +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_PYTHON3)$(BR2_TOOLCHAIN_USES_UCLIBC)-$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1),yyy-) +$(error Python3 doesn't work with uClibc and kernel headers < 5.1. Please use a different toolchain or unselect Python3.) +endif diff --git a/package/qbee-agent/qbee-agent.hash b/package/qbee-agent/qbee-agent.hash index 156f911a6d..3c022b5167 100644 --- a/package/qbee-agent/qbee-agent.hash +++ b/package/qbee-agent/qbee-agent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6dca3d020bc9f0f80f4c8c5b85c079a65707fb79485b39c85d9bd1cfadafcf9f qbee-agent-2024.36-go2.tar.gz +sha256 38379b0869d013fbd225d3e092fa16751c414b8f412437c1c4c7f3af118fee4b qbee-agent-2024.50-go2.tar.gz sha256 02d07d96be99eb042b01ba650079a440ce26a78c5e0e1e8060c33a8c9e200404 LICENSE diff --git a/package/qbee-agent/qbee-agent.mk b/package/qbee-agent/qbee-agent.mk index 1a9653ee7f..c5df59a663 100644 --- a/package/qbee-agent/qbee-agent.mk +++ b/package/qbee-agent/qbee-agent.mk @@ -5,12 +5,12 @@ ################################################################################ # keep QBEE_AGENT_COMMIT_ID in sync when updating -QBEE_AGENT_VERSION = 2024.36 +QBEE_AGENT_VERSION = 2024.50 QBEE_AGENT_SITE = $(call github,qbee-io,qbee-agent,$(QBEE_AGENT_VERSION)) QBEE_AGENT_LICENSE = Apache-2.0 QBEE_AGENT_LICENSE_FILES = LICENSE -QBEE_AGENT_COMMIT_ID = d52fb5e69b479550636570a2db6cebe06f5f129b +QBEE_AGENT_COMMIT_ID = 4303465d155f0680968b57fdf4421971786356a4 QBEE_AGENT_GOMOD = go.qbee.io/agent diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch index f9e523a627..509850b8fa 100644 --- a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch +++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch @@ -1,4 +1,4 @@ -From d6fea3c321c7eb18e6dd151f5d4b0cc46b77bcc0 Mon Sep 17 00:00:00 2001 +From 67d9845d3583053baaae73883be73ca257bfcf20 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 30 Apr 2024 09:40:55 +0200 Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is @@ -16,17 +16,19 @@ Suggested-by: Paolo Bonzini Signed-off-by: Dario Binacchi [Dario: make the patch to be applied with fuzz factor 0] Upstream: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/ +[Romain: rebase on Qemu 9.2.0] +Signed-off-by: Romain Naour --- tests/fp/meson.build | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index 114b4b483ea7..0e1237be54ed 100644 +index 9059a24752..2b290f83e7 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build -@@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest, - ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], - suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 180) +@@ -139,12 +139,14 @@ test('fp-test-mulAdd', fptest, + timeout: slow_fp_tests.get('mulAdd', 30), + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow']) -executable( - 'fp-bench', @@ -46,5 +48,5 @@ index 114b4b483ea7..0e1237be54ed 100644 fptestlog2 = executable( 'fp-test-log2', -- -2.34.1 +2.47.1 diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 2d15ab1ea9..ff7423bc4c 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -211,13 +211,13 @@ config BR2_PACKAGE_QEMU_TARGET_MICROBLAZE bool "microblaze" select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM help - Xilinix MicroBlaze soft processor. + Xilinx MicroBlaze soft processor. config BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL bool "microblazeel" select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM help - Xilinix MicroBlaze EL soft processor. + Xilinx MicroBlaze EL soft processor. config BR2_PACKAGE_QEMU_TARGET_MIPS bool "mips" diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index 4db114490a..090204d90c 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -4,6 +4,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_armeb default y if BR2_aarch64 default y if BR2_i386 + default y if BR2_loongarch64 default y if BR2_m68k default y if BR2_microblazeel default y if BR2_microblazebe diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 169fe05068..f4691af1dd 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834 qemu-9.1.0.tar.xz -sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 e0517349b50ca73ebec2fa85b06050d5c463ca65c738833bd8fc1f15f180be51 qemu-10.1.0.tar.xz +sha256 dd3ce02338c3a48abb6ba59b48809f7108a8bd242cb0cc8be90daafa30707c28 COPYING +sha256 31c90ce76b6f5aab90a205851e71d5c27e31c0aa3d7017a4383b98a6fe3f1faa COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 76394b3e77..df81ea6486 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 9.1.0 +QEMU_VERSION = 10.1.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_SELINUX_MODULES = qemu virt @@ -271,6 +271,13 @@ else QEMU_OPTS += --disable-install-blobs endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +QEMU_OPTS += --enable-zstd +QEMU_DEPENDENCIES += zstd +else +QEMU_OPTS += --disable-zstd +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS @@ -288,6 +295,7 @@ define QEMU_CONFIGURE_CMDS --python=$(HOST_DIR)/bin/python3 \ --ninja=$(HOST_DIR)/bin/ninja \ --disable-alsa \ + --disable-asan \ --disable-bpf \ --disable-brlapi \ --disable-bsd-user \ @@ -314,10 +322,10 @@ define QEMU_CONFIGURE_CMDS --disable-pa \ --disable-plugins \ --disable-rbd \ - --disable-sanitizers \ --disable-selinux \ --disable-sparse \ --disable-strip \ + --disable-ubsan \ --disable-vde \ --disable-vhost-crypto \ --disable-vhost-user-blk-server \ @@ -371,7 +379,6 @@ HOST_QEMU_DEPENDENCIES = \ # mipsel mipsel # mips64 mips64 # mips64el mips64el -# nios2 nios2 # or1k or1k # powerpc ppc # powerpc64 ppc64 @@ -460,6 +467,13 @@ else HOST_QEMU_OPTS += --disable-libusb endif +ifeq ($(BR2_PACKAGE_HOST_ZSTD),y) +HOST_QEMU_OPTS += --enable-zstd +HOST_QEMU_DEPENDENCIES += host-zstd +else +HOST_QEMU_OPTS += --disable-zstd +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define HOST_QEMU_CONFIGURE_CMDS diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash index 6e5c761463..261401467c 100644 --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash @@ -1,5 +1,4 @@ # Locally calculated -sha256 e267655a47fbe118f6960bca7994bd6b8986ef955344fe006a424be96f868602 firmware-cadence-lsdk2012.bin -sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING -sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA -sha256 53e3eb0b2bd81c171fa04c17514e20b39b7bb1fe1224c593f7717f615fb9d52b EULA.txt +sha256 65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84 firmware-imx-8.16.bin +sha256 4c89574f9a76e861919f80fef84bac30e4ba7fb8732b0fcda4b26d400239f517 COPYING +sha256 423c76762d50b82fedd3e15c48e436d7272a7e130f9ebb910f76489345707cf6 EULA diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk index 4f75287269..3f92bd24c2 100644 --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk @@ -4,11 +4,11 @@ # ################################################################################ -QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk2012 -QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION) -QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin +QORIQ_CADENCE_DP_FIRMWARE_VERSION = 8.16 +QORIQ_CADENCE_DP_FIRMWARE_SITE = https://www.nxp.com/lgfiles/NMG/MAD/YOCTO +QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-imx-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement -QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING EULA EULA.txt +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING EULA QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),) @@ -20,11 +20,11 @@ define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS endef define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(TARGET_DIR)/boot/ls1028a-dp-fw.bin + $(INSTALL) -D -m 0644 $(@D)/firmware/hdmi/cadence/dp_ls1028a.bin $(TARGET_DIR)/boot/ls1028a-dp-fw.bin endef define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/dp/ls1028a-dp-fw.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin + $(INSTALL) -D -m 0644 $(@D)/firmware/hdmi/cadence/dp_ls1028a.bin $(BINARIES_DIR)/ls1028a-dp-fw.bin endef $(eval $(generic-package)) diff --git a/package/qoriq-ddr-phy-binary/Config.in b/package/qoriq-ddr-phy-binary/Config.in new file mode 100644 index 0000000000..301a2c1974 --- /dev/null +++ b/package/qoriq-ddr-phy-binary/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_QORIQ_DDR_PHY_BINARY + bool "qoriq-ddr-phy-binary" + help + Firmware binary for DDR PHY of NXP LX2160A family of SoCs. + + https://github.com/nxp-qoriq/ddr-phy-binary diff --git a/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash new file mode 100644 index 0000000000..439d8e3a8f --- /dev/null +++ b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 0837d5752a89ae7b9779cceac4aa758aad89688154a6a110a53fe16cbe6adca4 qoriq-ddr-phy-binary-lf-6.12.20-2.0.0.tar.gz +sha256 e7e5f4949f7ac9f9a5d4d68b8f835f3ddc93ad47b594a11de699d90b9175413f NXP-Binary-EULA.txt diff --git a/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk new file mode 100644 index 0000000000..665b653d20 --- /dev/null +++ b/package/qoriq-ddr-phy-binary/qoriq-ddr-phy-binary.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# qoriq-ddr-phy-binary +# +################################################################################ + +QORIQ_DDR_PHY_BINARY_VERSION = lf-6.12.20-2.0.0 +QORIQ_DDR_PHY_BINARY_SITE = $(call github,nxp-qoriq,ddr-phy-binary,$(QORIQ_DDR_PHY_BINARY_VERSION)) +QORIQ_DDR_PHY_BINARY_LICENSE = NXP Binary EULA +QORIQ_DDR_PHY_BINARY_LICENSE_FILES = NXP-Binary-EULA.txt +QORIQ_DDR_PHY_BINARY_INSTALL_IMAGES = YES +QORIQ_DDR_PHY_BINARY_INSTALL_TARGET = NO + +define QORIQ_DDR_PHY_BINARY_INSTALL_IMAGES_CMDS + $(INSTALL) -D $(@D)/lx2160a/fip_ddr.bin $(BINARIES_DIR)/fip_ddr.bin +endef + +$(eval $(generic-package)) diff --git a/package/qoriq-firmware-inphi/Config.in b/package/qoriq-firmware-inphi/Config.in new file mode 100644 index 0000000000..88ae96c075 --- /dev/null +++ b/package/qoriq-firmware-inphi/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_QORIQ_FIRMWARE_INPHI + bool "qoriq-firmware-inphi" + help + Firmware image for the Inphi IN112525 2x 25GbE SFP+ + retimer, exclusively for use on the NXP LX2160A-RDB. + + https://github.com/nxp-qoriq/qoriq-firmware-inphi diff --git a/package/qoriq-firmware-inphi/qoriq-firmware-inphi.hash b/package/qoriq-firmware-inphi/qoriq-firmware-inphi.hash new file mode 100644 index 0000000000..df860e47a0 --- /dev/null +++ b/package/qoriq-firmware-inphi/qoriq-firmware-inphi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bc04d6b7ca578ad4bba053a8ec3929af305f296f23c32557dc290540cb49ac18 qoriq-firmware-inphi-f22e9ff3bfed8342da6efb699e473b11fbad5695.tar.gz +sha256 53e3eb0b2bd81c171fa04c17514e20b39b7bb1fe1224c593f7717f615fb9d52b EULA.txt diff --git a/package/qoriq-firmware-inphi/qoriq-firmware-inphi.mk b/package/qoriq-firmware-inphi/qoriq-firmware-inphi.mk new file mode 100644 index 0000000000..630c6634fd --- /dev/null +++ b/package/qoriq-firmware-inphi/qoriq-firmware-inphi.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# qoriq-firmware-inphi +# +################################################################################ + +# Unlikely to ever be updated, keep a fixed version instead of following BSP tags +QORIQ_FIRMWARE_INPHI_VERSION = f22e9ff3bfed8342da6efb699e473b11fbad5695 +QORIQ_FIRMWARE_INPHI_SITE = $(call github,nxp,qoriq-firmware-inphi,$(QORIQ_FIRMWARE_INPHI_VERSION)) +QORIQ_FIRMWARE_INPHI_LICENSE = NXP Binary EULA +QORIQ_FIRMWARE_INPHI_LICENSE_FILES = EULA.txt +QORIQ_FIRMWARE_INPHI_INSTALL_IMAGES = YES + +define QORIQ_FIRMWARE_INPHI_INSTALL_IMAGES_CMDS + $(INSTALL) -D $(@D)/in112525-phy-ucode.txt $(BINARIES_DIR)/in112525-phy-ucode.txt +endef + +$(eval $(generic-package)) diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash index 67efd675cc..fb5fdac9a6 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c994367c74dd2ff6cd70ea269cf1bc775c5f4e11294a8db414491ce6c2eb9dc3 qoriq-fm-ucode-lf-6.6.23-2.0.0.tar.gz +sha256 12894dd52239e98b00bdd0a4e30b57d7bf6c37becf2a5db4a2e7d0074435d072 qoriq-fm-ucode-lf-6.12.20-2.0.0.tar.gz sha256 7a223031d76339df0e4e5a94d193a270fb9963d42b577aa42fe130a4657f3e17 LICENSE diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk index 84360533eb..fe71c283ea 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_FM_UCODE_VERSION = lf-6.6.23-2.0.0 +QORIQ_FM_UCODE_VERSION = lf-6.12.20-2.0.0 QORIQ_FM_UCODE_SITE = $(call github,nxp-qoriq,qoriq-fm-ucode,$(QORIQ_FM_UCODE_VERSION)) QORIQ_FM_UCODE_LICENSE = NXP Binary EULA QORIQ_FM_UCODE_LICENSE_FILES = LICENSE diff --git a/package/qoriq-mc-binary/Config.in b/package/qoriq-mc-binary/Config.in new file mode 100644 index 0000000000..6008b6c456 --- /dev/null +++ b/package/qoriq-mc-binary/Config.in @@ -0,0 +1,55 @@ +config BR2_PACKAGE_QORIQ_MC_BINARY + bool "qoriq-mc-binary" + help + The Management Complex (MC) is a key component of the + networking subsystem named DPAA2 (Data Path Acceleration + Architecture, second version) in some NXP Layerscape SoCs. + + The MC coprocessor runs a closed-source, NXP-supplied + firmware image that simplifies and abstracts the allocation + and configuration of the networking hardware primitives into + DPAA2 "objects". + + https://github.com/nxp-qoriq/qoriq-mc-binary + +if BR2_PACKAGE_QORIQ_MC_BINARY +choice + prompt "QorIQ MC firmware target" + help + Select the target SoC for the QorIQ MC firmware. + +config BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LS1088A + bool "ls1088a" + +config BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LS2080A + bool "ls2080a" + +config BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LS2088A + bool "ls2088a" + +config BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LX2160A + bool "lx2160a" + +endchoice + +config BR2_QORIQ_MC_BINARY_PLATFORM + string + default "ls1088a" if BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LS1088A + default "ls2080a" if BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LS2080A + default "ls2088a" if BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LS2088A + default "lx2160a" if BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LX2160A + +config BR2_QORIQ_MC_BINARY_SUBDIR + string + default "lx216xa" if BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_LX2160A + default BR2_QORIQ_MC_BINARY_PLATFORM + +config BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_INSTALL_PATH + string "Path on target to install MC firmware" + help + The MC firmware can optionally be deployed to the target + filesystem at the path specified here. This is useful if + the mcinitcmd U-Boot environment variable is configured + to load the MC firmware from the filesystem. + +endif diff --git a/package/qoriq-mc-binary/qoriq-mc-binary.hash b/package/qoriq-mc-binary/qoriq-mc-binary.hash new file mode 100644 index 0000000000..ccddff28cd --- /dev/null +++ b/package/qoriq-mc-binary/qoriq-mc-binary.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 912ad8effd5c7b08eb277719b1e021b8b1fe4022dc3d961b419562e1d2d7a860 qoriq-mc-binary-10.39.0.tar.gz +sha256 7733839334c6c820f01f76bff7ee9b60411effdcee8b6017e1d5bcacbdb432f6 LICENSE diff --git a/package/qoriq-mc-binary/qoriq-mc-binary.mk b/package/qoriq-mc-binary/qoriq-mc-binary.mk new file mode 100644 index 0000000000..5ae2e48c65 --- /dev/null +++ b/package/qoriq-mc-binary/qoriq-mc-binary.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# qoriq-mc-binary +# +################################################################################ + +QORIQ_MC_BINARY_VERSION = 10.39.0 +QORIQ_MC_BINARY_SITE = $(call github,nxp-qoriq,qoriq-mc-binary,mc_release_$(QORIQ_MC_BINARY_VERSION)) +QORIQ_MC_BINARY_LICENSE = NXP Binary EULA +QORIQ_MC_BINARY_LICENSE_FILES = LICENSE +QORIQ_MC_BINARY_INSTALL_IMAGES = YES + +QORIQ_MC_BINARY_PLATFORM = $(call qstrip,$(BR2_QORIQ_MC_BINARY_PLATFORM)) +QORIQ_MC_BINARY_SUBDIR = $(call qstrip,$(BR2_QORIQ_MC_BINARY_SUBDIR)) +QORIQ_MC_BINARY_BIN = mc_$(QORIQ_MC_BINARY_PLATFORM)_$(QORIQ_MC_BINARY_VERSION).itb +QORIQ_MC_BINARY_INSTALL_PATH = $(call qstrip,$(BR2_PACKAGE_QORIQ_MC_BINARY_TARGET_INSTALL_PATH)) + +ifeq ($(QORIQ_MC_BINARY_INSTALL_PATH),) +QORIQ_MC_BINARY_INSTALL_TARGET = NO +endif + +define QORIQ_MC_BINARY_INSTALL_IMAGES_CMDS + $(INSTALL) -D $(@D)/$(QORIQ_MC_BINARY_SUBDIR)/$(QORIQ_MC_BINARY_BIN) $(BINARIES_DIR)/mc.itb +endef + +define QORIQ_MC_BINARY_INSTALL_TARGET_CMDS + $(INSTALL) -D $(@D)/$(QORIQ_MC_BINARY_SUBDIR)/$(QORIQ_MC_BINARY_BIN) $(TARGET_DIR)/$(QORIQ_MC_BINARY_INSTALL_PATH)/mc.itb +endef + +$(eval $(generic-package)) diff --git a/package/qoriq-mc-utils/Config.in b/package/qoriq-mc-utils/Config.in new file mode 100644 index 0000000000..7444aef4c3 --- /dev/null +++ b/package/qoriq-mc-utils/Config.in @@ -0,0 +1,76 @@ +config BR2_PACKAGE_QORIQ_MC_UTILS + bool "qoriq-mc-utils" + select BR2_PACKAGE_HOST_DTC + help + The Management Complex (MC) is a key component of the + networking subsystem named DPAA2 (Data Path Acceleration + Architecture, second version) in some NXP Layerscape SoCs. + + The MC firmware is configured through two distinct files + named DPL and DPC, which are customizable by the end user. + Example configuration files for NXP reference boards are + distributed through this package, and are frequently patched + to produce the configuration required in other scenarios. + + https://github.com/nxp-qoriq/mc-utils + # sign in required + https://www.nxp.com/webapp/Download?colCode=DPAA2UM + +if BR2_PACKAGE_QORIQ_MC_UTILS + +config BR2_PACKAGE_QORIQ_MC_UTILS_DPC_CUSTOM_PATH + string "Data Path Configuration (DPC) custom file paths" + help + The DPC file contains the settings defining the behavior + of the MC firmware. Its structure follows the device + tree syntax and is compiled to a device tree blob. + + This option defines a space-separated list of device + tree source (DTS) file names, specified without + the trailing .dts. It should be used when the NXP + qoriq-mc-utils repository does not contain an adequate + DPC for the platform, and is preferable to patching + the package. + +config BR2_PACKAGE_QORIQ_MC_UTILS_DPC_INTREE + string "Data Path Configuration (DPC) in-tree files" + help + This option defines a space-separated list of device + tree source (DTS) files relative to the "config/" + folder of the qoriq-mc-utils repository, specified + without the trailing .dts. It should be used when NXP + provides an adequate DPC for the platform. + +config BR2_PACKAGE_QORIQ_MC_UTILS_DPL_CUSTOM_PATH + string "Data Path Layout (DPL) custom file paths" + help + The DPL file contains a description of the initial + networking objects created by the MC firmware when it + boots. Its structure follows the device tree syntax + and is compiled to a device tree blob. + + This option defines a space-separated list of device + tree source (DTS) files, specified without the + trailing .dts. It should be used when the NXP + qoriq-mc-utils repository does not contain an + adequate DPL for the platform, and is preferable to + patching the package. + +config BR2_PACKAGE_QORIQ_MC_UTILS_DPL_INTREE + string "Data Path Layout (DPL) in-tree files" + help + This option defines a space-separated list of device + tree source (DTS) files relative to the "config/" + folder of the qoriq-mc-utils repository, specified + without the trailing .dts. It should be used when NXP + provides an adequate DPL for the platform. + +config BR2_PACKAGE_QORIQ_MC_UTILS_TARGET_INSTALL_PATH + string "Path on target to install DPL and DPC files" + help + The DPL and DPC files can optionally be deployed to + the target at the path specified here. This is useful + if the mcinitcmd U-Boot environment variable is + configured to apply the DPL and DPC from the filesystem. + +endif diff --git a/package/qoriq-mc-utils/qoriq-mc-utils.hash b/package/qoriq-mc-utils/qoriq-mc-utils.hash new file mode 100644 index 0000000000..f0234b9d1f --- /dev/null +++ b/package/qoriq-mc-utils/qoriq-mc-utils.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 1d3f4a6b2661cff9cfb5d4fcba3b181eb6febdd88a127fa069e306f51d778fc5 qoriq-mc-utils-10.39.0.tar.gz +sha256 7a223031d76339df0e4e5a94d193a270fb9963d42b577aa42fe130a4657f3e17 LICENSE diff --git a/package/qoriq-mc-utils/qoriq-mc-utils.mk b/package/qoriq-mc-utils/qoriq-mc-utils.mk new file mode 100644 index 0000000000..63390ad6de --- /dev/null +++ b/package/qoriq-mc-utils/qoriq-mc-utils.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qoriq-mc-utils +# +################################################################################ + +QORIQ_MC_UTILS_VERSION = 10.39.0 +QORIQ_MC_UTILS_SITE = $(call github,nxp-qoriq,mc-utils,mc_release_$(QORIQ_MC_UTILS_VERSION)) +QORIQ_MC_UTILS_LICENSE = BSD-3-Clause +QORIQ_MC_UTILS_INSTALL_IMAGES = YES +QORIQ_MC_UTILS_DEPENDENCIES = host-dtc + +QORIQ_MC_UTILS_DPC_FILES = $(call qstrip,$(BR2_PACKAGE_QORIQ_MC_UTILS_DPC_CUSTOM_PATH)) +QORIQ_MC_UTILS_DPC_INTREE = $(call qstrip,$(BR2_PACKAGE_QORIQ_MC_UTILS_DPC_INTREE)) +QORIQ_MC_UTILS_DPL_FILES = $(call qstrip,$(BR2_PACKAGE_QORIQ_MC_UTILS_DPL_CUSTOM_PATH)) +QORIQ_MC_UTILS_DPL_INTREE = $(call qstrip,$(BR2_PACKAGE_QORIQ_MC_UTILS_DPL_INTREE)) +QORIQ_MC_UTILS_INSTALL_PATH = $(call qstrip,$(BR2_PACKAGE_QORIQ_MC_UTILS_TARGET_INSTALL_PATH)) + +ifeq ($(QORIQ_MC_UTILS_INSTALL_PATH),) +QORIQ_MC_UTILS_INSTALL_TARGET = NO +endif + +define QORIQ_MC_UTILS_INSTALL_FILES + $(INSTALL) -d $(1) + $(foreach file, $(QORIQ_MC_UTILS_DPC_FILES) $(QORIQ_MC_UTILS_DPL_FILES), \ + PATH=$(BR_PATH) dtc -I dts -O dtb $(file).dts -o $(1)/$(notdir $(file)).dtb + ) + $(foreach file, $(QORIQ_MC_UTILS_DPC_INTREE) $(QORIQ_MC_UTILS_DPL_INTREE), \ + $(INSTALL) -D $(@D)/config/$(file).dtb $(1)/$(notdir $(file)).dtb + ) +endef + +define QORIQ_MC_UTILS_BUILD_CMDS + PATH=$(BR_PATH) $(MAKE) -C $(@D)/config/ +endef + +define QORIQ_MC_UTILS_INSTALL_IMAGES_CMDS + $(call QORIQ_MC_UTILS_INSTALL_FILES,$(BINARIES_DIR)) +endef + +define QORIQ_MC_UTILS_INSTALL_TARGET_CMDS + $(call QORIQ_MC_UTILS_INSTALL_FILES,$(TARGET_DIR)/$(QORIQ_MC_UTILS_INSTALL_PATH)) +endef + +$(eval $(generic-package)) diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index 1f664842f5..1bdd38446d 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52dfb95a3d8e811609dd8a982a5c6f3ba88fac096ea8448a27b571b7c25e3a83 qoriq-rcw-lf-6.6.23-2.0.0.tar.gz +sha256 cf1caf7f45989025f8564c5edd9c98650082ebb2d091239292d3db8d75522164 qoriq-rcw-lf-6.12.20-2.0.0.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index c6cfe59a56..35602e41e4 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_RCW_VERSION = lf-6.6.23-2.0.0 +QORIQ_RCW_VERSION = lf-6.12.20-2.0.0 QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk index fae6ecc413..1f92068f18 100644 --- a/package/qpid-proton/qpid-proton.mk +++ b/package/qpid-proton/qpid-proton.mk @@ -6,7 +6,7 @@ QPID_PROTON_VERSION = 0.35.0 QPID_PROTON_SITE = \ - https://downloads.apache.org/qpid/proton/$(QPID_PROTON_VERSION) + https://archive.apache.org/dist/qpid/proton/$(QPID_PROTON_VERSION) QPID_PROTON_LICENSE = Apache-2.0 QPID_PROTON_LICENSE_FILES = LICENSE.txt QPID_PROTON_CPE_ID_VENDOR = apache diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 6e6a7cf984..c45b8c1591 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -72,8 +72,10 @@ config BR2_PACKAGE_QT5BASE_MYSQL config BR2_PACKAGE_QT5BASE_PSQL bool "PostgreSQL Plugin" depends on BR2_USE_MMU # postgresql - depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help @@ -126,7 +128,6 @@ config BR2_PACKAGE_QT5BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ - !BR2_PACKAGE_QT5BASE_DIRECTFB && \ !BR2_PACKAGE_QT5BASE_XCB && \ !BR2_PACKAGE_QT5BASE_EGLFS help @@ -193,13 +194,6 @@ config BR2_PACKAGE_QT5BASE_VULKAN config BR2_PACKAGE_QT5BASE_LINUXFB bool "linuxfb support" -config BR2_PACKAGE_QT5BASE_DIRECTFB - bool "directfb support" - depends on BR2_PACKAGE_DIRECTFB - -comment "directfb backend available if directfb is enabled" - depends on !BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_QT5BASE_XCB bool "X.org XCB support" depends on BR2_PACKAGE_XORG7 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 3fd5d30251..3ad2bdfc04 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -9,20 +9,13 @@ QT5BASE_SITE = $(QT5_SITE)/qtbase QT5BASE_SITE_METHOD = git QT5BASE_CPE_ID_VENDOR = qt QT5BASE_CPE_ID_PRODUCT = qt +# Closest upstream version +QT5BASE_CPE_ID_VERSION = 5.15.14 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# From commits: -# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" -# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" -QT5BASE_IGNORE_CVES += CVE-2021-38593 -# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" -QT5BASE_IGNORE_CVES += CVE-2022-25255 -# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" -QT5BASE_IGNORE_CVES += CVE-2022-25634 - # A few comments: # * -no-pch to workaround the issue described at # http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. @@ -40,7 +33,8 @@ QT5BASE_CONFIGURE_OPTS += \ -system-pcre \ -no-pch \ -shared \ - -no-feature-relocatable + -no-feature-relocatable \ + -no-directfb # starting from version 5.9.0, -optimize-debug is enabled by default # for debug builds and it overrides -O* with -Og which is not what we @@ -173,8 +167,6 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widge # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb # is to add a link against the "inuxfb" library. QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) QT5BASE_CONFIGURE_OPTS += -xkbcommon diff --git a/package/qt5/qt5declarative/0003-Include-cstdint-for-uintptr_t.patch b/package/qt5/qt5declarative/0003-Include-cstdint-for-uintptr_t.patch new file mode 100644 index 0000000000..6f6c525eef --- /dev/null +++ b/package/qt5/qt5declarative/0003-Include-cstdint-for-uintptr_t.patch @@ -0,0 +1,50 @@ +From c8c602382ff5261501e7b323d04fee90fa40be58 Mon Sep 17 00:00:00 2001 +From: Arnout Vandecappelle +Date: Sat, 17 May 2025 21:16:32 +0200 +Subject: [PATCH] Include for uintptr_t + +GCC 15 adheres more strictly to the standard about which type is defined +in which header. As such, uintptr_t is no longer available unless +cstdint is included. + +Add #include in the files that use uintptr_t. + +Note that in masm, stdint.h is included instead of cstdint, so leave +those alone. + +Signed-off-by: Arnout Vandecappelle +Upstream: https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/57 +--- + src/plugins/scenegraph/openvg/qopenvgoffscreensurface.cpp | 2 ++ + src/qml/compiler/qv4compiler.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/plugins/scenegraph/openvg/qopenvgoffscreensurface.cpp b/src/plugins/scenegraph/openvg/qopenvgoffscreensurface.cpp +index 1f2709e06c..cc3703de64 100644 +--- a/src/plugins/scenegraph/openvg/qopenvgoffscreensurface.cpp ++++ b/src/plugins/scenegraph/openvg/qopenvgoffscreensurface.cpp +@@ -37,6 +37,8 @@ + ** + ****************************************************************************/ + ++#include ++ + #include + #include "qopenvgoffscreensurface.h" + +diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp +index 18e19cf01c..3a8df1cd47 100644 +--- a/src/qml/compiler/qv4compiler.cpp ++++ b/src/qml/compiler/qv4compiler.cpp +@@ -37,6 +37,8 @@ + ** + ****************************************************************************/ + ++#include ++ + #include + #include + #include +-- +2.49.0 + diff --git a/package/qt5/qt5webengine-chromium/0011-Shorted-printed-cmd-when-long-commands-fail.patch b/package/qt5/qt5webengine-chromium/0011-Shorted-printed-cmd-when-long-commands-fail.patch new file mode 100644 index 0000000000..46349abc50 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0011-Shorted-printed-cmd-when-long-commands-fail.patch @@ -0,0 +1,57 @@ +From 1a713c6e4861f0672252425a1ccbfa9f45834d5d Mon Sep 17 00:00:00 2001 +From: Mohamed Heikal +Date: Tue, 4 Apr 2023 17:04:04 +0000 +Subject: [PATCH] Shorted printed cmd when long commands fail +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some commands (eg: javac) are very long and when they fail most of the +screen/log is filled with the actual cmd vs the error message output. +Shorten printed CMDs to 200 chars unless an environment variable is set. + +Bug: None +Change-Id: I92809a7e4a2b1204931a74fd6239803feddd430e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4395905 +Reviewed-by: Andrew Grieve +Commit-Queue: Mohamed Heikal +Cr-Commit-Position: refs/heads/main@{#1126065} +Upstream: Backport [https://github.com/chromium/chromium/commit/4c6fc1984970af4b2b1765014c9ddcd957ad7dda] +Signed-off-by: Gaël PORTAY +[gportay: remove import pipes] +--- + chromium/build/android/gyp/util/build_utils.py | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/chromium/build/android/gyp/util/build_utils.py b/chromium/build/android/gyp/util/build_utils.py +index 02298051702..5fa753af459 100644 +--- a/chromium/build/android/gyp/util/build_utils.py ++++ b/chromium/build/android/gyp/util/build_utils.py +@@ -12,7 +12,6 @@ import fnmatch + import json + import logging + import os +-import pipes + import re + import shutil + import stat +@@ -196,9 +195,14 @@ class CalledProcessError(Exception): + + def __str__(self): + # A user should be able to simply copy and paste the command that failed +- # into their shell. ++ # into their shell (unless it is more than 200 chars). ++ # User can set PRINT_FULL_COMMAND=1 to always print the full command. ++ print_full = os.environ.get('PRINT_FULL_COMMAND', '0') != '0' ++ full_cmd = shlex.join(self.args) ++ short_cmd = textwrap.shorten(full_cmd, width=200) ++ printed_cmd = full_cmd if print_full else short_cmd + copyable_command = '( cd {}; {} )'.format(os.path.abspath(self.cwd), +- ' '.join(map(pipes.quote, self.args))) ++ printed_cmd) + return 'Command failed: {}\n{}'.format(copyable_command, self.output) + + +-- +2.39.5 + diff --git a/package/qt5/qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch b/package/qt5/qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch new file mode 100644 index 0000000000..f68f266e39 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch @@ -0,0 +1,101 @@ +From 80ddc04dd2398611afd8eafd89f5a6cd81b82363 Mon Sep 17 00:00:00 2001 +From: Arnout Vandecappelle +Date: Sun, 18 May 2025 09:59:24 +0200 +Subject: [PATCH] Include for uintptr_t, uint8_t, etc. + +GCC 15 adheres more strictly to the standard about which type is defined +in which header. As such, uintptr_t, uint8_t, etc. are no longer +available unless cstdint is included. + +Add #include in the files that gave errors with GCC 15 + +Most (all?) of these fixes are already upstream, but spread out over +various commits that don't necessarily apply to our version. Fixing it +ourselves is simpler. + +Signed-off-by: Arnout Vandecappelle +Upstream: N/A, already fixed and we're very far behind +--- + chromium/base/task/thread_pool.h | 1 + + chromium/net/tools/huffman_trie/trie_entry.h | 1 + + .../transport_security_state_entry.h | 1 + + .../perfetto/include/perfetto/ext/tracing/core/slice.h | 1 + + .../perfetto/include/perfetto/tracing/tracing_backend.h | 1 + + .../perfetto/src/trace_processor/importers/gzip/gzip_utils.h | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/chromium/base/task/thread_pool.h b/chromium/base/task/thread_pool.h +index 085c249ba58e6..afc674ca7f6fb 100644 +--- a/chromium/base/task/thread_pool.h ++++ b/chromium/base/task/thread_pool.h +@@ -5,6 +5,7 @@ + #ifndef BASE_TASK_THREAD_POOL_H_ + #define BASE_TASK_THREAD_POOL_H_ + ++#include + #include + #include + +diff --git a/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h +index fe70260f981f2..eac6a7fc2499d 100644 +--- a/chromium/net/tools/huffman_trie/trie_entry.h ++++ b/chromium/net/tools/huffman_trie/trie_entry.h +@@ -5,6 +5,7 @@ + #ifndef NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ + #define NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ + ++#include + #include + #include + #include +diff --git a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h +index 59059d88f6df2..fe15bb7429f6d 100644 +--- a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h ++++ b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h +@@ -5,6 +5,7 @@ + #ifndef NET_TOOLS_TRANSPORT_SECURITY_STATE_GENERATOR_TRANSPORT_SECURITY_STATE_ENTRY_H_ + #define NET_TOOLS_TRANSPORT_SECURITY_STATE_GENERATOR_TRANSPORT_SECURITY_STATE_ENTRY_H_ + ++#include + #include + #include + #include +diff --git a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h +index 4ce66fdeadc3a..3f3932b228737 100644 +--- a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h ++++ b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h +index 67b0d2eb51e0d..3c2462de588dd 100644 +--- a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h ++++ b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h +@@ -17,6 +17,7 @@ + #ifndef INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_ + #define INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_ + ++#include + #include + #include + +diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h +index 624363ff66f90..68783e879c8e0 100644 +--- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h ++++ b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h +@@ -18,6 +18,7 @@ + #define SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_ + + #include ++#include + + struct z_stream_s; + +-- +2.49.0 + diff --git a/package/qt5/qt5webengine/0003-configure.pri-remove-some-of-the-thumb-detection-log.patch b/package/qt5/qt5webengine/0003-configure.pri-remove-some-of-the-thumb-detection-log.patch new file mode 100644 index 0000000000..57ed3558bc --- /dev/null +++ b/package/qt5/qt5webengine/0003-configure.pri-remove-some-of-the-thumb-detection-log.patch @@ -0,0 +1,69 @@ +From b00f7b41ffdee03f9982287d61c2fa21ebee5e6b Mon Sep 17 00:00:00 2001 +From: Arnout Vandecappelle +Date: Sat, 17 May 2025 22:09:32 +0200 +Subject: [PATCH] configure.pri: remove some of the thumb detection logic + +The hasThumbFlag test has a roundabout way of discovering whether thumb +is available. It looks at the -mthumb and -marm flag (which does make +some sense), but then it tries to look at -march to determine which ARM +architecture version is used. That test doesn't work if GCC is +configured for a default target architecture and no -march is passed on +the command line. + +In Buildroot, we don't pass any -mthumb, -marm or -march in CFLAGS +because all of that is included in the toolchain wrapper. Therefore, the +logic has nothing to determine the target ARM ISA version and returns +false. + +As a result, nothing is passed down to gn, and gn adds -marm to the +build. There is in fact a warning about this: + + WARNING: Thumb instruction set is required to build ffmpeg for QtWebEngine. + +but since it's just a warning, it gets ignored. + +Indeed, the build does fail (when ffmpeg is built, i.e. when +BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS is enabled) with: + + FAILED: obj/third_party/ffmpeg/ffmpeg_internal/vp8.o + [...] + {standard input}: Assembler messages: + {standard input}:1119: Error: bad instruction `ldrhcs r0,[ip],#2' + {standard input}:1156: Error: bad instruction `ldrhcs r9,[ip],#2' + +In practice, the architecture version doesn't really matter, because all +the architectures supported by JSCore have thumb. + +Therefore, remove the logic for detecting if the CPU architecture +supports thumb. Do keep the -marm and -mthumb logic, even though in +Buildroot it doesn't do anything, and the warning gets ignored. + +Signed-off-by: Arnout Vandecappelle +Upstream: It's not clear if the same logic about JSCore applies in +upstream, so not sent. +--- + configure.pri | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.pri b/configure.pri +index 8da334c83..3ff298e9f 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -370,14 +370,6 @@ defineTest(qtConfTest_hasThumbFlag) { + !isEmpty(FLAG): return(true) + FLAG = $$qtwebengine_extractCFlag("-marm") + !isEmpty(FLAG): return(false) +- +- MARCH = $$qtwebengine_extractCFlag("-march=.*") +- MARMV = $$replace(MARCH, "armv",) +- !isEmpty(MARMV) { +- MARMV = $$split(MARMV,) +- MARMV = $$member(MARMV, 0) +- } +- if (isEmpty(MARMV) | lessThan(MARMV, 7)): return(false) + # no flag assume mthumb + return(true) + } +-- +2.49.0 + diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 28786bd2c8..6179591399 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -25,7 +25,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libvpx depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 529a83df6c..00df7e1ede 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -71,13 +71,13 @@ QT5WEBENGINE_DEPENDENCIES += \ host-webp \ host-zlib \ freetype \ - jpeg \ lcms2 \ libevent \ libnss \ libvpx \ libxml2 \ libxslt \ + opus \ snappy \ webp @@ -88,13 +88,13 @@ QT5WEBENGINE_CONF_OPTS += \ -webengine-webp \ -feature-build-qtwebengine-core \ -feature-webengine-core-support \ + -feature-webengine-noexecstack \ -feature-webengine-system-dbus \ -feature-webengine-system-fontconfig \ -feature-webengine-system-freetype \ -feature-webengine-system-glib \ -feature-webengine-system-glibc \ -feature-webengine-system-harfbuzz \ - -feature-webengine-system-jpeg \ -feature-webengine-system-khr \ -feature-webengine-system-lcms2 \ -feature-webengine-system-libevent \ @@ -117,7 +117,7 @@ QT5WEBENGINE_CONF_OPTS += \ -no-feature-webengine-developer-build \ -no-feature-webengine-full-debug-info \ -no-feature-webengine-native-spellchecker \ - -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-jpeg \ -no-feature-webengine-system-minizip \ -no-feature-webengine-system-gn diff --git a/package/qt6/Config.in b/package/qt6/Config.in index c5a1a702d3..10594691cf 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -47,9 +47,13 @@ source "package/qt6/qt6base/Config.in" source "package/qt6/qt6charts/Config.in" source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6declarative/Config.in" +source "package/qt6/qt6graphs/Config.in" source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6mqtt/Config.in" +source "package/qt6/qt6multimedia/Config.in" source "package/qt6/qt6opcua/Config.in" +source "package/qt6/qt6quick3d/Config.in" +source "package/qt6/qt6quicktimeline/Config.in" source "package/qt6/qt6scxml/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 56c5a413ad..33cbf7551f 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -4,8 +4,8 @@ # ################################################################################ -QT6_VERSION_MAJOR = 6.7 -QT6_VERSION = $(QT6_VERSION_MAJOR).3 +QT6_VERSION_MAJOR = 6.8 +QT6_VERSION = $(QT6_VERSION_MAJOR).1 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 3b15d40c83..7f3948ec27 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -61,6 +61,7 @@ config BR2_PACKAGE_QT6BASE_XCB depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_CURSOR select BR2_PACKAGE_XCB_UTIL_IMAGE select BR2_PACKAGE_XCB_UTIL_KEYSYMS select BR2_PACKAGE_XCB_UTIL_RENDERUTIL @@ -200,10 +201,12 @@ comment "MySQL plugin needs a toolchain w/ C++, threads" config BR2_PACKAGE_QT6BASE_PSQL bool "PostgreSQL Plugin" - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR - depends on !BR2_OPTIMIZE_FAST + depends on BR2_USE_MMU # postgresql + depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql + depends on !BR2_STATIC_LIBS # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help Build PostgreSQL plugin diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 46fb668817..bc605c6821 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -1,3 +1,6 @@ +config BR2_PACKAGE_HOST_QT6BASE_CONCURRENT + bool + # Select this if you need host qt6 tools that require the Qt::Gui module (e.g. # Qt Shader Baker(qsb)). config BR2_PACKAGE_HOST_QT6BASE_GUI @@ -13,7 +16,5 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK config BR2_PACKAGE_HOST_QT6BASE_TEST bool -# Select this if you need host qt6 tools that require the Qt::Sql module -# (e.g. qhelpgenerator). -config BR2_PACKAGE_HOST_QT6BASE_SQL +config BR2_PACKAGE_HOST_QT6BASE_WIDGETS bool diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 695c1134c8..94269047c5 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtbase-everywhere-src-6.7.3.tar.xz.sha256 -sha256 8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097 qtbase-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtbase-everywhere-src-6.8.1.tar.xz.sha256 +sha256 40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf qtbase-everywhere-src-6.8.1.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt @@ -11,4 +11,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING +sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 888654a216..51a4f1b5be 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -83,17 +83,24 @@ HOST_QT6BASE_DEPENDENCIES = \ host-libb2 \ host-pcre2 \ host-zlib + HOST_QT6BASE_CONF_OPTS = \ - -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ + -DFEATURE_sql=OFF \ -DFEATURE_system_doubleconversion=ON \ -DFEATURE_system_libb2=ON \ -DFEATURE_system_pcre2=ON \ -DFEATURE_system_zlib=ON +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_CONCURRENT),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF +endif + # We need host-qt6base with Gui support when building host-qt6shadertools, # otherwise the build is skipped and no qsb host tool is generated. # qt6shadertools fail to build if qsb is not available. @@ -112,10 +119,16 @@ HOST_QT6BASE_CONF_OPTS += \ -DFEATURE_printsupport=OFF \ -DFEATURE_kms=OFF \ -DFEATURE_fontconfig=OFF \ - -DFEATURE_widgets=OFF \ -DFEATURE_libinput=OFF \ -DFEATURE_tslib=OFF \ -DFEATURE_eglfs=OFF + +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_WIDGETS),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + else HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif @@ -127,15 +140,6 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif -# We need host qt6base with Sql support for host-qt6tools to generate the -# qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not -# available. -ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y) -HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON -else -HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF -endif - # We need host-qt6base with Testlib support when building host-qt6declarative # with QuickTest support. QuickTest support is further required for building the # qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is @@ -199,6 +203,7 @@ QT6BASE_CONF_OPTS += \ QT6BASE_DEPENDENCIES += \ libxcb \ libxkbcommon \ + xcb-util-cursor \ xcb-util-wm \ xcb-util-image \ xcb-util-keysyms \ diff --git a/package/qt6/qt6charts/qt6charts.hash b/package/qt6/qt6charts/qt6charts.hash index fbeb580f29..215d18c576 100644 --- a/package/qt6/qt6charts/qt6charts.hash +++ b/package/qt6/qt6charts/qt6charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtcharts-everywhere-src-6.7.3.tar.xz.sha256 -sha256 07ea63a550e6bcfa4a9c38056f7aa524357305572268fe26f6063d83e4233659 qtcharts-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtcharts-everywhere-src-6.8.1.tar.xz.sha256 +sha256 2edea3f16e248ef508d99332798645b7f5ab6edbbf2e3d7d78fb674156f07d29 qtcharts-everywhere-src-6.8.1.tar.xz # Hashes for license files sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash index 0d8b1cf5d8..ba13da8d4e 100644 --- a/package/qt6/qt6core5compat/qt6core5compat.hash +++ b/package/qt6/qt6core5compat/qt6core5compat.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qt5compat-everywhere-src-6.7.3.tar.xz.sha256 -sha256 8b6a68a3dfaa7e9d10a0dafccee594c72e8de061bc573ae86b1c081b423a53f0 qt5compat-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qt5compat-everywhere-src-6.8.1.tar.xz.sha256 +sha256 05c8c088b4cd8331fa8a9c8b7ff7c42a088cb112e673eae5708048d0131264fc qt5compat-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash index 473b9b6baf..81b8ca929b 100644 --- a/package/qt6/qt6declarative/qt6declarative.hash +++ b/package/qt6/qt6declarative/qt6declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtdeclarative-everywhere-src-6.7.3.tar.xz.sha256 -sha256 937b70e441abf5bc4e50d44d26610e2714a28514acf3885cd36116cd610b9875 qtdeclarative-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtdeclarative-everywhere-src-6.8.1.tar.xz.sha256 +sha256 95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc qtdeclarative-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk index ecf14d3323..edec67649f 100644 --- a/package/qt6/qt6declarative/qt6declarative.mk +++ b/package/qt6/qt6declarative/qt6declarative.mk @@ -35,12 +35,6 @@ QT6DECLARATIVE_CONF_OPTS = \ -DQT_BUILD_EXAMPLES=OFF \ -DQT_BUILD_TESTS=OFF -HOST_QT6DECLARATIVE_CONF_OPTS = \ - -DQT_HOST_PATH=$(HOST_DIR) \ - -DBUILD_WITH_PCH=OFF \ - -DQT_BUILD_EXAMPLES=OFF \ - -DQT_BUILD_TESTS=OFF - HOST_QT6DECLARATIVE_DEPENDENCIES = \ host-qt6base diff --git a/package/qt6/qt6graphs/Config.in b/package/qt6/qt6graphs/Config.in new file mode 100644 index 0000000000..a99f25d6de --- /dev/null +++ b/package/qt6/qt6graphs/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_QT6GRAPHS + bool "qt6graphs" + select BR2_PACKAGE_QT6DECLARATIVE + select BR2_PACKAGE_QT6QUICK3D + help + This package corresponds to the Qt Graphs module: + + https://doc.qt.io/qt-6/qtgraphs-index.html diff --git a/package/qt6/qt6graphs/qt6graphs.hash b/package/qt6/qt6graphs/qt6graphs.hash new file mode 100644 index 0000000000..59d35d9e66 --- /dev/null +++ b/package/qt6/qt6graphs/qt6graphs.hash @@ -0,0 +1,5 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtgraphs-everywhere-src-6.8.1.tar.xz.sha256 +sha256 1e46e3de69936835652ab40ef8caf5824ea71e26871274561fb65ec142d54a80 qtgraphs-everywhere-src-6.8.1.tar.xz + +# Hashes for license files +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt diff --git a/package/qt6/qt6graphs/qt6graphs.mk b/package/qt6/qt6graphs/qt6graphs.mk new file mode 100644 index 0000000000..488d5acde2 --- /dev/null +++ b/package/qt6/qt6graphs/qt6graphs.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# qt6graphs +# +################################################################################ + +QT6GRAPHS_VERSION = $(QT6_VERSION) +QT6GRAPHS_SITE = $(QT6_SITE) +QT6GRAPHS_SOURCE = qtgraphs-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6GRAPHS_VERSION).tar.xz +QT6GRAPHS_INSTALL_STAGING = YES +QT6GRAPHS_SUPPORTS_IN_SOURCE_BUILD = NO +QT6GRAPHS_CMAKE_BACKEND = ninja +QT6GRAPHS_LICENSE = GPL-3.0 +QT6GRAPHS_LICENSE_FILES = LICENSES/GPL-3.0-only.txt + +QT6GRAPHS_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6GRAPHS_DEPENDENCIES = \ + qt6base \ + qt6declarative \ + qt6quick3d + +$(eval $(cmake-package)) diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash index e328cac5e4..a330ecb323 100644 --- a/package/qt6/qt6languageserver/qt6languageserver.hash +++ b/package/qt6/qt6languageserver/qt6languageserver.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtlanguageserver-everywhere-src-6.7.3.tar.xz.sha256 -sha256 c56d3872428503d9e49bfc6fa1023332f035ffd711d39e904e50cd6bb1f9df8f qtlanguageserver-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtlanguageserver-everywhere-src-6.8.1.tar.xz.sha256 +sha256 865e9436c1432a53e38a30625b6cee60bf72553ff508047115513a233c8e6d7e qtlanguageserver-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash index bc2dc68447..f13fbaab9c 100644 --- a/package/qt6/qt6mqtt/qt6mqtt.hash +++ b/package/qt6/qt6mqtt/qt6mqtt.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 0a80d52cf349b61e0c012f1aa692639ac958de46d8a76cdb99af7b6067cf5c46 qt6mqtt-6.7.3-git4.tar.gz +sha256 757c96a645b81e858c19b5407d54b3a40ee288d04ffadc9a96dd52e50c6d8d6b qt6mqtt-6.8.1-git4.tar.gz # Hashes for license files sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6multimedia/Config.in b/package/qt6/qt6multimedia/Config.in new file mode 100644 index 0000000000..8cdd95f3e8 --- /dev/null +++ b/package/qt6/qt6multimedia/Config.in @@ -0,0 +1,124 @@ +config BR2_PACKAGE_QT6MULTIMEDIA + bool "qt6multimedia" + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_QT6SHADERTOOLS + help + This package provides Qt6 Multimedia: + + https://doc.qt.io/qt-6/qtmultimedia-index.html + https://code.qt.io/cgit/qt/qtmultimedia.git + +if BR2_PACKAGE_QT6MULTIMEDIA + +comment "alsa support requires disabling pulseaudio" + depends on BR2_PACKAGE_QT6MULTIMEDIA_PULSEAUDIO + +config BR2_PACKAGE_QT6MULTIMEDIA_ALSA + bool "alsa support" + # qt6-multimedia audio backend requires selection + # of either PulseAudio or ALSA. + depends on !BR2_PACKAGE_QT6MULTIMEDIA_PULSEAUDIO + select BR2_PACKAGE_ALSA_LIB + help + This option selects Alsa as audio backend. + +config BR2_PACKAGE_QT6MULTIMEDIA_EXAMPLES + bool "examples" + select BR2_PACKAGE_QT6SVG + help + This option enables the Qt6 Multimedia examples. + +comment "ffmpeg plugin needs kernel headers >= 5.2" + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + +config BR2_PACKAGE_QT6MULTIMEDIA_FFMPEG + bool "ffmpeg plugin" + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC + # V4L2_PIX_FMT_BGRA32 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + # qt6-multimedia ffmpeg plugin needs + # qt6base-concurrent, PulseAudio and ffmpeg-swcale. + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG_SWSCALE + select BR2_PACKAGE_QT6BASE_CONCURRENT + select BR2_PACKAGE_QT6MULTIMEDIA_PULSEAUDIO + # libxext/libxrandr are needed for ffmpeg plugin to build with + # X11 support: + # https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/multimedia/ffmpeg/CMakeLists.txt?h=6.8.1#n198 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 + help + This option enables ffmpeg media backend. + +if BR2_PACKAGE_QT6MULTIMEDIA_FFMPEG + +comment "VAAPI support needs OpenGL, EGL, libgbm with dma-buf" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + +config BR2_PACKAGE_QT6MULTIMEDIA_VAAPI + bool "vaapi support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + select BR2_PACKAGE_LIBVA + # ffmpeg-vaapi support needs qt6base-opengl + select BR2_PACKAGE_QT6BASE_OPENGL + select BR2_PACKAGE_QT6MULTIMEDIA_LINUX_DMA_BUF + help + This option enables the vaapi support. +endif + +config BR2_PACKAGE_QT6MULTIMEDIA_GSTREAMER + bool "gstreamer plugin" + # gstreamer 1.x and gst-plugins-base-app are required + # for gstreamer support in qt6-multimedia + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + select BR2_PACKAGE_GSTREAMER1 + help + This option enables gstreamer media backend. + +if BR2_PACKAGE_QT6MULTIMEDIA_GSTREAMER + +config BR2_PACKAGE_QT6MULTIMEDIA_GST1_PLUGINS_PHOTOGRAPHY + bool "photography support" + select BR2_PACKAGE_GST1_PLUGINS_BAD + help + This option enables gstreamer-photography support. + +endif + +comment "dma-buf support needs EGM, libgbm with dma-buf" + depends on !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + +config BR2_PACKAGE_QT6MULTIMEDIA_LINUX_DMA_BUF + bool "linux dma buffer support" + # qt6 configure script needs EGL to check for linux dma buffer + # support + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + help + This option enables the linux dma buffer support. + +config BR2_PACKAGE_QT6MULTIMEDIA_PULSEAUDIO + bool "pulseaudio support" + depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC + select BR2_PACKAGE_PULSEAUDIO + help + This option selects PulseAudio as audio backend. + +config BR2_PACKAGE_QT6MULTIMEDIA_SPATIALAUDIO + bool "spatial audio module" + help + This option enables the Qt6 Spatial Audio module. + + https://doc.qt.io/qt-6/qtspatialaudio-index.html + +endif diff --git a/package/qt6/qt6multimedia/qt6multimedia.hash b/package/qt6/qt6multimedia/qt6multimedia.hash new file mode 100644 index 0000000000..cddafb56a8 --- /dev/null +++ b/package/qt6/qt6multimedia/qt6multimedia.hash @@ -0,0 +1,24 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtmultimedia-everywhere-src-6.8.1.tar.xz.sha256 +sha256 75fa87134f9afab7f0a62c55a4744799ac79519560d19c8e1d4c32bdd173f953 qtmultimedia-everywhere-src-6.8.1.tar.xz + +# Hashes for license files +sha256 f32fb3b417a194167cfad068223fc975ba96c5960513a10f66a3c28720aec1df LICENSES/BSD-2-Clause.txt +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 1f1b677d26ab73e159a55c3a914cf12d888e18a9d0d469fedab4aa6e5a48b1c0 LICENSES/BSD-Source-Code.txt +sha256 84c6ef3ea9e3254a54d0acf5d3e0c61ae011b8fef7dd6940591cf060e6380a8f LICENSES/BSL-1.0.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 7658542977bfdced9e1059a6c934ce4281de76d103b831007b825917dc62511a LICENSES/IJG.txt +sha256 f2ec607f67bb0dd3053b49835b02110d5cd0f8eb6da3aac4dc0b142a6b299be9 LICENSES/ISC.txt +sha256 fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb LICENSES/LGPL-2.1-or-later.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt +sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172 LICENSES/MPL-2.0.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 bfb1112d49db5b1daecdfef24bd7e2f3ea0bafb33aa67aa0ab51e2bf8407c03d LICENSES/Zlib.txt +sha256 85da7c29c2d2f2e6b3116b1219584cb513474cab797b3312a779be4c2181e51e src/3rdparty/eigen/COPYING.BSD +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 src/3rdparty/eigen/COPYING.MPL2 +sha256 8b69cf3ac3ddd34df478c4ae6eaacf5e6c63ea7ee6403c8dad97e4d1438bc3c4 src/3rdparty/eigen/COPYRIGHTS +sha256 b522f821df94da3bad917e98ef04817b3af421c3b8c23e8247ae7e517b289934 src/3rdparty/pffft/COPYRIGHTS +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/pffft/LICENSE diff --git a/package/qt6/qt6multimedia/qt6multimedia.mk b/package/qt6/qt6multimedia/qt6multimedia.mk new file mode 100644 index 0000000000..c2a9d250cf --- /dev/null +++ b/package/qt6/qt6multimedia/qt6multimedia.mk @@ -0,0 +1,137 @@ +################################################################################ +# +# qt6multimedia +# +################################################################################ + +QT6MULTIMEDIA_VERSION = $(QT6_VERSION) +QT6MULTIMEDIA_SITE = $(QT6_SITE) +QT6MULTIMEDIA_SOURCE = qtmultimedia-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6MULTIMEDIA_VERSION).tar.xz +QT6MULTIMEDIA_INSTALL_STAGING = YES +QT6MULTIMEDIA_SUPPORTS_IN_SOURCE_BUILD = NO +QT6MULTIMEDIA_CMAKE_BACKEND = ninja +QT6MULTIMEDIA_LICENSE = GPL-3.0, LGPL-3.0 + +QT6MULTIMEDIA_LICENSE_FILES = \ + LICENSES/BSD-2-Clause.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/BSD-Source-Code.txt \ + LICENSES/BSL-1.0.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/IJG.txt \ + LICENSES/ISC.txt \ + LICENSES/LGPL-2.1-or-later.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/MIT.txt \ + LICENSES/MPL-2.0.txt \ + LICENSES/Qt-GPL-exception-1.0.txt \ + LICENSES/Zlib.txt \ + src/3rdparty/eigen/COPYING.BSD \ + src/3rdparty/eigen/COPYING.MPL2 \ + src/3rdparty/eigen/COPYRIGHTS \ + src/3rdparty/pffft/COPYRIGHTS \ + src/3rdparty/pffft/LICENSE + +QT6MULTIMEDIA_CONF_OPTS = \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DFEATURE_gstreamer_gl=OFF + +QT6MULTIMEDIA_DEPENDENCIES = \ + qt6base \ + qt6shadertools + +# for multimedia quick module +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +QT6MULTIMEDIA_DEPENDENCIES += qt6declarative +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_ALSA),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_alsa=ON +QT6MULTIMEDIA_DEPENDENCIES += alsa-lib +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_alsa=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_EXAMPLES),y) +QT6MULTIMEDIA_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON +QT6MULTIMEDIA_DEPENDENCIES += qt6svg +else +QT6MULTIMEDIA_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_FFMPEG),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_ffmpeg=ON +QT6MULTIMEDIA_DEPENDENCIES += ffmpeg +# libxext/libxrandr are needed for ffmpeg plugin to build with X11 +# support: +# https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/multimedia/ffmpeg/CMakeLists.txt?h=6.8.1#n198 +ifeq ($(BR2_PACKAGE_XORG7),y) +QT6MULTIMEDIA_DEPENDENCIES += xlib_libXext xlib_libXrandr +endif +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_ffmpeg=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_GSTREAMER),y) +QT6MULTIMEDIA_CONF_OPTS += \ + -DFEATURE_gstreamer=ON \ + -DFEATURE_gstreamer_1_0=ON \ + -DFEATURE_gstreamer_app=ON +QT6MULTIMEDIA_DEPENDENCIES += \ + gst1-plugins-base \ + gstreamer1 +else +QT6MULTIMEDIA_CONF_OPTS += \ + -DFEATURE_gstreamer=OFF \ + -DFEATURE_gstreamer_1_0=OFF \ + -DFEATURE_gstreamer_app=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_GST1_PLUGINS_PHOTOGRAPHY),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_gstreamer_photography=ON +QT6MULTIMEDIA_DEPENDENCIES += gst1-plugins-bad +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_gstreamer_photography=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_LINUX_DMA_BUF),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_linux_dmabuf=ON +QT6MULTIMEDIA_DEPENDENCIES += \ + libgbm \ + libegl +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_linux_dmabuf=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_PULSEAUDIO),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_pulseaudio=ON +QT6MULTIMEDIA_DEPENDENCIES += pulseaudio +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_pulseaudio=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_SPATIALAUDIO),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_spatialaudio=ON +ifeq ($(BR2_PACKAGE_QT6QUICK3D),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_spatialaudio_quick3d=ON +QT6MULTIMEDIA_DEPENDENCIES += qt6quick3d +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_spatialaudio_quick3d=OFF +endif + +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_spatialaudio=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6MULTIMEDIA_VAAPI),y) +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_vaapi=ON +QT6MULTIMEDIA_DEPENDENCIES += libva +else +QT6MULTIMEDIA_CONF_OPTS += -DFEATURE_vaapi=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/qt6/qt6opcua/Config.in b/package/qt6/qt6opcua/Config.in index 68b73f7c50..9b5359dd4c 100644 --- a/package/qt6/qt6opcua/Config.in +++ b/package/qt6/qt6opcua/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_QT6OPCUA bool "qt6opcua" select BR2_PACKAGE_QT6BASE_NETWORK - # qt6opcuda needs host-qt6opcua, and host-qt6opcua needs + # qt6opcua needs host-qt6opcua, and host-qt6opcua needs # network support in qt6base. select BR2_PACKAGE_HOST_QT6BASE_NETWORK diff --git a/package/qt6/qt6opcua/qt6opcua.hash b/package/qt6/qt6opcua/qt6opcua.hash index 8bb89abd58..627450af60 100644 --- a/package/qt6/qt6opcua/qt6opcua.hash +++ b/package/qt6/qt6opcua/qt6opcua.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 09b5e525ad1a61b537b826f049b8725ab3b783bcaf3010a58361f73ff4df1cdb qt6opcua-6.7.3-git4.tar.gz +sha256 0283f634707bf5c88ed30fec604bf7ea3bc22620cd060517812f9fb6304f254b qt6opcua-6.8.1-git4.tar.gz # Hashes for license files sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6opcua/qt6opcua.mk b/package/qt6/qt6opcua/qt6opcua.mk index 6c8ff7af89..28771ba8a5 100644 --- a/package/qt6/qt6opcua/qt6opcua.mk +++ b/package/qt6/qt6opcua/qt6opcua.mk @@ -28,10 +28,6 @@ QT6OPCUA_CONF_OPTS = \ -DQT_HOST_PATH=$(HOST_DIR) \ -DBUILD_WITH_PCH=OFF -HOST_QT6OPCUA_CONF_OPTS = \ - -DQT_HOST_PATH=$(HOST_DIR) \ - -DBUILD_WITH_PCH=OFF - QT6OPCUA_DEPENDENCIES = \ qt6base \ host-qt6opcua diff --git a/package/qt6/qt6quick3d/Config.in b/package/qt6/qt6quick3d/Config.in new file mode 100644 index 0000000000..3ec267734f --- /dev/null +++ b/package/qt6/qt6quick3d/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT6QUICK3D + bool "qt6quick3d" + select BR2_PACKAGE_HOST_QT6BASE_CONCURRENT # Host Quick3DRuntimeRender + select BR2_PACKAGE_HOST_QT6BASE_GUI + select BR2_PACKAGE_HOST_QT6BASE_WIDGETS + select BR2_PACKAGE_QT6DECLARATIVE + select BR2_PACKAGE_QT6DECLARATIVE_QUICK + help + This package corresponds to the Qt Quick 3D module: + + https://doc.qt.io/qt-6/qtquick3d-index.html diff --git a/package/qt6/qt6quick3d/qt6quick3d.hash b/package/qt6/qt6quick3d/qt6quick3d.hash new file mode 100644 index 0000000000..960cda69ad --- /dev/null +++ b/package/qt6/qt6quick3d/qt6quick3d.hash @@ -0,0 +1,14 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtquick3d-everywhere-src-6.8.1.tar.xz.sha256 +sha256 3f3d345e6c95fcd40ab37e6a37cd31811e5d239dea8e142e632d4ea41bf20ce7 qtquick3d-everywhere-src-6.8.1.tar.xz + +# Hashes for license files +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 d040359701c01996a017d5c515678929cd1b0625e64cb86db44025fbb6cdf1fc LICENSES/MIT.txt +sha256 c3ed04bcbea49f521e4ab32c638fa86b13ebc7b8e1a8972807265079fcd1e6b9 src/3rdparty/assimp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/embree/LICENSE.txt +sha256 063805e3b8e24ceab4c5dea358b03245ee41c31be87cf65c61d836636cb494bb src/3rdparty/meshoptimizer/LICENSE.md +sha256 2af9d14c7cd67f13c3e7e91dcfe15ec5c8af42923635441e0f5a75bcadadeb33 src/3rdparty/tinyexr/LICENSE +sha256 2c16d5b1c2808277fe975b4f70f0fd9afc9b3bcf04e6c676665a82cb2d5579e3 src/3rdparty/xatlas/LICENSE +sha256 966313e8129db5d0b3b081d1a50ae107da9a3da2d8faa05899e3042a33192525 src/helpers/GODOT_LICENSE.txt +sha256 966313e8129db5d0b3b081d1a50ae107da9a3da2d8faa05899e3042a33192525 src/runtimerender/GODOT_LICENSE.txt diff --git a/package/qt6/qt6quick3d/qt6quick3d.mk b/package/qt6/qt6quick3d/qt6quick3d.mk new file mode 100644 index 0000000000..246bd2d82d --- /dev/null +++ b/package/qt6/qt6quick3d/qt6quick3d.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# qt6quick3d +# +################################################################################ + +QT6QUICK3D_VERSION = $(QT6_VERSION) +QT6QUICK3D_SITE = $(QT6_SITE) +QT6QUICK3D_SOURCE = qtquick3d-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6QUICK3D_VERSION).tar.xz +QT6QUICK3D_INSTALL_STAGING = YES +QT6QUICK3D_SUPPORTS_IN_SOURCE_BUILD = NO +QT6QUICK3D_CMAKE_BACKEND = ninja +QT6QUICK3D_LICENSE = GPL-3.0 + +QT6QUICK3D_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/MIT.txt \ + src/3rdparty/assimp/LICENSE \ + src/3rdparty/embree/LICENSE.txt \ + src/3rdparty/meshoptimizer/LICENSE.md \ + src/3rdparty/tinyexr/LICENSE \ + src/3rdparty/xatlas/LICENSE \ + src/helpers/GODOT_LICENSE.txt \ + src/runtimerender/GODOT_LICENSE.txt + +QT6QUICK3D_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6QUICK3D_DEPENDENCIES = \ + host-qt6quick3d \ + host-qt6shadertools \ + qt6base \ + qt6declarative + +ifeq ($(BR2_PACKAGE_ASSIMP),y) +QT6QUICK3D_CONF_OPTS += -DFEATURE_system_assimp=ON +QT6QUICK3D_DEPENDENCIES += assimp +else +QT6QUICK3D_CONF_OPTS += -DFEATURE_system_assimp=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6QUICKTIMELINE),y) +QT6QUICK3D_DEPENDENCIES += qt6quicktimeline +endif + +ifeq ($(BR2_PACKAGE_QT6SHADERTOOLS),y) +QT6QUICK3D_DEPENDENCIES += qt6shadertools +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +QT6QUICK3D_CONF_OPTS += -DFEATURE_system_zlib=ON +QT6QUICK3D_DEPENDENCIES += zlib +else +QT6QUICK3D_CONF_OPTS += -DFEATURE_system_zlib=OFF +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/qt6/qt6quicktimeline/Config.in b/package/qt6/qt6quicktimeline/Config.in new file mode 100644 index 0000000000..466aab23c8 --- /dev/null +++ b/package/qt6/qt6quicktimeline/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_QT6QUICKTIMELINE + bool "qt6quicktimeline" + select BR2_PACKAGE_QT6DECLARATIVE + select BR2_PACKAGE_QT6DECLARATIVE_QUICK + help + This package corresponds to the Qt Quick Timeline module: + + https://doc.qt.io/qt-6/qtquicktimeline-index.html diff --git a/package/qt6/qt6quicktimeline/qt6quicktimeline.hash b/package/qt6/qt6quicktimeline/qt6quicktimeline.hash new file mode 100644 index 0000000000..b042b4e2f8 --- /dev/null +++ b/package/qt6/qt6quicktimeline/qt6quicktimeline.hash @@ -0,0 +1,5 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtquicktimeline-everywhere-src-6.8.1.tar.xz.sha256 +sha256 fdbc198e27fd7bce0801fb3cfa336e81932607e6a36c97ae8394880eedfe12a3 qtquicktimeline-everywhere-src-6.8.1.tar.xz + +# Hashes for license files +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt diff --git a/package/qt6/qt6quicktimeline/qt6quicktimeline.mk b/package/qt6/qt6quicktimeline/qt6quicktimeline.mk new file mode 100644 index 0000000000..18544a5a2b --- /dev/null +++ b/package/qt6/qt6quicktimeline/qt6quicktimeline.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# qt6quicktimeline +# +################################################################################ + +QT6QUICKTIMELINE_VERSION = $(QT6_VERSION) +QT6QUICKTIMELINE_SITE = $(QT6_SITE) +QT6QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6QUICKTIMELINE_VERSION).tar.xz +QT6QUICKTIMELINE_INSTALL_STAGING = YES +QT6QUICKTIMELINE_SUPPORTS_IN_SOURCE_BUILD = NO +QT6QUICKTIMELINE_CMAKE_BACKEND = ninja +QT6QUICKTIMELINE_LICENSE = GPL-3.0 +QT6QUICKTIMELINE_LICENSE_FILES = LICENSES/GPL-3.0-only.txt + +QT6QUICKTIMELINE_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6QUICKTIMELINE_DEPENDENCIES = \ + qt6base \ + qt6declarative + +$(eval $(cmake-package)) diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash index f5e8b075a5..f239f18dd3 100644 --- a/package/qt6/qt6scxml/qt6scxml.hash +++ b/package/qt6/qt6scxml/qt6scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtscxml-everywhere-src-6.7.3.tar.xz.sha256 -sha256 608febeb0dafb6fbf559e064dee779ab799441ed804267b534705ea5077eeda3 qtscxml-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtscxml-everywhere-src-6.8.1.tar.xz.sha256 +sha256 2f406f44cfacd6eddb90468012a5d1d99d7a64ec05a21a2a7eda9dfc12614fd6 qtscxml-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash index 7da5f2bb43..9777633b85 100644 --- a/package/qt6/qt6serialbus/qt6serialbus.hash +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtserialbus-everywhere-src-6.7.3.tar.xz.sha256 -sha256 55d82e9c7a827808b7383f0a57ad12c2a6fcf5b6c936b27e633155163c0a6276 qtserialbus-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtserialbus-everywhere-src-6.8.1.tar.xz.sha256 +sha256 40788d92ec5c3ae297818e9f9eea9d21e398a54fa3fd8ddd530d324548ed15da qtserialbus-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 7972749d10..d30c297d0f 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtserialport-everywhere-src-6.7.3.tar.xz.sha256 -sha256 d4fa58ee809b39c9eda8d20ee4677971e918edb9a076540466693bc46db146f0 qtserialport-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtserialport-everywhere-src-6.8.1.tar.xz.sha256 +sha256 098e72a5c06d7db003e3eea1b0ed72d7308e3ea9cb9e89b538816dc96c938395 qtserialport-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt @@ -7,4 +7,3 @@ sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENS sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt -sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialport/qt6serialport.mk b/package/qt6/qt6serialport/qt6serialport.mk index bdb16dd892..4a006d971a 100644 --- a/package/qt6/qt6serialport/qt6serialport.mk +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -23,8 +23,7 @@ QT6SERIALPORT_LICENSE_FILES = \ LICENSES/GFDL-1.3-no-invariants-only.txt \ LICENSES/GPL-2.0-only.txt \ LICENSES/GPL-3.0-only.txt \ - LICENSES/LGPL-3.0-only.txt \ - LICENSES/Qt-GPL-exception-1.0.txt + LICENSES/LGPL-3.0-only.txt QT6SERIALPORT_CONF_OPTS = \ -DQT_HOST_PATH=$(HOST_DIR) \ diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash index d796561424..015ec5b96f 100644 --- a/package/qt6/qt6shadertools/qt6shadertools.hash +++ b/package/qt6/qt6shadertools/qt6shadertools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtshadertools-everywhere-src-6.7.3.tar.xz.sha256 -sha256 74e512798c7ddbda354a2d8d975211454bbabb47afb7e598892067a5828c0995 qtshadertools-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtshadertools-everywhere-src-6.8.1.tar.xz.sha256 +sha256 55b70cd632473a8043c74ba89310f7ba9c5041d253bc60e7ae1fa789169c4846 qtshadertools-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6svg/qt6svg.hash b/package/qt6/qt6svg/qt6svg.hash index 611dbf72a7..cd7a148fb7 100644 --- a/package/qt6/qt6svg/qt6svg.hash +++ b/package/qt6/qt6svg/qt6svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtsvg-everywhere-src-6.7.3.tar.xz.sha256 -sha256 40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b qtsvg-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtsvg-everywhere-src-6.8.1.tar.xz.sha256 +sha256 3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0 qtsvg-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6tools/Config.in.host b/package/qt6/qt6tools/Config.in.host index 7a6f8a5176..404ebfa923 100644 --- a/package/qt6/qt6tools/Config.in.host +++ b/package/qt6/qt6tools/Config.in.host @@ -2,9 +2,6 @@ config BR2_PACKAGE_HOST_QT6TOOLS bool "host qt6tools" # The Qt Qt Network module is required select BR2_PACKAGE_HOST_QT6BASE_NETWORK - # Requires the Qt Sql module to build the qhelpgenerator - # tool, if target support for Sql is present - select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash index dba38b2895..ede1608ec4 100644 --- a/package/qt6/qt6tools/qt6tools.hash +++ b/package/qt6/qt6tools/qt6tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qttools-everywhere-src-6.7.3.tar.xz.sha256 -sha256 f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f qttools-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qttools-everywhere-src-6.8.1.tar.xz.sha256 +sha256 9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d qttools-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk index b063f08887..fd32b3352a 100644 --- a/package/qt6/qt6tools/qt6tools.mk +++ b/package/qt6/qt6tools/qt6tools.mk @@ -28,11 +28,18 @@ QT6TOOLS_LICENSE_FILES = \ LICENSES/Qt-GPL-exception-1.0.txt QT6TOOLS_CONF_OPTS = \ + -DFEATURE_assistant=OFF \ + -DFEATURE_designer=OFF \ + -DFEATURE_linguist=OFF \ -DQT_HOST_PATH=$(HOST_DIR) \ -DBUILD_WITH_PCH=OFF \ -DQT_BUILD_EXAMPLES=OFF \ -DQT_BUILD_TESTS=OFF +# Disable clang support in qt6tools for now, as version 17 is needed: +# https://code.qt.io/cgit/qt/qttools.git/tree/.cmake.conf?h=6.8.1 +QT6TOOLS_CONF_OPTS += -DFEATURE_clang=OFF + QT6TOOLS_DEPENDENCIES = \ qt6base \ host-qt6tools @@ -42,9 +49,15 @@ QT6TOOLS_DEPENDENCIES += qt6declarative endif HOST_QT6TOOLS_CONF_OPTS = \ + -DFEATURE_assistant=OFF \ + -DFEATURE_designer=OFF \ -DQT_BUILD_EXAMPLES=OFF \ -DQT_BUILD_TESTS=OFF +# Disable clang support in qt6tools for now, as version 17 is needed: +# https://code.qt.io/cgit/qt/qttools.git/tree/.cmake.conf?h=6.8.1 +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_clang=OFF + HOST_QT6TOOLS_DEPENDENCIES = host-qt6base ifeq ($(BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS),y) diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash index 3f568755ed..60b9ab08de 100644 --- a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash +++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz.sha256 -sha256 1a872104e212c048ada47d28ea8bb2e0ab0637663a3b085989349e249f1423d9 qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz.sha256 +sha256 1022a3bc4093ec732e85b659158c8a70a31eecbd0dfef4e4f6c67f474f89a264 qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash index a1fdb649b2..a378097eb4 100644 --- a/package/qt6/qt6wayland/qt6wayland.hash +++ b/package/qt6/qt6wayland/qt6wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtwayland-everywhere-src-6.7.3.tar.xz.sha256 -sha256 e326c7ceb628f503bfc20577d5d2df9690ee10db08eb940cb80c759a6972b2b5 qtwayland-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtwayland-everywhere-src-6.8.1.tar.xz.sha256 +sha256 2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203 qtwayland-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash index d9cfe8e173..789f51a71d 100644 --- a/package/qt6/qt6websockets/qt6websockets.hash +++ b/package/qt6/qt6websockets/qt6websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtwebsockets-everywhere-src-6.7.3.tar.xz.sha256 -sha256 ba03007db7ee68a5bc3e3bd1d71e11f3e1f84e470bcb8c54cd7c01bbe1c5990e qtwebsockets-everywhere-src-6.7.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/qtwebsockets-everywhere-src-6.8.1.tar.xz.sha256 +sha256 e4cfdae8760bedd1c2b00429a6c9bf88cc11c5018dcb46bde277fb1edf341e3f qtwebsockets-everywhere-src-6.8.1.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/quagga/0001-fix-ipctl-forwarding.patch b/package/quagga/0001-fix-ipctl-forwarding.patch deleted file mode 100644 index e2e3421edb..0000000000 --- a/package/quagga/0001-fix-ipctl-forwarding.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add definitions for IPCTL_FORWARDING and IP6CTL_FORWARDING. - -Inspired from -http://svn.gnumonks.org/trunk/grouter/build/src/quagga/quagga/quagga-0.99.1-forward_sysctl-2.6.14.patch - -Signed-off-by: Thomas Petazzoni - -Index: quagga-0.99.16/zebra/ipforward_sysctl.c -=================================================================== ---- quagga-0.99.16.orig/zebra/ipforward_sysctl.c 2010-06-20 23:40:45.000000000 +0200 -+++ quagga-0.99.16/zebra/ipforward_sysctl.c 2010-06-20 23:41:37.000000000 +0200 -@@ -31,6 +31,15 @@ - - #define MIB_SIZ 4 - -+/* Fix for recent (2.6.14) kernel headers */ -+#ifndef IPCTL_FORWARDING -+#define IPCTL_FORWARDING NET_IPV4_FORWARD -+#endif -+ -+#ifndef IP6CTL_FORWARDING -+#define IP6CTL_FORWARDING NET_IPV6_FORWARDING -+#endif -+ - extern struct zebra_privs_t zserv_privs; - - /* IPv4 forwarding control MIB. */ diff --git a/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch b/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch deleted file mode 100644 index f2fc9cc647..0000000000 --- a/package/quagga/0002-lib-prefix.h-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 01bcd0f7411f86eea44247bf91b48882cae35519 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 21 Sep 2020 23:12:25 +0200 -Subject: [PATCH] lib/prefix.h: fix build with gcc 10 - -Remove __packed to fix the following build failure with gcc 10 (which -defaults to -fno-common): - - CCLD libzebra.la -/tmp/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: .libs/sockunion.o:(.bss+0x0): multiple definition of `__packed'; .libs/vty.o:(.bss+0x6c): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/82b15cff3f7b943eb93d8270790f1b8561d31d6a - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugzilla.quagga.net/show_bug.cgi?id=1014] ---- - lib/prefix.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/prefix.h b/lib/prefix.h -index 2cf0b20b..a5306eee 100644 ---- a/lib/prefix.h -+++ b/lib/prefix.h -@@ -44,7 +44,7 @@ - */ - struct ethaddr { - u_char octet[ETHER_ADDR_LEN]; --} __packed; -+}; - - - /* --- -2.28.0 - diff --git a/package/quagga/0003-Fix-build-with-gcc-10.patch b/package/quagga/0003-Fix-build-with-gcc-10.patch deleted file mode 100644 index fbe85165ee..0000000000 --- a/package/quagga/0003-Fix-build-with-gcc-10.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 7a446434302d7b71211b81b3c6cd12a7b35223d1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 6 Mar 2021 16:28:37 +0100 -Subject: [PATCH] Fix build with gcc 10 - -Fix the following build failure with gcc 10 (which defaults to --fno-common): - - CCLD pimd -/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pimd.o:(.bss+0x8): multiple definition of `qpim_static_route_list'; pim_main.o:(.bss+0x8): first defined here -/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pimd.o:(.bss+0x28): multiple definition of `qpim_mroute_del_last'; pim_main.o:(.bss+0x10): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/fd5ee2b52a3cfaec268fafd3ffe4c30e51465c7e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugzilla.quagga.net/show_bug.cgi?id=1014] ---- - pimd/pim_version.h | 2 +- - pimd/pimd.c | 1 + - pimd/pimd.h | 66 +++++++++++++++++++++++----------------------- - 3 files changed, 35 insertions(+), 34 deletions(-) - -diff --git a/pimd/pim_version.h b/pimd/pim_version.h -index ef9f370c..891d4314 100644 ---- a/pimd/pim_version.h -+++ b/pimd/pim_version.h -@@ -25,6 +25,6 @@ - - #define PIMD_VERSION_STR "0.166" - --const char * const PIMD_VERSION; -+extern const char * const PIMD_VERSION; - - #endif /* PIM_VERSION_H */ -diff --git a/pimd/pimd.c b/pimd/pimd.c -index 97fb2233..d7340cc0 100644 ---- a/pimd/pimd.c -+++ b/pimd/pimd.c -@@ -50,6 +50,7 @@ int64_t qpim_mroute_socket_creation = 0; /* timestamp of creat - struct thread *qpim_mroute_socket_reader = 0; - int qpim_mroute_oif_highest_vif_index = -1; - struct list *qpim_channel_oil_list = 0; -+struct in_addr qpim_all_pim_routers_addr; - int qpim_t_periodic = PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */ - struct list *qpim_upstream_list = 0; - struct zclient *qpim_zclient_update = 0; -diff --git a/pimd/pimd.h b/pimd/pimd.h -index 9a7e6058..8b3496fd 100644 ---- a/pimd/pimd.h -+++ b/pimd/pimd.h -@@ -68,39 +68,39 @@ - #define PIM_MASK_PIM_J_P (1 << 12) - #define PIM_MASK_STATIC (1 << 13) - --const char *const PIM_ALL_SYSTEMS; --const char *const PIM_ALL_ROUTERS; --const char *const PIM_ALL_PIM_ROUTERS; --const char *const PIM_ALL_IGMP_ROUTERS; -- --struct thread_master *master; --uint32_t qpim_debugs; --int qpim_mroute_socket_fd; --int64_t qpim_mroute_socket_creation; /* timestamp of creation */ --struct thread *qpim_mroute_socket_reader; --int qpim_mroute_oif_highest_vif_index; --struct list *qpim_channel_oil_list; /* list of struct channel_oil */ --struct in_addr qpim_all_pim_routers_addr; --int qpim_t_periodic; /* Period between Join/Prune Messages */ --struct list *qpim_upstream_list; /* list of struct pim_upstream */ --struct zclient *qpim_zclient_update; --struct zclient *qpim_zclient_lookup; --struct pim_assert_metric qpim_infinite_assert_metric; --long qpim_rpf_cache_refresh_delay_msec; --struct thread *qpim_rpf_cache_refresher; --int64_t qpim_rpf_cache_refresh_requests; --int64_t qpim_rpf_cache_refresh_events; --int64_t qpim_rpf_cache_refresh_last; --struct in_addr qpim_inaddr_any; --struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */ --struct in_addr qpim_ssmpingd_group_addr; --int64_t qpim_scan_oil_events; --int64_t qpim_scan_oil_last; --int64_t qpim_mroute_add_events; --int64_t qpim_mroute_add_last; --int64_t qpim_mroute_del_events; --int64_t qpim_mroute_del_last; --struct list *qpim_static_route_list; /* list of routes added statically */ -+extern const char *const PIM_ALL_SYSTEMS; -+extern const char *const PIM_ALL_ROUTERS; -+extern const char *const PIM_ALL_PIM_ROUTERS; -+extern const char *const PIM_ALL_IGMP_ROUTERS; -+ -+extern struct thread_master *master; -+extern uint32_t qpim_debugs; -+extern int qpim_mroute_socket_fd; -+extern int64_t qpim_mroute_socket_creation; /* timestamp of creation */ -+extern struct thread *qpim_mroute_socket_reader; -+extern int qpim_mroute_oif_highest_vif_index; -+extern struct list *qpim_channel_oil_list; /* list of struct channel_oil */ -+extern struct in_addr qpim_all_pim_routers_addr; -+extern int qpim_t_periodic; /* Period between Join/Prune Messages */ -+extern struct list *qpim_upstream_list; /* list of struct pim_upstream */ -+extern struct zclient *qpim_zclient_update; -+extern struct zclient *qpim_zclient_lookup; -+extern struct pim_assert_metric qpim_infinite_assert_metric; -+extern long qpim_rpf_cache_refresh_delay_msec; -+extern struct thread *qpim_rpf_cache_refresher; -+extern int64_t qpim_rpf_cache_refresh_requests; -+extern int64_t qpim_rpf_cache_refresh_events; -+extern int64_t qpim_rpf_cache_refresh_last; -+extern struct in_addr qpim_inaddr_any; -+extern struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */ -+extern struct in_addr qpim_ssmpingd_group_addr; -+extern int64_t qpim_scan_oil_events; -+extern int64_t qpim_scan_oil_last; -+extern int64_t qpim_mroute_add_events; -+extern int64_t qpim_mroute_add_last; -+extern int64_t qpim_mroute_del_events; -+extern int64_t qpim_mroute_del_last; -+extern struct list *qpim_static_route_list; /* list of routes added statically */ - - #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2) - --- -2.30.0 - diff --git a/package/quagga/Config.in b/package/quagga/Config.in deleted file mode 100644 index 9361b6a212..0000000000 --- a/package/quagga/Config.in +++ /dev/null @@ -1,95 +0,0 @@ -config BR2_PACKAGE_QUAGGA - bool "quagga" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC - help - Routing software suite, providing implementations of OSPFv2, - OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+. - - http://www.quagga.net/ - -if BR2_PACKAGE_QUAGGA - -config BR2_PACKAGE_QUAGGA_ZEBRA - bool "zebra daemon" - help - Build zebra daemon. - -config BR2_PACKAGE_QUAGGA_TCP_ZEBRA - bool "Use TCP sockets between zebra and protocol daemons" - depends on BR2_PACKAGE_QUAGGA_ZEBRA - help - Use a TCP socket to communicate between zebra (supervisor) - and the different protocol daemons. - - You'll want this enabled if zebra and the protocol daemon(s) - run on different hosts. - -config BR2_PACKAGE_QUAGGA_BGPD - bool "BGPv4+ protocol" - help - Build bgpd daemon. - -config BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE - bool "BGP route announcement" - depends on BR2_PACKAGE_QUAGGA_BGPD - -config BR2_PACKAGE_QUAGGA_ISISD - bool "IS-IS protocol" - help - Enable isisd support in quagga. - -config BR2_PACKAGE_QUAGGA_NHRPD - bool "NHRPD protocol" - select BR2_PACKAGE_C_ARES - help - Build Next Hop Routing Protocol daemon. - -config BR2_PACKAGE_QUAGGA_OSPFD - bool "OSPFv2 protocol" - help - Build ospfd daemon. - -config BR2_PACKAGE_QUAGGA_OSPF6D - bool "OSPFv3 (IPv6) protocol" - help - Build ospf6d daemon. - -config BR2_PACKAGE_QUAGGA_RIPD - bool "RIPv2/v3 protocol" - help - Build ripd daemon. - -config BR2_PACKAGE_QUAGGA_RIPNGD - bool "RIPng (IPv6) protocol" - help - Build ripngd daemon. - -config BR2_PACKAGE_QUAGGA_PIMD - bool "PIMd protocol" - help - Provides IPv4 PIM-SSM multicast routing. - -config BR2_PACKAGE_QUAGGA_WATCHQUAGGA - bool "Build watchquagga" - help - Build and install watchquagga, a zebra/protocol daemon - supervisor. - -config BR2_PACKAGE_QUAGGA_VTYSH - bool "Build vtysh" - select BR2_PACKAGE_READLINE - help - Build and install vtysh, a vty shell for Quagga. - -config BR2_PACKAGE_QUAGGA_SNMP - bool "SNMP support" - depends on BR2_USE_MMU # net-snmp - select BR2_PACKAGE_NETSNMP - help - Make quagga information available via SNMP SMUX. - -comment "AgentX support must be enabled in net-snmp or the build will break" - depends on BR2_PACKAGE_QUAGGA_SNMP - -endif diff --git a/package/quagga/quagga.hash b/package/quagga/quagga.hash deleted file mode 100644 index d63908ad8f..0000000000 --- a/package/quagga/quagga.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3 quagga-1.2.4.tar.gz - -# Hash for license file -sha256 b39c1bad4e51e2a3389cd25fc4addebe41a3ae7c11100795683f9330de1536e5 COPYING diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk deleted file mode 100644 index dd921552f1..0000000000 --- a/package/quagga/quagga.mk +++ /dev/null @@ -1,115 +0,0 @@ -################################################################################ -# -# quagga -# -################################################################################ - -QUAGGA_VERSION = 1.2.4 -# upstream (http://download.savannah.gnu.org/releases/quagga) dead -QUAGGA_SITE = http://sources.buildroot.net/quagga -QUAGGA_INSTALL_STAGING = YES -QUAGGA_DEPENDENCIES = host-gawk host-pkgconf -QUAGGA_LICENSE = GPL-2.0+ -QUAGGA_LICENSE_FILES = COPYING -QUAGGA_CPE_ID_VENDOR = quagga -QUAGGA_SELINUX_MODULES = zebra - -# We need to override the sysconf and localstate directories so that -# quagga can create files as the quagga user without extra -# intervention -QUAGGA_CONF_OPTS = \ - --program-transform-name='' \ - --sysconfdir=/etc/quagga \ - --localstatedir=/var/run/quagga - -# quagga has its own internal copy of getopt_long. To avoid conflicts with libc's -# getopt, we need to make sure that the getopt function itself is also built. -QUAGGA_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -DREALLY_NEED_PLAIN_GETOPT" - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -QUAGGA_CONF_OPTS += --enable-capabilities -QUAGGA_DEPENDENCIES += libcap -else -QUAGGA_CONF_OPTS += --disable-capabilities -endif - -ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) -QUAGGA_DEPENDENCIES += libxcrypt -endif - -ifeq ($(BR2_PACKAGE_PROTOBUF_C),y) -QUAGGA_CONF_OPTS += --enable-protobuf -QUAGGA_DEPENDENCIES += protobuf-c -else -QUAGGA_CONF_OPTS += --disable-protobuf -endif - -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd --disable-ospfapi) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_PIMD),--enable-pimd,--disable-pimd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),--enable-tcp-zebra,--disable-tcp-zebra) - -define QUAGGA_USERS - quagga -1 quagga -1 * - - - Quagga priv drop user -endef - -# Set the permissions of /etc/quagga such that quagga (through vtysh) -# can save the configuration - set the folder recursively as the files -# need to be 600, and then set the folder (non-recursively) to 755 so -# it can used. Quagga also needs to write to the folder as it moves -# and creates, rather than overwriting. -define QUAGGA_PERMISSIONS - /etc/quagga r 600 quagga quagga - - - - - - /etc/quagga d 755 quagga quagga - - - - - -endef - -# In order for the QUAGGA_PERMISSIONS variable above to work, -# /etc/quagga has to exist. However, this package without any -# sub-option enabled will not create /etc/quagga, so let's create it -# unconditionally in a post-install hook, in case it hasn't been -# already created by the quagga installation. -define QUAGGA_CREATE_ETC_QUAGGA - mkdir -p $(TARGET_DIR)/etc/quagga -endef -QUAGGA_POST_INSTALL_TARGET_HOOKS += QUAGGA_CREATE_ETC_QUAGGA - -ifeq ($(BR2_PACKAGE_QUAGGA_NHRPD),y) -QUAGGA_CONF_OPTS += --enable-nhrpd -QUAGGA_DEPENDENCIES += c-ares -else -QUAGGA_CONF_OPTS += --disable-nhrpd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) -QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config -QUAGGA_CONF_OPTS += --enable-snmp=agentx -QUAGGA_DEPENDENCIES += netsnmp -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_VTYSH),y) -QUAGGA_CONF_OPTS += --enable-vtysh -QUAGGA_DEPENDENCIES += readline -else -QUAGGA_CONF_OPTS += --disable-vtysh -endif - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -QUAGGA_CONF_OPTS += --disable-pie -endif - -define QUAGGA_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/quagga/quagga_tmpfiles.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/quagga.conf - $(INSTALL) -D -m 644 package/quagga/quagga@.service \ - $(TARGET_DIR)/usr/lib/systemd/system/quagga@.service -endef - -$(eval $(autotools-package)) diff --git a/package/quagga/quagga@.service b/package/quagga/quagga@.service deleted file mode 100644 index 797af32e12..0000000000 --- a/package/quagga/quagga@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Quagga %i routing daemon -ConditionFileIsExecutable=/usr/sbin/%i -Wants=quagga@zebra.service - -[Service] -Type=simple -EnvironmentFile=/etc/default/quagga-%i -PrivateTmp=true -# Systemd doesn't like having %i in the executable path. -ExecStart=/usr/bin/env /usr/sbin/%i $OPTS -f /etc/quagga/%i.conf -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-failure - -[Install] -WantedBy=multi-user.target - diff --git a/package/quagga/quagga_tmpfiles.conf b/package/quagga/quagga_tmpfiles.conf deleted file mode 100644 index e16c475fd4..0000000000 --- a/package/quagga/quagga_tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/quagga/ 1755 quagga quagga - diff --git a/package/quazip/quazip.hash b/package/quazip/quazip.hash index 1c5c614caf..46346d0124 100644 --- a/package/quazip/quazip.hash +++ b/package/quazip/quazip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 79633fd3a18e2d11a7d5c40c4c79c1786ba0c74b59ad752e8429746fe1781dd6 quazip-1.4.tar.gz +sha256 405b72b6e76c8987ff41a762523b8f64876ba406d8a831d268ee0b63f1369582 quazip-1.5.tar.gz sha256 b455b21b0d31d6e51993f1fb7e0694c75fa0eb0519a9ea62e4815fcf48b140b0 COPYING diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index ac28792f20..06b702e732 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAZIP_VERSION = 1.4 +QUAZIP_VERSION = 1.5 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = zlib diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index fd174bc657..a59d460706 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD - depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 depends on !BR2_sh # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_STATIC_LIBS # No way to check for fenv support. @@ -18,7 +17,6 @@ config BR2_PACKAGE_QUICKJS comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" depends on !BR2_microblaze - depends on !BR2_nios2 depends on !BR2_sh depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ diff --git a/package/quickjs/quickjs.hash b/package/quickjs/quickjs.hash index 30613b982a..798c857a10 100644 --- a/package/quickjs/quickjs.hash +++ b/package/quickjs/quickjs.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 quickjs-2024-01-13.tar.xz -sha256 f41baf09eef895d468d18c23055d74f711e4b8b2641cef279b5d71285c07bfe8 LICENSE +sha256 2f20074c25166ef6f781f381c50d57b502cb85d470d639abccebbef7954c83bf quickjs-2025-04-26.tar.xz +sha256 598fd7fc928e4350abce36e337ba5a1346923c5c692f5be92c3d8e29ddd7c18d LICENSE diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index e745923b87..e2170b2978 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUICKJS_VERSION = 2024-01-13 +QUICKJS_VERSION = 2025-04-26 QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT @@ -29,7 +29,7 @@ define QUICKJS_INSTALL_STAGING_CMDS EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ DESTDIR=$(STAGING_DIR) \ STRIP=/bin/true \ - prefix=/usr \ + PREFIX=/usr \ install endef @@ -39,7 +39,7 @@ define QUICKJS_INSTALL_TARGET_CMDS EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ DESTDIR=$(TARGET_DIR) \ STRIP=/bin/true \ - prefix=/usr \ + PREFIX=/usr \ install endef diff --git a/package/quota/0001-setproject-fix-openat-call.patch b/package/quota/0001-setproject-fix-openat-call.patch new file mode 100644 index 0000000000..3c5d523e1e --- /dev/null +++ b/package/quota/0001-setproject-fix-openat-call.patch @@ -0,0 +1,41 @@ +From d9852bd5b76ca65f283929e803b87343942ecb1f Mon Sep 17 00:00:00 2001 +From: Konstantin Demin +Date: Tue, 1 Jul 2025 14:35:36 +0200 +Subject: [PATCH] setproject: fix openat() call + +It looks like that openat() call was copy-pasted from above fstatat() call. +However, manpage for openat() doesn't mention AT_SYMLINK_NOFOLLOW. +Furthermore, AT_SYMLINK_NOFOLLOW constant value (0x100) sometimes (!) clashes +with O_CREAT constant value which is defined as 0100 (0x40) OR 0x100 (yes, two +different values for the same constant appear in headers). This produces build +errors when fortifying defines (-D_FORTIFY_SOURCE) are in effect (e.g. with +glibc 2.41). In order to keep correct behavior, use O_NOFOLLOW instead of +AT_SYMLINK_NOFOLLOW. + +Fixes: e61d46c65899ced9599c93a6128f19d8759fcad8 +Signed-off-by: Konstantin Demin +Signed-off-by: Jan Kara + +Upstream: https://sourceforge.net/p/linuxquota/code/ci/d9852bd5b76ca65f283929e803b87343942ecb1f/ + +Signed-off-by: Bernd Kuhls +--- + setproject.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setproject.c b/setproject.c +index 3047c3d..e688dcd 100644 +--- a/setproject.c ++++ b/setproject.c +@@ -73,7 +73,7 @@ static void setproject_recurse(int dirfd, unsigned id, unsigned dev) + if (!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) + continue; + +- int fd = openat(dirfd, d->d_name, AT_SYMLINK_NOFOLLOW); ++ int fd = openat(dirfd, d->d_name, O_NOFOLLOW); + if (fd < 0) { + errstr(_("error opening %s: %m"), d->d_name); + errno = 0; +-- +2.47.3 + diff --git a/package/quota/0002-setproject-Fix-openWRT-build.patch b/package/quota/0002-setproject-Fix-openWRT-build.patch new file mode 100644 index 0000000000..04cc5fab04 --- /dev/null +++ b/package/quota/0002-setproject-Fix-openWRT-build.patch @@ -0,0 +1,32 @@ +From 41ba7031ca4852739dd1f66102d34e4a98490906 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Tue, 1 Jul 2025 15:41:56 +0200 +Subject: [PATCH] setproject: Fix openWRT build + +basename() needs libgen.h include in openWRT build environment. Add it. + +Reported-by: "W. Michael Petullo" +Signed-off-by: Jan Kara + +Upstream: https://sourceforge.net/p/linuxquota/code/ci/41ba7031ca4852739dd1f66102d34e4a98490906/ + +Signed-off-by: Bernd Kuhls +--- + setproject.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setproject.c b/setproject.c +index e688dcd..4308435 100644 +--- a/setproject.c ++++ b/setproject.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.47.3 + diff --git a/package/quota/quota.hash b/package/quota/quota.hash index 5b083c911c..e82c1f2c64 100644 --- a/package/quota/quota.hash +++ b/package/quota/quota.hash @@ -1,7 +1,6 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.09/ (click on info button) -md5 f85c2e15d9a735640675ff4977b57bb6 quota-4.09.tar.gz -sha1 5c215d869626b532be2773f4161bdcc8b9f97126 quota-4.09.tar.gz +# From https://sourceforge.net/projects/linuxquota/files/quota-tools/4.10/ +sha1 343f26a6f1b6a8dbbd7d89045b0c087efb08d553 quota-4.10.tar.gz # Locally calculated -sha256 9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9 quota-4.09.tar.gz +sha256 a04a0cafca29c15be8b6ac660e06188bccb802c19efe2e7c19ed7f3d667ecf5e quota-4.10.tar.gz sha256 32a5fd41e7a257f7f0373988ea8d45cebdbf376060703c242c11c000751b1203 COPYING diff --git a/package/quota/quota.mk b/package/quota/quota.mk index 1b6a4b1975..f22ebe41c4 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -4,8 +4,8 @@ # ################################################################################ -QUOTA_VERSION = 4.09 -QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) +QUOTA_VERSION = 4.10 +QUOTA_SITE = https://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ QUOTA_LICENSE_FILES = COPYING diff --git a/package/racehound/Config.in b/package/racehound/Config.in index 5b8bdc77bc..757743f79b 100644 --- a/package/racehound/Config.in +++ b/package/racehound/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_RACEHOUND - CONFIG_KALLSYMS_ALL - CONFIG_KPROBES - https://github.com/winnukem/racehound + https://github.com/kmrov/racehound comment "racehound needs an Linux kernel >= 3.14 to be built" depends on !BR2_LINUX_KERNEL diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk index 6499e166d8..93ce5c8e57 100644 --- a/package/racehound/racehound.mk +++ b/package/racehound/racehound.mk @@ -5,7 +5,7 @@ ################################################################################ RACEHOUND_VERSION = f09f06fcc3c77c8c5541be3ba5be80aa8148ce0c -RACEHOUND_SITE = $(call github,winnukem,racehound,$(RACEHOUND_VERSION)) +RACEHOUND_SITE = $(call github,kmrov,racehound,$(RACEHOUND_VERSION)) RACEHOUND_LICENSE = GPL-2.0 RACEHOUND_LICENSE_FILES = LICENSE RACEHOUND_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/package/radvd/Config.in b/package/radvd/Config.in index f1df0c3cb8..374e184b74 100644 --- a/package/radvd/Config.in +++ b/package/radvd/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_RADVD bool "radvd" depends on BR2_USE_MMU # fork() + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd + depends on !BR2_STATIC_LIBS # libbsd + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD help IPv6 Router Advertisement Daemon. diff --git a/package/radvd/radvd.hash b/package/radvd/radvd.hash index a624db24ba..8415b8d854 100644 --- a/package/radvd/radvd.hash +++ b/package/radvd/radvd.hash @@ -1,3 +1,3 @@ -# From http://www.litech.org/radvd/dist/radvd-2.19.tar.gz.sha512 -sha512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233 radvd-2.19.tar.gz +# From http://www.litech.org/radvd/dist/radvd-2.20.tar.gz.sha512 +sha512 798d8476ab5ff43083b181d6d6ec43c47d06e4067d30c71e038cfd890bcf1ca23e809f9e184c4363458bfa25a916625dd2d7553290fb3e5459034d477b80ebaa radvd-2.20.tar.gz sha256 40a6db00cf0b97f031eaa6c6e87157788f40ced1b88e3ea6d78779bd2a39dc80 COPYRIGHT diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk index 7a3b0a36ac..89d8f55d51 100644 --- a/package/radvd/radvd.mk +++ b/package/radvd/radvd.mk @@ -4,9 +4,9 @@ # ################################################################################ -RADVD_VERSION = 2.19 +RADVD_VERSION = 2.20 RADVD_SITE = http://www.litech.org/radvd/dist -RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf +RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf libbsd # We need to ignore , because radvd already includes # , which conflicts with . RADVD_CONF_ENV = \ diff --git a/package/ramsmp/Config.in b/package/ramsmp/Config.in deleted file mode 100644 index 411e7de911..0000000000 --- a/package/ramsmp/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RAMSMP - bool "ramspeed/smp" - depends on BR2_USE_MMU # fork() - help - RAMspeed/SMP is a free open source command line utility to - measure cache and memory performance of multiprocessor - machines. - - http://alasir.com/software/ramspeed/ diff --git a/package/ramsmp/Makefile b/package/ramsmp/Makefile deleted file mode 100644 index 5cd76e09d9..0000000000 --- a/package/ramsmp/Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -all: generic - -generic: ramsmp.c fltmem.c fltmark.c intmem.c intmark.c - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o ramsmp - -i386: ramsmp.c i386/*.s i386/cpuinfo/*.s - $(CC) $(CFLAGS) -DI386_ASM $(LDFLAGS) $^ -o ramsmp - -x86_64: ramsmp.c amd64/*.s - $(CC) $(CFLAGS) -DAMD64_ASM $(LDFLAGS) $^ -o ramsmp - -clean: - rm -f *.o ramsmp diff --git a/package/ramsmp/ramsmp.hash b/package/ramsmp/ramsmp.hash deleted file mode 100644 index c5e29a3900..0000000000 --- a/package/ramsmp/ramsmp.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 ramsmp-3.5.0.tar.gz -sha256 2c308cffbab01762f8f6b11725725a227080746ef865f2756c9c9e1591dddaad LICENCE diff --git a/package/ramsmp/ramsmp.mk b/package/ramsmp/ramsmp.mk deleted file mode 100644 index 6098376da5..0000000000 --- a/package/ramsmp/ramsmp.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# ramsmp -# -################################################################################ - -RAMSMP_VERSION = 3.5.0 -RAMSMP_SITE = http://www.alasir.com/software/ramspeed -RAMSMP_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64) -RAMSMP_LICENSE = Alasir License -RAMSMP_LICENSE_FILES = LICENCE - -define RAMSMP_BUILD_CMDS - cp -f package/ramsmp/Makefile $(@D) - $(TARGET_CONFIGURE_OPTS) make -C $(@D) $(RAMSMP_ARCH) -endef - -define RAMSMP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/ramsmp $(TARGET_DIR)/usr/bin/ramsmp -endef - -$(eval $(generic-package)) diff --git a/package/ramspeed/Config.in b/package/ramspeed/Config.in deleted file mode 100644 index bd0438ffe1..0000000000 --- a/package/ramspeed/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -comment "ramspeed needs a toolchain not affected by GCC bug 43744" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - -config BR2_PACKAGE_RAMSPEED - bool "ramspeed" - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - help - RAMspeed is a free open source command line utility - to measure cache and memory performance. - - http://alasir.com/software/ramspeed/ diff --git a/package/ramspeed/Makefile b/package/ramspeed/Makefile deleted file mode 100644 index f4a4de6a1e..0000000000 --- a/package/ramspeed/Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -all: generic - -generic: ramspeed.c fltmem.c fltmark.c intmem.c intmark.c - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o ramspeed - -i386: ramspeed.c i386/*.s i386/cpuinfo/*.s - $(CC) $(CFLAGS) -DI386_ASM $(LDFLAGS) $^ -o ramspeed - -x86_64: ramspeed.c amd64/*.s - $(CC) $(CFLAGS) -DAMD64_ASM $(LDFLAGS) $^ -o ramspeed - -clean: - rm -f *.o ramspeed diff --git a/package/ramspeed/ramspeed.hash b/package/ramspeed/ramspeed.hash deleted file mode 100644 index 5a6bfe3eb2..0000000000 --- a/package/ramspeed/ramspeed.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 ramspeed-2.6.0.tar.gz -sha256 2c308cffbab01762f8f6b11725725a227080746ef865f2756c9c9e1591dddaad LICENCE diff --git a/package/ramspeed/ramspeed.mk b/package/ramspeed/ramspeed.mk deleted file mode 100644 index 7dc4faae7c..0000000000 --- a/package/ramspeed/ramspeed.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# ramspeed -# -################################################################################ - -RAMSPEED_VERSION = 2.6.0 -RAMSPEED_SITE = http://www.alasir.com/software/ramspeed -RAMSPEED_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64) -RAMSPEED_LICENSE = Alasir License -RAMSPEED_LICENSE_FILES = LICENCE - -define RAMSPEED_BUILD_CMDS - cp -f package/ramspeed/Makefile $(@D) - $(TARGET_CONFIGURE_OPTS) make -C $(@D) $(RAMSPEED_ARCH) -endef - -define RAMSPEED_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/ramspeed $(TARGET_DIR)/usr/bin/ramspeed -endef - -$(eval $(generic-package)) diff --git a/package/rapidjson/rapidjson.hash b/package/rapidjson/rapidjson.hash index ca5befdefc..c0a9b78716 100644 --- a/package/rapidjson/rapidjson.hash +++ b/package/rapidjson/rapidjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39f96f17b40f7201042c9b45d6444cb7eae1b7adfb7455412a86f6140450d32d rapidjson-ab1842a2dae061284c0a62dca1cc6d5e7e37e346.tar.gz +sha256 2d2601a82d2d3b7e143a3c8d43ef616671391034bc46891a9816b79cf2d3e7a8 rapidjson-24b5e7a8b27f42fa16b96fc70aade9106cf7102f.tar.gz sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index 3091edeab9..fcd6393b64 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAPIDJSON_VERSION = ab1842a2dae061284c0a62dca1cc6d5e7e37e346 +RAPIDJSON_VERSION = 24b5e7a8b27f42fa16b96fc70aade9106cf7102f RAPIDJSON_SITE = $(call github,Tencent,rapidjson,$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt diff --git a/package/raptor/0003-Fix-Heap-read-buffer-overflow-in-ntriples-bnode.patch b/package/raptor/0003-Fix-Heap-read-buffer-overflow-in-ntriples-bnode.patch new file mode 100644 index 0000000000..1242c7289c --- /dev/null +++ b/package/raptor/0003-Fix-Heap-read-buffer-overflow-in-ntriples-bnode.patch @@ -0,0 +1,30 @@ +From ece2c79df43091686a538b8231cf387d84bfa60e Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Fri, 7 Feb 2025 11:38:34 -0800 +Subject: [PATCH] Fix Github issue 70 B) Heap read buffer overflow in ntriples + bnode + +(raptor_ntriples_parse_term_internal): Only allow looking at the last +character of a bnode ID only if bnode length >0 + +CVE: CVE-2024-57822 +Upstream: https://github.com/dajobe/raptor/commit/ece2c79df43091686a538b8231cf387d84bfa60e + +Signed-off-by: Titouan Christophe +--- + src/raptor_ntriples.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_ntriples.c b/src/raptor_ntriples.c +index 3276e790..ecc4247c 100644 +--- a/src/raptor_ntriples.c ++++ b/src/raptor_ntriples.c +@@ -212,7 +212,7 @@ raptor_ntriples_parse_term_internal(raptor_world* world, + locator->column--; + locator->byte--; + } +- if(term_class == RAPTOR_TERM_CLASS_BNODEID && dest[-1] == '.') { ++ if(term_class == RAPTOR_TERM_CLASS_BNODEID && position > 0 && dest[-1] == '.') { + /* If bnode id ended on '.' move back one */ + dest--; + diff --git a/package/raptor/0004-Fix-integer-underflow-in-raptor_uri_normalize_path.patch b/package/raptor/0004-Fix-integer-underflow-in-raptor_uri_normalize_path.patch new file mode 100644 index 0000000000..55e8ab3f11 --- /dev/null +++ b/package/raptor/0004-Fix-integer-underflow-in-raptor_uri_normalize_path.patch @@ -0,0 +1,43 @@ +From da7a79976bd0314c23cce55d22495e7d29301c44 Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Thu, 6 Feb 2025 21:12:37 -0800 +Subject: [PATCH] Fix Github issue 70 A) Integer Underflow in + raptor_uri_normalize_path() + +(raptor_uri_normalize_path): Return empty buffer if path gets to 0 +length + +CVE: CVE-2024-57823 +Upstream: https://github.com/dajobe/raptor/commit/da7a79976bd0314c23cce55d22495e7d29301c44 + +Signed-off-by: Titouan Christophe +--- + src/raptor_rfc2396.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/raptor_rfc2396.c b/src/raptor_rfc2396.c +index 8cc364f4..f8ec5798 100644 +--- a/src/raptor_rfc2396.c ++++ b/src/raptor_rfc2396.c +@@ -351,6 +351,10 @@ raptor_uri_normalize_path(unsigned char* path_buffer, size_t path_len) + *dest++ = *s++; + *dest = '\0'; + path_len -= len; ++ if(path_len <= 0) { ++ *path_buffer = '\0'; ++ return 0; ++ } + + if(p && p < prev) { + /* We know the previous prev path component and we didn't do +@@ -390,6 +394,10 @@ raptor_uri_normalize_path(unsigned char* path_buffer, size_t path_len) + /* Remove /.. at the end of the path */ + *prev = '\0'; + path_len -= (s-prev); ++ if(path_len <= 0) { ++ *path_buffer = '\0'; ++ return 0; ++ } + } + + diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index ec7643ce3d..1b850400f8 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -14,6 +14,11 @@ RAPTOR_CPE_ID_VENDOR = librdf RAPTOR_CPE_ID_PRODUCT = raptor_rdf_syntax_library RAPTOR_INSTALL_STAGING = YES +# 0003-Fix-Heap-read-buffer-overflow-in-ntriples-bnode.patch +RAPTOR_IGNORE_CVES += CVE-2024-57822 +# 0004-Fix-integer-underflow-in-raptor_uri_normalize_path.patch +RAPTOR_IGNORE_CVES += CVE-2024-57823 + # Flag is added to make sure the patch is applied for the configure.ac of raptor. RAPTOR_AUTORECONF = YES diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 413fe88f03..e17be5f411 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2ce52a9f1de1aab39daa10fa487c55d20d34f679d11b1a1743d0ef81ffb3c726 raspberrypi-usbboot-20240926-102326-git4.tar.gz +sha256 339b1e2a0853ad700339206a2424c3fc9559518bc37ebfaac76b0484cf6f5bdb raspberrypi-usbboot-20250227-132106-git4.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 3135741e9b..dd7a2a1b24 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 20240926-102326 +RASPBERRYPI_USBBOOT_VERSION = 20250227-132106 RASPBERRYPI_USBBOOT_SITE = https://github.com/raspberrypi/usbboot.git RASPBERRYPI_USBBOOT_SITE_METHOD = git RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash index c65ead3784..b0833a744f 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 42318e96a464e6c716edb45c48bd3ec3b874462973db902fbe099a395e4acb4b rauc-hawkbit-updater-1.3.tar.xz +sha256 635da0807699d2efef63e44f6f6563efdb88f2f826f8ad7f8f852473a5416d71 rauc-hawkbit-updater-1.4.tar.xz sha256 041234c81fd6fe6c531ea1a886b9e740b9ee06759d1a910a14edbd06f4aa62c7 LICENSE diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index da1c020bb6..04b2e195d7 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_HAWKBIT_UPDATER_VERSION = 1.3 +RAUC_HAWKBIT_UPDATER_VERSION = 1.4 RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/releases/download/v$(RAUC_HAWKBIT_UPDATER_VERSION) RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 @@ -15,6 +15,10 @@ RAUC_HAWKBIT_UPDATER_CFLAGS = $(TARGET_CFLAGS) -std=c99 ifeq ($(BR2_PACKAGE_SYSTEMD),y) RAUC_HAWKBIT_UPDATER_DEPENDENCIES += systemd RAUC_HAWKBIT_UPDATER_CONF_OPTS += -Dsystemd=enabled +# rauc-hawkbit-updater.service uses this user and group +define RAUC_HAWKBIT_UPDATER_USERS + rauc-hawkbit -1 rauc-hawkbit -1 * - - - RAUC Hawkbit Updater +endef else RAUC_HAWKBIT_UPDATER_CONF_OPTS += -Dsystemd=disabled endif diff --git a/package/rauc/Config.in b/package/rauc/Config.in index af0b99c36b..9a910963a3 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -5,17 +5,19 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # uses X509_PURPOSE_get_by_id # uses ENGINE_* API - select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES select BR2_PACKAGE_SQUASHFS # run-time dependency - select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency - select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT help RAUC is the Robust Auto-Update Controller developed by Pengutronix. It supports updating embedded Linux systems over the network or from disks and provides a d-bus interface. + Notice: The U-Boot bootloader support requires fw_getenv / + fw_setenv from uboot-tools. + http://rauc.io/ if BR2_PACKAGE_RAUC diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index f3ab0a0be9..c0eee0d8d8 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 96681e119af8b6b9bb30e856a831e5a5b3292e9a5959d26ffa274b5135bc5031 rauc-1.12.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 4ae0b5246c668acb544ce0230a3bada81c78e8afd4755e5afa2218cbd686fd70 rauc-1.15.tar.xz +sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 475aee5d89..10d4a2db95 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.12 +RAUC_VERSION = 1.15 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 @@ -61,6 +61,7 @@ RAUC_CONF_OPTS += -Dstreaming=false endif HOST_RAUC_DEPENDENCIES = \ + host-json-glib \ host-pkgconf \ host-openssl \ host-libglib2 \ @@ -68,9 +69,9 @@ HOST_RAUC_DEPENDENCIES = \ $(if $(BR2_PACKAGE_HOST_LIBP11),host-libp11) HOST_RAUC_CONF_OPTS += \ + -Djson=enabled \ -Dnetwork=false \ -Dstreaming=false \ - -Djson=disabled \ -Dservice=false \ -Dtests=false diff --git a/package/rdesktop/0002-use-correct-modulus-and-exponent.patch b/package/rdesktop/0002-use-correct-modulus-and-exponent.patch new file mode 100644 index 0000000000..f6989d5777 --- /dev/null +++ b/package/rdesktop/0002-use-correct-modulus-and-exponent.patch @@ -0,0 +1,29 @@ +From 53ba87dc174175e98332e22355ad8662c02880d6 Mon Sep 17 00:00:00 2001 +From: Markus Beth +Date: Mon, 2 Dec 2019 11:22:13 +0100 +Subject: [PATCH] use correct modulus and exponent in rdssl_rkey_get_exp_mod + +Upstream: https://github.com/rdesktop/rdesktop/commit/53ba87dc174175e98332e22355ad8662c02880d6 + +Signed-off-by: Bernd Kuhls +--- + ssl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ssl.c b/ssl.c +index 930c7f94..0681a890 100644 +--- a/ssl.c ++++ b/ssl.c +@@ -307,10 +307,10 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, + { + size_t outlen; + +- outlen = (mpz_sizeinbase(modulus, 2) + 7) / 8; ++ outlen = (mpz_sizeinbase(rkey->n, 2) + 7) / 8; + if (outlen > max_mod_len) + return 1; +- outlen = (mpz_sizeinbase(exponent, 2) + 7) / 8; ++ outlen = (mpz_sizeinbase(rkey->e, 2) + 7) / 8; + if (outlen > max_exp_len) + return 1; + diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index 82d0ee784c..fd538fc5a4 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2c842d80964e6c24994cef33508f26bcb06042b70643115a9d28619dc2b96f42 rdma-core-54.0.tar.gz +sha256 aa9ca1f5a9e356f770441f52254ddc70ff0a4df76a25383e422075eb730efb4b rdma-core-60.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 20b89abedf..99b77dc03c 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 54.0 +RDMA_CORE_VERSION = 60.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md diff --git a/package/re2/Config.in b/package/re2/Config.in index b79e711ad3..acc4bdbe46 100644 --- a/package/re2/Config.in +++ b/package/re2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_RE2 bool "re2" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # libabseil-cpp select BR2_PACKAGE_LIBABSEIL_CPP diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 1598d1ee1b..25ca9b4896 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 3f6690c3393a613c3a0b566309cf04dc381d61470079b653afc47c67fb898198 re2-2024-04-01.tar.gz +sha256 2f3bec634c3e51ea1faf0d441e0a8718b73ef758d7020175ed7e352df3f6ae12 re2-2025-08-12.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 75dfdbaf50..1068e7cc54 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2024-04-01 +RE2_VERSION = 2025-08-12 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE diff --git a/package/readline/0001-Fix-build-with-non-wchar-toolchains.patch b/package/readline/0001-Fix-build-with-non-wchar-toolchains.patch new file mode 100644 index 0000000000..2ec8c9c6a1 --- /dev/null +++ b/package/readline/0001-Fix-build-with-non-wchar-toolchains.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 5 Jul 2025 07:48:20 +0200 +Subject: [PATCH] Fix build with non-wchar toolchains +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit a7f5650e6549e1b5c4e2e1fa30eee19de6bcbe7a added two functions to +mbutil.c but forgot to add defines for HANDLE_MULTIBYTE causing build +errors with toolchains without wchar support: + +../mbutil.c: In function ‘_rl_mb_strcaseeqn’: +../mbutil.c:594:3: error: unknown type name ‘mbstate_t’ + +Upstream: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00002.html + +Signed-off-by: Bernd Kuhls +--- + mbutil.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/mbutil.c b/mbutil.c +index 5243fd7..c15f3aa 100644 +--- a/mbutil.c ++++ b/mbutil.c +@@ -584,6 +584,7 @@ _rl_find_prev_mbchar (const char *string, int seed, int flags) + #endif + } + ++#if defined (HANDLE_MULTIBYTE) + /* Compare the first N characters of S1 and S2 without regard to case. If + FLAGS&1, apply the mapping specified by completion-map-case and make + `-' and `_' equivalent. Returns 1 if the strings are equal. */ +@@ -658,3 +659,4 @@ _rl_mb_charcasecmp (const char *s1, mbstate_t *ps1, const char *s2, mbstate_t *p + return 1; + return (wc1 == wc2); + } ++#endif /* HANDLE_MULTIBYTE */ +-- +2.39.5 + diff --git a/package/readline/0001-curses-link.patch b/package/readline/0001-curses-link.patch deleted file mode 100644 index 6afc5ba078..0000000000 --- a/package/readline/0001-curses-link.patch +++ /dev/null @@ -1,18 +0,0 @@ -link readline directly to ncurses since it needs symbols from it - -upstream readline does this on purpose (no direct linking), but -it doesn't make much sense in a Linux world - -Signed-off-by: Gustavo Zacarias - ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -42,7 +42,7 @@ - SHOBJ_LIBS= - - SHLIB_XLDFLAGS= --SHLIB_LIBS= -+SHLIB_LIBS=-lncurses - - SHLIB_DOT='.' - SHLIB_LIBPREF='lib' diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch deleted file mode 100644 index c2c2d81260..0000000000 --- a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b8d91eab12603fa88e095248855f5f772d182d05 Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Wed, 5 Oct 2022 10:41:16 -0400 -Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with - an invalid locale specification - -Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b -[peter: stripped unrelated ._.gitignore change] -Signed-off-by: Peter Seiderer ---- - nls.c | 4 ++++ - patchlevel | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/nls.c b/nls.c -index 5c6a13b..8c027d6 100644 ---- a/nls.c -+++ b/nls.c -@@ -141,6 +141,10 @@ _rl_init_locale (void) - if (lspec == 0) - lspec = ""; - ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ -+ if (ret == 0 || *ret == 0) -+ ret = setlocale (LC_CTYPE, (char *)NULL); -+ if (ret == 0 || *ret == 0) -+ ret = RL_DEFAULT_LOCALE; - #else - ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; - #endif -diff --git a/patchlevel b/patchlevel -index d8c9df7..fdf4740 100644 ---- a/patchlevel -+++ b/patchlevel -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --0 -+1 --- -2.39.2 - diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 627746d821..961ef77a0d 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig -sha256 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz +# https://ftp.gnu.org/gnu/readline/readline-8.3.tar.gz.sig +sha256 fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc readline-8.3.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 66812dee77..f69cbe45e2 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,14 +4,17 @@ # ################################################################################ -READLINE_VERSION = 8.2 +READLINE_VERSION = 8.3 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf HOST_READLINE_DEPENDENCIES = host-ncurses host-autoconf READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ bash_cv_wcwidth_broken=no -READLINE_CONF_OPTS = --disable-install-examples +READLINE_CONF_OPTS = \ + --disable-install-examples \ + --with-curses \ + --with-shared-termcap-library READLINE_LICENSE = GPL-3.0+ READLINE_LICENSE_FILES = COPYING READLINE_CPE_ID_VENDOR = gnu diff --git a/package/redis/Config.in b/package/redis/Config.in index a2239b4a54..ed11ce8c2e 100644 --- a/package/redis/Config.in +++ b/package/redis/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_REDIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() + depends on BR2_INSTALL_LIBSTDCPP # fastfloat bundled dep is in C++ help Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message @@ -15,8 +16,8 @@ config BR2_PACKAGE_REDIS http://www.redis.io -comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl" +comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl, C++" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_INSTALL_LIBSTDCPP diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 5c3a5ea4d8..f9c70c469f 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d redis-7.2.5.tar.gz +sha256 d88f2361fdf3a3a8668fe5753e29915566109dca07b4cb036427ea6dc7783671 redis-8.2.3.tar.gz # Locally calculated -sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING +sha256 4a0e416b9537688f30dfe69ddaceb2ca64d96b7df02a0a6760d376890ddc4e40 LICENSE.txt diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 852bf31ca0..c8073407b9 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,10 +4,12 @@ # ################################################################################ -REDIS_VERSION = 7.2.5 +REDIS_VERSION = 8.2.3 REDIS_SITE = http://download.redis.io/releases -REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) -REDIS_LICENSE_FILES = COPYING +REDIS_LICENSE = \ + AGPL-3.0 or SSPL-1.0 or RSAL-2.0 (core); \ + MIT and BSD family licenses (Bundled components) +REDIS_LICENSE_FILES = LICENSE.txt REDIS_CPE_ID_VENDOR = redislabs REDIS_SELINUX_MODULES = redis diff --git a/package/refpolicy/2.20250213/0001-fix-building-when-dbus-module-is-not-enabled.patch b/package/refpolicy/2.20250213/0001-fix-building-when-dbus-module-is-not-enabled.patch new file mode 100644 index 0000000000..4ac9725961 --- /dev/null +++ b/package/refpolicy/2.20250213/0001-fix-building-when-dbus-module-is-not-enabled.patch @@ -0,0 +1,40 @@ +From eff537f7be038120ca06fc7c39f9817ae120ce00 Mon Sep 17 00:00:00 2001 +From: Dave Sugar +Date: Thu, 15 May 2025 10:05:24 -0400 +Subject: [PATCH] fix building when dbus module is not enabled + +Signed-off-by: Dave Sugar +Upstream: https://github.com/SELinuxProject/refpolicy/pull/908 +Signed-off-by: Arnout Vandecappelle +--- + policy/modules/system/selinuxutil.te | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te +index 86a6e5503..cd0e8762f 100644 +--- a/policy/modules/system/selinuxutil.te ++++ b/policy/modules/system/selinuxutil.te +@@ -99,7 +99,8 @@ role run_init_roles types run_init_t; + + type selinux_dbus_t; + type selinux_dbus_exec_t; +-dbus_system_domain(selinux_dbus_t, selinux_dbus_exec_t) ++domain_type(selinux_dbus_t) ++domain_entry_file(selinux_dbus_t, selinux_dbus_exec_t) + + type semanage_t; + type semanage_exec_t; +@@ -504,6 +505,10 @@ miscfiles_read_localization(selinux_dbus_t) + + seutil_domtrans_semanage(selinux_dbus_t) + ++optional_policy(` ++ dbus_system_domain(selinux_dbus_t, selinux_dbus_exec_t) ++') ++ + optional_policy(` + policykit_dbus_chat(selinux_dbus_t) + ') +-- +2.49.0 + diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 8ae8f0448d..f330c685ab 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -26,7 +26,7 @@ config BR2_PACKAGE_REFPOLICY policies is not correct. Individual policies would need to be tweaked to get everything functioning properly. - https://github.com/TresysTechnology/refpolicy + https://github.com/SELinuxProject/refpolicy if BR2_PACKAGE_REFPOLICY @@ -121,6 +121,31 @@ config BR2_REFPOLICY_EXTRA_MODULES endif +config BR2_REFPOLICY_SET_BOOLEANS + string "Set policy booleans" + help + Set default values for policy booleans before compiling the + policy (see policy/booleans.conf in the refpolicy + README). The value of this option is a space separated list + of either plain names (to set that boolean to true), or + "name=(true|false)" pairs (to set the given value). + + Boolean values can still be changed at runtime if the policy + permits, but such changes cannot be persisted with a + monolithic policy. + +config BR2_REFPOLICY_ENABLEAUDIT + bool "remove dontaudit rules from policy (debugging only)" + help + Remove dontaudit rules from policy.conf before compiling the + policy. This can be useful for debugging to see "denied" + audit log messages that would otherwise be hidden, which + show the cause of problems. + + Warning: This option will likely produce a high rate of + audit log messages, and should be enabled only for + debugging. + endif comment "refpolicy needs a toolchain w/ threads, gcc >= 5, host gcc >= 5" diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index 5e876d4a43..1ebb57e480 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 7ed41f4f45189b9ee9706da8ac357eccc103651b56daabaddb54c436e8117cf9 refpolicy-2.20240226.tar.bz2 +sha256 e5b435c934048d01ca4415a1f2670a51e113f26f5d01ad4227c98fbe8dea8d5b refpolicy-2.20250923.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 74ccb79624..c5d8ce3b57 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20240226 +REFPOLICY_VERSION = 2.20250923 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif @@ -101,6 +101,21 @@ define REFPOLICY_CONFIGURE_SYSTEMD endef endif +ifeq ($(BR2_REFPOLICY_ENABLEAUDIT),y) +define REFPOLICY_CONFIGURE_ENABLEAUDIT + $(REFPOLICY_MAKE) -C $(@D) enableaudit +endef +endif + +# Override defaults for policy booleans. name=(true|false) will result +# in the given value, just a name implies "true". +define REFPOLICY_CONFIGURE_BOOLEANS + $(foreach b,$(call qstrip,$(BR2_REFPOLICY_SET_BOOLEANS)), + read -r name value < <(echo "$(subst =, ,$(b))"); \ + $(SED) "/^$${name} =/c\\$${name} = $${value:-true}" $(@D)/policy/booleans.conf + ) +endef + define REFPOLICY_CONFIGURE_CMDS $(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = $(REFPOLICY_POLICY_VERSION)" \ $(@D)/build.conf @@ -111,7 +126,9 @@ define REFPOLICY_CONFIGURE_CMDS $(REFPOLICY_COPY_EXTRA_MODULES) ) $(REFPOLICY_MAKE) -C $(@D) bare conf + $(REFPOLICY_CONFIGURE_ENABLEAUDIT) $(REFPOLICY_CONFIGURE_MODULES) + $(REFPOLICY_CONFIGURE_BOOLEANS) endef define REFPOLICY_BUILD_CMDS diff --git a/package/restclient-cpp/restclient-cpp.hash b/package/restclient-cpp/restclient-cpp.hash index 96c6d6c9e0..55f3b3589b 100644 --- a/package/restclient-cpp/restclient-cpp.hash +++ b/package/restclient-cpp/restclient-cpp.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 d62ba618f9a938652fd53b483289e8662a99451839e59058c8beb286dfbc65ec restclient-cpp-0.5.2.tar.gz +sha256 ca450e15d9b9724234d234686f22862eef97b776cbebb433382830974949d6f2 restclient-cpp-0.5.3.tar.gz sha256 1c2f79e825a39eb61d8919044776627f4d079ff38975410a3bde340154fc94a4 LICENSE diff --git a/package/restclient-cpp/restclient-cpp.mk b/package/restclient-cpp/restclient-cpp.mk index 1ba9ed8139..6a0c8627af 100644 --- a/package/restclient-cpp/restclient-cpp.mk +++ b/package/restclient-cpp/restclient-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTCLIENT_CPP_VERSION = 0.5.2 +RESTCLIENT_CPP_VERSION = 0.5.3 RESTCLIENT_CPP_SITE = $(call github,mrtazz,restclient-cpp,$(RESTCLIENT_CPP_VERSION)) RESTCLIENT_CPP_LICENSE = MIT RESTCLIENT_CPP_LICENSE_FILES = LICENSE diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 34847f28f1..dcfbd54617 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 4192595c08c775ff540f5ab850885ce11b132a4a4e29b65f20e751dd0a69d31f restorecond-3.7.tar.gz +sha256 d57b6ffe7eafd01af58e5efa50f8522eca73c0b3cb2955ca3f33397ba074a1a7 restorecond-3.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 4624b9204d..e8f432c88d 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.7 +RESTORECOND_VERSION = 3.9 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = LICENSE diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch index e665a6570e..8df1491e40 100644 --- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch @@ -1,4 +1,4 @@ -From 77f850969433b14769ade4281899373f3ebabf86 Mon Sep 17 00:00:00 2001 +From 3199b83995a9e3a180664c03db6b301641d8f3ea Mon Sep 17 00:00:00 2001 From: Jonathan Stites Date: Wed, 6 May 2020 12:55:35 +0000 Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag @@ -11,16 +11,18 @@ supported by the upstream project, so ripgrep will fail to build. Signed-off-by: Sam Voss [Antoine: update for 14.1.0] Signed-off-by: Antoine Coutant +[Mehdi: update for 14.1.1] +Signed-off-by: El Mehdi YOUNES --- .github/workflows/ci.yml | 6 ++++++ .github/workflows/release.yml | 8 +++++++- Cargo.toml | 8 +++++++- - README.md | 9 +++++++++ + README.md | 8 ++++++++ crates/core/main.rs | 8 ++++++-- - 5 files changed, 35 insertions(+), 4 deletions(-) + 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index d21b85a..0c9ecb9 100644 +index 532e2e9..744e2bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,6 +172,12 @@ jobs: @@ -37,7 +39,7 @@ index d21b85a..0c9ecb9 100644 # We could test this when using Cross, but we'd have to execute the # 'rg' binary (done in test-complete) with qemu, which is a pain and diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml -index f6ea3d9..ac18129 100644 +index f6ea3d9..b9ac802 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -171,7 +171,13 @@ jobs: @@ -45,8 +47,8 @@ index f6ea3d9..ac18129 100644 echo "target dir is: ${{ env.TARGET_DIR }}" - - name: Build release binary -+ - name: Build release binary (linux) -+ if: matrix.build == 'linux' ++ - name : Build release binary (linux) ++ if: matrix.build == 'linux + # Use jemalloc allocator for much better performance over the musl default allocator + run: ${{ env.CARGO }} build --verbose --release --features "pcre2 jemalloc" ${{ env.TARGET_FLAGS }} + @@ -56,7 +58,7 @@ index f6ea3d9..ac18129 100644 run: | ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }} diff --git a/Cargo.toml b/Cargo.toml -index da350bc..1a0a48f 100644 +index 2ec69c9..2785c12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,8 +59,9 @@ serde_json = "1.0.23" @@ -70,9 +72,9 @@ index da350bc..1a0a48f 100644 [dev-dependencies] serde = "1.0.77" -@@ -70,6 +71,11 @@ walkdir = "2" +@@ -69,6 +70,11 @@ walkdir = "2" + [features] - simd-accel = ["grep/simd-accel"] pcre2 = ["grep/pcre2"] +# The jemalloc allocator is used for improved +# performance on x86 musl builds. @@ -83,16 +85,15 @@ index da350bc..1a0a48f 100644 [profile.release] debug = 1 diff --git a/README.md b/README.md -index 0821fab..fdb9fb5 100644 +index a429087..f017864 100644 --- a/README.md +++ b/README.md -@@ -478,6 +478,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have +@@ -486,6 +486,14 @@ build a static executable with MUSL and with PCRE2, then you will need to have `musl-gcc` installed, which might be in a separate package from the actual MUSL library, depending on your Linux distribution. +When building with the MUSL target on Linux, it is recommended to use the +jemalloc allocator for performance: -+ +``` +$ rustup target add x86_64-unknown-linux-musl +$ cargo build --release --target x86_64-unknown-linux-musl --features jemalloc @@ -129,5 +130,5 @@ index 64f35ce..9aa6663 100644 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; -- -2.25.1 +2.43.0 diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index 39165770dc..c6cfa63ea3 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e1e66e2e9a7290a0a9445a82886a678ee8b2583b296fb851e1472c7403a681a ripgrep-14.1.0-cargo2.tar.gz +sha256 cb56abf62d2e9924a873af5dba4ecc87964a5144459d240a83e42c26ea6f9d7f ripgrep-14.1.1-cargo4.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 288c20ee95..f340452169 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,13 +4,10 @@ # ################################################################################ -RIPGREP_VERSION = 14.1.0 +RIPGREP_VERSION = 14.1.1 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT RIPGREP_CPE_ID_VALID = YES -# CVE only impacts ripgrep on Windows -RIPGREP_IGNORE_CVES += CVE-2021-3013 - $(eval $(cargo-package)) diff --git a/package/rnnoise/0001-Fix-compilation-errors.patch b/package/rnnoise/0001-Fix-compilation-errors.patch new file mode 100644 index 0000000000..bbe710012e --- /dev/null +++ b/package/rnnoise/0001-Fix-compilation-errors.patch @@ -0,0 +1,147 @@ +From 372f7b4b76cde4ca1ec4605353dd17898a99de38 Mon Sep 17 00:00:00 2001 +From: "Timothy B. Terriberry" +Date: Mon, 15 Apr 2024 11:27:25 -0700 +Subject: [PATCH] Fix compilation errors. + +vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or + greater) without the Opus macros. +Also, nobody was defining OPUS_CLEAR (but several things were + including the non-existent os_support.h where it is defined in + libopus), so replace those calls with RNN_CLEAR and remove the + erroneous includes. +Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too, + since it is needed in multiple places now. + +Fixes GitHub #222 + +Upstream: https://github.com/xiph/rnnoise/commit/372f7b4b76cde4ca1ec4605353dd17898a99de38 +Signed-off-by: Peter Korsgaard +--- + src/common.h | 8 ++++++++ + src/vec.h | 9 ++++----- + src/vec_avx.h | 2 +- + src/vec_neon.h | 5 +++-- + src/x86/x86cpu.h | 4 ++-- + 5 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/src/common.h b/src/common.h +index 5005bff..f9095ca 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -43,6 +43,14 @@ static RNN_INLINE void rnnoise_free (void *ptr) + #define RNN_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst)))) + #endif + ++# if !defined(OPUS_GNUC_PREREQ) ++# if defined(__GNUC__)&&defined(__GNUC_MINOR__) ++# define OPUS_GNUC_PREREQ(_maj,_min) \ ++ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min)) ++# else ++# define OPUS_GNUC_PREREQ(_maj,_min) 0 ++# endif ++# endif + + + #endif +diff --git a/src/vec.h b/src/vec.h +index 8e96cbf..71b7afb 100644 +--- a/src/vec.h ++++ b/src/vec.h +@@ -30,6 +30,7 @@ + #define VEC_H + + #include "opus_types.h" ++#include "common.h" + #include + #include "arch.h" + #include "x86/x86_arch_macros.h" +@@ -41,8 +42,6 @@ + #include "vec_neon.h" + #else + +-#include "os_support.h" +- + #define MAX_INPUTS (2048) + + #define NO_OPTIMIZATIONS +@@ -50,7 +49,7 @@ + static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) + { + int i, j; +- OPUS_CLEAR(out, rows); ++ RNN_CLEAR(out, rows); + for (i=0;i + #include +-/*#include "celt/x86/x86cpu.h"*/ ++#include "x86/x86cpu.h" + + #define MAX_INPUTS (2048) + +diff --git a/src/vec_neon.h b/src/vec_neon.h +index e6432e2..31b736c 100644 +--- a/src/vec_neon.h ++++ b/src/vec_neon.h +@@ -32,7 +32,8 @@ + #define VEC_NEON_H + + #include +-#include "os_support.h" ++#include "opus_types.h" ++#include "common.h" + + #if defined(__arm__) && !defined(__aarch64__) && (__ARM_ARCH < 8 || !defined(__clang__)) + /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */ +@@ -302,7 +303,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i + static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) + { + int i, j; +- OPUS_CLEAR(out, rows); ++ RNN_CLEAR(out, rows); + for (i=0;i +Date: Sun, 6 Jul 2025 20:21:00 +0200 +Subject: [PATCH] Fix conflicting types build error + +Upstream: https://github.com/raspberrypi/userland/pull/744 +Signed-off-by: Thomas Petazzoni +--- + interface/vchiq_arm/vchiq_lib.c | 2 +- + interface/vmcs_host/vc_vchi_gpuserv.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/interface/vchiq_arm/vchiq_lib.c b/interface/vchiq_arm/vchiq_lib.c +index 133d5ca..7a2dae5 100755 +--- a/interface/vchiq_arm/vchiq_lib.c ++++ b/interface/vchiq_arm/vchiq_lib.c +@@ -537,7 +537,7 @@ vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T handle, + int size, + void *userdata, + VCHIQ_BULK_MODE_T mode, +- int (*copy_pagelist)()) ++ int (*copy_pagelist)(char *vcptr, const struct pagelist_struct *pagelist)) + { + VCHIQ_SERVICE_T *service = find_service_by_handle(handle); + VCHIQ_QUEUE_BULK_TRANSFER_T args; +diff --git a/interface/vmcs_host/vc_vchi_gpuserv.h b/interface/vmcs_host/vc_vchi_gpuserv.h +index fc0bfee..ce6cb58 100755 +--- a/interface/vmcs_host/vc_vchi_gpuserv.h ++++ b/interface/vmcs_host/vc_vchi_gpuserv.h +@@ -58,7 +58,7 @@ struct sync_job_s { + + struct gpu_callback_s { + // callback to call when complete (can be NULL) +- void (*func)(); ++ void (*func)(void*); + void *cookie; + }; + +-- +2.50.1 + diff --git a/package/rpi-userland/0009-Fix-raspicommonsettings_parse_cmdline.patch b/package/rpi-userland/0009-Fix-raspicommonsettings_parse_cmdline.patch new file mode 100644 index 0000000000..df11d591fc --- /dev/null +++ b/package/rpi-userland/0009-Fix-raspicommonsettings_parse_cmdline.patch @@ -0,0 +1,28 @@ +From cf6d0ac0d31fcc2e64c83b8105b078e792f2d441 Mon Sep 17 00:00:00 2001 +From: Krawlow +Date: Wed, 23 Mar 2022 16:46:18 +0100 +Subject: [PATCH] Fix raspicommonsettings_parse_cmdline + +Fix raspicommonsettings_parse_cmdline's definition to match declaration + +Upstream: c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e +Signed-off-by: Thomas Petazzoni +--- + host_applications/linux/apps/raspicam/RaspiCommonSettings.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/host_applications/linux/apps/raspicam/RaspiCommonSettings.h b/host_applications/linux/apps/raspicam/RaspiCommonSettings.h +index 75b2937..2e9de7d 100644 +--- a/host_applications/linux/apps/raspicam/RaspiCommonSettings.h ++++ b/host_applications/linux/apps/raspicam/RaspiCommonSettings.h +@@ -54,6 +54,6 @@ typedef struct + void raspicommonsettings_set_defaults(RASPICOMMONSETTINGS_PARAMETERS *); + void raspicommonsettings_dump_parameters(RASPICOMMONSETTINGS_PARAMETERS *); + void raspicommonsettings_display_help(); +-int raspicommonsettings_parse_cmdline(RASPICOMMONSETTINGS_PARAMETERS *state, const char *arg1, const char *arg2, void (*app_help)()); ++int raspicommonsettings_parse_cmdline(RASPICOMMONSETTINGS_PARAMETERS *state, const char *arg1, const char *arg2, void (*app_help)(char*)); + + #endif +-- +2.50.1 + diff --git a/package/rpm/0002-Use-Python-3.2-compatible-object-hash-slot-type.patch b/package/rpm/0002-Use-Python-3.2-compatible-object-hash-slot-type.patch new file mode 100644 index 0000000000..cf9865ea3f --- /dev/null +++ b/package/rpm/0002-Use-Python-3.2-compatible-object-hash-slot-type.patch @@ -0,0 +1,58 @@ +From a0a937a454b2f82eae7ed3b4436614e64ef63e2d Mon Sep 17 00:00:00 2001 +From: Panu Matilainen +Date: Mon, 13 Mar 2023 12:41:11 +0200 +Subject: [PATCH] Use Python >= 3.2 compatible object hash slot type + +Python 3.2 changed the object hash type to make them pointer-width on +all platforms - an incompatible change but apparently 3.2 was early enough +in the 3.x days for such changes: https://bugs.python.org/issue9778 + +The hash vs pointer size mismatch has quietly been there all along but +clang >= 16 started treating this as an error, causing failed builds. +The fix is easy and obvious enough, but this requires us to bump the +minimum Python version from 3.1 to 3.2. Which thankfully is old enough that +we can do without having to care or introduce build-time compatibility +workarounds. + +Suggested-by: Khem Raj +Upstream: 45103f84764b2a293b068eb0f59456f553ec45d8 +Signed-off-by: Thomas Petazzoni +--- + INSTALL | 4 ++-- + python/header-py.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/INSTALL b/INSTALL +index 13d0d8a83..528c1e5c0 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -66,8 +66,8 @@ These are available from + http://www.bzip.org + http://tukaani.org/xz/ + +-If you want to build the Python bindings to RPM library, it can be enabled +-with --enable-python option to configure. You'll need to have Python >= 3.1 ++Python bindings to RPM library are built by default, but it can be disabled ++with -DENABLE_PYTHON=OFF. You'll need to have Python >= 3.2 + runtime and C API development environment installed. + Python is available from: + http://www.python.org/ +diff --git a/python/header-py.c b/python/header-py.c +index 0aed0c926..c15503f35 100644 +--- a/python/header-py.c ++++ b/python/header-py.c +@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) + "(Oi)", s, RPMTAG_NEVR); + } + +-static long hdr_hash(PyObject * h) ++static Py_hash_t hdr_hash(PyObject * h) + { +- return (long) h; ++ return (Py_hash_t) h; + } + + static PyObject * hdr_reduce(hdrObject *s) +-- +2.49.0 + diff --git a/package/rpm/0003-Fix-missing-basename-include-on-macOS.patch b/package/rpm/0003-Fix-missing-basename-include-on-macOS.patch new file mode 100644 index 0000000000..ec920612e2 --- /dev/null +++ b/package/rpm/0003-Fix-missing-basename-include-on-macOS.patch @@ -0,0 +1,26 @@ +From f510770a214bd2e8144a39868c34cd568179599e Mon Sep 17 00:00:00 2001 +From: Calvin Buckley +Date: Tue, 11 Jul 2023 19:22:41 -0300 +Subject: [PATCH] Fix missing basename include on macOS + +Upstream: b2e67642fd8cb64d8cb1cca9e759396c1c10807d +Signed-off-by: Thomas Petazzoni +--- + tools/rpmuncompress.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c +index bd4146d54..58ddf5683 100644 +--- a/tools/rpmuncompress.c ++++ b/tools/rpmuncompress.c +@@ -1,6 +1,7 @@ + #include "system.h" + + #include ++#include + #include + #include + #include +-- +2.49.0 + diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index be30013992..fd9883077c 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -8,6 +8,7 @@ RRDTOOL_VERSION = 1.9.0 RRDTOOL_SITE = https://github.com/oetiker/rrdtool-1.x/releases/download/v$(RRDTOOL_VERSION) RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE +RRDTOOL_CPE_ID_VALID = YES RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) # 0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch diff --git a/package/rsync/rsync.hash b/package/rsync/rsync.hash index edeca9c4df..5feacd0663 100644 --- a/package/rsync/rsync.hash +++ b/package/rsync/rsync.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://rsync.samba.org/ftp/rsync/src/rsync-3.3.0.tar.gz.asc -sha256 7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90 rsync-3.3.0.tar.gz +# https://rsync.samba.org/ftp/rsync/src/rsync-3.4.1.tar.gz.asc +sha256 2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52 rsync-3.4.1.tar.gz # Locally calculated sha256 85c19ea50a224c2d0067a69c083584e5717b40b76610ec1218f91385775067dd COPYING diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 188c87e1d4..e4c02a756f 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYNC_VERSION = 3.3.0 +RSYNC_VERSION = 3.4.1 RSYNC_SITE = https://rsync.samba.org/ftp/rsync/src RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 9c523c5881..13a84b206f 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 b6be03c766df4cde314972c1c01cb74f3eacf8aec57066c0c12be0e079726eba rsyslog-8.2410.0.tar.gz +sha256 a70a9834186859539a6a4d1c7b3f68c23897e805829b764a45e92cb0cc95e66a rsyslog-8.2510.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 69b32076f8..69128afbac 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2410.0 +RSYSLOG_VERSION = 8.2510.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 diff --git a/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch b/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch index 9212b8eee0..650e63460f 100644 --- a/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch +++ b/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch @@ -1,4 +1,4 @@ -From 063972eece2fb8157f0feb98a4608c2984c7c5ff Mon Sep 17 00:00:00 2001 +From 17ec1bce74419f8193c0246dbde2d2fdd6b1b4e3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 12 May 2021 09:18:33 +0200 Subject: [PATCH] Makefile: drop explicit undefine PYLIB for compatibility with @@ -30,12 +30,12 @@ Signed-off-by: Julien Olivain 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile -index e2f8579..62c906f 100644 +index f656e34..1206f40 100644 --- a/Makefile +++ b/Makefile -@@ -37,11 +37,6 @@ LDFLAGS ?= - - PYLIB ?= $(shell python3 -m get_pylib) +@@ -52,11 +52,6 @@ else + $(warning libcpupower disabled, building without --deepest-idle-state support.) + endif -# Check for errors, such as python3 not available -ifeq (${PYLIB},) @@ -46,5 +46,5 @@ index e2f8579..62c906f 100644 src/pi_tests/pi_stress.8 \ src/ptsematest/ptsematest.8 \ -- -2.45.2 +2.47.0 diff --git a/package/rt-tests/0003-Fix-build-with-glibc-2.41.patch b/package/rt-tests/0003-Fix-build-with-glibc-2.41.patch new file mode 100644 index 0000000000..6899b55c99 --- /dev/null +++ b/package/rt-tests/0003-Fix-build-with-glibc-2.41.patch @@ -0,0 +1,57 @@ +From 280e198c39d1b17d0491d7c4e7afda97ae6c8e6f Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Wed, 29 Jan 2025 16:46:11 -0500 +Subject: [PATCH] Fix rt-tests build with glibc-2.41 + +The sched_*attr APIs were added to glibc +https://sourceware.org/git/?p=glibc.git;a=commit;h=21571ca0d70302909cf72707b2a7736cf12190a0 + +This fixes the build conflict in rt-tests with glibc-2.4 + +Signed-off-by: Yaakov Selkowitz +Signed-off-by: John Kacur +Upstream: https://web.git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/?id=d3a23a0cc76789c3083df3bad78982cd49bc4c5e +Signed-off-by: Brandon Lumbra +--- + src/include/rt-sched.h | 2 ++ + src/lib/rt-sched.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h +index 80171c76e0ee..dfd7f45f51cc 100644 +--- a/src/include/rt-sched.h ++++ b/src/include/rt-sched.h +@@ -42,6 +42,7 @@ + #define __NR_sched_getattr 275 + #endif + ++#if ! __GLIBC_PREREQ(2, 41) + struct sched_attr { + uint32_t size; + uint32_t sched_policy; +@@ -67,5 +68,6 @@ int sched_getattr(pid_t pid, + struct sched_attr *attr, + unsigned int size, + unsigned int flags); ++#endif + + #endif /* __RT_SCHED_H__ */ +diff --git a/src/lib/rt-sched.c b/src/lib/rt-sched.c +index 8023bc70c473..2500abde26e4 100644 +--- a/src/lib/rt-sched.c ++++ b/src/lib/rt-sched.c +@@ -14,6 +14,7 @@ + + #include "rt-sched.h" + ++#if ! __GLIBC_PREREQ(2, 41) + int sched_setattr(pid_t pid, + const struct sched_attr *attr, + unsigned int flags) +@@ -28,3 +29,4 @@ int sched_getattr(pid_t pid, + { + return syscall(__NR_sched_getattr, pid, attr, size, flags); + } ++#endif +-- +2.47.1 diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 9682fde406..c17829cace 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 0e5b2fbc98ceb786bd113c9a30f0388d884b2d8c4bd6c569d94ae8b00a702bbb rt-tests-2.7.tar.xz +sha256 13190fda63fae640a354d3378c16030f1bd4c243e514515810145dd9d1ae16d8 rt-tests-2.8.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index e048ee94d0..6c445fde91 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests/older RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.7 +RT_TESTS_VERSION = 2.8 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING diff --git a/package/rtl8188eu/Config.in b/package/rtl8188eu/Config.in index 76d9085297..102e8d7bf7 100644 --- a/package/rtl8188eu/Config.in +++ b/package/rtl8188eu/Config.in @@ -4,17 +4,8 @@ config BR2_PACKAGE_RTL8188EU depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8188EU USB Wi-Fi adapter. - This is needed only for Linux kernels before 3.12. - Since 3.12, there is a (staging) driver in mainline, with a - similar codebase. - Make sure your target kernel has the CONFIG_WIRELESS_EXT - config option enabled. - - Note: this package needs a firmware loading mechanism to load - the binary blob for the chip to work. - - https://github.com/lwfinger/rtl8188eu + https://github.com/benetti-engineering/rtl8188eu comment "rtl8188eu needs a Linux kernel to be built" depends on !BR2_s390x diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index 4f8f83e78c..74f12fef29 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 507d32eb91d3d407c7758319c81a36a9dc69e2b89378cabcd382411153927b7b rtl8188eu-f42fc9c45d2086c415dce70d3018031b54a7beef.tar.gz +sha256 bed53ce2ce2b947795f795538d823a8ecdf3845f2f7571d54ba351ddf4ddb243 rtl8188eu-2ef2819d2d3ef7701a739c66525bca4731c6abbf.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index eca0fb8007..5efa5aefec 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,8 +4,8 @@ # ################################################################################ -RTL8188EU_VERSION = f42fc9c45d2086c415dce70d3018031b54a7beef -RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) +RTL8188EU_VERSION = 2ef2819d2d3ef7701a739c66525bca4731c6abbf +RTL8188EU_SITE = $(call github,benetti-engineering,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING RTL8188EU_MODULE_MAKE_OPTS = CONFIG_RTL8188EU=m diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index 1b1aefdd5c..2eaa881d00 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5ab565057ac81527ac579edfdd2a1e42b9ceb2f2924b2ade88a11849443789e4 rtl8189es-30a52f789a0b933c4a7eb06cbf4a4d21c8e581aa.tar.gz +sha256 e8beac10341e70779a7699cb806504d84107d59aee2b6c0919b1ffe5f8236bc4 rtl8189es-0a5d04114fac3c9f48a343cb905fbb6a3f9f5df5.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 11735ba112..55536a5b59 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189ES_VERSION = 30a52f789a0b933c4a7eb06cbf4a4d21c8e581aa +RTL8189ES_VERSION = 0a5d04114fac3c9f48a343cb905fbb6a3f9f5df5 RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 @@ -20,6 +20,7 @@ endif define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 5ed0bbd376..d5bd34ac1e 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a5063b1554acd08bcc084926d1ff80148fe8521a6aefb7061cae68b7c4a7cdb1 rtl8189fs-9a82349c2c40515f9d20b9f6721670f76b4e1c7a.tar.gz +sha256 4d8495b1b5a0c42ff0df775b16abd38103ad8532c53c0527f416484f8c2d477f rtl8189fs-876e627a5b6a8021700391b4249a4a31edfebe5c.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index afb8685bac..45ad24e392 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 9a82349c2c40515f9d20b9f6721670f76b4e1c7a +RTL8189FS_VERSION = 876e627a5b6a8021700391b4249a4a31edfebe5c RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index a8b7cb9358..42055cb194 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8da0f54bd9ae094b5f61fe3c4dd207b2df62b4286970e2828f7c5ce1146447fb rtl8192eu-56f672a8b9572c743148f2e60068fd341d52d5a3.tar.gz +sha256 19e1686d6841f572d3274c96e3e4b66544027d559f5d4da528d8c8510f7d34e6 rtl8192eu-ee928d5dc065f328043711c271eb54f008e6245c.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 0f00d301a8..d96389edf0 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 56f672a8b9572c743148f2e60068fd341d52d5a3 +RTL8192EU_VERSION = ee928d5dc065f328043711c271eb54f008e6245c RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 @@ -16,7 +16,7 @@ RTL8192EU_USER_EXTRA_CFLAGS = -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ RTL8192EU_MODULE_MAKE_OPTS = \ CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8192EU=m \ - USER_EXTRA_CFLAGS="$(RTL8192EU_USER_EXTRA_CFLAGS)" + USER_ccflags-y="$(RTL8192EU_USER_EXTRA_CFLAGS)" define RTL8192EU_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) diff --git a/package/rtl8723bu/Config.in b/package/rtl8723bu/Config.in index 7c624fc4d4..2f2f96dfe5 100644 --- a/package/rtl8723bu/Config.in +++ b/package/rtl8723bu/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_RTL8723BU help rtl8723bu wifi driver - https://github.com/lwfinger/rtl8723bu + https://github.com/benetti-engineering/rtl8723bu comment "rtl8723bu needs a Linux kernel to be built" depends on !BR2_s390x diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 236b9a6726..1261139a20 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 357c78d6f86794d96530155f9ba102e56421efb6fa43eb33daa0fb57354e8215 rtl8723bu-af3a408d6399655b0db23c2c8720436ca725ca47.tar.gz +sha256 e9f94b6e6a6412acbef98d5e21f5c5ef185b0d856f35790e328caeb5df40702c rtl8723bu-bb6fcc9d14b1ec8eb9c3b448c2023fa8fc551178.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 0ce8b1afad..b324b87685 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,8 +4,8 @@ # ################################################################################ -RTL8723BU_VERSION = af3a408d6399655b0db23c2c8720436ca725ca47 -RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) +RTL8723BU_VERSION = bb6fcc9d14b1ec8eb9c3b448c2023fa8fc551178 +RTL8723BU_SITE = $(call github,benetti-engineering,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) RTL8723BU_MODULE_MAKE_OPTS = \ diff --git a/package/rtl8723ds/Config.in b/package/rtl8723ds/Config.in index e5123a2aae..018e70489d 100644 --- a/package/rtl8723ds/Config.in +++ b/package/rtl8723ds/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_RTL8723DS help rtl8723bs wifi driver - https://github.com/lwfinger/rtl8723ds + https://github.com/benetti-engineering/rtl8723ds comment "rtl8723ds needs a Linux kernel to be built" depends on !BR2_s390x diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index f2829d3f04..c2691402bd 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4f3006ffc1604854edbd6d25ad468ca57f6bcfd7814e4dab57725f144f00aa94 rtl8723ds-52e593e8c889b68ba58bd51cbdbcad7fe71362e4.tar.gz +sha256 338f0fe08acdd1352428d86f88366935e1b967b134f252ac9a3e50cc8922fe14 rtl8723ds-546ffb2cb735e0c33e765936721bd66dd58e6893.tar.gz sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 2536450d80..14938daaf6 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,8 +4,8 @@ # ################################################################################ -RTL8723DS_VERSION = 52e593e8c889b68ba58bd51cbdbcad7fe71362e4 -RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) +RTL8723DS_VERSION = 546ffb2cb735e0c33e765936721bd66dd58e6893 +RTL8723DS_SITE = $(call github,benetti-engineering,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 RTL8723DS_LICENSE_FILES = COPYING diff --git a/package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch b/package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch new file mode 100644 index 0000000000..a48214fea2 --- /dev/null +++ b/package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch @@ -0,0 +1,1637 @@ +From bfb09454a243547bea3e02d6c6df2ffdc1218fea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dominik=20W=C3=B3jt?= +Date: Sat, 3 May 2025 19:18:54 +0200 +Subject: [PATCH] fix build for kernel 6.15 + +Upstream: https://github.com/aircrack-ng/rtl8812au/pull/1229 +Signed-off-by: Giulio Benetti +--- + Makefile | 760 ++++++++++++++++---------------- + hal/phydm/phydm.mk | 4 +- + hal/phydm/sd4_phydm_2_kernel.mk | 2 +- + include/osdep_service_linux.h | 4 + + 4 files changed, 389 insertions(+), 381 deletions(-) + +diff --git a/Makefile b/Makefile +index 10acbd2..d6e5809 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,27 +1,27 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie +-EXTRA_CFLAGS += -O3 +-EXTRA_CFLAGS += -Wno-unused-variable +-#EXTRA_CFLAGS += -Wno-unused-value +-EXTRA_CFLAGS += -Wno-unused-label +-#EXTRA_CFLAGS += -Wno-unused-parameter +-EXTRA_CFLAGS += -Wno-unused-function +-EXTRA_CFLAGS += -Wno-implicit-fallthrough +-EXTRA_CFLAGS += -Wno-cast-function-type +-EXTRA_CFLAGS += -Wno-missing-declarations +-EXTRA_CFLAGS += -Wno-missing-prototypes +-#EXTRA_CFLAGS += -Wno-error=cast-function-type +-#EXTRA_CFLAGS += -Wno-parentheses-equality +-#EXTRA_CFLAGS += -Wno-error=incompatible-pointer-types +-EXTRA_CFLAGS += -Wno-stringop-overread +-#EXTRA_CFLAGS += -Wno-pointer-bool-conversion +-EXTRA_CFLAGS += -Wno-unknown-pragmas +-#EXTRA_CFLAGS += -Wno-unused +-EXTRA_CFLAGS += -Wno-address +-EXTRA_CFLAGS += -Wno-vla -g +- +-EXTRA_CFLAGS += -I$(src)/include -I$(srctree)/$(src)/include +-EXTRA_CFLAGS += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm +-EXTRA_LDFLAGS += --strip-all -O3 ++ccflags-y += $(USER_EXTRA_CFLAGS) -fno-pie ++ccflags-y += -O3 ++ccflags-y += -Wno-unused-variable ++#ccflags-y += -Wno-unused-value ++ccflags-y += -Wno-unused-label ++#ccflags-y += -Wno-unused-parameter ++ccflags-y += -Wno-unused-function ++ccflags-y += -Wno-implicit-fallthrough ++ccflags-y += -Wno-cast-function-type ++ccflags-y += -Wno-missing-declarations ++ccflags-y += -Wno-missing-prototypes ++#ccflags-y += -Wno-error=cast-function-type ++#ccflags-y += -Wno-parentheses-equality ++#ccflags-y += -Wno-error=incompatible-pointer-types ++ccflags-y += -Wno-stringop-overread ++#ccflags-y += -Wno-pointer-bool-conversion ++ccflags-y += -Wno-unknown-pragmas ++#ccflags-y += -Wno-unused ++ccflags-y += -Wno-address ++ccflags-y += -Wno-vla -g ++ ++ccflags-y += -I$(src)/include -I$(srctree)/$(src)/include ++ccflags-y += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm ++ldflags-y += --strip-all -O3 + + ########################## WIFI IC ############################ + CONFIG_RTL8812A = y +@@ -189,12 +189,12 @@ endif + + ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) + +-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" ++ccflags-y += -DDRV_NAME=\"rtl88XXau\" + ifeq ($(CONFIG_USB_HCI), y) + USER_MODULE_NAME = 88XXau + endif + else +-EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" ++ccflags-y += -DDRV_NAME=\"rtl8812au\" + endif + + _OS_INTFS_FILES := os_dep/osdep_service.o \ +@@ -230,10 +230,10 @@ _HAL_INTFS_FILES := hal/hal_intf.o \ + hal/led/hal_$(HCI_NAME)_led.o + + +-EXTRA_CFLAGS += -I$(src)/platform -I$(srctree)/$(src)/platform ++ccflags-y += -I$(src)/platform -I$(srctree)/$(src)/platform + _PLATFORM_FILES := platform/platform_ops.o + +-EXTRA_CFLAGS += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc ++ccflags-y += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc + + + ########### HAL_RTL8812A_RTL8821A ################################# +@@ -292,7 +292,7 @@ endif + endif + + ifeq ($(CONFIG_RTL8812A), y) +-EXTRA_CFLAGS += -DCONFIG_RTL8812A ++ccflags-y += -DCONFIG_RTL8812A + _HAL_INTFS_FILES += hal/rtl8812a/hal8812a_fw.o + endif + +@@ -310,7 +310,7 @@ endif + endif + endif + +-EXTRA_CFLAGS += -DCONFIG_RTL8821A ++ccflags-y += -DCONFIG_RTL8821A + + _HAL_INTFS_FILES += hal/rtl8812a/hal8821a_fw.o + endif +@@ -331,7 +331,7 @@ endif + ########### HAL_RTL8814A ################################# + ifeq ($(CONFIG_RTL8814A), y) + ## ADD NEW VHT MP HW TX MODE ## +-#EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE ++#ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE + CONFIG_MP_VHT_HW_TX_MODE = n + ########################################## + RTL871X = rtl8814a +@@ -339,7 +339,7 @@ ifeq ($(CONFIG_USB_HCI), y) + MODULE_NAME = 8814au + endif + +-EXTRA_CFLAGS += -DCONFIG_RTL8814A ++ccflags-y += -DCONFIG_RTL8814A + + _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ + hal/$(RTL871X)/Hal8814PwrSeq.o \ +@@ -390,274 +390,274 @@ endif + + ifeq ($(CONFIG_USB_HCI), y) + ifeq ($(CONFIG_USB_AUTOSUSPEND), y) +-EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND ++ccflags-y += -DCONFIG_USB_AUTOSUSPEND + endif + endif + + ifeq ($(CONFIG_MP_INCLUDED), y) + #MODULE_NAME := $(MODULE_NAME)_mp +-EXTRA_CFLAGS += -DCONFIG_MP_INCLUDED ++ccflags-y += -DCONFIG_MP_INCLUDED + endif + + ifeq ($(CONFIG_POWER_SAVING), y) +-EXTRA_CFLAGS += -DCONFIG_POWER_SAVING ++ccflags-y += -DCONFIG_POWER_SAVING + endif + + ifeq ($(CONFIG_HW_PWRP_DETECTION), y) +-EXTRA_CFLAGS += -DCONFIG_HW_PWRP_DETECTION ++ccflags-y += -DCONFIG_HW_PWRP_DETECTION + endif + + ifeq ($(CONFIG_BT_COEXIST), y) +-EXTRA_CFLAGS += -DCONFIG_BT_COEXIST ++ccflags-y += -DCONFIG_BT_COEXIST + endif + + ifeq ($(CONFIG_INTEL_WIDI), y) +-EXTRA_CFLAGS += -DCONFIG_INTEL_WIDI ++ccflags-y += -DCONFIG_INTEL_WIDI + endif + + ifeq ($(CONFIG_WAPI_SUPPORT), y) +-EXTRA_CFLAGS += -DCONFIG_WAPI_SUPPORT ++ccflags-y += -DCONFIG_WAPI_SUPPORT + endif + + ifeq ($(CONFIG_EFUSE_CONFIG_FILE), y) +-EXTRA_CFLAGS += -DCONFIG_EFUSE_CONFIG_FILE ++ccflags-y += -DCONFIG_EFUSE_CONFIG_FILE + + #EFUSE_MAP_PATH + USER_EFUSE_MAP_PATH ?= + ifneq ($(USER_EFUSE_MAP_PATH),) +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"$(USER_EFUSE_MAP_PATH)\" ++ccflags-y += -DEFUSE_MAP_PATH=\"$(USER_EFUSE_MAP_PATH)\" + else ifeq ($(MODULE_NAME), 8189es) +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8189e.map\" ++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8189e.map\" + else ifeq ($(MODULE_NAME), 8723bs) +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8723bs.map\" ++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8723bs.map\" + else +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_$(MODULE_NAME).map\" ++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_$(MODULE_NAME).map\" + endif + + #WIFIMAC_PATH + USER_WIFIMAC_PATH ?= + ifneq ($(USER_WIFIMAC_PATH),) +-EXTRA_CFLAGS += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\" ++ccflags-y += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\" + else +-EXTRA_CFLAGS += -DWIFIMAC_PATH=\"/data/wifimac.txt\" ++ccflags-y += -DWIFIMAC_PATH=\"/data/wifimac.txt\" + endif + + endif + + ifeq ($(CONFIG_EXT_CLK), y) +-EXTRA_CFLAGS += -DCONFIG_EXT_CLK ++ccflags-y += -DCONFIG_EXT_CLK + endif + + ifeq ($(CONFIG_TRAFFIC_PROTECT), y) +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + endif + + ifeq ($(CONFIG_LOAD_PHY_PARA_FROM_FILE), y) +-EXTRA_CFLAGS += -DCONFIG_LOAD_PHY_PARA_FROM_FILE +-#EXTRA_CFLAGS += -DREALTEK_CONFIG_PATH_WITH_IC_NAME_FOLDER +-EXTRA_CFLAGS += -DREALTEK_CONFIG_PATH=\"/lib/firmware/\" ++ccflags-y += -DCONFIG_LOAD_PHY_PARA_FROM_FILE ++#ccflags-y += -DREALTEK_CONFIG_PATH_WITH_IC_NAME_FOLDER ++ccflags-y += -DREALTEK_CONFIG_PATH=\"/lib/firmware/\" + endif + + ifeq ($(CONFIG_TXPWR_BY_RATE), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=0 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE=0 + else ifeq ($(CONFIG_TXPWR_BY_RATE), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=1 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE=1 + endif + ifeq ($(CONFIG_TXPWR_BY_RATE_EN), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=0 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=0 + else ifeq ($(CONFIG_TXPWR_BY_RATE_EN), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=1 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=1 + else ifeq ($(CONFIG_TXPWR_BY_RATE_EN), auto) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=2 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=2 + endif + + ifeq ($(CONFIG_TXPWR_LIMIT), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT=0 ++ccflags-y += -DCONFIG_TXPWR_LIMIT=0 + else ifeq ($(CONFIG_TXPWR_LIMIT), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT=1 ++ccflags-y += -DCONFIG_TXPWR_LIMIT=1 + endif + ifeq ($(CONFIG_TXPWR_LIMIT_EN), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=0 ++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=0 + else ifeq ($(CONFIG_TXPWR_LIMIT_EN), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=1 ++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=1 + else ifeq ($(CONFIG_TXPWR_LIMIT_EN), auto) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=2 ++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=2 + endif + + ifneq ($(CONFIG_RTW_CHPLAN), 0xFF) +-EXTRA_CFLAGS += -DCONFIG_RTW_CHPLAN=$(CONFIG_RTW_CHPLAN) ++ccflags-y += -DCONFIG_RTW_CHPLAN=$(CONFIG_RTW_CHPLAN) + endif + + ifeq ($(CONFIG_CALIBRATE_TX_POWER_BY_REGULATORY), y) +-EXTRA_CFLAGS += -DCONFIG_CALIBRATE_TX_POWER_BY_REGULATORY ++ccflags-y += -DCONFIG_CALIBRATE_TX_POWER_BY_REGULATORY + endif + + ifeq ($(CONFIG_CALIBRATE_TX_POWER_TO_MAX), y) +-EXTRA_CFLAGS += -DCONFIG_CALIBRATE_TX_POWER_TO_MAX ++ccflags-y += -DCONFIG_CALIBRATE_TX_POWER_TO_MAX + endif + + ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), disable) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=0 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=0 + else ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), enable) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=1 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=1 + endif + + ifeq ($(CONFIG_RTW_ADAPTIVITY_MODE), normal) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_MODE=0 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_MODE=0 + else ifeq ($(CONFIG_RTW_ADAPTIVITY_MODE), carrier_sense) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_MODE=1 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_MODE=1 + endif + + ifeq ($(CONFIG_SIGNAL_SCALE_MAPPING), y) +-EXTRA_CFLAGS += -DCONFIG_SIGNAL_SCALE_MAPPING ++ccflags-y += -DCONFIG_SIGNAL_SCALE_MAPPING + endif + + ifeq ($(CONFIG_80211W), y) +-EXTRA_CFLAGS += -DCONFIG_IEEE80211W ++ccflags-y += -DCONFIG_IEEE80211W + endif + + ifeq ($(CONFIG_WOWLAN), y) +-EXTRA_CFLAGS += -DCONFIG_WOWLAN -DRTW_WAKEUP_EVENT=$(CONFIG_WAKEUP_TYPE) +-EXTRA_CFLAGS += -DRTW_SUSPEND_TYPE=$(CONFIG_SUSPEND_TYPE) ++ccflags-y += -DCONFIG_WOWLAN -DRTW_WAKEUP_EVENT=$(CONFIG_WAKEUP_TYPE) ++ccflags-y += -DRTW_SUSPEND_TYPE=$(CONFIG_SUSPEND_TYPE) + ifeq ($(CONFIG_WOW_STA_MIX), y) +-EXTRA_CFLAGS += -DRTW_WOW_STA_MIX ++ccflags-y += -DRTW_WOW_STA_MIX + endif + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER ++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER + endif + endif + + ifeq ($(CONFIG_AP_WOWLAN), y) +-EXTRA_CFLAGS += -DCONFIG_AP_WOWLAN ++ccflags-y += -DCONFIG_AP_WOWLAN + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER ++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER + endif + endif + + ifeq ($(CONFIG_PNO_SUPPORT), y) +-EXTRA_CFLAGS += -DCONFIG_PNO_SUPPORT ++ccflags-y += -DCONFIG_PNO_SUPPORT + ifeq ($(CONFIG_PNO_SET_DEBUG), y) +-EXTRA_CFLAGS += -DCONFIG_PNO_SET_DEBUG ++ccflags-y += -DCONFIG_PNO_SET_DEBUG + endif + endif + + ifeq ($(CONFIG_GPIO_WAKEUP), y) +-EXTRA_CFLAGS += -DCONFIG_GPIO_WAKEUP ++ccflags-y += -DCONFIG_GPIO_WAKEUP + ifeq ($(CONFIG_ONE_PIN_GPIO), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_ONE_PIN_GPIO ++ccflags-y += -DCONFIG_RTW_ONE_PIN_GPIO + endif + ifeq ($(CONFIG_HIGH_ACTIVE_DEV2HST), y) +-EXTRA_CFLAGS += -DHIGH_ACTIVE_DEV2HST=1 ++ccflags-y += -DHIGH_ACTIVE_DEV2HST=1 + else +-EXTRA_CFLAGS += -DHIGH_ACTIVE_DEV2HST=0 ++ccflags-y += -DHIGH_ACTIVE_DEV2HST=0 + endif + endif + + ifeq ($(CONFIG_HIGH_ACTIVE_HST2DEV), y) +-EXTRA_CFLAGS += -DHIGH_ACTIVE_HST2DEV=1 ++ccflags-y += -DHIGH_ACTIVE_HST2DEV=1 + else +-EXTRA_CFLAGS += -DHIGH_ACTIVE_HST2DEV=0 ++ccflags-y += -DHIGH_ACTIVE_HST2DEV=0 + endif + + ifneq ($(CONFIG_WAKEUP_GPIO_IDX), default) +-EXTRA_CFLAGS += -DWAKEUP_GPIO_IDX=$(CONFIG_WAKEUP_GPIO_IDX) ++ccflags-y += -DWAKEUP_GPIO_IDX=$(CONFIG_WAKEUP_GPIO_IDX) + endif + + ifeq ($(CONFIG_RTW_SDIO_PM_KEEP_POWER), y) + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER ++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER + endif + endif + + ifeq ($(CONFIG_REDUCE_TX_CPU_LOADING), y) +-EXTRA_CFLAGS += -DCONFIG_REDUCE_TX_CPU_LOADING ++ccflags-y += -DCONFIG_REDUCE_TX_CPU_LOADING + endif + + ifeq ($(CONFIG_BR_EXT), y) + BR_NAME = br0 +-EXTRA_CFLAGS += -DCONFIG_BR_EXT +-EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' ++ccflags-y += -DCONFIG_BR_EXT ++ccflags-y += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' + endif + + + ifeq ($(CONFIG_TDLS), y) +-EXTRA_CFLAGS += -DCONFIG_TDLS ++ccflags-y += -DCONFIG_TDLS + endif + + ifeq ($(CONFIG_WIFI_MONITOR), y) +-EXTRA_CFLAGS += -DCONFIG_WIFI_MONITOR ++ccflags-y += -DCONFIG_WIFI_MONITOR + endif + + ifeq ($(CONFIG_MCC_MODE), y) +-EXTRA_CFLAGS += -DCONFIG_MCC_MODE ++ccflags-y += -DCONFIG_MCC_MODE + endif + + ifeq ($(CONFIG_RTW_NAPI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_NAPI ++ccflags-y += -DCONFIG_RTW_NAPI + endif + + ifeq ($(CONFIG_RTW_GRO), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_GRO ++ccflags-y += -DCONFIG_RTW_GRO + endif + + ifeq ($(CONFIG_RTW_REPEATER_SON), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_REPEATER_SON ++ccflags-y += -DCONFIG_RTW_REPEATER_SON + endif + + ifeq ($(CONFIG_RTW_IPCAM_APPLICATION), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_IPCAM_APPLICATION ++ccflags-y += -DCONFIG_RTW_IPCAM_APPLICATION + ifeq ($(CONFIG_WIFI_MONITOR), n) +-EXTRA_CFLAGS += -DCONFIG_WIFI_MONITOR ++ccflags-y += -DCONFIG_WIFI_MONITOR + endif + endif + + ifeq ($(CONFIG_RTW_NETIF_SG), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_NETIF_SG ++ccflags-y += -DCONFIG_RTW_NETIF_SG + endif + + ifeq ($(CONFIG_TX_CSUM_OFFLOAD), y) +-EXTRA_CFLAGS += -DCONFIG_TX_CSUM_OFFLOAD ++ccflags-y += -DCONFIG_TX_CSUM_OFFLOAD + endif + + ifeq ($(CONFIG_ICMP_VOQ), y) +-EXTRA_CFLAGS += -DCONFIG_ICMP_VOQ ++ccflags-y += -DCONFIG_ICMP_VOQ + endif + + ifeq ($(CONFIG_IP_R_MONITOR), y) +-EXTRA_CFLAGS += -DCONFIG_IP_R_MONITOR ++ccflags-y += -DCONFIG_IP_R_MONITOR + endif + + ifeq ($(CONFIG_RTW_WIFI_HAL), y) +-#EXTRA_CFLAGS += -DCONFIG_RTW_WIFI_HAL_DEBUG +-EXTRA_CFLAGS += -DCONFIG_RTW_WIFI_HAL +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVEDNOR_LLSTATS +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVENDOR_RANDOM_MAC_OUI +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVEDNOR_RSSIMONITOR +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVENDOR_WIFI_LOGGER ++#ccflags-y += -DCONFIG_RTW_WIFI_HAL_DEBUG ++ccflags-y += -DCONFIG_RTW_WIFI_HAL ++ccflags-y += -DCONFIG_RTW_CFGVEDNOR_LLSTATS ++ccflags-y += -DCONFIG_RTW_CFGVENDOR_RANDOM_MAC_OUI ++ccflags-y += -DCONFIG_RTW_CFGVEDNOR_RSSIMONITOR ++ccflags-y += -DCONFIG_RTW_CFGVENDOR_WIFI_LOGGER + endif + + ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y) +-EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE ++ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE + endif + + ifeq ($(CONFIG_APPEND_VENDOR_IE_ENABLE), y) +-EXTRA_CFLAGS += -DCONFIG_APPEND_VENDOR_IE_ENABLE ++ccflags-y += -DCONFIG_APPEND_VENDOR_IE_ENABLE + endif + + ifeq ($(CONFIG_RTW_DEBUG), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_DEBUG +-EXTRA_CFLAGS += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL) ++ccflags-y += -DCONFIG_RTW_DEBUG ++ccflags-y += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL) + endif + +-EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04 ++ccflags-y += -DDM_ODM_SUPPORT_TYPE=0x04 + + ifeq ($(CONFIG_RTW_VIRTUAL_INTF), y) +-EXTRA_CFLAGS += -DRTW_VIRTUAL_INTF=1 ++ccflags-y += -DRTW_VIRTUAL_INTF=1 + endif + + ifeq ($(CONFIG_PLATFORM_I386_PC), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/; s/riscv.*/riscv/;") + ARCH ?= $(SUBARCH) + CROSS_COMPILE ?= +@@ -669,8 +669,8 @@ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RPI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH ?= arm + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -680,8 +680,8 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ARM64_RPI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH ?= arm64 + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -691,8 +691,8 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ARM_NV_NANO), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm64 + KVER := $(shell uname -r) + KSRC := /lib/modules/$(KVER)/build +@@ -702,8 +702,8 @@ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging + endif + + ifeq ($(CONFIG_PLATFORM_ARM_ODROIDC2), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH ?= arm64 + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -713,8 +713,8 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_PPC), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e s/ppc/powerpc/) + ARCH ?= $(SUBARCH) + CROSS_COMPILE ?= +@@ -725,16 +725,16 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_NV_TK1), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_NV_TK1 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_PLATFORM_ANDROID ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_PLATFORM_ANDROID + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK +-EXTRA_CFLAGS += -DRTW_VENDOR_EXT_SUPPORT +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_RADIO_WORK ++ccflags-y += -DRTW_VENDOR_EXT_SUPPORT ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC + ARCH ?= arm + + CROSS_COMPILE := /mnt/newdisk/android_sdk/nvidia_tk1/android_L/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- +@@ -743,9 +743,9 @@ MODULE_NAME = wlan + endif + + ifeq ($(CONFIG_PLATFORM_NV_TK1_UBUNTU), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_NV_TK1 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + ARCH ?= arm + +@@ -757,7 +757,7 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM702X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ACTIONS_ATM702X ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ACTIONS_ATM702X + #ARCH := arm + ARCH := $(R_ARCH) + #CROSS_COMPILE := arm-none-linux-gnueabi- +@@ -769,18 +769,18 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM705X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-#EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++#ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ACTIONS_ATM705X +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_ACTIONS_ATM705X ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_arm_act_sdio.o + endif + +@@ -790,20 +790,20 @@ KSRC := /home/android_sdk/Action-semi/705a_android_L/android/kernel + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN50IW1P1), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN50IW1P1 +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN50IW1P1 ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_RESUME_IN_WORKQUEUE ++ccflags-y += -DCONFIG_PLATFORM_OPS + + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -817,14 +817,14 @@ KSRC :=/home/android_sdk/Allwinner/a64/android-51/lichee/linux-3.10/ + endif + + ifeq ($(CONFIG_PLATFORM_TI_AM3517), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE + CROSS_COMPILE := arm-eabi- + KSRC := $(shell pwd)/../../../Android/kernel + ARCH := arm + endif + + ifeq ($(CONFIG_PLATFORM_MSTAR_TITANIA12), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12 + ARCH:=mips + CROSS_COMPILE:= /usr/src/Mstar_kernel/mips-4.3/bin/mips-linux-gnu- + KVER:= 2.6.28.9 +@@ -832,13 +832,13 @@ KSRC:= /usr/src/Mstar_kernel/2.6.28.9/ + endif + + ifeq ($(CONFIG_PLATFORM_MSTAR), y) +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_MSTAR +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_MSTAR_HIGH ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_MSTAR ++ccflags-y += -DCONFIG_PLATFORM_MSTAR_HIGH + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -DCONFIG_FIX_NR_BULKIN_BUFFER ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -DCONFIG_FIX_NR_BULKIN_BUFFER + endif + ARCH:=arm + CROSS_COMPILE:= /usr/src/bin/arm-none-linux-gnueabi- +@@ -849,18 +849,18 @@ endif + ifeq ($(CONFIG_PLATFORM_ANDROID_ARM64), y) + # For this to work, change the "modules:" section is also needed, in order to build with CLANG. + # "$(MAKE) ARCH=$(ARCH) SUBARCH=$(ARCH) REAL_CC=${CC_DIR}/clang CLANG_TRIPLE=aarch64-linux-gnu- CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd) O="$(KBUILD_OUTPUT)" modules" +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -fno-pic +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -fno-pic ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC -DCONFIG_RADIO_WORK + #Enable this to have two interfaces: +-#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_P2P_IPS ++#ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_P2P_IPS + # A special rule for cfg80211_connect_bss() to receive all 10 arguments in an Android build +-EXTRA_CFLAGS += -DCONFIG_CFG80211_CONNECT_BSS_ANDROID ++ccflags-y += -DCONFIG_CFG80211_CONNECT_BSS_ANDROID + endif + + ifeq ($(CONFIG_PLATFORM_ANDROID_X86), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) + ARCH := $(SUBARCH) + CROSS_COMPILE := /media/DATA-2/android-x86/ics-x86_20120130/prebuilt/linux-x86/toolchain/i686-unknown-linux-gnu-4.2.1/bin/i686-unknown-linux-gnu- +@@ -869,20 +869,20 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ANDROID_INTEL_X86), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ANDROID_INTEL_X86 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_SKIP_SIGNAL_SCALE_MAPPING ++ccflags-y += -DCONFIG_PLATFORM_ANDROID_INTEL_X86 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_SKIP_SIGNAL_SCALE_MAPPING + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE ++ccflags-y += -DCONFIG_RESUME_IN_WORKQUEUE + endif + endif + + ifeq ($(CONFIG_PLATFORM_JB_X86), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) + ARCH := $(SUBARCH) + CROSS_COMPILE := /home/android_sdk/android-x86_JB/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7/bin/i686-linux-android- +@@ -891,7 +891,7 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_PXA2XX), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := arm-none-linux-gnueabi- + KVER := 2.6.34.1 +@@ -899,7 +899,7 @@ KSRC ?= /usr/src/linux-2.6.34.1 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_S3C2K4), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := arm-linux- + KVER := 2.6.24.7_$(ARCH) +@@ -907,7 +907,7 @@ KSRC := /usr/src/kernels/linux-$(KVER) + endif + + ifeq ($(CONFIG_PLATFORM_ARM_S3C6K4), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := arm-none-linux-gnueabi- + KVER := 2.6.34.1 +@@ -915,7 +915,7 @@ KSRC ?= /usr/src/linux-2.6.34.1 + endif + + ifeq ($(CONFIG_PLATFORM_RTD2880B), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B ++ccflags-y += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B + ARCH:= + CROSS_COMPILE:= + KVER:= +@@ -923,7 +923,7 @@ KSRC:= + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_RMI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH:=mips + CROSS_COMPILE:=mipsisa32r2-uclibc- + KVER:= +@@ -931,7 +931,7 @@ KSRC:= /root/work/kernel_realtek + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_PLM), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_BIG_ENDIAN + ARCH:=mips + CROSS_COMPILE:=mipsisa32r2-uclibc- + KVER:= +@@ -939,7 +939,7 @@ KSRC:= /root/work/kernel_realtek + endif + + ifeq ($(CONFIG_PLATFORM_MSTAR389), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389 + ARCH:=mips + CROSS_COMPILE:= mips-linux-gnu- + KVER:= 2.6.28.10 +@@ -947,7 +947,7 @@ KSRC:= /home/mstar/mstar_linux/2.6.28.9/ + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_AR9132), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_BIG_ENDIAN + ARCH := mips + CROSS_COMPILE := mips-openwrt-linux- + KSRC := /home/alex/test_openwrt/tmp/linux-2.6.30.9 +@@ -955,7 +955,7 @@ endif + + # This is how I built for openwrt Neo2 platform. --Ben + ifeq ($(CONFIG_PLATFORM_OPENWRT_NEO2), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm64 + CROSS_COMPILE := aarch64-openwrt-linux- + #export PATH=$PATH:/home/greearb/git/openwrt-neo2-dev/staging_dir/toolchain-aarch64_cortex-a53_gcc-7.3.0_musl/bin/ +@@ -964,7 +964,7 @@ KSRC := /home/greearb/git/openwrt-neo2-dev/build_dir/target-aarch64_cortex-a53_m + endif + + ifeq ($(CONFIG_PLATFORM_DMP_PHILIPS), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM + ARCH := mips + #CROSS_COMPILE:=/usr/local/msdk-4.3.6-mips-EL-2.6.12.6-0.9.30.3/bin/mipsel-linux- + CROSS_COMPILE:=/usr/local/toolchain_mipsel/bin/mipsel-linux- +@@ -972,8 +972,8 @@ KSRC ?=/usr/local/Jupiter/linux-2.6.12 + endif + + ifeq ($(CONFIG_PLATFORM_RTK_DMP), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) + _PLATFORM_FILES += platform/platform_RTK_DMP_usb.o + endif +@@ -984,7 +984,7 @@ KSRC ?= /usr/src/DMP_Kernel/jupiter/linux-2.6.12 + endif + + ifeq ($(CONFIG_PLATFORM_MT53XX), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX + ARCH:= arm + CROSS_COMPILE:= arm11_mtk_le- + KVER:= 2.6.27 +@@ -992,7 +992,7 @@ KSRC?= /proj/mtk00802/BD_Compare/BDP/Dev/BDP_V301/BDP_Linux/linux-2.6.27 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_MX51_241H), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM + ARCH := arm + CROSS_COMPILE := /opt/freescale/usr/local/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi- + KVER := 2.6.31 +@@ -1000,8 +1000,8 @@ KSRC ?= /lib/modules/2.6.31-770-g0e46b52/source + endif + + ifeq ($(CONFIG_PLATFORM_FS_MX61), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -1011,7 +1011,7 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATJ227X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X + ARCH := mips + CROSS_COMPILE := /home/cnsd4/project/actions/tools-2.6.27/bin/mipsel-linux-gnu- + KVER := 2.6.27 +@@ -1019,9 +1019,9 @@ KSRC := /home/cnsd4/project/actions/linux-2.6.27.28 + endif + + ifeq ($(CONFIG_PLATFORM_TI_DM365), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365 +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_RX +-EXTRA_CFLAGS += -DCONFIG_SINGLE_XMIT_BUF -DCONFIG_SINGLE_RECV_BUF ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365 ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_RX ++ccflags-y += -DCONFIG_SINGLE_XMIT_BUF -DCONFIG_SINGLE_RECV_BUF + ARCH := arm + #CROSS_COMPILE := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/arm/v5t_le/bin/arm_v5t_le- + #KSRC := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/lsp/ti-davinci/linux-dm365 +@@ -1032,7 +1032,7 @@ KVER := 2.6.18 + endif + + ifeq ($(CONFIG_PLATFORM_MOZART), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MOZART ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MOZART + ARCH := arm + CROSS_COMPILE := /home/vivotek/lsp/mozart3v2/Mozart3e_Toolchain/build_arm_nofpu/usr/bin/arm-linux- + KVER := $(shell uname -r) +@@ -1041,11 +1041,11 @@ KERNELOUTPUT := /home/pink/sample/ODM/IP8136W-VINT/tmp/kernel + endif + + ifeq ($(CONFIG_PLATFORM_TEGRA3_CARDHU), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + KSRC := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/out/target/product/cardhu/obj/KERNEL +@@ -1053,11 +1053,11 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_TEGRA4_DALMORE), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- + KSRC := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/out/target/product/dalmore/obj/KERNEL +@@ -1065,7 +1065,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8900), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/SDK_2304_20110613/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/SDK_2304_20110613/kernel +@@ -1073,7 +1073,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8920), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/kernel +@@ -1081,10 +1081,10 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8920_JB42), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/kernel +@@ -1092,7 +1092,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RK2818), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS + ARCH := arm + CROSS_COMPILE := /usr/src/release_fae_version/toolchain/arm-eabi-4.4.0/bin/arm-eabi- + KSRC := /usr/src/release_fae_version/kernel25_A7_281x +@@ -1100,13 +1100,13 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RK3188), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE + # default setting for Power control +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DRTW_SUPPORT_PLATFORM_SHUTDOWN + # default setting for Special function + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3188/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- +@@ -1115,15 +1115,15 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RK3066), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_RK3066 +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DCONFIG_PLATFORM_ARM_RK3066 ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN ++ccflags-y += -DRTW_SUPPORT_PLATFORM_SHUTDOWN + endif +-EXTRA_CFLAGS += -fno-pic ++ccflags-y += -fno-pic + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Rockchip/rk3066_20130607/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi- + #CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3066sdk/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi- +@@ -1132,7 +1132,7 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_URBETTER), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE + ARCH := arm + CROSS_COMPILE := /media/DATA-1/urbetter/arm-2009q3/bin/arm-none-linux-gnueabi- + KSRC := /media/DATA-1/urbetter/ics-urbetter/kernel +@@ -1140,7 +1140,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TI_PANDA), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE + ARCH := arm + #CROSS_COMPILE := /media/DATA-1/aosp/ics-aosp_20111227/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + #KSRC := /media/DATA-1/aosp/android-omap-panda-3.0_20120104 +@@ -1150,14 +1150,14 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_JZ4760), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE + ARCH ?= mips + CROSS_COMPILE ?= /mnt/sdb5/Ingenic/Umido/mips-4.3/bin/mips-linux-gnu- + KSRC ?= /mnt/sdb5/Ingenic/Umido/kernel + endif + + ifeq ($(CONFIG_PLATFORM_SZEBOOK), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_BIG_ENDIAN + ARCH:=arm + CROSS_COMPILE:=/opt/crosstool2/bin/armeb-unknown-linux-gnueabi- + KVER:= 2.6.31.6 +@@ -1165,20 +1165,20 @@ KSRC:= ../code/linux-2.6.31.6-2020/ + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUNxI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUNxI ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUNxI + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) + # default setting for A10-EVB mmc0 +-#EXTRA_CFLAGS += -DCONFIG_WITS_EVB_V13 ++#ccflags-y += -DCONFIG_WITS_EVB_V13 + _PLATFORM_FILES += platform/platform_ARM_SUNxI_sdio.o + endif + +@@ -1191,22 +1191,22 @@ KSRC=/home/android_sdk/Allwinner/a10/android-jb42/lichee-jb42/linux-3.0 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN6I), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN6I +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN6I ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) + # default setting for A31-EVB mmc0 +-EXTRA_CFLAGS += -DCONFIG_A31_EVB ++ccflags-y += -DCONFIG_A31_EVB + _PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o + endif + +@@ -1223,17 +1223,17 @@ KSRC :=/home/android_sdk/Allwinner/a31/kitkat-a3x_v4.5/lichee/linux-3.3 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN7I), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN7I ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1253,17 +1253,17 @@ KSRC := /home/android_sdk/Allwinner/a20/kitkat-a20_v4.4/lichee/linux-3.4 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN8I_W3P1), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I_W3P1 +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I_W3P1 ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1280,20 +1280,20 @@ KSRC :=/home/android_sdk/Allwinner/a23/android-kk44/lichee/linux-3.4 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN8I_W5P1), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I_W5P1 +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I_W5P1 ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1307,8 +1307,8 @@ KSRC :=/home/android_sdk/Allwinner/a33/android-L/lichee/linux-3.4 + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATV5201), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATV5201 +-EXTRA_CFLAGS += -DCONFIG_SDIO_DISABLE_RXFIFO_POLLING_LOOP ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATV5201 ++ccflags-y += -DCONFIG_SDIO_DISABLE_RXFIFO_POLLING_LOOP + ARCH := mips + CROSS_COMPILE := mipsel-linux-gnu- + KVER := $(KERNEL_VER) +@@ -1316,29 +1316,29 @@ KSRC:= $(CFGDIR)/../../kernel/linux-$(KERNEL_VER) + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RTD299X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ifeq ($(CONFIG_ANDROID), y) + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + endif + #ARCH, CROSS_COMPILE, KSRC,and MODDESTDIR are provided by external makefile + INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RTD299X_LG), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1 +-EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3 +-#EXTRA_CFLAGS += -DCONFIG_FIX_HWPORT +-EXTRA_CFLAGS += -DLGE_PRIVATE +-EXTRA_CFLAGS += -DPURE_SUPPLICANT +-EXTRA_CFLAGS += -DCONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP -DCONFIG_RTW_IOCTL_SET_COUNTRY +-EXTRA_CFLAGS += -DDBG_RX_DFRAME_RAW_DATA +-EXTRA_CFLAGS += -DRTW_REDUCE_SCAN_SWITCH_CH_TIME ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1 ++ccflags-y += -DCONFIG_IFACE_NUMBER=3 ++#ccflags-y += -DCONFIG_FIX_HWPORT ++ccflags-y += -DLGE_PRIVATE ++ccflags-y += -DPURE_SUPPLICANT ++ccflags-y += -DCONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP -DCONFIG_RTW_IOCTL_SET_COUNTRY ++ccflags-y += -DDBG_RX_DFRAME_RAW_DATA ++ccflags-y += -DRTW_REDUCE_SCAN_SWITCH_CH_TIME + ARCH ?= arm + KVER ?= + +@@ -1354,11 +1354,11 @@ INSTALL_PREFIX ?= + endif + + ifeq ($(CONFIG_PLATFORM_HISILICON), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_HISILICON ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_HISILICON + ifeq ($(SUPPORT_CONCURRENT),y) +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_CONCURRENT_MODE + endif +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + ifeq ($(CROSS_COMPILE),) + CROSS_COMPILE = arm-hisiv200-linux- +@@ -1370,23 +1370,23 @@ endif + endif + + ifeq ($(CONFIG_PLATFORM_HISILICON_HI3798), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON_HI3798 +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON_HI3798_MV200_HDMI_DONGLE +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_HISILICON ++ccflags-y += -DCONFIG_PLATFORM_HISILICON_HI3798 ++#ccflags-y += -DCONFIG_PLATFORM_HISILICON_HI3798_MV200_HDMI_DONGLE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 +-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT + # default setting for Android 5.x and later +-#EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++#ccflags-y += -DCONFIG_RADIO_WORK + + # If system could power on and recognize Wi-Fi SDIO automatically, + # platfrom operations are not necessary. + #ifeq ($(CONFIG_SDIO_HCI), y) +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++#ccflags-y += -DCONFIG_PLATFORM_OPS + #_PLATFORM_FILES += platform/platform_hisilicon_hi3798_sdio.o +-#EXTRA_CFLAGS += -DCONFIG_HISI_SDIO_ID=1 ++#ccflags-y += -DCONFIG_HISI_SDIO_ID=1 + #endif + + ARCH ?= arm +@@ -1400,35 +1400,35 @@ endif + # Platform setting + ifeq ($(CONFIG_PLATFORM_ARM_SPREADTRUM_6820), y) + ifeq ($(CONFIG_ANDROID_2X), y) +-EXTRA_CFLAGS += -DANDROID_2X ++ccflags-y += -DANDROID_2X + endif +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD +-EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_6820 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_SPRD ++ccflags-y += -DPLATFORM_SPREADTRUM_6820 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_sprd_sdio.o + endif + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SPREADTRUM_8810), y) + ifeq ($(CONFIG_ANDROID_2X), y) +-EXTRA_CFLAGS += -DANDROID_2X ++ccflags-y += -DANDROID_2X + endif +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD +-EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_8810 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_SPRD ++ccflags-y += -DPLATFORM_SPREADTRUM_8810 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_sprd_sdio.o + endif + endif + + ifeq ($(CONFIG_PLATFORM_ARM_WMT), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_SDIO_HCI), y) + _PLATFORM_FILES += platform/platform_ARM_WMT_sdio.o + endif +@@ -1439,18 +1439,18 @@ MODULE_NAME :=8189es_kk + endif + + ifeq ($(CONFIG_PLATFORM_RTK119X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++#ccflags-y += -DCONFIG_PLATFORM_ARM_SUN7I ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-#EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++#ccflags-y += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + +-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS ++#ccflags-y += -DCONFIG_#PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + #_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1470,15 +1470,15 @@ MODULE_NAME := 8192eu + endif + + ifeq ($(CONFIG_PLATFORM_RTK119X_AM), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK119X_AM +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE +-EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3 +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_RTK119X_AM ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_CONCURRENT_MODE -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE ++ccflags-y += -DCONFIG_IFACE_NUMBER=3 ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + endif + + ARCH := arm +@@ -1490,28 +1490,28 @@ CROSS_COMPILE := + endif + + ifeq ($(CONFIG_PLATFORM_RTK129X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DRTK_129X_PLATFORM +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DRTK_129X_PLATFORM ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-#EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++#ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + ifeq ($(CONFIG_RTL8821C)$(CONFIG_SDIO_HCI),yy) +-EXTRA_CFLAGS += -DCONFIG_WAKEUP_GPIO_INPUT_MODE +-EXTRA_CFLAGS += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN ++ccflags-y += -DCONFIG_WAKEUP_GPIO_INPUT_MODE ++ccflags-y += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN + endif +-EXTRA_CFLAGS += -Wno-error=date-time ++ccflags-y += -Wno-error=date-time + # default setting for Android 7.0 + ifeq ($(RTK_ANDROID_VERSION), nougat) +-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1 ++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1 + endif +-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS ++#ccflags-y += -DCONFIG_#PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + endif + + ARCH := arm64 +@@ -1526,12 +1526,12 @@ KSRC := /home/android_sdk/DHC/trunk-6.0.0_r1-QA160627/linux-kernel + endif + + ifeq ($(CONFIG_PLATFORM_RTK390X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK390X +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_RTW_NETIF_SG ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_RTK390X ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_RTW_NETIF_SG + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + endif + + ARCH:=rlx +@@ -1542,12 +1542,12 @@ KSRC:= /home/realtek/share/Develop/IPCAM_SDK/RealSil/rts3901_sdk_v1.2_vanilla/li + endif + + ifeq ($(CONFIG_PLATFORM_NOVATEK_NT72668), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NOVATEK_NT72668 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_RX +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_PLATFORM_NOVATEK_NT72668 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_RX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + ARCH ?= arm + CROSS_COMPILE := arm-linux-gnueabihf- + KVER := 3.8.0 +@@ -1556,10 +1556,10 @@ KSRC := /Custom/Novatek/TCL/linux-3.8_header + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8930_JB42), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/v13.05_r1-tcc-android-4.2.2_tcc893x-evm_build/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/v13.05_r1-tcc-android-4.2.2_tcc893x-evm_build/kernel +@@ -1567,7 +1567,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_RTL8197D), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D ++ccflags-y += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D + export DIR_LINUX=$(shell pwd)/../SDK/rlxlinux-sdk321-v50/linux-2.6.30 + ARCH ?= rlx + CROSS_COMPILE:= $(DIR_LINUX)/../toolchain/rsdk-1.5.5-5281-EB-2.6.30-0.9.30.3-110714/bin/rsdk-linux- +@@ -1575,17 +1575,17 @@ KSRC := $(DIR_LINUX) + endif + + ifeq ($(CONFIG_PLATFORM_AML_S905), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_AML_S905 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -fno-pic ++ccflags-y += -DCONFIG_PLATFORM_AML_S905 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -fno-pic + # default setting for Android +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 +-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT + # default setting for Android 5.x and later +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_aml_s905_sdio.o + endif + +@@ -1599,19 +1599,19 @@ endif + endif + + ifeq ($(CONFIG_PLATFORM_ZTE_ZX296716), y) +-EXTRA_CFLAGS += -Wno-error=date-time +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ZTE_ZX296716 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -Wno-error=date-time ++ccflags-y += -DCONFIG_PLATFORM_ZTE_ZX296716 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 +-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT + # default setting for Android 5.x and later +-#EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++#ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_SDIO_HCI), y) + # mark this temporarily +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++#ccflags-y += -DCONFIG_PLATFORM_OPS + #_PLATFORM_FILES += platform/platform_zte_zx296716_sdio.o + endif + +@@ -1621,11 +1621,11 @@ KSRC ?= + endif + + ifeq ($(ARCH), i386) +-EXTRA_CFLAGS += -mhard-float +-EXTRA_CFLAGS += -DMARK_KERNEL_PFU ++ccflags-y += -mhard-float ++ccflags-y += -DMARK_KERNEL_PFU + else ifeq ($(ARCH), x86_64) +-EXTRA_CFLAGS += -mhard-float +-EXTRA_CFLAGS += -DMARK_KERNEL_PFU ++ccflags-y += -mhard-float ++ccflags-y += -DMARK_KERNEL_PFU + endif + + ########### CUSTOMER ################################ +@@ -1634,7 +1634,7 @@ CONFIG_CUSTOMER_HUAWEI = y + endif + + ifeq ($(CONFIG_CUSTOMER_HUAWEI), y) +-EXTRA_CFLAGS += -DCONFIG_HUAWEI_PROC ++ccflags-y += -DCONFIG_HUAWEI_PROC + endif + + ifeq ($(CONFIG_MULTIDRV), y) +@@ -1823,3 +1823,7 @@ endif + @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der 88XXau.ko + + sign-install: all sign install ++ ++# For compatibility with kernels prior to 2.6.24. ++EXTRA_CFLAGS += $(ccflags-y) ++EXTRA_LDFLAGS += $(ldflags-y) +diff --git a/hal/phydm/phydm.mk b/hal/phydm/phydm.mk +index a05df64..b4cdca3 100644 +--- a/hal/phydm/phydm.mk ++++ b/hal/phydm/phydm.mk +@@ -1,4 +1,4 @@ +-EXTRA_CFLAGS += -I$(src)/hal/phydm ++ccflags-y += -I$(src)/hal/phydm + + _PHYDM_FILES := hal/phydm/phydm_debug.o \ + hal/phydm/phydm_antdiv.o\ +@@ -223,4 +223,4 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8814b_bb.o\ + hal/phydm/halrf/$(RTL871X)/halrf_8814b.o \ + hal/phydm/halrf/$(RTL871X)/halrf_iqk_8814b.o \ + hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8814b.o +-endif +\ No newline at end of file ++endif +diff --git a/hal/phydm/sd4_phydm_2_kernel.mk b/hal/phydm/sd4_phydm_2_kernel.mk +index f11c6ac..65eb93c 100644 +--- a/hal/phydm/sd4_phydm_2_kernel.mk ++++ b/hal/phydm/sd4_phydm_2_kernel.mk +@@ -1,4 +1,4 @@ +-EXTRA_CFLAGS += -I$(src)/hal/phydm ++ccflags-y += -I$(src)/hal/phydm + + _PHYDM_FILES := hal/phydm/phydm_debug.o \ + hal/phydm/phydm_interface.o\ +diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h +index 684d685..4c276f6 100644 +--- a/include/osdep_service_linux.h ++++ b/include/osdep_service_linux.h +@@ -385,7 +385,11 @@ __inline static void _set_timer(_timer *ptimer, u32 delay_time) + + __inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++ *bcancelled = timer_delete_sync(&ptimer->timer) == 1 ? 1 : 0; ++#else + *bcancelled = del_timer_sync(&ptimer->timer) == 1 ? 1 : 0; ++#endif + } + + static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) +-- +2.39.5 + diff --git a/package/rtl8812au-aircrack-ng/0002-fix-build-for-kernel-6.16.patch b/package/rtl8812au-aircrack-ng/0002-fix-build-for-kernel-6.16.patch new file mode 100644 index 0000000000..46f67f14ac --- /dev/null +++ b/package/rtl8812au-aircrack-ng/0002-fix-build-for-kernel-6.16.patch @@ -0,0 +1,34 @@ +From de764c6b43fef79bdea8783232a89d2e8ff0e059 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Fri, 15 Aug 2025 23:48:33 +0200 +Subject: [PATCH] fix build for kernel 6.16 + +With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=41cb08555c4164996d67c78b3bf1c658075b75f1 +from_timer() has been renamed to timer_container_of() so let's rename +according to linux version >= 6.16 + +Upstream: https://github.com/aircrack-ng/rtl8812au/pull/1236 +Signed-off-by: Giulio Benetti +--- + include/osdep_service_linux.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h +index 4c276f6..9f9a317 100644 +--- a/include/osdep_service_linux.h ++++ b/include/osdep_service_linux.h +@@ -355,7 +355,9 @@ static inline void timer_hdl(struct timer_list *in_timer) + static inline void timer_hdl(unsigned long cntx) + #endif + { +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)) ++ _timer *ptimer = timer_container_of(ptimer, in_timer, timer); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) + _timer *ptimer = from_timer(ptimer, in_timer, timer); + #else + _timer *ptimer = (_timer *)cntx; +-- +2.43.0 + diff --git a/package/rtl8812au-aircrack-ng/0003-Fix-build-for-kernel-6.17.patch b/package/rtl8812au-aircrack-ng/0003-Fix-build-for-kernel-6.17.patch new file mode 100644 index 0000000000..361615b945 --- /dev/null +++ b/package/rtl8812au-aircrack-ng/0003-Fix-build-for-kernel-6.17.patch @@ -0,0 +1,57 @@ +From dfbeaa319808624c367200739a9a6f7fbc4b8281 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 8 Oct 2025 17:56:52 +0200 +Subject: [PATCH] Fix build for kernel 6.17 + +With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b74947b4f6ff7c122a1bb6eb38bb7ecfbb1d3820 +set_wiphy_params() and set/get_tx_power() gain argument radio_idx to get +radio index. So let's add that argument according to linux version >= +6.17. + +Upstream: https://github.com/aircrack-ng/rtl8812au/pull/1238 +Signed-off-by: Giulio Benetti +--- + os_dep/linux/ioctl_cfg80211.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index ec47e95..3d834a4 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -3365,7 +3365,12 @@ exit: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, int radio_idx, ++ u32 changed) ++#else + static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed) ++#endif + { + #if 0 + struct iwm_priv *iwm = wiphy_to_iwm(wiphy); +@@ -4267,6 +4272,9 @@ static int cfg80211_rtw_set_txpower(struct wiphy *wiphy, + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) + struct wireless_dev *wdev, + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) || defined(COMPAT_KERNEL_RELEASE) + enum nl80211_tx_power_setting type, int mbm) + #else +@@ -4328,6 +4336,9 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy, + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) + struct wireless_dev *wdev, + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)) + unsigned int link_id, + #endif +-- +2.47.3 + diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index ea5ca3c56b..bb7c4b297d 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d08bad19680047cb178d8984bfdd09d9ff7765b8c9ee35a9f8f87676f0c41a64 rtl8812au-aircrack-ng-b44d288f423ede0fc7cdbf92d07a7772cd727de4.tar.gz +sha256 d4a1435e29bf4a46a4b0b31cad91f30bb263a899b382f828125437dce3cb4bae rtl8812au-aircrack-ng-c3fb89a2f7066f4bf4e4d9d85d84f9791f14c83e.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 3a7c56a3fc..1308508e00 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = b44d288f423ede0fc7cdbf92d07a7772cd727de4 +RTL8812AU_AIRCRACK_NG_VERSION = c3fb89a2f7066f4bf4e4d9d85d84f9791f14c83e RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE diff --git a/package/rtl8821au/Config.in b/package/rtl8821au/Config.in index 3d7bbf643d..24ea9b8c7d 100644 --- a/package/rtl8821au/Config.in +++ b/package/rtl8821au/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_RTL8821AU help rtl8821au wifi driver - https://github.com/abperiasamy/rtl8812AU_8821AU_linux + https://github.com/benetti-engineering/rtl8821au diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index 56e5609ebd..29b4d46f8e 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fde8ca9735a6c9c4c907fb6f565185a59b04bcfa78feb2309941cc09d49c4ac7 rtl8821au-8ea0ed9da764448c7310a27744ab5814289f35a8.tar.gz +sha256 fe9840003e9481cf9fce3a5ed3f5b985615f862abc1b8d51fe6de7da9e4943c9 rtl8821au-dfe6801adb9b3a5572260ab308d3b69522992814.tar.gz sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 9a92696437..734b427019 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,8 +4,8 @@ # ################################################################################ -RTL8821AU_VERSION = 8ea0ed9da764448c7310a27744ab5814289f35a8 -RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) +RTL8821AU_VERSION = dfe6801adb9b3a5572260ab308d3b69522992814 +RTL8821AU_SITE = $(call github,benetti-engineering,rtl8821au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index 41c39f5cff..b9869303de 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9ccac108553e0ddc35e030539e23c2151fc038f21c12a241b4df13e0c171ba5f rtl8821cu-1597dfeda6cefd2e603fc7020ceca226d05fb108.tar.gz +sha256 3e7fc5b598b81006fb07a5a3534aa4288cb387ed531c71f3734e55e6cae729b0 rtl8821cu-3d1fcf4bc838542ceb03b0b4e9e40600720cf6ae.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index faad054b3b..e1ef396110 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = 1597dfeda6cefd2e603fc7020ceca226d05fb108 +RTL8821CU_VERSION = 3d1fcf4bc838542ceb03b0b4e9e40600720cf6ae RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE diff --git a/package/rtl8822cs/Config.in b/package/rtl8822cs/Config.in index c827291ae4..2e1c376902 100644 --- a/package/rtl8822cs/Config.in +++ b/package/rtl8822cs/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_RTL8822CS Realtek RTL8822CS Wi-Fi driver as a kernel module (JetHome repository) - https://github.com/jethome-ru/rtl88x2cs/ + https://github.com/jethome-iot/rtl88x2cs/ diff --git a/package/rtl8822cs/rtl8822cs.hash b/package/rtl8822cs/rtl8822cs.hash index 53fc06cca5..2a649fe493 100644 --- a/package/rtl8822cs/rtl8822cs.hash +++ b/package/rtl8822cs/rtl8822cs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9aea86233848e9edb497b27614c78680f7bb1962579d4b05333d9c1a189c62fe rtl8822cs-40450f759c8a930d271b5f0a663685f412debc72.tar.gz +sha256 12bf44c0dbce921440f5800a98e877fadda2d656824cca546c2b9e0e99e6a489 rtl8822cs-0ef9ddd619d2a386df90fd7c32b65958b0d675ed.tar.gz diff --git a/package/rtl8822cs/rtl8822cs.mk b/package/rtl8822cs/rtl8822cs.mk index 223d232c8d..d10388c2e1 100644 --- a/package/rtl8822cs/rtl8822cs.mk +++ b/package/rtl8822cs/rtl8822cs.mk @@ -4,8 +4,8 @@ # ################################################################################ -RTL8822CS_VERSION = 40450f759c8a930d271b5f0a663685f412debc72 -RTL8822CS_SITE = $(call github,jethome-ru,rtl88x2cs,$(RTL8822CS_VERSION)) +RTL8822CS_VERSION = 0ef9ddd619d2a386df90fd7c32b65958b0d675ed +RTL8822CS_SITE = $(call github,jethome-iot,rtl88x2cs,$(RTL8822CS_VERSION)) RTL8822CS_LICENSE = GPL-2.0 RTL8822CS_MODULE_MAKE_OPTS = \ diff --git a/package/rtl_433/rtl_433.hash b/package/rtl_433/rtl_433.hash index 3a00e0cae7..30f60a82f7 100644 --- a/package/rtl_433/rtl_433.hash +++ b/package/rtl_433/rtl_433.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1260c58400bf35832ac1b76cb3cccf3dc1335ffa2416909c63c7d7060c74663b rtl_433-23.11.tar.gz +sha256 5a409ea10e6d3d7d4aa5ea91d2d6cc92ebb2d730eb229c7b37ade65458223432 rtl_433-25.02.tar.gz # License file, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index 0af25c7936..08735be850 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL_433_VERSION = 23.11 +RTL_433_VERSION = 25.02 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING @@ -18,6 +18,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# do not include Buildroot git info in version output +RTL_433_CONF_ENV = GIT_DIR=. + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index d6622909e5..90faed4c32 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,7 +1,7 @@ -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -sha512 dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883 ruby-3.3.5.tar.xz +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +sha512 29000b3396ab95fc2dc13d2d78441ff5c34258e5421115181c54b1b4d55d5c0d4f3d0c3cec6b32b9a1bb8de5c51b383fcad4369ec3fb244fd0ce182afbe79ba4 ruby-3.4.6.tar.xz # License files, Locally calculated -sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL +sha256 a2021e52d5d6adf7e3f45aab9d2b860ce03cdf6153776853e11d5668193eecfd LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 2e04cb3e92..ffe42968b5 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 3.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).5 -RUBY_VERSION_EXT = 3.3.0 +RUBY_VERSION_MAJOR = 3.4 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).6 +RUBY_VERSION_EXT = 3.4.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 711d7c61a2..76857afb31 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25072beb84f4adae316a968241dc74ac30982d38e4459635074aa9e9d87d3de7 runc-1.2.0-go2.tar.gz +sha256 3262492ce42bea0919ee1a2d000b6f303fd14877295bc38d094876b55fdd448b runc-1.3.0-go2.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 94b7b15900..bdff619751 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.2.0 +RUNC_VERSION = 1.3.0 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 070a0b9779..7f9d2f6339 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,70 +1,70 @@ # Generated with utils/update-rust # Do not edit manually -# From https://static.rust-lang.org/dist/rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 99acf175be33bd96ac82d644125d0e2acc6962d61ee64851edc7d8ba3bd23ca4 rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 34669e600d6ee7744e59f5d4542e2a539a9b13f099a4533f19a46e32a0868053 rust-1.82.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 a32342217fb82167fffcaf0c7e44ac6e32ce5fa63dc3beb42439ab05f561a882 rust-1.82.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 0608a560ce266e8aafecc2b9908e3094f5ef1e135460b1f88aa614e5bf65aae4 rust-1.82.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 048f637a547522ba0081c5772fd3196dfcc2d0d24f442424f168b5d55f961537 rust-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -sha256 532190c3cdbdee9249bcde648b1c61b092bdd8885266ba9edd6df6824a454958 rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-s390x-unknown-linux-gnu.tar.xz.sha256 -sha256 71428fab3cf18cfe4b4486a11d292ec157fe8b0c904fb4fae34db6539144c286 rust-1.82.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 8a6bf24ca1fee2bd861590431c7954674191a0c0dfa0af4169731bc1459cf58a rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 1359ac1f3a123ae5da0ee9e47b98bb9e799578eefd9f347ff9bafd57a1d74a7f rust-std-1.82.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-aarch64-unknown-linux-musl.tar.xz.sha256 -sha256 a364a4b506865fbd56aac67e2b540a824cd9abda621bb38a8b678166d33b8ec2 rust-std-1.82.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -sha256 bec0b04e6e1e183fc21521e9cc2dc89be41c3ccacff3fb5ca48419b47af94fe1 rust-std-1.82.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 fa379cc69b23782cbaddf66025889bf5ca9c32ddb60766fe158b43cfe49a2b2b rust-std-1.82.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-musleabi.tar.xz.sha256 -sha256 cd5e1577c1772ba309d003c49a2df2f06ccbc1cd1bf3ee9c1cfada210979f26e rust-std-1.82.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -sha256 86f2242347c1cbae354cd0ff66c9bfe735f1b371c189aaf0157a3b55004590cb rust-std-1.82.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -sha256 e3c74773cf6f09a3cda1b64c3058f5a88abea0a98f172de895c0ecf7b7b760b2 rust-std-1.82.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -sha256 df0a3be0e71ca8aa8be4915f7142661af32411949a75c1729a314e6ab5c78b0b rust-std-1.82.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -sha256 4d692c1696ad49285a45bc5f636ce9c13ccb32b99ed14be428eaaf1e0cae6b33 rust-std-1.82.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 34d258a07c9051803786405731c05fb19f7980e13308acf4b16e8c836bd73ac8 rust-std-1.82.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -sha256 1e318fcff01379cf4459f02526309b1f086530004be4fb5e00988ce7b1d821f5 rust-std-1.82.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -sha256 bf93c79abc56bfcc3d48f2defcb0ca720405d01a50ba08d6d24830ae034bbc2d rust-std-1.82.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-i586-unknown-linux-gnu.tar.xz.sha256 -sha256 f56585c55664898c7484f4b7bd139770c99d7b4da6e56e4016f71cb053b1aee2 rust-std-1.82.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-i586-unknown-linux-musl.tar.xz.sha256 -sha256 711c03ffb5bb53fcc97278b015d1ea9f503ce826ba390855f576c0e3b77c4bdb rust-std-1.82.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 c7ebb02b6ca349999b3b7dce768efaca5e0d9060f55397523e11a64cd10a9405 rust-std-1.82.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-i686-unknown-linux-musl.tar.xz.sha256 -sha256 3c5ee32afc4b83313832c7a78175c05a5e568e6053fde7e65e2a9b19ce104c10 rust-std-1.82.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 827989a42526206199025f764d08d7cd319fee58bf2e08dcaf75df9ead6f094e rust-std-1.82.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 cdfadb39f1325319de8152504413f34671ac09fa7ecb97f967c25ece3645bc5e rust-std-1.82.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 4954a44305622b8f68ca088138b9a69432e350336da1a415a282ce148beb340d rust-std-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -sha256 5649f9b4e107d6c5f72fb7f82cfe15370b80b8d983670602e02e0b615bc6dc88 rust-std-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-s390x-unknown-linux-gnu.tar.xz.sha256 -sha256 454b83668b57bdef28fc49aca8fd4c38e395b49011e653afdf3f9bb2dae8aa63 rust-std-1.82.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -sha256 87db52d782131a8817b76f65eefcae2c24a49b2a6f19ed9bd4699167305c22aa rust-std-1.82.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 2eca3d36f7928f877c334909f35fe202fbcecce109ccf3b439284c2cb7849594 rust-std-1.82.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.82.0-x86_64-unknown-linux-musl.tar.xz.sha256 -sha256 1c99a4c81f51b687ba55746c7d3f19b5b860fe4eff604d3c7d803e08c9cc89bb rust-std-1.82.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 d5decc46123eb888f809f2ee3b118d13586a37ffad38afaefe56aa7139481d34 rust-1.88.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 1f28a28b025ab2637f479f7f239c391a83319dcb89c53819c5a828fe4f92616a rust-1.88.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 e685d4a1d4d616fbf2accf13f29f3dfa431e62b49125499677a7c0954afd216e rust-1.88.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 a06706c8e76dcdd652b74d8737d4d99c20991068520bca86712d3e6d94d141e5 rust-1.88.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 4e429d0c390032e556cea9a5729b8abc035aa421a1ad3ac232b63308705c14bb rust-1.88.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +sha256 3021ad1c6f5c5d177546f9890acaac105fbfc211bfd4b11fc06156f85112df09 rust-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-s390x-unknown-linux-gnu.tar.xz.sha256 +sha256 96f49ff456bd5649f19f2165864f5588d1bb1f533b9da8b4e3c7b65d61b28a7f rust-1.88.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.88.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 7b5437c1d18a174faae253a18eac22c32288dccfc09ff78d5ee99b7467e21bca rust-1.88.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 e9ac4ff3c87247a2195fcceddbf1bdeee5c4fd337f014d8f4c4e3ac99002021f rust-std-1.88.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-aarch64-unknown-linux-musl.tar.xz.sha256 +sha256 b1562ce0836d5071abbbeaf52e3db9ce0d37fa432f5202b8f661aa4881b4c3e4 rust-std-1.88.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +sha256 598e389223ebef13efe6ef8d4dc11da3427c3716f21fd089b9ec5afbec1bb900 rust-std-1.88.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 b5e1f168fa02ad57e1ace9ac3d379a9c95f816a26f12156216521a22e192f123 rust-std-1.88.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-arm-unknown-linux-musleabi.tar.xz.sha256 +sha256 89190b0de686052ff76418f67efa25ca83430f112737c2625d2911d0839cf9fc rust-std-1.88.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +sha256 5aa9d94539b8e5dc02454ca5605c420d7e96c74e62ec53889cc27d2744edef95 rust-std-1.88.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +sha256 37b77f0e226f291f42d02c4d3011d53a4bde67fc4b49ae205fde80cd50b55d8a rust-std-1.88.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +sha256 fe75a39a140e5ab430d17d6aed2b93b5c17735ece4c578629f5210d43512d6b6 rust-std-1.88.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +sha256 60ee3766f67d6404f8c9e77090c57c21fef7eca540ec0ab2f2cd2b28a21dca37 rust-std-1.88.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 f9e13ca81872019186a67c44919c017b1bfa80c1e2784caee81ab1f65f548b5b rust-std-1.88.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +sha256 822c8dc77c50eaf4786c42b9004daf3aa05472b3247d11c02caf8bc1d408d67f rust-std-1.88.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +sha256 fd6684c2454c2859209e1f9791d4f7bd5be4e75f599276220ba8814f94f331cb rust-std-1.88.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-i586-unknown-linux-gnu.tar.xz.sha256 +sha256 7c9016ce85e24dde9d76c0a34061fa0fd6f742ea495dd1784804b60061b39627 rust-std-1.88.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-i586-unknown-linux-musl.tar.xz.sha256 +sha256 ab409bb848d7109005857e14cd200f5a07479b3c6b8c7fdda9325af61672a273 rust-std-1.88.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 ced56f7ab86496f6eb42d356841f9d0b625159eba65afd1913f232bb66d4b7e0 rust-std-1.88.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-i686-unknown-linux-musl.tar.xz.sha256 +sha256 dcd1ef607728bcc73bcd70341094a6fcaa1dbbfb01cfc48505c0e93b62394eb8 rust-std-1.88.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 891fe38736ca637bcd776f6d2b1822d761bd92305188482e45d26ab0dd84344b rust-std-1.88.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 89cf8b30e0fae601e0603e41d5eaf58881729208cac83636eff89b94724b7112 rust-std-1.88.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 1030e71f755692c3429bb16829cca776c1ac372abbce3001b04d4e46b1e4f32f rust-std-1.88.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +sha256 d446fc0d8e4ce985c2d21aa2adb6ec9fce8f7ebde85655200abd71e142b9a981 rust-std-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-s390x-unknown-linux-gnu.tar.xz.sha256 +sha256 df3144f87a22d606abea4dcfe88369fcd499ef2fc748724b47941308ae259a5d rust-std-1.88.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +sha256 95be6d0dec8be07fa13313a10dd177e72df9737660c235a3e673bffcdd2e9068 rust-std-1.88.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 36d7eacf46bd5199cb433e49a9ed9c9b380d82f8a0ebc05e89b43b51c070c955 rust-std-1.88.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.88.0-x86_64-unknown-linux-musl.tar.xz.sha256 +sha256 0c42b63c18a6343851e0f27aeb5cff73146c86fc95bc4e2bf51b726c4311249e rust-std-1.88.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT +sha256 b71bd43a069ca0641a9ecfe585ca7b3c53b5cc1608f8b68321168698e28b5ea1 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index c14ca7f88e..215bd84ad3 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.82.0 +RUST_BIN_VERSION = 1.88.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust-bindgen/rust-bindgen.hash b/package/rust-bindgen/rust-bindgen.hash index 7b222e577f..dc79a62ddd 100644 --- a/package/rust-bindgen/rust-bindgen.hash +++ b/package/rust-bindgen/rust-bindgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 618a92ac5e0e855a4e5cb16fb71258c4859679f3f7d7d95c7150e8b09cbbfbde rust-bindgen-0.65.1-cargo2.tar.gz +sha256 f131b9cf87ea0a5db33ff3ad711aec4dbc4d383536f5f2e37493d63cbe95428e rust-bindgen-0.72.0-cargo4.tar.gz sha256 c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db LICENSE diff --git a/package/rust-bindgen/rust-bindgen.mk b/package/rust-bindgen/rust-bindgen.mk index aa0d7d44a4..349d4c3670 100644 --- a/package/rust-bindgen/rust-bindgen.mk +++ b/package/rust-bindgen/rust-bindgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BINDGEN_VERSION = 0.65.1 +RUST_BINDGEN_VERSION = 0.72.0 RUST_BINDGEN_SITE = $(call github,rust-lang,rust-bindgen,v$(RUST_BINDGEN_VERSION)) RUST_BINDGEN_LICENSE = BSD-3-clause RUST_BINDGEN_LICENSE_FILES = LICENSE diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 19af66e2d6..7b22bb8c94 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,8 +1,8 @@ # Generated with utils/update-rust # Do not edit manually -# From https://static.rust-lang.org/dist/rustc-1.82.0-src.tar.xz.sha256 -sha256 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210 rustc-1.82.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.88.0-src.tar.xz.sha256 +sha256 0c1dcbb4f762513d021e1a282c0ac58c0a423642b3a6bf581cafb5414df4193e rustc-1.88.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT +sha256 b71bd43a069ca0641a9ecfe585ca7b3c53b5cc1608f8b68321168698e28b5ea1 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 29c03594d2..9999475c35 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,11 +6,12 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.82.0 +RUST_VERSION = 1.88.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT RUST_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT +RUST_CPE_ID_VENDOR = rust-lang HOST_RUST_PROVIDES = host-rustc @@ -48,6 +49,7 @@ define HOST_RUST_CONFIGURE_CMDS echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ + echo 'download-ci-llvm = false'; \ echo 'ninja = false'; \ echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml diff --git a/package/ruy/Config.in b/package/ruy/Config.in new file mode 100644 index 0000000000..cc137a403c --- /dev/null +++ b/package/ruy/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_RUY_ARCH_SUPPORTS + bool + default y if BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS + +config BR2_PACKAGE_RUY + bool "ruy" + depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_HAS_THREADS # cpuinfo + select BR2_PACKAGE_CPUINFO + help + Ruy is a matrix multiplication library. Its focus is to cover + the matrix multiplication needs of neural network inference + engines. Its initial user has been TensorFlow Lite, where it + is used by default on the ARM CPU architecture. + + https://github.com/google/ruy + +comment "ruy needs a toolchain w/ C++14, threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ruy/ruy.hash b/package/ruy/ruy.hash new file mode 100644 index 0000000000..159687bf04 --- /dev/null +++ b/package/ruy/ruy.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 0bd02bef7675d3edd8168e6e4ce22e162516947fcc07bb79809be4cda8f27a0c ruy-83fd40d730feb0804fafbc2d8814bcc19a17b2e5.tar.gz +# License files, locally calculated +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/ruy/ruy.mk b/package/ruy/ruy.mk new file mode 100644 index 0000000000..3e83553f19 --- /dev/null +++ b/package/ruy/ruy.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# ruy +# +################################################################################ + +RUY_VERSION = 83fd40d730feb0804fafbc2d8814bcc19a17b2e5 +RUY_SITE = $(call github,google,ruy,$(RUY_VERSION)) +RUY_LICENSE = Apache-2.0 +RUY_LICENSE_FILES = LICENSE +RUY_INSTALL_STAGING = YES +RUY_DEPENDENCIES = cpuinfo +RUY_CONF_OPTS = \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DRUY_FIND_CPUINFO=ON \ + -DRUY_MINIMAL_BUILD=ON + +$(eval $(cmake-package)) diff --git a/package/s6-dns/s6-dns.hash b/package/s6-dns/s6-dns.hash index dd6e6f3632..29e81e7753 100644 --- a/package/s6-dns/s6-dns.hash +++ b/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 6aee32bb68d01f5109f71e31a283213c668cd3c0e79fb9e469e6cabb58079f2b s6-dns-2.3.7.2.tar.gz +sha256 4d7ab49c9842ac25b668dc1e2a9260be97757a75f263ce85f9b6556ad2e1dee4 s6-dns-2.4.0.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk index 8e175431a4..566cdf21ef 100644 --- a/package/s6-dns/s6-dns.mk +++ b/package/s6-dns/s6-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.7.2 +S6_DNS_VERSION = 2.4.0.0 S6_DNS_SITE = https://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING @@ -12,8 +12,7 @@ S6_DNS_INSTALL_STAGING = YES S6_DNS_DEPENDENCIES = skalibs S6_DNS_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index 25292c35b2..78cefb0c65 100644 --- a/package/s6-linux-init/s6-linux-init.hash +++ b/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 11ae08d0a66210b5e56b6baee0f6b9b1b69fbedb05fda1285b115a31ca46c77f s6-linux-init-1.1.2.0.tar.gz -sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING +sha256 971e014a229b7f47a128721dd714f8d493c4ac644e465197b6599a9640966530 s6-linux-init-1.1.2.1.tar.gz +sha256 75b0b50d7bcb9b2fc174d01442536bce03333da1814df3e61cd6ef8f663548f1 COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index ae2bcdb8d8..9378a33509 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,15 +4,14 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.1.2.0 +S6_LINUX_INIT_VERSION = 1.1.2.1 S6_LINUX_INIT_SITE = https://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils S6_LINUX_INIT_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/execline \ diff --git a/package/s6-linux-utils/s6-linux-utils.hash b/package/s6-linux-utils/s6-linux-utils.hash index 97a67c674e..c01e856948 100644 --- a/package/s6-linux-utils/s6-linux-utils.hash +++ b/package/s6-linux-utils/s6-linux-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 8f944633ca87d3d23e0f03c9c383d1502d508c9bac16d38c3fbf723a5eab2bb7 s6-linux-utils-2.6.2.0.tar.gz -sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING +sha256 915f167294d36ca9240a62281c7299b5ad5d558b8d45d888761135749d9fd234 s6-linux-utils-2.6.2.1.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index 04e08c3d43..f760aec78f 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -4,15 +4,14 @@ # ################################################################################ -S6_LINUX_UTILS_VERSION = 2.6.2.0 +S6_LINUX_UTILS_VERSION = 2.6.2.1 S6_LINUX_UTILS_SITE = https://skarnet.org/software/s6-linux-utils S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING S6_LINUX_UTILS_DEPENDENCIES = skalibs S6_LINUX_UTILS_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ diff --git a/package/s6-networking/s6-networking.hash b/package/s6-networking/s6-networking.hash index 4eff4d49f4..dfc05f03da 100644 --- a/package/s6-networking/s6-networking.hash +++ b/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 db411c54371a17ed7d4543dd86cf9530ce25fcf624bef83ae2b579520e5e70bf s6-networking-2.7.0.3.tar.gz +sha256 31bdb70c824f58f6cb09d0a568a2454615eeaf498a82896f6c3f8382af590965 s6-networking-2.7.0.4.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index 212fae7361..1e2aa5adaa 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.7.0.3 +S6_NETWORKING_VERSION = 2.7.0.4 S6_NETWORKING_SITE = https://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING @@ -12,8 +12,7 @@ S6_NETWORKING_INSTALL_STAGING = YES S6_NETWORKING_DEPENDENCIES = s6-dns s6 S6_NETWORKING_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/execline \ diff --git a/package/s6-portable-utils/s6-portable-utils.hash b/package/s6-portable-utils/s6-portable-utils.hash index 2454e91a4d..790f4e3d32 100644 --- a/package/s6-portable-utils/s6-portable-utils.hash +++ b/package/s6-portable-utils/s6-portable-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 3e4492055d160c25fb90153f0efc277d7d52bf981bbe3ea2e9dfe51c493561ff s6-portable-utils-2.3.0.3.tar.gz -sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING +sha256 8dee87b6c89181ef3ed3241fece43f8d79aa137449cae778d3b59e1e91906b08 s6-portable-utils-2.3.0.4.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index 826750f387..7986e9454e 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -4,15 +4,14 @@ # ################################################################################ -S6_PORTABLE_UTILS_VERSION = 2.3.0.3 +S6_PORTABLE_UTILS_VERSION = 2.3.0.4 S6_PORTABLE_UTILS_SITE = https://skarnet.org/software/s6-portable-utils S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING S6_PORTABLE_UTILS_DEPENDENCIES = skalibs S6_PORTABLE_UTILS_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ diff --git a/package/s6-rc/s6-rc.hash b/package/s6-rc/s6-rc.hash index 72bd5d42be..052039f98d 100644 --- a/package/s6-rc/s6-rc.hash +++ b/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e3272796a947904de37ab34ec10430e26107b8ef05210d81059c8b36203e6a9f s6-rc-0.5.4.3.tar.gz +sha256 c3b5f1b8d3acea60a20a59fb25280b69a6aac0bb3afdab21d2edeada77b2df01 s6-rc-0.5.5.0.tar.gz sha256 75b0b50d7bcb9b2fc174d01442536bce03333da1814df3e61cd6ef8f663548f1 COPYING diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 301c705910..07857708ba 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_RC_VERSION = 0.5.4.3 +S6_RC_VERSION = 0.5.5.0 S6_RC_SITE = https://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING @@ -12,8 +12,7 @@ S6_RC_INSTALL_STAGING = YES S6_RC_DEPENDENCIES = s6 S6_RC_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/execline \ diff --git a/package/s6/s6.hash b/package/s6/s6.hash index 6abeb8066a..b82b226741 100644 --- a/package/s6/s6.hash +++ b/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7e46f8f55d80bb0e2025a64d5d649af4a4ac21e348020caaadde30ba5e5b4830 s6-2.13.0.0.tar.gz +sha256 bf0614cf52957cb0af04c7b02d10ebd6c5e023c9d46335cbf75484eed3e2ce7e s6-2.13.1.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6/s6.mk b/package/s6/s6.mk index 7e02c26d03..e72dc28460 100644 --- a/package/s6/s6.mk +++ b/package/s6/s6.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_VERSION = 2.13.0.0 +S6_VERSION = 2.13.1.0 S6_SITE = https://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING @@ -12,8 +12,7 @@ S6_INSTALL_STAGING = YES S6_DEPENDENCIES = execline S6_CONF_OPTS = \ - --prefix=/ \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/execline \ diff --git a/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index eb0ea099b7..b8dd012d41 100644 --- a/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -33,7 +33,7 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 4.11.13, 4.17.7 & 4.20.3] +[Bernd: rebased for version 4.23.1] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- @@ -43,10 +43,10 @@ diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_hei index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -13,3 +13,14 @@ - # when this will be available also in - # system libraries... - conf.define('HAVE_CLIENT_GSS_C_CHANNEL_BOUND_FLAG', 1) +@@ -16,3 +16,14 @@ + + conf.define('HAVE_KRB5_INIT_CREDS_STEP', 1) + conf.define('HAVE_GSS_KEY_VALUE_SET_DESC', 1) + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): diff --git a/package/samba4/Config.in b/package/samba4/Config.in index 5907bdc478..e1d3dd9bf7 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -10,14 +10,16 @@ config BR2_PACKAGE_SAMBA4 depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi depends on !BR2_STATIC_LIBS # cmocka, python, gnutls - depends on !BR2_nios2 # binary too large, relocations don't fit depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_CMOCKA select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON3_SSL select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_POPT select BR2_PACKAGE_ZLIB help diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 2c867a03bf..ec28ced087 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.20.5.tar.asc -sha256 0697a8a57ff8b268cc268d508ee4f9ec86fd82350e84eba47a709242b71f6962 samba-4.20.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.23.3.tar.asc +sha256 06cdbb27a6956978b045455fe0696d998ffbac8d24ba24de87a4ef8200813320 samba-4.23.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4cece4b477..439e5452af 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.20.5 +SAMBA4_VERSION = 4.23.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -22,6 +22,7 @@ SAMBA4_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_READLINE),readline) \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) SAMBA4_CFLAGS = $(TARGET_CFLAGS) SAMBA4_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) diff --git a/package/sane-airscan/Config.in b/package/sane-airscan/Config.in new file mode 100644 index 0000000000..b7cf224741 --- /dev/null +++ b/package/sane-airscan/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_SANE_AIRSCAN + bool "sane-airscan" + depends on !BR2_STATIC_LIBS # avahi, gnutls, sane-backends + depends on BR2_TOOLCHAIN_HAS_THREADS # avahi, dbus + depends on BR2_USE_WCHAR # avahi, gnutls + depends on BR2_USE_MMU # dbus, sane-backends + select BR2_PACKAGE_AVAHI + select BR2_PACKAGE_AVAHI_DAEMON # needed to get avahi-client + select BR2_PACKAGE_DBUS # needed by avahi to get avahi-client + select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_SANE_BACKENDS + select BR2_PACKAGE_TIFF + help + SANE backend for AirScan (eSCL) and WSD document scanners + + Similar to how most modern network printers support + "driverless" printing, using the universal vendor-neutral + printing protocol, many modern network scanners and MFPs + support "driverless" scanning. + + https://github.com/alexpevzner/sane-airscan + +comment "sane-airscan needs a toolchain w/ wchar, dynamic library, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/sane-airscan/sane-airscan.hash b/package/sane-airscan/sane-airscan.hash new file mode 100644 index 0000000000..40fb84e32d --- /dev/null +++ b/package/sane-airscan/sane-airscan.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 647f41f84f9bce743c796ca84c1fda67e519968fab407490c28fd0cc6d7ac485 sane-airscan-0.99.33.tar.gz +sha256 a2631c1b81992bd6f66db6be8b009ed7e3e998d1e2db4de497fa82d65011d373 LICENSE diff --git a/package/sane-airscan/sane-airscan.mk b/package/sane-airscan/sane-airscan.mk new file mode 100644 index 0000000000..168430e3e3 --- /dev/null +++ b/package/sane-airscan/sane-airscan.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# sane-airscan +# +################################################################################ + +SANE_AIRSCAN_VERSION = 0.99.33 +SANE_AIRSCAN_SITE = $(call github,alexpevzner,sane-airscan,$(SANE_AIRSCAN_VERSION)) +SANE_AIRSCAN_DEPENDENCIES = avahi gnutls jpeg libpng libxml2 sane-backends tiff +SANE_AIRSCAN_LICENSE = GPL-2.0+-with-exception +SANE_AIRSCAN_LICENSE_FILES = LICENSE + +$(eval $(meson-package)) diff --git a/package/sane-backends/0002-sm3600.h-Fix-build-with-standard-C23.patch b/package/sane-backends/0002-sm3600.h-Fix-build-with-standard-C23.patch new file mode 100644 index 0000000000..287de48285 --- /dev/null +++ b/package/sane-backends/0002-sm3600.h-Fix-build-with-standard-C23.patch @@ -0,0 +1,38 @@ +From 90815a9f2576c2428287a500cab6caeddb80f9a8 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 5 Feb 2025 13:19:11 +0100 +Subject: [PATCH] sm3600.h: Fix build with standard C23 + +bool, true and false are keywords in the standard C23 - the sm3600 +backend defines them on its own, which is forbidden with the new +standard. + +The patch adds ifdef guards for the affected typedef - the old code +will be used for older standards, C23 will define TBool as bool. + +Upstream: https://gitlab.com/sane-project/backends/-/commit/90815a9f2576c2428287a500cab6caeddb80f9a8 + +Signed-off-by: Bernd Kuhls +--- + backend/sm3600.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/backend/sm3600.h b/backend/sm3600.h +index 2ecbeb236..5d8a8d809 100644 +--- a/backend/sm3600.h ++++ b/backend/sm3600.h +@@ -77,7 +77,11 @@ Start: 2.4.2001 + + /* ====================================================================== */ + ++#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L + typedef enum { false, true } TBool; ++#else ++typedef bool TBool; ++#endif /* GCC < 15 */ + + typedef SANE_Status TState; + +-- +GitLab + diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk index 7a37a99643..115867fa0a 100644 --- a/package/sbc/sbc.mk +++ b/package/sbc/sbc.mk @@ -12,6 +12,13 @@ SBC_DEPENDENCIES = host-pkgconf SBC_LICENSE := LGPL-2.1+ (library) SBC_LICENSE_FILES = COPYING COPYING.LIB +# gcc-15 defaults to -std=gnu23 which introduces build failures. +# We force "-std=gnu17" for gcc version supporting it. Earlier gcc +# versions will work, since they are using the older standard. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) +SBC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17" +endif + ifeq ($(BR2_PACKAGE_SBC_TOOLS),y) SBC_DEPENDENCIES += libsndfile SBC_CONF_OPTS += --enable-tools --enable-tester diff --git a/package/scons/scons.hash b/package/scons/scons.hash index 8dca99830e..3a8a942ee8 100644 --- a/package/scons/scons.hash +++ b/package/scons/scons.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scons/json -md5 f5a740e94864408902c62bdb47687d9d SCons-4.7.0.tar.gz -sha256 d8b617f6610a73e46509de70dcf82f76861b79762ff602d546f4e80918ec81f3 SCons-4.7.0.tar.gz +md5 37ad818d24ad2f44d6bee5b0f3838706 scons-4.8.1.tar.gz +sha256 5b641357904d2f56f7bfdbb37e165ab996b6143c948b9df0efc7305f54949daa scons-4.8.1.tar.gz # Locally computed sha256 checksums sha256 2f6ac9a1fc98394d18b80dba9bedb9d5626006d44db3fecf7cf3e21cff7e8b1c LICENSE diff --git a/package/scons/scons.mk b/package/scons/scons.mk index b6bfaa0237..f1f76f38a6 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -4,9 +4,8 @@ # ################################################################################ -SCONS_VERSION = 4.7.0 -SCONS_SOURCE = SCons-$(SCONS_VERSION).tar.gz -SCONS_SITE = https://files.pythonhosted.org/packages/7b/68/6895065c86c65a9388eb760a43ea695ec5b9b1c98a9675a3bcd682dbe9c0 +SCONS_VERSION = 4.8.1 +SCONS_SITE = https://files.pythonhosted.org/packages/b9/76/a2c1293642f9a448f2d012cabf525be69ca5abf4af289bc0935ac1554ee8 SCONS_LICENSE = MIT SCONS_LICENSE_FILES = LICENSE SCONS_SETUP_TYPE = setuptools diff --git a/package/screen/screen.hash b/package/screen/screen.hash index 208a9cb36d..61bacd88ff 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-5.0.0.tar.gz.sig -sha256 f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 screen-5.0.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-5.0.1.tar.gz.sig +sha256 2dae36f4db379ffcd14b691596ba6ec18ac3a9e22bc47ac239789ab58409869d screen-5.0.1.tar.gz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 9a64780a9a..74453faff8 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 5.0.0 +SCREEN_VERSION = 5.0.1 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 1350fc6781..1160f3f2bb 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 88af4569161a0d0192f0f4a94582a1af4e75722499d06984fb7f91f638f5afb3 sdbus-cpp-2.0.0.tar.gz +sha256 6025e5dc6cddd532ff960d14e68ced5f42a1916b23a73fea6bcb437f06992eaf sdbus-cpp-2.1.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 2994f079c9..a01bcd22c6 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 2.0.0 +SDBUS_CPP_VERSION = 2.1.0 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd diff --git a/package/sdbusplus/Config.in.host b/package/sdbusplus/Config.in.host index 2b1d1ce31d..a9f8afe02b 100644 --- a/package/sdbusplus/Config.in.host +++ b/package/sdbusplus/Config.in.host @@ -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. diff --git a/package/sdbusplus/sdbusplus.mk b/package/sdbusplus/sdbusplus.mk index 498b835052..207243b14d 100644 --- a/package/sdbusplus/sdbusplus.mk +++ b/package/sdbusplus/sdbusplus.mk @@ -23,7 +23,7 @@ SDBUSPLUS_LICENSE = Apache-2.0 SDBUSPLUS_LICENSE_FILES = LICENSE # Autoreconf is missing the m4/ directory, which might actually be missing -# iff it was the first argument, but unfortunately we are overriding the +# if it was the first argument, but unfortunately we are overriding the # first include directory above. Thus we need that hook here. define SDBUSPLUS_CREATE_M4 mkdir -p $(@D)/m4 diff --git a/package/sdl/0001-Fix-compilation-with-libX11-1.5.99.902.patch b/package/sdl/0001-Fix-compilation-with-libX11-1.5.99.902.patch new file mode 100644 index 0000000000..83f0ab2bb1 --- /dev/null +++ b/package/sdl/0001-Fix-compilation-with-libX11-1.5.99.902.patch @@ -0,0 +1,69 @@ +From 41410b72746cfc7ff515aefed62b0b179bf6e8da Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Sun, 2 Jun 2013 20:48:53 +0600 +Subject: [PATCH] Fix compilation with libX11 >= 1.5.99.902. + +These changes fixes bug #1769 for SDL 1.2 +(http://bugzilla.libsdl.org/show_bug.cgi?id=1769). + +Upstream: 5d79977ec7a6b58afa6e4817035aaaba186f7e9f +Signed-off-by: Vicente Olivert Riera +--- + configure.in | 11 +++++++++++ + include/SDL_config.h.in | 1 + + src/video/x11/SDL_x11sym.h | 4 ++++ + 3 files changed, 16 insertions(+) + +diff --git a/configure.in b/configure.in +index 08c8e1e9..89c526d4 100644 +--- a/configure.in ++++ b/configure.in +@@ -1127,6 +1127,17 @@ AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for ful + if test x$definitely_enable_video_x11_xrandr = xyes; then + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) + fi ++ AC_MSG_CHECKING(for const parameter to _XData32) ++ have_const_param_xdata32=no ++ AC_TRY_COMPILE([ ++ #include ++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++ ],[ ++ ],[ ++ have_const_param_xdata32=yes ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) ++ ]) ++ AC_MSG_RESULT($have_const_param_xdata32) + fi + fi + } +diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in +index 8bb1773c..78ca747b 100644 +--- a/include/SDL_config.h.in ++++ b/include/SDL_config.h.in +@@ -282,6 +282,7 @@ + #undef SDL_VIDEO_DRIVER_WINDIB + #undef SDL_VIDEO_DRIVER_WSCONS + #undef SDL_VIDEO_DRIVER_X11 ++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 + #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE + #undef SDL_VIDEO_DRIVER_X11_DYNAMIC + #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT +diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h +index 4875b989..bd83f7f5 100644 +--- a/src/video/x11/SDL_x11sym.h ++++ b/src/video/x11/SDL_x11sym.h +@@ -165,7 +165,11 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return) + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) ++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) ++#else + SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++#endif + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + +-- +2.50.1 + diff --git a/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch new file mode 100644 index 0000000000..68e66bd5a2 --- /dev/null +++ b/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch @@ -0,0 +1,29 @@ +From c24c08c9aa0f92213793e5ef404f2c387603d7f8 Mon Sep 17 00:00:00 2001 +From: Ozkan Sezer +Date: Sat, 18 Jun 2022 14:55:00 +0300 +Subject: [PATCH] SDL_x11yuv.c: fix possible use-after-free + +Fixes: https://github.com/libsdl-org/SDL-1.2/issues/863 +Upstream: d7e00208738a0bc6af302723fe64908ac35b777b +Signed-off-by: Peter Korsgaard +--- + src/video/x11/SDL_x11yuv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c +index 62698dfd..0d5754e3 100644 +--- a/src/video/x11/SDL_x11yuv.c ++++ b/src/video/x11/SDL_x11yuv.c +@@ -374,8 +374,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S + #ifdef PITCH_WORKAROUND + if ( hwdata->image != NULL && hwdata->image->pitches[0] != (width*bpp) ) { + /* Ajust overlay width according to pitch */ +- XFree(hwdata->image); + width = hwdata->image->pitches[0] / bpp; ++ XFree(hwdata->image); + hwdata->image = SDL_NAME(XvCreateImage)(GFX_Display, xv_port, format, + 0, width, height); + } +-- +2.50.1 + diff --git a/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch b/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch new file mode 100644 index 0000000000..cccc0464bb --- /dev/null +++ b/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch @@ -0,0 +1,66 @@ +From 6fb5aadafc9d99c25fb4f1a37d225d5b79bc92e9 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 15 Oct 2022 15:10:48 -0700 +Subject: [PATCH] Xext: Fix function declarations without a prototype + +This is not supported with the upcoming clang 16. + +error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Werror,-Wdeprecated-non-prototype] + +reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240 + +Upstream: e738cfffced8a006094d55337d917386582ada47 +Signed-off-by: Thomas Petazzoni +--- + src/video/Xext/XME/xme.c | 2 +- + src/video/Xext/Xinerama/Xinerama.c | 3 ++- + src/video/Xext/Xv/Xv.c | 6 +++--- + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c +index 2cead35a..bb8d04d4 100644 +--- a/src/video/Xext/XME/xme.c ++++ b/src/video/Xext/XME/xme.c +@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME; + /* + * find_display - locate the display info block + */ +-static int XiGMiscCloseDisplay(); ++static int XiGMiscCloseDisplay(Display*, XExtCodes*); + + static XExtensionHooks xigmisc_extension_hooks = { + NULL, /* create_gc */ +diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c +index 4ff42ebf..57f64b9c 100644 +--- a/src/video/Xext/Xinerama/Xinerama.c ++++ b/src/video/Xext/Xinerama/Xinerama.c +@@ -50,7 +50,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; + #define PanoramiXSimpleCheckExtension(dpy,i) \ + XextSimpleCheckExtension (dpy, i, panoramiX_extension_name) + +-static int close_display(); ++static int close_display(Display*, XExtCodes*); ++ + static /* const */ XExtensionHooks panoramiX_extension_hooks = { + NULL, /* create_gc */ + NULL, /* copy_gc */ +diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c +index 7147b9e8..c254a1dc 100644 +--- a/src/video/Xext/Xv/Xv.c ++++ b/src/video/Xext/Xv/Xv.c +@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName; + #define XvCheckExtension(dpy, i, val) \ + XextCheckExtension(dpy, i, xv_extension_name, val) + +-static char *xv_error_string(); +-static int xv_close_display(); +-static Bool xv_wire_to_event(); ++static char *xv_error_string(Display*, int, XExtCodes*, char*, int); ++static int xv_close_display(Display*, XExtCodes*); ++static Bool xv_wire_to_event(Display*, XEvent*, xEvent*); + + static XExtensionHooks xv_extension_hooks = { + NULL, /* create_gc */ +-- +2.50.1 + diff --git a/package/sdl/0004-src-stdlib-SDL_iconv.c-fix-types-mismatch.patch b/package/sdl/0004-src-stdlib-SDL_iconv.c-fix-types-mismatch.patch new file mode 100644 index 0000000000..4915c6cadc --- /dev/null +++ b/package/sdl/0004-src-stdlib-SDL_iconv.c-fix-types-mismatch.patch @@ -0,0 +1,50 @@ +From 390974b8a9d5e513d48d794818dbe180e0f80b16 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Fri, 28 Nov 2025 10:57:41 +0100 +Subject: [PATCH] src/stdlib/SDL_iconv.c: fix types mismatch + +When building sdl this error shows up: +./src/stdlib/SDL_iconv.c: In function 'SDL_iconv': +./src/stdlib/SDL_iconv.c:50:29: error: passing argument 2 of 'iconv' from incompatible pointer type [-Wincompatible-pointer-types] + 50 | retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); + | ^~~~~ + | | + | const char ** + +Let's pick only this code from upstream commit[1] and left the rest +untouched. + +Upstream: [1] + +[1]: +https://github.com/libsdl-org/SDL-1.2/commit/8a8135d91f9361448521765c9da00401fab866a1 + +Signed-off-by: Giulio Benetti +--- + src/stdlib/SDL_iconv.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c +index fa56a99e..369f6881 100644 +--- a/src/stdlib/SDL_iconv.c ++++ b/src/stdlib/SDL_iconv.c +@@ -43,12 +43,10 @@ size_t SDL_iconv(SDL_iconv_t cd, + const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) + { +- size_t retCode; +-#ifdef ICONV_INBUF_NONCONST +- retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); +-#else +- retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); +-#endif ++ /* iconv's second parameter may or may not be `const char const *` depending on the ++ C runtime's whims. Casting to void * seems to make everyone happy, though. */ ++ const size_t retCode = iconv((iconv_t) ((uintptr_t) cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft); ++ + if ( retCode == (size_t)-1 ) { + switch(errno) { + case E2BIG: +-- +2.47.3 + diff --git a/package/sdl/Config.in b/package/sdl/Config.in index 9f1e34de5c..1d9887f324 100644 --- a/package/sdl/Config.in +++ b/package/sdl/Config.in @@ -13,10 +13,6 @@ config BR2_PACKAGE_SDL_FBCON bool "SDL framebuffer console video driver" default y -config BR2_PACKAGE_SDL_DIRECTFB - bool "SDL DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_SDL_X11 bool "SDL X11 video driver" depends on BR2_PACKAGE_XORG7 diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 462600debb..439c30b2a5 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -28,7 +28,9 @@ HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN SDL_DEPENDENCIES += host-automake host-autoconf host-libtool HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool -SDL_CONF_OPTS += --enable-video-qtopia=no +SDL_CONF_OPTS += \ + --enable-video-qtopia=no \ + --enable-video-directfb=no ifeq ($(BR2_PACKAGE_SDL_FBCON),y) SDL_CONF_OPTS += --enable-video-fbcon=yes @@ -36,14 +38,6 @@ else SDL_CONF_OPTS += --enable-video-fbcon=no endif -ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y) -SDL_DEPENDENCIES += directfb -SDL_CONF_OPTS += --enable-video-directfb=yes -SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL_CONF_OPTS += --enable-video-directfb=no -endif - ifeq ($(BR2_PACKAGE_SDL_X11),y) SDL_CONF_OPTS += --enable-video-x11=yes SDL_DEPENDENCIES += \ diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 7c8258fe73..432b34b9e4 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -11,13 +11,6 @@ config BR2_PACKAGE_SDL2 if BR2_PACKAGE_SDL2 -config BR2_PACKAGE_SDL2_DIRECTFB - bool "DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - -comment "DirectFB video driver needs directfb" - depends on !BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_SDL2_X11 bool "X11 video driver" depends on BR2_PACKAGE_XORG7 @@ -45,6 +38,23 @@ comment "KMS/DRM video driver needs a GBM provider, and OpenGL or OpenGLES+EGL" !BR2_PACKAGE_HAS_LIBEGL || \ !(BR2_PACKAGE_SDL2_OPENGL || BR2_PACKAGE_SDL2_OPENGLES) +config BR2_PACKAGE_SDL2_WAYLAND + bool "Wayland video driver" + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + depends on BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_SDL2_OPENGLES + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLAND_PROTOCOLS + +comment "Wayland video driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "Wayland video driver needs wayland with an OpenGLES+EGL backend" + depends on !BR2_PACKAGE_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_SDL2_OPENGLES + config BR2_PACKAGE_SDL2_OPENGL bool "OpenGL (GLX)" depends on BR2_PACKAGE_HAS_LIBGL diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 140767ef0a..484545fe88 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.9.tar.gz.sig -sha256 24b574f71c87a763f50704bbb630cbe38298d544a1f890f099a4696b1d6beba4 SDL2-2.30.9.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.32.10.tar.gz.sig +sha256 5f5993c530f084535c65a6879e9b26ad441169b3e25d789d83287040a9ca5165 SDL2-2.32.10.tar.gz # Locally calculated -sha256 9b9e1764f06701bcf7ce21e942c682d5921ba0900c6fca760321b1c8837a9662 LICENSE.txt +sha256 97f35b302b361680ec1e891e95d2d52097bb95abff361434916d99dc1305f127 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 9eee5c7123..eb6e753869 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.30.9 +SDL2_VERSION = 2.32.10 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib @@ -23,10 +23,10 @@ SDL2_CONF_OPTS += \ --disable-video-vivante \ --disable-video-cocoa \ --disable-video-metal \ - --disable-video-wayland \ --disable-video-dummy \ --disable-video-offscreen \ --disable-video-vulkan \ + --disable-video-directfb \ --disable-ime \ --disable-ibus \ --disable-fcitx \ @@ -77,14 +77,6 @@ else SDL2_CONF_OPTS += --disable-3dnow endif -ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) -SDL2_DEPENDENCIES += directfb -SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL2_CONF_OPTS += --disable-video-directfb -endif - ifeq ($(BR2_PACKAGE_SDL2_OPENGLES)$(BR2_PACKAGE_RPI_USERLAND),yy) SDL2_DEPENDENCIES += rpi-userland SDL2_CONF_OPTS += --enable-video-rpi @@ -137,6 +129,13 @@ else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif +ifeq ($(BR2_PACKAGE_SDL2_WAYLAND),y) +SDL2_DEPENDENCIES += libegl libxkbcommon wayland wayland-protocols +SDL2_CONF_OPTS += --enable-video-wayland +else +SDL2_CONF_OPTS += --disable-video-wayland +endif + ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y) SDL2_CONF_OPTS += --enable-video-opengl SDL2_DEPENDENCIES += libgl diff --git a/package/sdl2_image/sdl2_image.hash b/package/sdl2_image/sdl2_image.hash index 53a887c6f9..9d5ae395cd 100644 --- a/package/sdl2_image/sdl2_image.hash +++ b/package/sdl2_image/sdl2_image.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc SDL2_image-2.8.2.tar.gz +sha256 f7c06a8783952cfe960adccdd3d8472b63ab31475b4390d10cfdcc1aea61238f SDL2_image-2.8.4.tar.gz sha256 a0e8ce06504966e45088ee1cc7583cc8af9aac615d4cf56d47d847da9cb15139 LICENSE.txt diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk index 40b9e3c915..e058cd9f74 100644 --- a/package/sdl2_image/sdl2_image.mk +++ b/package/sdl2_image/sdl2_image.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_IMAGE_VERSION = 2.8.2 +SDL2_IMAGE_VERSION = 2.8.4 SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL2_IMAGE_INSTALL_STAGING = YES diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index 7693aeba6b..4bdf004bad 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d48cbd1ce475b9e178206bf3b72d56b66d84d44f64ac05803328396234d67723 SDL2_ttf-2.22.0.tar.gz -sha256 a0e8ce06504966e45088ee1cc7583cc8af9aac615d4cf56d47d847da9cb15139 LICENSE.txt +sha256 0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd SDL2_ttf-2.24.0.tar.gz +sha256 7826eca0a0f7e591f38dd844e207a200aac81a59b20d8a30c3af8c6282af13e6 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index f4f293cec1..3f53dd1e79 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.22.0 +SDL2_TTF_VERSION = 2.24.0 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index e1db897d44..ce70480d50 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0 0.8.0.tar.gz +sha256 819979c922a0be258aed133d93920bce6a3d3565a60588d6d372ce9db2712cd3 0.9.1.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27f3c8646f..69be691cf6 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.8.0 +SEATD_VERSION = 0.9.1 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT diff --git a/package/sedutil/Config.in b/package/sedutil/Config.in index e695f2bed7..95cdd26e84 100644 --- a/package/sedutil/Config.in +++ b/package/sedutil/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS # no big endian support default y if BR2_arcle || BR2_arm || BR2_aarch64 \ || BR2_i386 || BR2_microblazeel || BR2_mipsel \ - || BR2_mips64el || BR2_nios2 || BR2_powerpc64le \ + || BR2_mips64el || BR2_powerpc64le \ || BR2_sh4 || BR2_sh4a || BR2_x86_64 \ || BR2_XTENSA_LITTLE_ENDIAN @@ -12,7 +12,6 @@ config BR2_PACKAGE_SEDUTIL depends on BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS # 4.4.1 headers depends on BR2_INSTALL_LIBSTDCPP help The Drive Trust Alliance Self Encrypting Drive Utility, @@ -23,7 +22,6 @@ config BR2_PACKAGE_SEDUTIL comment "sedutil needs a toolchain w/ C++, gcc >= 4.8, headers >= 3.12" depends on BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 9cf1fee97e..44095dcd74 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 630b2ad50e017a06a81d4f94312bee85465a93cb050a7536c728055de9a41a2b selinux-python-3.7.tar.gz +sha256 dcfa5f1919dcb7e7b775851994eb5c83b7580dc496cd2d1f73867dfa074d2339 selinux-python-3.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 3ea461b37e..27ff12ad06 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.7 +SELINUX_PYTHON_VERSION = 3.9 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = LICENSE @@ -14,7 +14,7 @@ SELINUX_PYTHON_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ ARCH="$(BR2_ARCH)" \ LIBDIR="$(STAGING_DIR)/usr/lib" \ - PYTHONLIBDIR="usr/lib/python$(PYTHON3_VERSION_MAJOR)" + PYTHONLIBDIR="usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW),y) SELINUX_PYTHON_DEPENDENCIES += checkpolicy diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 296f7fe137..65d34a0fce 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 db0641aeafefec46612c7c2ddd33ef1060bb721ce64842d2a96c33dddb5eb176 semodule-utils-3.7.tar.gz +sha256 729be36e4726c5d0833732681a94b2e0e4aff973c076504e41f8547abb6c5424 semodule-utils-3.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index c9d3af4509..75955845df 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.7 +SEMODULE_UTILS_VERSION = 3.9 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = LICENSE diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash index 0335c57cb3..88f3fdf46d 100644 --- a/package/sentry-cli/sentry-cli.hash +++ b/package/sentry-cli/sentry-cli.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 997581bca5bdb6f7540ea9d6e1d25f0e9df06fcc338d26ed75fc81f9401d65d4 sentry-cli-2.20.3-cargo2.tar.gz +sha256 5072542aad76e1cad27ef643c50b2d959bd5d49e742d887fbad83391d9ce61e2 sentry-cli-2.20.3-cargo4.tar.gz sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/setserial/0001-build-system-fix.patch b/package/setserial/0001-build-system-fix.patch index eec7993d19..06f2201bd4 100644 --- a/package/setserial/0001-build-system-fix.patch +++ b/package/setserial/0001-build-system-fix.patch @@ -3,7 +3,19 @@ sure that the directories (especially the manpages directory) are created before installing files to them. This is similar to what automake does. +Also remove CXXFLAGS and its use since the linker errors out with: + + cannot find @CXXFLAGS@: No such file or directory + +Additionally, remove the strip command made on the wrong file. + Signed-off-by: Thomas Petazzoni +[rebased on top of Debian's setserial_2.17-57.debian.tar.xz instead of relying + on deletion of 01_makefile.patch] +[extend commit log to explain why CXXFLAGS is removed and also that strip is + removed on purpose, c.f. original commit aaa2b660a9f9 ("setserial: convert to + autotargets and fix manpages install")] +Signed-off-by: Quentin Schulz --- Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) @@ -12,17 +24,30 @@ Index: setserial-2.17/Makefile.in =================================================================== --- setserial-2.17.orig/Makefile.in +++ setserial-2.17/Makefile.in -@@ -26,9 +26,10 @@ setserial.cat: setserial.8 +@@ -15,7 +15,6 @@ RM = rm -f + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + CPPFLAGS = @CPPFLAGS@ +-CXXFLAGS = @CXXFLAGS@ + DEFS = @DEFS@ + INCS = -I. + TAR = tar +@@ -23,14 +22,15 @@ TAR = tar + all: setserial setserial.cat + + setserial: setserial.c +- $(CC) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(INCS) setserial.c -o setserial ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(INCS) setserial.c -o setserial + + setserial.cat: setserial.8 nroff -man setserial.8 > setserial.cat install: setserial setserial.8 - $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin - $(STRIP) $(DESTDIR)/bin/setserial -- $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8 + mkdir -p $(DESTDIR)/usr/bin + $(INSTALL_PROGRAM) setserial $(DESTDIR)/usr/bin + mkdir -p $(DESTDIR)/usr/share/man/man8 -+ $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/share/man/man8 + $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/share/man/man8 clean: - $(RM) setserial setserial.o setserial.cat *~ diff --git a/package/setserial/0002-tiocghayesesp-build-fix.patch b/package/setserial/0002-tiocghayesesp-build-fix.patch index 176a0c9e15..670be34c28 100644 --- a/package/setserial/0002-tiocghayesesp-build-fix.patch +++ b/package/setserial/0002-tiocghayesesp-build-fix.patch @@ -6,6 +6,9 @@ define the TIOCGHAYESESP ioctl, breaking the build. It's very unlikely to be of interest anymore, so just undef it. Signed-off-by: Peter Korsgaard +[rebased on top of Debian's setserial_2.17-45.3.diff] +Upstream: N/A only for compatibility with Linux kernels [2.6.33;2.6.36[ +Signed-off-by: Quentin Schulz --- setserial.c | 5 +++++ 1 file changed, 5 insertions(+) @@ -14,9 +17,9 @@ Index: setserial-2.17/setserial.c =================================================================== --- setserial-2.17.orig/setserial.c +++ setserial-2.17/setserial.c -@@ -24,6 +24,11 @@ +@@ -39,6 +39,11 @@ + #include "safety.h" #endif - #include +/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86) + still define TIOCGHAYESESP. It's very unlikely to be of interest diff --git a/package/setserial/setserial.hash b/package/setserial/setserial.hash index 991d2860a9..3c1ade56ff 100644 --- a/package/setserial/setserial.hash +++ b/package/setserial/setserial.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial/setserial_2.17-45.3.dsc +# From https://snapshot.debian.org/file/98a1ce8758c5313a8b8a266d493605e578bcc4f6/setserial_2.17-57.dsc sha256 7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a setserial_2.17.orig.tar.gz -sha256 33db87e8a86cf12b7c97efca9e056865e71358e8cfeb3931118b2647ce1eecc6 setserial_2.17-45.3.diff.gz +sha256 e96ef61d3e5fc5a77d6e54c4c48a2caee31931732a18ee49e4c67d128ad181c9 setserial_2.17-57.debian.tar.xz # Locally computed sha256 1d7e810ed28daf370def626dfd4c502f2f77d2b678f1ac72e2ba675dd6f9af0d debian/copyright diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 66ca59d79d..9beee349c8 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -5,23 +5,34 @@ ################################################################################ SETSERIAL_VERSION = 2.17 -SETSERIAL_PATCH = setserial_2.17-45.3.diff.gz SETSERIAL_SOURCE = setserial_$(SETSERIAL_VERSION).orig.tar.gz -SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial +SETSERIAL_SITE = https://snapshot.debian.org/archive/debian/20250307T084701Z/pool/main/s/setserial +SETSERIAL_EXTRA_DOWNLOADS = setserial_$(SETSERIAL_VERSION)-57.debian.tar.xz SETSERIAL_LICENSE = GPL-2.0 SETSERIAL_LICENSE_FILES = debian/copyright # make all also builds setserial.cat which needs nroff SETSERIAL_MAKE_OPTS = setserial +SETSERIAL_AUTORECONF = YES + +# Extract the Debian tarball inside the sources +define SETSERIAL_DEBIAN_EXTRACT + $(call suitable-extractor,$(notdir $(SETSERIAL_EXTRA_DOWNLOADS))) \ + $(SETSERIAL_DL_DIR)/$(notdir $(SETSERIAL_EXTRA_DOWNLOADS)) | \ + $(TAR) -C $(@D) $(TAR_OPTIONS) - +endef + +SETSERIAL_POST_EXTRACT_HOOKS += SETSERIAL_DEBIAN_EXTRACT + define SETSERIAL_APPLY_DEBIAN_PATCHES - # Touching gorhack.h is needed for the Debian patch 18 to work + # - Touching gorhack.h is needed for the Debian patch 18 to work + # - Apply patches in the order listed in debian/patches/series if [ -d $(@D)/debian/patches ]; then \ touch $(@D)/gorhack.h; \ - rm $(@D)/debian/patches/01_makefile.dpatch; \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches series; \ fi endef -SETSERIAL_POST_PATCH_HOOKS += SETSERIAL_APPLY_DEBIAN_PATCHES +SETSERIAL_PRE_PATCH_HOOKS += SETSERIAL_APPLY_DEBIAN_PATCHES $(eval $(autotools-package)) diff --git a/package/sexpect/sexpect.hash b/package/sexpect/sexpect.hash index d512117626..ce1232de82 100644 --- a/package/sexpect/sexpect.hash +++ b/package/sexpect/sexpect.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f6801c8b979d56eec54aedd7ede06e2342f382cee291beea88b52869186c557c sexpect-2.3.14.tar.gz +sha256 44f5711aa99f3ccf9c4b0edfcd9a7d25fa64b442574624ce451713d1532c1a7e sexpect-2.3.15.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sexpect/sexpect.mk b/package/sexpect/sexpect.mk index 7b878600e4..bbc84c1ca6 100644 --- a/package/sexpect/sexpect.mk +++ b/package/sexpect/sexpect.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEXPECT_VERSION = 2.3.14 +SEXPECT_VERSION = 2.3.15 SEXPECT_SITE = $(call github,clarkwang,sexpect,v$(SEXPECT_VERSION)) SEXPECT_LICENSE = GPL-3.0 SEXPECT_LICENSE_FILES = LICENSE diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 7155baff07..68703e6082 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,4 +1,4 @@ -# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.18.0/shadow-4.18.0.tar.xz.asc # with key 66D0387DB85D320F8408166DB175CFA98F192AF2 -sha256 b78e3921a95d53282a38e90628880624736bf6235e36eea50c50835f59a3530b shadow-4.16.0.tar.xz +sha256 add4604d3bc410344433122a819ee4154b79dd8316a56298c60417e637c07608 shadow-4.18.0.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index f0a2b57b4d..2ba7a0e03e 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.16.0 +SHADOW_VERSION = 4.18.0 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause @@ -46,6 +46,7 @@ SHADOW_CONF_OPTS += --disable-account-tools-setuid endif ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) +SHADOW_INSTALL_STAGING = YES SHADOW_CONF_OPTS += --enable-subordinate-ids define SHADOW_SUBORDINATE_IDS_PERMISSIONS /usr/bin/newuidmap f 4755 0 0 - - - - - diff --git a/package/shadowsocks-libev/0004-fix-mbedtls-3-6-compatibility.patch b/package/shadowsocks-libev/0004-fix-mbedtls-3-6-compatibility.patch new file mode 100644 index 0000000000..ca46425c4d --- /dev/null +++ b/package/shadowsocks-libev/0004-fix-mbedtls-3-6-compatibility.patch @@ -0,0 +1,231 @@ +From 9afa3cacf947f910be46b69fc5a7a1fdd02fd5e6 Mon Sep 17 00:00:00 2001 +From: Lu jicong +Date: Fri, 10 Jan 2025 22:05:31 +0800 +Subject: [PATCH] Fix in 'mbedtls 3.6.0 ver' compilation failure issue + +Fix mbedtls 3.6 compatibility + +Co-authored-by: Zxl hhyccc +Signed-off-by: Lu jicong +Upstream: https://github.com/shadowsocks/shadowsocks-libev/commit/9afa3cacf947f910be46b69fc5a7a1fdd02fd5e6 +Signed-off-by: Thomas Perale +--- + m4/mbedtls.m4 | 20 ++++++++++++++++++++ + src/aead.c | 23 +++++++++++------------ + src/crypto.c | 2 +- + src/crypto.h | 1 - + src/stream.c | 51 ++++++--------------------------------------------- + 5 files changed, 38 insertions(+), 59 deletions(-) + +diff --git a/m4/mbedtls.m4 b/m4/mbedtls.m4 +index 2c478b960..a795790ca 100644 +--- a/m4/mbedtls.m4 ++++ b/m4/mbedtls.m4 +@@ -31,7 +31,12 @@ AC_DEFUN([ss_MBEDTLS], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ ++#include ++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 ++#include ++#else + #include ++#endif + ]], + [[ + #ifndef MBEDTLS_CIPHER_MODE_CFB +@@ -48,7 +53,12 @@ AC_DEFUN([ss_MBEDTLS], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ ++#include ++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 ++#include ++#else + #include ++#endif + ]], + [[ + #ifndef MBEDTLS_ARC4_C +@@ -64,7 +74,12 @@ AC_DEFUN([ss_MBEDTLS], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ ++#include ++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 ++#include ++#else + #include ++#endif + ]], + [[ + #ifndef MBEDTLS_BLOWFISH_C +@@ -80,7 +95,12 @@ AC_DEFUN([ss_MBEDTLS], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ ++#include ++#if MBEDTLS_VERSION_NUMBER >= 0x03000000 ++#include ++#else + #include ++#endif + ]], + [[ + #ifndef MBEDTLS_CAMELLIA_C +diff --git a/src/aead.c b/src/aead.c +index 358ec9381..73349da64 100644 +--- a/src/aead.c ++++ b/src/aead.c +@@ -177,9 +177,13 @@ aead_cipher_encrypt(cipher_ctx_t *cipher_ctx, + // Otherwise, just use the mbedTLS one with crappy AES-NI. + case AES192GCM: + case AES128GCM: +- ++#if MBEDTLS_VERSION_NUMBER < 0x03000000 + err = mbedtls_cipher_auth_encrypt(cipher_ctx->evp, n, nlen, ad, adlen, + m, mlen, c, clen, c + mlen, tlen); ++#else ++ err = mbedtls_cipher_auth_encrypt_ext(cipher_ctx->evp, n, nlen, ad, adlen, ++ m, mlen, c, mlen + tlen, clen, tlen); ++#endif + *clen += tlen; + break; + case CHACHA20POLY1305IETF: +@@ -226,8 +230,13 @@ aead_cipher_decrypt(cipher_ctx_t *cipher_ctx, + // Otherwise, just use the mbedTLS one with crappy AES-NI. + case AES192GCM: + case AES128GCM: ++#if MBEDTLS_VERSION_NUMBER < 0x03000000 + err = mbedtls_cipher_auth_decrypt(cipher_ctx->evp, n, nlen, ad, adlen, + m, mlen - tlen, p, plen, m + mlen - tlen, tlen); ++#else ++ err = mbedtls_cipher_auth_decrypt_ext(cipher_ctx->evp, n, nlen, ad, adlen, ++ m, mlen, p, mlen - tlen, plen, tlen); ++#endif + break; + case CHACHA20POLY1305IETF: + err = crypto_aead_chacha20poly1305_ietf_decrypt(p, &long_plen, NULL, m, mlen, +@@ -721,17 +730,7 @@ aead_key_init(int method, const char *pass, const char *key) + cipher_t *cipher = (cipher_t *)ss_malloc(sizeof(cipher_t)); + memset(cipher, 0, sizeof(cipher_t)); + +- if (method >= CHACHA20POLY1305IETF) { +- cipher_kt_t *cipher_info = (cipher_kt_t *)ss_malloc(sizeof(cipher_kt_t)); +- cipher->info = cipher_info; +- cipher->info->base = NULL; +- cipher->info->key_bitlen = supported_aead_ciphers_key_size[method] * 8; +- cipher->info->iv_size = supported_aead_ciphers_nonce_size[method]; +- } else { +- cipher->info = (cipher_kt_t *)aead_get_cipher_type(method); +- } +- +- if (cipher->info == NULL && cipher->key_len == 0) { ++ if (method < CHACHA20POLY1305IETF && aead_get_cipher_type(method) == NULL) { + LOGE("Cipher %s not found in crypto library", supported_aead_ciphers[method]); + FATAL("Cannot initialize cipher"); + } +diff --git a/src/crypto.c b/src/crypto.c +index b44d8674c..76c426b53 100644 +--- a/src/crypto.c ++++ b/src/crypto.c +@@ -103,7 +103,7 @@ crypto_md5(const unsigned char *d, size_t n, unsigned char *md) + if (md == NULL) { + md = m; + } +-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 ++#if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000 + if (mbedtls_md5_ret(d, n, md) != 0) + FATAL("Failed to calculate MD5"); + #else +diff --git a/src/crypto.h b/src/crypto.h +index 1791551ff..70707932b 100644 +--- a/src/crypto.h ++++ b/src/crypto.h +@@ -97,7 +97,6 @@ typedef struct buffer { + typedef struct { + int method; + int skey; +- cipher_kt_t *info; + size_t nonce_len; + size_t key_len; + size_t tag_len; +diff --git a/src/stream.c b/src/stream.c +index 35d9050b3..b2e2cea82 100644 +--- a/src/stream.c ++++ b/src/stream.c +@@ -168,33 +168,6 @@ crypto_stream_xor_ic(uint8_t *c, const uint8_t *m, uint64_t mlen, + return 0; + } + +-int +-cipher_nonce_size(const cipher_t *cipher) +-{ +- if (cipher == NULL) { +- return 0; +- } +- return cipher->info->iv_size; +-} +- +-int +-cipher_key_size(const cipher_t *cipher) +-{ +- /* +- * Semi-API changes (technically public, morally prnonceate) +- * Renamed a few headers to include _internal in the name. Those headers are +- * not supposed to be included by users. +- * Changed md_info_t into an opaque structure (use md_get_xxx() accessors). +- * Changed pk_info_t into an opaque structure. +- * Changed cipher_base_t into an opaque structure. +- */ +- if (cipher == NULL) { +- return 0; +- } +- /* From Version 1.2.7 released 2013-04-13 Default Blowfish keysize is now 128-bits */ +- return cipher->info->key_bitlen / 8; +-} +- + const cipher_kt_t * + stream_get_cipher_type(int method) + { +@@ -642,34 +615,22 @@ stream_key_init(int method, const char *pass, const char *key) + cipher_t *cipher = (cipher_t *)ss_malloc(sizeof(cipher_t)); + memset(cipher, 0, sizeof(cipher_t)); + +- if (method == SALSA20 || method == CHACHA20 || method == CHACHA20IETF) { +- cipher_kt_t *cipher_info = (cipher_kt_t *)ss_malloc(sizeof(cipher_kt_t)); +- cipher->info = cipher_info; +- cipher->info->base = NULL; +- cipher->info->key_bitlen = supported_stream_ciphers_key_size[method] * 8; +- cipher->info->iv_size = supported_stream_ciphers_nonce_size[method]; +- } else { +- cipher->info = (cipher_kt_t *)stream_get_cipher_type(method); +- } +- +- if (cipher->info == NULL && cipher->key_len == 0) { ++ if (method < SALSA20 && stream_get_cipher_type(method) == NULL) { + LOGE("Cipher %s not found in crypto library", supported_stream_ciphers[method]); + FATAL("Cannot initialize cipher"); + } + + if (key != NULL) +- cipher->key_len = crypto_parse_key(key, cipher->key, cipher_key_size(cipher)); ++ cipher->key_len = crypto_parse_key(key, cipher->key, ++ supported_stream_ciphers_key_size[method]); + else +- cipher->key_len = crypto_derive_key(pass, cipher->key, cipher_key_size(cipher)); ++ cipher->key_len = crypto_derive_key(pass, cipher->key, ++ supported_stream_ciphers_key_size[method]); + + if (cipher->key_len == 0) { + FATAL("Cannot generate key and NONCE"); + } +- if (method == RC4_MD5) { +- cipher->nonce_len = 16; +- } else { +- cipher->nonce_len = cipher_nonce_size(cipher); +- } ++ cipher->nonce_len = supported_stream_ciphers_nonce_size[method]; + cipher->method = method; + + return cipher; diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index 331866a379..dc7c7eee5b 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795 shairport-sync-3.3.9.tar.gz +sha256 a1242d100b61fe1fffbbf706e919ed51d6a341c9fb8293fb42046e32ae2b3338 shairport-sync-4.3.7.tar.gz sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 4430014ec9..493eefbd6f 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.3.9 +SHAIRPORT_SYNC_VERSION = 4.3.7 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause @@ -44,9 +44,6 @@ else SHAIRPORT_SYNC_DEPENDENCIES += mbedtls SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=mbedtls SHAIRPORT_SYNC_CONF_LIBS += -lmbedx509 -lmbedcrypto -ifeq ($(BR2_PACKAGE_MBEDTLS_COMPRESSION),y) -SHAIRPORT_SYNC_CONF_LIBS += -lz -endif endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION),y) diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash index dfa7ef3a34..3759917148 100644 --- a/package/shapelib/shapelib.hash +++ b/package/shapelib/shapelib.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5da90a60e25440f108f4e8e95732bfa83ede13c8e0c2bcf80ae41006cc8ebc20 shapelib-1.6.1.tar.gz +sha256 4b74a36ced94e9a7bea401157e664addcc5be251e7df7f88d4674361da012c21 shapelib-1.6.2.tar.gz sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 LICENSE-LGPL sha256 3f46082162242563bf4f43b091871cb19064bc5a398c6d2b024f6b64c6710516 LICENSE-MIT sha256 15e1205bb007d4d7821f7b1cc461ba8d051647e86dbc9baf1bb6f68b10588eeb web/license.html diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk index f7c3056844..08bf3c9f94 100644 --- a/package/shapelib/shapelib.mk +++ b/package/shapelib/shapelib.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAPELIB_VERSION = 1.6.1 +SHAPELIB_VERSION = 1.6.2 SHAPELIB_SITE = http://download.osgeo.org/shapelib SHAPELIB_LICENSE = MIT or LGPL-2.0 SHAPELIB_LICENSE_FILES = LICENSE-LGPL LICENSE-MIT web/license.html diff --git a/package/simple-mail/simple-mail.hash b/package/simple-mail/simple-mail.hash index 4de1525b53..ba4d36c2b3 100644 --- a/package/simple-mail/simple-mail.hash +++ b/package/simple-mail/simple-mail.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f93e93843d11da5c4ec44225eba46ccb3e9710fd594a27b966901745429ed4f4 simple-mail-3.0.0.tar.gz +sha256 d4a46b5c3f706669ffb3c9e4d2ff5e2bd892eda639f80784d862fa94a2082eb2 simple-mail-3.1.0.tar.gz # Hash for license file sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c LICENSE diff --git a/package/simple-mail/simple-mail.mk b/package/simple-mail/simple-mail.mk index 82bea45f21..7063e9dd0f 100644 --- a/package/simple-mail/simple-mail.mk +++ b/package/simple-mail/simple-mail.mk @@ -4,7 +4,7 @@ # ################################################################################ -SIMPLE_MAIL_VERSION = 3.0.0 +SIMPLE_MAIL_VERSION = 3.1.0 SIMPLE_MAIL_SITE = $(call github,cutelyst,simple-mail,v$(SIMPLE_MAIL_VERSION)) SIMPLE_MAIL_INSTALL_STAGING = YES SIMPLE_MAIL_LICENSE = LGPL-2.1+ diff --git a/package/sipeed-lpi4abin/Config.in b/package/sipeed-lpi4abin/Config.in new file mode 100644 index 0000000000..c77266eb31 --- /dev/null +++ b/package/sipeed-lpi4abin/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SIPEED_LPI4ABIN + bool "sipeed-lpi4abin" + depends on BR2_riscv + help + This package provides TH1520 SoC binary blobs for + LicheePi 4A. + + https://github.com/revyos/th1520-boot-firmware diff --git a/package/sipeed-lpi4abin/sipeed-lpi4abin.hash b/package/sipeed-lpi4abin/sipeed-lpi4abin.hash new file mode 100644 index 0000000000..7281f38cd2 --- /dev/null +++ b/package/sipeed-lpi4abin/sipeed-lpi4abin.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 c0c2daed3c56ba30a26d81986dfa041101c58db994372d601f126cab8fa01013 sipeed-lpi4abin-725756411ecc20f2c2dbc5ea6b8e5aacc6f83aad-git4.tar.gz diff --git a/package/sipeed-lpi4abin/sipeed-lpi4abin.mk b/package/sipeed-lpi4abin/sipeed-lpi4abin.mk new file mode 100644 index 0000000000..59ef9ff918 --- /dev/null +++ b/package/sipeed-lpi4abin/sipeed-lpi4abin.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# sipeed-lpi4abin +# +################################################################################ + +SIPEED_LPI4ABIN_VERSION = 725756411ecc20f2c2dbc5ea6b8e5aacc6f83aad +SIPEED_LPI4ABIN_SITE = https://github.com/revyos/th1520-boot-firmware.git +SIPEED_LPI4ABIN_SITE_METHOD = git +SIPEED_LPI4ABIN_LICENSE = PROPRIETARY + +SIPEED_LPI4ABIN_INSTALL_IMAGES = YES +SIPEED_LPI4ABIN_INSTALL_TARGET = NO + +SIPEED_LPI4ABIN_FILES = \ + addons/boot/light_aon_fpga.bin \ + addons/boot/light_c906_audio.bin \ + addons/boot/str.bin + +define SIPEED_LPI4ABIN_INSTALL_IMAGES_CMDS + $(foreach f,$(SIPEED_LPI4ABIN_FILES), \ + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR)/bootbins $(@D)/$(f) + ) +endef + +$(eval $(generic-package)) diff --git a/package/siproxd/0001-Fix-compilation-on-gcc-14.patch b/package/siproxd/0001-Fix-compilation-on-gcc-14.patch new file mode 100644 index 0000000000..0a55969703 --- /dev/null +++ b/package/siproxd/0001-Fix-compilation-on-gcc-14.patch @@ -0,0 +1,50 @@ +From 985c2cd198213b250c61d8c6621af52e318c4c12 Mon Sep 17 00:00:00 2001 +From: crumpled-acronym <60061744+crumpled-acronym@users.noreply.github.com> +Date: Mon, 30 Jun 2025 12:32:02 +0200 +Subject: [PATCH] Fix compilation on gcc >= 14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +`./configure` fails for gcc >= 14 with the following error + +``` +checking "libosip prefix"... +checking for osip_init in -losip2... yes +checking for parser_init in -losipparser2... yes +checking libosip2 version > 3.0.0... *** ERROR: libosip2-3.x.x is required! +``` + +which in fact is caused by the test program in `ACX_CHECK_LIBOSIP_VERSION` function in `acinclude.m4` due to + +``` +conftest.c:4:3: error: return type defaults to ‘int’ [-Wimplicit-int] + 4 | main() { + | ^~~~ +``` + +This patch fixes the issue! + +Upstream: https://github.com/hb9xar/siproxd/commit/985c2cd198213b250c61d8c6621af52e318c4c12 + +Signed-off-by: Bernd Kuhls +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 6fa4828..8164246 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -340,7 +340,7 @@ dnl pointer to the structure (bad) + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([ + #include +- main() { ++ int main() { + osip_message_t t; + int e; + e=t.contacts.nb_elt; +-- +2.47.3 + diff --git a/package/siproxd/siproxd.mk b/package/siproxd/siproxd.mk index 228f0855a6..faabb68a24 100644 --- a/package/siproxd/siproxd.mk +++ b/package/siproxd/siproxd.mk @@ -12,6 +12,8 @@ SIPROXD_LICENSE_FILES = COPYING SIPROXD_DEPENDENCIES = libosip2 libtool sqlite +# 0001-Fix-compilation-on-gcc-14.patch +SIPROXD_AUTORECONF = YES SIPROXD_CONF_OPTS = --without-included-ltdl $(eval $(autotools-package)) diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash index 1e6bd96671..ba727f9ddd 100644 --- a/package/skalibs/skalibs.hash +++ b/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ddfec5730e5b2f19d0381ecf7f796b39a6e473236bda0ad8d3776a3fe7b07e43 skalibs-2.14.2.0.tar.gz +sha256 a14aa558c9b09b062fa16acec623b2c8f93d69f5cba4d07f6d0c58913066c427 skalibs-2.14.3.0.tar.gz sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk index 45f3e15a7b..d37db47b20 100644 --- a/package/skalibs/skalibs.mk +++ b/package/skalibs/skalibs.mk @@ -4,14 +4,13 @@ # ################################################################################ -SKALIBS_VERSION = 2.14.2.0 +SKALIBS_VERSION = 2.14.3.0 SKALIBS_SITE = https://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING SKALIBS_INSTALL_STAGING = YES SKALIBS_CONF_OPTS = \ - --prefix=/ \ --with-default-path=/sbin:/usr/sbin:/bin:/usr/bin \ --with-sysdep-devurandom=yes \ $(SHARED_STATIC_LIBS_OPTS) diff --git a/package/skeleton-custom/skeleton-custom.mk b/package/skeleton-custom/skeleton-custom.mk index b05c834b94..b5a1a5e80d 100644 --- a/package/skeleton-custom/skeleton-custom.mk +++ b/package/skeleton-custom/skeleton-custom.mk @@ -23,20 +23,13 @@ $(error No path specified for the custom skeleton) endif endif -# For a merged /usr, ensure that /lib, /bin and /sbin and their /usr -# counterparts are appropriately setup as symlinks ones to the others. -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -SKELETON_CUSTOM_NOT_MERGED_USR_DIRS = \ - $(shell support/scripts/check-merged-usr.sh $(SKELETON_CUSTOM_PATH)) -endif # merged /usr - -ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy) -ifneq ($(SKELETON_CUSTOM_NOT_MERGED_USR_DIRS),) -$(error The custom skeleton in $(SKELETON_CUSTOM_PATH) is not \ - using a merged /usr for the following directories: \ - $(SKELETON_CUSTOM_NOT_MERGED_USR_DIRS)) -endif -endif +define SKELETON_CUSTOM_CONFIGURE_CMDS + support/scripts/check-merged \ + -t skeleton \ + $(if $(BR2_ROOTFS_MERGED_USR),-u) \ + $(if $(BR2_ROOTFS_MERGED_BIN),-b) \ + $(SKELETON_CUSTOM_PATH) +endef # The target-dir-warning file and the lib{32,64} symlinks are the only # things we customise in the custom skeleton. @@ -49,9 +42,7 @@ define SKELETON_CUSTOM_INSTALL_TARGET_CMDS endef # For the staging dir, we don't really care what we install, but we -# need the /lib and /usr/lib appropriately setup. Since we ensure, -# above, that they are correct in the skeleton, we can simply copy the -# skeleton to staging. +# need the /lib and /usr/lib appropriately setup. define SKELETON_CUSTOM_INSTALL_STAGING_CMDS $(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(STAGING_DIR)) $(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR)) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 1bb3971191..dc754f1244 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -23,7 +23,7 @@ define HOST_SKELETON_INSTALL_CMDS $(Q)mkdir -p $(HOST_DIR)/lib $(Q)mkdir -p $(HOST_DIR)/include $(Q)case $(HOSTARCH) in \ - (*64) ln -snf lib $(HOST_DIR)/lib64;; \ + (*64|s390x) ln -snf lib $(HOST_DIR)/lib64;; \ (*) ln -snf lib $(HOST_DIR)/lib32;; \ esac endef diff --git a/package/skopeo/Config.in b/package/skopeo/Config.in new file mode 100644 index 0000000000..0de9b16047 --- /dev/null +++ b/package/skopeo/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_SKOPEO + bool "skopeo" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU # btrfs-progs, libgpgme, lvm2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs, lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + select BR2_PACKAGE_HOST_GO + select BR2_PACKAGE_BTRFS_PROGS + select BR2_PACKAGE_CONTAINERS_IMAGE_CONFIG # runtime + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LVM2 + help + skopeo is a command line utility that performs various + operations on container images and image repositories. + + https://github.com/containers/skopeo + +comment "skopeo needs a toolchain w/ threads, sahred libs" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS diff --git a/package/skopeo/skopeo.hash b/package/skopeo/skopeo.hash index c523dea46a..02cb76d6f1 100644 --- a/package/skopeo/skopeo.hash +++ b/package/skopeo/skopeo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9402e71f3fba979d0c0509240b963847bfeda2eac60be83eb5a628fd67d098e6 skopeo-1.16.1-go2.tar.gz +sha256 0c19fe51b2cd8d1bd5e38c03b97421e318fc08153bdf5ef2f816a29889eacdef skopeo-1.20.0-go2.tar.gz sha256 716a8b80635c394681e652823e1e42e411ad2d254e1f202403422d74f4b0b106 LICENSE diff --git a/package/skopeo/skopeo.mk b/package/skopeo/skopeo.mk index 9859d774d4..a8587f06b8 100644 --- a/package/skopeo/skopeo.mk +++ b/package/skopeo/skopeo.mk @@ -4,20 +4,35 @@ # ################################################################################ -SKOPEO_VERSION = 1.16.1 +SKOPEO_VERSION = 1.20.0 SKOPEO_SITE = $(call github,containers,skopeo,v$(SKOPEO_VERSION)) SKOPEO_LICENSE = Apache-2.0 SKOPEO_LICENSE_FILES = LICENSE SKOPEO_CPE_ID_VALID = YES +SKOPEO_DEPENDENCIES = \ + host-pkgconf \ + btrfs-progs \ + libgpgme \ + lvm2 + +ifeq ($(BR2_PACKAGE_SQLITE),y) +SKOPEO_DEPENDENCIES += sqlite +SKOPEO_TAGS += libsqlite3 +endif + HOST_SKOPEO_DEPENDENCIES = \ host-btrfs-progs \ host-libgpgme \ host-lvm2 \ host-pkgconf +SKOPEO_GO_ENV = PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig +SKOPEO_BUILD_TARGETS = cmd/skopeo + HOST_SKOPEO_GO_ENV = PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig HOST_SKOPEO_BUILD_TARGETS = cmd/skopeo +$(eval $(golang-package)) $(eval $(host-golang-package)) diff --git a/package/slirp/slirp.hash b/package/slirp/slirp.hash index 930e6aca58..bd07074bb4 100644 --- a/package/slirp/slirp.hash +++ b/package/slirp/slirp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1c2e3d30e41a055ed41f9d0b3234d0d143bc28f5ad84bb101413f830844df757 libslirp-v4.8.0.tar.bz2 +sha256 3caff6e2de445f4995629d4929c55419f661b2b1d14f12481e155a71c1e8f811 libslirp-v4.9.1.tar.bz2 sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 6d44df8d7e..950ad53ea8 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP_VERSION = 4.8.0 +SLIRP_VERSION = 4.9.1 SLIRP_SOURCE = libslirp-v$(SLIRP_VERSION).tar.bz2 SLIRP_SITE = https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$(SLIRP_VERSION) SLIRP_LICENSE = BSD-3-Clause diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash index 1a6a657066..cb9088e8e8 100644 --- a/package/slirp4netns/slirp4netns.hash +++ b/package/slirp4netns/slirp4netns.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3b7c7b593b279c46d25a48b583371ab762968e98b6a46457d8d52a755852eb9 slirp4netns-1.3.1.tar.gz +sha256 8d24539967850bada944d56459eb9e9167357d57b39e864d95ed7d6c0dd0298d slirp4netns-1.3.3.tar.gz sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk index ce8ea34f2e..ab63120305 100644 --- a/package/slirp4netns/slirp4netns.mk +++ b/package/slirp4netns/slirp4netns.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP4NETNS_VERSION = 1.3.1 +SLIRP4NETNS_VERSION = 1.3.3 SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) SLIRP4NETNS_LICENSE = GPL-2.0 SLIRP4NETNS_LICENSE_FILES = COPYING @@ -12,4 +12,13 @@ SLIRP4NETNS_DEPENDENCIES = libcap libglib2 libseccomp slirp SLIRP4NETNS_AUTORECONF = YES +define SLIRP4NETNS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) +endef + $(eval $(autotools-package)) diff --git a/package/smartmontools/smartmontools.hash b/package/smartmontools/smartmontools.hash index e48e955d01..ecc2c9d089 100644 --- a/package/smartmontools/smartmontools.hash +++ b/package/smartmontools/smartmontools.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.3/ -md5 7a71d388124e3cd43abf6586a43cb1ff smartmontools-7.3.tar.gz -sha1 5ce7adb606119148d725b91a00652d427ca0adc2 smartmontools-7.3.tar.gz +# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.5/ +md5 38c38b0b82db7fc4906cdd50d15a7931 smartmontools-7.5.tar.gz +sha1 9b0ca96931d6184da34d68bbe9a785713f5a8474 smartmontools-7.5.tar.gz # Locally computed -sha256 a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b smartmontools-7.3.tar.gz +sha256 690b83ca331378da9ea0d9d61008c4b22dde391387b9bbad7f29387f2595f76e smartmontools-7.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index d24f008df4..557aec1efd 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMARTMONTOOLS_VERSION = 7.3 +SMARTMONTOOLS_VERSION = 7.5 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_LICENSE = GPL-2.0+ SMARTMONTOOLS_LICENSE_FILES = COPYING diff --git a/package/snagboot/Config.in.host b/package/snagboot/Config.in.host new file mode 100644 index 0000000000..3087348a87 --- /dev/null +++ b/package/snagboot/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_SNAGBOOT + bool "host snagboot" + help + Snagboot intends to be an open-source and generic + replacement to the vendor-specific, sometimes proprietary, + tools used to recover and/or reflash embedded platforms. + + https://github.com/bootlin/snagboot/ diff --git a/package/snagboot/snagboot.hash b/package/snagboot/snagboot.hash new file mode 100644 index 0000000000..e5978617aa --- /dev/null +++ b/package/snagboot/snagboot.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a3ace4245472141c0cdcd8e095530652ce95d804f7515a29613ddb07d2c32033 snagboot-2.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/snagboot/snagboot.mk b/package/snagboot/snagboot.mk new file mode 100644 index 0000000000..12f77c0b14 --- /dev/null +++ b/package/snagboot/snagboot.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# snagboot +# +################################################################################ + +SNAGBOOT_VERSION = 2.4 +SNAGBOOT_SITE = $(call github,bootlin,snagboot,v$(SNAGBOOT_VERSION)) +SNAGBOOT_LICENSE = GPL-2.0 +SNAGBOOT_LICENSE_FILES = LICENSE +SNAGBOOT_SETUP_TYPE = setuptools +HOST_SNAGBOOT_DEPENDENCIES = \ + host-python-pyyaml \ + host-python-pyusb \ + host-python-serial \ + host-python-xmodem \ + host-python-tftpy \ + host-python-crccheck \ + host-python-pylibfdt \ + host-python-packaging \ + host-python-pyfatfs + +# We do not install the dependencies for the snagfactory GUI +define SNAGBOOT_REMOVE_SNAGFACTORY + $(RM) $(HOST_DIR)/bin/snagfactory +endef +HOST_SNAGBOOT_POST_INSTALL_HOOKS += SNAGBOOT_REMOVE_SNAGFACTORY + +$(eval $(host-python-package)) diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index c9b9c8be8d..aea9d95770 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.7.0/sngrep-1.7.0.tar.gz.md5sum -md5 ee3cc7bd75adeb713411aa678e45ae4c sngrep-1.7.0.tar.gz +# From https://github.com/irontec/sngrep/releases/download/v1.8.2/sngrep-1.8.2.tar.gz.md5sum +md5 eb2a398e2e98993ee2a19a3afddfc282 sngrep-1.8.2.tar.gz # Locally computed -sha256 2e5ba3a4d6486ea00bd73d2cceff383ba162dcd6d0170ae74cfa3b1c206e2cb1 sngrep-1.7.0.tar.gz +sha256 1cd05bddd531b353e3069c5243e7076b60a3ee907dbbc3c9c2834676ed8c4bac sngrep-1.8.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index b86d7e83f0..5399d041b5 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNGREP_VERSION = 1.7.0 +SNGREP_VERSION = 1.8.2 SNGREP_SITE = \ https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION) SNGREP_LICENSE = GPL-3.0+ diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index b66056ef40..e81bd8886f 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 034553f7cb75d7ce1fe70cb3ba06e88587b6bca4fa062d10344ce4555a1395f7 snmp++-3.5.1.tar.gz +sha256 52c038426d6e13d627832aadb905549ee32b5ca4b707ac446bedac05abdfd1bf snmp++-3.6.3.tar.gz sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 966bb340fd..9a84d74f95 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.5.1 +SNMPPP_VERSION = 3.6.3 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf diff --git a/package/snooze/0001-fix-snooze-n-format-string.patch b/package/snooze/0001-fix-snooze-n-format-string.patch new file mode 100644 index 0000000000..293777166f --- /dev/null +++ b/package/snooze/0001-fix-snooze-n-format-string.patch @@ -0,0 +1,40 @@ +From 5f9e616b29fe272fffbb31e4b7ea8ff61f781601 Mon Sep 17 00:00:00 2001 +From: Leah Neukirchen +Date: Wed, 29 May 2024 19:42:27 +0200 +Subject: [PATCH] fix "snooze -n" format string + +Fixes #22. + +Signed-off-by: J. Neuschäfer + +Upstream: https://github.com/leahneukirchen/snooze/commit/5f9e616b29fe272fffbb31e4b7ea8ff61f781601 +--- + snooze.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/snooze.c b/snooze.c +index 06f0d07..e47ad11 100644 +--- a/snooze.c ++++ b/snooze.c +@@ -329,13 +329,13 @@ main(int argc, char *argv[]) + char weekstr[4]; + struct tm *tm = localtime(&t); + strftime(weekstr, sizeof weekstr, "%a", tm); +- printf("%s %s %2ldd%3ldh%3ldm%3lds ", ++ printf("%s %s %2dd%3dh%3dm%3ds ", + isotime(tm), + weekstr, +- ((t - now) / (60*60*24)), +- ((t - now) / (60*60)) % 24, +- ((t - now) / 60) % 60, +- (t - now) % 60); ++ ((int)(t - now) / (60*60*24)), ++ ((int)(t - now) / (60*60)) % 24, ++ ((int)(t - now) / 60) % 60, ++ (int)(t - now) % 60); + if(jitter) { + printf("(plus up to %ds for jitter)\n", jitter); + } else { +-- +2.43.0 + diff --git a/package/snooze/0002-snooze-remove-unused-include.patch b/package/snooze/0002-snooze-remove-unused-include.patch new file mode 100644 index 0000000000..fba92cd6b5 --- /dev/null +++ b/package/snooze/0002-snooze-remove-unused-include.patch @@ -0,0 +1,36 @@ +From 2eebd33c10d5a0f1a9831e3e49215857ab41ec03 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Sat, 2 Aug 2025 23:09:31 +0200 +Subject: [PATCH] snooze: remove unused include + +The `#include ` was orinally included in the initial commit +(see [1]) to use the `getauxval` function declaration. + +This function usage has since been removed in commit [2]. + +This commit removes the include that is no longer needed. + +[1] https://github.com/leahneukirchen/snooze/commit/56480881978a4cb5813746232de9950d46cb3369 +[2] https://github.com/leahneukirchen/snooze/commit/610e6b35ec614764770d47b5974b30fd90dce6fe + +Upstream: https://github.com/leahneukirchen/snooze/pull/24 +Signed-off-by: Thomas Perale +--- + snooze.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/snooze.c b/snooze.c +index e47ad11..11925ca 100644 +--- a/snooze.c ++++ b/snooze.c +@@ -18,10 +18,6 @@ + #include + #include + +-#ifdef __linux__ +-#include +-#endif +- + static long slack = 60; + #define SLEEP_PHASE 300 + static int nflag, vflag; diff --git a/package/snooze/Config.in b/package/snooze/Config.in new file mode 100644 index 0000000000..0e068cb607 --- /dev/null +++ b/package/snooze/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SNOOZE + bool "snooze" + help + snooze is a tool for waiting until a particular time and then + running a command. Together with a service supervision system + such as runit, this can be used to replace cron(8). + + https://github.com/leahneukirchen/snooze diff --git a/package/snooze/snooze.hash b/package/snooze/snooze.hash new file mode 100644 index 0000000000..c1710d857f --- /dev/null +++ b/package/snooze/snooze.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 d63fde85d9333188bed5996baabd833eaa00842ce117443ffbf8719c094be414 snooze-0.5.tar.gz +sha256 2cea433f84afcfd9d55515908d3ea69ed1df00ffbf90cc48cd68d72a2b464544 README.md diff --git a/package/snooze/snooze.mk b/package/snooze/snooze.mk new file mode 100644 index 0000000000..9c5f7a3830 --- /dev/null +++ b/package/snooze/snooze.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# snooze +# +################################################################################ + +SNOOZE_VERSION = 0.5 +SNOOZE_SITE = $(call github,leahneukirchen,snooze,v$(SNOOZE_VERSION)) +SNOOZE_LICENSE = CC0-1.0 + +# Unfortunately, snooze doesn't have a dedicated file for the license, but it +# is mentioned in the README and in the manpage. +SNOOZE_LICENSE_FILES = README.md + +SNOOZE_MAKE_OPTS = \ + PREFIX=/usr \ + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" + +define SNOOZE_BUILD_CMDS + $(MAKE) -C $(@D)/ $(SNOOZE_MAKE_OPTS) +endef + +define SNOOZE_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D)/ $(SNOOZE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/package/soapy-sdr/0001-Remove-deprecated-use-of-distutils-fix-for-Python-3..patch b/package/soapy-sdr/0001-Remove-deprecated-use-of-distutils-fix-for-Python-3..patch new file mode 100644 index 0000000000..0df2c8f8e0 --- /dev/null +++ b/package/soapy-sdr/0001-Remove-deprecated-use-of-distutils-fix-for-Python-3..patch @@ -0,0 +1,79 @@ +From 1ee5670803f89b21d84a6a84acbb578da051c119 Mon Sep 17 00:00:00 2001 +From: Ryan Volz +Date: Tue, 26 Sep 2023 14:56:59 -0400 +Subject: [PATCH] Remove deprecated use of distutils, fix for Python 3.12+ + +Remove deprecated use of distutils, fix for Python 3.12+ + +This switches to using sysconfig from distutils, which is necessary for +Python 3.12+ since distutils is deprecated and has been removed. + +It is necessary to specify the install scheme when a prefix other than +the Python default is used so that changes to the default scheme made by +distributions (e.g. Debian, Fedora) do not produce an incorrect Python +installation directory. For example, Debian patches the default scheme +to prepend the path with '/local', but if a user specifies a prefix of +'/usr/local', then the path using the default scheme would be +'/usr/local/local/...' with a duplicated 'local' directory. Specifying +an unmodified install scheme fixes that. + +Signed-off-by: Ryan Volz + +Upstream: https://github.com/pothosware/SoapySDR/commit/1ee5670803f89b21d84a6a84acbb578da051c119 +Signed-off-by: Gwenhael Goavec-Merou +--- + swig/python/get_python_lib.py | 36 ++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +diff --git a/python/get_python_lib.py b/python/get_python_lib.py +index 0c71652..574f0b6 100644 +--- a/python/get_python_lib.py ++++ b/python/get_python_lib.py +@@ -1,19 +1,33 @@ + import os ++import pathlib + import sys +-import site +-from distutils.sysconfig import get_python_lib ++import sysconfig + + if __name__ == '__main__': +- prefix = sys.argv[1] ++ prefix = pathlib.Path(sys.argv[1]).resolve() + +- #ask distutils where to install the python module +- install_dir = get_python_lib(plat_specific=True, prefix=prefix) ++ # default install dir for the running Python interpreter ++ default_install_dir = pathlib.Path(sysconfig.get_path('platlib')).resolve() + +- #use sites when the prefix is already recognized ++ # if default falls under the desired prefix, we're done + try: +- paths = [p for p in site.getsitepackages() if p.startswith(prefix)] +- if len(paths) == 1: install_dir = paths[0] +- except AttributeError: pass ++ relative_install_dir = default_install_dir.relative_to(prefix) ++ except ValueError: ++ # get install dir for the specified prefix ++ # can't use the default scheme because distributions modify it ++ # newer Python versions have 'venv' scheme, use for all OSs. ++ if 'venv' in sysconfig.get_scheme_names(): ++ scheme = 'venv' ++ elif os.name == 'nt': ++ scheme = 'nt' ++ else: ++ scheme = 'posix_prefix' ++ prefix_install_dir = pathlib.Path(sysconfig.get_path( ++ 'platlib', ++ scheme=scheme, ++ vars={'base': prefix, 'platbase': prefix}, ++ )).resolve() ++ relative_install_dir = prefix_install_dir.relative_to(prefix) + +- #strip the prefix to return a relative path +- print(os.path.relpath(install_dir, prefix)) ++ # want a relative path for use in the build system ++ print(relative_install_dir) +-- +2.49.0 + diff --git a/package/soapy-sdr/Config.in b/package/soapy-sdr/Config.in new file mode 100644 index 0000000000..43ff191dca --- /dev/null +++ b/package/soapy-sdr/Config.in @@ -0,0 +1,27 @@ +comment "SoapySDR needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS + +config BR2_PACKAGE_SOAPY_SDR + bool "SoapySDR" + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Soapy SDR - vendor and platform neutral SDR support library. + + https://github.com/pothosware/SoapySDR/wiki + +if BR2_PACKAGE_SOAPY_SDR + +config BR2_PACKAGE_SOAPY_SDR_APPS + bool "apps support" + help + Enable apps + +config BR2_PACKAGE_SOAPY_SDR_PYTHON + bool "python support" + depends on BR2_PACKAGE_PYTHON3 + help + Enable python binding +endif diff --git a/package/soapy-sdr/soapy-sdr.hash b/package/soapy-sdr/soapy-sdr.hash new file mode 100644 index 0000000000..3804660140 --- /dev/null +++ b/package/soapy-sdr/soapy-sdr.hash @@ -0,0 +1,3 @@ +# Locally calculated: +sha256 a508083875ed75d1090c24f88abef9895ad65f0f1b54e96d74094478f0c400e6 soapy-sdr-0.8.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/soapy-sdr/soapy-sdr.mk b/package/soapy-sdr/soapy-sdr.mk new file mode 100644 index 0000000000..91fe66f8bc --- /dev/null +++ b/package/soapy-sdr/soapy-sdr.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# SoapySDR +# +################################################################################ + +SOAPY_SDR_VERSION = 0.8.1 +SOAPY_SDR_SITE = https://github.com/pothosware/SoapySDR/archive/refs/tags +SOAPY_SDR_LICENSE = BSL-1.0 +SOAPY_SDR_LICENSE_FILES = LICENSE_1_0.txt + +SOAPY_SDR_SUPPORTS_IN_SOURCE_BUILD = NO + +SOAPY_SDR_CONF_OPTS = \ + -DENABLE_TESTS=OFF \ + -DENABLE_DOCS=OFF \ + -DENABLE_LIBRARY=ON + +# For third-party modules, the SoapySDR libraries are mandatory at +# compile time. +SOAPY_SDR_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_SOAPY_SDR_APPS),y) +SOAPY_SDR_CONF_OPTS += -DENABLE_APPS=ON +else +SOAPY_SDR_CONF_OPTS += -DENABLE_APPS=OFF +endif + +ifeq ($(BR2_PACKAGE_SOAPY_SDR_PYTHON),y) +SOAPY_SDR_DEPENDENCIES += python3 +SOAPY_SDR_CONF_OPTS += -DENABLE_PYTHON=ON \ + -DENABLE_PYTHON3=ON \ + -DBUILD_PYTHON3=ON \ + -DUSE_PYTHON_CONFIG=ON +else +SOAPY_SDR_CONF_OPTS += -DENABLE_PYTHON=OFF \ + -DENABLE_PYTHON3=OFF \ + -DBUILD_PYTHON3=OFF \ + -DUSE_PYTHON_CONFIG=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/socat/0001-no-documentation.patch b/package/socat/0001-no-documentation.patch index b4c3e1ffde..5dbce0576e 100644 --- a/package/socat/0001-no-documentation.patch +++ b/package/socat/0001-no-documentation.patch @@ -10,7 +10,7 @@ the package Makefile.in to not build/install its documentation. Upstream: N/A Signed-off-by: Thomas Petazzoni -[baruch: update for 1.8.0.0; git patch format] +[baruch: update for 1.8.0.0 and 1.8.0.3; git patch format] Signed-off-by: Baruch Siach --- Makefile.in | 7 ++----- @@ -22,7 +22,7 @@ index c01b1a4a2306..fd89acb06f3c 100644 +++ b/Makefile.in @@ -82,7 +82,7 @@ SHFILES = socat-chain.sh socat-mux.sh socat-broker.sh \ TESTFILES = test.sh socks4echo.sh proxyecho.sh readline-test.sh \ - proxy.sh socks4a-echo.sh + proxy.sh socks4a-echo.sh socks5server-echo.sh -all: progs doc +all: progs diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 2a14d75303..b1c3d3cd11 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 51f9ecdf5d942d0a3c150ea400eb89ef socat-1.8.0.0.tar.bz2 +md5 8ef0bc4f602636797917f8574c3b249e socat-1.8.0.3.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7 socat-1.8.0.0.tar.bz2 +sha256 01eb017361d95bb3a6941e840b59e4463a3fabf92df4154ed02b16a2ed6a0095 socat-1.8.0.3.tar.bz2 # Locally calculated -sha256 de9d702354b2e748ea87eb20d18c3d90ebede5dc6d2fc3c2e0645d139a5181bc README +sha256 f51653b61cf2516c39e8f2edefc11604d0f9d14f0c6ae988bef228a1f0283ad2 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 7f634c28f0..69f8f40452 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.8.0.0 +SOCAT_VERSION = 1.8.0.3 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception diff --git a/package/socketcand/socketcand.hash b/package/socketcand/socketcand.hash index 713939897d..57192ec7dd 100644 --- a/package/socketcand/socketcand.hash +++ b/package/socketcand/socketcand.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 3c5cc7af4ff707ac344e62d2e37a74b59aeccd14b88e837cc142c52b69d64a39 socketcand-69e2201222f015a1abe7a58ecf61325012cd91b1.tar.gz -sha256 18bda0db4e3c56cefdb1b9b01b7eada7764c0746f6321378c30d78f5ee81cfee socketcand.c +sha256 f19e600e99e13202a4039158c1d7dce55645271f14028d60e231266337627ecd socketcand-0.6.1-103-g6dd5d33d4645ab221e8cd265c08607366e21ddf1.tar.gz +sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause +sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk index 1755d3ae56..841931f874 100644 --- a/package/socketcand/socketcand.mk +++ b/package/socketcand/socketcand.mk @@ -4,16 +4,23 @@ # ################################################################################ -SOCKETCAND_VERSION = 69e2201222f015a1abe7a58ecf61325012cd91b1 +SOCKETCAND_VERSION = 0.6.1-103-g6dd5d33d4645ab221e8cd265c08607366e21ddf1 SOCKETCAND_SITE = $(call github,linux-can,socketcand,$(SOCKETCAND_VERSION)) -SOCKETCAND_AUTORECONF = YES SOCKETCAND_LICENSE = BSD-3-Clause or GPL-2.0 -SOCKETCAND_LICENSE_FILES = socketcand.c +SOCKETCAND_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt ifeq ($(BR2_PACKAGE_LIBCONFIG),y) SOCKETCAND_DEPENDENCIES += libconfig +SOCKETCAND_CONF_OPTS += -Dlibconfig=true else -SOCKETCAND_CONF_OPTS += --without-config +SOCKETCAND_CONF_OPTS += -Dlibconfig=false endif -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_LIBSOCKETCAN),y) +SOCKETCAND_DEPENDENCIES += libsocketcan +SOCKETCAND_CONF_OPTS += -Dlibsocketcan=true +else +SOCKETCAND_CONF_OPTS += -Dlibsocketcan=false +endif + +$(eval $(meson-package)) diff --git a/package/softhsm2/softhsm2.mk b/package/softhsm2/softhsm2.mk index 5e37e42dde..ae44b93bc4 100644 --- a/package/softhsm2/softhsm2.mk +++ b/package/softhsm2/softhsm2.mk @@ -6,7 +6,7 @@ SOFTHSM2_VERSION = 2.6.1 SOFTHSM2_SOURCE = softhsm-$(SOFTHSM2_VERSION).tar.gz -SOFTHSM2_SITE = https://dist.opendnssec.org/source +SOFTHSM2_SITE = https://github.com/opendnssec/opendnssec/releases/download/2.1.14 SOFTHSM2_LICENSE = BSD-2-Clause SOFTHSM2_LICENSE_FILES = LICENSE SOFTHSM2_DEPENDENCIES = openssl diff --git a/package/solarus/Config.in b/package/solarus/Config.in index bcfa640890..b0c807faed 100644 --- a/package/solarus/Config.in +++ b/package/solarus/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_SOLARUS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on !BR2_STATIC_LIBS # SDL2 depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES @@ -25,9 +25,9 @@ config BR2_PACKAGE_SOLARUS http://www.solarus-games.org https://github.com/solarus-games/solarus -comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1" +comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 9, NPTL, dynamic library, and luajit or lua 5.1" depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch b/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch index 3d21b570f1..9d004321f7 100644 --- a/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch +++ b/package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch @@ -1,10 +1,9 @@ -From 5d51acafe9c38fb05939b4d2d6a9dcde12476458 Mon Sep 17 00:00:00 2001 +From a1c913c52f70ee7c70e1e5ae1473ee407cd1494c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias -Date: Sat, 29 Jun 2024 12:28:54 +0200 +Date: Sat, 17 May 2025 22:12:23 +0200 Subject: [PATCH] Make SoX support uclibc-based toolchains -From: -http://sourceforge.net/p/sox/bugs/179/ +From http://sourceforge.net/p/sox/bugs/179/ Signed-off-by: Gustavo Zacarias [Julien: rebased patch on package git version 7524160, @@ -36,5 +35,5 @@ index 3fcf4382..9fc001bd 100644 (void)fp; #endif -- -2.45.2 +2.49.0 diff --git a/package/sox/0006-voc-word-width-should-never-be-0-to-avoid-division-b.patch b/package/sox/0006-voc-word-width-should-never-be-0-to-avoid-division-b.patch new file mode 100644 index 0000000000..94298b7ae5 --- /dev/null +++ b/package/sox/0006-voc-word-width-should-never-be-0-to-avoid-division-b.patch @@ -0,0 +1,34 @@ +From ad8ecfbdd9ff184b60600a115247a6aa947d0215 Mon Sep 17 00:00:00 2001 +From: Helmut Grohne +Date: Sat, 17 May 2025 22:10:00 +0200 +Subject: [PATCH] voc: word width should never be 0 to avoid division by zero + +Bug: https://sourceforge.net/p/sox/bugs/351/ +Bug-Debian: https://bugs.debian.org/1010374 + +This patch fixes both CVE-2021-3643 and CVE-2021-23210. + +Upstream: https://sourceforge.net/p/sox/bugs/351/ +Signed-off-by: Thomas Petazzoni +--- + src/voc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/voc.c b/src/voc.c +index a75639e9..0ca07f94 100644 +--- a/src/voc.c ++++ b/src/voc.c +@@ -625,6 +625,10 @@ static int getblock(sox_format_t * ft) + v->rate = new_rate_32; + ft->signal.rate = new_rate_32; + lsx_readb(ft, &uc); ++ if (uc <= 1) { ++ lsx_fail_errno(ft, SOX_EFMT, "2 bits per word required"); ++ return (SOX_EOF); ++ } + v->size = uc; + lsx_readb(ft, &uc); + if (v->channels != -1 && uc != v->channels) { +-- +2.49.0 + diff --git a/package/sox/0007-hcom-validate-dictsize.patch b/package/sox/0007-hcom-validate-dictsize.patch new file mode 100644 index 0000000000..722b64675b --- /dev/null +++ b/package/sox/0007-hcom-validate-dictsize.patch @@ -0,0 +1,38 @@ +From 54455f59305d9ce94cc73100bc2dd542865fed4b Mon Sep 17 00:00:00 2001 +From: Helmut Grohne +Date: Sat, 17 May 2025 22:33:16 +0200 +Subject: [PATCH] hcom: validate dictsize + +Bug: https://sourceforge.net/p/sox/bugs/350/ +Bug: https://sourceforge.net/p/sox/bugs/352/ +Bug-Debian: https://bugs.debian.org/1021133 +Bug-Debian: https://bugs.debian.org/1021134 + +This patch fixes both CVE-2021-23159 and CVE-2021-23172. + +Upstream: https://sourceforge.net/p/sox/bugs/350/ +Upstream: https://sourceforge.net/p/sox/bugs/352/ +Signed-off-by: Thomas Petazzoni +--- + src/hcom.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/hcom.c b/src/hcom.c +index 594c8706..9e8b03c6 100644 +--- a/src/hcom.c ++++ b/src/hcom.c +@@ -141,6 +141,11 @@ static int startread(sox_format_t * ft) + return (SOX_EOF); + } + lsx_readw(ft, &dictsize); ++ if (dictsize == 0 || dictsize > 511) ++ { ++ lsx_fail_errno(ft, SOX_EHDR, "Implausible dictionary size in HCOM header"); ++ return SOX_EOF; ++ } + + /* Translate to sox parameters */ + ft->encoding.encoding = SOX_ENCODING_HCOM; +-- +2.49.0 + diff --git a/package/sox/0008-phere-avoid-integer-underflow.patch b/package/sox/0008-phere-avoid-integer-underflow.patch new file mode 100644 index 0000000000..7c59896660 --- /dev/null +++ b/package/sox/0008-phere-avoid-integer-underflow.patch @@ -0,0 +1,42 @@ +From c49c81a3c4409e7c1979ec8cb341fb0c57220616 Mon Sep 17 00:00:00 2001 +From: Helmut Grohne +Date: Sat, 17 May 2025 22:48:05 +0200 +Subject: [PATCH] phere: avoid integer underflow + +Link: https://talosintelligence.com/vulnerability_reports/TALOS-2021-1434 +Bug: https://sourceforge.net/p/sox/bugs/362/ +Bug-Debian: https://bugs.debian.org/1012138 + +Upstream: https://sourceforge.net/p/sox/bugs/362/ +Signed-off-by: Thomas Petazzoni +--- + src/sphere.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/sphere.c b/src/sphere.c +index a3fd1c64..9544d160 100644 +--- a/src/sphere.c ++++ b/src/sphere.c +@@ -63,7 +63,8 @@ static int start_read(sox_format_t * ft) + return (SOX_EOF); + } + +- header_size -= (strlen(buf) + 1); ++ bytes_read = strlen(buf); ++ header_size -= bytes_read >= header_size ? header_size : bytes_read + 1; + + while (strncmp(buf, "end_head", (size_t)8) != 0) { + if (strncmp(buf, "sample_n_bytes", (size_t)14) == 0) +@@ -105,7 +106,8 @@ static int start_read(sox_format_t * ft) + return (SOX_EOF); + } + +- header_size -= (strlen(buf) + 1); ++ bytes_read = strlen(buf); ++ header_size -= bytes_read >= header_size ? header_size : bytes_read + 1; + } + + if (!bytes_per_sample) +-- +2.49.0 + diff --git a/package/sox/0009-formats-aiff-reject-implausibly-large-number-of-chan.patch b/package/sox/0009-formats-aiff-reject-implausibly-large-number-of-chan.patch new file mode 100644 index 0000000000..fd1d210da1 --- /dev/null +++ b/package/sox/0009-formats-aiff-reject-implausibly-large-number-of-chan.patch @@ -0,0 +1,63 @@ +From 452bfd55096e24ff5eb4a5eb491c70125ce05be8 Mon Sep 17 00:00:00 2001 +From: Helmut Grohne +Date: Sat, 17 May 2025 22:55:32 +0200 +Subject: [PATCH] formats+aiff: reject implausibly large number of channels + +Bug: https://sourceforge.net/p/sox/bugs/360/ +Bug-Debian: https://bugs.debian.org/1012516 + +Upstream: https://sourceforge.net/p/sox/bugs/360/ +Signed-off-by: Thomas Petazzoni +--- + src/aiff.c | 5 +++++ + src/formats_i.c | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/aiff.c b/src/aiff.c +index 3a152c58..6de94f32 100644 +--- a/src/aiff.c ++++ b/src/aiff.c +@@ -619,6 +619,11 @@ int lsx_aiffstartwrite(sox_format_t * ft) + At 48 kHz, 16 bits stereo, this gives ~3 hours of audio. + Sorry, the AIFF format does not provide for an indefinite + number of samples. */ ++ if (ft->signal.channels >= (0x7f000000 / (ft->encoding.bits_per_sample >> 3))) ++ { ++ lsx_fail_errno(ft, SOX_EOF, "too many channels for AIFF header"); ++ return SOX_EOF; ++ } + return(aiffwriteheader(ft, (uint64_t) 0x7f000000 / ((ft->encoding.bits_per_sample>>3)*ft->signal.channels))); + } + +diff --git a/src/formats_i.c b/src/formats_i.c +index 7048040d..6a7c27e3 100644 +--- a/src/formats_i.c ++++ b/src/formats_i.c +@@ -19,6 +19,7 @@ + */ + + #include "sox_i.h" ++#include + #include + #include + #include +@@ -60,9 +61,14 @@ int lsx_check_read_params(sox_format_t * ft, unsigned channels, + if (ft->seekable) + ft->data_start = lsx_tell(ft); + +- if (channels && ft->signal.channels && ft->signal.channels != channels) ++ if (channels && ft->signal.channels && ft->signal.channels != channels) { + lsx_warn("`%s': overriding number of channels", ft->filename); +- else ft->signal.channels = channels; ++ } else if (channels > SHRT_MAX) { ++ lsx_fail_errno(ft, EINVAL, "implausibly large number of channels"); ++ return SOX_EOF; ++ } else { ++ ft->signal.channels = channels; ++ } + + if (rate && ft->signal.rate && ft->signal.rate != rate) + lsx_warn("`%s': overriding sample rate", ft->filename); +-- +2.49.0 + diff --git a/package/sox/0010-formats-reject-implausible-rate.patch b/package/sox/0010-formats-reject-implausible-rate.patch new file mode 100644 index 0000000000..5e60b62011 --- /dev/null +++ b/package/sox/0010-formats-reject-implausible-rate.patch @@ -0,0 +1,39 @@ +From 6af0a8b32df4d7a83fd52a963a20e6e321f10fd6 Mon Sep 17 00:00:00 2001 +From: Helmut Grohne +Date: Sat, 17 May 2025 23:05:33 +0200 +Subject: [PATCH] formats: reject implausible rate + +Bug: https://sourceforge.net/p/sox/bugs/360/ +Bug-Debian: https://bugs.debian.org/1012516 + +Upstream: https://sourceforge.net/p/sox/bugs/360/ +Signed-off-by: Thomas Petazzoni +--- + src/formats_i.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/formats_i.c b/src/formats_i.c +index 6a7c27e3..5f5ef979 100644 +--- a/src/formats_i.c ++++ b/src/formats_i.c +@@ -70,9 +70,15 @@ int lsx_check_read_params(sox_format_t * ft, unsigned channels, + ft->signal.channels = channels; + } + +- if (rate && ft->signal.rate && ft->signal.rate != rate) ++ if (rate && ft->signal.rate && ft->signal.rate != rate) { + lsx_warn("`%s': overriding sample rate", ft->filename); +- else ft->signal.rate = rate; ++ /* Since NaN comparisons yield false, the negation rejects them. */ ++ } else if (!(rate > 0)) { ++ lsx_fail_errno(ft, EINVAL, "invalid rate value"); ++ return SOX_EOF; ++ } else { ++ ft->signal.rate = rate; ++ } + + if (encoding && ft->encoding.encoding && ft->encoding.encoding != encoding) + lsx_warn("`%s': overriding encoding type", ft->filename); +-- +2.49.0 + diff --git a/package/sox/0011-CVE-2023-32627-Filter-null-sampling-rate-in-VOC-code.patch b/package/sox/0011-CVE-2023-32627-Filter-null-sampling-rate-in-VOC-code.patch new file mode 100644 index 0000000000..b67d23c12d --- /dev/null +++ b/package/sox/0011-CVE-2023-32627-Filter-null-sampling-rate-in-VOC-code.patch @@ -0,0 +1,37 @@ +From 2ab4f13af84f224cfbdd997e027c7348156de463 Mon Sep 17 00:00:00 2001 +From: Helmut Grohne +Date: Sat, 17 May 2025 23:07:34 +0200 +Subject: [PATCH] CVE-2023-32627 Filter null sampling rate in VOC coder + +Avoid a divide by zero and out of bound read by rejecting null sampling rate in VOC file + +bug: https://sourceforge.net/p/sox/bugs/369/ +bug-redhat: https://bugzilla.redhat.com/show_bug.cgi?id=2212282 +bug-debian: https://bugs.debian.org/1041112 +bug-debian-security: https://security-tracker.debian.org/tracker/CVE-2023-32627 + +Upstream: https://sourceforge.net/p/sox/bugs/369/ +Signed-off-by: Thomas Petazzoni +--- + src/voc.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/voc.c b/src/voc.c +index 0ca07f94..d8b982c5 100644 +--- a/src/voc.c ++++ b/src/voc.c +@@ -353,6 +353,11 @@ static size_t read_samples(sox_format_t * ft, sox_sample_t * buf, + v->block_remaining = 0; + return done; + } ++ if(uc == 0) { ++ lsx_fail_errno(ft, EINVAL, "invalid rate value"); ++ v->block_remaining = 0; ++ return done; ++ } + *buf = SOX_UNSIGNED_8BIT_TO_SAMPLE(uc,); + lsx_adpcm_init(&v->adpcm, 6 - v->size, SOX_SAMPLE_TO_SIGNED_16BIT(*buf, ft->clips)); + ++buf; +-- +2.49.0 + diff --git a/package/sox/sox.mk b/package/sox/sox.mk index d0329bf50d..9fd3f2151c 100644 --- a/package/sox/sox.mk +++ b/package/sox/sox.mk @@ -12,15 +12,82 @@ SOX_LICENSE = GPL-2.0+ (sox binary), LGPL-2.1+ (libraries) SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL SOX_CPE_ID_VENDOR = sound_exchange_project SOX_CPE_ID_PRODUCT = sound_exchange +# The Git commit in SOX_VERSION is 14.4.2 + a large number of commits +SOX_CPE_ID_VERSION = 14.4.2 # From git and we're patching configure.ac SOX_AUTORECONF = YES SOX_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive SOX_INSTALL_STAGING = YES -SOX_IGNORE_CVES += CVE-2017-11332 CVE-2017-11358 CVE-2017-11359 \ - CVE-2017-15370 CVE-2017-15371 CVE-2017-15372 CVE-2017-15642 \ - CVE-2017-18189 CVE-2019-8354 CVE-2019-8355 CVE-2019-8356 \ - CVE-2019-8357 CVE-2019-13590 +# sox-14.4.2-6-g6e177c45 +SOX_IGNORE_CVES += CVE-2017-11332 + +# sox-14.4.2-7-ge410d00c +SOX_IGNORE_CVES += CVE-2017-11358 + +# sox-14.4.2-8-g7b3f30e1 +SOX_IGNORE_CVES += CVE-2017-11359 + +# sox-14.4.2-9-ge076a7ad +SOX_IGNORE_CVES += CVE-2017-15370 + +# sox-14.4.2-10-g968c689a +SOX_IGNORE_CVES += CVE-2017-15371 + +# sox-14.4.2-11-g515b9861 +SOX_IGNORE_CVES += CVE-2017-15372 + +# sox-14.4.2-12-gf56c0dbc +SOX_IGNORE_CVES += CVE-2017-15642 + +# sox-14.4.2-13-g09d7388c +# CVE-2019-1010004 is a duplicate of CVE-2017-18189 +SOX_IGNORE_CVES += CVE-2017-18189 CVE-2019-1010004 + +# sox-14.4.2-38-gf7091126 +SOX_IGNORE_CVES += CVE-2019-8354 + +# sox-14.4.2-39-gf8587e2d +SOX_IGNORE_CVES += CVE-2019-8355 + +# sox-14.4.2-40-gb7883ae1 +SOX_IGNORE_CVES += CVE-2019-8356 + +# sox-14.4.2-41-g2ce02fea +SOX_IGNORE_CVES += CVE-2019-8357 + +# sox-14.4.2-44-g7b6a8892 +SOX_IGNORE_CVES += CVE-2019-13590 + +# 0006-voc-word-width-should-never-be-0-to-avoid-division-b.patch +# This entry is NOT stale, those CVEs are not reported by pkg-stats +# due to the change of CPE ID to sox_project:sox in the NVD database +SOX_IGNORE_CVES += CVE-2021-3643 CVE-2021-23210 + +# 0007-hcom-validate-dictsize.patch +# This entry is NOT stale, those CVEs are not reported by pkg-stats +# due to the change of CPE ID to sox_project:sox in the NVD database +SOX_IGNORE_CVES += CVE-2021-23159 CVE-2021-23172 CVE-2023-34318 CVE-2023-34432 + +# 0008-phere-avoid-integer-underflow.patch +# This entry is NOT stale, those CVEs are not reported by pkg-stats +# due to the change of CPE ID to libsox_project:libsox in the NVD database +SOX_IGNORE_CVES += CVE-2021-40426 + +# 0009-formats-aiff-reject-implausibly-large-number-of-chan.patch +# This entry is NOT stale, those CVEs are not reported by pkg-stats +# due to the change of CPE ID to sox_project:sox in the NVD database +SOX_IGNORE_CVES += CVE-2022-31650 CVE-2023-26590 + +# 0010-formats-reject-implausible-rate.patch +# This entry is NOT stale, those CVEs are not reported by pkg-stats +# due to the change of CPE ID to sox_project:sox in the NVD database +SOX_IGNORE_CVES += CVE-2022-31651 + +# 0011-CVE-2023-32627-Filter-null-sampling-rate-in-VOC-code.patch +# This entry is NOT stale, those CVEs are not reported by pkg-stats +# due to the change of CPE ID to sox_project:sox in the NVD database +SOX_IGNORE_CVES += CVE-2023-32627 SOX_CONF_OPTS = \ --with-distro="Buildroot" \ diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 69e569a548..947acb0dfc 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9962648c9b4f1a7bbc76fd8d9172555bad1871fdb14ff4f842ef87949682caa5 spdlog-1.15.0.tar.gz +sha256 8741753e488a78dd0d0024c980e1fb5b5c85888447e309d9cb9d949bdb52aa3e spdlog-1.16.0.tar.gz sha256 4ccecab18d1ff0b61174fe3d6c430541625d3ddb865b0d5887db296f883c76e7 LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index 3f69f9a6d3..245feac801 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.15.0 +SPDLOG_VERSION = 1.16.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE diff --git a/package/spice/spice.hash b/package/spice/spice.hash index b228f213a5..c678f9b114 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,3 +1,4 @@ +# From https://www.spice-space.org/download/releases/spice-server/spice-0.15.2.tar.bz2.sha256 +sha256 6d9eb6117f03917471c4bc10004abecff48a79fb85eb85a1c45f023377015b81 spice-0.15.2.tar.bz2 # Locally calculated -sha256 b320cf8f4bd2852750acb703c15b72856027e5a8554f8217dfbb3cc09deba0f5 spice-0.15.0.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 608a9413fe..0997903791 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_VERSION = 0.15.0 +SPICE_VERSION = 0.15.2 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ diff --git a/package/spirv-headers/spirv-headers.hash b/package/spirv-headers/spirv-headers.hash index 136f3df733..c62d12a79a 100644 --- a/package/spirv-headers/spirv-headers.hash +++ b/package/spirv-headers/spirv-headers.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32b4c6ae6a2fa9b56c2c17233c8056da47e331f76e117729925825ea3e77a739 spirv-headers-1.3.261.1.tar.gz -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a LICENSE +sha256 602364ab7bf404a7f352df7da5c645f1c4558a9c92616f8ee33422b04d5e35b7 spirv-headers-1.4.328.1.tar.gz +sha256 ea43b1de38a6f90c488800d66dec1ed671e68cda530266bc96951fb5b6307613 LICENSE diff --git a/package/spirv-headers/spirv-headers.mk b/package/spirv-headers/spirv-headers.mk index 9f84c42b2d..9312e96d41 100644 --- a/package/spirv-headers/spirv-headers.mk +++ b/package/spirv-headers/spirv-headers.mk @@ -5,8 +5,8 @@ ################################################################################ # Keep in sync with spirv-tools version -SPIRV_HEADERS_VERSION = 1.3.261.1 -SPIRV_HEADERS_SITE = $(call github,KhronosGroup,SPIRV-Headers,sdk-$(SPIRV_HEADERS_VERSION)) +SPIRV_HEADERS_VERSION = 1.4.328.1 +SPIRV_HEADERS_SITE = $(call github,KhronosGroup,SPIRV-Headers,vulkan-sdk-$(SPIRV_HEADERS_VERSION)) SPIRV_HEADERS_LICENSE = MIT SPIRV_HEADERS_LICENSE_FILES = LICENSE diff --git a/package/spirv-llvm-translator/Config.in b/package/spirv-llvm-translator/Config.in new file mode 100644 index 0000000000..91bd7f5ba3 --- /dev/null +++ b/package/spirv-llvm-translator/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + bool "spirv-translator" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # llvm + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_PACKAGE_LLVM + select BR2_PACKAGE_SPIRV_HEADERS + select BR2_PACKAGE_ZLIB + help + LLVM/SPIR-V Bi-Directional Translator is a library and tool + for translation between LLVM IR and SPIR-V. + + https://github.com/khronosGroup/SPIRV-LLVM-Translator + +comment "spirv-translator needs a toolchain w/ wchar, threads, C++, gcc >= 7, dynamic library, host gcc >= 7" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash index 4500fc4f62..0263689519 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.hash +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 0a00a72a5b004eeb73f9c96c9c6ba2d6de232cbf3c22a7b322047604d24402ba spirv-llvm-translator-v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c6e63.tar.gz +sha256 8db031b9e23c1dd47154751cf74f8a3c5d5e8d92896789c6a7eb956946287677 spirv-llvm-translator-v21.1.2-5-g3c0231e56b7a9ecc4875e8696ea53d54d6776f85.tar.gz sha256 e3bc36440fc927c62d5cc24efeefe225a14d4e34ffeb0c92e430625cce9ee444 LICENSE.TXT diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk index 523890a986..28bdb4d26f 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -5,8 +5,8 @@ ################################################################################ # Generate version string using: -# git describe --tags --match 'v15*' --abbrev=40 origin/llvm_release_150 -SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c6e63 +# git describe --tags --match 'v21*' --abbrev=40 origin/llvm_release_210 +SPIRV_LLVM_TRANSLATOR_VERSION = v21.1.2-5-g3c0231e56b7a9ecc4875e8696ea53d54d6776f85 SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm spirv-headers +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(STAGING_DIR)/usr \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/spirv-tools/spirv-tools.hash b/package/spirv-tools/spirv-tools.hash index 65cb9c619b..e3652a48cd 100644 --- a/package/spirv-tools/spirv-tools.hash +++ b/package/spirv-tools/spirv-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ead95c626ad482882a141d1aa0ce47b9453871f72c42c0b28d39c82f60a52008 spirv-tools-1.3.261.1.tar.gz +sha256 d00dc47df7163c2bacd70f090441e8fad96234f0e3b96c54ee9091a49e627adb spirv-tools-1.4.328.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/spirv-tools/spirv-tools.mk b/package/spirv-tools/spirv-tools.mk index e863911b03..c71a0f8299 100644 --- a/package/spirv-tools/spirv-tools.mk +++ b/package/spirv-tools/spirv-tools.mk @@ -5,11 +5,12 @@ ################################################################################ # Keep in sync with spirv-headers version -SPIRV_TOOLS_VERSION = 1.3.261.1 -SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,sdk-$(SPIRV_TOOLS_VERSION)) +SPIRV_TOOLS_VERSION = 1.4.328.1 +SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,vulkan-sdk-$(SPIRV_TOOLS_VERSION)) SPIRV_TOOLS_LICENSE = Apache-2.0 SPIRV_TOOLS_LICENSE_FILES = LICENSE SPIRV_TOOLS_DEPENDENCIES = spirv-headers +HOST_SPIRV_TOOLS_DEPENDENCIES = host-spirv-headers SPIRV_TOOLS_INSTALL_STAGING = YES SPIRV_TOOLS_CONF_OPTS = \ @@ -18,4 +19,11 @@ SPIRV_TOOLS_CONF_OPTS = \ -DSPIRV_SKIP_TESTS=ON \ -DSPIRV_WERROR=OFF +HOST_SPIRV_TOOLS_CONF_OPTS = \ + -DSPIRV-Headers_SOURCE_DIR=$(HOST_DIR) \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -DSPIRV_SKIP_TESTS=ON \ + -DSPIRV_WERROR=OFF + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index ce1e369b20..c649267040 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -30,11 +30,11 @@ 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" +config BR2_PACKAGE_SQLITE_ENABLE_RTREE + bool "Enable the RTREE extension for SQLite" help - When this option is defined in the amalgamation, the JSON - extensions are added to the build automatically. + When this option is defined in the amalgamation, the RTREE + extension is added to the build automatically. config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY bool "Enable sqlite3_unlock_notify() interface" diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index ba2c0956d8..19d5584625 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83eb21a6f6a649f506df8bd3aab85a08f7556ceed5dbd8dea743ea003fc3a957 sqlite-autoconf-3470000.tar.gz +sha256 4f2445cd70479724d32ad015ec7fd37fbb6f6130013bd4bfbc80c32beb42b7e0 sqlite-autoconf-3510100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index e6d681e501..ca8071c78e 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.47.0 -SQLITE_TAR_VERSION = 3470000 +SQLITE_VERSION = 3.51.1 +SQLITE_TAR_VERSION = 3510100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2024 +SQLITE_SITE = https://www.sqlite.org/2025 SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite @@ -21,12 +21,8 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA endif -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 +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_RTREE),y) +SQLITE_CFLAGS += -DSQLITE_ENABLE_RTREE endif ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y) @@ -45,35 +41,86 @@ endif # Work around using -O0 ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y:) SQLITE_CFLAGS += $(TARGET_CFLAGS) -O0 +else ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +SQLITE_CFLAGS += $(TARGET_CFLAGS) -O0 else # fallback to standard -O3 when -Ofast is present to avoid -ffast-math SQLITE_CFLAGS += $(subst -Ofast,-O3,$(TARGET_CFLAGS)) endif -SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)" - -ifeq ($(BR2_STATIC_LIBS),y) -SQLITE_CONF_OPTS += --enable-dynamic-extensions=no -else -SQLITE_CONF_OPTS += --disable-static-shell -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -SQLITE_CONF_OPTS += --enable-threadsafe -else -SQLITE_CONF_OPTS += --disable-threadsafe -SQLITE_CFLAGS += -DSQLITE_THREADSAFE=0 -endif - ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) SQLITE_DEPENDENCIES += ncurses readline -SQLITE_CONF_OPTS += --disable-editline --enable-readline -else ifeq ($(BR2_PACKAGE_LIBEDIT),y) -SQLITE_DEPENDENCIES += libedit -SQLITE_CONF_OPTS += --enable-editline --disable-readline +SQLITE_CFLAGS += -DHAVE_READLINE=1 +SQLITE_LDFLAGS += -lreadline -lncurses +else ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_LIBEDIT),yy) +SQLITE_DEPENDENCIES += ncurses libedit +SQLITE_CFLAGS += -DHAVE_EDITLINE=1 +SQLITE_LDFLAGS += -ledit -lncurses else -SQLITE_CONF_OPTS += --disable-editline --disable-readline +SQLITE_CONF_OPTS += --disable-readline endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y) +SQLITE_CONF_OPTS += --fts3 +endif + +ifeq ($(BR2_STATIC_LIBS),y) +SQLITE_CONF_OPTS += --disable-shared +endif + +SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)" LDFLAGS="$(SQLITE_LDFLAGS)" + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101971 +define SQLITE_FIX_MAKEFILE + chmod +w $(@D)/Makefile + sed -i "s/-fPIC//" $(@D)/Makefile +endef + +define SQLITE_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) \ + $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ + $(SQLITE_CONF_ENV) ./configure \ + --prefix=/usr \ + --host="$(GNU_TARGET_NAME)" \ + --build="$(GNU_HOST_NAME)" \ + --sysroot="$(STAGING_DIR)" \ + --disable-rpath \ + --soname=legacy \ + $(SQLITE_CONF_OPTS) \ + ) + $(if $(BR2_m68k_cf),$(SQLITE_FIX_MAKEFILE)) +endef + +define SQLITE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define SQLITE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install +endef + +define SQLITE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install +endef + +define HOST_SQLITE_CONFIGURE_CMDS + (cd $(@D); $(HOST_CONFIGURE_OPTS) \ + ./configure \ + --prefix=/usr \ + --host="$(GNU_HOST_NAME)" \ + --build="$(GNU_HOST_NAME)" \ + --sysroot="$(HOST_DIR)" \ + --disable-readline \ + ) +endef + +define HOST_SQLITE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_SQLITE_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) DESTDIR="$(HOST_DIR)" -C $(@D) install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/sqlitecpp/sqlitecpp.hash b/package/sqlitecpp/sqlitecpp.hash index 3ed6a3c40a..960d9bfb21 100644 --- a/package/sqlitecpp/sqlitecpp.hash +++ b/package/sqlitecpp/sqlitecpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5aa8eda130d0689bd5ed9b2074714c2dbc610f710483c61ba6cf944cebfe03af sqlitecpp-3.3.2.tar.gz -sha256 ecb10f021c51e9fd1dabaebd8a8e977934d47d9e3c74094f333060be2d6e023b LICENSE.txt +sha256 33bd4372d83bc43117928ee842be64d05e7807f511b5195f85d30015cad9cac6 sqlitecpp-3.3.3.tar.gz +sha256 a16149966042207bfc968dd1081403d43a37a6264fe31c7b1a7960dbb0e716b9 LICENSE.txt diff --git a/package/sqlitecpp/sqlitecpp.mk b/package/sqlitecpp/sqlitecpp.mk index 1cf8281997..95ddc953cb 100644 --- a/package/sqlitecpp/sqlitecpp.mk +++ b/package/sqlitecpp/sqlitecpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITECPP_VERSION = 3.3.2 +SQLITECPP_VERSION = 3.3.3 SQLITECPP_SITE = $(call github,SRombauts,SQLiteCpp,$(SQLITECPP_VERSION)) SQLITECPP_LICENSE = MIT SQLITECPP_LICENSE_FILES = LICENSE.txt diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash index bc45b4ab5e..c921d638bb 100644 --- a/package/squashfs/squashfs.hash +++ b/package/squashfs/squashfs.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c squashfs-4.6.1.tar.gz +sha256 94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c squashfs-tools-4.6.1.tar.gz # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index b9fbf54b01..f2cb0ab25e 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -5,7 +5,8 @@ ################################################################################ SQUASHFS_VERSION = 4.6.1 -SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) +SQUASHFS_SOURCE = squashfs-tools-$(SQUASHFS_VERSION).tar.gz +SQUASHFS_SITE = https://github.com/plougher/squashfs-tools/releases/download/$(SQUASHFS_VERSION) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING SQUASHFS_CPE_ID_VALID = YES diff --git a/package/squeezelite/squeezelite.hash b/package/squeezelite/squeezelite.hash index 67ed4c8797..62cbe025fe 100644 --- a/package/squeezelite/squeezelite.hash +++ b/package/squeezelite/squeezelite.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7f0342f4943d3c3498d930060f5a1e8d63ccb7282b9c21f964926e310449d592 squeezelite-71c012ad9ba102feb95823b7b9dc17e5305689c7.tar.gz -sha256 dc01c3da33fea11ed918f9e437b88baa59c70401aab0dad747e33dd9e8035706 LICENSE.txt +sha256 dae15fe640111895c99a3aa561a3448d3ce43ab695c2006828e621c51023b588 squeezelite-72e1fd8abfa9b2f8e9636f033247526920878718.tar.gz +sha256 6c9ecc7ee5e0a793b04669128191cf1f250b4e9dc6e1130aa050619b39ab71d0 LICENSE.txt diff --git a/package/squeezelite/squeezelite.mk b/package/squeezelite/squeezelite.mk index b0347c4df9..40fc6df411 100644 --- a/package/squeezelite/squeezelite.mk +++ b/package/squeezelite/squeezelite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUEEZELITE_VERSION = 71c012ad9ba102feb95823b7b9dc17e5305689c7 +SQUEEZELITE_VERSION = 72e1fd8abfa9b2f8e9636f033247526920878718 SQUEEZELITE_SITE = $(call github,ralph-irving,squeezelite,$(SQUEEZELITE_VERSION)) SQUEEZELITE_LICENSE = GPL-3.0 SQUEEZELITE_LICENSE_FILES = LICENSE.txt diff --git a/package/squid/0001-Fix-ASN-1-encoding-of-long-SNMP-OIDs.patch b/package/squid/0001-Fix-ASN-1-encoding-of-long-SNMP-OIDs.patch new file mode 100644 index 0000000000..695ba0255e --- /dev/null +++ b/package/squid/0001-Fix-ASN-1-encoding-of-long-SNMP-OIDs.patch @@ -0,0 +1,52 @@ +From 0d89165ee6da10e6fa50c44998b3cd16d59400e9 Mon Sep 17 00:00:00 2001 +From: Alex Rousskov +Date: Sat, 30 Aug 2025 06:49:36 +0000 +Subject: [PATCH] Fix ASN.1 encoding of long SNMP OIDs (#2149) + +Upstream: https://github.com/squid-cache/squid/commit/250a18e0a80694b919972a1836cdfe20f2e1baa0 +CVE: CVE-2025-59362 +Signed-off-by: Thomas Perale +--- + lib/snmplib/asn1.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/lib/snmplib/asn1.c b/lib/snmplib/asn1.c +index 81f2051fbe7..2852c26b220 100644 +--- a/lib/snmplib/asn1.c ++++ b/lib/snmplib/asn1.c +@@ -735,6 +735,7 @@ asn_build_objid(u_char * data, int *datalength, + * lastbyte ::= 0 7bitvalue + */ + u_char buf[MAX_OID_LEN]; ++ u_char *bufEnd = buf + sizeof(buf); + u_char *bp = buf; + oid *op = objid; + int asnlength; +@@ -753,6 +754,10 @@ asn_build_objid(u_char * data, int *datalength, + while (objidlength-- > 0) { + subid = *op++; + if (subid < 127) { /* off by one? */ ++ if (bp >= bufEnd) { ++ snmp_set_api_error(SNMPERR_ASN_ENCODE); ++ return (NULL); ++ } + *bp++ = subid; + } else { + mask = 0x7F; /* handle subid == 0 case */ +@@ -770,8 +775,16 @@ asn_build_objid(u_char * data, int *datalength, + /* fix a mask that got truncated above */ + if (mask == 0x1E00000) + mask = 0xFE00000; ++ if (bp >= bufEnd) { ++ snmp_set_api_error(SNMPERR_ASN_ENCODE); ++ return (NULL); ++ } + *bp++ = (u_char) (((subid & mask) >> bits) | ASN_BIT8); + } ++ if (bp >= bufEnd) { ++ snmp_set_api_error(SNMPERR_ASN_ENCODE); ++ return (NULL); ++ } + *bp++ = (u_char) (subid & mask); + } + } diff --git a/package/squid/squid.hash b/package/squid/squid.hash index e0dede862a..329d61ca93 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,3 @@ -# From http://www.squid-cache.org/Versions/v6/squid-6.10.tar.xz.asc -md5 86deefa7282c4388be95260aa4d4cf6a squid-6.10.tar.xz -sha1 70e90865df0e4e9ba7765b622da40bda9bb8fc5d squid-6.10.tar.xz # Locally calculated -sha256 0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7 squid-6.10.tar.xz +sha256 9eafe06f58a199b918e79d33d8aa03afb9ae0c11d18974dca0b44c2669cab6dd squid-6.14.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index bfb3664082..d445f005b7 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,13 +4,17 @@ # ################################################################################ -SQUID_VERSION = 6.10 +SQUID_VERSION = 6.14 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v6 +SQUID_SITE = https://github.com/squid-cache/squid/releases/download/SQUID_$(subst .,_,$(SQUID_VERSION)) SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache SQUID_SELINUX_MODULES = apache squid + +# 0001-Fix-ASN-1-encoding-of-long-SNMP-OIDs.patch +SQUID_IGNORE_CVES += CVE-2025-59362 + SQUID_DEPENDENCIES = libcap host-libcap libtool libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = \ diff --git a/package/sshguard/sshguard.hash b/package/sshguard/sshguard.hash index d018428d19..81d79e3034 100644 --- a/package/sshguard/sshguard.hash +++ b/package/sshguard/sshguard.hash @@ -1,4 +1,4 @@ -# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.3/sshguard-2.4.3.sha256 -sha256 64029deff6de90fdeefb1f497d414f0e4045076693a91da1a70eb7595e97efeb sshguard-2.4.3.tar.gz +# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.5.1/sshguard-2.5.1.sha256 +sha256 997a1e0ec2b2165b4757c42f8948162eb534183946af52efc406885d97cb89fc sshguard-2.5.1.tar.gz # Locally calculated sha256 c3ae64f12153a1bc55bc234d09f40a08ab0e0149fffc972c0b7f02d5a12c1a5c COPYING diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index 97cbbb2bdd..4aa152bbfc 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHGUARD_VERSION = 2.4.3 +SSHGUARD_VERSION = 2.5.1 SSHGUARD_SITE = https://sourceforge.net/projects/sshguard/files/sshguard/$(SSHGUARD_VERSION) SSHGUARD_LICENSE = ISC, Public Domain (fnv hash), BSD-3-Clause (SimCList) SSHGUARD_LICENSE_FILES = COPYING diff --git a/package/sslh/0002-fix-warnings-on-sockaddr-storage.patch b/package/sslh/0002-fix-warnings-on-sockaddr-storage.patch new file mode 100644 index 0000000000..4df920f718 --- /dev/null +++ b/package/sslh/0002-fix-warnings-on-sockaddr-storage.patch @@ -0,0 +1,56 @@ +From 402ca5219b5dcf7a502cd3f75906423527837a7a Mon Sep 17 00:00:00 2001 +From: Yves Rutschle +Date: Thu, 4 Jan 2024 23:22:44 +0100 +Subject: [PATCH] fix warnings on sockaddr storage + +Upstream: https://github.com/yrutschle/sslh/commit/402ca5219b5dcf7a502cd3f75906423527837a7a +Signed-off-by: Peter Korsgaard +--- + udp-listener.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/udp-listener.c b/udp-listener.c +index 570e480..bc7a3f4 100644 +--- a/udp-listener.c ++++ b/udp-listener.c +@@ -36,10 +36,10 @@ + + static int cnx_cmp(struct connection* cnx1, struct connection* cnx2) + { +- struct sockaddr* addr1 = &cnx1->client_addr; ++ struct sockaddr_storage* addr1 = &cnx1->client_addr; + socklen_t addrlen1 = cnx1->addrlen; + +- struct sockaddr* addr2 = &cnx2->client_addr; ++ struct sockaddr_storage* addr2 = &cnx2->client_addr; + socklen_t addrlen2 = cnx2->addrlen; + + if (addrlen1 != addrlen2) return -1; +@@ -52,13 +52,13 @@ static int cnx_cmp(struct connection* cnx1, struct connection* cnx2) + * lowest bytes of remote port */ + static int hash_make_key(hash_item new) + { +- struct sockaddr* addr = &new->client_addr; ++ struct sockaddr_storage* addr = &new->client_addr; + //socklen_t addrlen = new->addrlen; + struct sockaddr_in* addr4; + struct sockaddr_in6* addr6; + int out; + +- switch (addr->sa_family) { ++ switch (((struct sockaddr*)addr)->sa_family) { + case AF_INET: + addr4 = (struct sockaddr_in*)addr; + out = addr4->sin_port; +@@ -327,7 +327,7 @@ void udp_s2c_forward(struct connection* cnx) + if ((res == -1) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))) return; + CHECK_RES_DIE(res, "udp_listener/recvfrom"); + res = sendto(cnx->local_endpoint, data, res, 0, +- &cnx->client_addr, cnx->addrlen); ++ (struct sockaddr*)&cnx->client_addr, cnx->addrlen); + mark_active(cnx); + } + +-- +2.39.5 + diff --git a/package/start-stop-daemon/0003-s-s-d-Cast-struct-sockaddr_un-to-struct-sockaddr-on-.patch b/package/start-stop-daemon/0003-s-s-d-Cast-struct-sockaddr_un-to-struct-sockaddr-on-.patch new file mode 100644 index 0000000000..c093b49e2e --- /dev/null +++ b/package/start-stop-daemon/0003-s-s-d-Cast-struct-sockaddr_un-to-struct-sockaddr-on-.patch @@ -0,0 +1,31 @@ +From 209ffbbf7c8fcf49d9296c969feb7a41aece6525 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Dec 2022 18:37:08 +0100 +Subject: [PATCH] s-s-d: Cast struct sockaddr_un to struct sockaddr on bind() + call + +Changelog: internal +Warned-by: gcc -Wincompatible-pointer-types on musl-libc + +Upstream: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=209ffbbf7c8fcf49d9296c969feb7a41aece6525 +Signed-off-by: Florian Larysch +--- + utils/start-stop-daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c +index 6863151c1..a15c0493f 100644 +--- a/utils/start-stop-daemon.c ++++ b/utils/start-stop-daemon.c +@@ -632,7 +632,7 @@ create_notify_socket(void) + su.sun_family = AF_UNIX; + strncpy(su.sun_path, sockname, sizeof(su.sun_path) - 1); + +- rc = bind(fd, &su, sizeof(su)); ++ rc = bind(fd, (struct sockaddr *)&su, sizeof(su)); + if (rc < 0) + fatale("cannot bind to notification socket"); + +-- +2.50.1 + diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index 4c1e0c18a1..6c8e2a850d 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,4 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha256 03dad30f4031bdc2d200146e7c587249ea75dbdb88c8ae13632829aac5540b08 stellarium-24.3.tar.xz +sha256 1cdebfa04220656a956270425e06c6c522579c07d61c3440f6b11ac3f09f6db5 stellarium-25.3.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 51b1688742..ec792bf20a 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 24.3 +STELLARIUM_VERSION = 25.3 STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ diff --git a/package/strace/Config.in b/package/strace/Config.in index e0551f3861..ff7d271c0c 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_STRACE bool "strace" - # needs at least kernel headers 4.0 on nios2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2 # needs at least kernel headers 5.0 on xtensa depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa # needs at least kernel headers 5.0 on musl aarch64 @@ -19,10 +17,6 @@ config BR2_PACKAGE_STRACE https://strace.io -comment "strace needs a toolchain w/ headers >= 4.0 on nios2" - depends on BR2_nios2 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" depends on BR2_xtensa depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/strace/strace.hash b/package/strace/strace.hash index e167f9d20a..268045ef1d 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,6 @@ -# Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.11/strace-6.11.tar.xz.asc -sha256 83262583a3529f02c3501aa8b8ac772b4cbc03dc934e98bab6e4883626e283a5 strace-6.11.tar.xz -sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING +# Locally calculated after checking signature with RSA key from +# https://raw.githubusercontent.com/strace/strace/refs/tags/v6.18/GPG-KEY +# https://strace.io/files/6.18/strace-6.18.tar.xz.asc +sha256 0ad5dcba973a69e779650ef1cb335b12ee60716fc7326609895bd33e6d2a7325 strace-6.18.tar.xz +sha256 ca2a0994c57e48b16828008c80cdb626e471b6b59116a8443b2ce4e3c77ddc3b COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 367a44da6e..5230b4d60c 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.11 +STRACE_VERSION = 6.18 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ diff --git a/package/stress-ng/0001-stress-pthread-fix-non-NPTL-build.patch b/package/stress-ng/0001-stress-pthread-fix-non-NPTL-build.patch new file mode 100644 index 0000000000..518296fdc4 --- /dev/null +++ b/package/stress-ng/0001-stress-pthread-fix-non-NPTL-build.patch @@ -0,0 +1,42 @@ +From 73d1f5ed2167fca8a1cbfb85f4da123f00e524a1 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 30 Nov 2025 11:36:10 +0100 +Subject: [PATCH] stress-pthread: fix non-NPTL build + +https://github.com/ColinIanKing/stress-ng/commit/15b26e33daaf36acd5eeceaaf6fc954f46792a8b +added the usage of attr without using HAVE_PTHREAD_ATTR_SETSTACK for +toolchains without NPTL support. + +This patch fixes build errors detected by buildroot autobuilders: +https://autobuild.buildroot.net/results/d4f/d4fadef213455b1776d93e30e51ffe09fb1879c5/build-end.log + +stress-pthread.c: In function 'stress_pthread': +stress-pthread.c:567:81: error: 'attr' undeclared (first use in this function) + 567 | pthreads[i].ret = pthread_create(&pthreads[i].pthread, &attr, + +Upstream: https://github.com/ColinIanKing/stress-ng/pull/593 + +Signed-off-by: Bernd Kuhls +--- + stress-pthread.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/stress-pthread.c b/stress-pthread.c +index aafcf0f0a..8605b7a1d 100644 +--- a/stress-pthread.c ++++ b/stress-pthread.c +@@ -564,7 +564,11 @@ static int stress_pthread(stress_args_t *args) + + pthreads[i].t_create = stress_time_now(); + pthreads[i].t_run = pthreads[i].t_create; ++#if defined(HAVE_PTHREAD_ATTR_SETSTACK) + pthreads[i].ret = pthread_create(&pthreads[i].pthread, &attr, ++#else ++ pthreads[i].ret = pthread_create(&pthreads[i].pthread, NULL, ++#endif + stress_pthread_func, (void *)&pargs); + if (UNLIKELY(pthreads[i].ret)) { + /* Out of resources, don't try any more */ +-- +2.47.3 + diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 30bb4d10c8..4041aba9b6 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -5,8 +5,7 @@ config BR2_PACKAGE_STRESS_NG depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 depends on BR2_TOOLCHAIN_HAS_THREADS - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC - depends on !BR2_nios2 + # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on ARC depends on !BR2_arc help stress-ng will stress test a computer system in various @@ -17,7 +16,7 @@ config BR2_PACKAGE_STRESS_NG https://github.com/ColinIanKing/stress-ng comment "stress-ng needs a toolchain w/ threads, headers >= 3.3" - depends on !BR2_nios2 && !BR2_arc + depends on !BR2_arc depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index a945fdc14a..dbe5f60a25 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b0ac75b68bb804fd3276fcb235f1b0a9567090ebd887b2ed0f8a3203f9545e11 stress-ng-0.18.05.tar.gz +sha256 054953145d7de36725a54636ea68975bb9ada06b4769878d25e556fab5804513 stress-ng-0.19.06.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index bf092b0782..7240e3e321 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.18.05 +STRESS_NG_VERSION = 0.19.06 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index a62688f9c3..10efcc1616 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -59,9 +59,20 @@ config BR2_PACKAGE_STRONGSWAN_GMP config BR2_PACKAGE_STRONGSWAN_WOLFSSL bool "wolfssl" select BR2_PACKAGE_WOLFSSL + select BR2_PACKAGE_WOLFSSL_ALL endchoice +config BR2_PACKAGE_STRONGSWAN_PIDDIR + string "piddir" + default "/var/run" + help + Path for PID and UNIX socket files used by strongswan. + + Use the empty string to not pass --with-piddir to strongswan + configure, this then defaults to strongswan's source default + which may not be stable across releases. + config BR2_PACKAGE_STRONGSWAN_AF_ALG bool "Enable AF_ALG crypto interface to Linux Crypto API" @@ -72,6 +83,16 @@ config BR2_PACKAGE_STRONGSWAN_CURL config BR2_PACKAGE_STRONGSWAN_MD4 bool "Enable MD4 hash algorithm" +config BR2_PACKAGE_STRONGSWAN_DROP_CAPS + bool "Drop unneeded capabilities after initialization" + select BR2_PACKAGE_LIBCAP + help + strongSwan supports capability dropping. The IKE charon daemon + is started as root and most of its privileges are dropped + immediately. + After the daemon has been initialized, further unneeded + capabilities are dropped. + config BR2_PACKAGE_STRONGSWAN_CHARON bool "Enable the IKEv1/IKEv2 keying daemon charon" default y @@ -193,6 +214,11 @@ config BR2_PACKAGE_STRONGSWAN_SQL config BR2_PACKAGE_STRONGSWAN_BYPASS_LAN bool "Enable BYPASS-LAN plugin" +config BR2_PACKAGE_STRONGSWAN_NONROOT + bool "Run as non-root" + help + This allows running the IKE charon daemon as the non-root + user/group charon/charon. endif config BR2_PACKAGE_STRONGSWAN_PKI diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 823b58555d..9719242327 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -62,6 +62,23 @@ STRONGSWAN_CONF_OPTS += \ --with-imcvdir=/usr/lib/ipsec/imcvs \ --with-dev-headers=/usr/include +ifeq ($(BR2_PACKAGE_STRONGSWAN_DROP_CAPS),y) +STRONGSWAN_CONF_OPTS += --with-capabilities=libcap +endif + +# setup piddir if BR2_PACKAGE_STRONGSWAN_PIDDIR is not empty +STRONGSWAN_CONF_OPTS += $(if $(call qstrip,$(BR2_PACKAGE_STRONGSWAN_PIDDIR)),--with-piddir=$(BR2_PACKAGE_STRONGSWAN_PIDDIR)) + +ifeq ($(BR2_PACKAGE_STRONGSWAN_NONROOT),y) +STRONGSWAN_CONF_OPTS += \ + --with-user=charon \ + --with-group=charon + +define STRONGSWAN_USERS + charon -1 charon -1 * - - - +endef +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) STRONGSWAN_CONF_ENV += LIBS='-latomic' endif @@ -75,7 +92,8 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \ $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) \ - $(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),wolfssl) + $(if $(BR2_PACKAGE_STRONGSWAN_WOLFSSL),wolfssl) \ + $(if $(BR2_PACKAGE_STRONGSWAN_DROP_CAPS),libcap) ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) STRONGSWAN_DEPENDENCIES += \ diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 2710e9e3f3..5950e9dccf 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.14.3.tar.bz2.sha512 -sha512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41 subversion-1.14.3.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.5.tar.bz2.sha512 +sha512 e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321 subversion-1.14.5.tar.bz2 # Locally calculated sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index bc0b9b45ab..b3daf013f0 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.14.3 +SUBVERSION_VERSION = 1.14.5 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 diff --git a/package/sudo/Config.in b/package/sudo/Config.in index ee5ea542ab..85bc4859b8 100644 --- a/package/sudo/Config.in +++ b/package/sudo/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_SUDO bool "sudo" # uses fork() depends on BR2_USE_MMU + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help Sudo is a program designed to allow a sysadmin to give limited root privileges to users and log root activity. The diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 066d3b9de6..3bbce74cbc 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558 sudo-1.9.15p5.tar.gz +sha256 ff607ea717072197738a78f778692cd6df9a7e3e404565f51de063ca27455d32 sudo-1.9.17p1.tar.gz # Locally calculated -sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md +sha256 41eb34d6b184c2638d6d32c6e7f70b8dd6423e68b91da959e0cf773aa01f62d7 LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 7961a99002..0aacd8207d 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.15 -SUDO_VERSION_MINOR = p5 +SUDO_VERSION_MAJOR = 1.9.17 +SUDO_VERSION_MINOR = p1 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -37,6 +37,10 @@ else SUDO_CONF_OPTS += --without-pam endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +SUDO_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) SUDO_CONF_OPTS += --enable-zlib SUDO_DEPENDENCIES += zlib @@ -73,7 +77,7 @@ define SUDO_USERS endef define SUDO_ENABLE_SUDO_GROUP_RULE - $(SED) '/^# \%sudo\tALL=(ALL:ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers + $(SED) '/^# \%sudo ALL=(ALL:ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers endef SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE diff --git a/package/sunxi-mali-utgard-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in index ba4d1919ce..22f93d0a0e 100644 --- a/package/sunxi-mali-utgard-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER since the driver requires at least double buffering and fails to work with the default value(100). - https://github.com/giuliobenetti/sunxi-mali/blob/master/README.md + https://github.com/benetti-engineering/sunxi-mali/blob/master/README.md diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index 5f3e001325..0b5dc9c2f8 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 151a56eb6a47efee19369a1c08b7aec506e48f983683a3cd05c5494cedf0fb69 sunxi-mali-utgard-driver-ad7e98bc1e81c7ac9c897f854c1a429d33e45d58.tar.gz +sha256 b0cf26625db13989be54844d3625e6918bee6d4ae6d054da161a2bf9e3665532 sunxi-mali-utgard-driver-b47f74c92fbcbdf175a16052d1b0ce8345efc6b2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk index ba7c50718d..38946aa1e4 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUNXI_MALI_UTGARD_DRIVER_VERSION = ad7e98bc1e81c7ac9c897f854c1a429d33e45d58 -SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,giuliobenetti,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_VERSION = b47f74c92fbcbdf175a16052d1b0ce8345efc6b2 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,benetti-engineering,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE diff --git a/package/supertux/Config.in b/package/supertux/Config.in index e8e96a3ae5..64c1715a25 100644 --- a/package/supertux/Config.in +++ b/package/supertux/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SUPERTUX depends on BR2_PACKAGE_HAS_LIBGL # libglew depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 # libglew, SDL2 OpenGL (GLX) - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_MMU # SDL2 OpenGL (GLX) @@ -35,11 +35,11 @@ config BR2_PACKAGE_SUPERTUX http://supertux.github.io/ -comment "supertux needs OpenGL and a toolchain w/ C++, gcc >= 6, NPTL, dynamic library, wchar" +comment "supertux needs OpenGL and a toolchain w/ C++, gcc >= 9, NPTL, dynamic library, wchar" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 319415754a..0f6c244058 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # openal - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz, openal + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS # openal depends on BR2_PACKAGE_HAS_LIBGL @@ -33,7 +33,7 @@ config BR2_PACKAGE_SUPERTUXKART http://supertuxkart.sourceforge.net/Main_Page -comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++, gcc >= 4.9" +comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++, gcc >= 9" depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU @@ -41,6 +41,6 @@ comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NP depends on BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ || !BR2_PACKAGE_HAS_LIBGL \ || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash index 58ab0d93b0..ea5ba01dc0 100644 --- a/package/suricata/suricata.hash +++ b/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 98c812faef466d337f107f13ae37843f1c719942b93832d70f1a2fd7ee1b5c2c suricata-6.0.19.tar.gz +sha256 c1515754924b618914fcb3cb98873af49996b920f2389a1998f89604f227a807 suricata-6.0.20.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index e60ed2fce8..8840853054 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 6.0.19 +SURICATA_VERSION = 6.0.20 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE diff --git a/package/sway/Config.in b/package/sway/Config.in index d78f792c48..1f4b497af3 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -33,7 +33,7 @@ config BR2_PACKAGE_SWAY_SWAYBAR bool "swaybar" select BR2_PACKAGE_DEJAVU select BR2_PACKAGE_JQ if BR2_PACKAGE_BASH_COMPLETION # Runtime - select BR2_PACKAGE_DMENU_WAYLAND # Runtime + select BR2_PACKAGE_WMENU # Runtime help Enable support for swaybar diff --git a/package/sway/sway.hash b/package/sway/sway.hash index 86b6581f1c..46f2bee753 100644 --- a/package/sway/sway.hash +++ b/package/sway/sway.hash @@ -1,3 +1,5 @@ -# Locally computed, tarball verified with GPG signature -sha256 73f08fd2cf7948e8af900709efe44eae412ae11c5773960e25c9aa09f73bad41 sway-1.8.1.tar.gz +# Locally calculated after checking pgp signature +# https://github.com/swaywm/sway/releases/download/1.11/sway-1.11.tar.gz.sig +# with key 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 "emersion " +sha256 0e37a55b7c3379230e97e1ad982542b75016a0c7d6676198604e557f9b373dae sway-1.11.tar.gz sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 0aad9de712..f27d147852 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWAY_VERSION = 1.8.1 +SWAY_VERSION = 1.11 SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) SWAY_LICENSE = MIT SWAY_LICENSE_FILES = LICENSE @@ -16,12 +16,6 @@ SWAY_CONF_OPTS = \ -Dman-pages=disabled \ -Dsd-bus-provider=libsystemd -ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) -SWAY_CONF_OPTS += -Dxwayland=enabled -else -SWAY_CONF_OPTS += -Dxwayland=disabled -endif - ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y) SWAY_CONF_OPTS += -Dgdk-pixbuf=enabled SWAY_DEPENDENCIES += gdk-pixbuf diff --git a/package/swipl/Config.in b/package/swipl/Config.in index 84b6ace47f..8bf58344b3 100644 --- a/package/swipl/Config.in +++ b/package/swipl/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS default y if BR2_m68k # BR2_microblaze has only FE_TONEAREST default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - # BR2_nios2 has only FE_TONEAREST default y if BR2_or1k default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_riscv diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash index 20278cfb8d..efc3aa963f 100644 --- a/package/swipl/swipl.hash +++ b/package/swipl/swipl.hash @@ -1,4 +1,4 @@ # From https://www.swi-prolog.org/download/stable -sha256 b331637a57c913c49edcfcb10ddcf6c031278ce93d2411d54542778531abb5c7 swipl-9.2.8.tar.gz +sha256 53f428e2d9bbdf30e53b06c9c42def9a13ff82fc36a111d410fc8b0bc889ee2d swipl-9.2.9.tar.gz # Locally calculated sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk index ef9aedcd2d..20faaefe7c 100644 --- a/package/swipl/swipl.mk +++ b/package/swipl/swipl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWIPL_VERSION = 9.2.8 +SWIPL_VERSION = 9.2.9 SWIPL_SITE = https://www.swi-prolog.org/download/stable/src SWIPL_LICENSE = BSD-2-Clause SWIPL_LICENSE_FILES = LICENSE @@ -36,7 +36,8 @@ SWIPL_CONF_OPTS = \ -DQSORT_R_GNU=1 \ -DSWIPL_NATIVE_FRIEND=$(HOST_SWIPL_SRCDIR) \ -DSWIPL_PACKAGES=OFF \ - -DUSE_TCMALLOC=OFF + -DUSE_TCMALLOC=OFF \ + -DCMAKE_CXX_COMPILER=true ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SWIPL_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic diff --git a/package/swtpm/swtpm.hash b/package/swtpm/swtpm.hash index 934d3b6ee0..ebad1ef4bf 100644 --- a/package/swtpm/swtpm.hash +++ b/package/swtpm/swtpm.hash @@ -1,2 +1,2 @@ -sha256 b281b4e8c39f68e1928675f788abc70072e4081152e129144359a8c5c304c06b swtpm-0.8.2.tar.gz +sha256 f8da11cadfed27e26d26c5f58a7b8f2d14d684e691927348906b5891f525c684 swtpm-0.10.1.tar.gz sha256 19d27d6e96d07022e5e688f75c974f1ceb9aae9e90e0fccae68666d02099cc4b LICENSE diff --git a/package/swtpm/swtpm.mk b/package/swtpm/swtpm.mk index 598d56cf1d..25377f5771 100644 --- a/package/swtpm/swtpm.mk +++ b/package/swtpm/swtpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWTPM_VERSION = 0.8.2 +SWTPM_VERSION = 0.10.1 SWTPM_SITE = $(call github,stefanberger,swtpm,v$(SWTPM_VERSION)) SWTPM_LICENSE = BSD-4-Clause SWTPM_LICENSE_FILES = LICENSE diff --git a/package/swugenerator/swugenerator.hash b/package/swugenerator/swugenerator.hash index 301f168681..184fd86e27 100644 --- a/package/swugenerator/swugenerator.hash +++ b/package/swugenerator/swugenerator.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3f4885242bce9523d26567578793c828e2f07122c6b7e44cce8ede33e5618a01 swugenerator-0.3.tar.gz +sha256 bb816a77278a2d320e36cdd6fd1bb9b8318b4ef4ccd05e79bb1d5ee631a1d5c1 swugenerator-0.5.tar.gz # Locally computed sha256 checksums sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/package/swugenerator/swugenerator.mk b/package/swugenerator/swugenerator.mk index 22ed799e99..5acabc2036 100644 --- a/package/swugenerator/swugenerator.mk +++ b/package/swugenerator/swugenerator.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUGENERATOR_VERSION = 0.3 +SWUGENERATOR_VERSION = 0.5 SWUGENERATOR_SITE = $(call github,sbabic,swugenerator,$(SWUGENERATOR_VERSION)) SWUGENERATOR_LICENSE = GPL-3.0 SWUGENERATOR_LICENSE_FILES = LICENSE diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index ac28acb1f4..bc911d1820 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2736045e885ad6c5dcba8dcc6c7582d0b76ef29a3d6ab7c4080908356e35e3b2 swupdate-2024.05.2.tar.gz +sha256 678b47fd2419727c4d0abf5c9f3bc0dc4b67e95951132bd1c8f5603e88947779 swupdate-2025.05.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 75e4af5db4..05329d13b8 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2024.05.2 +SWUPDATE_VERSION = 2025.05 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch deleted file mode 100644 index 46b4505837..0000000000 --- a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001 -From: Paul -Date: Sun, 23 May 2021 12:16:40 +0100 -Subject: [PATCH] harden link checker before accepting click - -[Retrieved from: -https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431] -Signed-off-by: Fabrice Fontaine -[Julien: rebased patch on version 3.7.0] -Signed-off-by: Julien Olivain ---- - src/textview.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/textview.c b/src/textview.c -index e55eea9..6fbb8a1 100644 ---- a/src/textview.c -+++ b/src/textview.c -@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri) - gboolean retval = TRUE; - - if (is_uri_string(uri->uri) == FALSE) -- return TRUE; -+ return FALSE; - - buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text)); - gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start); -@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri) - if (aval == G_ALERTDEFAULT) - retval = TRUE; - } -+ if (strlen(uri->uri) > get_uri_len(uri->uri)) -+ retval = FALSE; - - g_free(visible_str); - --- -2.45.2 - diff --git a/package/sylpheed/Config.in b/package/sylpheed/Config.in deleted file mode 100644 index f03ae87706..0000000000 --- a/package/sylpheed/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_SYLPHEED - bool "sylpheed" - depends on BR2_PACKAGE_LIBGTK2 - help - lightweight and user-friendly e-mail client. - - http://sylpheed.sraoss.jp/en/ diff --git a/package/sylpheed/sylpheed.hash b/package/sylpheed/sylpheed.hash deleted file mode 100644 index 39fa76612d..0000000000 --- a/package/sylpheed/sylpheed.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 0d6bc5eb46f5d0a463757c62bc80b00d219b294b3c3662840e4540f6db2e3e49 sylpheed-3.7.0.tar.xz -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk deleted file mode 100644 index fc419e2867..0000000000 --- a/package/sylpheed/sylpheed.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# sylpheed -# -################################################################################ - -SYLPHEED_VERSION_MAJOR = 3.7 -SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0 -SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz -SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) -SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin) -SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB -SYLPHEED_CPE_ID_VALID = YES -SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme -SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2 - -# 0001-harden-link-checker-before-accepting-click.patch -SYLPHEED_IGNORE_CVES += CVE-2021-37746 - -# Remove the -I$(includedir) from the Makefiles -# because it refers to the host /usr/include. -define SYLPHEED_PRECONFIGURE - for i in $$(find $(@D) -name "Makefile*"); do \ - sed -i 's:-I$$(includedir)::g' $$i; \ - done -endef - -SYLPHEED_PRE_CONFIGURE_HOOKS += SYLPHEED_PRECONFIGURE - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SYLPHEED_DEPENDENCIES += openssl -SYLPHEED_CONF_OPTS += --enable-ssl -else -SYLPHEED_CONF_OPTS += --disable-ssl -endif - -$(eval $(autotools-package)) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 8b1cd63a73..c74d7f9ba6 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,4 @@ -# Upstream .sha256 from GitHub -sha256 40a3bb593d7507e49a4379f48ae8a9bc4b68dcc583efcdbf3b9056128442c92a sysklogd-2.6.2.tar.gz - +# Upstream .sha256 from https://github.com/troglobit/sysklogd/releases/tag/v2.7.2 +sha256 bc410ca64551a11fac6518b418fb6b8afbd888a70af2c5eb353334a706727bca sysklogd-2.7.2.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index eeb3a3748d..baafc38083 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.6.2 +SYSKLOGD_VERSION = 2.7.2 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index bab628f521..f6d0e83433 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 4.7 +@version: 4.8 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 7f829c8b13..04f33926d5 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5477189a2d12325aa4faebfcf59f5bdd9084234732f0c3ec16dd253847dacf1c syslog-ng-4.7.1.tar.gz +sha256 f82732a8e639373037d2b69c0e6d5d6594290f0350350f7a146af4cd8ab9e2c7 syslog-ng-4.8.3.tar.gz sha256 d7d51f8d0f6ee9757a371080e7f5fa19ac73afbef14db6e981705cf1ec813d6b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 57ee46ce05..fa405ca5cb 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 4.7.1 +SYSLOG_NG_VERSION = 4.8.3 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in index a4f53a1179..e89a0e539e 100644 --- a/package/sysprof/Config.in +++ b/package/sysprof/Config.in @@ -1,14 +1,15 @@ config BR2_PACKAGE_SYSPROF bool "sysprof" - depends on BR2_USE_WCHAR # glib2, libdex, json-glib - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, libdex, json-glib, polkit + depends on BR2_USE_WCHAR # glib2, libdex, json-glib, elfutils + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, libdex, json-glib, polkit, elfutils depends on BR2_USE_MMU # glib2, libdex, json-glib depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libunwind, polkit depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS # libdex, libunwind, polkit + depends on !BR2_STATIC_LIBS # libdex, libunwind, polkit, elfutils depends on !BR2_OPTIMIZE_FAST # polkit depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12 + select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDEX select BR2_PACKAGE_LIBGLIB2 diff --git a/package/sysprof/sysprof.hash b/package/sysprof/sysprof.hash index ca025674a7..d68981d31e 100644 --- a/package/sysprof/sysprof.hash +++ b/package/sysprof/sysprof.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/sysprof/47/sysprof-47.0.sha256sum -sha256 7424c629434660654288c04248998c357d1ce87ee1559fd44df1980992ef5df5 sysprof-47.0.tar.xz +# From https://download.gnome.org/sources/sysprof/49/sysprof-49.0.sha256sum +sha256 ff04139637785c841948862087a4323b981680d942296409321b574fcb282878 sysprof-49.0.tar.xz # License files sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk index 81c0a4a6ee..92c840b795 100644 --- a/package/sysprof/sysprof.mk +++ b/package/sysprof/sysprof.mk @@ -4,14 +4,15 @@ # ################################################################################ -SYSPROF_VERSION_MAJOR = 47 +SYSPROF_VERSION_MAJOR = 49 SYSPROF_VERSION = $(SYSPROF_VERSION_MAJOR).0 SYSPROF_SOURCE = sysprof-$(SYSPROF_VERSION).tar.xz SYSPROF_SITE = https://download.gnome.org/sources/sysprof/$(SYSPROF_VERSION_MAJOR) SYSPROF_LICENSE = GPL-3.0+ SYSPROF_LICENSE_FILES = COPYING -SYSPROF_DEPENDENCIES = libglib2 libdex libunwind json-glib polkit +SYSPROF_DEPENDENCIES = elfutils libglib2 libdex libunwind json-glib polkit SYSPROF_CONF_OPTS = \ + -Ddebuginfod=disabled \ -Ddevelopment=false \ -Dexamples=false \ -Dgtk=false \ diff --git a/package/sysrepo/S51sysrepo-plugind b/package/sysrepo/S51sysrepo-plugind index 60ea3ba7a9..4bee6c1705 100644 --- a/package/sysrepo/S51sysrepo-plugind +++ b/package/sysrepo/S51sysrepo-plugind @@ -10,6 +10,7 @@ SYSREPO_PLUGIND_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -x "$EXECUTABLE" \ -- $SYSREPO_PLUGIND_ARGS status=$? @@ -45,7 +46,7 @@ reload() { } case "$1" in - start|stop|restart|reload) + start|stop|restart|reload) "$1";; *) echo "Usage: $0 {start|stop|restart|reload}" diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 056f70787d..d0f6546222 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz +sha256 c897206797427c79c4646baa1d8abe539bbc70af884ac869e827ff9f09d7fcc8 sysrepo-3.7.11.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 7f2570bd7d..59dc59a5df 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.150 +SYSREPO_VERSION = 3.7.11 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9a5386c7dc..931134911a 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS default y if BR2_m68k default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - default y if BR2_nios2 default y if BR2_riscv default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb default y if BR2_sparc || BR2_sparc64 @@ -25,6 +24,8 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_HOST_GCC_AT_LEAST_8 # host-systemd + select BR2_ROOTFS_MERGED_USR + select BR2_ROOTFS_MERGED_BIN select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP @@ -53,9 +54,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Kernel versions below 4.15 ("recommended baseline") have + Kernel versions below 5.4 ("recommended baseline") have significant gaps in functionality and are not recommended - for use with this version of systemd. + for use with this version of systemd. (e.g. lack race-free + process tracking by pidfd, systemd-networkd, and new mount + API support). Systemd requires a Linux kernel >= 3.15 with the following options enabled: @@ -355,7 +358,8 @@ config BR2_PACKAGE_SYSTEMD_MYHOSTNAME config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" - default y + default y if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 help systemd-networkd is a system service that manages networks. It detects and configures network devices as they appear, as @@ -366,6 +370,9 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD https://www.freedesktop.org/software/systemd/man/systemd-networkd.html +comment "systemd-networkd needs a toolchain with kernel headers >= 5.4" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + config BR2_PACKAGE_SYSTEMD_OOMD bool "enable out-of-memory killer" help diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 976d88c1f5..d68950f934 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,15 +1,16 @@ # sha256 locally computed -sha256 896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0 systemd-256.7.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 +sha256 5a2f477e6268630f6e2829c7bb3e442017549798a4122635817934eaa0c6ac10 systemd-257.10.tar.gz +sha256 ac4985facb553559981f507982444d779115e3e3a4c8b7847ae956198490c1b3 LICENSE.GPL2 +sha256 6d9bb3b7fc818a8facc4cc296060a0883fef8710d6498f86165335846e82ee9d LICENSE.LGPL2.1 +sha256 c9e7bf5b7c243c719b8b43c36158effb9b54c5e80abc9d82e4b2d4b2a4aa64ad LICENSES/alg-sha1-public-domain.txt sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 LICENSES/BSD-3-Clause.txt sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSES/CC0-1.0.txt -sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt +sha256 c7e6735d511987e7ed4c4a08b335d578335088e06225955ec8944973dbc0640c LICENSES/LGPL-2.0-or-later.txt sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 3df2dfbb09215ab1aecdd3c91d7fbe02fee4a0e75ef8967a25d1a6fe3b8abc06 LICENSES/README.md +sha256 768ecb25cb1e6e41672fc655571f45ba46a3f03fcbc6ab56c7a09ac5928eb37b LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index bf70a3d187..6d04ee2581 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 256.7 +SYSTEMD_VERSION = 257.10 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -35,6 +35,7 @@ SYSTEMD_LICENSE = \ SYSTEMD_LICENSE_FILES = \ LICENSE.GPL2 \ LICENSE.LGPL2.1 \ + LICENSES/alg-sha1-public-domain.txt \ LICENSES/BSD-2-Clause.txt \ LICENSES/BSD-3-Clause.txt \ LICENSES/CC0-1.0.txt \ @@ -73,6 +74,7 @@ SYSTEMD_CONF_OPTS += \ -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ + -Dipe=false \ -Dkexec-path=/usr/sbin/kexec \ -Dkmod-path=/usr/bin/kmod \ -Dldconfig=false \ @@ -99,6 +101,7 @@ SYSTEMD_CONF_OPTS += \ -Dfuzz-tests=false \ -Dinstall-tests=false \ -Dlog-message-verification=disabled \ + -Dsysupdated=disabled \ -Dtmpfiles=true \ -Dukify=disabled \ -Dbpf-framework=disabled \ @@ -111,11 +114,6 @@ ifeq ($(BR2_OPTIMIZE_FAST),y) SYSTEMD_CFLAGS += -O3 -fno-finite-math-only endif -ifeq ($(BR2_nios2),y) -# Nios2 ld emits warnings, make warnings not to be treated as errors -SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings -endif - ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) SYSTEMD_JOURNALD_PERMISSIONS = /var/log/journal d 2755 root systemd-journal - - - - - endif @@ -651,7 +649,7 @@ SYSTEMD_CONF_OPTS += -Dbootloader=enabled SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) define SYSTEMD_INSTALL_BOOT_FILES - $(INSTALL) -D -m 0644 $(@D)/build/src/boot/efi/systemd-boot$(SYSTEMD_BOOT_EFI_ARCH).efi \ + $(INSTALL) -D -m 0644 $(@D)/buildroot-build/src/boot/systemd-boot$(SYSTEMD_BOOT_EFI_ARCH).efi \ $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(SYSTEMD_BOOT_EFI_ARCH).efi $(INSTALL) -D -m 0644 $(SYSTEMD_PKGDIR)/boot-files/loader.conf \ $(BINARIES_DIR)/efi-part/loader/loader.conf @@ -852,6 +850,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) @@ -1015,7 +1014,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dopenssl=disabled \ -Dp11kit=disabled \ -Dlibfido2=disabled \ - -Dpcre2=disabled + -Dpcre2=disabled \ + -Dsysupdated=disabled HOST_SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ diff --git a/package/sysvinit/sysvinit.hash b/package/sysvinit/sysvinit.hash index 67b0ab38f0..8de1efed40 100644 --- a/package/sysvinit/sysvinit.hash +++ b/package/sysvinit/sysvinit.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2b7e3a5 sysvinit-3.04.tar.xz +sha256 c90874b8c054a35991fb8c4d30c443ed1e9b1815ff6165c7b483f558be4e4b53 sysvinit-3.14.tar.xz # Hash for license files: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index e05a6dee38..7e73432ea2 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -4,9 +4,9 @@ # ################################################################################ -SYSVINIT_VERSION = 3.04 +SYSVINIT_VERSION = 3.14 SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz -SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit +SYSVINIT_SITE = https://github.com/slicer69/sysvinit/releases/download/$(SYSVINIT_VERSION) SYSVINIT_LICENSE = GPL-2.0+ SYSVINIT_LICENSE_FILES = COPYING SYSVINIT_CPE_ID_VALID = YES diff --git a/package/taglib/Config.in b/package/taglib/Config.in index 6a87a13215..5b641a9653 100644 --- a/package/taglib/Config.in +++ b/package/taglib/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_TAGLIB bool "taglib" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + select BR2_PACKAGE_UTFCPP help TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index e83aa451f3..f3fc31beea 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b taglib-1.13.1.tar.gz +sha256 3716d31f7c83cbf17b67c8cf44dd82b2a2f17e6780472287a16823e70305ddba taglib-2.1.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index 9bdf05b85d..60ca045886 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,9 +4,10 @@ # ################################################################################ -TAGLIB_VERSION = 1.13.1 -TAGLIB_SITE = http://taglib.github.io/releases +TAGLIB_VERSION = 2.1.1 +TAGLIB_SITE = https://taglib.org/releases TAGLIB_INSTALL_STAGING = YES +TAGLIB_DEPENDENCIES = utfcpp TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL TAGLIB_CPE_ID_VENDOR = taglib diff --git a/package/tailscale/tailscale.hash b/package/tailscale/tailscale.hash index a5492684a1..e2d600f03e 100644 --- a/package/tailscale/tailscale.hash +++ b/package/tailscale/tailscale.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 46b68067a8b91f0e32ea8c23c292b9eb6675fac4c7bba5471a1f787bc3ad7412 tailscale-1.76.1-go2.tar.gz +sha256 4830cd822a838d5d44fd5eeebd07a2aacaf0255fb3fb7d3852d57659f54e51bc tailscale-1.78.1-go2.tar.gz sha256 d1ee1c7947d4b2c1963ea214d5324f1d4c89f2f1d0f0224889b4dfb868dad725 LICENSE diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk index 91290ba4a3..86039fd4b1 100644 --- a/package/tailscale/tailscale.mk +++ b/package/tailscale/tailscale.mk @@ -4,18 +4,43 @@ # ################################################################################ -TAILSCALE_VERSION = 1.76.1 +TAILSCALE_VERSION = 1.78.1 TAILSCALE_SITE = $(call github,tailscale,tailscale,v$(TAILSCALE_VERSION)) TAILSCALE_LICENSE = BSD-3-Clause TAILSCALE_LICENSE_FILES = LICENSE TAILSCALE_GOMOD = tailscale.com +TAILSCALE_CPE_ID_VENDOR = tailscale TAILSCALE_BUILD_TARGETS = cmd/tailscale cmd/tailscaled -TAILSCALE_INSTALL_BINS = tailscale tailscaled TAILSCALE_LDFLAGS = \ -X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \ -X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION) +define TAILSCALE_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.defaults \ + $(TARGET_DIR)/etc/default/tailscaled + $(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.service \ + $(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service +endef + +define TAILSCALE_INSTALL_SYMLINK + ln -f -s ../bin/tailscaled $(TARGET_DIR)/usr/sbin/tailscaled +endef +TAILSCALE_POST_INSTALL_TARGET_HOOKS += TAILSCALE_INSTALL_SYMLINK + define TAILSCALE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6_MULTIPLE_TABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_NETLINK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_CT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_MASQ) + $(call KCONFIG_ENABLE_OPT,CONFIG_NFT_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_INET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_IPV4) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_TABLES_IPV6) $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) endef diff --git a/package/tbtools/tbtools.hash b/package/tbtools/tbtools.hash index 25879c2780..f62d3c36d6 100644 --- a/package/tbtools/tbtools.hash +++ b/package/tbtools/tbtools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6ec94630bc4e1afec1342cfd635d1c7da7d82f6c5f00adac61d164505c2a0717 tbtools-0.4.2-cargo2.tar.gz +sha256 3fd91206483884f44ef757343f68c9acf91817ebbcdf4c0f6821a3734eb54984 tbtools-0.6.0-cargo4.tar.gz sha256 9b16a3add311d607af8d9b348a842a37840d0f47dfcc6cf2a7756ee02c24ed69 LICENSE diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index 13b2ee65f9..3031b86144 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBTOOLS_VERSION = 0.4.2 +TBTOOLS_VERSION = 0.6.0 TBTOOLS_SITE = $(call github,intel,tbtools,v$(TBTOOLS_VERSION)) TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk index cc998d82d6..e90334c783 100644 --- a/package/tcf-agent/tcf-agent.mk +++ b/package/tcf-agent/tcf-agent.mk @@ -15,7 +15,7 @@ TCF_AGENT_DEPENDENCIES = util-linux TCF_AGENT_SUBDIR = agent # there is not much purpose for the shared lib, -# if wont be used (unmodifed) outside the tcf-agent application +# it will not be used (unmodified) outside the tcf-agent application TCF_AGENT_CONF_OPTS = \ -DBUILD_SHARED_LIBS=OFF \ -DTCF_MACHINE=$(call qstrip,$(BR2_PACKAGE_TCF_AGENT_ARCH)) diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index e73e2d2c57..4307fa60fc 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.4.4/tcpreplay-4.4.4.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.5.2/tcpreplay-4.5.2.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 3ff9753cc43bb15e77832cee657e3030dbcdd957fa247e6abacc605689e24051 tcpreplay-4.4.4.tar.xz +sha256 2df15bc6d49f96a77617d137049f998193bbae95c1a31b04ca02856a24cbf384 tcpreplay-4.5.2.tar.xz sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index c5b3f9baa4..32bcf8d278 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.4.4 +TCPREPLAY_VERSION = 4.5.2 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 diff --git a/package/tealdeer/tealdeer.hash b/package/tealdeer/tealdeer.hash index f5493ec8eb..acfaad0271 100644 --- a/package/tealdeer/tealdeer.hash +++ b/package/tealdeer/tealdeer.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 f0be09eed89d25e44f954e9c25476176d9e4acc15171ae93b5977d7f244851ba tealdeer-1.6.1-cargo2.tar.gz +sha256 40952b9921d750bd6a84a7624b7b19558a9bbf1be6433b70db5ec2ccd840e33d tealdeer-1.6.1-cargo4.tar.gz sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 3cb7ff51e5..2ec8a58487 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -42,13 +42,6 @@ TEKUI_MAKE_OPTS += \ X11_DEFS="-D_XOPEN_SOURCE -DENABLE_XFT -DENABLE_XVID -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/fontconfig" \ DISPLAY_DRIVER=x11 else -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -TEKUI_DEPENDENCIES += directfb -TEKUI_MAKE_OPTS += \ - DIRECTFB_LIBS="-lfreetype -ldirectfb -lpthread" \ - DIRECTFB_DEFS="-D_REENTRANT -I$(STAGING_DIR)/usr/include/directfb -I$(STAGING_DIR)/usr/include/freetype2" \ - DISPLAY_DRIVER=directfb -else TEKUI_MAKE_OPTS += \ FREETYPE_LIBS=-lfreetype \ FREETYPE_DEFS="-I$(STAGING_DIR)/usr/include/freetype2" \ @@ -56,7 +49,6 @@ TEKUI_MAKE_OPTS += \ RAWFB_SUB_DEFS="-DDEF_FONTDIR=\\\"$(TEKUI_FONTDIR)\\\"" \ DISPLAY_DRIVER=rawfb endif -endif define TEKUI_BUILD_CMDS $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all diff --git a/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch b/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch new file mode 100644 index 0000000000..b849bc5055 --- /dev/null +++ b/package/tensorflow-lite/0001-lite-Update-CMakeLists.txt.patch @@ -0,0 +1,48 @@ +From 081c2e4e3cf021efb2853a485a18b563e88f6117 Mon Sep 17 00:00:00 2001 +From: Terry Heo +Date: Tue, 1 Nov 2022 15:55:30 -0700 +Subject: [PATCH] lite: Update CMakeLists.txt + +This changes are needed to build kernel tests. + +PiperOrigin-RevId: 485439972 + +Signed-off-by: James Hilliard +Upstream: https://github.com/tensorflow/tensorflow/commit/081c2e4e3cf021efb2853a485a18b563e88f6117 +--- + tensorflow/lite/CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index 9dfbb4b72f3..fd8b3faf1e2 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -209,6 +209,9 @@ list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tflite_with_xnnpack\\.cc$") + # Exclude Flex related files. + list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*with_selected_ops\\.cc$") + ++# Exclude tensorflow_profiler_logger files. ++list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tensorflow_profiler_logger\\.cc$") ++ + if(_TFLITE_ENABLE_MMAP) + list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*mmap_allocation_disabled\\.cc$") + else() +@@ -222,6 +225,7 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "iOS") + endif() + populate_tflite_source_vars("core" TFLITE_CORE_SRCS) + populate_tflite_source_vars("core/api" TFLITE_CORE_API_SRCS) ++populate_tflite_source_vars("core/c" TFLITE_CORE_C_SRCS) + populate_tflite_source_vars("c" TFLITE_C_SRCS) + populate_tflite_source_vars("delegates" TFLITE_DELEGATES_SRCS) + if(TFLITE_ENABLE_GPU) +@@ -483,6 +487,7 @@ endif() + # TFLite library + set(_ALL_TFLITE_SRCS + ${TFLITE_CORE_API_SRCS} ++ ${TFLITE_CORE_C_SRCS} + ${TFLITE_CORE_SRCS} + ${TFLITE_C_SRCS} + ${TFLITE_DELEGATES_FLEX_SRCS} +-- +2.34.1 + diff --git a/package/tensorflow-lite/0002-Add-SYSTEM_FARMHASH-cmake-config-flag.patch b/package/tensorflow-lite/0002-Add-SYSTEM_FARMHASH-cmake-config-flag.patch new file mode 100644 index 0000000000..538af1de9d --- /dev/null +++ b/package/tensorflow-lite/0002-Add-SYSTEM_FARMHASH-cmake-config-flag.patch @@ -0,0 +1,73 @@ +From d8451a9048d09692994c40a6f9bc928e70ed79b5 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Mon, 28 Nov 2022 21:36:34 -0700 +Subject: [PATCH] Add SYSTEM_FARMHASH cmake config flag + +Since farmhash does not install a cmake package we need to +search for the library and headers to use the provided +version. + +Signed-off-by: James Hilliard +Upstream: https://github.com/tensorflow/tensorflow/commit/d8451a9048d09692994c40a6f9bc928e70ed79b5 +--- + tensorflow/lite/g3doc/guide/build_cmake.md | 1 + + .../tools/cmake/modules/Findfarmhash.cmake | 30 +++++++++++++++---- + 2 files changed, 26 insertions(+), 5 deletions(-) + +diff --git a/tensorflow/lite/g3doc/guide/build_cmake.md b/tensorflow/lite/g3doc/guide/build_cmake.md +index 6950a365bb8..6de955e70b0 100644 +--- a/tensorflow/lite/g3doc/guide/build_cmake.md ++++ b/tensorflow/lite/g3doc/guide/build_cmake.md +@@ -81,6 +81,7 @@ variables to point to your library installations. + ```sh + cmake ../tensorflow_src/tensorflow/lite -DTFLITE_ENABLE_INSTALL=ON \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ ++ -DSYSTEM_FARMHASH=ON \ + -Dabsl_DIR=/lib/cmake/absl \ + -DEigen3_DIR=/share/eigen3/cmake \ + -DFlatbuffers_DIR=/lib/cmake/flatbuffers \ +diff --git a/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake b/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake +index 1b0dc28f624..97b43298f13 100644 +--- a/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake ++++ b/tensorflow/lite/tools/cmake/modules/Findfarmhash.cmake +@@ -13,12 +13,32 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-# tensorflow-lite uses find_package for this package, so override the system +-# installation and build from source instead. +-include(farmhash) +-if(farmhash_POPULATED) ++# tensorflow-lite uses find_package for this package, so build from ++# source if the system version is not enabled. ++ ++if(SYSTEM_FARMHASH) ++ include(FindPackageHandleStandardArgs) ++ find_path(FARMHASH_ROOT_DIR NAMES include/farmhash.h) ++ find_library(FARMHASH_LIB NAMES farmhash PATHS ${FARMHASH_ROOT_DIR}/lib ${FARMHASH_LIB_PATH}) ++ find_path(FARMHASH_INCLUDE_DIRS NAMES farmhash.h PATHS ${FARMHASH_ROOT_DIR}/include) ++ find_package_handle_standard_args(farmhash DEFAULT_MSG FARMHASH_LIB FARMHASH_INCLUDE_DIRS) ++endif() ++ ++if(farmhash_FOUND) ++ add_library(farmhash SHARED IMPORTED GLOBAL) ++ set_target_properties(farmhash PROPERTIES ++ IMPORTED_LOCATION ${FARMHASH_LIB} ++ INTERFACE_INCLUDE_DIRECTORIES ${FARMHASH_INCLUDE_DIRS} ++ ) ++else() ++ include(farmhash) ++ if(farmhash_POPULATED) ++ get_target_property(FARMHASH_INCLUDE_DIRS farmhash INTERFACE_DIRECTORIES) ++ endif() ++endif() ++ ++if(farmhash_FOUND OR farmhash_POPULATED) + set(FARMHASH_FOUND TRUE) +- get_target_property(FARMHASH_INCLUDE_DIRS farmhash INTERFACE_DIRECTORIES) + add_library(farmhash::farmhash ALIAS farmhash) + set(FARMHASH_LIBRARIES farmhash::farmhash) + endif() +-- +2.34.1 + diff --git a/package/tensorflow-lite/0003-Fix-FindFlatBuffers-cmake-file.patch b/package/tensorflow-lite/0003-Fix-FindFlatBuffers-cmake-file.patch new file mode 100644 index 0000000000..83e8ae6423 --- /dev/null +++ b/package/tensorflow-lite/0003-Fix-FindFlatBuffers-cmake-file.patch @@ -0,0 +1,50 @@ +From d8f98dd9f2b437cca5954b38cb48d9c21733f67d Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 24 Nov 2022 14:29:06 -0700 +Subject: [PATCH] Fix FindFlatBuffers cmake file + +Capitalization needs to match for system cmake override to work: +https://github.com/google/flatbuffers/blob/v22.11.23/CMake/FindFlatBuffers.cmake + +Signed-off-by: James Hilliard +Upstream: https://github.com/tensorflow/tensorflow/commit/d8f98dd9f2b437cca5954b38cb48d9c21733f67d +--- + tensorflow/lite/CMakeLists.txt | 2 +- + tensorflow/lite/g3doc/guide/build_cmake.md | 2 +- + .../modules/{FindFlatbuffers.cmake => FindFlatBuffers.cmake} | 0 + 3 files changed, 2 insertions(+), 2 deletions(-) + rename tensorflow/lite/tools/cmake/modules/{FindFlatbuffers.cmake => FindFlatBuffers.cmake} (100%) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index f9c30d6a046..c2ee9edfb61 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -143,7 +143,7 @@ find_package(absl REQUIRED) + find_package(Eigen3 REQUIRED) + find_package(farmhash REQUIRED) + find_package(fft2d REQUIRED) +-find_package(Flatbuffers REQUIRED) ++find_package(FlatBuffers REQUIRED) + find_package(gemmlowp REQUIRED) + find_package(NEON_2_SSE REQUIRED) + find_package(cpuinfo REQUIRED) #CPUINFO is used by XNNPACK and RUY library +diff --git a/tensorflow/lite/g3doc/guide/build_cmake.md b/tensorflow/lite/g3doc/guide/build_cmake.md +index 6950a365bb8..9cb7ebac326 100644 +--- a/tensorflow/lite/g3doc/guide/build_cmake.md ++++ b/tensorflow/lite/g3doc/guide/build_cmake.md +@@ -84,7 +84,7 @@ cmake ../tensorflow_src/tensorflow/lite -DTFLITE_ENABLE_INSTALL=ON \ + -DSYSTEM_FARMHASH=ON \ + -Dabsl_DIR=/lib/cmake/absl \ + -DEigen3_DIR=/share/eigen3/cmake \ +- -DFlatbuffers_DIR=/lib/cmake/flatbuffers \ ++ -DFlatBuffers_DIR=/lib/cmake/flatbuffers \ + -DNEON_2_SSE_DIR=/lib/cmake/NEON_2_SSE \ + -Dcpuinfo_DIR=/share/cpuinfo \ + -Druy_DIR=/lib/cmake/ruy +diff --git a/tensorflow/lite/tools/cmake/modules/FindFlatbuffers.cmake b/tensorflow/lite/tools/cmake/modules/FindFlatBuffers.cmake +similarity index 100% +rename from tensorflow/lite/tools/cmake/modules/FindFlatbuffers.cmake +rename to tensorflow/lite/tools/cmake/modules/FindFlatBuffers.cmake +-- +2.34.1 + diff --git a/package/tensorflow-lite/0004-Don-t-link-tensorflow-lite-against-gemmlowp.patch b/package/tensorflow-lite/0004-Don-t-link-tensorflow-lite-against-gemmlowp.patch new file mode 100644 index 0000000000..eadc483778 --- /dev/null +++ b/package/tensorflow-lite/0004-Don-t-link-tensorflow-lite-against-gemmlowp.patch @@ -0,0 +1,31 @@ +From fb584589f707853d85a081c99b1b82598c2631c1 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 24 Nov 2022 15:10:27 -0700 +Subject: [PATCH] Don't link tensorflow-lite against gemmlowp + +We can't link against gemmlowp as it is a header only library. + +Fixes: +/bin/ld: cannot find -lgemmlowp: No such file or directory + +Signed-off-by: James Hilliard +Upstream: https://github.com/tensorflow/tensorflow/commit/fb584589f707853d85a081c99b1b82598c2631c1 +--- + tensorflow/lite/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index f9c30d6a046..3fe5ed15605 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -534,7 +534,6 @@ target_link_libraries(tensorflow-lite + farmhash + fft2d_fftsg2d + flatbuffers::flatbuffers +- gemmlowp + ruy::ruy + ${CMAKE_DL_LIBS} + ${TFLITE_TARGET_DEPENDENCIES} +-- +2.34.1 + diff --git a/package/tensorflow-lite/0005-tflite-add-stdint.h-for-int-types-in-internal-Spectr.patch b/package/tensorflow-lite/0005-tflite-add-stdint.h-for-int-types-in-internal-Spectr.patch new file mode 100644 index 0000000000..e4eac41bb3 --- /dev/null +++ b/package/tensorflow-lite/0005-tflite-add-stdint.h-for-int-types-in-internal-Spectr.patch @@ -0,0 +1,26 @@ +From 9dbee4329ffd0474b939927f6d337959fb72318a Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Fri, 31 Mar 2023 16:01:44 +0000 +Subject: [PATCH] tflite: add stdint.h for int types in internal::Spectrogram + +Signed-off-by: James Hilliard +Upstream: https://github.com/tensorflow/tensorflow/commit/9dbee4329ffd0474b939927f6d337959fb72318a +--- + tensorflow/lite/kernels/internal/spectrogram.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tensorflow/lite/kernels/internal/spectrogram.cc b/tensorflow/lite/kernels/internal/spectrogram.cc +index a832962a38d..919eebeb3e7 100644 +--- a/tensorflow/lite/kernels/internal/spectrogram.cc ++++ b/tensorflow/lite/kernels/internal/spectrogram.cc +@@ -17,6 +17,7 @@ limitations under the License. + + #include + #include ++#include + + #include "third_party/fft2d/fft.h" + +-- +2.34.1 + diff --git a/package/tensorflow-lite/Config.in b/package/tensorflow-lite/Config.in new file mode 100644 index 0000000000..99d219622d --- /dev/null +++ b/package/tensorflow-lite/Config.in @@ -0,0 +1,38 @@ +config BR2_PACKAGE_TENSORFLOW_LITE_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_i386 + default y if BR2_x86_64 + depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS + +config BR2_PACKAGE_TENSORFLOW_LITE + bool "tensorflow-lite" + depends on BR2_PACKAGE_TENSORFLOW_LITE_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp + depends on BR2_TOOLCHAIN_HAS_THREADS # cpuinfo + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_SHARED_LIBS + select BR2_PACKAGE_CPUINFO + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_FARMHASH + select BR2_PACKAGE_FFT2D + select BR2_PACKAGE_FLATBUFFERS + select BR2_PACKAGE_GEMMLOWP + select BR2_PACKAGE_LIBABSEIL_CPP + select BR2_PACKAGE_NEON_2_SSE + select BR2_PACKAGE_RUY if BR2_PACKAGE_RUY_ARCH_SUPPORTS + select BR2_PACKAGE_XNNPACK if BR2_PACKAGE_XNNPACK_ARCH_SUPPORTS + help + Tensorflow Lite dynamic library and headers: Inference engine + to run previously trained machine learning models. + + https://www.tensorflow.org/ + +comment "tensorflow-lite needs a toolchain w/ gcc >= 8, C++, threads" + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS + +comment "tensorflow-lite needs a toolchain w/ shared libraries" + depends on !BR2_SHARED_LIBS diff --git a/package/tensorflow-lite/tensorflow-lite.hash b/package/tensorflow-lite/tensorflow-lite.hash new file mode 100644 index 0000000000..7d9035707b --- /dev/null +++ b/package/tensorflow-lite/tensorflow-lite.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48 tensorflow-lite-2.11.0.tar.gz +# License files, locally calculated +sha256 71c6915d04265772a0339bed47276942c678b45cc01534210ebe6984fd1aec65 LICENSE diff --git a/package/tensorflow-lite/tensorflow-lite.mk b/package/tensorflow-lite/tensorflow-lite.mk new file mode 100644 index 0000000000..433eff3242 --- /dev/null +++ b/package/tensorflow-lite/tensorflow-lite.mk @@ -0,0 +1,59 @@ +################################################################################ +# +# tensorflow-lite +# +################################################################################ + +TENSORFLOW_LITE_VERSION = 2.11.0 +TENSORFLOW_LITE_SITE = $(call github,tensorflow,tensorflow,v$(TENSORFLOW_LITE_VERSION)) +TENSORFLOW_LITE_INSTALL_STAGING = YES +TENSORFLOW_LITE_LICENSE = Apache-2.0 +TENSORFLOW_LITE_LICENSE_FILES = LICENSE +TENSORFLOW_LITE_SUBDIR = tensorflow/lite +TENSORFLOW_LITE_SUPPORTS_IN_SOURCE_BUILD = NO +TENSORFLOW_LITE_DEPENDENCIES += \ + host-pkgconf \ + host-flatbuffers \ + cpuinfo \ + eigen \ + farmhash \ + fft2d \ + flatbuffers \ + gemmlowp \ + libabseil-cpp \ + neon-2-sse + +TENSORFLOW_LITE_CONF_OPTS = \ + -Dabsl_DIR=$(STAGING_DIR)/usr/lib/cmake/absl \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -I$(STAGING_DIR)/usr/include/gemmlowp" \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DEigen3_DIR=$(STAGING_DIR)/usr/share/eigen3/cmake \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ + -DFETCHCONTENT_QUIET=OFF \ + -DFFT2D_SOURCE_DIR=$(STAGING_DIR)/usr/include/fft2d \ + -DFlatBuffers_DIR=$(STAGING_DIR)/usr/lib/cmake/flatbuffers \ + -DNEON_2_SSE_DIR=$(STAGING_DIR)/usr/lib/cmake/NEON_2_SSE \ + -DSYSTEM_FARMHASH=ON \ + -DTFLITE_ENABLE_EXTERNAL_DELEGATE=ON \ + -DTFLITE_ENABLE_GPU=OFF \ + -DTFLITE_ENABLE_INSTALL=ON \ + -DTFLITE_ENABLE_MMAP=ON \ + -DTFLITE_ENABLE_NNAPI=OFF + +ifeq ($(BR2_PACKAGE_RUY),y) +TENSORFLOW_LITE_DEPENDENCIES += ruy +TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_RUY=ON +else +TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_RUY=OFF +endif + +ifeq ($(BR2_PACKAGE_XNNPACK),y) +TENSORFLOW_LITE_DEPENDENCIES += xnnpack +TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_XNNPACK=ON -Dxnnpack_POPULATED=ON +else +TENSORFLOW_LITE_CONF_OPTS += -DTFLITE_ENABLE_XNNPACK=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/tesseract-ocr/Config.in b/package/tesseract-ocr/Config.in index 4d9b78733e..79a27780b2 100644 --- a/package/tesseract-ocr/Config.in +++ b/package/tesseract-ocr/Config.in @@ -1,13 +1,13 @@ -comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, wchar" +comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 8, dynamic library, wchar" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR menuconfig BR2_PACKAGE_TESSERACT_OCR bool "tesseract-ocr" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 35b116685f..b45e892966 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 c4bc2a81c12a472f445b7c2fb4705a08bd643ef467f51ec84f0e148bd368051b tesseract-ocr-5.4.1.tar.gz +sha256 f2fb34ca035b6d087a42875a35a7a5c4155fa9979c6132365b1e5a28ebc3fc11 tesseract-ocr-5.5.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index b2cefcf2a0..81a1e8097c 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.4.1 +TESSERACT_OCR_VERSION = 5.5.0 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 diff --git a/package/tftpd/Config.in b/package/tftpd/Config.in index d4e81e70bc..faaff3fe2e 100644 --- a/package/tftpd/Config.in +++ b/package/tftpd/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_TFTPD bool "tftpd" - # linker issue with pre-6.x toolchains - depends on !(BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_6) depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 9faa47683b..4e3d897bf3 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -32,7 +32,7 @@ endef THERMALD_PRE_CONFIGURE_HOOKS += THERMALD_GTK_DOC_HOOK # Autoreconf is missing the m4/ directory, which might actually be missing -# iff it was the first argument, but unfortunately we are overriding the +# if it was the first argument, but unfortunately we are overriding the # first include directory above. Thus we need that hook here. define THERMALD_CREATE_M4 mkdir -p $(@D)/m4 diff --git a/package/thttpd/Config.in b/package/thttpd/Config.in deleted file mode 100644 index bd97bc7a75..0000000000 --- a/package/thttpd/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_THTTPD - bool "thttpd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC - help - thttpd is a simple, small, portable, fast, and secure HTTP - server - - http://www.acme.com/software/thttpd/ diff --git a/package/thttpd/thttpd.hash b/package/thttpd/thttpd.hash deleted file mode 100644 index a29b9b2dcb..0000000000 --- a/package/thttpd/thttpd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397 thttpd-2.29.tar.gz -sha256 be059e6b8219d5bb5480fa6a2864bbb34892f56951d03d08b356bc1fa8c81a01 thttpd.c diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk deleted file mode 100644 index d9cb5c9071..0000000000 --- a/package/thttpd/thttpd.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# thttpd -# -################################################################################ - -THTTPD_VERSION = 2.29 -THTTPD_SITE = https://acme.com/software/thttpd -THTTPD_LICENSE = BSD-2-Clause -THTTPD_LICENSE_FILES = thttpd.c -THTTPD_CPE_ID_VENDOR = acme - -THTTPD_MAKE = $(MAKE1) - -ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) -THTTPD_DEPENDENCIES += libxcrypt -endif - -define THTTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/thttpd $(TARGET_DIR)/usr/sbin/thttpd - $(INSTALL) -D -m 0755 $(@D)/extras/htpasswd $(TARGET_DIR)/usr/bin/htpasswd - $(INSTALL) -D -m 0755 $(@D)/extras/makeweb $(TARGET_DIR)/usr/bin/makeweb - $(INSTALL) -D -m 0755 $(@D)/extras/syslogtocern $(TARGET_DIR)/usr/bin/syslogtocern - $(INSTALL) -D -m 0755 $(@D)/scripts/thttpd_wrapper $(TARGET_DIR)/usr/sbin/thttpd_wrapper - $(SED) 's:/usr/local/sbin:/usr/sbin:g' -e \ - 's:/usr/local/www/thttpd_config:/etc/thttpd.conf:g' \ - $(TARGET_DIR)/usr/sbin/thttpd_wrapper - $(INSTALL) -d $(TARGET_DIR)/var/www/data - $(INSTALL) -d $(TARGET_DIR)/var/www/logs - echo "dir=/var/www/data" > $(TARGET_DIR)/etc/thttpd.conf - echo 'cgipat=**.cgi' >> $(TARGET_DIR)/etc/thttpd.conf - echo "logfile=/var/www/logs/thttpd_log" >> $(TARGET_DIR)/etc/thttpd.conf - echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/etc/thttpd.conf -endef - -define THTTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/thttpd/S90thttpd \ - $(TARGET_DIR)/etc/init.d/S90thttpd -endef - -define THTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/thttpd/thttpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/thttpd.service -endef - -$(eval $(autotools-package)) diff --git a/package/thttpd/thttpd.service b/package/thttpd/thttpd.service deleted file mode 100644 index e3c93e7b3c..0000000000 --- a/package/thttpd/thttpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Tiny HTTP Daemon - -[Service] -PIDFile=/run/thttpd.pid -ExecStart=/usr/sbin/thttpd -D -C /etc/thttpd.conf -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package/ti-sgx-demos/Config.in b/package/ti-sgx-demos/Config.in index ec7b8e6038..f45ccd8d01 100644 --- a/package/ti-sgx-demos/Config.in +++ b/package/ti-sgx-demos/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_TI_SGX_DEMOS depends on BR2_PACKAGE_TI_SGX_UM help These SGX powervr demo applications from Imagination - Technologies are availabe as binaries only. The binaries + Technologies are available as binaries only. The binaries are compiled for the TI SGX implementation. https://git.ti.com/cgit/graphics/img-pvr-sdk diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 5e2dcca73c..ff0b698345 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -# https://download.osgeo.org/libtiff/tiff-4.7.0.tar.xz.sig +# https://download.osgeo.org/libtiff/tiff-4.7.1.tar.xz.sig # with key: B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D -sha256 273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017 tiff-4.7.0.tar.xz -sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md +sha256 b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba tiff-4.7.1.tar.xz +sha256 0e27c2382d7b8147972bbb746e04059a1152c8d0fda9d03ef1399d1a433c4ade LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 5d7219d7da..32bebcf95f 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.7.0 +TIFF_VERSION = 4.7.1 TIFF_SOURCE = tiff-$(TIFF_VERSION).tar.xz TIFF_SITE = https://download.osgeo.org/libtiff TIFF_LICENSE = tiff license @@ -13,6 +13,9 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# Fixed in 4.7.0 +TIFF_IGNORE_CVES += CVE-2025-8851 + # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ diff --git a/package/tig/tig.hash b/package/tig/tig.hash index b5aebb9c5d..e234a329be 100644 --- a/package/tig/tig.hash +++ b/package/tig/tig.hash @@ -1,6 +1,6 @@ # From: -# https://github.com/jonas/tig/releases/download/tig-2.5.10/tig-2.5.10.tar.gz.sha256 -sha256 f655cc1366fc10058a2bd505bb88ca78e653ff7526c1b81774c44b9d841210e3 tig-2.5.10.tar.gz +# https://github.com/jonas/tig/releases/download/tig-2.6.0/tig-2.6.0.tar.gz.sha256 +sha256 99d4a0fdd3d93547ebacfe511195cb92e4f75b91644c06293c067f401addeb3e tig-2.6.0.tar.gz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/tig/tig.mk b/package/tig/tig.mk index d3aa6df62a..b6a7ddf9de 100644 --- a/package/tig/tig.mk +++ b/package/tig/tig.mk @@ -4,12 +4,12 @@ # ################################################################################ -TIG_VERSION = 2.5.10 +TIG_VERSION = 2.6.0 TIG_SITE = https://github.com/jonas/tig/releases/download/tig-$(TIG_VERSION) TIG_LICENSE = GPL-2.0+ TIG_LICENSE_FILES = COPYING -TIG_DEPENDENCIES = ncurses +TIG_DEPENDENCIES = host-pkgconf ncurses ifeq ($(BR2_PACKAGE_LIBICONV),y) TIG_DEPENDENCIES += libiconv diff --git a/package/time/0001-time-fix-sighandler-prototype-for-C23.patch b/package/time/0001-time-fix-sighandler-prototype-for-C23.patch new file mode 100644 index 0000000000..8d4e1d7033 --- /dev/null +++ b/package/time/0001-time-fix-sighandler-prototype-for-C23.patch @@ -0,0 +1,35 @@ +From 218cd7ce34b6dbc86c80f1c781639ea7661d1252 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Thu, 2 Oct 2025 19:30:12 +0200 +Subject: [PATCH] time: fix sighandler prototype for C23 + +In C23 functions with empty argument list in the prototype are treated +as taking no arguments. This means that the `int` argument of the +sighandler must be specified explicitly or the code will fail to +compile due to mismatched function type. + +Signed-off-by: Marcin Serwin + +Upstream: https://lists.gnu.org/archive/html/bug-time/2025-10/msg00000.html + +Signed-off-by: Bernd Kuhls +--- + src/time.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/time.c b/src/time.c +index 7b401bc..88287dd 100644 +--- a/src/time.c ++++ b/src/time.c +@@ -77,7 +77,7 @@ enum + + + /* A Pointer to a signal handler. */ +-typedef RETSIGTYPE (*sighandler) (); ++typedef RETSIGTYPE (*sighandler) (int); + + /* msec = milliseconds = 1/1,000 (1*10e-3) second. + usec = microseconds = 1/1,000,000 (1*10e-6) second. */ +-- +2.47.3 + diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 08d981661e..75396c9164 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b2fcc29e9975b88c5323aefb062346326694c391d52af46186f5a5ad09136d47 timescaledb-2.17.2.tar.gz +sha256 09496504e78a9896eaf7689929f4fa0ab40dde90d202259aa4dcf6ec32fe528f timescaledb-2.21.4.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index c9dda67282..234420c105 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.17.2 +TIMESCALEDB_VERSION = 2.21.4 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE @@ -23,6 +23,7 @@ TIMESCALEDB_CONF_OPTS = \ -DPG_PKGLIBDIR=lib/postgresql \ -DPG_SHAREDIR=share/postgresql \ -DPG_BINDIR=bin \ + -DPG_PATH="$(STAGING_DIR)/usr" \ -DPG_CPPFLAGS="$(TARGET_CPPFLAGS) " \ -DPG_CFLAGS="$(TARGET_CFLAGS) " \ -DPG_LDFLAGS="$(TARGET_LDFLAGS) " \ diff --git a/package/tini/0001-support-posix-basename-from-musl-libc.patch b/package/tini/0001-support-posix-basename-from-musl-libc.patch new file mode 100644 index 0000000000..17445d5b3b --- /dev/null +++ b/package/tini/0001-support-posix-basename-from-musl-libc.patch @@ -0,0 +1,76 @@ +From 924c4bd6028457188942ecbfdc75e6a343fa9395 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sun, 14 Apr 2024 15:33:51 +0200 +Subject: [PATCH] Support POSIX basename() from musl libc + +Musl libc 1.2.5 removed the definition of the basename() function from +string.h and only provides it in libgen.h as the POSIX standard +defines it. + +This change fixes compilation with musl libc 1.2.5. +```` +build_dir/target-mips_24kc_musl/tini-0.19.0/src/tini.c:227:36: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration] + 227 | fprintf(file, "%s (%s)\n", basename(name), TINI_VERSION_STRING); +build_dir/target-mips_24kc_musl/tini-0.19.0/src/tini.c:227:25: error: format '%s' expects argument of type 'char *', but argument 3 has type 'int' [-Werror=format=] + 227 | fprintf(file, "%s (%s)\n", basename(name), TINI_VERSION_STRING); + | ~^ ~~~~~~~~~~~~~~ + | | | + | char * int + | %d + +```` + +basename() modifies the input string, copy it first with strdup(), If +strdup() returns NULL the code will handle it. + +Signed-off-by: Hauke Mehrtens +Upstream: https://github.com/krallin/tini/commit/924c4bd6028457188942ecbfdc75e6a343fa9395 +Signed-off-by: Thomas Perale +--- + src/tini.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/src/tini.c b/src/tini.c +index 7914d3a..41d1506 100644 +--- a/src/tini.c ++++ b/src/tini.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #include "tiniConfig.h" + #include "tiniLicense.h" +@@ -224,14 +225,19 @@ int spawn(const signal_configuration_t* const sigconf_ptr, char* const argv[], i + } + + void print_usage(char* const name, FILE* const file) { +- fprintf(file, "%s (%s)\n", basename(name), TINI_VERSION_STRING); ++ char *dirc, *bname; ++ ++ dirc = strdup(name); ++ bname = basename(dirc); ++ ++ fprintf(file, "%s (%s)\n", bname, TINI_VERSION_STRING); + + #if TINI_MINIMAL +- fprintf(file, "Usage: %s PROGRAM [ARGS] | --version\n\n", basename(name)); ++ fprintf(file, "Usage: %s PROGRAM [ARGS] | --version\n\n", bname); + #else +- fprintf(file, "Usage: %s [OPTIONS] PROGRAM -- [ARGS] | --version\n\n", basename(name)); ++ fprintf(file, "Usage: %s [OPTIONS] PROGRAM -- [ARGS] | --version\n\n", bname); + #endif +- fprintf(file, "Execute a program under the supervision of a valid init process (%s)\n\n", basename(name)); ++ fprintf(file, "Execute a program under the supervision of a valid init process (%s)\n\n", bname); + + fprintf(file, "Command line options:\n\n"); + +@@ -261,6 +267,7 @@ void print_usage(char* const name, FILE* const file) { + fprintf(file, " %s: Send signals to the child's process group.\n", KILL_PROCESS_GROUP_GROUP_ENV_VAR); + + fprintf(file, "\n"); ++ free(dirc); + } + + void print_license(FILE* const file) { diff --git a/package/tini/tini.mk b/package/tini/tini.mk index 83e86237d4..c195c69023 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -31,8 +31,6 @@ endef define TINI_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini - mkdir -p $(TARGET_DIR)/usr/libexec/docker - ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init endef # Tini's CMakeLists.txt is not suitable for Buildroot. diff --git a/package/tinifier/tinifier.hash b/package/tinifier/tinifier.hash index c43e77b88f..f22203cac6 100644 --- a/package/tinifier/tinifier.hash +++ b/package/tinifier/tinifier.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a56fd648cdc86f82837fedfd3e1a9ecc5750f15be24630ea1533d64fc6d1c2bb tinifier-3.4.0-go2.tar.gz +sha256 42e5ad67a1533c009f655d8c66dbdbf5e6fe3b9934293586534b55143d1a542e tinifier-4.1.0-go2.tar.gz sha256 18f524914c0df04e21289c3d9ca3e27c10abe5869cc4e4d4790a1b2c56df282c LICENSE diff --git a/package/tinifier/tinifier.mk b/package/tinifier/tinifier.mk index d7ed6f7c93..d837b5da00 100644 --- a/package/tinifier/tinifier.mk +++ b/package/tinifier/tinifier.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINIFIER_VERSION = 3.4.0 +TINIFIER_VERSION = 4.1.0 TINIFIER_SITE = $(call github,tarampampam,tinifier,v$(TINIFIER_VERSION)) TINIFIER_LICENSE = MIT TINIFIER_LICENSE_FILES = LICENSE diff --git a/package/tinycbor/0001-Fix-build-with-GCC-11-fallthrough-is-supported-but-n.patch b/package/tinycbor/0001-Fix-build-with-GCC-11-fallthrough-is-supported-but-n.patch new file mode 100644 index 0000000000..e54e8db6e2 --- /dev/null +++ b/package/tinycbor/0001-Fix-build-with-GCC-11-fallthrough-is-supported-but-n.patch @@ -0,0 +1,55 @@ +From 45e4641059709862b4e46f3608d140337566334b Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Wed, 2 Apr 2025 08:39:04 -0700 +Subject: [PATCH] Fix build with GCC < 11: [[fallthrough]] is supported but not + allowed in C + +I think GCC says `__has_cpp_attribute(fallthrough)` is true because C++ +supports it (it means "has C++ attribute"), but that doesn't apply to +the C language. This causes a compilation error: + +``` +compilersupport_p.h:57:41: error: expected expression before '[' token + 57 | # define CBOR_FALLTHROUGH [[fallthrough]] + | ^ +cborparser.c:225:13: note: in expansion of macro 'CBOR_FALLTHROUGH' + 225 | CBOR_FALLTHROUGH; + | ^~~~~~~~~~~~~~~~ +``` + +Instead, we should use the C23 `__has_c_attribute` to detect the C +attribute. + +Fixes #293. + +Signed-off-by: Thiago Macieira + +Upstream: https://github.com/intel/tinycbor/commit/45e4641059709862b4e46f3608d140337566334b +Signed-off-by: Florian Larysch +--- + src/compilersupport_p.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/compilersupport_p.h b/src/compilersupport_p.h +index c91ea93..9251799 100644 +--- a/src/compilersupport_p.h ++++ b/src/compilersupport_p.h +@@ -52,10 +52,14 @@ + # define cbor_static_assert(x) ((void)sizeof(char[2*!!(x) - 1])) + #endif + +-#if defined(__has_cpp_attribute) // C23 and C++17 ++#if defined(__has_cpp_attribute) && defined(__cplusplus) // C++17 + # if __has_cpp_attribute(fallthrough) + # define CBOR_FALLTHROUGH [[fallthrough]] + # endif ++#elif defined(__has_c_attribute) && !defined(__cplusplus) // C23 ++# if __has_c_attribute(fallthrough) ++# define CBOR_FALLTHROUGH [[fallthrough]] ++# endif + #endif + #ifndef CBOR_FALLTHROUGH + # ifdef __GNUC__ +-- +2.50.1 + diff --git a/package/tinycbor/0002-fix-build-on-i386-without-SSE2.patch b/package/tinycbor/0002-fix-build-on-i386-without-SSE2.patch new file mode 100644 index 0000000000..45611e6f23 --- /dev/null +++ b/package/tinycbor/0002-fix-build-on-i386-without-SSE2.patch @@ -0,0 +1,59 @@ +From 48a22bddfcc67b3a433ded695f906cc314a0bd5f Mon Sep 17 00:00:00 2001 +From: Florian Larysch +Date: Sun, 17 Aug 2025 00:20:57 +0200 +Subject: [PATCH] fix build on i386 without SSE2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 3cba6b1 ("Use _Float16 for half conversions if available") added +support for using half-width float support in the compiler to perform +encoding operations, using the FLT16_MANT_DIG macro to check for +support on the given target. + +However, on x86 GCC only supports this when SSE2 is enabled[1]. Unlike +clang and the other architectures where support for this is conditional, +GCC *does* define those macros even without SSE2 support, causing a +build failure: + + In file included from cborencoder_float.c:29: + cborinternal_p.h: In function ‘encode_half’: + cborinternal_p.h:56:5: error: invalid conversion to type ‘_Float16’ without option ‘-msse2’ + 56 | _Float16 f = (_Float16)x; + | ^~~~~~~~ + cborinternal_p.h: In function ‘decode_half’: + cborinternal_p.h:65:5: error: invalid conversion from type ‘_Float16’ without option ‘-msse2’ + 65 | return (float)f; + | + +Work around this by additionally checking for this specific condition. + +[1] https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html + +Upstream: https://github.com/intel/tinycbor/commit/48a22bddfcc67b3a433ded695f906cc314a0bd5f +Signed-off-by: Florian Larysch +--- + src/cborinternal_p.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/cborinternal_p.h b/src/cborinternal_p.h +index 19273ac..ee9c117 100644 +--- a/src/cborinternal_p.h ++++ b/src/cborinternal_p.h +@@ -48,8 +48,12 @@ + /* Check for FLT16_MANT_DIG using integer comparison. Clang headers incorrectly + * define this macro unconditionally when __STDC_WANT_IEC_60559_TYPES_EXT__ + * is defined (regardless of actual support for _Float16). ++ * ++ * GCC defines these macros but doesn't support arithmetic including ++ * conversions on x86 without SSE2. + */ +-# if FLT16_MANT_DIG > 0 || __FLT16_MANT_DIG__ > 0 ++# if (FLT16_MANT_DIG > 0 || __FLT16_MANT_DIG__ > 0) && \ ++ !(defined(__i386__) && !defined(__SSE2__)) + static inline unsigned short encode_half(float x) + { + unsigned short h; +-- +2.50.1 + diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index 0e616d1e9f..dd63822908 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 512e2c9fce74f60ef9ed3af59161e905f9e19f30a52e433fc55f39f4c70d27e4 tinycbor-0.6.0.tar.gz +sha256 0f9944496d1143935e9c996bc6233ca0dd5451299def33ef400a409942f8f34b tinycbor-0.6.1.tar.gz sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index d2fb583e67..03067edbd7 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCBOR_VERSION = 0.6.0 +TINYCBOR_VERSION = 0.6.1 TINYCBOR_SITE = $(call github,intel,tinycbor,v$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE diff --git a/package/tinycompress/tinycompress.hash b/package/tinycompress/tinycompress.hash index f86b75f346..1a2b2c0203 100644 --- a/package/tinycompress/tinycompress.hash +++ b/package/tinycompress/tinycompress.hash @@ -1,5 +1,7 @@ # Locally calculated after checking pgp signature -sha256 ebbe788c28328e7cca245aaf9194a5ad0dc91e9e0dc883c2cf9feb6d42c9f3fc tinycompress-1.2.11.tar.bz2 +# from https://www.alsa-project.org/files/pub/tinycompress/tinycompress-1.2.13.tar.bz2.sig +# with key F04DF50737AC1A884C4B3D718380596DA6E59C91 +sha256 0efe6cbd7bff31983e0d416df0436767665cc4cd70d278c06ce0e83e0eeab5db tinycompress-1.2.13.tar.bz2 # Locally calculated sha256 912ea37a4435594a3b3c35f04efa4b5b7af2e68a05f5319c16c881711a31e4b7 COPYING diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index fabd5884b2..b5764ea293 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCOMPRESS_VERSION = 1.2.11 +TINYCOMPRESS_VERSION = 1.2.13 TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 diff --git a/package/tinyssh/0001-packet_put-Add-missing-bug.h-include-for-global_die-.patch b/package/tinyssh/0001-packet_put-Add-missing-bug.h-include-for-global_die-.patch new file mode 100644 index 0000000000..99649d4690 --- /dev/null +++ b/package/tinyssh/0001-packet_put-Add-missing-bug.h-include-for-global_die-.patch @@ -0,0 +1,33 @@ +From f863e60d93006019855a0431ea5cd71c8f1fc173 Mon Sep 17 00:00:00 2001 +From: Haelwenn Monnier +Date: Tue, 9 Jan 2024 20:15:29 +0100 +Subject: [PATCH] packet_put: Add missing bug.h include for global_die (#84) + +``` +packet_put.c:53:9: error: call to undeclared function 'global_die'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + global_die(111); + ^ +1 error generated. +``` + +Upstream: https://github.com/janmojzis/tinyssh/commit/f863e60d93006019855a0431ea5cd71c8f1fc173 +Signed-off-by: Florian Larysch +--- + tinyssh/packet_put.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tinyssh/packet_put.c b/tinyssh/packet_put.c +index 17e8d84..7f46ff6 100644 +--- a/tinyssh/packet_put.c ++++ b/tinyssh/packet_put.c +@@ -6,6 +6,7 @@ Public domain. + + #include "uint32_pack_big.h" + #include "buf.h" ++#include "bug.h" + #include "sshcrypto.h" + #include "ssh.h" + #include "log.h" +-- +2.50.1 + diff --git a/package/tinyxml/0002-Avoid-reachable-assertion-via-crafted-XML-document.patch b/package/tinyxml/0002-Avoid-reachable-assertion-via-crafted-XML-document.patch new file mode 100644 index 0000000000..802d964e15 --- /dev/null +++ b/package/tinyxml/0002-Avoid-reachable-assertion-via-crafted-XML-document.patch @@ -0,0 +1,33 @@ +From: Guilhem Moulin +Date: Sat, 30 Dec 2023 14:15:54 +0100 +Subject: Avoid reachable assertion via crafted XML document with a '\0' + located after whitespace + +Upstream: https://salsa.debian.org/debian/tinyxml/-/raw/2366e1f23d059d4c20c43c54176b6bd78d6a83fc/debian/patches/CVE-2023-34194.patch + +CVE: CVE-2023-34194 + +Bug: https://www.forescout.com/resources/sierra21-vulnerabilities +Bug-Debian: https://bugs.debian.org/1059315 +Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2023-34194 +Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2023-40462 +Signed-off-by: Titouan Christophe +--- + tinyxmlparser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tinyxmlparser.cpp b/src/tinyxmlparser.cpp +index 8aa0dfa..1601962 100644 +--- a/src/tinyxmlparser.cpp ++++ b/src/tinyxmlparser.cpp +@@ -1606,6 +1606,10 @@ const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXm + } + + p = SkipWhiteSpace( p, _encoding ); ++ if ( !p || !*p ) ++ { ++ break; ++ } + if ( StringEqual( p, "version", true, _encoding ) ) + { + TiXmlAttribute attrib; diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 01c25f7c1c..2f57b8a4f1 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,9 +12,12 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VALID = YES +TINYXML_CPE_ID_VERSION = $(firstword $(subst _,$(space),$(TINYXML_VERSION))) # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 +# 0002-Avoid-reachable-assertion-via-crafted-XML-document.patch +TINYXML_IGNORE_CVES += CVE-2023-34194 + $(eval $(autotools-package)) diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash index a131b8624d..6efe202b52 100644 --- a/package/tinyxml2/tinyxml2.hash +++ b/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3bdf15128ba16686e69bce256cc468e76c7b94ff2c7f391cc5ec09e40bff3839 tinyxml2-10.0.0.tar.gz +sha256 5556deb5081fb246ee92afae73efd943c889cef0cafea92b0b82422d6a18f289 tinyxml2-11.0.0.tar.gz sha256 9332252e9b9e46db8285d4a3f0bf25f139bf1dca6781b956d57f2302efca6432 LICENSE.txt diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 044b8f82db..ab04091753 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYXML2_VERSION = 10.0.0 +TINYXML2_VERSION = 11.0.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = LICENSE.txt diff --git a/package/tipidee/tipidee.hash b/package/tipidee/tipidee.hash index ecc1ab34b4..18b2c1600f 100644 --- a/package/tipidee/tipidee.hash +++ b/package/tipidee/tipidee.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 d9e91fc719879a43d54329b99b02c6649c54e428e77bc96a0573506b52bf1422 tipidee-0.0.5.0.tar.gz +sha256 228a995683a8cd4a1de9a7cb3f8d83a43830886c687895d0a3d1c5033f90362b tipidee-0.0.5.1.tar.gz sha256 8feb7933c6e6506a7f20fbfc03fd37df3caff4becdf3b7a0ffad5016277e441e COPYING diff --git a/package/tipidee/tipidee.mk b/package/tipidee/tipidee.mk index 8ae18edd8d..035ff50b18 100644 --- a/package/tipidee/tipidee.mk +++ b/package/tipidee/tipidee.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIPIDEE_VERSION = 0.0.5.0 +TIPIDEE_VERSION = 0.0.5.1 TIPIDEE_SITE = https://skarnet.org/software/tipidee TIPIDEE_LICENSE = ISC TIPIDEE_LICENSE_FILES = COPYING @@ -13,7 +13,7 @@ TIPIDEE_DEPENDENCIES = skalibs TIPIDEE_CONF_OPTS = \ --prefix=/usr \ --sysconfdir=/etc \ - --with-sysdeps=$(STAGING_DIR)/lib/skalibs/sysdeps \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ --with-include=$(STAGING_DIR)/include \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ diff --git a/package/tmux/0001-Cast-to-avoid-warnings-on-32-bit-architectures.-GitH.patch b/package/tmux/0001-Cast-to-avoid-warnings-on-32-bit-architectures.-GitH.patch new file mode 100644 index 0000000000..e9cd9d5acc --- /dev/null +++ b/package/tmux/0001-Cast-to-avoid-warnings-on-32-bit-architectures.-GitH.patch @@ -0,0 +1,28 @@ +From f812b8d30456c071ee23e9a02d6ce16036fd3f68 Mon Sep 17 00:00:00 2001 +From: Nicholas Marriott +Date: Wed, 29 Oct 2025 08:47:45 +0000 +Subject: [PATCH] Cast to avoid warnings on 32-bit architectures. GitHub issue + 4597. + +Upstream: https://github.com/tmux/tmux/commit/f812b8d30456c071ee23e9a02d6ce16036fd3f68 +Signed-off-by: Giulio Benetti +--- + compat/utf8proc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compat/utf8proc.c b/compat/utf8proc.c +index dd4ab27f..147da696 100644 +--- a/compat/utf8proc.c ++++ b/compat/utf8proc.c +@@ -48,7 +48,7 @@ utf8proc_mbtowc(wchar_t *pwc, const char *s, size_t n) + * *pwc == -1 indicates invalid codepoint + * slen < 0 indicates an error + */ +- slen = utf8proc_iterate(s, n, pwc); ++ slen = utf8proc_iterate(s, n, (utf8proc_int32_t*)pwc); + if (*pwc == (wchar_t)-1 || slen < 0) + return (-1); + return (slen); +-- +2.47.3 + diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index b5c0fe58d0..c4eb508d78 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz +sha256 16216bd0877170dfcc64157085ba9013610b12b082548c7c9542cc0103198951 tmux-3.5a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 533a82bbad..4cceeabfc5 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,12 +4,19 @@ # ################################################################################ -TMUX_VERSION = 3.3a +TMUX_VERSION = 3.5a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VALID = YES -TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +TMUX_DEPENDENCIES = host-bison libevent ncurses host-pkgconf + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +TMUX_DEPENDENCIES += jemalloc +TMUX_CONF_OPTS += --enable-jemalloc +else +TMUX_CONF_OPTS += --disable-jemalloc +endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) TMUX_DEPENDENCIES += systemd diff --git a/package/tor/tor.hash b/package/tor/tor.hash index eb0ab728d2..ea15ddefe6 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.13.tar.gz.sha256sum -sha256 9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28 tor-0.4.8.13.tar.gz +# From https://dist.torproject.org/tor-0.4.8.21.tar.gz.sha256sum +sha256 eaf6f5b73091b95576945eade98816ddff7cd005befe4d94718a6f766b840903 tor-0.4.8.21.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 042ed75a7b..746eacd581 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.13 +TOR_VERSION = 0.4.8.21 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE diff --git a/package/tpm2-abrmd/S80tpm2-abrmd b/package/tpm2-abrmd/S80tpm2-abrmd index 6a0bef0a31..3917a698e8 100644 --- a/package/tpm2-abrmd/S80tpm2-abrmd +++ b/package/tpm2-abrmd/S80tpm2-abrmd @@ -1,74 +1,69 @@ #!/bin/sh -my_name="$0" +DAEMON="tpm2-abrmd" +PIDFILE="/var/run/$DAEMON.pid" -check_required_files() { - [ -f "$1" ] || { - echo "$my_name: $1 is missing" - exit 1 - } -} +TABRMD_ARGS="--tcti=device --logger=syslog --max-connections=20" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" check_device() { - ls -1 /dev/tpm[0-9]* > /dev/null 2>&1 || { - echo "device driver not loaded, skipping." + if ! ls /dev/tpm[0-9]* > /dev/null 2>&1; then + echo "no TPM device found, skipping." exit 0 - } - chown tss:tss /dev/tpm[0-9]* && chmod 600 /dev/tpm* -} - -rm_stale_pidfile() { - if [ -e "$1" ]; then - exe="/proc/$(cat "$1")/exe" - { [ -s "$exe" ] && [ "$(readlink -f "$exe")" = "$2" ]; } || rm -f "$1" + fi + if [ ! -x /sbin/udevd ]; then + chown tss:tss /dev/tpm[0-9]* && chmod 660 /dev/tpm* fi } start() { - printf "Starting tpm2-abrmd: " + printf 'Starting %s: ' "$DAEMON" check_device - rm_stale_pidfile /var/run/tpm2-abrmd.pid /usr/sbin/tpm2-abrmd - start-stop-daemon -S -q -o -b -m -p /var/run/tpm2-abrmd.pid -c tss:tss -x /usr/sbin/tpm2-abrmd -- ${DAEMON_OPTS} || { + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon --start --background --chuid tss:tss --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" \ + -- ${TABRMD_ARGS} + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else echo "FAIL" - exit 1 - } - pidof /usr/sbin/tpm2-abrmd > /var/run/tpm2-abrmd.pid - echo "OK" + fi + return "$status" } stop() { - printf "Stopping tpm2-abrmd: " - start-stop-daemon -K -q -o -p /var/run/tpm2-abrmd.pid -u tss -x /usr/sbin/tpm2-abrmd || { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else echo "FAIL" - exit 1 - } - rm_stale_pidfile /var/run/tpm2-abrmd.pid /usr/sbin/tpm2-abrmd - echo "OK" + return "$status" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" } -check_required_files /etc/dbus-1/system.d/tpm2-abrmd.conf - -# defaults -DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20" - -# Read configuration variable file if it is present -[ -r /etc/default/tpm2-abrmd ] && . /etc/default/tpm2-abrmd +restart() { + stop + start +} case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - sleep 1 - start - ;; + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; *) echo "Usage: tpm2-abrmd {start|stop|restart|reload}" >&2 exit 1 esac - -exit 0 diff --git a/package/tpm2-abrmd/tpm2-abrmd.hash b/package/tpm2-abrmd/tpm2-abrmd.hash index 1c6e739056..cb5d9314f0 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.hash +++ b/package/tpm2-abrmd/tpm2-abrmd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1e587808c6739079d59f124d9c1a0058f8d34dd84f1f656c946667fa0a181c48 tpm2-abrmd-2.3.3.tar.gz +sha256 d59aff34164aa705b05155b86607f6b66918a433104f754a3fcf76216dd9f465 tpm2-abrmd-3.0.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index 0e62cb176a..a4e7645374 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_ABRMD_VERSION = 2.3.3 +TPM2_ABRMD_VERSION = 3.0.0 TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION) TPM2_ABRMD_LICENSE = BSD-2-Clause TPM2_ABRMD_LICENSE_FILES = LICENSE @@ -14,7 +14,8 @@ TPM2_ABRMD_DEPENDENCIES = libglib2 tpm2-tss host-pkgconf TPM2_ABRMD_CONF_OPTS = \ --disable-defaultflags \ --with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \ - --with-udevrulesdir=$(if $(BR2_PACKAGE_HAS_UDEV),/usr/lib/udev/rules.d,no) + --with-udevrulesdir=$(if $(BR2_PACKAGE_HAS_UDEV),/usr/lib/udev/rules.d,no) \ + --with-dbuspolicydir=/usr/share/dbus-1/system.d # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used TPM2_ABRMD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.hash b/package/tpm2-pkcs11/tpm2-pkcs11.hash index 797955a69b..5f5abfbbe8 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.hash +++ b/package/tpm2-pkcs11/tpm2-pkcs11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 35bf06c30cfa76fc0eba2c5f503cf7dd0d34a66afb2d292fee896b90362f633b tpm2-pkcs11-1.9.0.tar.gz +sha256 ce24aa5ec2471545576e892b6f64fd873a424371bbf9be4ca3a0e689ea11c9b7 tpm2-pkcs11-1.9.1.tar.gz sha256 793aa007f793458434d7cc60b1c827053a399308658b32fcaa6023802adc22e1 LICENSE diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.mk b/package/tpm2-pkcs11/tpm2-pkcs11.mk index c6218d772e..b26f53de27 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.mk +++ b/package/tpm2-pkcs11/tpm2-pkcs11.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_PKCS11_VERSION = 1.9.0 +TPM2_PKCS11_VERSION = 1.9.1 TPM2_PKCS11_SITE = https://github.com/tpm2-software/tpm2-pkcs11/releases/download/$(TPM2_PKCS11_VERSION) TPM2_PKCS11_LICENSE = BSD-2-Clause TPM2_PKCS11_LICENSE_FILES = LICENSE diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 857987ae36..d87c1e0d8d 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -39,6 +39,8 @@ config BR2_PACKAGE_TPM2_TSS_FAPI depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help This option allows to enable Feature API (FAPI). Feature API (FAPI) as described in the "TSS 2.0 Feature API diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index c9fa4e6ae0..891c1285b0 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ba9e52117f254f357ff502e7d60fce652b3bfb26327d236bbf5ab634235e40f1 tpm2-tss-3.2.2.tar.gz +sha256 37f1580200ab78305d1fc872d89241aaee0c93cbe85bc559bf332737a60d3be8 tpm2-tss-4.1.3.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index b76d16e71e..08ff401328 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.2.2 +TPM2_TSS_VERSION = 4.1.3 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE @@ -13,11 +13,8 @@ TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = openssl host-pkgconf -# 0001-configure-Only-use-CXX-when-fuzzing.patch -TPM2_TSS_AUTORECONF = YES - # systemd-sysusers and systemd-tmpfiles are only used at install time -# to trigger the creation of users adn tmpfiles, which we do not care +# to trigger the creation of users and tmpfiles, which we do not care # about at build time. groupadd, useradd, and setfacl are used in the # fallback path when systemd-sysusers or systemd-tmpfiles are missing # and their failure is ignored anyway. @@ -36,10 +33,10 @@ TPM2_TSS_CONF_OPTS = \ TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" ifeq ($(BR2_PACKAGE_TPM2_TSS_FAPI),y) -TPM2_TSS_DEPENDENCIES += json-c libcurl +TPM2_TSS_DEPENDENCIES += json-c libcurl util-linux TPM2_TSS_CONF_OPTS += --enable-fapi else -TPM2_TSS_CONF_OPTS += --disable-fapi +TPM2_TSS_CONF_OPTS += --disable-fapi --disable-policy endif define TPM2_TSS_USERS diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index c1b52a5195..fa61654fd5 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 2efe103389367e93c764c4a788880ba51018a65dec21b0411965a5f06a6338c1 trace-cmd-v3.3.1.tar.gz +sha256 8ed41f61010998e4a1ba54778f9077ee7afb5311d38dca9781d7a397dd70c9d4 trace-cmd-v3.3.3.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index cf16ddcb17..a1b17289cd 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 3.3.1 +TRACE_CMD_VERSION = 3.3.3 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot diff --git a/package/traceroute/traceroute.hash b/package/traceroute/traceroute.hash index cf2eb127a2..5619338848 100644 --- a/package/traceroute/traceroute.hash +++ b/package/traceroute/traceroute.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 05ebc7aba28a9100f9bbae54ceecbf75c82ccf46bdfce8b5d64806459a7e0412 traceroute-2.1.3.tar.gz +sha256 9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e traceroute-2.1.6.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/traceroute/traceroute.mk b/package/traceroute/traceroute.mk index 133f8d3c3e..bd246e5f9e 100644 --- a/package/traceroute/traceroute.mk +++ b/package/traceroute/traceroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACEROUTE_VERSION = 2.1.3 +TRACEROUTE_VERSION = 2.1.6 TRACEROUTE_SITE = http://downloads.sourceforge.net/traceroute/traceroute/traceroute-$(TRACEROUTE_VERSION) TRACEROUTE_LICENSE = GPL-2.0+, LGPL-2.1+ diff --git a/package/transmission/0001-bump-miniupnpc-to-2.2.8.patch b/package/transmission/0001-bump-miniupnpc-to-2.2.8.patch new file mode 100644 index 0000000000..f8fab5024f --- /dev/null +++ b/package/transmission/0001-bump-miniupnpc-to-2.2.8.patch @@ -0,0 +1,39 @@ +From febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C5=93ur?= +Date: Sat, 15 Jun 2024 07:24:06 +0800 +Subject: [PATCH] bump miniupnpc to 2.2.8 (#6907) + +* bump miniupnpc to 2.2.8 + +* Avoid build error "ln: include/miniupnpc/.: Operation not permitted" + +Upstream: https://github.com/transmission/transmission/commit/febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8 + +[Bernd: rebased for version 4.0.6] +Signed-off-by: Bernd Kuhls +--- + Transmission.xcodeproj/project.pbxproj | 2 +- + libtransmission/port-forwarding-upnp.cc | 9 +++++++-- + third-party/miniupnp | 2 +- + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc +index 6d7bbc7f7c2..a4146e0df13 100644 +--- a/libtransmission/port-forwarding-upnp.cc ++++ b/libtransmission/port-forwarding-upnp.cc +@@ -261,8 +261,13 @@ tr_port_forwarding_state tr_upnpPulse( + + FreeUPNPUrls(&handle->urls); + auto lanaddr = std::array{}; +- if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) == +- UPNP_IGD_VALID_CONNECTED) ++ if ( ++#if (MINIUPNPC_API_VERSION >= 18) ++ UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, nullptr, 0) ++#else ++ UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) ++#endif ++ == UPNP_IGD_VALID_CONNECTED) + { + tr_logAddInfo(fmt::format(_("Found Internet Gateway Device '{url}'"), fmt::arg("url", handle->urls.controlURL))); + tr_logAddInfo(fmt::format(_("Local Address is '{address}'"), fmt::arg("address", lanaddr.data()))); diff --git a/package/transmission/Config.in b/package/transmission/Config.in index eeaa7890fb..e767723eef 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -37,7 +37,6 @@ config BR2_PACKAGE_TRANSMISSION_DAEMON config BR2_PACKAGE_TRANSMISSION_GTK bool "transmission-gtk" - depends on !BR2_nios2 # gtkmm3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz -> gtkmm3 depends on BR2_PACKAGE_LIBGTK3 && BR2_SYSTEM_ENABLE_NLS select BR2_PACKAGE_GTKMM3 @@ -45,7 +44,6 @@ config BR2_PACKAGE_TRANSMISSION_GTK Install transmission GTK-based GUI interface. comment "transmission-gtk needs libgtk3 and a toolchain with NLS enabled" - depends on !BR2_nios2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGTK3 && !BR2_SYSTEM_ENABLE_NLS endif diff --git a/package/transmission/S92transmission b/package/transmission/S92transmission index 85ff40ec16..1c24c16d98 100644 --- a/package/transmission/S92transmission +++ b/package/transmission/S92transmission @@ -16,11 +16,11 @@ # http://trac.transmissionbt.com/wiki/ConfigFiles # For a guide on how set the preferences, visit: # http://trac.transmissionbt.com/wiki/EditConfigFiles -# For the available environement variables, visit: +# For the available environment variables, visit: # http://trac.transmissionbt.com/wiki/EnvironmentVariables # # The name of the user that should run Transmission. -# It's RECOMENDED to run Transmission in it's own user, +# It's RECOMMENDED to run Transmission in it's own user, # by default, this is set to 'transmission'. # For the sake of security you shouldn't set a password # on this user diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 9ef48b1e77..16ada077f3 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5 tree-2.1.1.tgz +sha256 68ac45dc78c0c311ada06200ffc3c285e74223ba208061f8d15ffac25e44b2ec tree-2.2.1.tgz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 479a172a72..4b48f4cf48 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 2.1.1 +TREE_VERSION = 2.2.1 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://oldmanprogrammer.net/tar/tree TREE_LICENSE = GPL-2.0+ diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 6fe35633aa..79c6962d7c 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 -sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz +# https://github.com/libts/tslib/releases/download/1.24/tslib-1.24.tar.xz.sha256 +sha256 58d9941ffaa269c399f00d0d308184c96087f7acf69aa8e3c6645e852f993ba2 tslib-1.24.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index e8eb3beeaf..6138503f40 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.23 +TSLIB_VERSION = 1.24 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) diff --git a/package/tstools/0002-fix-build-with-gcc-15.patch b/package/tstools/0002-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..193bad43b8 --- /dev/null +++ b/package/tstools/0002-fix-build-with-gcc-15.patch @@ -0,0 +1,27 @@ +From a1f2a71b286135d89865bb0332cbe3db59cea300 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 9 Dec 2024 16:57:53 +1100 +Subject: [PATCH] fix build with gcc-15 + +Upstream: https://github.com/kynesim/tstools/pull/44 +Signed-off-by: Peter Korsgaard +--- + tsserve.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tsserve.c b/tsserve.c +index d81042e..253ba0c 100644 +--- a/tsserve.c ++++ b/tsserve.c +@@ -2958,7 +2958,7 @@ static void set_child_exit_handler(); + /* + * Signal handler - catch children and stop them becoming zombies + */ +-static void on_child_exit() ++static void on_child_exit(int signum) + { + #if 0 + print_msg("sighandler: starting\n"); +-- +2.39.5 + diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 3f86b3ff3b..9dc5dd8b6a 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f31cf06dcc40313e9b77331827201e74ed75c4d18156394581ca1a4ae55aa888 tvheadend-26ec161fb3c903f8b0d0be8b54d1b67c596fb829.tar.gz -sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md +sha256 8ad851b39afaa1bab121c00a1fcaff641e3640d2c4743a1ca7800d2f403fcf52 tvheadend-0b23983f5dafff006ee83908915193c49deacca5.tar.gz +sha256 0420f5d2e0df002e31320d9f58fc5454cbb8f53fa0ab1fc85afb8821c6b103e3 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 812ab4e9ab..7d83c31e5f 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 26ec161fb3c903f8b0d0be8b54d1b67c596fb829 +TVHEADEND_VERSION = 0b23983f5dafff006ee83908915193c49deacca5 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index d353bc4410..a1629066ce 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html -sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz +# https://lists.iana.org/hyperkitty/list/tz-announce@iana.org/thread/6JVHNHLB6I2WAYTQ75L6KEPEQHFXAJK3/ +sha512 7d83741f3cae81fac8131994b43c55b6da7328df18b706e5ee40e9b3212bc506e6f8fc90988b18da424ed59eff69bce593f2783b7b5f18eb483a17aeb94258d6 tzdata2025b.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index e367205277..32607268d8 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2024a +TZDATA_VERSION = 2025b TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 9a274bf394..26b73ef950 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 596b2fba75fedc7a410dd71583c828642ecd486dfdcfde109dfebb82a374abbe uacme-1.7.5.tar.gz +sha256 d11a86ac2a0dbf285de27dff4193c65f7f3736da3d0480049af50d305940e0d6 uacme-1.7.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index 0fcb5c5c34..fc5b97d23d 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.5 +UACME_VERSION = 1.7.6 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version @@ -13,18 +13,12 @@ UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl -# 0001-Fix-cross-compilation.patch touches configure.ac -UACME_AUTORECONF = YES - UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" ifeq ($(BR2_PACKAGE_GNUTLS),y) UACME_CONF_OPTS += --with-gnutls UACME_DEPENDENCIES += gnutls else ifeq ($(BR2_PACKAGE_MBEDTLS),y) -ifeq ($(BR2_PACKAGE_MBEDTLS_COMPRESSION),y) - UACME_LIBS += -lz -endif UACME_CONF_OPTS += --with-mbedtls UACME_DEPENDENCIES += mbedtls else ifeq ($(BR2_PACKAGE_OPENSSL),y) diff --git a/package/uboot-bootcount/uboot-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash index 7f46da22eb..da77d614a9 100644 --- a/package/uboot-bootcount/uboot-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b26b9135716afb2ea967edc2327d1d307cdd15a643bd105dc223d062e18f2dda uboot-bootcount-3.0.0.tar.gz +sha256 cd3345ac6ff1f44588ae39a8da4bc9c7993f98ece556f374f2f7af6715a9cfa7 uboot-bootcount-3.2.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk index 48a45b91aa..26d2b95bac 100644 --- a/package/uboot-bootcount/uboot-bootcount.mk +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_BOOTCOUNT_VERSION = 3.0.0 +UBOOT_BOOTCOUNT_VERSION = 3.2.0 UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING diff --git a/package/uboot-tools/0002-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch b/package/uboot-tools/0002-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch new file mode 100644 index 0000000000..502458e219 --- /dev/null +++ b/package/uboot-tools/0002-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch @@ -0,0 +1,34 @@ +From 3b89170333ef0fdfffee14751ce3e1d66d7dfa00 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 14 Sep 2021 19:08:02 +0200 +Subject: [PATCH] tools/Makefile: fix {C,LD}FLAGS with CROSS_BUILD_TOOLS + +When CROSS_BUILD_TOOLS is set, set KBUILD_HOST{CF,LD}FLAGS to +{C,LD}FLAGS otherwise CC will be used with HOST{C,LD}FLAGS which seems +wrong. + +It should be noted that, for an unknown reason, overriding +HOST{C,LD}FLAGS don't work. + +Signed-off-by: Fabrice Fontaine +--- + tools/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 4a86321f64..98bb92990d 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -316,7 +316,8 @@ subdir- += env + + ifneq ($(CROSS_BUILD_TOOLS),) + override HOSTCC = $(CC) +-override HOSTCFLAGS = $(CFLAGS) ++override KBUILD_HOSTCFLAGS = $(CFLAGS) ++override KBUILD_HOSTLDFLAGS = $(LDFLAGS) + + quiet_cmd_crosstools_strip = STRIP $^ + cmd_crosstools_strip = $(STRIP) $^; touch $@ +-- +2.33.0 + diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in index e8bbf3a16e..da6cd65252 100644 --- a/package/uboot-tools/Config.in +++ b/package/uboot-tools/Config.in @@ -68,12 +68,18 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE config BR2_PACKAGE_UBOOT_TOOLS_MKEFICAPSULE bool "mkeficapsule" + depends on !BR2_STATIC_LIBS # gnutls + depends on BR2_USE_WCHAR # gnutls + select BR2_PACKAGE_GNUTLS help Install the mkeficapsule tool on the target system The mkeficapsule tool from Das U-Boot bootloader, which allows generation of UEFI capsule binaries. +comment "mkeficapsule support needs a toolchain w/ wchar, dynamic library" + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS + config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE bool "mkenvimage" help diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 5a48926ebe..7b71e2d948 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e u-boot-2021.07.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index e9c7edb218..37ccd7b953 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2021.07 +UBOOT_TOOLS_VERSION = 2025.10 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = https://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ @@ -15,14 +15,24 @@ UBOOT_TOOLS_INSTALL_STAGING = YES # u-boot 2020.01+ needs make 4.0+ UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) -HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) +HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) host-gnutls + +# the available hash algorithms and the way to enable them are the +# same for host and target +UBOOT_TOOLS_HASH_ALGOS = CRC16 CRC32 MD5 SHA1 SHA256 SHA384 SHA512 +define UBOOT_TOOLS_ENABLE_HASH_ALGOS + $(foreach hash,$(UBOOT_TOOLS_HASH_ALGOS),\ + echo '#define CONFIG_TOOLS_$(hash) 1' >> $(@D)/include/generated/autoconf.h + ) +endef define UBOOT_TOOLS_CONFIGURE_CMDS mkdir -p $(@D)/include/config + echo "#include " > $(@D)/include/config.h touch $(@D)/include/config/auto.conf mkdir -p $(@D)/include/generated - touch $(@D)/include/generated/autoconf.h - echo $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),'#define CONFIG_FIT_PRINT 1') >> $(@D)/include/generated/autoconf.h + $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),$(UBOOT_TOOLS_ENABLE_HASH_ALGOS)) + echo $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),'#define CONFIG_FIT_SIGNATURE 1') >> $(@D)/include/generated/autoconf.h mkdir -p $(@D)/include/asm touch $(@D)/include/asm/linkage.h endef @@ -44,7 +54,8 @@ UBOOT_TOOLS_DEPENDENCIES += openssl host-pkgconf endif ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKEFICAPSULE),y) -UBOOT_TOOLS_MAKE_OPTS += CONFIG_EFI_HAVE_CAPSULE_SUPPORT=y +UBOOT_TOOLS_MAKE_OPTS += CONFIG_TOOLS_MKEFICAPSULE=y +UBOOT_TOOLS_DEPENDENCIES += gnutls endif ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN),y) @@ -109,10 +120,11 @@ endef define HOST_UBOOT_TOOLS_CONFIGURE_CMDS mkdir -p $(@D)/include/config + echo "#include " > $(@D)/include/config.h touch $(@D)/include/config/auto.conf mkdir -p $(@D)/include/generated - touch $(@D)/include/generated/autoconf.h - echo $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),'#define CONFIG_FIT_PRINT 1') >> $(@D)/include/generated/autoconf.h + $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),$(UBOOT_TOOLS_ENABLE_HASH_ALGOS)) + echo $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),'#define CONFIG_FIT_SIGNATURE 1') >> $(@D)/include/generated/autoconf.h mkdir -p $(@D)/include/asm touch $(@D)/include/asm/linkage.h endef @@ -120,7 +132,7 @@ endef HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ - CONFIG_EFI_HAVE_CAPSULE_SUPPORT=y + CONFIG_TOOLS_MKEFICAPSULE=y ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),y) HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y CONFIG_MKIMAGE_DTC_PATH=dtc @@ -220,7 +232,7 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage $(HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN) $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv - ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv + ln -sf fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef @@ -232,8 +244,8 @@ $(eval $(host-generic-package)) MKIMAGE = $(HOST_DIR)/bin/mkimage -# mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 nios2 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa -# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa +# mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa +# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips powerpc sh sparc i386 x86_64 xtensa # For i386, we need to convert # For openrisc, we need to convert # For others, we'll just keep NORMALIZED_ARCH diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash index af70e86e46..e35f37b03d 100644 --- a/package/ubus/ubus.hash +++ b/package/ubus/ubus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0020c808d0ba74b1f4c9514e2b3dfa98ec13a142c97b86b9c229479c560aca19 ubus-f787c97b34894a38b15599886cacbca01271684f-git4.tar.gz +sha256 ba7602c660cb2c15c0e04942414e4cf3d96622622406c5fc3b88895694aebb9f ubus-afa57cce0aff82f4a7a0e509d4387ebc23dd3be7-git4.tar.gz sha256 a3caa6c0e90c87b7c97c2ac3d0c0d416082ef777215faec2e9b24ea6e68f6988 ubusd_acl.h diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index cc2ed81786..913c0e3e39 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBUS_VERSION = f787c97b34894a38b15599886cacbca01271684f +UBUS_VERSION = afa57cce0aff82f4a7a0e509d4387ebc23dd3be7 UBUS_SITE = https://git.openwrt.org/project/ubus.git UBUS_SITE_METHOD = git diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index dbc3966906..56174a33b8 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.50/uClibc-ng-1.0.50.tar.xz.sha256 -sha256 aed867251f4823a74ea5e3a3993d3a7c123280abe15e38dc206770c3968f21cf uClibc-ng-1.0.50.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.55/uClibc-ng-1.0.55.tar.xz.sha256 +sha256 5f7f3aafddb2ca08fb295be45561c0188407103d7446cfd264b9b822fed3ed2d uClibc-ng-1.0.55.tar.xz # Locally calculated sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 600d72ce7b..0c303d77f8 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.50 +UCLIBC_VERSION = 1.0.55 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ @@ -72,6 +72,15 @@ define UCLIBC_BINFMT_CONFIG endef endif +# +# 64-bit time_t is enabled by default but needs headers >= 5.1.0 +# +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1),) +define UCLIBC_DISABLE_TIME64 + $(call KCONFIG_DISABLE_OPT,UCLIBC_USE_TIME64) +endef +endif + # # AArch64 definitions # @@ -398,6 +407,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_DISABLE_OPT,DOSTRIP) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) + $(UCLIBC_DISABLE_TIME64) $(UCLIBC_AARCH64_PAGE_SIZE_CONFIG) $(UCLIBC_ARC_PAGE_SIZE_CONFIG) $(UCLIBC_ARC_ATOMICS_CONFIG) diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash index 66f4be5e1f..a62e6b5ed6 100644 --- a/package/udisks/udisks.hash +++ b/package/udisks/udisks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b75734ccf602540dedb4068bec206adcb508a4c003725e117ae8f994d92d8ece udisks-2.10.1.tar.bz2 +sha256 0bf30151fe8d9d2fb59b57f6630739dfbbd16417dee69ec57d43b37335bd649a udisks-2.11.0.tar.bz2 sha256 98046e932dc6c739001e79d7079a3bd958fc55475dcd917d27f884c0c93525cc COPYING diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index 0d63532d8a..c9b66872e9 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -4,7 +4,7 @@ # ################################################################################ -UDISKS_VERSION = 2.10.1 +UDISKS_VERSION = 2.11.0 UDISKS_SOURCE = udisks-$(UDISKS_VERSION).tar.bz2 UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS_VERSION) UDISKS_LICENSE = GPL-2.0+ @@ -45,4 +45,10 @@ else UDISKS_CONF_OPTS += --disable-fhs-media endif +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SMART),y) +UDISKS_CONF_OPTS += --enable-smart +else +UDISKS_CONF_OPTS += --disable-smart +endif + $(eval $(autotools-package)) diff --git a/package/uefisettings/uefisettings.hash b/package/uefisettings/uefisettings.hash index 505b5de566..b9b5222d4b 100644 --- a/package/uefisettings/uefisettings.hash +++ b/package/uefisettings/uefisettings.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5d4d6f771e615df9fee3d531c85dad9946ed793fc0a0e636dee1d342780f7863 uefisettings-f90aed759b9c2217bea336e37ab5282616ece390-cargo2.tar.gz +sha256 3c199e92e9dde29d5a1be33994cef27eb9450f1dbc006eb5e09856e2be7f172b uefisettings-149bc92970949d44be641ae1e3e942220d7390e7-cargo4.tar.gz sha256 acc0b83e151985bb943d35ac37e7522fef28d707af9a4829678e92baa409aaf1 LICENSE diff --git a/package/uefisettings/uefisettings.mk b/package/uefisettings/uefisettings.mk index 0559b1c504..2a11baa74d 100644 --- a/package/uefisettings/uefisettings.mk +++ b/package/uefisettings/uefisettings.mk @@ -4,7 +4,7 @@ # ################################################################################ -UEFISETTINGS_VERSION = f90aed759b9c2217bea336e37ab5282616ece390 +UEFISETTINGS_VERSION = 149bc92970949d44be641ae1e3e942220d7390e7 UEFISETTINGS_SITE = $(call github,linuxboot,uefisettings,$(UEFISETTINGS_VERSION)) UEFISETTINGS_LICENSE = BSD-3-Clause UEFISETTINGS_LICENSE_FILES = LICENSE diff --git a/package/uemacs/02-Replace-cuserid.patch b/package/uemacs/02-Replace-cuserid.patch new file mode 100644 index 0000000000..0e7eaf371f --- /dev/null +++ b/package/uemacs/02-Replace-cuserid.patch @@ -0,0 +1,34 @@ +From 289ccf8f0e77ae4f240eca988eb3a6ac19afbae9 Mon Sep 17 00:00:00 2001 +From: Thomas Bonnefille +Date: Fri, 17 Jan 2025 22:10:41 +0100 +Subject: [PATCH] Replace cuserid + +cuserid has been removed from some toolchains and is no longer in the +POSIX standard since 1990. getlogin has been in the standard since 2001. + +This commit uncomments the call to getlogin and thus replaces cuserid +with getlogin. + +Upstream: https://github.com/torvalds/uemacs/pull/46 +Signed-off-by: Thomas Bonnefille +--- + pklock.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pklock.c b/pklock.c +index dc30b76..5f4865b 100644 +--- a/pklock.c ++++ b/pklock.c +@@ -80,8 +80,7 @@ char *dolock(char *fname) + } + if ((n = read(fd, locker, MAXNAME)) < 1) { + lseek(fd, 0, SEEK_SET); +-/* strcpy(locker, getlogin()); */ +- cuserid(locker); ++ strcpy(locker, getlogin()); + strcat(locker + strlen(locker), "@"); + gethostname(locker + strlen(locker), 64); + write(fd, locker, strlen(locker)); +-- +2.48.1 + diff --git a/package/ufs-utils/Config.in b/package/ufs-utils/Config.in new file mode 100644 index 0000000000..438eeaf7a6 --- /dev/null +++ b/package/ufs-utils/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_UFS_UTILS + bool "ufs-utils" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + help + UFS utils is a set of utilities for managing Universal + Flash Storage (UFS) devices. + + https://github.com/SanDisk-Open-Source/ufs-utils.git + +comment "ufs-utils needs a toolchain w/ headers >= 5.1" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 diff --git a/package/ufs-utils/ufs-utils.hash b/package/ufs-utils/ufs-utils.hash new file mode 100644 index 0000000000..e322759502 --- /dev/null +++ b/package/ufs-utils/ufs-utils.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 96d15ce4b0990049d812d24afc2a62240c1a4aa534ea6aebb5aebd34dccb2dac ufs-utils-7.14.12.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ufs-utils/ufs-utils.mk b/package/ufs-utils/ufs-utils.mk new file mode 100644 index 0000000000..1de7615a92 --- /dev/null +++ b/package/ufs-utils/ufs-utils.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# ufs-utils +# +################################################################################ + +UFS_UTILS_VERSION = 7.14.12 +UFS_UTILS_SITE = $(call github,SanDisk-Open-Source,ufs-utils,v$(UFS_UTILS_VERSION)) +UFS_UTILS_LICENSE = GPL-2.0 +UFS_UTILS_LICENSE_FILES = COPYING + +define UFS_UTILS_BUILD_CMDS + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" +endef + +define UFS_UTILS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/ufs-utils $(TARGET_DIR)/usr/bin/ufs-utils +endef + +$(eval $(generic-package)) diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash index f682dd6d84..3502d5f1ef 100644 --- a/package/umtprd/umtprd.hash +++ b/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0b3c308016595a5d956eaaa086d3bfe4c9af2270857181695338df9affb3574 umtprd-1.6.8.tar.gz +sha256 6f57f61a1993059bcdd5f598d8c2a3888991497ef42ba3594947f00bd7746b1f umtprd-1.8.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk index 1f1f6bcd23..1a2b387219 100644 --- a/package/umtprd/umtprd.mk +++ b/package/umtprd/umtprd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UMTPRD_VERSION = 1.6.8 +UMTPRD_VERSION = 1.8.1 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ba876299c2..19966d889e 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,8 +1,8 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.21.0.tar.gz.sha256 +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.24.2.tar.gz.sha256 # After checking pgp signature from: -# https://nlnetlabs.nl/downloads/unbound/unbound-1.21.0.tar.gz.asc -# with key: EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D -sha256 e7dca7d6b0f81bdfa6fa64ebf1053b5a999a5ae9278a87ef182425067ea14521 unbound-1.21.0.tar.gz +# https://nlnetlabs.nl/downloads/unbound/unbound-1.24.2.tar.gz.asc +# with key: 948EB42322C5D00B79340F5DCFF3344D9087A490 +sha256 44e7b53e008a6dcaec03032769a212b46ab5c23c105284aa05a4f3af78e59cdb unbound-1.24.2.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index c63311139b..b435839020 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.21.0 +UNBOUND_VERSION = 1.24.2 UNBOUND_SITE = https://nlnetlabs.nl/downloads/unbound UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl diff --git a/package/unifdef/0002-Don-t-use-C23-constexpr-keyword.patch b/package/unifdef/0002-Don-t-use-C23-constexpr-keyword.patch new file mode 100644 index 0000000000..5b5c9690da --- /dev/null +++ b/package/unifdef/0002-Don-t-use-C23-constexpr-keyword.patch @@ -0,0 +1,60 @@ +From d616741e6b0d5b57b66447e85ad32b283b28adde Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 17 Nov 2024 01:26:27 +0000 +Subject: [PATCH] Don't use C23 constexpr keyword + +This fixes building with upcoming GCC 15 which defaults to -std=gnu23. + +Signed-off-by: James Hilliard +Upstream: https://github.com/fanf2/unifdef/pull/19 +--- + unifdef.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/unifdef.c b/unifdef.c +index dc145a2..4bd3bda 100644 +--- a/unifdef.c ++++ b/unifdef.c +@@ -202,7 +202,7 @@ static int depth; /* current #if nesting */ + static int delcount; /* count of deleted lines */ + static unsigned blankcount; /* count of blank lines */ + static unsigned blankmax; /* maximum recent blankcount */ +-static bool constexpr; /* constant #if expression */ ++static bool is_constexpr; /* constant #if expression */ + static bool zerosyms; /* to format symdepth output */ + static bool firstsym; /* ditto */ + +@@ -1086,7 +1086,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + *valp = (value[sym] != NULL); + lt = *valp ? LT_TRUE : LT_FALSE; + } +- constexpr = false; ++ is_constexpr = false; + } else if (!endsym(*cp)) { + debug("eval%d symbol", prec(ops)); + sym = findsym(&cp); +@@ -1103,7 +1103,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + lt = *valp ? LT_TRUE : LT_FALSE; + cp = skipargs(cp); + } +- constexpr = false; ++ is_constexpr = false; + } else { + debug("eval%d bad expr", prec(ops)); + return (LT_ERROR); +@@ -1170,10 +1170,10 @@ ifeval(const char **cpp) + long val = 0; + + debug("eval %s", *cpp); +- constexpr = killconsts ? false : true; ++ is_constexpr = killconsts ? false : true; + ret = eval_table(eval_ops, &val, cpp); + debug("eval = %d", val); +- return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); ++ return (is_constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); + } + + /* +-- +2.34.1 + diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index 6262dab5ae..e81448adbd 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec unixODBC-2.3.12.tar.gz +sha256 4e2814de3e01fc30b0b9f75e83bb5aba91ab0384ee951286504bb70205524771 unixODBC-2.3.14.tar.gz sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 28f1e5bc94..47c08a39eb 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.12 +UNIXODBC_VERSION = 2.3.14 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = http://www.unixodbc.org UNIXODBC_INSTALL_STAGING = YES @@ -12,6 +12,12 @@ UNIXODBC_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) UNIXODBC_LICENSE_FILES = COPYING exe/COPYING UNIXODBC_CPE_ID_VENDOR = unixodbc +# gcc-15 defaults to -std=gnu23 which introduces build failures. +# We force "-std=gnu17" for gcc version supporting it. Earlier gcc +# versions will work, since they are using the older standard. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) +UNIXODBC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17" +endif UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf ifeq ($(BR2_PACKAGE_LIBEDIT),y) diff --git a/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch b/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch index cbc58e484b..bdb3eae6af 100644 --- a/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch +++ b/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch @@ -31,7 +31,7 @@ index 0000000..27951b4 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,17 @@ -+cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) +INCLUDE(CheckFunctionExists) + +project(unzip C) diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash index bbf4f7d71f..0b371e5454 100644 --- a/package/unzip/unzip.hash +++ b/package/unzip/unzip.hash @@ -1,6 +1,6 @@ -# From https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip/unzip_6.0-26.dsc +# From https://snapshot.debian.org/archive/debian/20250311T215724Z/pool/main/u/unzip/unzip_6.0-29.dsc sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip_6.0.orig.tar.gz -sha256 67bde7c71d52afd61aa936d4415c8d12fd90ca26e9637a3cd67cae9b71298c12 unzip_6.0-27.debian.tar.xz +sha256 14043e5ea351c02b3bc8676e1e6d20d79b9a690b6d7520e8138ac629cc048417 unzip_6.0-29.debian.tar.xz # Locally computed: sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 5effebee4a..8dccaf6ce3 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -6,13 +6,13 @@ UNZIP_VERSION = 6.0 UNZIP_SOURCE = unzip_$(UNZIP_VERSION).orig.tar.gz -UNZIP_PATCH = unzip_$(UNZIP_VERSION)-27.debian.tar.xz -UNZIP_SITE = https://snapshot.debian.org/archive/debian/20220916T090657Z/pool/main/u/unzip +UNZIP_PATCH = unzip_$(UNZIP_VERSION)-29.debian.tar.xz +UNZIP_SITE = https://snapshot.debian.org/archive/debian/20250311T215724Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE UNZIP_CPE_ID_VALID = YES -# unzip_$(UNZIP_VERSION)-27.debian.tar.xz has patches to fix: +# unzip_$(UNZIP_VERSION)-29.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \ CVE-2014-8139 \ CVE-2014-8140 \ diff --git a/package/upx/upx.mk b/package/upx/upx.mk index 65f4bac517..210114b926 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -9,7 +9,7 @@ UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING -UPX_CPE_ID_VALID = YES +UPX_CPE_ID_VENDOR = upx UPX_SUPPORTS_IN_SOURCE_BUILD = NO $(eval $(host-cmake-package)) diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 765a2438c2..0bd9ee9889 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,5 +1,5 @@ # From https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-versions.xml -md5 69d00d6ed7097b97d972a159d14cfba1 usb-modeswitch-2.6.1.tar.bz2 +md5 cf3b9f052fe49b02b385848eedc7264f usb-modeswitch-2.6.2.tar.bz2 # Locally calculated -sha256 5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34 usb-modeswitch-2.6.1.tar.bz2 +sha256 f7abd337784a9d1bd39cb8a587518aff6f2a43d916145eafd80b1b8b7146db66 usb-modeswitch-2.6.2.tar.bz2 sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index f2ee004b42..aa5646adee 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.6.1 +USB_MODESWITCH_VERSION = 2.6.2 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index f207fa6826..254209ff64 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf, C++17 filesystem depends on !BR2_STATIC_LIBS # libqb, protobuf depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash index 6c10dc9d3e..10eab07f95 100644 --- a/package/usbguard/usbguard.hash +++ b/package/usbguard/usbguard.hash @@ -1,5 +1,5 @@ -# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.2/usbguard-1.1.2.tar.gz.sum -sha256 dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934 usbguard-1.1.2.tar.gz +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.4/usbguard-1.1.4.tar.gz.sum +sha256 7d76b75e779e3c9e6c2fc10e7389dfa34056864c9f0c6eaca722687b7e75893c usbguard-1.1.4.tar.gz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 4a5028f509..5f6672d44a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBGUARD_VERSION = 1.1.2 +USBGUARD_VERSION = 1.1.4 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE diff --git a/package/usbip/Config.in b/package/usbip/Config.in new file mode 100644 index 0000000000..25f8fb8577 --- /dev/null +++ b/package/usbip/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_USBIP + bool "usbip" + depends on BR2_PACKAGE_HAS_UDEV + help + The USB-over-IP suite of tools. + + Note: you'll have to enable either (or both) of "VHCI hcd" + (CONFIG_USBIP_VHCI_HCD) if you want to access a remote USB + device, or "Host driver" (CONFIG_USBIP_HOST) if you want + to share a USB device, in your kernel configuration. The + Buildroot package "hwdata" with the "usb.ids" file is also + useful (but not mandatory) to list and identify USB device + by name. + + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/tools/usb/usbip + +comment "usbip needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/usbip/usbip.hash b/package/usbip/usbip.hash new file mode 100644 index 0000000000..dc901617bf --- /dev/null +++ b/package/usbip/usbip.hash @@ -0,0 +1,5 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 d450ab215de4e1f8bb85e0f4216760fa33fd024b4526b144f4ce0d9012b29c9e linux-6.12.6.tar.xz + +# Locally computed +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 tools/usb/usbip/COPYING diff --git a/package/usbip/usbip.mk b/package/usbip/usbip.mk new file mode 100644 index 0000000000..b4475c8d89 --- /dev/null +++ b/package/usbip/usbip.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# usbip +# +################################################################################ + +# Since linux 3.17, usbip is part of the linux source tree. Usually, we'd add +# such a tool in the linux-tools package. +# +# However, usbip is autotools-based, so we'd have to duplicate the autotools +# infra in linux-tools; the basic infra is easy to duplicate, but then come +# the conditional libtool patches, and it's not trivial to do. And of course, +# there would be the maintenance cost... +# +# usbip is not very tied to the kernel, in fact. It is pretty stable, API-wise, +# so we can just use a recent kernel version. +USBIP_VERSION = 6.12.6 +USBIP_SOURCE = linux-$(USBIP_VERSION).tar.xz +USBIP_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v6.x +USBIP_DL_SUBDIR = linux + +# usbip's licensing diverges from that of the rest of the kernel +USBIP_LICENSE = GPL-2.0-or-later +USBIP_LICENSE_FILES = tools/usb/usbip/COPYING + +USBIP_DEPENDENCIES = udev + +USBIP_SUBDIR = tools/usb/usbip +USBIP_INSTALL_STAGING = YES + +USBIP_AUTORECONF = YES +USBIP_CONFIGURE_OPTS = --without-tcp-wrappers + +define USBIP_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) + $(call KCONFIG_ENABLE_OPT,CONFIG_USBIP_CORE) +endef + +$(eval $(autotools-package)) diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in index a38eb2f2e5..7e7029bbfe 100644 --- a/package/usbutils/Config.in +++ b/package/usbutils/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_USBUTILS depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_PACKAGE_HAS_UDEV # needs hwdb + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBUSB help USB enumeration utilities diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index 7527b6e63a..3527d4e30d 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 83f68b59b58547589c00266e82671864627593ab4362d8c807f50eea923cad93 usbutils-018.tar.xz +sha256 659f40c440e31ba865c52c818a33d3ba6a97349e3353f8b1985179cb2aa71ec5 usbutils-019.tar.xz # Locally calculated sha256 91412672119c72352b76c1d48fa1a8b7cdc7f70be7929e468c8805db468e23e4 LICENSES/GPL-2.0-only.txt sha256 4631da83311d27f99078d0d102e31bd34a4fcbcc2dae2aa40f1454a5b48125dc LICENSES/GPL-3.0-only.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 48301fbb9f..5b6037afa2 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,13 +4,18 @@ # ################################################################################ -USBUTILS_VERSION = 018 +USBUTILS_VERSION = 019 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py) USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0-only.txt LICENSES/GPL-3.0-only.txt +ifeq ($(BR2_PACKAGE_LIBICONV),y) +USBUTILS_DEPENDENCIES += libiconv +USBUTILS_LDFLAGS += -liconv +endif + # Nice lsusb.py script only if there's python 3.x ifeq ($(BR2_PACKAGE_PYTHON3),) define USBUTILS_REMOVE_PYTHON diff --git a/package/ustream-ssl/0001-ustream-mbedtls-use-getrandom-instead-of-dev-urandom.patch b/package/ustream-ssl/0001-ustream-mbedtls-use-getrandom-instead-of-dev-urandom.patch new file mode 100644 index 0000000000..2abb7ce3a1 --- /dev/null +++ b/package/ustream-ssl/0001-ustream-mbedtls-use-getrandom-instead-of-dev-urandom.patch @@ -0,0 +1,88 @@ +From 498f6e268d4d2b0ad33b430f4ba1abe397d31496 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sun, 19 Feb 2023 21:11:12 +0100 +Subject: [PATCH] ustream-mbedtls: Use getrandom() instead of /dev/urandom + +Instead of keeping a file descriptor open just use the getrandom syscall +to get random data. This is supported by musl libc, glibc and Linux for +some time now. + +This also improves the error handling in case this function returns not +as many bytes as expected. + +Signed-off-by: Hauke Mehrtens +Reviewed-by: Torsten Duwe +Upstream: https://git.openwrt.org/?p=project/ustream-ssl.git;a=commit;h=498f6e268d4d2b0ad33b430f4ba1abe397d31496 +Signed-off-by: Thomas Perale +--- + ustream-mbedtls.c | 25 ++++++------------------- + 1 file changed, 6 insertions(+), 19 deletions(-) + +diff --git a/ustream-mbedtls.c b/ustream-mbedtls.c +index e79e37b..7fc7874 100644 +--- a/ustream-mbedtls.c ++++ b/ustream-mbedtls.c +@@ -17,6 +17,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -25,8 +26,6 @@ + #include "ustream-ssl.h" + #include "ustream-internal.h" + +-static int urandom_fd = -1; +- + static int s_ustream_read(void *ctx, unsigned char *buf, size_t len) + { + struct ustream *s = ctx; +@@ -66,21 +65,12 @@ __hidden void ustream_set_io(struct ustream_ssl_ctx *ctx, void *ssl, struct ustr + mbedtls_ssl_set_bio(ssl, conn, s_ustream_write, s_ustream_read, NULL); + } + +-static bool urandom_init(void) ++static int _random(void *ctx, unsigned char *out, size_t len) + { +- if (urandom_fd > -1) +- return true; ++ ssize_t ret; + +- urandom_fd = open("/dev/urandom", O_RDONLY); +- if (urandom_fd < 0) +- return false; +- +- return true; +-} +- +-static int _urandom(void *ctx, unsigned char *out, size_t len) +-{ +- if (read(urandom_fd, out, len) < 0) ++ ret = getrandom(out, len, 0); ++ if (ret < 0 || (size_t)ret != len) + return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; + + return 0; +@@ -134,9 +124,6 @@ __ustream_ssl_context_new(bool server) + mbedtls_ssl_config *conf; + int ep; + +- if (!urandom_init()) +- return NULL; +- + ctx = calloc(1, sizeof(*ctx)); + if (!ctx) + return NULL; +@@ -159,7 +146,7 @@ __ustream_ssl_context_new(bool server) + + mbedtls_ssl_config_defaults(conf, ep, MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT); +- mbedtls_ssl_conf_rng(conf, _urandom, NULL); ++ mbedtls_ssl_conf_rng(conf, _random, NULL); + + if (server) { + mbedtls_ssl_conf_authmode(conf, MBEDTLS_SSL_VERIFY_NONE); +-- +2.30.2 diff --git a/package/ustream-ssl/0002-ustream-mbedtls-add-compatibility-with-mbed-tls-3-0-0.patch b/package/ustream-ssl/0002-ustream-mbedtls-add-compatibility-with-mbed-tls-3-0-0.patch new file mode 100644 index 0000000000..b9fa4be1a5 --- /dev/null +++ b/package/ustream-ssl/0002-ustream-mbedtls-add-compatibility-with-mbed-tls-3-0-0.patch @@ -0,0 +1,79 @@ +From 91666a38b7bd4bd353394986d8343a33ba61d8e2 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sat, 11 Nov 2023 22:13:24 +0100 +Subject: [PATCH] ustream-mbedtls: Add compatibility with Mbed TLS 3.0.0 + +This adds support for compiling the code against Mbed TLS 3.0.0. +It still compiles against Mbed TLS 2.28. + +The following changes were needed: + * DES and 3DES was removed + * mbedtls_pk_context->pk_info is private, use mbedtls_pk_get_type() + to check if it was initialized + * mbedtls_pk_parse_keyfile() now gets a random callback + * mbedtls/certs.h contains test data and is not installed any more and + not needed. + +Signed-off-by: Hauke Mehrtens +Upstream: https://git.openwrt.org/?p=project/ustream-ssl.git;a=commit;h=91666a38b7bd4bd353394986d8343a33ba61d8e2 +Signed-off-by: Thomas Perale +--- + ustream-mbedtls.c | 12 +++++++++++- + ustream-mbedtls.h | 1 - + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/ustream-mbedtls.c b/ustream-mbedtls.c +index 7fc7874..1c70cac 100644 +--- a/ustream-mbedtls.c ++++ b/ustream-mbedtls.c +@@ -110,9 +110,15 @@ static const int default_ciphersuites_client[] = + AES_CBC_CIPHERS(ECDHE_ECDSA), + AES_CBC_CIPHERS(ECDHE_RSA), + AES_CBC_CIPHERS(DHE_RSA), ++/* Removed in Mbed TLS 3.0.0 */ ++#ifdef MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA + MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, ++#endif + AES_CIPHERS(RSA), ++/* Removed in Mbed TLS 3.0.0 */ ++#ifdef MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA + MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA, ++#endif + 0 + }; + +@@ -171,7 +177,7 @@ static void ustream_ssl_update_own_cert(struct ustream_ssl_ctx *ctx) + if (!ctx->cert.version) + return; + +- if (!ctx->key.pk_info) ++ if (mbedtls_pk_get_type(&ctx->key) == MBEDTLS_PK_NONE) + return; + + mbedtls_ssl_conf_own_cert(&ctx->conf, &ctx->cert, &ctx->key); +@@ -206,7 +212,11 @@ __hidden int __ustream_ssl_set_key_file(struct ustream_ssl_ctx *ctx, const char + { + int ret; + ++#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) ++ ret = mbedtls_pk_parse_keyfile(&ctx->key, file, NULL, _random, NULL); ++#else + ret = mbedtls_pk_parse_keyfile(&ctx->key, file, NULL); ++#endif + if (ret) + return -1; + +diff --git a/ustream-mbedtls.h b/ustream-mbedtls.h +index e622e5e..7e7c699 100644 +--- a/ustream-mbedtls.h ++++ b/ustream-mbedtls.h +@@ -21,7 +21,6 @@ + + #include + #include +-#include + #include + #include + #include +-- +2.30.2 diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash index 7a03b21b86..9084f9109e 100644 --- a/package/ustreamer/ustreamer.hash +++ b/package/ustreamer/ustreamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 88ac5e99c56729fecba2cf7f63b690a126dcaef420e2cce9c25c66c55c097f64 ustreamer-6.16.tar.gz +sha256 592fab2eb10ccb768e19b4e6631e1279d415f23d268a4b45b9d440378beaa570 ustreamer-6.41.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk index 2944827083..ef5ac09eeb 100644 --- a/package/ustreamer/ustreamer.mk +++ b/package/ustreamer/ustreamer.mk @@ -4,11 +4,11 @@ # ################################################################################ -USTREAMER_VERSION = 6.16 +USTREAMER_VERSION = 6.41 USTREAMER_SITE = $(call github,pikvm,ustreamer,v$(USTREAMER_VERSION)) USTREAMER_LICENSE = GPL-3.0+ USTREAMER_LICENSE_FILES = LICENSE -USTREAMER_DEPENDENCIES = jpeg libevent libbsd +USTREAMER_DEPENDENCIES = jpeg libevent libbsd host-pkgconf USTREAMER_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/utf8proc/utf8proc.hash b/package/utf8proc/utf8proc.hash index 7fee89968d..560c6b2ccf 100644 --- a/package/utf8proc/utf8proc.hash +++ b/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd215d04313b5bc42c1abedbcb0a6574667e31acee1085543a232204e36384c4 utf8proc-2.9.0.tar.gz +sha256 276a37dc4d1dd24d7896826a579f4439d1e5fe33603add786bb083cab802e23e utf8proc-2.10.0.tar.gz sha256 3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256 LICENSE.md diff --git a/package/utf8proc/utf8proc.mk b/package/utf8proc/utf8proc.mk index 42ec48e0a8..79909ec106 100644 --- a/package/utf8proc/utf8proc.mk +++ b/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.9.0 +UTF8PROC_VERSION = 2.10.0 UTF8PROC_SITE = https://github.com/JuliaStrings/utf8proc/releases/download/v$(UTF8PROC_VERSION) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md diff --git a/package/utfcpp/Config.in b/package/utfcpp/Config.in new file mode 100644 index 0000000000..19e1f21688 --- /dev/null +++ b/package/utfcpp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_UTFCPP + bool "utfcpp" + depends on BR2_INSTALL_LIBSTDCPP + help + UTF-8 with C++ in a Portable Way + + https://github.com/nemtrif/utfcpp + +comment "taglib needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/utfcpp/utfcpp.hash b/package/utfcpp/utfcpp.hash new file mode 100644 index 0000000000..d995899165 --- /dev/null +++ b/package/utfcpp/utfcpp.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f808b26d8c3a59def27fea207182ece77a8930bd121a69f80d328ecf3cfef925 utfcpp-4.0.8.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/utfcpp/utfcpp.mk b/package/utfcpp/utfcpp.mk new file mode 100644 index 0000000000..d3d7896813 --- /dev/null +++ b/package/utfcpp/utfcpp.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# taglib +# +################################################################################ + +UTFCPP_VERSION = 4.0.8 +UTFCPP_SITE = $(call github,nemtrif,utfcpp,v$(UTFCPP_VERSION)) +UTFCPP_LICENSE = BSL-1.0 +UTFCPP_LICENSE_FILES = LICENSE + +# utfcpp is a header-only library, it only makes sense +# to have it installed into the staging directory. +UTFCPP_INSTALL_STAGING = YES +UTFCPP_INSTALL_TARGET = NO + +define UTFCPP_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/utf8/ + $(INSTALL) -m 0644 $(@D)/source/utf8.h $(STAGING_DIR)/usr/include/utf8.h + $(INSTALL) -m 0644 $(@D)/source/utf8/* $(STAGING_DIR)/usr/include/utf8/ +endef + +$(eval $(generic-package)) diff --git a/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch b/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch deleted file mode 100644 index 12dd119ef3..0000000000 --- a/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch +++ /dev/null @@ -1,39 +0,0 @@ -From beef18da4de87ca5aaadf2beb14187f35cc4f50f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 May 2024 18:22:11 +0200 -Subject: [PATCH] sys-utils/setarch.c: fix build with uclibc-ng < 1.0.39 - -Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without -https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) -raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: - -sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? - 106 | X(PER_LINUX32_3GB) \ - | ^~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/4647fc6afbf7e99c49531600425df60f1243fcd2 ---- - sys-utils/setarch.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c -index 227bc6b5de..4bcb5e69e6 100644 ---- a/sys-utils/setarch.c -+++ b/sys-utils/setarch.c -@@ -89,6 +89,11 @@ - # define PER_LINUX_FDPIC (PER_LINUX | FDPIC_FUNCPTRS) - #endif - -+/* fallback for old uclibc-headers < 1.0.39 */ -+#ifndef PER_LINUX32_3GB -+# define PER_LINUX32_3GB (PER_LINUX32 | ADDR_LIMIT_3GB) -+#endif -+ - #define ALL_PERSONALITIES \ - X(PER_LINUX) \ - X(PER_LINUX_32BIT) \ diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 317efebcbf..d1c2986ca6 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,10 +1,14 @@ -# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/sha256sums.asc -sha256 d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 util-linux-2.40.2.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.41/sha256sums.asc +sha256 be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 util-linux-2.41.1.tar.xz # License files, locally calculated -sha256 27f25514040a401b2ceb7057eae1f46cedb1666664b519b5be7e0960d1b35164 README.licensing +sha256 4c2db318192bda62f3f8fcf71488bb5e602ae4385eba281d711b46cc13a40bb3 README.licensing +sha256 527f738966ca396cd5a68c1509390de2a780c6b614d9ee57f7544a6161938ed1 Documentation/licenses/COPYING.BSD-2-Clause sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC +sha256 6fc9e709ccbfe0d77fbffa2427a983282be2eb88e47b1cdb49f21a83b4d1e665 Documentation/licenses/COPYING.EUPL-1.2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-only sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 Documentation/licenses/COPYING.GPL-3.0-or-later sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later sha256 8555341619542abb48c102afd954e42d4478e5be16ad3d5af7b0ff71009e7348 Documentation/licenses/COPYING.MIT diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 7a143290eb..d1abdbdc9e 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,8 +7,8 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.40 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION_MAJOR = 2.41 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -24,18 +24,19 @@ UTIL_LINUX_LICENSE = \ ISC (rfkill) \ MIT (hardlink, flock) UTIL_LINUX_LICENSE_FILES = README.licensing \ + Documentation/licenses/COPYING.BSD-2-Clause \ Documentation/licenses/COPYING.BSD-3-Clause \ Documentation/licenses/COPYING.BSD-4-Clause-UC \ + Documentation/licenses/COPYING.EUPL-1.2 \ + Documentation/licenses/COPYING.GPL-2.0-only \ Documentation/licenses/COPYING.GPL-2.0-or-later \ + Documentation/licenses/COPYING.GPL-3.0-or-later \ Documentation/licenses/COPYING.ISC \ Documentation/licenses/COPYING.LGPL-2.1-or-later \ Documentation/licenses/COPYING.MIT UTIL_LINUX_CPE_ID_VENDOR = kernel -# 0001-libmount-ifdef-statx-call.patch -UTIL_LINUX_AUTORECONF = YES - UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = \ host-pkgconf \ @@ -60,6 +61,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 @@ -68,7 +75,13 @@ endif # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are # the same when merged usr is in use. ifeq ($(BR2_ROOTFS_MERGED_USR),y) -UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --libdir=/usr/lib +# Ditto for /usr/sbin and /usr/bin when merge sbin is in use +ifeq ($(BR2_ROOTFS_MERGED_BIN),y) +UTIL_LINUX_CONF_OPTS += --sbindir=/usr/bin +else +UTIL_LINUX_CONF_OPTS += --sbindir=/usr/sbin +endif endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) diff --git a/package/uuu/Config.in b/package/uuu/Config.in new file mode 100644 index 0000000000..6085183ea7 --- /dev/null +++ b/package/uuu/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_UUU + bool "uuu" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR # libuuu uses wchar_t + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_TINYXML2 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZSTD + help + UUU (Universal Update Utility) is Freescale/NXP I.MX Chip + image deploy tool. UUU is an evolution of MFGTools + (aka MFGTools v3). + + https://github.com/nxp-imx/mfgtools + +comment "uuu needs a toolchain w/ C++14, threads, atomic, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_ATOMIC \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 9dc286c41f..fa691255ee 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,3 +1,3 @@ # locally computed -sha256 723d3da358e6af974a056e3adbcb105fac9dad4b87544de0d22b8c974a8037aa uuu_source-uuu_1.5.182.tar.gz +sha256 4eab6647c9e75e5900ee8981c80750b26493fe54d99708989c0e7ce08067484e uuu_source-uuu_1.5.239.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index e57828a0ca..6ee06dab88 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,11 +4,12 @@ # ################################################################################ -UUU_VERSION = 1.5.182 +UUU_VERSION = 1.5.239 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/nxp-imx/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE +UUU_DEPENDENCIES = bzip2 libusb openssl tinyxml2 zlib zstd HOST_UUU_DEPENDENCIES = \ host-bzip2 \ host-libusb \ @@ -17,4 +18,9 @@ HOST_UUU_DEPENDENCIES = \ host-zlib \ host-zstd +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +UUU_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +$(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/v4l2loopback/Config.in b/package/v4l2loopback/Config.in index d8ca31e577..4bfa9a4fdd 100644 --- a/package/v4l2loopback/Config.in +++ b/package/v4l2loopback/Config.in @@ -14,10 +14,6 @@ if BR2_PACKAGE_V4L2LOOPBACK config BR2_PACKAGE_V4L2LOOPBACK_UTILS bool "utils" - depends on BR2_USE_MMU # bash - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash - select BR2_PACKAGE_BASH # runtime dependency - select BR2_PACKAGE_SUDO # runtime dependency help Install applications to interact with v4l2-loopback devices ("virtual video devices"). Currently there is only a single diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index abc2929d12..a4ddf5e2d9 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -11,6 +11,10 @@ V4L2LOOPBACK_LICENSE_FILES = COPYING V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) +define V4L2LOOPBACK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) utils +endef + define V4L2LOOPBACK_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/utils/v4l2loopback-ctl $(TARGET_DIR)/usr/bin/v4l2loopback-ctl endef @@ -24,6 +28,7 @@ define V4L2LOOPBACK_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_MEDIA_SUPPORT) $(call KCONFIG_ENABLE_OPT,CONFIG_I2C) $(call KCONFIG_ENABLE_OPT,CONFIG_VIDEO_DEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEDIA_CAMERA_SUPPORT) endef $(eval $(kernel-module)) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index a16875ac6a..1babb375d7 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.56/vala-0.56.17.sha256sum -sha256 26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a vala-0.56.17.tar.xz +# From https://download.gnome.org/sources/vala/0.56/vala-0.56.18.sha256sum +sha256 f2affe7d40ab63db8e7b9ecc3f6bdc9c2fc7e3134c84ff2d795f482fe926a382 vala-0.56.18.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 85f928202a..24dadeb346 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.56 -VALA_VERSION = $(VALA_VERSION_MAJOR).17 +VALA_VERSION = $(VALA_VERSION_MAJOR).18 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ diff --git a/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch index 8a6003cbae..7bc0dd02c6 100644 --- a/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch +++ b/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch @@ -16,7 +16,7 @@ diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c index 6110c93..298a00e 100644 --- a/coregrind/m_machine.c +++ b/coregrind/m_machine.c -@@ -27,6 +27,10 @@ +@@ -25,6 +25,10 @@ The GNU General Public License is contained in the file COPYING. */ diff --git a/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch b/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch index 44adfc4190..5e168ad506 100644 --- a/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch +++ b/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch @@ -19,7 +19,7 @@ diff --git a/coregrind/vgdb-invoker-ptrace.c b/coregrind/vgdb-invoker-ptrace.c index d65f59a..bdefac2 100644 --- a/coregrind/vgdb-invoker-ptrace.c +++ b/coregrind/vgdb-invoker-ptrace.c -@@ -72,6 +72,12 @@ +@@ -81,6 +81,12 @@ # endif #endif diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index 9cb66b583a..8e62256b9c 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,8 +1,8 @@ # From https://valgrind.org/downloads/current.html -sha1 ec410c75d3920d4f9249a5cfa2cac31e1bf6d586 valgrind-3.23.0.tar.bz2 +sha1 c32f135761724db05f018fff67e06c4edf328770 valgrind-3.26.0.tar.bz2 # locally computed -sha256 c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d valgrind-3.23.0.tar.bz2 +sha256 8d54c717029106f1644aadaf802ab9692e53d93dd015cbd19e74190eba616bd7 valgrind-3.26.0.tar.bz2 # License files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING sha256 56976e64523fa1e68db4e6f464f5b2cb89d7d08f54b1d012e317b8db286b3faf COPYING.DOCS diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index a5cb4b1c03..dc8d73b943 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,10 +4,10 @@ # ################################################################################ -VALGRIND_VERSION = 3.23.0 +VALGRIND_VERSION = 3.26.0 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 -VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 +VALGRIND_LICENSE = GPL-3.0+, GFDL-1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS VALGRIND_CPE_ID_VENDOR = valgrind VALGRIND_CONF_OPTS = \ diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk index ab4c32143d..7c7fbfca9c 100644 --- a/package/vde2/vde2.mk +++ b/package/vde2/vde2.mk @@ -38,5 +38,10 @@ HOST_VDE2_CONF_OPTS = \ --disable-profile \ --enable-tuntap +# C23 changes meaning of empty argument prototypes like int (*)() +# causing build failures, so force gnu99 +VDE2_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +HOST_VDE2_CONF_ENV = CFLAGS="$(HOST_CFLAGS) -std=gnu99" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/vdr-plugin-vnsiserver/Config.in b/package/vdr-plugin-vnsiserver/Config.in index 0a0ab8d376..7100b2432c 100644 --- a/package/vdr-plugin-vnsiserver/Config.in +++ b/package/vdr-plugin-vnsiserver/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_VDR_PLUGIN_VNSISERVER depends on BR2_PACKAGE_VDR help VDR plugin to handle KODI clients. - The vdr-plugin-vnsiserver is able to handle serveral KODI + The vdr-plugin-vnsiserver is able to handle several KODI clients connecting via the VNSI addon. https://github.com/FernetMenta/vdr-plugin-vnsiserver diff --git a/package/vim/Config.in b/package/vim/Config.in index 1469be8dbe..16cf35e1b4 100644 --- a/package/vim/Config.in +++ b/package/vim/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_VIM_RUNTIME bool "install runtime" default y help - Install VIM runtime (syntax highlighing + macros). + Install VIM runtime (syntax highlighting + macros). This option adds about 11MB of data to /usr/share/ endif diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 194bcb4378..ae909aaeac 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 0056537cb57190aa41c12ba6c2ad04ce10e7f714cde4c1fe7193a37e1c44db46 vim-9.1.0145.tar.gz +sha256 4fe4cb284007e26255267338dde1ceac6f8326f78123ae8c96a36ee15a1ea7ba vim-9.1.1684.tar.gz sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE -sha256 7a2f621c8496396dae5eecdcc4dccff9d534dff4627193d3ebf7fa6d2cb27042 README.txt +sha256 ee1d0885bbc4a95a24e49873a075391bdf26b69d13758e30f3d9271f8f42bd2d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index fb8062e1fa..4297bdd198 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.1.0145 +VIM_VERSION = 9.1.1684 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src @@ -49,6 +49,7 @@ endif define VIM_INSTALL_TARGET_CMDS cd $(@D)/src; \ $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installpack; \ $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installtools; \ $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installlinks endef @@ -63,7 +64,8 @@ define VIM_REMOVE_DOCS $(RM) -rf $(TARGET_DIR)/usr/share/vim/vim*/doc/ endef -# Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation +# Avoid oopses with vipw/vigr (from package shadow), lack of $EDITOR, +# or other packages expecting plain 'vi' command to exist. ifeq ($(BR2_ROOTFS_MERGED_USR),y) define VIM_INSTALL_VI_SYMLINK ln -sf vim $(TARGET_DIR)/usr/bin/vi diff --git a/package/vlc/0011-live555-fix-build-with-versions-2024.11.28.patch b/package/vlc/0011-live555-fix-build-with-versions-2024.11.28.patch new file mode 100644 index 0000000000..9708f680c9 --- /dev/null +++ b/package/vlc/0011-live555-fix-build-with-versions-2024.11.28.patch @@ -0,0 +1,47 @@ +From 8befcbfa834b809602db24c9ba7456d8cfc25cdb Mon Sep 17 00:00:00 2001 +From: Florian Albrechtskirchinger +Date: Sun, 2 Mar 2025 08:30:43 +0100 +Subject: [PATCH] live555: fix build with versions >= 2024.11.28 + +In the 2024.11.28 release (version 1732752000), live555 introduced +`EventLoopWatchVariable` as a typedef for `std::atomic`, replacing +direct use of `char` in earlier versions. Add a conditional typedef to +define it as `char` for older versions, and update `event_rtsp` and +`event_data` to use `EventLoopWatchVariable`. + +Upstream: https://code.videolan.org/videolan/vlc/-/commit/8befcbfa834b809602db24c9ba7456d8cfc25cdb + +Signed-off-by: Bernd Kuhls +--- + modules/access/live555.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp +index 461766661e49..cacea3c46952 100644 +--- a/modules/access/live555.cpp ++++ b/modules/access/live555.cpp +@@ -194,6 +194,10 @@ class RTSPClientVlc; + #define CAP_SUBSESSION_PAUSE (1 << 3) + #define CAPS_DEFAULT CAP_RATE_CONTROL + ++#if LIVEMEDIA_LIBRARY_VERSION_INT < 1732752000 // 2024.11.28 ++typedef char EventLoopWatchVariable; ++#endif ++ + struct demux_sys_t + { + char *p_sdp; /* XXX mallocated */ +@@ -232,8 +236,8 @@ struct demux_sys_t + bool b_no_data; /* if we never received any data */ + int i_no_data_ti; /* consecutive number of TaskInterrupt */ + +- char event_rtsp; +- char event_data; ++ EventLoopWatchVariable event_rtsp; ++ EventLoopWatchVariable event_data; + + bool b_get_param; /* Does the server support GET_PARAMETER */ + bool b_paused; /* Are we paused? */ +-- +GitLab + diff --git a/package/vnstat/vnstat.hash b/package/vnstat/vnstat.hash index 87d2a6d687..dcd4920619 100644 --- a/package/vnstat/vnstat.hash +++ b/package/vnstat/vnstat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 babc3f1583cc40e4e8ffb2f53296d93d308cb5a5043e85054f6eaf7b4ae57856 vnstat-2.11.tar.gz +sha256 c9fe19312d1ec3ddfbc4672aa951cf9e61ca98dc14cad3d3565f7d9803a6b187 vnstat-2.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index 665c0feaf3..b8666c05a5 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -VNSTAT_VERSION = 2.11 +VNSTAT_VERSION = 2.13 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING diff --git a/package/volk/volk.hash b/package/volk/volk.hash index 3a363f0357..a24967f28b 100644 --- a/package/volk/volk.hash +++ b/package/volk/volk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ce62f645c2ee3ef8b38f923de78ef4df9a1b7696d618f57781955803ee29bab3 volk-3.1.2.tar.xz +sha256 93fcf717545f5e60491c57fd8dd348d814d3f95332d9dada5e53ab38015ff90a volk-3.2.0.tar.xz sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk index 396f4e6e8b..7b10f57bac 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,7 +4,7 @@ # ################################################################################ -VOLK_VERSION = 3.1.2 +VOLK_VERSION = 3.2.0 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz VOLK_LICENSE = LGPL-3.0+ diff --git a/package/vorbis-tools/vorbis-tools.hash b/package/vorbis-tools/vorbis-tools.hash index a4f463e466..e31daf96ac 100644 --- a/package/vorbis-tools/vorbis-tools.hash +++ b/package/vorbis-tools/vorbis-tools.hash @@ -1,4 +1,4 @@ # From http://downloads.xiph.org/releases/vorbis/SHA256SUMS -sha256 db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0 vorbis-tools-1.4.2.tar.gz +sha256 a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde vorbis-tools-1.4.3.tar.gz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk index 936d2d816c..d64fe0b1ee 100644 --- a/package/vorbis-tools/vorbis-tools.mk +++ b/package/vorbis-tools/vorbis-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -VORBIS_TOOLS_VERSION = 1.4.2 +VORBIS_TOOLS_VERSION = 1.4.3 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis VORBIS_TOOLS_LICENSE = GPL-2.0 VORBIS_TOOLS_LICENSE_FILES = COPYING diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 83c14e8823..299ca61649 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f114198b1efb7635c281cb191948f6ed1cecfa9a9e9be2c14d5356cd624eb60 vue-router-4.4.5.tgz +sha256 093fee5133cf82e75d25940d86f58a4e3f194b74262205ff5c1926aed53339c4 vue-router-4.5.1.tgz sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 7de4864d3f..a6d9df6dc2 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.4.5 +VUEJS_ROUTER_VERSION = 4.5.1 VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- VUEJS_ROUTER_LICENSE = MIT diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index 127d6201a3..894eaa4874 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ca13a1928f3c57c6b84f64c84c066e410f91c4f3c25ae61f5fce1557210b9927 vue-3.5.12.tgz +sha256 afddbe7bb09a00bb23e738c2a5354819bf662955fd4a06abc630a3d1acc41a8b vue-3.5.16.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index f2b5168c9f..8f5c002548 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.5.12 +VUEJS_VERSION = 3.5.16 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT diff --git a/package/vulkan-headers/Config.in b/package/vulkan-headers/Config.in index c0fc8f20b0..fdab31893f 100644 --- a/package/vulkan-headers/Config.in +++ b/package/vulkan-headers/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_VULKAN_HEADERS bool "vulkan-headers" + depends on BR2_INSTALL_LIBSTDCPP help The Khronos official Vulkan header files and API registry. https://github.com/KhronosGroup/Vulkan-Headers + +comment "vulkan-headers needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/vulkan-headers/vulkan-headers.hash b/package/vulkan-headers/vulkan-headers.hash index b38bfcff47..286639b579 100644 --- a/package/vulkan-headers/vulkan-headers.hash +++ b/package/vulkan-headers/vulkan-headers.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 317e467a5fb2eaa6a18b984ec70fdbfaccd93595a3e6f4bcceca7d3fab280505 vulkan-headers-1.3.262.tar.gz +sha256 78665959d10b09061d8c3e21db8bf3e8b699e2d3d532fce850a32312dba7228b vulkan-headers-1.4.317.tar.gz sha256 ac24e5ea920e4318e4d02c4086ae51f53cfb03feed06c18df1019e7ada1ec7bc LICENSE.md diff --git a/package/vulkan-headers/vulkan-headers.mk b/package/vulkan-headers/vulkan-headers.mk index 20b248364d..52d5b56086 100644 --- a/package/vulkan-headers/vulkan-headers.mk +++ b/package/vulkan-headers/vulkan-headers.mk @@ -6,7 +6,7 @@ # Note: changing this version will also affect vulkan-loader and # vulkan-tools, so please update those packages as well. -VULKAN_HEADERS_VERSION = 1.3.262 +VULKAN_HEADERS_VERSION = 1.4.317 VULKAN_HEADERS_SITE = $(call github,KhronosGroup,Vulkan-Headers,v$(VULKAN_HEADERS_VERSION)) VULKAN_HEADERS_LICENSE = Apache-2.0, MIT VULKAN_HEADERS_LICENSE_FILES = LICENSE.md diff --git a/package/vulkan-loader/vulkan-loader.hash b/package/vulkan-loader/vulkan-loader.hash index e09ecda8a9..5bfc02f5c8 100644 --- a/package/vulkan-loader/vulkan-loader.hash +++ b/package/vulkan-loader/vulkan-loader.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3bbaa5ee64058a89949eb777de66ce94bfe3141892514172cfc9451c756802d5 vulkan-loader-1.3.262.tar.gz +sha256 e4e18585fe902ee04e86c1cdb2996b686bffef2cab02cb6079221fe69df05af8 vulkan-loader-1.4.317.tar.gz sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece LICENSE.txt diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk index b1545a4972..7aceb207b5 100644 --- a/package/vulkan-loader/vulkan-loader.mk +++ b/package/vulkan-loader/vulkan-loader.mk @@ -15,15 +15,9 @@ VULKAN_LOADER_DEPENDENCIES = host-pkgconf vulkan-headers VULKAN_LOADER_CONF_OPTS += \ -DASSEMBLER_WORKS=FALSE \ -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DLOADER_CODEGEN=OFF -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -VULKAN_LOADER_DEPENDENCIES += directfb -VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=ON -else -VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=OFF -endif - ifeq ($(BR2_PACKAGE_LIBXCB),y) VULKAN_LOADER_DEPENDENCIES += libxcb VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON diff --git a/package/vulkan-sdk/Config.in b/package/vulkan-sdk/Config.in new file mode 100644 index 0000000000..a2cd51ef0f --- /dev/null +++ b/package/vulkan-sdk/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_VULKAN_SDK + bool "vulkan-sdk" + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_INSTALL_LIBSTDCPP # C++ + select BR2_PACKAGE_VULKAN_HEADERS + help + The Vulkan meta-loader + + https://github.com/zeux/volk + +comment "Vulkan-SDK needs toolchain w/ C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/vulkan-sdk/vulkan-sdk.hash b/package/vulkan-sdk/vulkan-sdk.hash new file mode 100644 index 0000000000..f0f3da0e79 --- /dev/null +++ b/package/vulkan-sdk/vulkan-sdk.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d86bcf1aff499f41a3e445b55df5e393a5ce49b1bda689eb7335b0a0a54a3c0b vulkan-sdk-1.4.313.0.tar.gz +sha256 33c831f76b79501665e66c23ac8f876020457c216d44526a8f747da897999b35 LICENSE.md diff --git a/package/vulkan-sdk/vulkan-sdk.mk b/package/vulkan-sdk/vulkan-sdk.mk new file mode 100644 index 0000000000..2851e511bc --- /dev/null +++ b/package/vulkan-sdk/vulkan-sdk.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# vulkan-sdk +# +################################################################################ + +VULKAN_SDK_VERSION = 1.4.313.0 +VULKAN_SDK_SITE = https://github.com/zeux/volk/archive/refs/tags +VULKAN_SDK_LICENSE = MIT +VULKAN_SDK_LICENSE_FILES = LICENSE.md +VULKAN_SDK_INSTALL_STAGING = YES + +VULKAN_SDK_DEPENDENCIES = vulkan-headers + +VULKAN_SDK_CONF_OPTS += -DVOLK_INSTALL=ON + +$(eval $(cmake-package)) diff --git a/package/vulkan-tools/Config.in b/package/vulkan-tools/Config.in index 54fa539dab..f0a4cfee93 100644 --- a/package/vulkan-tools/Config.in +++ b/package/vulkan-tools/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_VULKAN_TOOLS bool "vulkan-tools" depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader - depends on !BR2_STATIC_LIBS # vullan-loader + depends on !BR2_STATIC_LIBS # vulkan-loader, vulkan-sdk depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader select BR2_PACKAGE_VULKAN_HEADERS select BR2_PACKAGE_VULKAN_LOADER - + select BR2_PACKAGE_VULKAN_SDK help The Khronos official Vulkan Tools and Utilities. diff --git a/package/vulkan-tools/vulkan-tools.hash b/package/vulkan-tools/vulkan-tools.hash index 24c0697784..504177379b 100644 --- a/package/vulkan-tools/vulkan-tools.hash +++ b/package/vulkan-tools/vulkan-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c77d02694d0516ae2ba3f3718745647e87e788ef93faabb2e3674ff32608010 vulkan-tools-1.3.262.tar.gz +sha256 4586309ab5b2a9584fde62fd85b0ef5bb98b4cdbca9cb1ba3a2b4978dc2f355c vulkan-tools-1.4.317.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk index 68f7c1c04d..9deeda6086 100644 --- a/package/vulkan-tools/vulkan-tools.mk +++ b/package/vulkan-tools/vulkan-tools.mk @@ -11,20 +11,15 @@ VULKAN_TOOLS_LICENSE_FILES = LICENSE.txt VULKAN_TOOLS_DEPENDENCIES = \ vulkan-headers \ - vulkan-loader + vulkan-loader \ + vulkan-sdk VULKAN_TOOLS_CONF_OPTS += \ -DBUILD_CUBE=OFF \ -DBUILD_ICD=OFF \ -DBUILD_VULKANINFO=ON \ - -DINSTALL_ICD=OFF - -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -VULKAN_TOOLS_DEPENDENCIES += directfb -VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=ON -else -VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=OFF -endif + -DINSTALL_ICD=OFF \ + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF ifeq ($(BR2_PACKAGE_LIBXCB),y) VULKAN_TOOLS_DEPENDENCIES += libxcb diff --git a/package/w_scan/0001-musl.patch b/package/w_scan/0001-musl.patch deleted file mode 100644 index 46d67677a8..0000000000 --- a/package/w_scan/0001-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix musl build - -Signed-off-by: Bernd Kuhls - -diff -uNr w_scan-20141122.org/descriptors.h w_scan-20141122/descriptors.h ---- w_scan-20141122.org/descriptors.h 2014-11-22 09:49:26.000000000 +0100 -+++ w_scan-20141122/descriptors.h 2016-01-24 14:05:21.000000000 +0100 -@@ -28,6 +28,7 @@ - #ifndef __DESCRIPTORS_H__ - #define __DESCRIPTORS_H__ - -+#include - #include "extended_frontend.h" - - /****************************************************************************** -diff -uNr w_scan-20141122.org/version.h w_scan-20141122/version.h ---- w_scan-20141122.org/version.h 2014-11-22 11:59:56.000000000 +0100 -+++ w_scan-20141122/version.h 2016-01-24 14:06:33.000000000 +0100 -@@ -1,6 +1,6 @@ - /* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */ - #ifndef W_SCAN_VERSION_H - #define W_SCAN_VERSION_H --uint version=20170107; -+unsigned int version=20170107; - #endif - diff --git a/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch b/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch deleted file mode 100644 index 50d2488190..0000000000 --- a/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,37 +0,0 @@ -si_types.h: fix build with gcc 10 - -Drop service_t, p_service_t, transponder_t and p_transponder_t to avoid -the following build failure with gcc 10 (which defaults to -fno-common): - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -lrt -o w_scan atsc_psip_section.o countries.o descriptors.o diseqc.o dump-dvbscan.o dump-vdr.o dump-xine.o dump-mplayer.o dump-vlc-m3u.o dvbscan.o lnb.o parse-dvbscan.o satellites.o scan.o section.o tools.o emulate.o dump-xml.o iconv_codes.o char-coding.o -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x404): multiple definition of `p_transponder_t'; countries.o:(.bss+0x0): first defined here -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x408): multiple definition of `transponder_t'; countries.o:(.bss+0x4): first defined here -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x480): multiple definition of `p_service_t'; countries.o:(.bss+0x7c): first defined here -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x484): multiple definition of `service_t'; countries.o:(.bss+0x80): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/5640442cb4ba06bcbcf31540a64f5665862d39f7 - -Signed-off-by: Fabrice Fontaine - -diff -Nura w_scan-20170107.orig/si_types.h w_scan-20170107/si_types.h ---- w_scan-20170107.orig/si_types.h 2020-09-20 11:09:56.776963441 +0200 -+++ w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200 -@@ -114,7 +114,7 @@ - uint32_t logical_channel_number; - uint8_t running; - void * priv; --} service_t, * p_service_t; -+}; - - /******************************************************************************* - /* transponder type. -@@ -201,7 +201,7 @@ - /*----------------------------*/ - char * network_name; - network_change_t network_change; --} __attribute__((packed)) transponder_t, * p_transponder_t; -+} __attribute__((packed)); - - /******************************************************************************* - /* satellite channel routing type. diff --git a/package/w_scan/Config.in b/package/w_scan/Config.in deleted file mode 100644 index d5471200ad..0000000000 --- a/package/w_scan/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "w_scan needs a toolchain w/ headers >= 3.7" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - -config BR2_PACKAGE_W_SCAN - bool "w_scan" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - w_scan is a small command line utility used to perform - frequency scans for DVB and ATSC transmissions. It is - capable of creating channels.conf files (in different output - formats !) as well as initial tuning data for scan. - - https://www.gen2vdr.de/wirbel/w_scan/index2.html diff --git a/package/w_scan/w_scan.hash b/package/w_scan/w_scan.hash deleted file mode 100644 index fcb0e611bc..0000000000 --- a/package/w_scan/w_scan.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe w_scan-20170107.tar.bz2 -sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/w_scan/w_scan.mk b/package/w_scan/w_scan.mk deleted file mode 100644 index c63f20cc9e..0000000000 --- a/package/w_scan/w_scan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# w_scan -# -################################################################################ - -W_SCAN_VERSION = 20170107 -W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2 -W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan -W_SCAN_LICENSE = GPL-2.0+ -W_SCAN_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -W_SCAN_DEPENDENCIES += libiconv -W_SCAN_CONF_ENV += LIBS=-liconv -endif - -$(eval $(autotools-package)) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index 543bea5d7b..061a093c55 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 9ee587d802ffd15a2e7cae579560d00754db4fad waf-2.1.1 -sha256 2e66e01fd564f09106419389119c78143327c89a35f26ee3ed376f0ee410a14d waf-2.1.1 +sha1 d11579fb088200adc5e6bf6c96e31fcb7afd94cb waf-2.1.6 +sha256 4bc4587a11925e19739da021e021a5764d39759fada85563bc6d4ded17515b14 waf-2.1.6 # The waf script also contains its license, but is renamed `waf` in the extract # step, so this is a synonym for the above, to check WAF_LICENSE -sha256 2e66e01fd564f09106419389119c78143327c89a35f26ee3ed376f0ee410a14d waf +sha256 4bc4587a11925e19739da021e021a5764d39759fada85563bc6d4ded17515b14 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index a12d15a228..911dcc5fc6 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.1.1 +WAF_VERSION = 2.1.6 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause diff --git a/package/waffle/Config.in b/package/waffle/Config.in index 79cb4ca2ed..c8661e1a0b 100644 --- a/package/waffle/Config.in +++ b/package/waffle/Config.in @@ -44,4 +44,4 @@ config BR2_PACKAGE_WAFFLE [1] http://piglit.freedesktop.org [2] http://github.com/apitrace/apitrace#readme - http://www.waffle-gl.org + https://waffle.freedesktop.org/ diff --git a/package/waffle/waffle.hash b/package/waffle/waffle.hash index 8968dd6fd3..bb12efefca 100644 --- a/package/waffle/waffle.hash +++ b/package/waffle/waffle.hash @@ -1,5 +1,3 @@ -# From https://gitlab.freedesktop.org/mesa/waffle/uploads/42030b1cc0f81fd738152104e1811919/waffle-1.7.0.sha256sums -sha256 69e42d15d08f63e7a54a8b8770295a6eb04dfd1c6f86c328b6039dbe7de28ef3 waffle-1.7.0.tar.xz - # Locally calculated +sha256 1058cca5ccd6c0c22c9c0cbe65f91a5dda5f77d08dac4ac8a38400bdd72be491 waffle-v1.8.0-95-g5f1f48287e806544d745e9a8f5aed47234c61292-git4.tar.gz sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt diff --git a/package/waffle/waffle.mk b/package/waffle/waffle.mk index 87d44c4217..24c7efe64d 100644 --- a/package/waffle/waffle.mk +++ b/package/waffle/waffle.mk @@ -4,47 +4,49 @@ # ################################################################################ -WAFFLE_VERSION = 1.7.0 -WAFFLE_SOURCE = waffle-$(WAFFLE_VERSION).tar.xz -WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/uploads/9eaadda4ec2ed1d8a26ddefd2cfd16be +WAFFLE_VERSION = v1.8.0-95-g5f1f48287e806544d745e9a8f5aed47234c61292 +WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle.git +WAFFLE_SITE_METHOD = git WAFFLE_INSTALL_STAGING = YES WAFFLE_LICENSE = BSD-2-Clause WAFFLE_LICENSE_FILES = LICENSE.txt WAFFLE_DEPENDENCIES = host-pkgconf -WAFFLE_CONF_OPTS = -Dwaffle_build_tests=OFF \ - -Dwaffle_build_examples=OFF \ - -Dwaffle_build_manpages=OFF \ - -Dwaffle_build_htmldocs=OFF \ - -Dwaffle_has_nacl=OFF +WAFFLE_CONF_OPTS = \ + -Dbuild.pkg_config_path=$(STAGING_DIR)/usr/lib/pkgconfig \ + -Dbuild-tests=false \ + -Dbuild-examples=false \ + -Dbuild-manpages=false \ + -Dbuild-htmldocs=false \ + -Dnacl=false ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND),y) WAFFLE_DEPENDENCIES += libegl wayland -WAFFLE_CONF_OPTS += -Dwaffle_has_wayland=ON +WAFFLE_CONF_OPTS += -Dwayland=enabled else -WAFFLE_CONF_OPTS += -Dwaffle_has_wayland=OFF +WAFFLE_CONF_OPTS += -Dwayland=disabled endif ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL),y) WAFFLE_DEPENDENCIES += libegl libxcb xlib_libX11 -WAFFLE_CONF_OPTS += -Dwaffle_has_x11_egl=ON +WAFFLE_CONF_OPTS += -Dx11_egl=enabled else -WAFFLE_CONF_OPTS += -Dwaffle_has_x11_egl=OFF +WAFFLE_CONF_OPTS += -Dx11_egl=disabled endif ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_GLX),y) WAFFLE_DEPENDENCIES += libgl libxcb xlib_libX11 -WAFFLE_CONF_OPTS += -Dwaffle_has_glx=ON +WAFFLE_CONF_OPTS += -Dglx=enabled else -WAFFLE_CONF_OPTS += -Dwaffle_has_glx=OFF +WAFFLE_CONF_OPTS += -Dglx=disabled endif ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_GBM),y) WAFFLE_DEPENDENCIES += libegl udev -WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=ON +WAFFLE_CONF_OPTS += -Dgbm=enabled else -WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF +WAFFLE_CONF_OPTS += -Dgbm=disabled endif ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) @@ -53,9 +55,9 @@ endif ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) WAFFLE_DEPENDENCIES += mesa3d -WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=ON +WAFFLE_CONF_OPTS += -Dsurfaceless_egl=enabled else -WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=OFF +WAFFLE_CONF_OPTS += -Dsurfaceless_egl=disabled endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/watchdog/0001-Do-not-guard-shutdown-__GLIBC__.patch b/package/watchdog/0001-Do-not-guard-shutdown-__GLIBC__.patch new file mode 100644 index 0000000000..7140888753 --- /dev/null +++ b/package/watchdog/0001-Do-not-guard-shutdown-__GLIBC__.patch @@ -0,0 +1,39 @@ +From aa371bf201b1d59c595a1ad7b3464ae544ed142f Mon Sep 17 00:00:00 2001 +From: Paul Crawford +Date: Thu, 16 Mar 2023 11:42:34 +0000 +Subject: [PATCH] Do not guard shutdown __GLIBC__ + +- Patch by Khem Raj + +- These headers are provided by uclibc/musl/glibc and bionic so we can + assume they are not needed to be glibc specific includes. This also + ensures that we get proper declaration of reboot() API + +Upstream: https://sourceforge.net/p/watchdog/code/ci/aa371bf201b1d59c595a1ad7b3464ae544ed142f/ + +Signed-off-by: Yegor Yefremov +--- + src/shutdown.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/shutdown.c b/src/shutdown.c +index 1d9a857..6aea0d0 100644 +--- a/src/shutdown.c ++++ b/src/shutdown.c +@@ -29,13 +29,9 @@ + #include "extern.h" + #include "ext2_mnt.h" + +-#if defined __GLIBC__ + #include + #include + #include +-#else /* __GLIBC__ */ +-#include +-#endif /* __GLIBC__ */ + + #include + +-- +2.34.1 + diff --git a/package/watchdogd/0001-Fix-use-of-uninitialized-exit-status.patch b/package/watchdogd/0001-Fix-use-of-uninitialized-exit-status.patch new file mode 100644 index 0000000000..69e7b36ef4 --- /dev/null +++ b/package/watchdogd/0001-Fix-use-of-uninitialized-exit-status.patch @@ -0,0 +1,85 @@ +From f6d56c374723923e276ccfd442fdd0cabf23d095 Mon Sep 17 00:00:00 2001 +From: Fiona Klute +Date: Fri, 14 Feb 2025 19:26:24 +0100 +Subject: [PATCH] Fix use of uninitialized exit status + +Depending on the timing between the SIGCHLD callback run and the first +generic_cb() timer callback run, script_exit_status() sometimes +returned uninitialized memory as the exit status of a script. This +could lead to incorrect "critical error" reports if that uninitialized +memory happened to contain a value that interpreted as an int was +above the critical threshold. + +Additionally, script_exit_status() unconditionally removed the process +information from the queue, meaning that if a process had not +completed by the time its status was first probed, its status could +never be updated or successfully probed again, leading to timeout. Fix +this by removing the process only if the status indicates it has +terminated (successful or not). + +The problems affected primarily scripts running approximately one +second or longer, because very short running scripts will very likely +have their exit status collected by the SIGCHLD callback before the +first timer callback run. + +Signed-off-by: Fiona Klute +Upstream: https://github.com/troglobit/watchdogd/pull/52 +--- + src/script.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/src/script.c b/src/script.c +index 1220fb9..f6e0763 100644 +--- a/src/script.c ++++ b/src/script.c +@@ -16,6 +16,7 @@ + */ + + #include ++#include /* bool type (before C23) */ + #include /* setenv() */ + #include /* waitpid() */ + #include /* execv(), _exit() */ +@@ -28,6 +29,7 @@ + struct exec_info { + pid_t pid; + int exit_status; ++ bool exited; + void (*cb)(void *arg); + void *arg; + LIST_ENTRY(exec_info) entry; +@@ -64,6 +66,8 @@ static void add(pid_t pid, void (*cb)(void *), void *arg) + } + + info->pid = pid; ++ info->exit_status = 0; ++ info->exited = false; + info->cb = cb; + info->arg = arg; + LIST_INSERT_HEAD(&exec_info_head, info, entry); +@@ -78,6 +82,7 @@ static int exec(pid_t pid, int status) + continue; + + info->exit_status = status; ++ info->exited = true; + if (info->cb) + info->cb(info->arg); + +@@ -96,9 +101,11 @@ int script_exit_status(pid_t pid) + if (info->pid != pid) + continue; + +- status = info->exit_status; +- LIST_REMOVE(info, entry); +- free(info); ++ if (info->exited) { ++ status = info->exit_status; ++ LIST_REMOVE(info, entry); ++ free(info); ++ } + break; + } + +-- +2.47.2 + diff --git a/package/watchdogd/S01watchdogd b/package/watchdogd/S01watchdogd old mode 100755 new mode 100644 index df57b8ad7a..8f811ac0fc --- a/package/watchdogd/S01watchdogd +++ b/package/watchdogd/S01watchdogd @@ -1,47 +1,77 @@ #!/bin/sh DAEMON="watchdogd" -PIDFILE="/var/run/$DAEMON.pid" +PIDFILE="/var/run/$DAEMON/pid" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" -cmd() -{ - start-stop-daemon -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" "$@" - status=$? - if [ $status -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return $status +start() { + printf "Starting %s: " "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon --start --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" -- $WATCHDOGD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf "Stopping %s: " "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + # watchdogd deletes its PID file on exit, wait for it to be gone + while [ -f "$PIDFILE" ]; do + sleep 0.1 + done + return "$status" +} + +restart() { + stop + start +} + +reload() { + printf "Reloading %s config: " "$DAEMON" + start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } case "$1" in - start) - printf 'Starting %s: ' "$DAEMON" - # shellcheck disable=SC2086 # we need the word splitting - cmd -S -- $SMCROUTED_ARGS - ;; - - stop) - printf 'Stopping %s: ' "$DAEMON" - cmd -K - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - reload) - printf 'Reloading %s: ' "$DAEMON" - cmd -K -s HUP - ;; - - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; esac + +exit $? diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index 93d40a919c..f35c054dff 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043581.html -sha256 71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92 wayland-protocols-1.36.tar.xz -sha512 5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0 wayland-protocols-1.36.tar.xz +# From https://lore.freedesktop.org/wayland-devel/aEw0AP7h6T8l11ug@gmail.com/T/#u +sha256 4d2b2a9e3e099d017dc8107bf1c334d27bb87d9e4aff19a0c8d856d17cd41ef0 wayland-protocols-1.45.tar.xz +sha512 d0557a75eb486fb824f182648bec346e270cb1ada8727613377ab95b0ccb595c516de242f486110c88b7009e98c87b071bf5b598f84466e5624aa1d81f19e195 wayland-protocols-1.45.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index c0dfe69401..0cb23f8438 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,13 +4,15 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.36 +WAYLAND_PROTOCOLS_VERSION = 1.45 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT WAYLAND_PROTOCOLS_LICENSE_FILES = COPYING WAYLAND_PROTOCOLS_INSTALL_STAGING = YES WAYLAND_PROTOCOLS_INSTALL_TARGET = NO +# needs wayland-scanner +WAYLAND_PROTOCOLS_DEPENDENCIES = host-wayland WAYLAND_PROTOCOLS_CONF_OPTS = -Dtests=false diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index 627cb5a1b0..8da9dbe745 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2024-May/043636.html -sha256 05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2 wayland-1.23.0.tar.xz -sha512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81 wayland-1.23.0.tar.xz +# From https://lore.freedesktop.org/wayland-devel/plU5smxin5VXbiedTGtL7CNHe0t2mHtgQlQ3-xwREmSSNYaClAcZpEBV8L7JvMT8JHwdD_a_uSFkDUaP45CAWyL545iZh5gInAdToX6hgt4=@emersion.fr/T/#u +sha256 82892487a01ad67b334eca83b54317a7c86a03a89cfadacfef5211f11a5d0536 wayland-1.24.0.tar.xz +sha512 60216602cffd1473ae15381f9e9a6f3829e742cac83843ca65360ba78bcff8d9442f15eb6a6d5d29c8f74dd920762ca1605f51658d22a1d3c18e338505b9f974 wayland-1.24.0.tar.xz # Locally calculated sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index 06adafc3e1..6add648d5d 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.23.0 +WAYLAND_VERSION = 1.24.0 WAYLAND_SITE = https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(WAYLAND_VERSION)/downloads WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT @@ -23,5 +23,17 @@ define WAYLAND_TARGET_CLEANUP endef WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP +# The wayland-scanner.pc installed by the target wayland package is +# used to find the wayland-scanner tool, which in a cross-compilation +# context is compiled for the host (and in Buildroot, compiled by +# host-wayland). Below, we tweak the target wayland-scanner.pc so that +# when the wayland_scanner variable is requested through pkg-config, +# it points to the host wayland_scanner tool. +define WAYLAND_TWEAK_WAYLAND_SCANNER_PATH + $(SED) 's%^wayland_scanner=.*%wayland_scanner=$(HOST_DIR)/bin/wayland-scanner%' \ + $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc +endef +WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TWEAK_WAYLAND_SCANNER_PATH + $(eval $(meson-package)) $(eval $(host-meson-package)) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index e6ab405cd5..7827dc6218 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,12 +16,13 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 or libgtk4 and a toolchain w/ C++, wchar, NPTL, dynamic library, gcc >= 11, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT - depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ + depends on (!BR2_PACKAGE_LIBGTK3 && !BR2_PACKAGE_LIBGTK4) || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_11 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,10 +33,10 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_USE_WCHAR # icu, libsoup3 - depends on BR2_PACKAGE_LIBGTK3 + depends on BR2_PACKAGE_LIBGTK3 || BR2_PACKAGE_LIBGTK4 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG @@ -53,11 +54,12 @@ 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 - select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK3_X11 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_WEBKITGTK_X11 + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_WEBKITGTK_X11 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_WEBKITGTK_X11 + select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_WEBKITGTK_X11 help WebKit is an open source, standards compliant web browser engine. @@ -66,6 +68,22 @@ config BR2_PACKAGE_WEBKITGTK if BR2_PACKAGE_WEBKITGTK +comment "webkitgtk X11 target needs the X11 GDK backend" + depends on !BR2_PACKAGE_LIBGTK3_X11 && !BR2_PACKAGE_LIBGTK4_X11 + +config BR2_PACKAGE_WEBKITGTK_X11 + bool "enable x11 target" + default y + depends on BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK4_X11 + +comment "webkitgtk Wayland target needs the Wayland GDK backend" + depends on !BR2_PACKAGE_LIBGTK3_WAYLAND && !BR2_PACKAGE_LIBGTK4_WAYLAND + +config BR2_PACKAGE_WEBKITGTK_WAYLAND + bool "enable wayland target" + default y + depends on BR2_PACKAGE_LIBGTK3_WAYLAND || BR2_PACKAGE_LIBGTK4_WAYLAND + config BR2_PACKAGE_WEBKITGTK_SANDBOX bool "sandboxing support" depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7da0e97e5d..90304074ac 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz.sums -sha1 e62b2c545011a2f180a914529a68950c4d34a2ee webkitgtk-2.44.2.tar.xz -sha256 523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b webkitgtk-2.44.2.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.50.1.tar.xz.sums +sha1 b599be86497f57fc5b2eb8b5d60ff181fc651752 webkitgtk-2.50.1.tar.xz +sha256 33e912ee6e3cdb4b9803715f50686af85a60af47f1cf72a6acc6a2db1bb3d9fe webkitgtk-2.50.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 19740b3b4e..fecca3529d 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.44.2 +WEBKITGTK_VERSION = 2.50.1 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -14,11 +14,15 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ - enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk3 libsecret \ + enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret \ libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2 WEBKITGTK_CMAKE_BACKEND = ninja +# Buildroot adds support for ccache through its +# toolchain-wrapper, so tell webkitgtk not to mess with it. +WEBKITGTK_CONF_ENV = WK_USE_CCACHE=NO + WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_DOCUMENTATION=OFF \ @@ -28,10 +32,19 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ -DUSE_AVIF=OFF \ - -DUSE_GTK4=OFF \ -DUSE_LIBHYPHEN=OFF \ + -DUSE_SKIA=OFF \ + -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \ -DUSE_WOFF2=ON +ifeq ($(BR2_PACKAGE_LIBGTK4),y) +WEBKITGTK_CONF_OPTS += -DUSE_GTK4=ON +WEBKITGTK_DEPENDENCIES += libgtk4 +else +WEBKITGTK_CONF_OPTS += -DUSE_GTK4=OFF +WEBKITGTK_DEPENDENCIES += libgtk3 +endif + ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_BUBBLEWRAP_SANDBOX=ON \ @@ -47,7 +60,7 @@ WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \ -DENABLE_WEB_AUDIO=ON \ -DENABLE_WEB_CODECS=ON -WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base +WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-bad gst1-plugins-base else WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ @@ -62,15 +75,28 @@ WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif ifeq ($(BR2_PACKAGE_WEBKITGTK_MINIBROWSER),y) +ifeq ($(BR2_PACKAGE_LIBGTK4),y) +define WEBKITGTK_INSTALL_MINIBROWSER_SYMLINK + ln -sf ../libexec/webkitgtk-6.0/MiniBrowser $(TARGET_DIR)/usr/bin/MiniBrowser +endef +else define WEBKITGTK_INSTALL_MINIBROWSER_SYMLINK ln -sf ../libexec/webkit2gtk-4.1/MiniBrowser $(TARGET_DIR)/usr/bin/MiniBrowser endef +endif WEBKITGTK_POST_INSTALL_TARGET_HOOKS += WEBKITGTK_INSTALL_MINIBROWSER_SYMLINK WEBKITGTK_CONF_OPTS += -DENABLE_MINIBROWSER=ON else WEBKITGTK_CONF_OPTS += -DENABLE_MINIBROWSER=OFF endif +ifeq ($(BR2_PACKAGE_FLITE),y) +WEBKITGTK_CONF_OPTS += -DENABLE_SPEECH_SYNTHESIS=ON +WEBKITGTK_DEPENDENCIES += flite +else +WEBKITGTK_CONF_OPTS += -DENABLE_SPEECH_SYNTHESIS=OFF +endif + ifeq ($(BR2_PACKAGE_LCMS2),y) WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON WEBKITGTK_DEPENDENCIES += lcms2 @@ -92,6 +118,13 @@ else WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WEBKITGTK_CONF_OPTS += -DUSE_LIBDRM=ON +WEBKITGTK_DEPENDENCIES += libdrm +else +WEBKITGTK_CONF_OPTS += -DUSE_LIBDRM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBJXL),y) WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON WEBKITGTK_DEPENDENCIES += libjxl @@ -113,7 +146,7 @@ else WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF endif -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) +ifeq ($(BR2_PACKAGE_WEBKITGTK_X11),y) WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -121,7 +154,7 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) +ifeq ($(BR2_PACKAGE_WEBKITGTK_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON else WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF diff --git a/package/webp/webp.hash b/package/webp/webp.hash index d579356a7c..8d80c72711 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5 libwebp-1.4.0.tar.gz +sha256 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c libwebp-1.5.0.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index a4d030948b..83d5506c0f 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.4.0 +WEBP_VERSION = 1.5.0 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause diff --git a/package/webrtc-audio-processing/0001-webrtc-api-task_queue-task_queue_base.h-include-cstd.patch b/package/webrtc-audio-processing/0001-webrtc-api-task_queue-task_queue_base.h-include-cstd.patch new file mode 100644 index 0000000000..db253d1dd8 --- /dev/null +++ b/package/webrtc-audio-processing/0001-webrtc-api-task_queue-task_queue_base.h-include-cstd.patch @@ -0,0 +1,29 @@ +From 9b59846b4f9a723743532f26c344d84084b7af96 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 29 Aug 2025 07:31:50 +0200 +Subject: [PATCH] webrtc/api/task_queue/task_queue_base.h: include + for uint32_t + +This is needed since GCC 15.x. + +Upstream: not applicable, code has completely changed in latest versions +Signed-off-by: Thomas Petazzoni +--- + webrtc/api/task_queue/task_queue_base.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/webrtc/api/task_queue/task_queue_base.h b/webrtc/api/task_queue/task_queue_base.h +index 90b1efd..7403ee9 100644 +--- a/webrtc/api/task_queue/task_queue_base.h ++++ b/webrtc/api/task_queue/task_queue_base.h +@@ -11,6 +11,7 @@ + #define API_TASK_QUEUE_TASK_QUEUE_BASE_H_ + + #include ++#include + + #include "api/task_queue/queued_task.h" + #include "rtc_base/system/rtc_export.h" +-- +2.50.1 + diff --git a/package/weston/0001-build-Allow-libdisplay-info-0.3.0.patch b/package/weston/0001-build-Allow-libdisplay-info-0.3.0.patch new file mode 100644 index 0000000000..d97d1a9bf4 --- /dev/null +++ b/package/weston/0001-build-Allow-libdisplay-info-0.3.0.patch @@ -0,0 +1,37 @@ +From 83b49400c1dfb72e3019267fd03f165d0bffec76 Mon Sep 17 00:00:00 2001 +From: Fiona Klute +Date: Mon, 6 Oct 2025 15:20:26 +0200 +Subject: [PATCH] build: Allow libdisplay-info 0.3.0 + +This is a backport of the change in upstream commit +683eabb61ec43a270f2e3ed67c63bbe3754b1214 "build: Allow libdisplay-info 0.3.0" +[1], applying the loosened version limit to the DRM backend only. The dependency +definition was moved to the top level meson.build in [2], and the lower bound +increased in [3]. + +[1] https://gitlab.freedesktop.org/wayland/weston/-/commit/683eabb61ec43a270f2e3ed67c63bbe3754b1214 +[2] https://gitlab.freedesktop.org/wayland/weston/-/commit/76e659f45edd23a8b1b253a93316ec73c709bc71 +[3] https://gitlab.freedesktop.org/wayland/weston/-/commit/82c5b386d860a479ed5a157f4dde58ffe202b948 + +Upstream: https://gitlab.freedesktop.org/wayland/weston/-/commit/683eabb61ec43a270f2e3ed67c63bbe3754b1214 (backported) +Signed-off-by: Fiona Klute (WIWA) +--- + libweston/backend-drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 002669e6..a8f2ea59 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build +@@ -4,7 +4,7 @@ endif + + dep_libdisplay_info = dependency( + 'libdisplay-info', +- version: ['>= 0.1.1', '< 0.3.0'], ++ version: ['>= 0.1.1', '< 0.4.0'], + fallback: ['display-info', 'di_dep'], + default_options: [ + 'werror=false', +-- +2.51.0 + diff --git a/package/weston/Config.in b/package/weston/Config.in index 89bcaa4aa0..614fef6bcc 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDISPLAY_INFO select BR2_PACKAGE_LIBDRM diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 2fdc6ec1f4..cd2a82508d 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2024-September/043776.html -sha256 47fd0325b0b948e9b003a38fdf4eb3a8581f3fdc740b8932b35ae8793bf4e4a5 weston-14.0.0.tar.xz -sha512 8bdeed91befd5cbb0bde0f1860ff7775c1835a5fa8c3bf26e99d2f0c16e81255fcf35bf338ae02d7826463d0efdf41ba3fe78e38e4c27787831dfa331acafc08 weston-14.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2025-April/044158.html +sha256 b47216b3530da76d02a3a1acbf1846a9cd41d24caa86448f9c46f78f20b6e0ac weston-14.0.2.tar.xz +sha512 e8214ec893e6c3ae94eb3c92feba104b0201843e9143f726a3e9a4d396d02523c94da706c1348cf934bc339fb1a4bc1fecdb865f0ea914115fd346d9eda091f5 weston-14.0.2.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index d879dcc965..57869b7e63 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 14.0.0 +WESTON_VERSION = 14.0.2 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -36,7 +36,8 @@ WESTON_SIMPLE_CLIENTS += dmabuf-v4l endif endif # BR2_PACKAGE_WESTON_SIMPLE_CLIENTS -ifeq ($(BR2_PACKAGE_JPEG),y) +# weston uses jpeg_read_icc_profile(), only provided by jpeg-turbo +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) WESTON_CONF_OPTS += -Dimage-jpeg=true WESTON_DEPENDENCIES += jpeg else diff --git a/package/wget/wget.hash b/package/wget/wget.hash index a0561d8d0a..da71b49d09 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,8 +1,8 @@ -# From https://lists.gnu.org/archive/html/bug-wget/2024-03/msg00008.html -sha1 01659f427c2e90c7c943805db69ea00f5da79b07 wget-1.24.5.tar.lz +# From https://lists.gnu.org/archive/html/bug-wget/2024-11/msg00002.html +sha1 ca79e61fbf1d32133f60ef7c7d476b250b6da423 wget-1.25.0.tar.lz # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.24.5.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.25.0.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 57a107151e4ef94fdf94affecfac598963f372f13293ed9c74032105390b36ee wget-1.24.5.tar.lz +sha256 19225cc756b0a088fc81148dc6a40a0c8f329af7fd8483f1c7b2fe50f4e08a1f wget-1.25.0.tar.lz # Locally calculated sha256 f7dc7522e7e1be9227f3dc8de8b39a4d1d2471968c893af15f00c1a2076a0eec COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d2a3a38e50..e3143647d7 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.24.5 +WGET_VERSION = 1.25.0 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf diff --git a/package/which/which.hash b/package/which/which.hash index edea4e5e34..b7784fdbf5 100644 --- a/package/which/which.hash +++ b/package/which/which.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad which-2.21.tar.gz +sha256 a2c558226fc4d9e4ce331bd2fd3c3f17f955115d2c00e447618a4ef9978a2a73 which-2.23.tar.gz # Locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/which/which.mk b/package/which/which.mk index c96e893756..c914c66839 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -4,7 +4,7 @@ # ################################################################################ -WHICH_VERSION = 2.21 +WHICH_VERSION = 2.23 WHICH_SITE = $(BR2_GNU_MIRROR)/which WHICH_LICENSE = GPL-3.0+ WHICH_LICENSE_FILES = COPYING diff --git a/package/whois/whois.hash b/package/whois/whois.hash index fb140fa198..e671347eae 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,6 @@ -# From http://snapshot.debian.org/archive/debian/20221017T031443Z/pool/main/w/whois/whois_5.5.14.dsc -sha256 bf9c2cb307d5419b34ad401eecf2820b8f69660db41cf0762e5da71fa2df68e8 whois_5.5.14.tar.xz +# From https://snapshot.debian.org/archive/debian/20251116T144052Z/pool/main/w/whois/whois_5.6.5.dsc +sha1 a550d7c51399fc24d9f325cb48560ef8d406fbbf whois_5.6.5.tar.xz +sha256 3ec4168da3ff61e5e426964428202bc0573ad6ecc1f3baf6f43daea6c748aa7d whois_5.6.5.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index e98add4e6a..78811e69fc 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.14 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20221017T031443Z/pool/main/w/whois +WHOIS_VERSION = 5.6.5 +WHOIS_SITE = https://snapshot.debian.org/archive/debian/20251116T144052Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/wilc-driver/0008-Fix-build-with-Linux-6.7.patch b/package/wilc-driver/0008-Fix-build-with-Linux-6.7.patch new file mode 100644 index 0000000000..9714a828eb --- /dev/null +++ b/package/wilc-driver/0008-Fix-build-with-Linux-6.7.patch @@ -0,0 +1,46 @@ +From c2024eb93f6d7ec605226d5d8a29ea17fbc71b5d Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 17 Apr 2025 19:06:48 +0200 +Subject: [PATCH] Fix build with Linux 6.7 + +During commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bb55441c57ccc5cc2eab44e1a97698b9d708871d +struct cfg80211_ap_settings has been split into multiple structs including +beacon. So is Linux version is 6.7+ let's use &info->beacon in place of +beacon. + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/8 +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 5c92062..25da3a1 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1822,13 +1822,21 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, + } + + static int change_beacon(struct wiphy *wiphy, struct net_device *dev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) ++ struct cfg80211_ap_update *info) ++#else + struct cfg80211_beacon_data *beacon) ++#endif + { + struct wilc_vif *vif = netdev_priv(dev); + + PRINT_INFO(vif->ndev, HOSTAPD_DBG, "Setting beacon\n"); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) ++ return wilc_add_beacon(vif, 0, 0, &info->beacon); ++#else + return wilc_add_beacon(vif, 0, 0, beacon); ++#endif + } + + static int stop_ap(struct wiphy *wiphy, struct net_device *dev +-- +2.39.5 + diff --git a/package/wilc-driver/0009-Fix-build-with-Linux-6.8.patch b/package/wilc-driver/0009-Fix-build-with-Linux-6.8.patch new file mode 100644 index 0000000000..2bafd53a9a --- /dev/null +++ b/package/wilc-driver/0009-Fix-build-with-Linux-6.8.patch @@ -0,0 +1,34 @@ +From 90e679f1b7caad02e68fa8672be6569eb1b2b76f Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 17 Apr 2025 18:56:55 +0200 +Subject: [PATCH] Fix build with Linux 6.8 + +With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d26270061ae66b915138af7cd73ca6f8b85e6b44 +strlcpy() has been superseded in favor of strscpy() so let's #define +strlcpy as strscpy if Linux version 6.8+ + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/8 +Signed-off-by: Giulio Benetti +--- + mon.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mon.c b/mon.c +index 2c9c2d9..20b7e20 100644 +--- a/mon.c ++++ b/mon.c +@@ -6,6 +6,10 @@ + + #include "cfg80211.h" + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)) ++#define strlcpy strscpy ++#endif ++ + struct wilc_wfi_radiotap_hdr { + struct ieee80211_radiotap_header hdr; + u8 rate; +-- +2.39.5 + diff --git a/package/wilc-driver/0010-Fix-build-with-Linux-6.10.patch b/package/wilc-driver/0010-Fix-build-with-Linux-6.10.patch new file mode 100644 index 0000000000..08444b06e2 --- /dev/null +++ b/package/wilc-driver/0010-Fix-build-with-Linux-6.10.patch @@ -0,0 +1,55 @@ +From 684eb3e40c88ee7a2cd4417a12b9b27a35e86655 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 17 Apr 2025 18:41:07 +0200 +Subject: [PATCH] Fix build with Linux 6.10 + +During commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9b163e0d330debbf7dcc14b2c3e2dc19a3b50a1d +is_dma_mapped member has been dropped since it was not used anymore. The +DMA mapping is done directly in single spi drivers in case it's supported +so having is_dma_mapped set to 1 lead to code breakage. So we can consider +it always as 0 and basically guard it if Linux version is 6.10+ + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/8 +Signed-off-by: Giulio Benetti +--- + spi.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/spi.c b/spi.c +index f7b43e2..be616f4 100644 +--- a/spi.c ++++ b/spi.c +@@ -338,7 +338,9 @@ static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len) + memset(&msg, 0, sizeof(msg)); + spi_message_init(&msg); + msg.spi = spi; ++#if KERNEL_VERSION(6, 10, 0) > LINUX_VERSION_CODE + msg.is_dma_mapped = USE_SPI_DMA; ++#endif + spi_message_add_tail(&tr, &msg); + + ret = spi_sync(spi, &msg); +@@ -385,7 +387,9 @@ static int wilc_spi_rx(struct wilc *wilc, u8 *rb, u32 rlen) + memset(&msg, 0, sizeof(msg)); + spi_message_init(&msg); + msg.spi = spi; ++#if KERNEL_VERSION(6, 10, 0) > LINUX_VERSION_CODE + msg.is_dma_mapped = USE_SPI_DMA; ++#endif + spi_message_add_tail(&tr, &msg); + + ret = spi_sync(spi, &msg); +@@ -427,7 +431,9 @@ static int wilc_spi_tx_rx(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen) + memset(&msg, 0, sizeof(msg)); + spi_message_init(&msg); + msg.spi = spi; ++#if KERNEL_VERSION(6, 10, 0) > LINUX_VERSION_CODE + msg.is_dma_mapped = USE_SPI_DMA; ++#endif + + spi_message_add_tail(&tr, &msg); + ret = spi_sync(spi, &msg); +-- +2.39.5 + diff --git a/package/wilc-driver/0011-cfg80211.c-fix-build-with-Linux-6.13.patch b/package/wilc-driver/0011-cfg80211.c-fix-build-with-Linux-6.13.patch new file mode 100644 index 0000000000..6d26b20a5c --- /dev/null +++ b/package/wilc-driver/0011-cfg80211.c-fix-build-with-Linux-6.13.patch @@ -0,0 +1,28 @@ +From 446911a48cd1a2c740b43a32d0ffa6e3f1887e84 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 26 Apr 2025 00:40:43 +0200 +Subject: [PATCH] cfg80211.c: fix build with Linux 6.13 + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/8 +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 25da3a1..d0cd826 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -291,6 +291,9 @@ struct wilc_vif *wilc_get_wl_to_vif(struct wilc *wl) + } + + static int set_channel(struct wiphy *wiphy, ++#if KERNEL_VERSION(6, 13, 0) <= LINUX_VERSION_CODE ++ struct net_device *netdev, ++#endif + struct cfg80211_chan_def *chandef) + { + struct wilc *wl = wiphy_priv(wiphy); +-- +2.39.5 + diff --git a/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch b/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch new file mode 100644 index 0000000000..adcbab4a59 --- /dev/null +++ b/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch @@ -0,0 +1,33 @@ +From ea7bdf9c6f37dbed0d7e7a94bd5d6ec20593eb02 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 1 Jul 2025 19:25:19 +0200 +Subject: [PATCH] Fix build with Linux 6.14 + +Commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7a53af85d3bbdbe06cd47b81a6d99a04dc0a3963 +adds argument "unsigned int link_id" to get_tx_power(), so let's add it to +cfg80211_rtw_get_txpower() according to Linux version. + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/9 +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 5c92062..0e1375c 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -2230,6 +2230,9 @@ static int set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + } + + static int get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)) ++ unsigned int link_id, ++#endif + int *dbm) + { + int ret; +-- +2.39.5 + diff --git a/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch b/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch new file mode 100644 index 0000000000..2baac53dfc --- /dev/null +++ b/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch @@ -0,0 +1,177 @@ +From acdbd9268841a5c0bac477418bb39707d9602957 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 1 Jul 2025 19:27:01 +0200 +Subject: [PATCH] Fix build with Linux 6.15 + +Commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8fa7292fee5c5240402371ea89ab285ec856c916 +drops del_timer_sync() in favor of timer_delete{_sync}() so let's backport +locally functions del_timer{_sync}() when Linux version is 6.15.0 or later. +Let's also backport crc7_be() and crc_itu_t() sinsce are not selectable +anymore in kernel since commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f5a40fcf82c1d3f26910ebe1c62fec8ae3b85f02 + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/9 +Signed-off-by: Giulio Benetti +--- + netdev.h | 13 +++++++ + spi.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 128 insertions(+) + +diff --git a/netdev.h b/netdev.h +index f06d45a..607a3b5 100644 +--- a/netdev.h ++++ b/netdev.h +@@ -13,6 +13,19 @@ + #include + #include + #include ++#include ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++static inline int del_timer_sync(struct timer_list *timer) ++{ ++ return timer_delete_sync(timer); ++} ++ ++static inline int del_timer(struct timer_list *timer) ++{ ++ return timer_delete(timer); ++} ++#endif + + #include "hif.h" + #include "wlan.h" +diff --git a/spi.c b/spi.c +index f7b43e2..5443633 100644 +--- a/spi.c ++++ b/spi.c +@@ -9,10 +9,125 @@ + #include + #include + #include ++#include + + #include "netdev.h" + #include "cfg80211.h" + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++/* ++ * Table for CRC-7 (polynomial x^7 + x^3 + 1). ++ * This is a big-endian CRC (msbit is highest power of x), ++ * aligned so the msbit of the byte is the x^6 coefficient ++ * and the lsbit is not used. ++ */ ++static const u8 crc7_be_syndrome_table[256] = { ++ 0x00, 0x12, 0x24, 0x36, 0x48, 0x5a, 0x6c, 0x7e, ++ 0x90, 0x82, 0xb4, 0xa6, 0xd8, 0xca, 0xfc, 0xee, ++ 0x32, 0x20, 0x16, 0x04, 0x7a, 0x68, 0x5e, 0x4c, ++ 0xa2, 0xb0, 0x86, 0x94, 0xea, 0xf8, 0xce, 0xdc, ++ 0x64, 0x76, 0x40, 0x52, 0x2c, 0x3e, 0x08, 0x1a, ++ 0xf4, 0xe6, 0xd0, 0xc2, 0xbc, 0xae, 0x98, 0x8a, ++ 0x56, 0x44, 0x72, 0x60, 0x1e, 0x0c, 0x3a, 0x28, ++ 0xc6, 0xd4, 0xe2, 0xf0, 0x8e, 0x9c, 0xaa, 0xb8, ++ 0xc8, 0xda, 0xec, 0xfe, 0x80, 0x92, 0xa4, 0xb6, ++ 0x58, 0x4a, 0x7c, 0x6e, 0x10, 0x02, 0x34, 0x26, ++ 0xfa, 0xe8, 0xde, 0xcc, 0xb2, 0xa0, 0x96, 0x84, ++ 0x6a, 0x78, 0x4e, 0x5c, 0x22, 0x30, 0x06, 0x14, ++ 0xac, 0xbe, 0x88, 0x9a, 0xe4, 0xf6, 0xc0, 0xd2, ++ 0x3c, 0x2e, 0x18, 0x0a, 0x74, 0x66, 0x50, 0x42, ++ 0x9e, 0x8c, 0xba, 0xa8, 0xd6, 0xc4, 0xf2, 0xe0, ++ 0x0e, 0x1c, 0x2a, 0x38, 0x46, 0x54, 0x62, 0x70, ++ 0x82, 0x90, 0xa6, 0xb4, 0xca, 0xd8, 0xee, 0xfc, ++ 0x12, 0x00, 0x36, 0x24, 0x5a, 0x48, 0x7e, 0x6c, ++ 0xb0, 0xa2, 0x94, 0x86, 0xf8, 0xea, 0xdc, 0xce, ++ 0x20, 0x32, 0x04, 0x16, 0x68, 0x7a, 0x4c, 0x5e, ++ 0xe6, 0xf4, 0xc2, 0xd0, 0xae, 0xbc, 0x8a, 0x98, ++ 0x76, 0x64, 0x52, 0x40, 0x3e, 0x2c, 0x1a, 0x08, ++ 0xd4, 0xc6, 0xf0, 0xe2, 0x9c, 0x8e, 0xb8, 0xaa, ++ 0x44, 0x56, 0x60, 0x72, 0x0c, 0x1e, 0x28, 0x3a, ++ 0x4a, 0x58, 0x6e, 0x7c, 0x02, 0x10, 0x26, 0x34, ++ 0xda, 0xc8, 0xfe, 0xec, 0x92, 0x80, 0xb6, 0xa4, ++ 0x78, 0x6a, 0x5c, 0x4e, 0x30, 0x22, 0x14, 0x06, ++ 0xe8, 0xfa, 0xcc, 0xde, 0xa0, 0xb2, 0x84, 0x96, ++ 0x2e, 0x3c, 0x0a, 0x18, 0x66, 0x74, 0x42, 0x50, ++ 0xbe, 0xac, 0x9a, 0x88, 0xf6, 0xe4, 0xd2, 0xc0, ++ 0x1c, 0x0e, 0x38, 0x2a, 0x54, 0x46, 0x70, 0x62, ++ 0x8c, 0x9e, 0xa8, 0xba, 0xc4, 0xd6, 0xe0, 0xf2 ++}; ++ ++/** ++ * crc7_be - update the CRC7 for the data buffer ++ * @crc: previous CRC7 value ++ * @buffer: data pointer ++ * @len: number of bytes in the buffer ++ * Context: any ++ * ++ * Returns the updated CRC7 value. ++ * The CRC7 is left-aligned in the byte (the lsbit is always 0), as that ++ * makes the computation easier, and all callers want it in that form. ++ * ++ */ ++u8 crc7_be(u8 crc, const u8 *buffer, size_t len) ++{ ++ while (len--) ++ crc = crc7_be_syndrome_table[crc ^ *buffer++]; ++ return crc; ++} ++ ++/* CRC table for the CRC ITU-T V.41 0x1021 (x^16 + x^12 + x^5 + 1) */ ++const u16 crc_itu_t_table[256] = { ++ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, ++ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, ++ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, ++ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, ++ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, ++ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, ++ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, ++ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, ++ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, ++ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, ++ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, ++ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, ++ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, ++ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, ++ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, ++ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, ++ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, ++ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, ++ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, ++ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, ++ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, ++ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, ++ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, ++ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, ++ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, ++ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, ++ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, ++ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, ++ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, ++ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, ++ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, ++ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 ++}; ++ ++/** ++ * crc_itu_t - Compute the CRC-ITU-T for the data buffer ++ * ++ * @crc: previous CRC value ++ * @buffer: data pointer ++ * @len: number of bytes in the buffer ++ * ++ * Returns the updated CRC value ++ */ ++u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len) ++{ ++ while (len--) ++ crc = crc_itu_t_byte(crc, *buffer++); ++ return crc; ++} ++#endif ++ + static bool enable_crc7; /* protect SPI commands with CRC7 */ + module_param(enable_crc7, bool, 0644); + MODULE_PARM_DESC(enable_crc7, +-- +2.39.5 + diff --git a/package/wilc-driver/0014-Fix-build-for-kernel-6.16.patch b/package/wilc-driver/0014-Fix-build-for-kernel-6.16.patch new file mode 100644 index 0000000000..bf4a8106af --- /dev/null +++ b/package/wilc-driver/0014-Fix-build-for-kernel-6.16.patch @@ -0,0 +1,34 @@ +From 8ee37436cfa1bdac354ff63e17b647e7b5fb20f9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 8 Sep 2025 21:14:22 +0200 +Subject: [PATCH] Fix build for kernel 6.16 + +With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=41cb08555c4164996d67c78b3bf1c658075b75f1 +from_timer() has been renamed to timer_container_of() so let's rename +according to linux version >= 6.16. + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/10 +Signed-off-by: Giulio Benetti +--- + netdev.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/netdev.h b/netdev.h +index 607a3b5..33708ad 100644 +--- a/netdev.h ++++ b/netdev.h +@@ -15,6 +15,10 @@ + #include + #include + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)) ++#define from_timer timer_container_of ++#endif ++ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) + static inline int del_timer_sync(struct timer_list *timer) + { +-- +2.43.0 + diff --git a/package/wilc-driver/0015-Fix-build-for-kernel-6.17.patch b/package/wilc-driver/0015-Fix-build-for-kernel-6.17.patch new file mode 100644 index 0000000000..4d5934bdd4 --- /dev/null +++ b/package/wilc-driver/0015-Fix-build-for-kernel-6.17.patch @@ -0,0 +1,109 @@ +From 00895566e07808a0c61d45464797d7cba2eb256c Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Fri, 10 Oct 2025 21:58:14 +0200 +Subject: [PATCH] Fix build for kernel 6.17 + +* With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b74947b4f6ff7c122a1bb6eb38bb7ecfbb1d3820 +set_wiphy_params(), set/get_tx_power() and set_antenna() gain argument +radio_idx to get radio index. So let's add that argument according to +linux version >= 6.17. +* With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a5589313383074c48a1b3751d592a6e084ae0573 +devm_gpio_request() is dropped in favor of devm_gpio_request_one(). +devm_gpio_request_one() requires flags to setup gpio status, but it's +not specified in wilc_of_parse_power_pins() so keep them as GPIOF_IN +since they get defined in wilc_wlan_power() called very soon after +wilc_of_parse_power_pins(). + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/11 +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 15 +++++++++++++++ + power.c | 12 +++++++++++- + 2 files changed, 26 insertions(+), 1 deletion(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 0e1375c..a7db9e6 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -997,7 +997,11 @@ static int change_bss(struct wiphy *wiphy, struct net_device *dev, + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++static int set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed) ++#else + static int set_wiphy_params(struct wiphy *wiphy, u32 changed) ++#endif + { + int ret = -EINVAL; + struct cfg_param_attr cfg_param_val; +@@ -2198,6 +2202,9 @@ static void wilc_set_wakeup(struct wiphy *wiphy, bool enabled) + } + + static int set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif + enum nl80211_tx_power_setting type, int mbm) + { + int ret; +@@ -2230,6 +2237,9 @@ static int set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + } + + static int get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)) + unsigned int link_id, + #endif +@@ -2252,7 +2262,12 @@ static int get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++static int set_antenna(struct wiphy *wiphy, int radio_idx, u32 tx_ant, ++ u32 rx_ant) ++#else + static int set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant) ++#endif + { + int ret; + struct wilc *wl = wiphy_priv(wiphy); +diff --git a/power.c b/power.c +index 6ab8d63..1cc391d 100644 +--- a/power.c ++++ b/power.c +@@ -1,4 +1,4 @@ +-#include ++#include OA + #include + #include + #include +@@ -37,11 +37,21 @@ int wilc_of_parse_power_pins(struct wilc *wilc) + !gpio_is_valid(power->gpios.reset)) + return -EINVAL; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ ret = devm_gpio_request_one(wilc->dev, power->gpios.chip_en, GPIOF_IN, ++ "CHIP_EN"); ++#else + ret = devm_gpio_request(wilc->dev, power->gpios.chip_en, "CHIP_EN"); ++#endif + if (ret) + return ret; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ ret = devm_gpio_request_one(wilc->dev, power->gpios.reset, GPIOF_IN, ++ "RESET"); ++#else + ret = devm_gpio_request(wilc->dev, power->gpios.reset, "RESET"); ++#endif + return ret; + } + +-- +2.47.3 + diff --git a/package/wilc-firmware/Config.in b/package/wilc-firmware/Config.in index 72a9c73206..813a75ecf2 100644 --- a/package/wilc-firmware/Config.in +++ b/package/wilc-firmware/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_WILC1000_FIRMWARE These binary blobs are provided directly from Microchip. Ideally, the firmware version should match driver version. - Generally, the latest firmware would be acceptible regardless + Generally, the latest firmware would be acceptable regardless of driver version. These will be installed to /lib/firmware/mchp/ @@ -26,7 +26,7 @@ config BR2_PACKAGE_WILC3000_FIRMWARE These binary blobs are provided directly from Microchip. Ideally, the firmware version should match driver version. - Generally, the latest firmware would be acceptible regardless + Generally, the latest firmware would be acceptable regardless of driver version. These will be installed to /lib/firmware/mchp/ diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 61de6db80f..eb0d45ca0a 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,8 +1,8 @@ # From: -# https://dl.winehq.org/wine/source/9.x/sha512sums.asc -sha512 530219c6a337f2996eac92d644ab603528b82cc6136cc37c1e6aa736d418f33c6f4b0d54f3537b04bceaf4487d84abcf926a2f5e9536ed4e966c4fe63c5b6ddd wine-9.19.tar.xz +# https://dl.winehq.org/wine/source/10.0/sha512sums.asc +sha512 effb41c5641993e2e52eaa825cc19b7d9846e084992c5a5b066ead2339b24384d320898a9cee347a9a87106bcb3b0f54c8cd2c8d4de3a887a658052ddd5168d6 wine-10.0.tar.xz # Locally calculated after checking pgp signature -sha256 2c13a0c3f31f25a54d415d86785a1ad46ef8a07ae973b6b699345a45206ac015 wine-9.19.tar.xz +sha256 c5e0b3f5f7efafb30e9cd4d9c624b85c583171d33549d933cd3402f341ac3601 wine-10.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB sha256 51433d87540ee2f30e3cff986e00e1477880002bf993106a13775ed60d4e0af4 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 6b1ba19b0b..380f729585 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,15 @@ # ################################################################################ -WINE_VERSION = 9.19 +# In Buildroot, Wine should be updated only on "stable" versions. This +# usually corresponds to version "X.0" (for initial stable releases) +# or "X.0.y" (for maintenance releases). Please avoid updating to a +# development version, unless it is absolutely needed (for example: +# incompatibility with another library and no maintenance stable +# version is available). +WINE_VERSION = 10.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/9.x +WINE_SITE = https://dl.winehq.org/wine/source/10.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +33,8 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vulkan + --without-vulkan \ + --without-osmesa # BR2_PACKAGE_MESA3D_OSMESA_GALLIUM removed in mesa 25.1 # Wine uses a wrapper around gcc, and uses the value of --host to # construct the filename of the gcc to call. But for external @@ -137,13 +144,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) -WINE_CONF_OPTS += --with-osmesa -WINE_DEPENDENCIES += mesa3d -else -WINE_CONF_OPTS += --without-osmesa -endif - ifeq ($(BR2_PACKAGE_PCSC_LITE),y) WINE_CONF_OPTS += --with-pcsclite WINE_DEPENDENCIES += pcsc-lite diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index 83a8c87587..f6134ba55b 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -9,6 +9,8 @@ WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION) WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2 WIPE_LICENSE = GPL-2.0+ WIPE_LICENSE_FILES = LICENSE +# configure script not compatible with >= gcc-15 +WIPE_AUTORECONF = YES define WIPE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/wipe $(TARGET_DIR)/usr/bin/wipe diff --git a/package/wireguard-tools/wireguard-tools.hash b/package/wireguard-tools/wireguard-tools.hash index b3eadec29a..d959d964d4 100644 --- a/package/wireguard-tools/wireguard-tools.hash +++ b/package/wireguard-tools/wireguard-tools.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2021-September/007049.html -sha256 97ff31489217bb265b7ae850d3d0f335ab07d2652ba1feec88b734bc96bd05ac wireguard-tools-1.0.20210914.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2025-May/008789.html +sha256 b6f2628b85b1b23cc06517ec9c74f82d52c4cdbd020f3dd2f00c972a1782950e wireguard-tools-1.0.20250521.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-tools/wireguard-tools.mk b/package/wireguard-tools/wireguard-tools.mk index d76e836a45..958d7a3ef0 100644 --- a/package/wireguard-tools/wireguard-tools.mk +++ b/package/wireguard-tools/wireguard-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_TOOLS_VERSION = 1.0.20210914 +WIREGUARD_TOOLS_VERSION = 1.0.20250521 WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz WIREGUARD_TOOLS_LICENSE = GPL-2.0 diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index ca11551579..4b2c67965f 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 9832a14e1be24abff7be30dee3c9a1afb5fdfcf475a0d91aafef039f8d85f5eb wireless-regdb-2024.07.04.tar.xz +sha256 d4c872a44154604c869f5851f7d21d818d492835d370af7f58de8847973801c3 wireless-regdb-2025.10.07.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index fae21687de..055238be5e 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2024.07.04 +WIRELESS_REGDB_VERSION = 2025.10.07 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 7fff34a7a7..a254b68cca 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4926399cffe3da12f1338e1feec53ef944e86ae7c719384bff87490d7e3edbc7 wireplumber-0.5.5.tar.bz2 +sha256 c89fa29694e89939c0e57cade5c9a7da8e5da21c19071862978ef5f3a346f1e7 wireplumber-0.5.10.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index c8cc1ad106..8818662059 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.5.5 +WIREPLUMBER_VERSION = 0.5.10 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 06119861f2..88eb7ef494 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,7 +1,7 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.2.6.txt -sha1 db0374dce360b99d8abb9a3f3471f3fc98d6d099 wireshark-4.2.6.tar.xz -sha256 5ec6028df29068d889c98489bf194a884b00831106fea1e921fea3c65f2003f5 wireshark-4.2.6.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.4.9.txt +sha1 dc91c68b03b389645fa6dade92960863d74bca1d wireshark-4.4.9.tar.xz +sha256 60551dc787f41e87aeaa1e9c33304f9008037e3baf9fa11aef9c2d584cc0b54b wireshark-4.4.9.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 fce67c1558e448fac784ce9a30cb47956488bc3ef6ec16316c38b0668b3cad2e README.md +sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYING +sha256 39887d884b6473f5897c915ae8e9497e5bc2c1f6decec2ce820d5fd716d763cc README.md diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 242430194f..9ccd8f9a9e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.2.6 +WIRESHARK_VERSION = 4.4.9 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license diff --git a/package/wlr-randr/Config.in b/package/wlr-randr/Config.in new file mode 100644 index 0000000000..fa3565560b --- /dev/null +++ b/package/wlr-randr/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_WLR_RANDR + bool "wlr-randr" + depends on BR2_PACKAGE_WAYLAND # wayland-client + help + Utility to manage outputs of a Wayland compositor. + + https://gitlab.freedesktop.org/emersion/wlr-randr diff --git a/package/wlr-randr/wlr-randr.hash b/package/wlr-randr/wlr-randr.hash new file mode 100644 index 0000000000..a8b5dfc955 --- /dev/null +++ b/package/wlr-randr/wlr-randr.hash @@ -0,0 +1,5 @@ +# Calculated locally +sha256 a64b6eb296d1c75af098fa2d229f9aaf3ceae45eeff24056930bd4bc613c6a5e wlr-randr-0.5.0.tar.gz + +# Hash for license files: +sha256 7f3e844a550da74d5f0a635ae1263cb7dafda7bd15ac37364ddde85de83a78c7 LICENSE diff --git a/package/wlr-randr/wlr-randr.mk b/package/wlr-randr/wlr-randr.mk new file mode 100644 index 0000000000..c5264deae7 --- /dev/null +++ b/package/wlr-randr/wlr-randr.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# wlr-randr +# +################################################################################ + +WLR_RANDR_VERSION = 0.5.0 +WLR_RANDR_SITE = https://gitlab.freedesktop.org/emersion/wlr-randr/-/releases/v$(WLR_RANDR_VERSION)/downloads +WLR_RANDR_LICENSE = MIT +WLR_RANDR_LICENSE_FILES = LICENSE +# host-wayland is for wayland-scanner +WLR_RANDR_DEPENDENCIES = host-pkgconf host-wayland wayland + +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +# uClibc < 1.0.38 does not expose strdup() when _POSIX_C_SOURCE >= 200809L +# See: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=0daab1508379e23a09ab7fdb469018228d951894 +# We define _XOPEN_SOURCE=500 as a workaround. +WLR_RANDR_CONF_OPTS += -Dc_args=-D_XOPEN_SOURCE=500 +endif + +$(eval $(meson-package)) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index d81506c375..6d2992cf2c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -1,4 +1,4 @@ -comment "wlroots needs udev, EGL and OpenGL ES support" +comment "wlroots needs udev, EGL, OpenGL ES and GBM support" depends on !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBGLES || \ @@ -15,8 +15,10 @@ config BR2_PACKAGE_WLROOTS depends on BR2_PACKAGE_HAS_UDEV # libinput depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PNP_IDS + select BR2_PACKAGE_LIBDISPLAY_INFO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 8ab05393b1..77d5c4552b 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,7 @@ -# Generated locally, after checking https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.2/downloads/wlroots-0.16.2.tar.gz.sig -sha256 83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa wlroots-0.16.2.tar.gz +# Locally calculated after checking pgp signature +# https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.19.0/downloads/wlroots-0.19.0.tar.gz.sig +# with key 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 "emersion " +sha256 aefb0fe2633b0aad1d66123b2f41afab004fb625e2a7790492cdd39a805cac91 wlroots-0.19.0.tar.gz # Hashes for license files: -sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE +sha256 35d427c043dcafe8893b9e7247348f599847c81d9a067703587c80707f3d58df LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index fdd2fb8250..babadea94f 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.16.2 +WLROOTS_VERSION = 0.19.0 WLROOTS_SITE = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$(WLROOTS_VERSION)/downloads WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -14,10 +14,12 @@ WLROOTS_DEPENDENCIES = \ host-pkgconf \ host-wayland \ hwdata \ + libdisplay-info \ libinput \ libxkbcommon \ libegl \ libgles \ + libgbm \ pixman \ seatd \ udev \ diff --git a/package/dmenu-wayland/Config.in b/package/wmenu/Config.in similarity index 68% rename from package/dmenu-wayland/Config.in rename to package/wmenu/Config.in index 8a4d0918dc..ce9e70f9f8 100644 --- a/package/dmenu-wayland/Config.in +++ b/package/wmenu/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_DMENU_WAYLAND - bool "dmenu-wayland" +config BR2_PACKAGE_WMENU + bool "wmenu" depends on BR2_USE_MMU # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, pango, wayland @@ -15,11 +15,13 @@ config BR2_PACKAGE_DMENU_WAYLAND select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS help - dmenu-wl is an efficient dynamic menu for wayland (wlroots). + wmenu is an efficient dynamic menu for Sway and wlroots based + Wayland compositors. It provides a Wayland-native dmenu + replacement which maintains the look and feel of dmenu. - https://github.com/nyyManni/dmenu-wayland + https://codeberg.org/adnano/wmenu -comment "dmenu-wayland needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" +comment "wmenu needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/wmenu/wmenu.hash b/package/wmenu/wmenu.hash new file mode 100644 index 0000000000..c4941001f4 --- /dev/null +++ b/package/wmenu/wmenu.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 4e6aea3f8975fec720f6eb87aad620d5297a8a5a137615e4cf047e95d2b9d308 0.2.0.tar.gz +sha256 500f0a221b2f3667676f6a084fb4e92ba4f74d09f45bc492e55aec4dd296bff2 LICENSE diff --git a/package/wmenu/wmenu.mk b/package/wmenu/wmenu.mk new file mode 100644 index 0000000000..7454dba8b9 --- /dev/null +++ b/package/wmenu/wmenu.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# wmenu +# +################################################################################ + +WMENU_VERSION = 0.2.0 +WMENU_SOURCE = $(WMENU_VERSION).tar.gz +WMENU_SITE = https://codeberg.org/adnano/wmenu/archive +WMENU_LICENSE = MIT +WMENU_LICENSE_FILES = LICENSE +WMENU_DEPENDENCIES = \ + cairo \ + pango \ + wayland \ + libxkbcommon \ + wayland \ + wayland-protocols + +$(eval $(meson-package)) diff --git a/package/woff2/0002-include-woff2-output.h-add-missing-stdint.h-include.patch b/package/woff2/0002-include-woff2-output.h-add-missing-stdint.h-include.patch new file mode 100644 index 0000000000..a79b414a4c --- /dev/null +++ b/package/woff2/0002-include-woff2-output.h-add-missing-stdint.h-include.patch @@ -0,0 +1,41 @@ +From 08ece7871775c0d7bf4fdff64b961cdc256adf6c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 2 Aug 2024 22:12:03 +0100 +Subject: [PATCH] include/woff2/output.h: add missing include + +Without the change `woff2` build fails on upcoming `gcc-15` as: + + In file included from src/woff2_out.cc:9: + include/woff2/output.h:73:25: error: expected ')' before '*' token + 73 | WOFF2MemoryOut(uint8_t* buf, size_t buf_size); + | ~ ^ + | ) + include/woff2/output.h:79:3: error: 'uint8_t' does not name a type + 79 | uint8_t* buf_; + | ^~~~~~~ + include/woff2/output.h:16:1: note: 'uint8_t' is defined in header ''; + this is probably fixable by adding '#include ' + 15 | #include + +++ |+#include + 16 | + +Upstream: https://github.com/google/woff2/pull/176 + +Signed-off-by: Bernd Kuhls +--- + include/woff2/output.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/woff2/output.h b/include/woff2/output.h +index dc78ccf..b12d538 100644 +--- a/include/woff2/output.h ++++ b/include/woff2/output.h +@@ -9,6 +9,8 @@ + #ifndef WOFF2_WOFF2_OUT_H_ + #define WOFF2_WOFF2_OUT_H_ + ++#include ++ + #include + #include + #include diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 92953f69f0..fd15e95be1 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -175,4 +175,19 @@ config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION help Add introspection support for the DBus control interface. +config BR2_PACKAGE_WPA_SUPPLICANT_SMARTCARD + bool "Smartcard support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + Enable the smart card support. Required for OpenSSL engines + to work using PKCS11 and 802.1x + +config BR2_PACKAGE_WPA_SUPPLICANT_WEP + bool "Enable WEP support (deprecated)" + help + Enable support for WEP. WEP support is deprecated due to + security concerns, but some systems may want to support WEP + networks. + endif diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index aef8731341..fe4bc34d55 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -24,9 +24,6 @@ WPA_SUPPLICANT_CONFIG_ENABLE = \ CONFIG_INTERNAL_LIBTOMMATH \ CONFIG_MATCH_IFACE -WPA_SUPPLICANT_CONFIG_DISABLE = \ - CONFIG_SMARTCARD - # libnl-3 needs -lm (for rint) and -lpthread if linking statically # And library order matters hence stick -lnl-3 first since it's appended # in the wpa_supplicant Makefiles as in LIBS+=-lnl-3 ... thus failing @@ -191,12 +188,22 @@ WPA_SUPPLICANT_DEPENDENCIES += readline WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_SMARTCARD),y) +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_SMARTCARD +else +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_SMARTCARD +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE),y) define WPA_SUPPLICANT_ENABLE_CTRL_IFACE sed -i '/ctrl_interface/s/^#//g' $(TARGET_DIR)/etc/wpa_supplicant.conf endef endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WEP),y) +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WEP +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO @@ -254,7 +261,7 @@ ifeq ($(BR2_PACKAGE_DBUS),y) define WPA_SUPPLICANT_INSTALL_DBUS $(INSTALL) -m 0644 -D \ $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf + $(TARGET_DIR)/usr/share/dbus-1/system.d/wpa_supplicant.conf $(WPA_SUPPLICANT_INSTALL_DBUS_NEW) endef endif diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 5055998ab7..f0578808c4 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.3.tar.xz.sums -md5 ab73398b1e35495977e50bee103969d2 wpebackend-fdo-1.14.3.tar.xz -sha1 2d2945df15cc1efa957657fa727f3bc4c6f580bb wpebackend-fdo-1.14.3.tar.xz -sha256 10121842595a850291db3e82f3db0b9984df079022d386ce42c2b8508159dc6c wpebackend-fdo-1.14.3.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.16.0.tar.xz.sums +md5 38f488aaa6d68252b593b65ba3e2d9d1 wpebackend-fdo-1.16.0.tar.xz +sha1 8a06e51aeb2c94b4cf254d866c19eca587d3cd37 wpebackend-fdo-1.16.0.tar.xz +sha256 beddf321232d5bd08106c179dbc600f8ce88eb3620b4a59a6329063b78f64635 wpebackend-fdo-1.16.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index dbabacf498..e5972754f6 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.14.3 +WPEBACKEND_FDO_VERSION = 1.16.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES diff --git a/package/wpewebkit/0001-WPE-Fix-the-build-with-USE_SKIA_OPENTYPE_SVG-ON-and-.patch b/package/wpewebkit/0001-WPE-Fix-the-build-with-USE_SKIA_OPENTYPE_SVG-ON-and-.patch new file mode 100644 index 0000000000..8432543e07 --- /dev/null +++ b/package/wpewebkit/0001-WPE-Fix-the-build-with-USE_SKIA_OPENTYPE_SVG-ON-and-.patch @@ -0,0 +1,44 @@ +From 94acd1ce0ff2860b19f22ab2d386d7711c9699b7 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Tue, 8 Jul 2025 21:46:44 +0300 +Subject: [PATCH] [WPE] Fix the build with USE_SKIA_OPENTYPE_SVG=ON and + USE_SYSPROF_CAPTURE=OFF + +Unreviewed build fix. + +When backporting 287859@main the #include for the needed Skia header +slipped inside an USE(SYSPROF_CAPTURE) guard. This moves the guards +and #include statements to their correct places. + +* Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp: + +Canonical link: https://commits.webkit.org/290945.273@webkitglib/2.48 + +Signed-off-by: Adrian Perez de Castro +Upstream: https://github.com/WebKit/WebKit/commit/943d05f0c9b03c053a456c90c2a8817c1f679711 +--- + Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp +index a06e33fd04f8..5fb245ce0b66 100644 +--- a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp ++++ b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp +@@ -43,11 +43,12 @@ + #include + #endif + +-#if USE(SYSPROF_CAPTURE) +-#include + #if USE(SKIA_OPENTYPE_SVG) + #include + #endif ++ ++#if USE(SYSPROF_CAPTURE) ++#include + #endif + + namespace WebKit { +-- +2.50.1 + diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 8016367058..5cbba43792 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, NPTL, dynamic library, gcc >= 11, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_11 \ || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" @@ -35,14 +35,15 @@ config BR2_PACKAGE_WPEWEBKIT depends on !BR2_BINFMT_FLAT # icu depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG + select BR2_HOST_CMAKE_AT_LEAST_3_20 + select BR2_PACKAGE_CAIRO if BR2_ENDIAN = "BIG" + select BR2_PACKAGE_CAIRO_PNG if BR2_ENDIAN = "BIG" select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_ICU select BR2_PACKAGE_JPEG @@ -56,6 +57,7 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_WPEBACKEND_FDO help WPE (Web Platform for Embedded) port of the WebKit engine, diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 7a7cef15a5..332fd9deaa 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.44.4.tar.xz.sums -md5 4d91f3ff629c9356dcff866b68a4646f wpewebkit-2.44.4.tar.xz -sha1 ef1ea0484e9ec17a362afe9a709fe0754f05cc14 wpewebkit-2.44.4.tar.xz -sha256 cd6042c63a6f883cc1586e5cea94e846aaaee6a864c14988e8af4ef4f362ba3b wpewebkit-2.44.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.48.3.tar.xz.sums +md5 2d3b7fa3c62886546f918fcc289cabbe wpewebkit-2.48.3.tar.xz +sha1 8a90b9ff8809c99c306defc1a08e50a31a09c590 wpewebkit-2.48.3.tar.xz +sha256 807571f07e87823b8fb79564692c9b1ef81ee62edbf51345a15bd0e7e1f2e07b wpewebkit-2.48.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 6a8e9c637c..15a2ea93e8 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -WPEWEBKIT_VERSION = 2.44.4 +WPEWEBKIT_VERSION = 2.48.3 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -16,11 +16,15 @@ WPEWEBKIT_LICENSE_FILES = \ WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ - harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup3 libtasn1 \ + harfbuzz icu jpeg libepoxy libgcrypt libgles libsoup3 libtasn1 \ libpng libxslt wayland-protocols webp wpebackend-fdo WPEWEBKIT_CMAKE_BACKEND = ninja +# Buildroot adds support for ccache through its +# toolchain-wrapper, so tell wpewebkit not to mess with it. +WPEWEBKIT_CONF_ENV = WK_USE_CCACHE=NO + WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_API_TESTS=OFF \ @@ -30,6 +34,15 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_WEB_RTC=OFF \ -DUSE_ATK=OFF +# WPE WebKit uses a bundled copy of Skia since 2.46.0 for +# little-endian targets, and Cairo for big-endian ones. +ifeq ($(BR2_ENDIAN),"BIG") +WPEWEBKIT_DEPENDENCIES += cairo +WPEWEBKIT_CONF_OPTS += -DUSE_SKIA=OFF +else +WPEWEBKIT_CONF_OPTS += -DUSE_SKIA=ON +endif + ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ -DENABLE_BUBBLEWRAP_SANDBOX=ON \ @@ -79,6 +92,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_FLITE),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_SPEECH_SYNTHESIS=ON +WPEWEBKIT_DEPENDENCIES += flite +else +WPEWEBKIT_CONF_OPTS += -DENABLE_SPEECH_SYNTHESIS=OFF +endif + ifeq ($(BR2_PACKAGE_LCMS2),y) WPEWEBKIT_CONF_OPTS += -DUSE_LCMS=ON WPEWEBKIT_DEPENDENCIES += lcms2 @@ -114,6 +134,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=OFF endif +ifeq ($(BR2_PACKAGE_SYSPROF),y) +WPEWEBKIT_CONF_OPTS += -DUSE_SYSPROF_CAPTURE=ON +WPEWEBKIT_DEPENDENCIES += sysprof +else +WPEWEBKIT_CONF_OPTS += -DUSE_SYSPROF_CAPTURE=OFF +endif + ifeq ($(BR2_INIT_SYSTEMD),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in index 1ac15ce368..adeb3ce0c0 100644 --- a/package/x11r7/xapp_xdm/Config.in +++ b/package/x11r7/xapp_xdm/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_XAPP_XDM depends on BR2_USE_MMU # fork() # Runtime dependency: can't start an X server unless there is one depends on BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_XAPP_SESSREG select BR2_PACKAGE_XAPP_XRDB select BR2_PACKAGE_XLIB_LIBX11 diff --git a/package/x11r7/xapp_xdm/xapp_xdm.hash b/package/x11r7/xapp_xdm/xapp_xdm.hash index daf1b0852f..096fcf37f0 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.hash +++ b/package/x11r7/xapp_xdm/xapp_xdm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003265.html -sha256 3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f xdm-1.1.14.tar.xz -sha512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 xdm-1.1.14.tar.xz +# From https://lists.x.org/archives/xorg/2025-March/061902.html +sha256 9494aef0911a031c53670725b5c8c9bb9d3f7c5ea7318b1f72ddd9dcbbeceb6a xdm-1.1.17.tar.xz +sha512 68499cdf73c9b6b48b974a724e5d045bb8333cfd17f1d7e36132e7aec51922c22260b361517c4f0d9fb7d28ce4909e0638e00180e93544bc7200d9bef55e822b xdm-1.1.17.tar.xz # Locally computed -sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING +sha256 74cda705693518c793f05074a79bfc6876f97c8ce560856e2ba36e2d9bf0ab5a COPYING diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk index 035f2e9484..03b9ad58e9 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.mk +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XDM_VERSION = 1.1.14 +XAPP_XDM_VERSION = 1.1.17 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.xz XAPP_XDM_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDM_LICENSE = MIT @@ -30,6 +30,10 @@ else XAPP_XDM_CONF_OPTS += --without-xinerama endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +XAPP_XDM_DEPENDENCIES += libxcrypt +endif + define XAPP_XDM_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \ $(TARGET_DIR)/etc/init.d/S99xdm diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash b/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash index 95287956a8..8174781e01 100644 --- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash +++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003186.html -sha256 f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4 xkbutils-1.0.5.tar.xz -sha512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77 xkbutils-1.0.5.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-February/003448.html +sha256 31a2bbee1e09ccba01de92897b8f540b545de812f318d31de07bd3a5a75ee25e xkbutils-1.0.6.tar.xz +sha512 78fb7ab4ef6642040992529444944080aca7a2ec4118f9a64c45dacc37e4041181df7bcd1f4270e11b9fbc8bd60a131b4702d2aa95741d89c54582ff8a8f896e xkbutils-1.0.6.tar.xz # Locally computed -sha256 3d67b53c085de6d475705b60855b9277afac5d4c4ec531d0ffd1ef0d00571594 COPYING +sha256 4e86cc10a286bd6ce91c37143c399b1426058f5a13252a3d4677d58c990cd6df COPYING diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk index 90501908e6..cf63d4bb71 100644 --- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk +++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBUTILS_VERSION = 1.0.5 +XAPP_XKBUTILS_VERSION = 1.0.6 XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.xz XAPP_XKBUTILS_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XKBUTILS_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index 879abdd74d..ddd66598a6 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -5,7 +5,8 @@ ################################################################################ XDRIVER_XF86_VIDEO_INTEL_VERSION = 31486f40f8e8f8923ca0799aea84b58799754564 -XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel +XDRIVER_XF86_VIDEO_INTEL_SITE = https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git +XDRIVER_XF86_VIDEO_INTEL_SITE_METHOD = git XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk index db0bbbaf65..616566f9ab 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -19,7 +19,7 @@ XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -# configure doesn't look for drm headers in the appropiate place, so help it +# configure doesn't look for drm headers in the appropriate place, so help it # libdrm is only useful with udev for KMS ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XDRIVER_XF86_VIDEO_QXL_CONF_ENV += REQUIRED_MODULES=libdrm diff --git a/package/x11r7/xlib_libXt/xlib_libXt.hash b/package/x11r7/xlib_libXt/xlib_libXt.hash index 577896d38b..5a27b2db4e 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.hash +++ b/package/x11r7/xlib_libXt/xlib_libXt.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-April/003383.html -sha256 52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91 libXt-1.3.0.tar.xz -sha512 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 libXt-1.3.0.tar.xz +# From https://lists.freedesktop.org/archives/xorg-announce/2024-November/003560.html +sha256 e0a774b33324f4d4c05b199ea45050f87206586d81655f8bef4dba434d931288 libXt-1.3.1.tar.xz +sha512 c220292f60b0f53134cf9364831a32bbaa9fa6bbb3a7143e917920957b7a48c616e946042747089f29ea9d8a18ecd64de620bcaf56d82462e7107de906f5db38 libXt-1.3.1.tar.xz # Locally calculated sha256 75c5574ca04731d739b1420f55f2b7b47f30df895817f1b03d0d7f5c1fbee534 COPYING diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index cca89145f8..7e639a7ced 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.3.0 +XLIB_LIBXT_VERSION = 1.3.1 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.xz XLIB_LIBXT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXT_LICENSE = MIT diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash index e8f83d427f..a9549ead30 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003287.html -sha256 870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f libxshmfence-1.3.2.tar.xz -sha512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c libxshmfence-1.3.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-December/003572.html +sha256 d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10 libxshmfence-1.3.3.tar.xz +sha512 2261b840ea621cf4ce31961ec9df17aa2e253b268afe289dfb97c240aee27b9f443fe36de5de52a2e1210b69092efde21871e20556bac9b4f1d8a3ead1b4c498 libxshmfence-1.3.3.tar.xz # Locally computed sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 4241102855..b8c9ebfe97 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXSHMFENCE_VERSION = 1.3.2 +XLIB_LIBXSHMFENCE_VERSION = 1.3.3 XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.xz XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSHMFENCE_LICENSE = MIT diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.hash b/package/x11r7/xlib_xtrans/xlib_xtrans.hash index 9595a73d0e..530f2e858a 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.hash +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-June/003399.html -sha256 1ba4b703696bfddbf40bacf25bce4e3efb2a0088878f017a50e9884b0c8fb1bd xtrans-1.5.0.tar.xz -sha512 e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228 xtrans-1.5.0.tar.xz +# From https://www.mail-archive.com/xorg-announce@lists.x.org/msg01797.html +sha256 faafea166bf2451a173d9d593352940ec6404145c5d1da5c213423ce4d359e92 xtrans-1.6.0.tar.xz +sha512 e0ac4a2df0eeacdf23cedd74fee063a8eea81d05c4c4c9a9a113b9b4238db7cacb3c831973ac647fe1a5b06426dcdf0b2f8be5ac27862700333269880e25725b xtrans-1.6.0.tar.xz # Locally computed -sha256 22616bf00b6db85ee3164775a95206894af987b85ff1a7703de55644bc722a39 COPYING +sha256 3fe68a84ab89e82947e560316ab70cf2d02a8b978ae5cf4fbdfd53fc5b917308 COPYING diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk index 001705bb2e..152c080a87 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_XTRANS_VERSION = 1.5.0 +XLIB_XTRANS_VERSION = 1.6.0 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.xz XLIB_XTRANS_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_XTRANS_LICENSE = MIT diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index 37ad9c7c04..941ceabd49 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2023-June/003408.html -sha256 b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c xorgproto-2023.2.tar.xz -sha512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d xorgproto-2023.2.tar.xz +# Verified from https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2024.1.tar.xz.sig +# with key 67DC86F2623FC5FD4BB5225D14706DBE1E4B4540 +# From https://lists.x.org/archives/xorg-announce/2024-March/003495.html +sha256 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 xorgproto-2024.1.tar.xz +sha512 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f xorgproto-2024.1.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index f6e5a5a434..0253167372 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2023.2 +XORGPROTO_VERSION = 2024.1 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 3520de242f..92030d4307 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2024-April/003504.html -sha256 2864b6a5359ab41c5a6132c69b5d0c9af6eb85ad26d433edb012c914029de752 xorg-server-21.1.13.tar.gz -sha512 9bf5617d577dd3526a9578daedc1f2e3527da6913841f8fc78a2bda311ebf1560e84e31942cb8133a2a2ac99487c13b9153db6fb2d00859fc24d053f6b91fe34 xorg-server-21.1.13.tar.gz +# From https://lists.x.org/archives/xorg/2025-October/thread.html +sha256 a51aea1cbb29cb8122e39c1c8728469d4fd8db71a538565fbf017df11841bf04 xorg-server-21.1.20.tar.gz +sha512 dabe7e637df4b964a1ff04a15587157b9596851a722a753447c257253ad0422007078b74053e1a51bdfd2178e3140a52f94dff0f205242a8589b6fe02d27e8a8 xorg-server-21.1.20.tar.gz # Locally calculated -sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING +sha256 abbb7969df55e399e91104ded4d0a20a1b67de7c01138e63d61b7ed4f81fec0d COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 05ba938c30..c9456c66b5 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,13 +4,13 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.13 +XSERVER_XORG_SERVER_VERSION = 21.1.20 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_CPE_ID_VENDOR = x.org -XSERVER_XORG_SERVER_CPE_ID_PRODUCT = xorg-server +XSERVER_XORG_SERVER_CPE_ID_PRODUCT = x_server XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 5bb26bf17e..0d1df29b43 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html -sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz -sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz +# From https://lists.x.org/archives/xorg/2025-October/062148.html +sha256 f297af27a84508db9b80d1cbbcc69c3801da38eb64c72f3b5b50f582459afdd0 xwayland-24.1.9.tar.xz +sha512 7438a572651dc77c1fd749879abccdc9a245c7b75143668d5561a8e99d41063f042a8eb3f9b931a2a12be1fc3cb9d197eee6794d0702a19e56c20f55acb35a26 xwayland-24.1.9.tar.xz # Locally calculated -sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING +sha256 abbb7969df55e399e91104ded4d0a20a1b67de7c01138e63d61b7ed4f81fec0d COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index c66dd471ac..59d607fb5b 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.4 +XWAYLAND_VERSION = 24.1.9 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT @@ -25,7 +25,6 @@ XWAYLAND_DEPENDENCIES = \ xorgproto XWAYLAND_CONF_OPTS = \ -Ddri3=true \ - -Dxwayland_eglstream=false \ -Dxvfb=false \ -Ddefault_font_path=/usr/share/fonts/X11/ \ -Ddtrace=false \ diff --git a/package/x11vnc/Config.in b/package/x11vnc/Config.in index d2639fce1e..e4706953b1 100644 --- a/package/x11vnc/Config.in +++ b/package/x11vnc/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_X11VNC bool "x11vnc" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() - depends on !BR2_nios2 # libvncserver select BR2_PACKAGE_LIBVNCSERVER select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXEXT diff --git a/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch b/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch index af0e57f206..4a12c15ca4 100644 --- a/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch +++ b/package/x265/0001-CMakeLists.txt-do-not-force-compiler-flags.patch @@ -21,43 +21,37 @@ Bernd Kuhls . Upstream: https://bitbucket.org/multicoreware/x265_git/pull-requests/26 Signed-off-by: Thomas Petazzoni +[Bernd: rebased for 4.1] +Signed-off-by: Bernd Kuhls --- - source/CMakeLists.txt | 10 +++------- - source/dynamicHDR10/CMakeLists.txt | 6 +++--- - 2 files changed, 6 insertions(+), 10 deletions(-) + source/CMakeLists.txt | 6 +++--- + source/dynamicHDR10/CMakeLists.txt | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index a407271b4..a34bf4d4f 100755 +index c14489ea6..fa331e8af 100755 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -239,11 +239,7 @@ if(GCC) - endif() +@@ -270,14 +270,14 @@ if(GCC) endif() if(ARM AND CROSS_COMPILE_ARM) -- if(ARM64) -- set(ARM_ARGS -fPIC) -- else() -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- endif() -+ set(ARM_ARGS -fPIC) message(STATUS "cross compile arm") +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) ++ set(ARM_ARGS -fPIC) elseif(ARM) - if(ARM64) -@@ -252,10 +248,10 @@ if(GCC) + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) else() - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -mfpu=neon -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) endif() endif() + if(ARM64) diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt -index 22fb79d44..2cea7c48a 100644 +index 4243338c6..62853a06b 100644 --- a/source/dynamicHDR10/CMakeLists.txt +++ b/source/dynamicHDR10/CMakeLists.txt @@ -43,14 +43,14 @@ if(GCC) diff --git a/package/x265/0002-Fix-CMake-build-error-with-latest-CMake-4.0-release.patch b/package/x265/0002-Fix-CMake-build-error-with-latest-CMake-4.0-release.patch new file mode 100644 index 0000000000..95d7a7c7b2 --- /dev/null +++ b/package/x265/0002-Fix-CMake-build-error-with-latest-CMake-4.0-release.patch @@ -0,0 +1,35 @@ +From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001 +From: yaswanthsastry +Date: Mon, 24 Feb 2025 17:07:03 +0530 +Subject: [PATCH] Fix CMake build error with latest CMake 4.0 release + +Upstream: https://bitbucket.org/multicoreware/x265_git/commits/b354c009a60bcd6d7fc04014e200a1ee9c45c167 + +Signed-off-by: Bernd Kuhls +--- + source/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 37dbe1a87..4f5b3ed82 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") + if(POLICY CMP0025) +- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang ++ cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang + endif() + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH + endif() + if(POLICY CMP0054) +- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted ++ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted + endif() + + project (x265) +-- +2.51.0 + diff --git a/package/x265/0003-Fix-for-CMake-Build-Errors-in-MacOS.patch b/package/x265/0003-Fix-for-CMake-Build-Errors-in-MacOS.patch new file mode 100644 index 0000000000..200ba15be4 --- /dev/null +++ b/package/x265/0003-Fix-for-CMake-Build-Errors-in-MacOS.patch @@ -0,0 +1,60 @@ +From 51ae8e922bcc4586ad4710812072289af91492a8 Mon Sep 17 00:00:00 2001 +From: yaswanthsastry +Date: Mon, 7 Apr 2025 11:27:36 +0530 +Subject: [PATCH] Fix for CMake Build Errors in MacOS + +Upstream: https://bitbucket.org/multicoreware/x265_git/commits/51ae8e922bcc4586ad4710812072289af91492a8 + +Signed-off-by: Bernd Kuhls +--- + source/CMakeLists.txt | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 4f5b3ed82..7183fd3ce 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -6,18 +6,14 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") +-if(POLICY CMP0025) +- cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang +-endif() ++ + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH + endif() +-if(POLICY CMP0054) +- cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted +-endif() ++ + + project (x265) +-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8 ++cmake_minimum_required (VERSION 2.8.8...3.10) # OBJECT libraries require 2.8.8 + include(CheckIncludeFiles) + include(CheckFunctionExists) + include(CheckSymbolExists) +@@ -168,7 +164,7 @@ if(APPLE) + add_definitions(-DMACOS=1) + endif() + +-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") ++if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") + set(CLANG 1) + endif() + if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") +@@ -740,6 +736,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) + if(ARM OR CROSS_COMPILE_ARM) + # compile ARM arch asm files here + enable_language(ASM) ++ if(APPLE) ++ set(ARM_ARGS ${ARM_ARGS} -arch ${CMAKE_OSX_ARCHITECTURES}) ++ endif() + foreach(ASM ${ARM_ASMS}) + set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM}) + list(APPEND ASM_SRCS ${ASM_SRC}) +-- +2.51.0 + diff --git a/package/x265/0004-Fix-neon-undefined-symbols-in-armv6l-armv7l.patch b/package/x265/0004-Fix-neon-undefined-symbols-in-armv6l-armv7l.patch new file mode 100644 index 0000000000..75f1d4c532 --- /dev/null +++ b/package/x265/0004-Fix-neon-undefined-symbols-in-armv6l-armv7l.patch @@ -0,0 +1,28 @@ +From ddb1933598736394b646cb0f78da4a4201ffc656 Mon Sep 17 00:00:00 2001 +From: Uthayakumar Muthu +Date: Sun, 12 Jan 2025 13:17:21 +0530 +Subject: [PATCH] Fix neon undefined symbols in armv6l,armv7l + +Upstream: https://bitbucket.org/multicoreware/x265_git/commits/ddb1933598736394b646cb0f78da4a4201ffc656 + +Signed-off-by: Bernd Kuhls +--- + source/common/cpu.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp +index ae0907890..35c43deaf 100644 +--- a/source/common/cpu.cpp ++++ b/source/common/cpu.cpp +@@ -352,7 +352,7 @@ uint32_t cpu_detect(bool benableavx512) + { + int flags = 0; + +-#if HAVE_ARMV6 ++#if HAVE_ARMV6 && ENABLE_ASSEMBLY + flags |= X265_CPU_ARMV6; + + // don't do this hack if compiled with -mfpu=neon +-- +2.51.0 + diff --git a/package/x265/x265.hash b/package/x265/x265.hash index fb9a5b5910..640cd9ce0d 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,5 +1,3 @@ -# From https://mailman.videolan.org/pipermail/x265-devel/2021-March/013257.html -md5 deb5df5cb2ec17bdbae6ac6bbc3b1eef x265_3.5.tar.gz # Locally generated -sha256 e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8 x265_3.5.tar.gz +sha256 a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29 x265_4.1.tar.gz sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/package/x265/x265.mk b/package/x265/x265.mk index bd5180b24b..ad4285fb16 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 3.5 +X265_VERSION = 4.1 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265_git/downloads X265_LICENSE = GPL-2.0+ @@ -23,7 +23,9 @@ endif ifeq ($(BR2_ARM_CPU_ARMV7A),y) X265_CONF_OPTS += -DCROSS_COMPILE_ARM=1 ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -X265_CONF_OPTS += -DCPU_HAS_NEON=1 +X265_CONF_OPTS += -DENABLE_NEON=ON +else +X265_CONF_OPTS += -DENABLE_NEON=OFF endif endif diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 01d6c19ad6..898d2e4eff 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2024-July/010052.html -sha256 9e6a7903806966d16ce220b49377c9c8fad667c8f0ffcb23a3442946269363a7 xapian-core-1.4.26.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2024-December/010056.html +sha256 bcbc99cfbf16080119c2571fc296794f539bd542ca3926f17c2999600830ab61 xapian-core-1.4.27.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 7677571288..187e366066 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.26 +XAPIAN_VERSION = 1.4.27 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ diff --git a/package/xen/0005-tools-drop-bogus-and-obsolete-ptyfuncs.m4.patch b/package/xen/0005-tools-drop-bogus-and-obsolete-ptyfuncs.m4.patch new file mode 100644 index 0000000000..ce13f454f3 --- /dev/null +++ b/package/xen/0005-tools-drop-bogus-and-obsolete-ptyfuncs.m4.patch @@ -0,0 +1,253 @@ +From 13a088627ae0c99f6c7c763ce0883dc804b54b66 Mon Sep 17 00:00:00 2001 +From: Olaf Hering +Date: Fri, 12 May 2023 12:26:14 +0000 +Subject: [PATCH] tools: drop bogus and obsolete ptyfuncs.m4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +According to openpty(3) it is required to include to get the +prototypes for openpty() and login_tty(). But this is not what the +function AX_CHECK_PTYFUNCS actually does. It makes no attempt to include +the required header. + +The two source files which call openpty() and login_tty() already contain +the conditionals to include the required header. + +Remove the bogus m4 file to fix build with clang, which complains about +calls to undeclared functions. + +Remove usage of INCLUDE_LIBUTIL_H in libxl_bootloader.c, it is already +covered by inclusion of libxl_osdep.h. + +Remove usage of PTYFUNCS_LIBS in libxl/Makefile, it is already covered +by UTIL_LIBS from config/StdGNU.mk. + +Signed-off-by: Olaf Hering +Reviewed-by: Anthony PERARD +[Vincent: backported to 4.14.6] +Signed-off-by: Vincent Stehlé +Upstream: https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=42abf5b9c53eb1b1a902002fcda68708234152c3 +--- + config/Tools.mk.in | 2 - + m4/ptyfuncs.m4 | 35 ----------------- + tools/config.h.in | 3 -- + tools/configure | 68 ---------------------------------- + tools/configure.ac | 2 - + tools/libxl/Makefile | 2 +- + tools/libxl/libxl_bootloader.c | 4 -- + 7 files changed, 1 insertion(+), 115 deletions(-) + delete mode 100644 m4/ptyfuncs.m4 + +diff --git a/config/Tools.mk.in b/config/Tools.mk.in +index 23df47af8d..4971c3f526 100644 +--- a/config/Tools.mk.in ++++ b/config/Tools.mk.in +@@ -31,8 +31,6 @@ PTHREAD_CFLAGS := @PTHREAD_CFLAGS@ + PTHREAD_LDFLAGS := @PTHREAD_LDFLAGS@ + PTHREAD_LIBS := @PTHREAD_LIBS@ + +-PTYFUNCS_LIBS := @PTYFUNCS_LIBS@ +- + LIBNL3_LIBS := @LIBNL3_LIBS@ + LIBNL3_CFLAGS := @LIBNL3_CFLAGS@ + XEN_TOOLS_RPATH := @rpath@ +diff --git a/m4/ptyfuncs.m4 b/m4/ptyfuncs.m4 +deleted file mode 100644 +index 3e37b5a23c..0000000000 +--- a/m4/ptyfuncs.m4 ++++ /dev/null +@@ -1,35 +0,0 @@ +-AC_DEFUN([AX_CHECK_PTYFUNCS], [ +- dnl This is a workaround for a bug in Debian package +- dnl libbsd-dev-0.3.0-1. Once we no longer support that +- dnl package we can remove the addition of -Werror to +- dnl CPPFLAGS. +- AX_SAVEVAR_SAVE(CPPFLAGS) +- CPPFLAGS="$CPPFLAGS -Werror" +- AC_CHECK_HEADER([libutil.h],[ +- AC_DEFINE([INCLUDE_LIBUTIL_H],[],[libutil header file name]) +- ]) +- AX_SAVEVAR_RESTORE(CPPFLAGS) +- AC_CACHE_CHECK([for openpty et al], [ax_cv_ptyfuncs_libs], [ +- for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do +- if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then +- AC_MSG_FAILURE([Unable to find library for openpty and login_tty]) +- fi +- AX_SAVEVAR_SAVE(LIBS) +- LIBS="$LIBS $ax_cv_ptyfuncs_libs" +- AC_LINK_IFELSE([AC_LANG_SOURCE([ +-#ifdef INCLUDE_LIBUTIL_H +-#include INCLUDE_LIBUTIL_H +-#endif +-int main(void) { +- openpty(0,0,0,0,0); +- login_tty(0); +-} +-])],[ +- break +- ],[]) +- AX_SAVEVAR_RESTORE(LIBS) +- done +- ]) +- PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs" +- AC_SUBST(PTYFUNCS_LIBS) +-]) +diff --git a/tools/config.h.in b/tools/config.h.in +index 5abf6092de..6b9a479928 100644 +--- a/tools/config.h.in ++++ b/tools/config.h.in +@@ -87,9 +87,6 @@ + /* Define extfs header to use */ + #undef INCLUDE_EXTFS_H + +-/* libutil header file name */ +-#undef INCLUDE_LIBUTIL_H +- + /* IPXE path */ + #undef IPXE_PATH + +diff --git a/tools/configure b/tools/configure +index cf937c9b7a..5102297210 100755 +--- a/tools/configure ++++ b/tools/configure +@@ -636,7 +636,6 @@ LIBNL3_LIBS + LIBNL3_CFLAGS + argp_ldflags + libiconv +-PTYFUNCS_LIBS + PTHREAD_LIBS + PTHREAD_LDFLAGS + PTHREAD_CFLAGS +@@ -3739,8 +3738,6 @@ esac + + + +- +- + # Fetched from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4 + # Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5 + # =========================================================================== +@@ -8871,71 +8868,6 @@ $as_echo "$ax_cv_pthread_flags" >&6; } + + + +- +- +- saved_CPPFLAGS="$CPPFLAGS" +- +- CPPFLAGS="$CPPFLAGS -Werror" +- ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" +-if test "x$ac_cv_header_libutil_h" = xyes; then : +- +- +-$as_echo "#define INCLUDE_LIBUTIL_H " >>confdefs.h +- +- +-fi +- +- +- +- CPPFLAGS="$saved_CPPFLAGS" +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty et al" >&5 +-$as_echo_n "checking for openpty et al... " >&6; } +-if ${ax_cv_ptyfuncs_libs+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do +- if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "Unable to find library for openpty and login_tty +-See \`config.log' for more details" "$LINENO" 5; } +- fi +- +- saved_LIBS="$LIBS" +- +- LIBS="$LIBS $ax_cv_ptyfuncs_libs" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#ifdef INCLUDE_LIBUTIL_H +-#include INCLUDE_LIBUTIL_H +-#endif +-int main(void) { +- openpty(0,0,0,0,0); +- login_tty(0); +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +- break +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +- LIBS="$saved_LIBS" +- +- done +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ptyfuncs_libs" >&5 +-$as_echo "$ax_cv_ptyfuncs_libs" >&6; } +- PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs" +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5 + $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; } + if ${ac_cv_lib_yajl_yajl_alloc+:} false; then : +diff --git a/tools/configure.ac b/tools/configure.ac +index 1808cffafb..9e5cf3aae0 100644 +--- a/tools/configure.ac ++++ b/tools/configure.ac +@@ -67,7 +67,6 @@ m4_include([../m4/uuid.m4]) + m4_include([../m4/pkg.m4]) + m4_include([../m4/curses.m4]) + m4_include([../m4/pthread.m4]) +-m4_include([../m4/ptyfuncs.m4]) + m4_include([../m4/extfs.m4]) + m4_include([../m4/fetcher.m4]) + m4_include([../m4/ax_compare_version.m4]) +@@ -417,7 +416,6 @@ AC_SUBST(zlib) + AC_SUBST(system_aio) + AX_CHECK_EXTFS + AX_CHECK_PTHREAD +-AX_CHECK_PTYFUNCS + AC_CHECK_LIB([yajl], [yajl_alloc], [], + [AC_MSG_ERROR([Could not find yajl])]) + AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) +diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile +index 38cd43abae..0f09be1624 100644 +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile +@@ -20,7 +20,7 @@ LIBUUID_LIBS += -luuid + endif + + LIBXL_LIBS = +-LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenhypfs) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ++LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenhypfs) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(UTIL_LIBS) $(LIBUUID_LIBS) + ifeq ($(CONFIG_LIBNL),y) + LIBXL_LIBS += $(LIBNL3_LIBS) + endif +diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c +index 18e9ebd714..1bc6e51827 100644 +--- a/tools/libxl/libxl_bootloader.c ++++ b/tools/libxl/libxl_bootloader.c +@@ -19,10 +19,6 @@ + #include + #endif + +-#ifdef INCLUDE_LIBUTIL_H +-#include INCLUDE_LIBUTIL_H +-#endif +- + #include "libxl_internal.h" + + #define BOOTLOADER_BUF_OUT 65536 +-- +2.45.2 + diff --git a/package/xen/0006-Arm64-adjust-__irq_to_desc-to-fix-build-with-gcc14.patch b/package/xen/0006-Arm64-adjust-__irq_to_desc-to-fix-build-with-gcc14.patch new file mode 100644 index 0000000000..ea810ed3f8 --- /dev/null +++ b/package/xen/0006-Arm64-adjust-__irq_to_desc-to-fix-build-with-gcc14.patch @@ -0,0 +1,62 @@ +From a17dda1d2bf9c25b91f9e72625696cf26b32673a Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Thu, 29 Aug 2024 10:03:53 +0200 +Subject: [PATCH] Arm64: adjust __irq_to_desc() to fix build with gcc14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With the original code I observe + +In function ‘__irq_to_desc’, + inlined from ‘route_irq_to_guest’ at arch/arm/irq.c:465:12: +arch/arm/irq.c:54:16: error: array subscript -2 is below array bounds of ‘irq_desc_t[32]’ {aka ‘struct irq_desc[32]’} [-Werror=array-bounds=] + 54 | return &this_cpu(local_irq_desc)[irq]; + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +which looks pretty bogus: How in the world does the compiler arrive at +-2 when compiling route_irq_to_guest()? Yet independent of that the +function's parameter wants to be of unsigned type anyway, as shown by +a vast majority of callers (others use plain int when they really mean +non-negative quantities). With that adjustment the code compiles fine +again. + +Signed-off-by: Jan Beulich +Acked-by: Michal Orzel +[Vincent: backported to 4.14.6] +Signed-off-by: Vincent Stehlé +Upstream: https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=99f942f3d410059dc223ee0a908827e928ef3592 +--- + xen/arch/arm/irq.c | 2 +- + xen/include/asm-arm/irq.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c +index 3877657a52..2862de00d9 100644 +--- a/xen/arch/arm/irq.c ++++ b/xen/arch/arm/irq.c +@@ -66,7 +66,7 @@ hw_irq_controller no_irq_type = { + static irq_desc_t irq_desc[NR_IRQS]; + static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); + +-irq_desc_t *__irq_to_desc(int irq) ++irq_desc_t *__irq_to_desc(unsigned int irq) + { + if ( irq < NR_LOCAL_IRQS ) + return &this_cpu(local_irq_desc)[irq]; +diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h +index e45d574598..33fbbadb34 100644 +--- a/xen/include/asm-arm/irq.h ++++ b/xen/include/asm-arm/irq.h +@@ -57,7 +57,7 @@ extern const unsigned int nr_irqs; + struct irq_desc; + struct irqaction; + +-struct irq_desc *__irq_to_desc(int irq); ++struct irq_desc *__irq_to_desc(unsigned int irq); + + #define irq_to_desc(irq) __irq_to_desc(irq) + +-- +2.45.2 + diff --git a/package/xen/0007-xen-arm32-avoid-.rodata-to-be-marked-as-executable.patch b/package/xen/0007-xen-arm32-avoid-.rodata-to-be-marked-as-executable.patch new file mode 100644 index 0000000000..9c484698ca --- /dev/null +++ b/package/xen/0007-xen-arm32-avoid-.rodata-to-be-marked-as-executable.patch @@ -0,0 +1,58 @@ +From 99314e08c6450a841d4f7155b7ce364e0990df1c Mon Sep 17 00:00:00 2001 +From: Jan Beulich +Date: Fri, 11 Jun 2021 11:19:15 +0200 +Subject: [PATCH] xen/arm32: avoid .rodata to be marked as executable + +The section .proc.info lives in .rodata as it doesn't contain any +executable code. However, the section is still marked as executable +as the consequence .rodata will also be marked executable. + +Xen doesn't use the ELF permissions to decide the page-table mapping +permission. However, this will confuse disassemblers. + +'#execinstr' is now removed on all the pushsection dealing with +.proc.info + +Signed-off-by: Jan Beulich +[julieng: Rework the commit message] +Acked-by: Julien Grall +Upstream: https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=163f47c14737cfa9dfb3240deea356b08caf7614 +Signed-off-by: Vincent Stehlé +--- + xen/arch/arm/arm32/proc-v7.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S +index 46bfc7a..8b418ed 100644 +--- a/xen/arch/arm/arm32/proc-v7.S ++++ b/xen/arch/arm/arm32/proc-v7.S +@@ -30,7 +30,7 @@ brahma15mp_init: + mcr CP32(r0, ACTLR) + mov pc, lr + +- .section ".proc.info", #alloc, #execinstr ++ .section ".proc.info", #alloc + .type __v7_ca15mp_proc_info, #object + __v7_ca15mp_proc_info: + .long 0x410FC0F0 /* Cortex-A15 */ +@@ -39,7 +39,7 @@ __v7_ca15mp_proc_info: + .long caxx_processor + .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info + +- .section ".proc.info", #alloc, #execinstr ++ .section ".proc.info", #alloc + .type __v7_ca7mp_proc_info, #object + __v7_ca7mp_proc_info: + .long 0x410FC070 /* Cortex-A7 */ +@@ -48,7 +48,7 @@ __v7_ca7mp_proc_info: + .long caxx_processor + .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info + +- .section ".proc.info", #alloc, #execinstr ++ .section ".proc.info", #alloc + .type __v7_brahma15mp_proc_info, #object + __v7_brahma15mp_proc_info: + .long 0x420F00F0 /* Broadcom Brahma-B15 */ +-- +2.48.1 + diff --git a/package/xen/0008-arm-Avoid-using-solaris-syntax-for-.section-directiv.patch b/package/xen/0008-arm-Avoid-using-solaris-syntax-for-.section-directiv.patch new file mode 100644 index 0000000000..127c126f99 --- /dev/null +++ b/package/xen/0008-arm-Avoid-using-solaris-syntax-for-.section-directiv.patch @@ -0,0 +1,73 @@ +From be0ff8586e38823d6ee08e031c28e5831bbb0991 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 1 Aug 2023 10:49:30 -0700 +Subject: [PATCH] arm: Avoid using solaris syntax for .section directive + +Assembler from binutils 2.41 will rejects ([1], [2]) the following +syntax + +.section "name", #alloc + +for any other any target other than ELF SPARC. This means we can't use +it in the Arm code. + +So switch to the GNU syntax + +.section name [, "flags"[, @type]] + +[1] https://sourceware.org/bugzilla/show_bug.cgi?id=11601 +[2] https://sourceware.org/binutils/docs-2.41/as.html#Section + +Signed-off-by: Khem Raj +Reviewed-by: Michal Orzel +[jgrall: Reword commit message] +Acked-by: Julien Grall +Upstream: https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=dfc490a3740bb7d6889939934afadcb58891fbce +Signed-off-by: Vincent Stehlé +--- + xen/arch/arm/arm32/proc-v7.S | 6 +++--- + xen/arch/arm/dtb.S | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S +index 8b418ed..9869780 100644 +--- a/xen/arch/arm/arm32/proc-v7.S ++++ b/xen/arch/arm/arm32/proc-v7.S +@@ -30,7 +30,7 @@ brahma15mp_init: + mcr CP32(r0, ACTLR) + mov pc, lr + +- .section ".proc.info", #alloc ++ .section .proc.info, "a" + .type __v7_ca15mp_proc_info, #object + __v7_ca15mp_proc_info: + .long 0x410FC0F0 /* Cortex-A15 */ +@@ -39,7 +39,7 @@ __v7_ca15mp_proc_info: + .long caxx_processor + .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info + +- .section ".proc.info", #alloc ++ .section .proc.info, "a" + .type __v7_ca7mp_proc_info, #object + __v7_ca7mp_proc_info: + .long 0x410FC070 /* Cortex-A7 */ +@@ -48,7 +48,7 @@ __v7_ca7mp_proc_info: + .long caxx_processor + .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info + +- .section ".proc.info", #alloc ++ .section .proc.info, "a" + .type __v7_brahma15mp_proc_info, #object + __v7_brahma15mp_proc_info: + .long 0x420F00F0 /* Broadcom Brahma-B15 */ +diff --git a/xen/arch/arm/dtb.S b/xen/arch/arm/dtb.S +index c703aef..8771daf 100644 +--- a/xen/arch/arm/dtb.S ++++ b/xen/arch/arm/dtb.S +@@ -1,2 +1,2 @@ +- .section .dtb,#alloc ++ .section .dtb, "a" + .incbin CONFIG_DTB_FILE +-- +2.48.1 + diff --git a/package/xen/Config.in b/package/xen/Config.in index af6acd3530..70a06f3cbf 100644 --- a/package/xen/Config.in +++ b/package/xen/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_XEN config BR2_PACKAGE_XEN_HYPERVISOR bool "Xen hypervisor" help - The Xen binaries are avaliable in /usr/lib/xen/ See + The Xen binaries are available in /usr/lib/xen/ See http://wiki.xenproject.org/wiki/Getting_Started for using the Xen hypervisor. @@ -33,6 +33,8 @@ config BR2_PACKAGE_XEN_TOOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_YAJL select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_BASH # runtime (scripts) + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS if BR2_PACKAGE_BUSYBOX # bash help The Xen tools can be accessed by the xl command. diff --git a/package/xerces/xerces.hash b/package/xerces/xerces.hash index e6b5b922d2..871089346f 100644 --- a/package/xerces/xerces.hash +++ b/package/xerces/xerces.hash @@ -1,5 +1,5 @@ -# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.4.tar.xz.sha256 -sha256 075bc57940da0f9be6dd183c550c8ce0b9833e4550dc382048377a1a5e3b2bd9 xerces-c-3.2.4.tar.xz +# From https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.3.0.tar.gz.sha256 +sha256 9555f1d06f82987fbb4658862705515740414fd34b4db6ad2ed76a2dc08d3bde xerces-c-3.3.0.tar.gz # Hash for license file sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 08efa6fb5c..198f15aa3a 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -4,9 +4,9 @@ # ################################################################################ -XERCES_VERSION = 3.2.4 -XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz -XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources +XERCES_VERSION = 3.3.0 +XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.gz +XERCES_SITE = https://archive.apache.org/dist/xerces/c/3/sources XERCES_LICENSE = Apache-2.0 XERCES_LICENSE_FILES = LICENSE XERCES_CPE_ID_VENDOR = apache diff --git a/package/xfsprogs/0002-configure-additionally-get-icu-uc-from-pkg-config.patch b/package/xfsprogs/0002-configure-additionally-get-icu-uc-from-pkg-config.patch new file mode 100644 index 0000000000..714d1e1257 --- /dev/null +++ b/package/xfsprogs/0002-configure-additionally-get-icu-uc-from-pkg-config.patch @@ -0,0 +1,47 @@ +From 0b3e7284c7fa20dd27f8a584f8db417d1d6fa27b Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Fri, 14 Feb 2025 09:45:10 +0100 +Subject: configure: additionally get icu-uc from pkg-config + +Upstream libicu changed its pkgconfig files[0] in version 76 to require +callers to call out to each .pc file they need for the libraries they +want to link against. This apparently reduces overlinking, at a cost of +needing the world to fix themselves up. + +This patch fixes the following build error with icu 76, also seen by +Fedora[1]: + + /bin/ld: unicrash.o: undefined reference to symbol 'uiter_setString_76' + /bin/ld: /lib/libicuuc.so.76: error adding symbols: DSO missing from command line + collect2: error: ld returned 1 exit status + make[2]: *** [../include/buildrules:65: xfs_scrub] Error 1 + make[1]: *** [include/buildrules:35: scrub] Error 2 + +Link: https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 [0] +Link: https://src.fedoraproject.org/rpms/xfsprogs/c/624b0fdf7b2a31c1a34787b04e791eee47c97340 [1] +Signed-off-by: Alyssa Ross +Reviewed-by: "Darrick J. Wong" + +Upstream: https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=0b3e7284c7fa20dd27f8a584f8db417d1d6fa27b + +Signed-off-by: Bernd Kuhls +--- + m4/package_icu.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'm4/package_icu.m4') + +diff --git a/m4/package_icu.m4 b/m4/package_icu.m4 +index 3ccbe0cc98..6b89c874f1 100644 +--- a/m4/package_icu.m4 ++++ b/m4/package_icu.m4 +@@ -1,5 +1,5 @@ + AC_DEFUN([AC_HAVE_LIBICU], +- [ PKG_CHECK_MODULES([libicu], [icu-i18n], [have_libicu=yes], [have_libicu=no]) ++ [ PKG_CHECK_MODULES([libicu], [icu-i18n icu-uc], [have_libicu=yes], [have_libicu=no]) + AC_SUBST(have_libicu) + AC_SUBST(libicu_CFLAGS) + AC_SUBST(libicu_LIBS) +-- +cgit 1.2.3-korg + diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 0234b91d09..552ff69bd6 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -10,6 +10,15 @@ XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 +# 0002-configure-additionally-get-icu-uc-from-pkg-config.patch +XFSPROGS_AUTORECONF = YES + +# restore upstream install-sh script overwritten by autoreconf +define XFSPROGS_FIX_INSTALL_SH + mv $(@D)/install-sh~ $(@D)/install-sh +endef +XFSPROGS_POST_CONFIGURE_HOOKS = XFSPROGS_FIX_INSTALL_SH + XFSPROGS_DEPENDENCIES = inih liburcu util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" diff --git a/package/xilinx-fpgautil/Config.in b/package/xilinx-fpgautil/Config.in new file mode 100644 index 0000000000..29245c0c5e --- /dev/null +++ b/package/xilinx-fpgautil/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_XILINX_FPGAUTIL + bool "xilinx-fpgautil" + depends on BR2_arm || BR2_aarch64 + help + Xilinx FPGA Manager Utility for zynq, zynqmp + and versal products. + + https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c diff --git a/package/xilinx-fpgautil/xilinx-fpgautil.hash b/package/xilinx-fpgautil/xilinx-fpgautil.hash new file mode 100644 index 0000000000..d214fd4269 --- /dev/null +++ b/package/xilinx-fpgautil/xilinx-fpgautil.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a0185fda33a538379eb5ae48253f721037485be85c51555e2ad49e322d389429 xilinx-fpgautil-xlnx-rel-v2025.1.tar.gz +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e COPYING.MIT diff --git a/package/xilinx-fpgautil/xilinx-fpgautil.mk b/package/xilinx-fpgautil/xilinx-fpgautil.mk new file mode 100644 index 0000000000..d41af96ee5 --- /dev/null +++ b/package/xilinx-fpgautil/xilinx-fpgautil.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# xilinx-fpgautil +# +################################################################################ + +XILINX_FPGAUTIL_VERSION = xlnx-rel-v2025.1 +XILINX_FPGAUTIL_SITE = $(call github,Xilinx,meta-xilinx,$(XILINX_FPGAUTIL_VERSION)) +XILINX_FPGAUTIL_LICENSE = MIT +XILINX_FPGAUTIL_LICENSE_FILES = COPYING.MIT + +define XILINX_FPGAUTIL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_LDFLAGS) \ + $(@D)/meta-xilinx-core/recipes-bsp/fpga-manager-script/files/fpgautil.c \ + -o $(@D)/fpgautil +endef + +define XILINX_FPGAUTIL_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/fpgautil $(TARGET_DIR)/usr/bin/fpgautil +endef + +$(eval $(generic-package)) diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk index f58c26f02a..f63a8a2251 100644 --- a/package/xinetd/xinetd.mk +++ b/package/xinetd/xinetd.mk @@ -29,6 +29,11 @@ else ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),) XINETD_CFLAGS += -DNO_RPC endif +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +# Make ecvt(), fcvt(), and gcvt() available for SIO library +XINETD_CFLAGS += -D_GNU_SOURCE +endif + XINETD_CONF_ENV += \ CFLAGS="$(XINETD_CFLAGS)" \ LIBS="$(XINETD_LIBS)" diff --git a/package/xl2tp/0001-Fix-compiling-with-C23.patch b/package/xl2tp/0001-Fix-compiling-with-C23.patch new file mode 100644 index 0000000000..6f32e7df35 --- /dev/null +++ b/package/xl2tp/0001-Fix-compiling-with-C23.patch @@ -0,0 +1,38 @@ +From cabd67927d8ed565c36cdd0cbf9b9dbd71606009 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Thu, 21 Nov 2024 00:12:29 +0200 +Subject: [PATCH] Fix compiling with C23. + +https://bugs.gentoo.org/944070 +Signed-off-by: Jaco Kroon + +Upstream: https://github.com/xelerance/xl2tpd/commit/cabd67927d8ed565c36cdd0cbf9b9dbd71606009 + +Signed-off-by: Bernd Kuhls +--- + xl2tpd.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/xl2tpd.c b/xl2tpd.c +index 791d5a4..4bf15fd 100644 +--- a/xl2tpd.c ++++ b/xl2tpd.c +@@ -74,7 +74,7 @@ static int control_handle_lac_hangup(FILE* resf, char* bufp); + static int control_handle_lac_disconnect(FILE* resf, char* bufp); + static int control_handle_lac_add_modify(FILE* resf, char* bufp); + static int control_handle_lac_remove(FILE* resf, char* bufp); +-static int control_handle_lac_status(); ++static int control_handle_lac_status(FILE* resf, char* bufp); + static int control_handle_lns_remove(FILE* resf, char* bufp); + + static struct control_requests_handler control_handlers[] = { +@@ -1549,7 +1549,8 @@ static int control_handle_lac_remove(FILE* resf, char* bufp){ + return 1; + } + +-static int control_handle_lac_status(){ ++static int control_handle_lac_status(FILE*, char*) ++{ + show_status (); + return 1; + } diff --git a/package/xmlstarlet/0002-xml_pyx-remove-ATTRIBUTE_UNUSED.patch b/package/xmlstarlet/0002-xml_pyx-remove-ATTRIBUTE_UNUSED.patch new file mode 100644 index 0000000000..dd7472301e --- /dev/null +++ b/package/xmlstarlet/0002-xml_pyx-remove-ATTRIBUTE_UNUSED.patch @@ -0,0 +1,49 @@ +From 6b3ca3549abb998947088bdf264d65a0a86684cd Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 12 Oct 2025 18:38:54 +0200 +Subject: [PATCH] xml_pyx: remove ATTRIBUTE_UNUSED + +This define was removed in libxml2 2.14.0: +https://gitlab.gnome.org/GNOME/libxml2/-/commit/208f27f9641a59863ce1f7d4992df77f7eb0ea9d + +Upstream: https://sourceforge.net/p/xmlstar/patches/23/ + +Signed-off-by: Bernd Kuhls +--- + src/xml_pyx.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/xml_pyx.c b/src/xml_pyx.c +index ab295f1..8adc028 100644 +--- a/src/xml_pyx.c ++++ b/src/xml_pyx.c +@@ -200,7 +200,7 @@ pyxExternalEntityReferenceHandler(void* userData, + } + + static void +-pyxExternalSubsetHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, ++pyxExternalSubsetHandler(void *ctx, const xmlChar *name, + const xmlChar *ExternalID, const xmlChar *SystemID) + { + fprintf(stdout, "D %s PUBLIC", name); /* TODO: re-check */ +@@ -215,7 +215,7 @@ pyxExternalSubsetHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, + } + + static void +-pyxCommentHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value) ++pyxCommentHandler(void *ctx, const xmlChar *value) + { + fprintf(stdout,"C"); + SanitizeData(value, xmlStrlen(value)); +@@ -223,7 +223,7 @@ pyxCommentHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value) + } + + static void +-pyxCdataBlockHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value, int len) ++pyxCdataBlockHandler(void *ctx, const xmlChar *value, int len) + { + fprintf(stdout,"["); + SanitizeData(value, len); +-- +2.47.3 + diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index aa6676507a..89c8fa1c11 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 34759ca9c1b2486ecb7b6bc267c76a6f365d401b2b6de6d667e0a13ae30882a2 xmrig-6.22.2.tar.gz +sha256 3521c592a18ada781d79c919ea6c1b7e5a8bcfe2ec666789bc55fd88a2aee8d3 xmrig-6.24.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 75657407d7..860af71f75 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.22.2 +XMRIG_VERSION = 6.24.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE diff --git a/package/xnnpack/Config.in b/package/xnnpack/Config.in new file mode 100644 index 0000000000..794c5c47d2 --- /dev/null +++ b/package/xnnpack/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_XNNPACK_ARCH_SUPPORTS + bool + default y if BR2_i386 + default y if BR2_x86_64 + depends on BR2_PACKAGE_CPUINFO_ARCH_SUPPORTS + +config BR2_PACKAGE_XNNPACK + bool "xnnpack" + depends on BR2_PACKAGE_XNNPACK_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_HAS_THREADS # cpuinfo, pthreadpool + select BR2_PACKAGE_CPUINFO + select BR2_PACKAGE_FP16 + select BR2_PACKAGE_FXDIV + select BR2_PACKAGE_PTHREADPOOL + help + XNNPACK is a highly optimized solution for neural network + inference on ARM, x86, WebAssembly, and RISC-V platforms. + + https://github.com/google/XNNPACK + +comment "xnnpack needs a toolchain w/ C++14, threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/xnnpack/xnnpack.hash b/package/xnnpack/xnnpack.hash new file mode 100644 index 0000000000..576b73aec0 --- /dev/null +++ b/package/xnnpack/xnnpack.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 0ed35a104a697abbae72b02b967e057883ff57b388178649c453b68cffb81f72 xnnpack-d7f398ee5e135ef4f7045802eea973cc6cb26c6c.tar.gz +# License files, locally calculated +sha256 63f519e15726f4c4f830bd958f694c84fecb4e0a4cacc527d2696bb71ef95ada LICENSE diff --git a/package/xnnpack/xnnpack.mk b/package/xnnpack/xnnpack.mk new file mode 100644 index 0000000000..bb53188f9e --- /dev/null +++ b/package/xnnpack/xnnpack.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# xnnpack +# +################################################################################ + +XNNPACK_VERSION = d7f398ee5e135ef4f7045802eea973cc6cb26c6c +XNNPACK_SITE = $(call github,google,XNNPACK,$(XNNPACK_VERSION)) +XNNPACK_LICENSE = BSD-3-Clause +XNNPACK_LICENSE_FILES = LICENSE +XNNPACK_INSTALL_STAGING = YES +XNNPACK_DEPENDENCIES = cpuinfo fp16 fxdiv pthreadpool +XNNPACK_CONF_OPTS = \ + -DCPUINFO_SOURCE_DIR=$(STAGING_DIR)/usr \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DXNNPACK_BUILD_TESTS=OFF \ + -DXNNPACK_BUILD_BENCHMARKS=OFF \ + -DXNNPACK_ENABLE_KLEIDIAI=OFF \ + -DXNNPACK_USE_SYSTEM_LIBS=ON + +$(eval $(cmake-package)) diff --git a/package/xr819-xradio/0001-Fix-build-for-kernel-6.17.patch b/package/xr819-xradio/0001-Fix-build-for-kernel-6.17.patch new file mode 100644 index 0000000000..3329016472 --- /dev/null +++ b/package/xr819-xradio/0001-Fix-build-for-kernel-6.17.patch @@ -0,0 +1,80 @@ +From dbf3f744650e05a40fc3df6325fc657e5c23cece Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Fri, 10 Oct 2025 22:18:12 +0200 +Subject: [PATCH] Fix build for kernel 6.17 + +With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b74947b4f6ff7c122a1bb6eb38bb7ecfbb1d3820 +set_rts_threshold() and config() gain argument radio_idx to get radio +index. So let's add that argument according to Linux version >= 6.17. + +Upstream: https://github.com/fifteenhex/xradio/commit/43992a7e7ed95ff815cf6d8ba81cef1085e50ab9 +Signed-off-by: Giulio Benetti +--- + sta.c | 12 ++++++++++-- + sta.h | 12 ++++++++++-- + 2 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/sta.c b/sta.c +index 1203ce9..d769b81 100644 +--- a/sta.c ++++ b/sta.c +@@ -381,7 +381,11 @@ int xradio_change_interface(struct ieee80211_hw *dev, + return ret; + } + +-int xradio_config(struct ieee80211_hw *dev, u32 changed) ++int xradio_config(struct ieee80211_hw *dev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif ++ u32 changed) + { + int ret = 0; + struct xradio_common *hw_priv = dev->priv; +@@ -796,7 +800,11 @@ void xradio_wep_key_work(struct work_struct *work) + wsm_unlock_tx(hw_priv); + } + +-int xradio_set_rts_threshold(struct ieee80211_hw *hw, u32 value) ++int xradio_set_rts_threshold(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif ++ u32 value) + { + struct xradio_common *hw_priv = hw->priv; + int ret = 0; +diff --git a/sta.h b/sta.h +index 39a023a..de8f837 100644 +--- a/sta.h ++++ b/sta.h +@@ -42,7 +42,11 @@ int xradio_change_interface(struct ieee80211_hw *dev, + struct ieee80211_vif *vif, + enum nl80211_iftype new_type, + bool p2p); +-int xradio_config(struct ieee80211_hw *dev, u32 changed); ++int xradio_config(struct ieee80211_hw *dev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif ++ u32 changed); + int xradio_change_interface(struct ieee80211_hw *dev, + struct ieee80211_vif *vif, + enum nl80211_iftype new_type, +@@ -65,7 +69,11 @@ int xradio_get_stats(struct ieee80211_hw *dev, + int xradio_get_tx_stats(struct ieee80211_hw *dev, + struct ieee80211_tx_queue_stats *stats); + */ +-int xradio_set_rts_threshold(struct ieee80211_hw *hw, u32 value); ++int xradio_set_rts_threshold(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)) ++ int radio_idx, ++#endif ++ u32 value); + + void xradio_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u32 queues, bool drop); + +-- +2.47.3 + diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 388a3a3cd4..fe91d856ec 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8bc3d745ed08b7f3a9c0413c2635d0faf647362b41494d04edc98709b869deef xr819-xradio-3a1f77fb2db248b7d18d93b67b16e0d6c91db184.tar.gz +sha256 c06dd87948b4a4c1bee070bbc3ce07b8711ec027e78ab9b83ea1c7350472105d xr819-xradio-d766844ce8307e5902b3ab461f06bf8ad06891dd.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8b576a347a..93fbdacb38 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 3a1f77fb2db248b7d18d93b67b16e0d6c91db184 +XR819_XRADIO_VERSION = d766844ce8307e5902b3ab461f06bf8ad06891dd XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE diff --git a/package/xscreensaver/0001-allow_unrecognized_conf_opts.patch b/package/xscreensaver/0001-allow_unrecognized_conf_opts.patch new file mode 100644 index 0000000000..d9e9367d05 --- /dev/null +++ b/package/xscreensaver/0001-allow_unrecognized_conf_opts.patch @@ -0,0 +1,28 @@ +Description: Allow unrecognized configure options + Fix an oddity in upstream-generated configure. + Our dh_auto_configure will add several unrecognized options. +Forwarded: not-needed +Author: Tormod Volden + +Downloaded from +https://sources.debian.org/data/main/x/xscreensaver/6.09%2Bdfsg1-1/debian/patches/94_allow_unrecognized_conf_opts.patch + +Upstream: not applicable + +Signed-off-by: Bernd Kuhls + +Index: xscreensaver-git/configure +=================================================================== +--- xscreensaver-git.orig/configure ++++ xscreensaver-git/configure +@@ -2856,8 +2856,8 @@ echo "current directory: `pwd`" + echo "command line was: $0 $@" + + if ! test -z "$ac_unrecognized_opts" ; then +- echo "" >&2 +- exit 2 ++ echo "ignored options $ac_unrecognized_opts" >&2 ++ #exit 2 + fi + + ############################################################################### diff --git a/package/xscreensaver/0002-configure_allow_warnings.patch b/package/xscreensaver/0002-configure_allow_warnings.patch new file mode 100644 index 0000000000..bd9a47207f --- /dev/null +++ b/package/xscreensaver/0002-configure_allow_warnings.patch @@ -0,0 +1,35 @@ +Description: Allow warnings from configure + Since 6.03 the original configure script returns non-zero if a + warning about configuration options versus detected capabilities + has been issued, presumably to increase awareness of the warnings. + To allow building on all architectures, while relying on the + resulting HAVE_XX flags as usual, return with success at the end + of the script. +Forwarded: not-needed +Author: Tormod Volden + +Downloaded from +https://sources.debian.org/src/xscreensaver/6.09%2Bdfsg1-1/debian/patches/100_configure_allow_warnings.patch + +Upstream: not applicable + +[Bernd: s/Debian/buildroot] +Signed-off-by: Bernd Kuhls + +Index: xscreensaver-git/configure +=================================================================== +--- xscreensaver-git.orig/configure ++++ xscreensaver-git/configure +@@ -23273,5 +23273,11 @@ echo " Extra Fonts: ${FONT + echo " App Defaults: ${APPDEFAULTS}/$addir_err" + echo "" + +-exit $CONF_STATUS ++if test "$CONF_STATUS" != 0; then ++ echo "" ++ echo "Warning: Buildroot build will proceed regardless of above warnings" ++ echo "" ++fi ++ ++exit 0 + diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index ba259274d1..2bed8f4765 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -2,16 +2,17 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_HAS_LIBGL # libglu - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 - depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 - depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # libgtk3 + depends on BR2_USE_WCHAR # libgtk3, libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3, libglib2 + depends on BR2_USE_MMU # libgtk3, libglib2 + depends on BR2_INSTALL_LIBSTDCPP # libgtk3 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk3 select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBGTK2 + select BR2_PACKAGE_LIBGTK3 + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 @@ -31,6 +32,7 @@ config BR2_PACKAGE_XSCREENSAVER comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 27ef7d8f00..b8a27a0515 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz +sha256 4ff6798217e3bbbc3c7336beeda7e83eafbf03301ac29b2236da66a0f1317643 xscreensaver-6.12.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 466d309940..f9e28e4551 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 6.03 +XSCREENSAVER_VERSION = 6.12 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -13,13 +13,17 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h XSCREENSAVER_CPE_ID_VALID = YES XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver +define XSCREENSAVER_FIX_INCLUDE_GL + $(SED) 's%OpenGL/gl.h%GL/gl.h%' $(@D)/driver/subprocs.c +endef +XSCREENSAVER_POST_EXTRACT_HOOKS = XSCREENSAVER_FIX_INCLUDE_GL + XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ - gdk-pixbuf-xlib \ jpeg \ libgl \ libglu \ - libgtk2 \ + libgtk3 \ libxml2 \ xlib_libX11 \ xlib_libXft \ @@ -42,6 +46,10 @@ else XSCREENSAVER_CONF_OPTS += --with-png=no endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +XSCREENSAVER_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) XSCREENSAVER_CONF_OPTS += --with-systemd=yes XSCREENSAVER_DEPENDENCIES += systemd diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index e0fdcfe66e..e86db1c06e 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 1cd5763d94d9370fed10d804e831a089b2ace0e7a74b6f56ef5a16a766bde7be xterm-389.tgz +sha256 3da2b5e64cb49b03aa13057d85e62e1f2e64f7c744719c00d338d11cd3e6ca1a xterm-401.tgz # Locally calculated -sha256 e38de4a0780954b5a7e69b5fa6c571daa8a1bfbacb4f2c5b2f07099e1a1d7c93 COPYING +sha256 99f70364bb769635eb9de18cc286e16cb78026f3b6478276344ee8619098dff6 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index c2c97dd318..fb6de107e9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 389 +XTERM_VERSION = 401 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf diff --git a/package/xvisor/0003-Makefile-Use-std-gnu11-to-fix-build-with-GCC-15.patch b/package/xvisor/0003-Makefile-Use-std-gnu11-to-fix-build-with-GCC-15.patch new file mode 100644 index 0000000000..f78e6efb9c --- /dev/null +++ b/package/xvisor/0003-Makefile-Use-std-gnu11-to-fix-build-with-GCC-15.patch @@ -0,0 +1,40 @@ +From 53a53af30ce1704b7de806a51d822472fbcc57de Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 24 Aug 2025 18:26:52 +0200 +Subject: [PATCH] Makefile: Use '-std=gnu11' to fix build with GCC 15 + +GCC 15 changed the default C standard version to C23 [1], resulting in +errors from the xvisor definitions of bool from core/include/vmm_types.h, +which is a reserved keyword under C23. + +Since CFLAGS are hardcoded in the main Makefile, add '-std=gnu11' to +'cflags' to resolve the error. + +[1] https://gcc.gnu.org/gcc-15/porting_to.html + +Upstream: https://github.com/xvisor/xvisor/pull/200 + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/11042295047 + +Signed-off-by: Romain Naour +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1984408c..8731ece0 100644 +--- a/Makefile ++++ b/Makefile +@@ -166,7 +166,7 @@ cppflags+=-I$(libs_dir)/include + cppflags+=$(cpu-cppflags) + cppflags+=$(board-cppflags) + cppflags+=$(libs-cppflags-y) +-cflags=-g -Wall -nostdlib --sysroot=$(drivers_dir)/include -fno-builtin -fno-stack-protector -D__VMM__ ++cflags=-std=gnu11 -g -Wall -nostdlib --sysroot=$(drivers_dir)/include -fno-builtin -fno-stack-protector -D__VMM__ + cflags+=$(board-cflags) + cflags+=$(cpu-cflags) + cflags+=$(libs-cflags-y) +-- +2.50.1 + diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index 216d07ddbd..fb8e384122 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,4 +1,4 @@ # locally computed -sha256 baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4 xxhash-0.8.2.tar.gz +sha256 aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80 xxhash-0.8.3.tar.gz sha256 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index f16a784966..51bf6ce855 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -XXHASH_VERSION = 0.8.2 +XXHASH_VERSION = 0.8.3 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING diff --git a/package/xz/xz.hash b/package/xz/xz.hash index c403ea2be4..0e0618ec02 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,10 +1,10 @@ # Locally calculated after checking pgp signature -# https://github.com/tukaani-project/xz/releases/download/v5.6.3/xz-5.6.3.tar.bz2.sig +# https://github.com/tukaani-project/xz/releases/download/v5.8.1/xz-5.8.1.tar.bz2.sig # using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin -sha256 a95a49147b2dbb5487517acc0adcd77f9c2032cf00664eeae352405357d14a6c xz-5.6.3.tar.bz2 +sha256 5965c692c4c8800cd4b33ce6d0f6ac9ac9d6ab227b17c512b6561bce4f08d47e xz-5.8.1.tar.bz2 # Hash for license files -sha256 ee3b35b82f7bb0ba5fd9f13ca34ebbe757a59c05bfde5ab9d50ff4188ed33396 COPYING +sha256 616a3ad264ce29b8f1cb97e53037b139d406899ca8d1f799651e17bfa09830b8 COPYING sha256 0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1 COPYING.0BSD sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index b3f8c30026..b1e210a172 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.6.3 +XZ_VERSION = 5.8.1 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES diff --git a/package/yad/Config.in b/package/yad/Config.in index 300525ee3c..4a140f63d7 100644 --- a/package/yad/Config.in +++ b/package/yad/Config.in @@ -1,13 +1,11 @@ config BR2_PACKAGE_YAD bool "yad" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11 + depends on BR2_PACKAGE_LIBGTK3_X11 help YAD (yet another dialog) is a tool for create graphical dialogs from shell scripts. http://sourceforge.net/projects/yad-dialog/ -comment "yad needs libgtk2 or libgtk3 w/ X11 backend" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3_X11 +comment "yad needs libgtk3 w/ X11 backend" + depends on !BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/yad/yad.mk b/package/yad/yad.mk index 15788efac0..b40220f9ad 100644 --- a/package/yad/yad.mk +++ b/package/yad/yad.mk @@ -9,16 +9,8 @@ YAD_SOURCE = yad-$(YAD_VERSION).tar.xz YAD_SITE = http://sourceforge.net/projects/yad-dialog/files YAD_LICENSE = GPL-3.0 YAD_LICENSE_FILES = COPYING -YAD_DEPENDENCIES = host-intltool host-pkgconf $(TARGET_NLS_DEPENDENCIES) +YAD_DEPENDENCIES = host-intltool host-pkgconf libgtk3 $(TARGET_NLS_DEPENDENCIES) YAD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -YAD_CONF_OPTS = --enable-html=no - -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -YAD_DEPENDENCIES += libgtk3 -YAD_CONF_OPTS += --with-gtk=gtk3 -else -YAD_DEPENDENCIES += libgtk2 -YAD_CONF_OPTS += --with-gtk=gtk2 -endif +YAD_CONF_OPTS = --enable-html=no --with-gtk=gtk3 $(eval $(autotools-package)) diff --git a/package/yaml-cpp/0001-emitterutils-Explicitly-include-cstdint.patch b/package/yaml-cpp/0001-emitterutils-Explicitly-include-cstdint.patch new file mode 100644 index 0000000000..e3dc308a2f --- /dev/null +++ b/package/yaml-cpp/0001-emitterutils-Explicitly-include-cstdint.patch @@ -0,0 +1,42 @@ +From 7b469b4220f96fb3d036cf68cd7bd30bd39e61d2 Mon Sep 17 00:00:00 2001 +From: Christopher Fore +Date: Wed, 14 Aug 2024 21:02:32 -0400 +Subject: [PATCH] emitterutils: Explicitly include + +GCC 15 will no longer include it by default, resulting in build +failures in projects that do not explicitly include it. + +Error: +src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope + 221 | std::pair EncodeUTF16SurrogatePair(int codePoint) { + | ^~~~~~~~ +src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header ''; +this is probably fixable by adding '#include ' + 12 | #include "yaml-cpp/null.h" + +++ |+#include + 13 | #include "yaml-cpp/ostream_wrapper.h" + +Tests pass. + +Closes: #1307 +See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html +See-also: https://bugs.gentoo.org/937412 +Signed-off-by: Christopher Fore + +Upstream: https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2 + +Signed-off-by: Bernd Kuhls +--- + src/emitterutils.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp +index fc41011a5..f801b1d0c 100644 +--- a/src/emitterutils.cpp ++++ b/src/emitterutils.cpp +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + diff --git a/package/yasm/0001-fix-null-pointer-dereference-in-yasm_expr_get_intnum.patch b/package/yasm/0001-fix-null-pointer-dereference-in-yasm_expr_get_intnum.patch new file mode 100644 index 0000000000..976c2f7a13 --- /dev/null +++ b/package/yasm/0001-fix-null-pointer-dereference-in-yasm_expr_get_intnum.patch @@ -0,0 +1,32 @@ +From 48ced849ed621a05cec4c04d4567323af3a76e81 Mon Sep 17 00:00:00 2001 +From: dataisland +Date: Fri, 15 Sep 2023 18:20:49 +0000 +Subject: [PATCH] Fix null-pointer-dereference in yasm_expr_get_intnum + +Fixes the following CVE: + - CVE-2021-33454: NULL pointer dereference in yasm_expr_get_intnum() in libyasm/expr.c + +For more info see: + - https://nvd.nist.gov/vuln/detail/CVE-2021-33454 + - https://github.com/yasm/yasm/pull/244 + +Upstream: https://github.com/yasm/yasm/pull/244 + +Signed-off-by: Titouan Christophe +--- + libyasm/expr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libyasm/expr.c b/libyasm/expr.c +index c2c868ede..6838eca56 100644 +--- a/libyasm/expr.c ++++ b/libyasm/expr.c +@@ -1260,7 +1260,7 @@ yasm_expr_get_intnum(yasm_expr **ep, int calc_bc_dist) + { + *ep = yasm_expr_simplify(*ep, calc_bc_dist); + +- if ((*ep)->op == YASM_EXPR_IDENT && (*ep)->terms[0].type == YASM_EXPR_INT) ++ if (*ep && (*ep)->op == YASM_EXPR_IDENT && (*ep)->terms[0].type == YASM_EXPR_INT) + return (*ep)->terms[0].data.intn; + else + return (yasm_intnum *)NULL; diff --git a/package/yasm/0002-bitvect-fix-build-with-gcc-15.patch b/package/yasm/0002-bitvect-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..684c8be042 --- /dev/null +++ b/package/yasm/0002-bitvect-fix-build-with-gcc-15.patch @@ -0,0 +1,38 @@ +From 64ef740eb262f329e55eebadf2ce276b146d44e9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 22 Apr 2025 19:06:24 +0200 +Subject: [PATCH] bitvect: fix build with gcc-15 + +* fixes: +libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant + 86 | typedef enum boolean { false = FALSE, true = TRUE } boolean; + | ^~~~~ +../git/libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards + +as suggested in: +https://github.com/yasm/yasm/issues/283#issuecomment-2661108816 + +Signed-off-by: Martin Jansa +Upstream: https://github.com/yasm/yasm/pull/287 +Signed-off-by: Thomas Perale +--- + libyasm/bitvect.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libyasm/bitvect.h b/libyasm/bitvect.h +index 3aee3a531..a13470ada 100644 +--- a/libyasm/bitvect.h ++++ b/libyasm/bitvect.h +@@ -83,7 +83,11 @@ typedef Z_longword *Z_longwordptr; + #ifdef MACOS_TRADITIONAL + #define boolean Boolean + #else +- typedef enum boolean { false = FALSE, true = TRUE } boolean; ++ #if __STDC_VERSION__ < 202311L ++ typedef enum boolean { false = FALSE, true = TRUE } boolean; ++ #else ++ typedef bool boolean; ++ #endif + #endif + #endif + diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index cdb8e15bee..766d29df3b 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -10,6 +10,9 @@ YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 YASM_CPE_ID_VENDOR = tortall +# 0001-fix-null-pointer-dereference-in-yasm_expr_get_intnum.patch +YASM_IGNORE_CVES += CVE-2021-33454 + # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. define YASM_PRE_CONFIGURE_FIXUP diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash index 78357d4f28..e38586b0b4 100644 --- a/package/ytree/ytree.hash +++ b/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6927bf7475d777c40ecc1a8e5125316605683d91a5829a9251b44f12b09e435b ytree-2.09.tar.gz +sha256 3bbbbd32f568cdae3e03fc735b1783d8cba605a2ca6056d1b971143d7ddd517d ytree-2.10.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk index ec59dd8dee..162b2a1c02 100644 --- a/package/ytree/ytree.mk +++ b/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.09 +YTREE_VERSION = 2.10 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING diff --git a/package/z3/Config.in b/package/z3/Config.in index 8cd3128687..3afb8a6a22 100644 --- a/package/z3/Config.in +++ b/package/z3/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_Z3_ARCH_SUPPORTS default y if BR2_m68k # BR2_microblaze has only FE_TONEAREST default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - # BR2_nios2 has only FE_TONEAREST default y if BR2_or1k default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_riscv diff --git a/package/z3/z3.hash b/package/z3/z3.hash index 8514043594..a9d1da901a 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f59c9cf600ea57fb64ffeffbffd0f2d2b896854f339e846f48f069d23bc14ba0 z3-4.13.3.tar.gz +sha256 3486bf5b35b185981cab0b0a81f870547648a1ca433085aa79afd17c44959751 z3-4.15.2.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index 16db30ac21..fe52167e1e 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.13.3 +Z3_VERSION = 4.15.2 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 4940f8ca8e..226bce51ba 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -40,7 +40,10 @@ config BR2_PACKAGE_ZABBIX_SERVER_MYSQL config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL bool "postgresql" + depends on BR2_USE_MMU # postgresql depends on BR2_USE_WCHAR # postgresql + depends on BR2_ENABLE_LOCALE # postgresql + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql depends on !BR2_STATIC_LIBS # postgresql depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index b4b71db5c8..787a0acfe9 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 215301b6e089a685a2fabcca17fc65e5766d42d2079174b65a1bf28df7679692 zabbix-7.0.5.tar.gz +sha256 44b51a09897e83b7d25cd706f88c0462224991d780881d6157d88fd804cc3a6c zabbix-7.2.13.tar.gz sha256 0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 318030214c..caa69fda38 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 7.0 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).5 +ZABBIX_VERSION_MAJOR = 7.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).13 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_SELINUX_MODULES = zabbix ZABBIX_LICENSE = AGPL-3.0 diff --git a/package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch b/package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch new file mode 100644 index 0000000000..5e5d21ec52 --- /dev/null +++ b/package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch @@ -0,0 +1,82 @@ +From ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d Mon Sep 17 00:00:00 2001 +From: classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Date: Wed, 27 Aug 2025 17:42:32 -0400 +Subject: [PATCH] linux: use sys/stat.h instead of linux/stat.h + +glibc includes linux/stat.h for statx, but musl defines its own statx +struct and associated constants, which does not include STATX_MNT_ID +yet. Thus, including linux/stat.h directly should be avoided for +maximum libc compatibility. + +Tested on: + - glibc: x86_64, i686, aarch64, armv7l, armv6l + - musl: x86_64, aarch64, armv7l, armv6l + +Reviewed-by: Brian Behlendorf +Tested-By: Achill Gilgenast +Signed-off-by: classabbyamp +Closes #17675 + +Upstream: https://github.com/openzfs/zfs/commit/ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d +Signed-off-by: José Luis Salvador Rufo +--- + config/user-statx.m4 | 6 +++--- + include/os/linux/spl/sys/stat.h | 2 +- + lib/libspl/include/os/linux/sys/stat.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/config/user-statx.m4 b/config/user-statx.m4 +index 0315f93e0c20..1ba74a40e9b8 100644 +--- a/config/user-statx.m4 ++++ b/config/user-statx.m4 +@@ -2,7 +2,7 @@ dnl # + dnl # Check for statx() function and STATX_MNT_ID availability + dnl # + AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ +- AC_CHECK_HEADERS([linux/stat.h], ++ AC_CHECK_HEADERS([sys/stat.h], + [have_stat_headers=yes], + [have_stat_headers=no]) + +@@ -14,7 +14,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ + AC_MSG_CHECKING([for STATX_MNT_ID]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +- #include ++ #include + ]], [[ + struct statx stx; + int mask = STATX_MNT_ID; +@@ -29,6 +29,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [ + ]) + ]) + ], [ +- AC_MSG_WARN([linux/stat.h not found; skipping statx support]) ++ AC_MSG_WARN([sys/stat.h not found; skipping statx support]) + ]) + ]) dnl end AC_DEFUN +diff --git a/include/os/linux/spl/sys/stat.h b/include/os/linux/spl/sys/stat.h +index 087389b57b34..ad2815e46394 100644 +--- a/include/os/linux/spl/sys/stat.h ++++ b/include/os/linux/spl/sys/stat.h +@@ -25,6 +25,6 @@ + #ifndef _SPL_STAT_H + #define _SPL_STAT_H + +-#include ++#include + + #endif /* SPL_STAT_H */ +diff --git a/lib/libspl/include/os/linux/sys/stat.h b/lib/libspl/include/os/linux/sys/stat.h +index a605af962a6d..13cc0b46ac93 100644 +--- a/lib/libspl/include/os/linux/sys/stat.h ++++ b/lib/libspl/include/os/linux/sys/stat.h +@@ -33,7 +33,7 @@ + + #ifdef HAVE_STATX + #include +-#include ++#include + #endif + + /* diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 50e53910fa..6ebcfb7a3d 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.sha256.asc -sha256 c92e02103ac5dd77bf01d7209eabdca55c7b3356aa747bb2357ec4222652a2a7 zfs-2.2.6.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.5/zfs-2.3.5.sha256.asc +sha256 326ae0cba8a615afa42c6891640e76acc4bd230f6d6ddec120c11e30b1392067 zfs-2.3.5.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 9cecd499ed..712f2afb54 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.2.6 +ZFS_VERSION = 2.3.5 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index cba7ed679e..81190ba493 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -15,18 +15,18 @@ Signed-off-by: Martin Bark 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1b714a8..00d2c09 100644 +index 0087b459..4773a977 100644 --- a/Makefile +++ b/Makefile -@@ -615,7 +615,7 @@ INSTALL: ALL install date.1 +@@ -675,7 +675,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". -version: $(VERSION_DEPS) +version: { (type git) >/dev/null 2>&1 && \ - V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty` || \ + V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty) || \ -- 2.7.4 diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 80c96ed793..b9daccb381 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html -sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz +# https://lists.iana.org/hyperkitty/list/tz-announce@iana.org/thread/6JVHNHLB6I2WAYTQ75L6KEPEQHFXAJK3/ +sha512 19826b12968c10fc4db7e4b07ba782bfb8590eeebaec6f719d74b92a2e642ab817bd72bceff0015ce52a838edfdb00753b3cd87dd84b35abf2606e5bee445f76 tzcode2025b.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 8abcec9360..1abeb2d70e 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2024a +ZIC_VERSION = 2025b ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 diff --git a/package/zip/0009-buffer-overflow-unicode-filename.patch b/package/zip/0009-buffer-overflow-unicode-filename.patch new file mode 100644 index 0000000000..860b453735 --- /dev/null +++ b/package/zip/0009-buffer-overflow-unicode-filename.patch @@ -0,0 +1,23 @@ +From: Shengjing Zhu +Subject: Fix buffer overflow when filename contains unicode characters +Bug-Debian: https://bugs.debian.org/1077054 +Bug-Debian: https://bugs.debian.org/1093629 +Bug-Ubuntu: https://launchpad.net/bugs/2062535 +Forwarded: https://sourceforge.net/p/infozip/bugs/81/ +Origin: https://src.fedoraproject.org/rpms/zip/raw/f41/f/buffer_overflow.patch + +Upstream: https://sources.debian.org/src/zip/3.0-15/debian/patches/14-buffer-overflow-unicode-filename.patch +Signed-off-by: Thomas Perale +--- +diff -Nura a/fileio.c b/fileio.c +--- a/fileio.c ++++ b/fileio.c +@@ -3502,7 +3502,7 @@ + if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) { + ZIPERR(ZE_MEM, "local_to_wide_string"); + } +- wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1); ++ wsize = mbstowcs(wc_string, local_string, wsize + 1); + wc_string[wsize] = (wchar_t) 0; + + /* in case wchar_t is not zwchar */ diff --git a/package/zip/0010-buffer-overflow-cve-2018-13410.patch b/package/zip/0010-buffer-overflow-cve-2018-13410.patch new file mode 100644 index 0000000000..399ab37bc5 --- /dev/null +++ b/package/zip/0010-buffer-overflow-cve-2018-13410.patch @@ -0,0 +1,25 @@ +From: Florent 'Skia' Jacquet +Subject: Fix buffer overflow when using '-T -TT' +Bug-Debian: https://bugs.debian.org/1093629 +Bug-Ubuntu: https://launchpad.net/bugs/2093024 +Forwarded: https://sourceforge.net/p/infozip/bugs/81/ + +strlen(unzip_path) + strlen(zipname) + " " + "'" + "'" + '\0' +The additional space required in the `cmd` buffer is 4, not 3. + +CVE: CVE-2018-13410 +Upstream: https://sources.debian.org/src/zip/3.0-15/debian/patches/15-buffer-overflow-cve-2018-13410.patch +Signed-off-by: Thomas Perale +--- +diff -Nura a/zip.c b/zip.c +--- a/zip.c ++++ b/zip.c +@@ -1437,7 +1437,7 @@ + /* Replace first {} with archive name. If no {} append name to string. */ + here = strstr(unzip_path, "{}"); + +- if ((cmd = malloc(strlen(unzip_path) + strlen(zipname) + 3)) == NULL) { ++ if ((cmd = malloc(strlen(unzip_path) + strlen(zipname) + 4)) == NULL) { + ziperr(ZE_MEM, "building command string for testing archive"); + } + diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 0457ba9414..0a66c146bf 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -12,6 +12,9 @@ ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project +# 0010-buffer-overflow-cve-2018-13410.patch +ZIP_IGNORE_CVES += CVE-2018-13410 + ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 endif diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index 908164aa60..d128565469 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 zlib-ng-2.1.6.tar.gz -sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md +sha256 a73343c3093e5cdc50d9377997c3815b878fd110bf6511c2c7759f2afb90f5a3 zlib-ng-2.2.4.tar.gz +sha256 6c9f0d975b41afaa34d22f55bb8986ce69e5cb7ad327cb2b28820cd425edf5ee LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index c9d022da3e..68a3b2d6f3 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 2.1.6 +ZLIB_NG_VERSION = 2.2.4 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md diff --git a/package/zlog/zlog.hash b/package/zlog/zlog.hash index 19881183e9..f000b08f37 100644 --- a/package/zlog/zlog.hash +++ b/package/zlog/zlog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fe412130abbb75a0779df89ae407db5d8f594435cc4ff6b068d924e13fd5c68 zlog-1.2.17.tar.gz +sha256 3977dc8ea0069139816ec4025b320d9a7fc2035398775ea91429e83cb0d1ce4e zlog-1.2.18.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index e5bbf6ff3b..0d56471559 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLOG_VERSION = 1.2.17 +ZLOG_VERSION = 1.2.18 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = Apache-2.0 ZLOG_LICENSE_FILES = LICENSE diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in index 2c80e2883d..8c08b9d862 100644 --- a/package/zmqpp/Config.in +++ b/package/zmqpp/Config.in @@ -14,13 +14,6 @@ config BR2_PACKAGE_ZMQPP http://github.com/benjamg/zmqpp -comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - -comment "zmqpp needs exception_ptr" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - if BR2_PACKAGE_ZMQPP config BR2_PACKAGE_ZMQPP_CLIENT @@ -39,3 +32,10 @@ comment "zmqpp client needs a toolchain w/ dynamic library, threads, wchar" || !BR2_USE_WCHAR endif + +comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "zmqpp needs exception_ptr" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/znc/znc.hash b/package/znc/znc.hash index 7bac128af9..6ffb5a3917 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8a7cf80e19aad510b4e282eaf61b56bc30df88ea2e0f64fadcdd303c4894f3c znc-1.9.1.tar.gz +sha256 4e6e76851dbf2606185972b53ec5decad68fe53b63a56e4df8b8b3c0a6c46800 znc-1.10.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/znc/znc.mk b/package/znc/znc.mk index ec6287e6de..3a0b983b09 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.9.1 +ZNC_VERSION = 1.10.1 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE diff --git a/package/zoxide/zoxide.hash b/package/zoxide/zoxide.hash index 1a3a066af9..64c1efd277 100644 --- a/package/zoxide/zoxide.hash +++ b/package/zoxide/zoxide.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f2d9b9448516919f6d5cf32a5f154c2dc3a90d9fdf0addab9cd6a7824020befc zoxide-0.9.4-cargo2.tar.gz +sha256 728fbe4e44cb9b4b8bb0753e962e2889619cccdc354ac141d6e26eb2ca8ee9b9 zoxide-0.9.8-cargo4.tar.gz sha256 23aa3b08366e4ed6050f3d9950070201802aadbe5675fa1c19f24f4de91cf294 LICENSE diff --git a/package/zoxide/zoxide.mk b/package/zoxide/zoxide.mk index 92b4395a87..870fc12a2c 100644 --- a/package/zoxide/zoxide.mk +++ b/package/zoxide/zoxide.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZOXIDE_VERSION = 0.9.4 +ZOXIDE_VERSION = 0.9.8 ZOXIDE_SITE = $(call github,ajeetdsouza,zoxide,v$(ZOXIDE_VERSION)) ZOXIDE_LICENSE = MIT ZOXIDE_LICENSE_FILES = LICENSE diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index 8be85c356a..2cd26ffc77 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,5 +1,5 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz.sha256 -sha256 8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 zstd-1.5.6.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz.sha256 +sha256 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 zstd-1.5.7.tar.gz # License files (locally computed) sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 575bb2c838..70da1e7354 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.6 +ZSTD_VERSION = 1.5.7 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 @@ -72,7 +72,7 @@ else ZSTD_OPTS += HAVE_THREAD=0 ZSTD_BUILD_LIBS_THREAD_SUFFIX = -nomt endif -# check-package disable OverriddenVariable - override intended + ZSTD_BUILD_LIBS = \ $(addsuffix -release, \ $(addsuffix $(ZSTD_BUILD_LIBS_THREAD_SUFFIX), \ diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index ff11896f4b..c0758579db 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635 zxing-cpp-2.2.1.tar.gz +sha256 64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba zxing-cpp-2.3.0.tar.gz # License files sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index 5f91bf2f71..515daf590f 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZXING_CPP_VERSION = 2.2.1 +ZXING_CPP_VERSION = 2.3.0 ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 ZXING_CPP_LICENSE_FILES = LICENSE diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk index 0ef53436d2..ba902b84fd 100644 --- a/package/zziplib/zziplib.mk +++ b/package/zziplib/zziplib.mk @@ -8,7 +8,7 @@ ZZIPLIB_VERSION = 0.13.74 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm.md -ZZIPLIB_CPE_ID_VALID = YES +ZZIPLIB_CPE_ID_VENDOR = gdraheim ZZIPLIB_INSTALL_STAGING = YES ZZIPLIB_CONF_OPTS += \ -DZZIPDOCS=OFF \ diff --git a/support/config-fragments/autobuild/br-loongarch64-full-internal.config b/support/config-fragments/autobuild/br-loongarch64-full-internal.config new file mode 100644 index 0000000000..9faab86b3c --- /dev/null +++ b/support/config-fragments/autobuild/br-loongarch64-full-internal.config @@ -0,0 +1,3 @@ +BR2_loongarch64=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/support/config-fragments/autobuild/br-loongarch64-internal-glibc.config b/support/config-fragments/autobuild/br-loongarch64-internal-glibc.config new file mode 100644 index 0000000000..a9ee70d559 --- /dev/null +++ b/support/config-fragments/autobuild/br-loongarch64-internal-glibc.config @@ -0,0 +1,3 @@ +BR2_loongarch64=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 654f11e28b..a559221b99 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -28,7 +28,6 @@ support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-mipsel-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config,x86_64 -support/config-fragments/autobuild/bootlin-nios2-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-openrisc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 @@ -51,6 +50,8 @@ support/config-fragments/autobuild/br-arm-internal-full.config,any support/config-fragments/autobuild/br-arm-internal-glibc.config,any support/config-fragments/autobuild/br-arm-internal-musl.config,any support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 +support/config-fragments/autobuild/br-loongarch64-full-internal.config,any +support/config-fragments/autobuild/br-loongarch64-internal-glibc.config,any support/config-fragments/autobuild/br-microblazeel-full-internal.config,any support/config-fragments/autobuild/br-mips64-n64-full.config,x86_64 support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config,x86_64 @@ -60,8 +61,3 @@ support/config-fragments/autobuild/br-powerpc-internal-full.config,any support/config-fragments/autobuild/br-riscv64-full-internal.config,any support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config,any support/config-fragments/autobuild/br-xtensa-full-internal.config,any -support/config-fragments/autobuild/linaro-aarch64.config,x86 -support/config-fragments/autobuild/linaro-aarch64-be.config,x86 -support/config-fragments/autobuild/linaro-arm.config,x86 -support/config-fragments/autobuild/sourcery-mips64.config,x86 -support/config-fragments/autobuild/sourcery-mips.config,x86 diff --git a/support/dependencies/check-host-python3.sh b/support/dependencies/check-host-python3.sh index 17cafd2883..380b19ccf7 100755 --- a/support/dependencies/check-host-python3.sh +++ b/support/dependencies/check-host-python3.sh @@ -7,8 +7,6 @@ version_min="$(echo ${1} | awk '{ split($1, v, "."); print v[1] v[2] }')" shift -# The host python interpreter is already checked by dependencies.sh but -# it only check if the version is at least 2.7. # We want to check the version number of the python3 interpreter even # if Buildroot is able to use any version but some packages may require # a more recent version. diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index fb0defd0c9..2843e3c5d5 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -154,7 +154,7 @@ fi # Check that a few mandatory programs are installed missing_progs="no" -for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do +for prog in perl tar wget cpio unzip rsync bc cmp find xargs awk ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then echo "You must install '$prog' on your build machine"; missing_progs="yes" diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 8c6e2add60..e7677ac6a9 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -1,26 +1,45 @@ # This Dockerfile generates the docker image that gets used by Gitlab CI -# To build it (YYYYMMDD.HHMM is the current date and time in UTC): -# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker -# docker push registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +# To build it for arm64 and amd64 (YYYYMMDD.HHMM is the current date and time in UTC): +# docker buildx create --use +# docker buildx build --platform linux/amd64,linux/arm64/v8 \ +# -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM \ +# --push support/docker # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20230202 +FROM debian:bookworm-20250203 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ description="Container with everything needed to run Buildroot" +# Architecture to build for +ARG TARGETPLATFORM + +# We need tar >= 1.35 +ARG TAR_VERSION="1.35" + # Setup environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # This repository can be a bit slow at times. Don't panic... COPY apt-sources.list /etc/apt/sources.list +# Install 32bit variant on x86_64 image. +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + dpkg --add-architecture i386; \ +fi + # The container has no package lists, so need to update first -RUN dpkg --add-architecture i386 && \ - apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 update -y + +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + apt-get -o APT::Retries=3 install -y --no-install-recommends \ + g++-multilib \ + libc6:i386; \ +fi + RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ @@ -28,11 +47,12 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ ca-certificates \ cmake \ cpio \ + curl \ cvs \ file \ - g++-multilib \ + flake8 \ + g++ \ git \ - libc6:i386 \ libncurses5-dev \ locales \ mercurial \ @@ -55,6 +75,16 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ apt-get -y autoremove && \ apt-get -y clean +# Build host-tar +RUN curl -sfL https://ftpmirror.gnu.org/tar/tar-${TAR_VERSION}.tar.xz | \ + tar -Jx -C /tmp && \ + cd /tmp/tar-${TAR_VERSION} && \ + FORCE_UNSAFE_CONFIGURE=1 ./configure \ + --disable-year2038 && \ + make && \ + make install && \ + rm -rf /tmp/tar-${TAR_VERSION} + # To be able to generate a toolchain with locales, enable one UTF-8 locale RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \ /usr/sbin/locale-gen @@ -64,5 +94,5 @@ RUN useradd -ms /bin/bash br-user && \ USER br-user WORKDIR /home/br-user -ENV HOME /home/br-user -ENV LC_ALL en_US.UTF-8 +ENV HOME=/home/br-user +ENV LC_ALL=en_US.UTF-8 diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 849996d9f7..d6fbf85270 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20230207T102800Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main +# Latest just before 20250218211000Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20250218T144938Z/ bookworm main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20250218T144938Z/ bookworm-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20250218T144938Z/ bookworm-updates main diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 12198051a4..b0e59ad74d 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -31,14 +31,14 @@ post_process_unpack "${base_name}" "${output}" # Do the Cargo vendoring pushd "${base_name}" > /dev/null -# Create the local .cargo/config with vendor info +# Create the local .cargo/config.toml with vendor info mkdir -p .cargo/ mkdir -p "${CARGO_HOME}" flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path "${manifest}" \ --locked VENDOR \ - > .cargo/config + > .cargo/config.toml # "cargo vendor' outputs on stderr a message directing to add some data # to the project's .cargo/config.toml, data that it outputs on stdout. diff --git a/support/download/curl b/support/download/curl index bea4485a6c..2124fe7cad 100755 --- a/support/download/curl +++ b/support/download/curl @@ -39,6 +39,7 @@ _curl() { # Note: please keep command below aligned with what is printed above _plain_curl() { # shellcheck disable=SC2086 # We want splitting + # shellcheck disable=SC2294 eval ${CURL} "${@}" } diff --git a/support/download/cvs b/support/download/cvs index a6840fea7b..a52e543e44 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -47,6 +47,7 @@ _cvs() { # Note: please keep command below aligned with what is printed above _plain_cvs() { # shellcheck disable=SC2086 # We really want word splitting in CVS + # shellcheck disable=SC2294 eval timeout 10m ${CVS} "${@}" } diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 5445aad5a7..b70c8edbd9 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -96,7 +96,7 @@ main() { backend="${backend_urlencode%|*}" case "${backend}" in git|svn|cvs|bzr|file|scp|hg|sftp) ;; - ftp|ftps) backend="curl" ;; + ftp|ftps|smb) backend="curl" ;; *) backend="wget" ;; esac uri=${uri#*+} diff --git a/support/download/git b/support/download/git index d49016e90c..fdc00607cc 100755 --- a/support/download/git +++ b/support/download/git @@ -22,6 +22,7 @@ set -e # GIT : the git command to call # shellcheck disable=SC1090 # Only provides mk_tar_gz() +# shellcheck disable=SC1091 . "${0%/*}/helpers" # Save our path and options in case we need to call ourselves again @@ -91,6 +92,7 @@ _git() { # Note: please keep command below aligned with what is printed above _plain_git() { # shellcheck disable=SC2086 # We want word-splitting for GIT + # shellcheck disable=SC2294 eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } @@ -131,8 +133,8 @@ fi _git remote set-url origin "'${uri}'" printf "Fetching all references\n" -_git fetch origin -_git fetch origin -t -f +_git fetch "${@}" origin +_git fetch "${@}" origin -t -f # Try to get the special refs exposed by some forges (pull-requests for # github, changes for gerrit...). There is no easy way to know whether @@ -141,7 +143,7 @@ _git fetch origin -t -f # below, if there is an issue anyway. Since most of the cset we're gonna # have to clone are not such special refs, consign the output to oblivion # so as not to alarm unsuspecting users, but still trace it as a warning. -if ! _git fetch origin "'${cset}:${cset}'" >/dev/null 2>&1; then +if ! _git fetch "${@}" origin "'${cset}:${cset}'" >/dev/null 2>&1; then printf "Could not fetch special ref '%s'; assuming it is not special.\n" "${cset}" fi diff --git a/support/download/go-post-process b/support/download/go-post-process index ef96a76948..edc23ec564 100755 --- a/support/download/go-post-process +++ b/support/download/go-post-process @@ -5,10 +5,11 @@ set -e . "${0%/*}/helpers" # Parse our options -while getopts "n:o:" OPT; do +while getopts "n:o:s:" OPT; do case "${OPT}" in o) output="${OPTARG}";; n) base_name="${OPTARG}";; + s) subdir="${OPTARG}";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac @@ -22,7 +23,7 @@ fi post_process_unpack "${base_name}" "${output}" # Do the Go vendoring -pushd "${base_name}" > /dev/null +pushd "${base_name}/${subdir}" > /dev/null if [ ! -f go.mod ]; then echo "ERROR: no vendor/ folder and no go.mod, aborting" diff --git a/support/download/svn b/support/download/svn index 1decb2310b..576fd48303 100755 --- a/support/download/svn +++ b/support/download/svn @@ -22,6 +22,7 @@ set -e # SVN : the svn command to call # shellcheck disable=SC1090 # Only provides mk_tar_gz() +# shellcheck disable=SC1091 . "${0%/*}/helpers" quiet= @@ -52,6 +53,7 @@ _svn() { # Note: please keep command below aligned with what is printed above _plain_svn() { # shellcheck disable=SC2086 # We want word-splitting for SVN + # shellcheck disable=SC2294 eval ${SVN} "${@}" } @@ -79,7 +81,7 @@ done # In case there is a redirection (e.g. http -> https), just keep the # last line (svn outputs everything on stdout) # shellcheck disable=SC2086 # creds may be empty -date="$( _plain_svn info ${creds} "'${uri}@${rev}'" \ +date="$( LC_ALL=C _plain_svn info ${creds} "'${uri}@${rev}'" \ |sed -r -e '/^Last Changed Date: /!d; s///' )" diff --git a/support/kconfig/lxdialog/inputbox.c b/support/kconfig/lxdialog/inputbox.c index d58de1dc53..510049a7bd 100644 --- a/support/kconfig/lxdialog/inputbox.c +++ b/support/kconfig/lxdialog/inputbox.c @@ -126,7 +126,8 @@ do_resize: case KEY_DOWN: break; case KEY_BACKSPACE: - case 127: + case 8: /* ^H */ + case 127: /* ^? */ if (pos) { wattrset(dialog, dlg.inputbox.atr); if (input_x == 0) { diff --git a/support/kconfig/nconf.c b/support/kconfig/nconf.c index 0031147798..e8e1944fa0 100644 --- a/support/kconfig/nconf.c +++ b/support/kconfig/nconf.c @@ -1048,7 +1048,7 @@ static int do_match(int key, struct match_state *state, int *ans) state->match_direction = FIND_NEXT_MATCH_UP; *ans = get_mext_match(state->pattern, state->match_direction); - } else if (key == KEY_BACKSPACE || key == 127) { + } else if (key == KEY_BACKSPACE || key == 8 || key == 127) { state->pattern[strlen(state->pattern)-1] = '\0'; adj_match_dir(&state->match_direction); } else diff --git a/support/kconfig/nconf.gui.c b/support/kconfig/nconf.gui.c index 88874acfda..820fc92565 100644 --- a/support/kconfig/nconf.gui.c +++ b/support/kconfig/nconf.gui.c @@ -440,7 +440,8 @@ int dialog_inputbox(WINDOW *main_window, case KEY_F(F_EXIT): case KEY_F(F_BACK): break; - case 127: + case 8: /* ^H */ + case 127: /* ^? */ case KEY_BACKSPACE: if (cursor_position > 0) { memmove(&result[cursor_position-1], diff --git a/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch b/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch new file mode 100644 index 0000000000..6e32115f70 --- /dev/null +++ b/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch @@ -0,0 +1,62 @@ +From 9c38f1f044080392603c497ecca4d7d09876ff99 Mon Sep 17 00:00:00 2001 +From: Changbin Du +Date: Mon, 25 Mar 2019 15:16:47 +0000 +Subject: [PATCH 23/23] kconfig/[mn]conf: handle backspace (^H) key + +Backspace is not working on some terminal emulators which do not send the +key code defined by terminfo. Terminals either send '^H' (8) or '^?' (127). +But currently only '^?' is handled. Let's also handle '^H' for those +terminals. + +Signed-off-by: Changbin Du +Signed-off-by: Masahiro Yamada +--- + kconfig/lxdialog/inputbox.c | 3 ++- + kconfig/nconf.c | 2 +- + kconfig/nconf.gui.c | 3 ++- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/kconfig/lxdialog/inputbox.c b/kconfig/lxdialog/inputbox.c +index 611945611bf8..1dcfb288ee63 100644 +--- a/kconfig/lxdialog/inputbox.c ++++ b/kconfig/lxdialog/inputbox.c +@@ -113,7 +113,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width + case KEY_DOWN: + break; + case KEY_BACKSPACE: +- case 127: ++ case 8: /* ^H */ ++ case 127: /* ^? */ + if (pos) { + wattrset(dialog, dlg.inputbox.atr); + if (input_x == 0) { +diff --git a/kconfig/nconf.c b/kconfig/nconf.c +index a4670f4e825a..ac92c0ded6c5 100644 +--- a/kconfig/nconf.c ++++ b/kconfig/nconf.c +@@ -1048,7 +1048,7 @@ static int do_match(int key, struct match_state *state, int *ans) + state->match_direction = FIND_NEXT_MATCH_UP; + *ans = get_mext_match(state->pattern, + state->match_direction); +- } else if (key == KEY_BACKSPACE || key == 127) { ++ } else if (key == KEY_BACKSPACE || key == 8 || key == 127) { + state->pattern[strlen(state->pattern)-1] = '\0'; + adj_match_dir(&state->match_direction); + } else +diff --git a/kconfig/nconf.gui.c b/kconfig/nconf.gui.c +index 7be620a1fcdb..77f525a8617c 100644 +--- a/kconfig/nconf.gui.c ++++ b/kconfig/nconf.gui.c +@@ -439,7 +439,8 @@ int dialog_inputbox(WINDOW *main_window, + case KEY_F(F_EXIT): + case KEY_F(F_BACK): + break; +- case 127: ++ case 8: /* ^H */ ++ case 127: /* ^? */ + case KEY_BACKSPACE: + if (cursor_position > 0) { + memmove(&result[cursor_position-1], +-- +2.48.1 + diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series index f120e323b7..cc176035be 100644 --- a/support/kconfig/patches/series +++ b/support/kconfig/patches/series @@ -11,3 +11,4 @@ 20-merge_config.sh-Allow-to-define-config-prefix.patch 21-Avoid-false-positive-matches-from-comment-lines.patch 22-kconfig-lxdialog-fix-check-with-GCC14.patch +23-kconfig-mn-conf-handle-backspace-H-key.patch diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 00592a7839..fe2cf3b156 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.11' +RELEASE='2025.11' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index db206432aa..ada36d0d60 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -45,7 +45,7 @@ before_script: .run_make: &run_make | - make O=${OUTPUT_DIR} > >(tee build.log |grep '>>>') 2>&1 || { + make O=${OUTPUT_DIR} world legal-info > >(tee build.log |grep '>>>') 2>&1 || { echo 'Failed build last output' tail -200 build.log exit 1 diff --git a/support/scripts/check-merged b/support/scripts/check-merged new file mode 100755 index 0000000000..57db8abd21 --- /dev/null +++ b/support/scripts/check-merged @@ -0,0 +1,135 @@ +#!/usr/bin/env bash +# +# Check if a given custom skeleton or overlay complies to the merged +# requirements: +# +# - for unmerged: +# /bin missing*, or an existing directory; not a symlink +# /lib missing*, or an existing directory; not a symlink +# /sbin missing*, or an existing directory; not a symlink +# /usr/bin/ missing*, or an existing directory; not a symlink +# /usr/lib/ missing*, or an existing directory; not a symlink +# /usr/sbin/ missing*, or an existing directory; not a symlink +# +# *: must be present for skeletons, can be missing for overlays +# +# - for merged-usr: all of the above, except: +# /bin missing, or a relative symlink to usr/bin +# /lib missing, or a relative symlink to usr/lib +# /sbin missing, or a relative symlink to usr/sbin +# +# - for merged-bin: all of the above, except: +# /usr/sbin missing, or a relative symlink to bin (thus points +# to /usr/bin) +# +# Input: +# -t TYPE the type of root to check: 'skeleton' or 'overlay' +# -u check for merged /usr +# -b check for merged /usr/bin +# $*: the root directories (skeleton, overlays) to check +# Output: +# stdout: the list of non-compliant paths (empty if compliant). +# Exit code: +# 0: in case of success (stdout will be empty) +# !0: if any directory to check is improperly merged +# + +type= +merged_usr=false +merged_bin=false +while getopts "t:ub" OPT; do + case "${OPT}" in + (t) type="${OPTARG}";; + (u) merged_usr=true;; + (b) merged_bin=true;; + (:) printf "option %s expects a mandatory argument\n" "${OPTARG}"; exit 1;; + (\?) printf "unknown option %s\n" "${OPTARG}"; exit 1;; + esac +done + +# Remove the options processed by getopts from $@, +# so that $@ now contains only the root directories to check. +shift $((OPTIND -1)) + +if [ "${type}" = "skeleton" ]; then + strict=true +else + strict=false +fi + +report_error() { + local type="${1}" + local root="${2}" + local fmt="${3}" + shift 3 + + if ${first}; then + printf "The %s in %s is not properly setup:\n" \ + "${type}" "${root}" + fi + first=false + # shellcheck disable=SC2059 # fmt *is* a format string + printf " - ${fmt}" "${@}" + is_success=false +} + +test_merged() { + local type="${1}" + local root="${2}" + local base="${3}" + local dir1="${4}" + local dir2="${5}" + + if ! test -e "${root}${base}${dir1}"; then + return 0 + elif [ "$(readlink "${root}${base}${dir1}")" = "${dir2}" ]; then + return 0 + fi + + # Otherwise, this directory is not merged + report_error "${type}" "${root}" \ + '%s%s should be missing, or be a relative symlink to %s\n' \ + "${base}" "${dir1}" "${dir2}" +} + +test_dir() { + local type="${1}" + local root="${2}" + local base="${3}" + local dir="${4}" + + if ! test -e "${root}${base}${dir}" && ! ${strict}; then + return 0 + elif test -d "${root}${base}${dir}" && ! test -L "${root}${base}${dir}"; then + return 0 + fi + + # Otherwise, this entry is not a proper directory + report_error "${type}" "${root}" \ + "%s%s should exist, be a directory, and not be a symlink\n" \ + "${base}" "${dir}" +} + +is_success=true +for root; do + first=true + test_dir "${type}" "${root}" "/" "usr/bin" + test_dir "${type}" "${root}" "/" "usr/lib" + if ${merged_usr}; then + test_merged "${type}" "${root}" "/" "bin" "usr/bin" + test_merged "${type}" "${root}" "/" "lib" "usr/lib" + test_merged "${type}" "${root}" "/" "sbin" "usr/sbin" + if ${merged_bin}; then + test_merged "${type}" "${root}" "/usr/" "sbin" "bin" + else + test_dir "${type}" "${root}" "/" "usr/sbin" + fi + else + test_dir "${type}" "${root}" "/" "bin" + test_dir "${type}" "${root}" "/" "lib" + test_dir "${type}" "${root}" "/" "sbin" + test_dir "${type}" "${root}" "/" "usr/sbin" + fi +done + +${is_success} diff --git a/support/scripts/cve-check b/support/scripts/cve-check new file mode 100755 index 0000000000..ff14e4b238 --- /dev/null +++ b/support/scripts/cve-check @@ -0,0 +1,329 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Enriches the input CycloneDX SBOM with vulnerability information from the NVD +# database. +# +# The NVD database is cloned using a mirror of it and the content is compared +# locally. +# +# Example usage: +# $ make show-info | utils/generate-cyclonedx | support/script/cve-check --nvd-path dl/buildroot-nvd/ +from collections import defaultdict +from pathlib import Path +from typing import TypedDict +import argparse +import sys +import json + +import cve as cvecheck + + +class Options(TypedDict, total=True): + include_resolved: bool + + +DESCRIPTION = """ +Enriches the input CycloneDX SBOM with vulnerability information from the NVD +database. + +The NVD database is cloned using a mirror of it and the content is compared +locally. +""" + + +brpath = Path(__file__).parent.parent.parent + + +def cve_api_get_lang_from_list(values, lang="en") -> (str | None): + for x in values: + if x.get("lang") == lang: + return x.get("value") + return None + + +def nvd_cve_weaknesses_to_cdx(weaknesses) -> list[int]: + """ + See the CycloneDX specification for 'cwes' [1] + + [1] https://cyclonedx.org/docs/1.6/json/#vulnerabilities_items_cwes + """ + res = [] + + for node in weaknesses: + value = cve_api_get_lang_from_list(node.get("description", [])) + if value is None: + continue + + cwe = value.replace("CWE-", "") + + if not cwe.isnumeric(): + continue + res.append(int(cwe)) + + return res + + +def nvd_cve_cvss_to_cdx(metrics): + """ + See the CycloneDX specification for 'ratings' [1] + + [1] https://cyclonedx.org/docs/1.6/json/#vulnerabilities_items_ratings + """ + + KEY_METHOD_DICT = { + "cvssMetricV40": "CVSSv4", + "cvssMetricV31": "CVSSv31", + "cvssMetricV3": "CVSSv3", + "cvssMetricV2": "CVSSv2" + } + + res = [] + + for key, values in metrics.items(): + for value in values: + data = value.get("cvssData", {}) + res.append({ + "method": KEY_METHOD_DICT.get(key, "other"), + **({ + "score": data["baseScore"], + } if "baseScore" in data else {}), + **({ + "severity": data["baseSeverity"].lower(), + } if "baseSeverity" in data else {}), + **({ + "vector": data["vectorString"], + } if "vectorString" in data else {}), + }) + + return res + + +def nvd_cve_references_to_cdx(references): + advisories = [] + + for ref in references: + if not {"url", "tags"}.issubset(ref): + continue + + tags = ref["tags"] + if not isinstance(tags, list) or len(tags) == 0: + continue + + advisories.append({ + "title": next((t for t in tags if "Advisory" not in t), tags[0]), + "url": ref["url"] + }) + + return advisories + + +def nvd_cve_to_cdx_vulnerability(nvd_cve): + """ + Turns the CVE object fetched from the NVD API into a CycloneDX + vulnerability that fits the spec (see [1]). + + [1] https://cyclonedx.org/docs/1.6/json/#vulnerabilities + """ + vulnerability = { + "bom-ref": nvd_cve["id"], + "id": nvd_cve["id"], + "description": cve_api_get_lang_from_list(nvd_cve.get("descriptions", [])) or "", + "source": { + "name": "NVD", + "url": "https://nvd.nist.gov/" + }, + **({ + "published": nvd_cve["published"], + } if "published" in nvd_cve else {}), + **({ + "updated": nvd_cve["lastModified"], + } if "lastModified" in nvd_cve else {}), + **({ + "cwes": nvd_cve_weaknesses_to_cdx(nvd_cve["weaknesses"]), + } if "weaknesses" in nvd_cve else {}), + **({ + "ratings": nvd_cve_cvss_to_cdx(nvd_cve["metrics"]), + } if "metrics" in nvd_cve else {}), + **({ + "advisories": nvd_cve_references_to_cdx(nvd_cve["references"]), + } if "references" in nvd_cve else {}), + } + + return vulnerability + + +def vuln_append_or_update_affects_if_exists(vulnerabilities, vulnerability): + """ + Append 'vulnerability' passed as argument to the 'vulnerabilities' argument + if an entry with the same 'id' doesn't exist yet. + If the vulnerability already exists, the input reference is added to the + 'affects' list of the existing entry. + + Args: + vulnerabilities (list): The vulnerabilities array reference retrieved + from the input CycloneDX SBOM + vulnerability (dict): Vulnerability to add to the 'vulnerabilities' list. + """ + # Search if a vulnerability with the same identifier already exists in the + # SBOM vulnerability list. + matching_vuln = next( + (vuln for vuln in vulnerabilities if vuln.get("id") == vulnerability["id"]), + None + ) + + # bom-ref to the component is passed to the affects of the vulnerability + # passed as argument + bom_ref = next((a["ref"] for a in vulnerability.get("affects", [])), None) + + if matching_vuln is not None: + # Remove the affect to not use it while updating matching vuln. + if "affects" in vulnerability: + del vulnerability["affects"] + + if matching_vuln.get("analysis") is not None and "analysis" in vulnerability: + # We don't update vulnerabilities that already have an + # 'analysis'. + # Buildroot ignored vulnerabilities will already have + # an analysis and need to remain as such. + del vulnerability["analysis"] + + affects = matching_vuln.setdefault("affects", []) + + if bom_ref is not None: + ref = next((a["ref"] for a in affects if a["ref"] == bom_ref), None) + if ref is None: + # Add a 'ref' (bom reference) to the component if not + # already present in the 'affects' list. + affects.append({ + "ref": bom_ref + }) + + # Update the metadata of the vulnerability with the one + # downloaded from the database. + matching_vuln.update(vulnerability) + else: + vulnerabilities.append(vulnerability) + + +def check_package_cve_affects(cve: cvecheck.CVE, cpe_product_pkgs, sbom, opt: Options): + vulnerabilities = sbom.setdefault("vulnerabilities", []) + + for product in cve.affected_products: + for comp in cpe_product_pkgs.get(product, []): + cve_status = cve.affects(comp["name"], comp["version"], comp["cpe"]) + + if cve_status == cve.CVE_UNKNOWN: + continue + + if cve_status == cve.CVE_DOESNT_AFFECT and not opt["include_resolved"]: + continue + + vulnerability = nvd_cve_to_cdx_vulnerability(cve.nvd_cve) + + vulnerability["analysis"] = { + "state": "exploitable" if cve_status == cve.CVE_AFFECTS else "resolved" + } + + vulnerability["affects"] = [{ + "ref": comp["bom-ref"] + }] + + vuln_append_or_update_affects_if_exists(vulnerabilities, vulnerability) + + +def check_package_cves(nvd_path: Path, sbom, opt: Options): + """ + Iterate over every entry of the NVD API mirror. Each vulnerability is + compared to the set of components passed as argument in the 'sbom'. + The vulnerabilities set of that 'sbom' argument is enriched with analysis + of vulnerabilities that match that set of components. + + Args: + nvd_path (Path): Path of the mirror of the NVD API. + sbom (dict): Input SBOM containing a set of vulnerabilities that will be enriched. + opt (Options): Options for the analysis. + """ + cpe_product_pkgs = defaultdict(list) + + for comp in sbom.get("components", []): + if comp.get("cpe") and comp.get("version"): + cpe_product = cvecheck.CPE(comp["cpe"]).product + cpe_product_pkgs[cpe_product].append(comp) + + for cve in cvecheck.CVE.read_nvd_dir(nvd_path): + check_package_cve_affects(cve, cpe_product_pkgs, sbom, opt) + + +def enrich_vulnerabilities(nvd_path: Path, sbom): + """ + Iterate over the vulnerabilities present in the 'sbom' passed as arguments + and enrich the vulnerability with content from the NVD API mirror. + + Args: + nvd_path (Path): Path of the mirror of the NVD API. + sbom (dict): Input SBOM containing a set of vulnerabilities that will be enriched. + """ + vulnerabilities = sbom.setdefault("vulnerabilities", []) + + for vuln in vulnerabilities: + vuln_id = vuln.get("id") + if vuln_id is None or not vuln_id.upper().startswith("CVE-"): + continue + + cve = cvecheck.CVE.read_nvd_entry(nvd_path, vuln_id) + + if cve is None: + print(f"Warning: '{vuln_id}' doesn't exist in NVD database.", file=sys.stderr) + continue + + vulnerability = nvd_cve_to_cdx_vulnerability(cve.nvd_cve) + vuln_append_or_update_affects_if_exists(vulnerabilities, vulnerability) + + +def main(): + parser = argparse.ArgumentParser(description=DESCRIPTION) + parser.add_argument("-i", "--in-file", nargs="?", type=argparse.FileType("r"), + default=(None if sys.stdin.isatty() else sys.stdin)) + parser.add_argument("-o", "--out-file", nargs="?", type=argparse.FileType("w"), + default=sys.stdout) + parser.add_argument('--nvd-path', dest='nvd_path', + default=brpath / 'dl' / 'buildroot-nvd', + help='Path to the local NVD database', + type=lambda p: Path(p).expanduser().resolve()) + parser.add_argument("--enrich-only", default=False, action='store_true', + help="Only update metadata for the vulnerabilities currently present " + + "in the input CycloneDX SBOM. Don't do an analysis.") + parser.add_argument("--include-resolved", default=False, action='store_true', + help="Add vulnerabilities already 'resolved' that don't affect a " + + "component to the output CycloneDX vulnerabilities analysis.") + parser.add_argument("--no-nvd-update", default=False, action='store_true', + help="Doesn't update the NVD database.") + + args = parser.parse_args() + + if args.in_file is None or args.nvd_path is None: + parser.print_help() + sys.exit(1) + + sbom = json.load(args.in_file) + + opt = Options( + include_resolved=args.include_resolved, + ) + + args.nvd_path.mkdir(parents=True, exist_ok=True) + if not args.no_nvd_update: + cvecheck.CVE.download_nvd(args.nvd_path) + + if args.enrich_only: + enrich_vulnerabilities(args.nvd_path, sbom) + else: + check_package_cves(args.nvd_path, sbom, opt) + + args.out_file.write(json.dumps(sbom, indent=2)) + args.out_file.write('\n') + + +if __name__ == "__main__": + main() diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 5af6e0c43f..3875c4258c 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -39,22 +39,98 @@ ops = { } -# Check if two CPE IDs match each other -def cpe_matches(cpe1, cpe2): - cpe1_elems = cpe1.split(":") - cpe2_elems = cpe2.split(":") +class CPE: + DISJOINT = 0 + SUBSET = 1 + SUPERSET = 2 + EQUAL = 3 - remains = filter(lambda x: x[0] not in ["*", "-"] and x[1] not in ["*", "-"] and x[0] != x[1], - zip(cpe1_elems, cpe2_elems)) - return len(list(remains)) == 0 + ANY = '*' + NA = '-' + @staticmethod + def compareAttribute(left, right): + """ + This static method compare two single attributes part of two CPE. -def cpe_product(cpe): - return cpe.split(':')[4] + This is an implementation of table 6-2 of [1]. + Attribute that are empty will be matched to the '*' (ANY) attribute. + According to [2] section 6.1.2.1.1 the empty attribute is inherited + from CPE22 and now bind to ANY. -def cpe_version(cpe): - return cpe.split(':')[5] + The hyphen '-' bind to the NA attribute (see [2]). + + [1] https://nvlpubs.nist.gov/nistpubs/Legacy/IR/nistir7696.pdf + [2] https://nvlpubs.nist.gov/nistpubs/Legacy/IR/nistir7695.pdf + """ + if left == '': + left = CPE.ANY + + if right == '': + right = CPE.ANY + + if left == right: + # 1 6 9 - equals + return CPE.EQUAL + elif left == CPE.ANY: + # 2 3 4 - superset + return CPE.SUPERSET + elif left == CPE.NA and right == CPE.ANY: + # 5 - subset + return CPE.SUBSET + elif left == CPE.NA: + # 12 16 - disjoint + return CPE.DISJOINT + elif right == CPE.ANY: + # 13 15 - subset + return CPE.SUBSET + return CPE.DISJOINT + + def matches(self, target) -> bool: + """ + As an example let's take the example of CVE-2023-... for syslog-ng. + One of the node as the following CPE criteria matched with the Buildroot CPE: + + cpe:2.3:a:oneidentitty:syslog-ng:*:*:*:*:-:*:*:* + cpe:2.3:a:oneidentitty:syslog-ng:4.71:*:*:*:*:*:*:* + + vendor: EQUAL (3) + product: EQUAL (3) + version: SUPERSET (2) + update: EQUAL (3) + edition: EQUAL (3) + language: EQUAL (3) + sw_edition: SUBSET (1) + ... + + This operation results in the two CPE matching. + """ + if not isinstance(target, CPE): + target = CPE(target) + + for selfAttribute, targetAttribute in zip(self.parts, target.parts): + if CPE.compareAttribute(selfAttribute, targetAttribute) == CPE.DISJOINT: + return False + + return True + + def __str__(self): + return self.cpe + + def __init__(self, cpe): + self.cpe = cpe + self.parts = cpe.split(':') + self.vendor = self.parts[3] + self.product = self.parts[4] + self.version = self.parts[5] + self.update = self.parts[6] + self.edition = self.parts[7] + self.language = self.parts[8] + self.sw_edition = self.parts[9] + self.target_sw = self.parts[10] + self.target_hw = self.parts[11] + self.other = self.parts[12] class CVE: @@ -68,8 +144,9 @@ class CVE: self.nvd_cve = nvd_cve @staticmethod - def download_nvd(nvd_git_dir): - print(f"Updating from {NVD_BASE_URL}") + def download_nvd(nvd_dir): + nvd_git_dir = os.path.join(nvd_dir, "git") + if os.path.exists(nvd_git_dir): subprocess.check_call( ["git", "pull"], @@ -102,7 +179,7 @@ class CVE: nvd_dir, a fresh copy will be downloaded, and kept in .json.gz """ nvd_git_dir = os.path.join(nvd_dir, "git") - CVE.download_nvd(nvd_git_dir) + for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): for dirpath, _, filenames in os.walk(os.path.join(nvd_git_dir, f"CVE-{year}")): for filename in filenames: @@ -111,11 +188,28 @@ class CVE: with open(os.path.join(dirpath, filename), "rb") as f: yield cls(json.load(f)) - def each_product(self): - """Iterate over each product section of this cve""" - for vendor in self.nvd_cve['cve']['affects']['vendor']['vendor_data']: - for product in vendor['product']['product_data']: - yield product + @classmethod + def read_nvd_entry(cls, nvd_dir, cve_id): + """ + Retrieve a single CVE entry contained in NIST Vulnerability Database + feeds. + + If the CVE entry doesn't exist 'None' is returned. + """ + nvd_git_dir = os.path.join(nvd_dir, "git") + + _, year, minor = cve_id.split("-") + + cve_subpath = f"CVE-{year}/CVE-{year}-{minor[:-2] + 'xx'}/{cve_id.upper()}.json" + path = os.path.join(nvd_git_dir, cve_subpath) + + ret = None + + if os.path.exists(path): + with open(path, "rb") as f: + ret = cls(json.load(f)) + + return ret def parse_node(self, node): """ @@ -134,8 +228,9 @@ class CVE: for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['criteria']) - version = cpe_version(cpe['criteria']) + cpeId = CPE(cpe['criteria']) + product = cpeId.product + version = cpeId.version # ignore when product is '-', which means N/A if product == '-': return @@ -167,7 +262,7 @@ class CVE: v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['criteria'], + 'id': cpeId, 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -176,7 +271,7 @@ class CVE: def each_cpe(self): for nodes in self.nvd_cve.get('configurations', []): - for node in nodes['nodes']: + for node in nodes.get('nodes', []): for cpe in self.parse_node(node): yield cpe @@ -188,32 +283,29 @@ class CVE: @property def affected_products(self): """The set of CPE products referred by this CVE definition""" - return set(cpe_product(p['id']) for p in self.each_cpe()) + return set(p['id'].product for p in self.each_cpe()) - def affects(self, name, version, cve_ignore_list, cpeid=None): + def affects(self, name, version, cpeid=None): """ True if the Buildroot Package object passed as argument is affected by this CVE. """ - if self.identifier in cve_ignore_list: - return self.CVE_DOESNT_AFFECT + if cpeid is None: + # if we don't have a cpeid, build one based on name and version + cpeid = CPE("cpe:2.3:*:*:%s:%s:*:*:*:*:*:*:*" % (name, version)) + elif not isinstance(cpeid, CPE): + cpeid = CPE(cpeid) - pkg_version = distutils.version.LooseVersion(version) + # Always prefer the package version of the CPE ID. + pkg_version = distutils.version.LooseVersion(cpeid.version) if not hasattr(pkg_version, "version"): - print("Cannot parse package '%s' version '%s'" % (name, version)) + print("Cannot parse package '%s' version '%s'" % (name, version), file=sys.stderr) pkg_version = None - # if we don't have a cpeid, build one based on name and version - if not cpeid: - cpeid = "cpe:2.3:*:*:%s:%s:*:*:*:*:*:*:*" % (name, version) - # if we have a cpeid, use its version instead of the package - # version, as they might be different due to - # _CPE_ID_VERSION - else: - pkg_version = distutils.version.LooseVersion(cpe_version(cpeid)) - for cpe in self.each_cpe(): - if not cpe_matches(cpe['id'], cpeid): + if not cpe['id'].matches(cpeid): + # If the node CPE id is not a subset of the target package we + # don't check for affect continue if not cpe['v_start'] and not cpe['v_end']: return self.CVE_AFFECTS diff --git a/support/scripts/fix-rpath b/support/scripts/fix-rpath index d3421504a5..afca7074c8 100755 --- a/support/scripts/fix-rpath +++ b/support/scripts/fix-rpath @@ -60,15 +60,11 @@ HOST_EXCLUDEPATHS="/share/terminfo" STAGING_EXCLUDEPATHS="/usr/include /usr/share/terminfo" TARGET_EXCLUDEPATHS="/lib/firmware" -patch_file() { - local PATCHELF rootdir file - local -a sanitize_extra_args +declare -a sanitize_extra_args +rootdir= - PATCHELF="${1}" - rootdir="${2}" - file="${3}" - shift 3 - sanitize_extra_args=("${@}") +patch_file() { + local file="${1}" # check if it's an ELF file rpath="$("${PATCHELF}" --print-rpath "${file}" 2>&1)" @@ -97,9 +93,21 @@ patch_file() { test "${changed}" != "" && chmod u-w "${file}" } +patch_files() { + while read -r -d $'\0' file; do + # for performance reasons, we want to do as little work as + # possible on non-ELF files. therefore, make sure that the + # file at least starts with the ELF magic before handing it of + # to patchelf, which will then perform the proper validation. + read -r -n4 magic <"${file}" && test "${magic}" != $'\x7fELF' && continue + + patch_file "${file}" + done +} + main() { - local rootdir tree - local -a find_args sanitize_extra_args + local tree + local -a find_args tree="${1}" @@ -162,14 +170,18 @@ main() { ;; esac - find_args+=( "-type" "f" "-print0" ) + work=$(mktemp --tmpdir -d fix-rpath.XXXXXXXX) - export -f patch_file - # Limit the number of cores used - # shellcheck disable=SC2016 # ${@} has to be expanded in the sub-shell. + find_args+=( "-type" "f" "-print0" ) find "${rootdir}" "${find_args[@]}" \ - | xargs -0 -r -P "${PARALLEL_JOBS:-1}" -I {} \ - bash -c 'patch_file "${@}"' _ "${PATCHELF}" "${rootdir}" {} "${sanitize_extra_args[@]}" + | split -t '\0' -a4 -d -n "r/${PARALLEL_JOBS:-1}" "-" "${work}/part" + + for part in "${work}/part"*; do + patch_files <"${part}" & + done + wait + + rm -rf "${work}" # Restore patched patchelf utility test "${tree}" = "host" && mv "${PATCHELF}.__to_be_patched" "${PATCHELF}" diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index bd1beec995..75fa2c7e0f 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -36,6 +36,7 @@ arches = { 'arcle-750d': { 'conditions': ['BR2_arcle', 'BR2_arc750d'], 'prefix': 'arc', + 'gdbserver': False, }, 'arcle-hs38': { 'conditions': ['BR2_arcle', 'BR2_archs38'], @@ -52,12 +53,12 @@ arches = { 'prefix': 'arm', }, 'armv7-eabihf': { - 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7A', 'BR2_ARM_EABIHF'], + 'conditions': ['BR2_arm', '(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A'], 'test_options': ['BR2_arm', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'], 'prefix': 'arm', }, 'armebv7-eabihf': { - 'conditions': ['BR2_armeb', 'BR2_ARM_CPU_ARMV7A', 'BR2_ARM_EABIHF'], + 'conditions': ['BR2_armeb', '(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A'], 'test_options': ['BR2_armeb', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'], 'prefix': 'armeb', }, @@ -118,10 +119,6 @@ arches = { 'conditions': ['BR2_mips64el', 'BR2_mips_64r6', 'BR2_MIPS_NABI32', '!BR2_MIPS_SOFT_FLOAT'], 'prefix': 'mips64el', }, - 'nios2': { - 'conditions': ['BR2_nios2'], - 'prefix': 'nios2', - }, 'openrisc': { 'conditions': ['BR2_or1k'], 'prefix': 'or1k', @@ -366,7 +363,7 @@ class Toolchain: selects.append("BR2_ENABLE_LOCALE") # thread support - if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS"): + if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS="): selects.append("BR2_TOOLCHAIN_HAS_THREADS") if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG"): @@ -482,6 +479,7 @@ def get_toolchains(): elif parts[2].startswith("bleeding-edge-"): variant = "bleeding-edge" version = parts[2][len("bleeding-edge-"):] + tmp[(arch, libc, variant)] = version if len(tmp) == 0: diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh index df224241ab..8657940be5 100755 --- a/support/scripts/genimage.sh +++ b/support/scripts/genimage.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + die() { cat <&2 Error: $@ diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 08f3344518..87a36a89a1 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -450,7 +450,7 @@ main() { auto_id=${AUTO_USER_ID} fi for g in ${groups//,/ }; do - add_one_group "${g}" ${auto_id} + add_one_group "${g}" "${auto_id}" done fi done diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 33c21e77b4..7d9170e30f 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -42,6 +42,8 @@ RM_API_STATUS_FOUND_BY_DISTRO = 2 RM_API_STATUS_FOUND_BY_PATTERN = 3 RM_API_STATUS_NOT_FOUND = 4 +HTTP_HEADERS = {'User-Agent': 'buildroot.org pkg-stats'} + class Defconfig: def __init__(self, name, path): @@ -122,6 +124,7 @@ class Package: self.cves = list() self.ignored_cves = list() self.unsure_cves = list() + self.stale_cve_ignores = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -464,38 +467,41 @@ def package_init_make_info(): check_url_count = 0 -async def check_url_status(session, pkg, npkgs, retry=True): +async def check_url_status(session, pkg, npkgs, retry=True, verbose=False): global check_url_count try: - async with session.get(pkg.url) as resp: + async with session.head(pkg.url, headers=HTTP_HEADERS) as resp: if resp.status >= 400: pkg.status['url'] = ("error", "invalid {}".format(resp.status)) check_url_count += 1 - print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) + if verbose: + print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) return except (aiohttp.ClientError, asyncio.TimeoutError): if retry: - return await check_url_status(session, pkg, npkgs, retry=False) + return await check_url_status(session, pkg, npkgs, retry=False, verbose=verbose) else: pkg.status['url'] = ("error", "invalid (err)") check_url_count += 1 - print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) + if verbose: + print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) return pkg.status['url'] = ("ok", "valid") check_url_count += 1 - print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) + if verbose: + print("[%04d/%04d] %s" % (check_url_count, npkgs, pkg.name)) -async def check_package_urls(packages): +async def check_package_urls(packages, verbose=False): tasks = [] connector = aiohttp.TCPConnector(limit_per_host=5) async with aiohttp.ClientSession(connector=connector, trust_env=True, timeout=aiohttp.ClientTimeout(total=15)) as sess: packages = [p for p in packages if p.status['url'][0] == 'ok'] for pkg in packages: - tasks.append(asyncio.ensure_future(check_url_status(sess, pkg, len(packages)))) + tasks.append(asyncio.ensure_future(check_url_status(sess, pkg, len(packages), verbose=verbose))) await asyncio.wait(tasks) @@ -522,7 +528,7 @@ def check_package_latest_version_set_status(pkg, status, version, identifier): async def check_package_get_latest_version_by_distro(session, pkg, retry=True): url = "https://release-monitoring.org/api/project/Buildroot/%s" % pkg.name try: - async with session.get(url) as resp: + async with session.get(url, headers=HTTP_HEADERS) as resp: if resp.status != 200: return False @@ -549,7 +555,7 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): async def check_package_get_latest_version_by_guess(session, pkg, retry=True): url = "https://release-monitoring.org/api/projects/?pattern=%s" % pkg.name try: - async with session.get(url) as resp: + async with session.get(url, headers=HTTP_HEADERS) as resp: if resp.status != 200: return False @@ -580,27 +586,30 @@ async def check_package_get_latest_version_by_guess(session, pkg, retry=True): check_latest_count = 0 -async def check_package_latest_version_get(session, pkg, npkgs): +async def check_package_latest_version_get(session, pkg, npkgs, verbose=False): global check_latest_count if await check_package_get_latest_version_by_distro(session, pkg): check_latest_count += 1 - print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) + if verbose: + print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) return if await check_package_get_latest_version_by_guess(session, pkg): check_latest_count += 1 - print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) + if verbose: + print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) return check_package_latest_version_set_status(pkg, RM_API_STATUS_NOT_FOUND, None, None) check_latest_count += 1 - print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) + if verbose: + print("[%04d/%04d] %s" % (check_latest_count, npkgs, pkg.name)) -async def check_package_latest_version(packages): +async def check_package_latest_version(packages, verbose=False): """ Fills in the .latest_version field of all Package objects @@ -623,7 +632,7 @@ async def check_package_latest_version(packages): async with aiohttp.ClientSession(connector=connector, trust_env=True) as sess: packages = [p for p in packages if p.is_actual_package] for pkg in packages: - tasks.append(asyncio.ensure_future(check_package_latest_version_get(sess, pkg, len(packages)))) + tasks.append(asyncio.ensure_future(check_package_latest_version_get(sess, pkg, len(packages), verbose=verbose))) await asyncio.wait(tasks) @@ -632,7 +641,18 @@ def check_package_cve_affects(cve, cpe_product_pkgs): if product not in cpe_product_pkgs: continue for pkg in cpe_product_pkgs[product]: - cve_status = cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) + cve_status = cve.affects(pkg.name, pkg.current_version, pkg.cpeid) + + if cve.identifier in pkg.ignored_cves: + if cve_status == cve.CVE_DOESNT_AFFECT: + # We have an ignore entry for a CVE which is + # already reported as 'not affected'. This might + # happen for example when the NVD database doesn't + # initially include version numbers for a CPE, and + # later fixes it. Store it so that we can report + # it. + pkg.stale_cve_ignores.append(cve.identifier) + cve_status = cve.CVE_DOESNT_AFFECT if cve_status == cve.CVE_AFFECTS: pkg.cves.append(cve.identifier) elif cve_status == cve.CVE_UNKNOWN: @@ -652,11 +672,14 @@ def check_package_cves(nvd_path, packages): pkg.status['cve'] = ("na", "no version information available") continue if pkg.cpeid: - cpe_product = cvecheck.cpe_product(pkg.cpeid) + cpe_product = cvecheck.CPE(pkg.cpeid).product cpe_product_pkgs[cpe_product].append(pkg) else: cpe_product_pkgs[pkg.name].append(pkg) + print(f"Updating NVD database in '{nvd_path}'") + cvecheck.CVE.download_nvd(nvd_path) + for cve in cvecheck.CVE.read_nvd_dir(nvd_path): check_package_cve_affects(cve, cpe_product_pkgs) @@ -664,6 +687,8 @@ def check_package_cves(nvd_path, packages): if 'cve' not in pkg.status: if pkg.cves or pkg.unsure_cves: pkg.status['cve'] = ("error", "affected by CVEs") + elif pkg.stale_cve_ignores: + pkg.status['cve'] = ("warning", "has stale CVE ignores") else: pkg.status['cve'] = ("ok", "not affected by CVEs") @@ -706,10 +731,13 @@ def calculate_stats(packages): stats["patches"] += pkg.patch_count stats["total-cves"] += len(pkg.cves) stats["total-unsure-cves"] += len(pkg.unsure_cves) + stats["total-stale-cve-ignores"] += len(pkg.stale_cve_ignores) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 if len(pkg.unsure_cves) != 0: stats["pkg-unsure-cves"] += 1 + if len(pkg.stale_cve_ignores) != 0: + stats["pkg-stale-cve-ignores"] += 1 if pkg.cpeid: stats["cpe-id"] += 1 else: @@ -861,7 +889,7 @@ function expandField(fieldId){ .wrong, .lotsofpatches, .invalid_url, .version-needs-update, .cpe-nok, .cve-nok { background: #ff9a69; } - .somepatches, .somewarnings, .missing_url, .version-unknown, .cpe-unknown, .cve-unknown { + .somepatches, .somewarnings, .missing_url, .version-unknown, .cpe-unknown, .cve-unknown, .cve-stale { background: #ffd870; } .cve_ignored, .version-error { @@ -1074,10 +1102,17 @@ def dump_html_pkg(f, pkg): div_class = ["centered data ignored_cves"] div_class.append(f'_{pkg_css_class}') if pkg.ignored_cves: - div_class.append("cve_ignored") + if pkg.stale_cve_ignores: + div_class.append("cve-stale") + else: + div_class.append("cve_ignored") f.write(f'
    \n') for ignored_cve in pkg.ignored_cves: - f.write(f' {ignored_cve}
    \n') + if ignored_cve in pkg.stale_cve_ignores: + f.write(f""" {ignored_cve}""" + """ (stale)
    \n""") + else: + f.write(f' {ignored_cve}
    \n') f.write("
    \n") # CPE ID @@ -1187,6 +1222,10 @@ def dump_html_stats(f, stats): stats["pkg-unsure-cves"]) f.write('
    Total number of unsure CVEs affecting all packages
    %s
    \n' % stats["total-unsure-cves"]) + f.write('
    Packages with stale CVE ignores
    %s
    \n' % + stats["pkg-stale-cve-ignores"]) + f.write('
    Total number of stale CVE ignores affecting all packages
    %s
    \n' % + stats["total-stale-cve-ignores"]) f.write('
    Packages with CPE ID
    %s
    \n' % stats["cpe-id"]) f.write('
    Packages without CPE ID
    %s
    \n' % @@ -1270,8 +1309,10 @@ def parse_args(): parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) parser.add_argument('--disable', type=list_str, - help='Features to disable, comma-separated (cve, upstream, url, warning)', + help='Features to disable, comma-separated (cve, upstream, url, warnings)', default=[]) + parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', + help='Increase verbosity') args = parser.parse_args() if not args.html and not args.json: parser.error('at least one of --html or --json (or both) is required') @@ -1325,11 +1366,11 @@ def __main__(): if "url" not in args.disable: print("Checking URL status") loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_urls(packages)) + loop.run_until_complete(check_package_urls(packages, verbose=args.verbose)) if "upstream" not in args.disable: print("Getting latest versions ...") loop = asyncio.get_event_loop() - loop.run_until_complete(check_package_latest_version(packages)) + loop.run_until_complete(check_package_latest_version(packages, verbose=args.verbose)) if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) diff --git a/support/testing/conf/docker-compose-kernel.config b/support/testing/conf/docker-compose-kernel.config index 4d30a578ec..fd28da7a4a 100644 --- a/support/testing/conf/docker-compose-kernel.config +++ b/support/testing/conf/docker-compose-kernel.config @@ -1,10 +1,22 @@ # CONFIG_SWAP is not set CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y +CONFIG_CGROUPS=y +CONFIG_MEMCG=y +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CPUSETS=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_BPF=y +CONFIG_BPF_SYSCALL=y # CONFIG_COMPAT_BRK is not set +CONFIG_SMP=y # CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_IOSF_MBI=y CONFIG_MCORE2=y # CONFIG_X86_MCE is not set # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set @@ -12,9 +24,8 @@ CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_SUSPEND is not set # CONFIG_ACPI is not set CONFIG_CPU_IDLE=y -CONFIG_PCI_MSI=y # CONFIG_VIRTUALIZATION is not set -# CONFIG_IOSCHED_CFQ is not set +CONFIG_BLK_DEV_THROTTLING=y # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set @@ -25,23 +36,36 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -# CONFIG_NF_CONNTRACK_PROCFS is not set -# CONFIG_NF_CT_PROTO_DCCP is not set -# CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_IPV6_SIT is not set +CONFIG_NETFILTER=y +CONFIG_NF_CONNTRACK=y +CONFIG_NETFILTER_XT_MARK=y +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_IPVS=y CONFIG_IP_VS=y CONFIG_IP_VS_RR=y CONFIG_IP_VS_NFCT=y -# CONFIG_BRIDGE_IGMP_SNOOPING is not set +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_RAW=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_RAW=y +CONFIG_IP6_NF_NAT=y +CONFIG_IP6_NF_TARGET_MASQUERADE=y +CONFIG_BRIDGE=y # CONFIG_WIRELESS is not set +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y CONFIG_NETDEVICES=y +CONFIG_VETH=y CONFIG_VIRTIO_NET=y # CONFIG_ETHERNET is not set # CONFIG_WLAN is not set @@ -52,26 +76,23 @@ CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_DEVMEM is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_LPSS is not set -# CONFIG_SERIAL_8250_MID is not set # CONFIG_HW_RANDOM_INTEL is not set # CONFIG_HW_RANDOM_AMD is not set # CONFIG_HW_RANDOM_VIA is not set CONFIG_HW_RANDOM_VIRTIO=y -# CONFIG_DEVPORT is not set # CONFIG_HWMON is not set # CONFIG_USB_SUPPORT is not set CONFIG_RTC_CLASS=y CONFIG_VIRTIO_PCI=y -# CONFIG_VIRTIO_PCI_LEGACY is not set +CONFIG_VIRTIO_MMIO=y # CONFIG_X86_PLATFORM_DEVICES is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT4_FS=y +CONFIG_OVERLAY_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_KEYS=y CONFIG_SECURITYFS=y -# CONFIG_CRYPTO_ECHAINIV is not set # CONFIG_CRYPTO_HW is not set -# CONFIG_UNUSED_SYMBOLS is not set CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py index 1f003f24c6..52308395a3 100644 --- a/support/testing/infra/__init__.py +++ b/support/testing/infra/__init__.py @@ -59,11 +59,20 @@ def download(dldir, filename): def run_cmd_on_host(builddir, cmd): """Call subprocess.check_output and return the text output.""" - out = subprocess.check_output(cmd, - stderr=open(os.devnull, "w"), - cwd=builddir, - env={"LANG": "C"}, - universal_newlines=True) + try: + out = subprocess.check_output(cmd, + cwd=builddir, + env={"LANG": "C"}, + stderr=subprocess.STDOUT, + text=True, + universal_newlines=True) + except subprocess.CalledProcessError as e: + print(f"Command failed with return code {e.returncode}") + print("=== STDOUT/STDERR ===") + print(e.output) + print("=====================") + raise + return out diff --git a/support/testing/infra/__pycache__/__init__.cpython-312.pyc b/support/testing/infra/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..0198fb3f64 Binary files /dev/null and b/support/testing/infra/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/infra/__pycache__/basetest.cpython-312.pyc b/support/testing/infra/__pycache__/basetest.cpython-312.pyc new file mode 100644 index 0000000000..a93b0d8d27 Binary files /dev/null and b/support/testing/infra/__pycache__/basetest.cpython-312.pyc differ diff --git a/support/testing/infra/__pycache__/builder.cpython-312.pyc b/support/testing/infra/__pycache__/builder.cpython-312.pyc new file mode 100644 index 0000000000..9e62bd07c4 Binary files /dev/null and b/support/testing/infra/__pycache__/builder.cpython-312.pyc differ diff --git a/support/testing/infra/__pycache__/emulator.cpython-312.pyc b/support/testing/infra/__pycache__/emulator.cpython-312.pyc new file mode 100644 index 0000000000..a5807b5100 Binary files /dev/null and b/support/testing/infra/__pycache__/emulator.cpython-312.pyc differ diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 1ae6232da8..13f9b2d398 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -24,8 +24,8 @@ MINIMAL_CONFIG = \ class BRConfigTest(unittest.TestCase): """Test up to the configure stage.""" - config = None - br2_external = list() + config: str + br2_external: list[str] = list() downloaddir = None outputdir = None logtofile = True @@ -37,7 +37,6 @@ class BRConfigTest(unittest.TestCase): super(BRConfigTest, self).__init__(names) self.testname = self.__class__.__name__ self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname) - self.config += '\nBR2_BACKUP_SITE=""\n' self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir) self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel) @@ -61,6 +60,28 @@ class BRConfigTest(unittest.TestCase): self.b.delete() +class BRHostPkgTest(BRConfigTest): + """Test up to the build stage of a host package. Define hostpkgs in + the class to the list of host packages that should be built.""" + config = \ + BASIC_TOOLCHAIN_CONFIG + \ + MINIMAL_CONFIG + hostpkgs = None + + def __init__(self, names): + super(BRHostPkgTest, self).__init__(names) + + def setUp(self): + super(BRHostPkgTest, self).setUp() + if not self.b.is_finished(): + self.show_msg("Building") + self.b.build(make_extra_opts=self.hostpkgs) + self.show_msg("Building done") + + def tearDown(self): + super(BRHostPkgTest, self).tearDown() + + class BRTest(BRConfigTest): """Test up to the build stage and instantiate an emulator.""" def __init__(self, names): diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 238e123302..3702ee2d48 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -5,6 +5,7 @@ import os import pexpect import pexpect.replwrap +import time import infra @@ -116,15 +117,21 @@ class Emulator(object): ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}" self.logfile.write(f"> host loadavg: {ldavg_str}\n") self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") - self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) + self.logfile.write(f"> emulator using {qemu_cmd[0]} version:\n") host_bin = os.path.join(self.builddir, "host", "bin") br_path = host_bin + os.pathsep + os.environ["PATH"] + qemu_env = {"QEMU_AUDIO_DRV": "none", + "PATH": br_path} + pexpect.run(f"{qemu_cmd[0]} --version", + encoding='utf-8', + logfile=self.logfile, + env=qemu_env) + self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, encoding='utf-8', codec_errors='replace', - env={"QEMU_AUDIO_DRV": "none", - "PATH": br_path}) + env=qemu_env) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile @@ -146,6 +153,10 @@ class Emulator(object): self.connect_shell() + output, exit_code = self.run(f"date -s @{int(time.time())}") + if exit_code: + raise SystemError("Cannot set date in virtual machine") + def connect_shell(self): extra_init_cmd = " && ".join([ 'export PAGER=cat', diff --git a/support/testing/tests/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..19cb25bd5d Binary files /dev/null and b/support/testing/tests/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/boot/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/boot/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..724a3368f8 Binary files /dev/null and b/support/testing/tests/boot/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/boot/__pycache__/test_atf.cpython-312.pyc b/support/testing/tests/boot/__pycache__/test_atf.cpython-312.pyc new file mode 100644 index 0000000000..44681a1492 Binary files /dev/null and b/support/testing/tests/boot/__pycache__/test_atf.cpython-312.pyc differ diff --git a/support/testing/tests/boot/__pycache__/test_edk2.cpython-312.pyc b/support/testing/tests/boot/__pycache__/test_edk2.cpython-312.pyc new file mode 100644 index 0000000000..3344a7795b Binary files /dev/null and b/support/testing/tests/boot/__pycache__/test_edk2.cpython-312.pyc differ diff --git a/support/testing/tests/boot/__pycache__/test_grub.cpython-312.pyc b/support/testing/tests/boot/__pycache__/test_grub.cpython-312.pyc new file mode 100644 index 0000000000..36d82dcff5 Binary files /dev/null and b/support/testing/tests/boot/__pycache__/test_grub.cpython-312.pyc differ diff --git a/support/testing/tests/boot/__pycache__/test_optee_os.cpython-312.pyc b/support/testing/tests/boot/__pycache__/test_optee_os.cpython-312.pyc new file mode 100644 index 0000000000..349f219a14 Binary files /dev/null and b/support/testing/tests/boot/__pycache__/test_optee_os.cpython-312.pyc differ diff --git a/support/testing/tests/boot/__pycache__/test_syslinux.cpython-312.pyc b/support/testing/tests/boot/__pycache__/test_syslinux.cpython-312.pyc new file mode 100644 index 0000000000..674b1947db Binary files /dev/null and b/support/testing/tests/boot/__pycache__/test_syslinux.cpython-312.pyc differ diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index b0e7696e86..b822b9d357 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -6,10 +6,10 @@ class TestATFAllwinner(infra.basetest.BRTest): """ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y + BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" # BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index 39d7a4dbcc..316eb616ee 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -7,6 +7,7 @@ class TestEdk2(infra.basetest.BRTest): config = \ """ BR2_aarch64=y + BR2_neoverse_n2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y @@ -25,7 +26,7 @@ class TestEdk2(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_HOST_GENIMAGE=y @@ -35,37 +36,119 @@ class TestEdk2(infra.basetest.BRTest): BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ - def __init__(self, names): - """Setup common test variables.""" - super(TestEdk2, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestEdk2. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") self.emulator.boot(arch="aarch64", options=["-M", "sbsa-ref", - "-cpu", "cortex-a57", + "-cpu", "neoverse-n2", "-m", "512M", "-pflash", flash0, "-pflash", flash1, "-hda", hda]) self.emulator.login() + + +class TestEdk2BuildBase(infra.basetest.BRTest): + """A class to test the build of various edk2 platforms.""" + base_config = \ + """ + # BR2_PACKAGE_BUSYBOX is not set + # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + # BR2_TARGET_ROOTFS_TAR is not set + BR2_INIT_NONE=y + BR2_SYSTEM_BIN_SH_NONE=y + BR2_TARGET_EDK2=y + BR2_TOOLCHAIN_EXTERNAL=y + """ + + def assertBinariesExist(self, *binaries: str) -> None: + """Assert that the binaries passed as argument exist + under the images folder. + We print a message to the emulator logfile for each binary found. + """ + for binary in binaries: + binpath = os.path.join(self.builddir, "images", binary) + self.assertTrue(os.path.exists(binpath), f"Missing {binpath}!") + print(f"{binary} exists: {binpath}", file=self.emulator.logfile, + flush=True) + + +class TestEdk2BuildArmVirtQemu(TestEdk2BuildBase): + config = TestEdk2BuildBase.base_config + \ + """ + BR2_aarch64=y + BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU=y + """ + + def test_run(self) -> None: + self.assertBinariesExist("QEMU_EFI.fd", "QEMU_VARS.fd") + + +class TestEdk2BuildArmVirtQemuKernel(TestEdk2BuildBase): + config = TestEdk2BuildBase.base_config + \ + """ + BR2_aarch64=y + BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL=y + """ + + def test_run(self) -> None: + self.assertBinariesExist("QEMU_EFI.fd", "QEMU_VARS.fd") + + +class TestEdk2BuildArmSgi575(TestEdk2BuildBase): + config = TestEdk2BuildBase.base_config + \ + """ + BR2_aarch64=y + BR2_TARGET_EDK2_PLATFORM_ARM_SGI575=y + """ + + def test_run(self) -> None: + self.assertBinariesExist("BL33_AP_UEFI.fd") + + +class TestEdk2BuildArmVexpressFvpAarch64(TestEdk2BuildBase): + config = TestEdk2BuildBase.base_config + \ + """ + BR2_aarch64=y + BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64=y + """ + + def test_run(self) -> None: + self.assertBinariesExist("FVP_AARCH64_EFI.fd") + + +class TestEdk2BuildQemuSbsa(TestEdk2BuildBase): + # This configuration is not exactly identical to the configuration built + # during TestEdk2, as we use the latest arm-trusted-firmware version, among + # other things. + config = TestEdk2BuildBase.base_config + \ + """ + BR2_aarch64=y + BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y + """ + + def test_run(self) -> None: + self.assertBinariesExist("SBSA_FLASH0.fd", "SBSA_FLASH1.fd", "fip.bin") + + +class TestEdk2BuildSolidrunArmada80x0mcbin(TestEdk2BuildBase): + config = TestEdk2BuildBase.base_config + \ + """ + BR2_aarch64=y + BR2_cortex_a72=y + BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33=y + BR2_TARGET_BINARIES_MARVELL=y + BR2_TARGET_MV_DDR_MARVELL=y + """ + + def test_run(self) -> None: + self.assertBinariesExist("ARMADA_EFI.fd", "fip.bin", "ble.bin", + "scp-fw.bin") diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 5cbc7fd22b..7ce7066875 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -8,7 +8,7 @@ class TestGrubi386BIOS(infra.basetest.BRTest): """ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh {}" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" @@ -37,7 +37,7 @@ class TestGrubi386EFI(infra.basetest.BRTest): """ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh {}" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" BR2_LINUX_KERNEL=y @@ -58,28 +58,6 @@ class TestGrubi386EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_DOSFSTOOLS=y """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) - def __init__(self, names): - """Setup common test variables.""" - super(TestGrubi386EFI, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestGrubi386EFI. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "OVMF.fd") @@ -110,7 +88,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): BR2_x86_64=y BR2_x86_corei7=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh {}" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" BR2_LINUX_KERNEL=y @@ -131,28 +109,6 @@ class TestGrubX8664EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_DOSFSTOOLS=y """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) - def __init__(self, names): - """Setup common test variables.""" - super(TestGrubX8664EFI, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestGrubX8664EFI. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "OVMF.fd") @@ -202,28 +158,6 @@ class TestGrubAArch64EFI(infra.basetest.BRTest): """.format(post_image=infra.filepath("tests/boot/test_grub/post-image-aarch64-efi.sh"), linux_fragment=infra.filepath("tests/boot/test_grub/linux-aarch64-efi.config")) - def __init__(self, names): - """Setup common test variables.""" - super(TestGrubAArch64EFI, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestGrubAArch64EFI. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd") @@ -270,28 +204,6 @@ class TestGrubRiscV64EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ - def __init__(self, names): - """Setup common test variables.""" - super(TestGrubRiscV64EFI, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestGrubAArch64EFI. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): disk = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "RISCV_VIRT_CODE.fd") diff --git a/support/testing/tests/boot/test_syslinux.py b/support/testing/tests/boot/test_syslinux.py index 467d564e18..17fe904263 100644 --- a/support/testing/tests/boot/test_syslinux.py +++ b/support/testing/tests/boot/test_syslinux.py @@ -6,13 +6,7 @@ class TestSysLinuxBase(infra.basetest.BRTest): """ BR2_x86_i686=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y - BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_8=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y - BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE=y """ x86_64_toolchain_config = \ @@ -20,20 +14,14 @@ class TestSysLinuxBase(infra.basetest.BRTest): BR2_x86_64=y BR2_x86_corei7=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y - BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2018.11-1.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_7=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y - BR2_TOOLCHAIN_EXTERNAL_CXX=y - BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y """ syslinux_legacy_config = \ """ BR2_TARGET_SYSLINUX=y BR2_TARGET_SYSLINUX_ISOLINUX=y + BR2_TARGET_SYSLINUX_LPXELINUX=y BR2_TARGET_SYSLINUX_PXELINUX=y BR2_TARGET_SYSLINUX_MBR=y """ diff --git a/support/testing/tests/core/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/core/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..d2de244b4f Binary files /dev/null and b/support/testing/tests/core/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_bad_arch.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_bad_arch.cpython-312.pyc new file mode 100644 index 0000000000..184e20617b Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_bad_arch.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_cpeid.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_cpeid.cpython-312.pyc new file mode 100644 index 0000000000..fbffb9439f Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_cpeid.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_file_capabilities.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_file_capabilities.cpython-312.pyc new file mode 100644 index 0000000000..1f11c60ee1 Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_file_capabilities.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_hardening.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_hardening.cpython-312.pyc new file mode 100644 index 0000000000..707311ec27 Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_hardening.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_post_scripts.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_post_scripts.cpython-312.pyc new file mode 100644 index 0000000000..34c2151caa Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_post_scripts.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_root_password.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_root_password.cpython-312.pyc new file mode 100644 index 0000000000..a263c35507 Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_root_password.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_rootfs_overlay.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_rootfs_overlay.cpython-312.pyc new file mode 100644 index 0000000000..123100ccf0 Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_rootfs_overlay.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_selinux.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_selinux.cpython-312.pyc new file mode 100644 index 0000000000..aa7818816c Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_selinux.cpython-312.pyc differ diff --git a/support/testing/tests/core/__pycache__/test_timezone.cpython-312.pyc b/support/testing/tests/core/__pycache__/test_timezone.cpython-312.pyc new file mode 100644 index 0000000000..3ad60efd93 Binary files /dev/null and b/support/testing/tests/core/__pycache__/test_timezone.cpython-312.pyc differ diff --git a/support/testing/tests/core/test_hardening.py b/support/testing/tests/core/test_hardening.py index e9d30f3a38..2daafbd883 100644 --- a/support/testing/tests/core/test_hardening.py +++ b/support/testing/tests/core/test_hardening.py @@ -7,16 +7,10 @@ import infra.basetest class TestHardeningBase(infra.basetest.BRTest): config = \ """ - BR2_powerpc64=y - BR2_powerpc_e5500=y + BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y - BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2018.02-2.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_6=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y - BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_PACKAGE_LIGHTTPD=y BR2_PACKAGE_HOST_CHECKSEC=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/support/testing/tests/core/test_selinux.py b/support/testing/tests/core/test_selinux.py index 683a424d6f..e72431211d 100644 --- a/support/testing/tests/core/test_selinux.py +++ b/support/testing/tests/core/test_selinux.py @@ -51,6 +51,24 @@ class TestSELinuxExtraModulesDirs(TestSELinuxInfra): self.assertEqual(out[2].strip(), "buildroot_test_t") +class TestSELinuxSetBooleans(TestSELinuxInfra): + config = TestSELinuxInfra.config + \ + """ + BR2_REFPOLICY_SET_BOOLEANS="user_dmesg user_all_users_send_syslog=false" + """ + + def test_run(self): + TestSELinuxInfra.base_test_run(self) + + out, ret = self.emulator.run("seinfo -x -b", 15) + self.assertEqual(ret, 0) + # lines follow the pattern "name (true|false);", plus indentation + bools = dict(line.strip().rstrip(';').split()[1:] for line in out[2:]) + # both of these booleans have the opposite default in refpolicy + self.assertEqual(bools["user_dmesg"], "true") + self.assertEqual(bools["user_all_users_send_syslog"], "false") + + class TestSELinuxCustomGit(TestSELinuxInfra): config = TestSELinuxInfra.config + \ """ diff --git a/support/testing/tests/core/test_timezone.py b/support/testing/tests/core/test_timezone.py index bf4a47fcde..bfb9604f66 100644 --- a/support/testing/tests/core/test_timezone.py +++ b/support/testing/tests/core/test_timezone.py @@ -9,6 +9,24 @@ def boot_armv5_cpio(emulator, builddir): options=["-initrd", img]) emulator.login() + # emulator.login() sets the emulated system date to the host + # date. In general, this is desirable (for correct SSL certificate + # behaviors, for example). + # + # This timezone runtime test checks that a Buildroot configuration + # is reflected in the generated system at runtime, using the + # standard "date" command. To make sure this test is stable in + # time (i.e. output is independent to the date/time the test is + # executed due to daylight saving time changes), we reset the + # system date to a constant value. + # + # We cannot set the system date to a value less than the system + # uptime. So we cannot set the time back to Unix Epoch with the + # command "date -s @0" (this would result to a EINVAL Invalid + # argument). Instead, we set the time at 1 hour after Epoch. This + # is sufficient as the emulated system takes few seconds to start. + emulator.run("date -s @3600") + class TestNoTimezone(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ diff --git a/support/testing/tests/download/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/download/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..d04ff40658 Binary files /dev/null and b/support/testing/tests/download/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/download/__pycache__/gitremote.cpython-312.pyc b/support/testing/tests/download/__pycache__/gitremote.cpython-312.pyc new file mode 100644 index 0000000000..64ff611c90 Binary files /dev/null and b/support/testing/tests/download/__pycache__/gitremote.cpython-312.pyc differ diff --git a/support/testing/tests/download/__pycache__/sshd.cpython-312.pyc b/support/testing/tests/download/__pycache__/sshd.cpython-312.pyc new file mode 100644 index 0000000000..59e2a9525b Binary files /dev/null and b/support/testing/tests/download/__pycache__/sshd.cpython-312.pyc differ diff --git a/support/testing/tests/download/__pycache__/test_git.cpython-312.pyc b/support/testing/tests/download/__pycache__/test_git.cpython-312.pyc new file mode 100644 index 0000000000..04ef53077f Binary files /dev/null and b/support/testing/tests/download/__pycache__/test_git.cpython-312.pyc differ diff --git a/support/testing/tests/download/__pycache__/test_gitforge.cpython-312.pyc b/support/testing/tests/download/__pycache__/test_gitforge.cpython-312.pyc new file mode 100644 index 0000000000..2e43fef542 Binary files /dev/null and b/support/testing/tests/download/__pycache__/test_gitforge.cpython-312.pyc differ diff --git a/support/testing/tests/download/__pycache__/test_ssh.cpython-312.pyc b/support/testing/tests/download/__pycache__/test_ssh.cpython-312.pyc new file mode 100644 index 0000000000..47f51fbf15 Binary files /dev/null and b/support/testing/tests/download/__pycache__/test_ssh.cpython-312.pyc differ diff --git a/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk b/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk index 5497bd6bfe..a9b7c451bc 100644 --- a/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk +++ b/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk @@ -5,6 +5,7 @@ ################################################################################ BAD_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d -BAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +BAD_SITE = $(GITREMOTE_DIR)/repo.git +BAD_SITE_METHOD = git $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-hash/package/export-subst/export-subst.mk b/support/testing/tests/download/br2-external/git-hash/package/export-subst/export-subst.mk index 8d7d3ff970..40c4b52a7a 100644 --- a/support/testing/tests/download/br2-external/git-hash/package/export-subst/export-subst.mk +++ b/support/testing/tests/download/br2-external/git-hash/package/export-subst/export-subst.mk @@ -5,6 +5,7 @@ ################################################################################ EXPORT_SUBST_VERSION = 0fdb95cf4f3c5ed4003287649cabb33c5f843e26 -EXPORT_SUBST_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +EXPORT_SUBST_SITE = $(GITREMOTE_DIR)/repo.git +EXPORT_SUBST_SITE_METHOD = git $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-hash/package/good/good.mk b/support/testing/tests/download/br2-external/git-hash/package/good/good.mk index 0f0eefd944..8071de657c 100644 --- a/support/testing/tests/download/br2-external/git-hash/package/good/good.mk +++ b/support/testing/tests/download/br2-external/git-hash/package/good/good.mk @@ -5,6 +5,7 @@ ################################################################################ GOOD_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d -GOOD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GOOD_SITE = $(GITREMOTE_DIR)/repo.git +GOOD_SITE_METHOD = git $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk b/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk index 1da19d88c6..825e26782e 100644 --- a/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk +++ b/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk @@ -5,6 +5,7 @@ ################################################################################ NOHASH_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d -NOHASH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +NOHASH_SITE = $(GITREMOTE_DIR)/repo.git +NOHASH_SITE_METHOD = git $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk index 6d4177c5bf..7b5ddce30a 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_PARTIAL_SHA1_BRANCH_HEAD_VERSION = 68c197d0879d485f4f6c -GIT_PARTIAL_SHA1_BRANCH_HEAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_BRANCH_HEAD_SITE = $(GITREMOTE_DIR)/repo.git +GIT_PARTIAL_SHA1_BRANCH_HEAD_SITE_METHOD = git GIT_PARTIAL_SHA1_BRANCH_HEAD_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk index 2f65b5c9a9..738821bc27 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_VERSION = 317406308d9259e2231b -GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_SITE = $(GITREMOTE_DIR)/repo.git +GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_SITE_METHOD = git GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk index 05aa659dd2..a96af88a06 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_VERSION = 46bae5b639e5a18e2cc4 -GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_SITE = $(GITREMOTE_DIR)/repo.git +GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_SITE_METHOD = git GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk index 515492397e..8e06d4c2c9 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_PARTIAL_SHA1_TAG_ITSELF_VERSION = 2b0e0d98a49c97da6a61 -GIT_PARTIAL_SHA1_TAG_ITSELF_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_TAG_ITSELF_SITE = $(GITREMOTE_DIR)/repo.git +GIT_PARTIAL_SHA1_TAG_ITSELF_SITE_METHOD = git GIT_PARTIAL_SHA1_TAG_ITSELF_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk index c810e81175..081657e0e5 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_PARTIAL_SHA1_TAG_POINTS_TO_VERSION = 516c9c5f64ec66534d4d -GIT_PARTIAL_SHA1_TAG_POINTS_TO_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_TAG_POINTS_TO_SITE = $(GITREMOTE_DIR)/repo.git +GIT_PARTIAL_SHA1_TAG_POINTS_TO_SITE_METHOD = git GIT_PARTIAL_SHA1_TAG_POINTS_TO_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk index d3ecaa8593..4238a12222 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SHA1_BRANCH_HEAD_VERSION = 68c197d0879d485f4f6cee85544722b79e68e59f -GIT_SHA1_BRANCH_HEAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_BRANCH_HEAD_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SHA1_BRANCH_HEAD_SITE_METHOD = git GIT_SHA1_BRANCH_HEAD_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk index badf9e13ca..ac982a4a4c 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SHA1_REACHABLE_BY_BRANCH_VERSION = 317406308d9259e2231bd0d6ddad3de3832bce08 -GIT_SHA1_REACHABLE_BY_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_REACHABLE_BY_BRANCH_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SHA1_REACHABLE_BY_BRANCH_SITE_METHOD = git GIT_SHA1_REACHABLE_BY_BRANCH_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk index b5fde7b586..f90fa8d707 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SHA1_REACHABLE_BY_TAG_VERSION = 46bae5b639e5a18e2cc4dc508f080d566baeff59 -GIT_SHA1_REACHABLE_BY_TAG_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_REACHABLE_BY_TAG_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SHA1_REACHABLE_BY_TAG_SITE_METHOD = git GIT_SHA1_REACHABLE_BY_TAG_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk index 8914496653..72a456a7e7 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SHA1_TAG_ITSELF_VERSION = 2b0e0d98a49c97da6a618ab36337e2058eb733a2 -GIT_SHA1_TAG_ITSELF_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_TAG_ITSELF_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SHA1_TAG_ITSELF_SITE_METHOD = git GIT_SHA1_TAG_ITSELF_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk index adaae7329c..3e54ff1a82 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SHA1_TAG_POINTS_TO_VERSION = 516c9c5f64ec66534d4d069c2e408d9ae4dce023 -GIT_SHA1_TAG_POINTS_TO_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_TAG_POINTS_TO_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SHA1_TAG_POINTS_TO_SITE_METHOD = git GIT_SHA1_TAG_POINTS_TO_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk index 7a35b3b51a..52219f36df 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SUBMODULE_DISABLED_VERSION = a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f -GIT_SUBMODULE_DISABLED_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SUBMODULE_DISABLED_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SUBMODULE_DISABLED_SITE_METHOD = git GIT_SUBMODULE_DISABLED_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk index 48a42f5e8a..8f92a5b223 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_SUBMODULE_ENABLED_VERSION = a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f -GIT_SUBMODULE_ENABLED_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SUBMODULE_ENABLED_SITE = $(GITREMOTE_DIR)/repo.git +GIT_SUBMODULE_ENABLED_SITE_METHOD = git GIT_SUBMODULE_ENABLED_GIT_SUBMODULES = YES $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk b/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk index 6960ceb2cb..95e7671344 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_TAG_VERSION = mytag -GIT_TAG_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_TAG_SITE = $(GITREMOTE_DIR)/repo.git +GIT_TAG_SITE_METHOD = git GIT_TAG_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk b/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk index 786224dad9..f1f5fab669 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_WRONG_CONTENT_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d -GIT_WRONG_CONTENT_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_WRONG_CONTENT_SITE = $(GITREMOTE_DIR)/repo.git +GIT_WRONG_CONTENT_SITE_METHOD = git GIT_WRONG_CONTENT_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk b/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk index f9d0d2226c..b77d05f29a 100644 --- a/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk +++ b/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk @@ -5,7 +5,8 @@ ################################################################################ GIT_WRONG_SHA1_VERSION = 0000000000000000000000000000000000000000 -GIT_WRONG_SHA1_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_WRONG_SHA1_SITE = $(GITREMOTE_DIR)/repo.git +GIT_WRONG_SHA1_SITE_METHOD = git GIT_WRONG_SHA1_LICENSE_FILES = file $(eval $(generic-package)) diff --git a/support/testing/tests/download/gitconfig.py b/support/testing/tests/download/gitconfig.py new file mode 100644 index 0000000000..31cee6e123 --- /dev/null +++ b/support/testing/tests/download/gitconfig.py @@ -0,0 +1,51 @@ +import os +import subprocess + +import infra + + +GIT_HOST_DIR = "host" +GIT_CONFIG_DIR = os.path.join(GIT_HOST_DIR, "home/br-user") +GIT_CONFIG_FILE = os.path.join(GIT_CONFIG_DIR, "gitconfig") + + +def run_git_config(logfile, cmd): + logfile.write( + "> running git config with '{}'\n".format(" ".join(cmd))) + try: + subprocess.check_call(cmd, stdout=logfile, stderr=logfile) + except FileNotFoundError: + logfile.write("> git config failed\n") + raise SystemError("git config failed") + + +def generate_gitconfig(builddir, logtofile, gitremotedir): + logfile = infra.open_log_file(builddir, "gitconfig", logtofile) + + # The git repository used by this test is cloned locally from + # gitremotedir using the "file://" protocol. Since it contains + # several git submodules we need to allow this protocol to be used + # with git submodules. Since we don't want to modify the user + # (global) gitconfig, we use a local gitconfig file. + localgitconfig = os.path.join(builddir, GIT_CONFIG_FILE) + + gitconfigdir = os.path.join(builddir, GIT_CONFIG_DIR) + os.makedirs(gitconfigdir, exist_ok=True) + + # We are using the git repository from the Buildroot git tree + # (gitremotedir). This repository is safe to use using "file://" + # protocol with git submodules. + cmd = ["git", "config", "--file", localgitconfig, + "--add", "protocol.file.allow", "always"] + + run_git_config(logfile, cmd) + + # Disable ownership check of the git tree for Gitlab-CI + # environment. + # See: https://gitlab.com/buildroot.org/buildroot/-/commit/a016b693f7830f3c8ae815851d3204b8b6e99821 + for git_repo in os.scandir(gitremotedir): + + cmd = ["git", "config", "--file", localgitconfig, + "--add", "safe.directory", git_repo.path] + + run_git_config(logfile, cmd) diff --git a/support/testing/tests/download/test_git.py b/support/testing/tests/download/test_git.py index 3cf98f6456..0cbb74a061 100644 --- a/support/testing/tests/download/test_git.py +++ b/support/testing/tests/download/test_git.py @@ -1,37 +1,46 @@ import os import shutil -from tests.download.gitremote import GitRemote +import tests.download.gitconfig import infra class GitTestBase(infra.basetest.BRConfigTest): - config = "" + config = \ + """ + BR2_BACKUP_SITE="" + """ gitremotedir = infra.filepath("tests/download/git-remote") - gitremote = None def setUp(self): super(GitTestBase, self).setUp() - self.gitremote = GitRemote(self.builddir, self.gitremotedir, self.logtofile) + + self.show_msg("Generating custom git config") + tests.download.gitconfig.generate_gitconfig(self.builddir, + self.logtofile, + self.gitremotedir) def tearDown(self): self.show_msg("Cleaning up") - if self.gitremote: - self.gitremote.stop() if self.b and not self.keepbuilds: self.b.delete() def check_hash(self, package): + gitconfig = os.path.join(self.builddir, + tests.download.gitconfig.GIT_CONFIG_FILE) # store downloaded tarball inside the output dir so the test infra # cleans it up at the end env = {"BR2_DL_DIR": os.path.join(self.builddir, "dl"), - "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)} + "GITREMOTE_DIR": self.gitremotedir, + "GIT_CONFIG_GLOBAL": gitconfig} self.b.build(["{}-dirclean".format(package), "{}-source".format(package)], env) def check_download(self, package): + gitconfig = os.path.join(self.builddir, + tests.download.gitconfig.GIT_CONFIG_FILE) # store downloaded tarball inside the output dir so the test infra # cleans it up at the end dl_dir = os.path.join(self.builddir, "dl") @@ -39,7 +48,8 @@ class GitTestBase(infra.basetest.BRConfigTest): if os.path.exists(dl_dir): shutil.rmtree(dl_dir) env = {"BR2_DL_DIR": dl_dir, - "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)} + "GITREMOTE_DIR": self.gitremotedir, + "GIT_CONFIG_GLOBAL": gitconfig} self.b.build(["{}-dirclean".format(package), "{}-legal-info".format(package)], env) diff --git a/support/testing/tests/download/test_gitforge.py b/support/testing/tests/download/test_gitforge.py index 477c365a34..e1ac35ec67 100644 --- a/support/testing/tests/download/test_gitforge.py +++ b/support/testing/tests/download/test_gitforge.py @@ -5,7 +5,10 @@ import infra class GitforgeTestBase(infra.basetest.BRConfigTest): - config = "" + config = \ + """ + BR2_BACKUP_SITE="" + """ def setUp(self): super(GitforgeTestBase, self).setUp() diff --git a/support/testing/tests/download/test_ssh.py b/support/testing/tests/download/test_ssh.py index 7d6ac3aaf7..126002a355 100644 --- a/support/testing/tests/download/test_ssh.py +++ b/support/testing/tests/download/test_ssh.py @@ -7,7 +7,9 @@ import infra class SSHTestBase(infra.basetest.BRConfigTest): - config = infra.basetest.MINIMAL_CONFIG + config = infra.basetest.MINIMAL_CONFIG + ''' +BR2_BACKUP_SITE="" +''' sshd_test_dir = infra.filepath("tests/download/sshd") sshd = None diff --git a/support/testing/tests/fs/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/fs/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..32c472442e Binary files /dev/null and b/support/testing/tests/fs/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_btrfs.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_btrfs.cpython-312.pyc new file mode 100644 index 0000000000..cf55c8e19c Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_btrfs.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_cpio.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_cpio.cpython-312.pyc new file mode 100644 index 0000000000..c4890424ce Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_cpio.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_erofs.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_erofs.cpython-312.pyc new file mode 100644 index 0000000000..38787198e6 Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_erofs.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_ext.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_ext.cpython-312.pyc new file mode 100644 index 0000000000..5b230eaa7d Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_ext.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_f2fs.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_f2fs.cpython-312.pyc new file mode 100644 index 0000000000..3b4b4d6925 Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_f2fs.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_iso9660.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_iso9660.cpython-312.pyc new file mode 100644 index 0000000000..b2ab9e0d0d Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_iso9660.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_jffs2.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_jffs2.cpython-312.pyc new file mode 100644 index 0000000000..e149711e61 Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_jffs2.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_oci.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_oci.cpython-312.pyc new file mode 100644 index 0000000000..669ae4e562 Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_oci.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_squashfs.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_squashfs.cpython-312.pyc new file mode 100644 index 0000000000..33f3dd3d73 Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_squashfs.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_ubi.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_ubi.cpython-312.pyc new file mode 100644 index 0000000000..fe3b3019db Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_ubi.cpython-312.pyc differ diff --git a/support/testing/tests/fs/__pycache__/test_yaffs2.cpython-312.pyc b/support/testing/tests/fs/__pycache__/test_yaffs2.cpython-312.pyc new file mode 100644 index 0000000000..371fa0c2da Binary files /dev/null and b/support/testing/tests/fs/__pycache__/test_yaffs2.cpython-312.pyc differ diff --git a/support/testing/tests/fs/test_ext.py b/support/testing/tests/fs/test_ext.py index 699f3ed932..7612ad2b30 100644 --- a/support/testing/tests/fs/test_ext.py +++ b/support/testing/tests/fs/test_ext.py @@ -38,26 +38,6 @@ def boot_img_and_check_fs_type(emulator, builddir, fs_type): class TestExt2(infra.basetest.BRTest): - config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ - """ - BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_2r0=y - BR2_TARGET_ROOTFS_EXT2_LABEL="foobaz" - BR2_TARGET_ROOTFS_EXT2_SIZE="16384" - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - out = dumpe2fs_run(self.builddir, "rootfs.ext2") - self.assertEqual(dumpe2fs_getprop(out, VOLNAME_PROP), "foobaz") - self.assertEqual(dumpe2fs_getprop(out, REVISION_PROP), "0 (original)") - - exit_code = boot_img_and_check_fs_type(self.emulator, - self.builddir, "ext2") - self.assertEqual(exit_code, 0) - - -class TestExt2r1(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ BR2_TARGET_ROOTFS_EXT2=y diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py index 6f8ca06de3..1b86bfbfc1 100644 --- a/support/testing/tests/fs/test_iso9660.py +++ b/support/testing/tests/fs/test_iso9660.py @@ -4,16 +4,9 @@ import infra.basetest BASIC_CONFIG = \ """ - BR2_x86_pentium4=y + BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y - BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y - BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2017.05-1078-g95b1dae.tar.bz2" - BR2_TOOLCHAIN_EXTERNAL_GCC_6=y - BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2=y - BR2_TOOLCHAIN_EXTERNAL_LOCALE=y - # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set - BR2_TOOLCHAIN_EXTERNAL_CXX=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_LINUX_KERNEL=y @@ -135,28 +128,6 @@ class TestIso9660Grub2EFI(infra.basetest.BRTest): """.format(infra.filepath("conf/grub2-efi.cfg"), infra.filepath("conf/grub2.cfg")) - def __init__(self, names): - """Setup common test variables.""" - super(TestIso9660Grub2EFI, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestIso9660Grub2EFI. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): exit_code = test_mount_internal_external(self.emulator, self.builddir, internal=True, @@ -185,28 +156,6 @@ class TestIso9660Grub2Hybrid(infra.basetest.BRTest): """.format(infra.filepath("conf/grub2-efi.cfg"), infra.filepath("conf/grub2.cfg")) - def __init__(self, names): - """Setup common test variables.""" - super(TestIso9660Grub2Hybrid, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestIso9660Grub2Hybrid. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): exit_code = test_mount_internal_external(self.emulator, self.builddir, internal=True, diff --git a/support/testing/tests/init/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/init/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..847876352b Binary files /dev/null and b/support/testing/tests/init/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/init/__pycache__/base.cpython-312.pyc b/support/testing/tests/init/__pycache__/base.cpython-312.pyc new file mode 100644 index 0000000000..7cdedf5594 Binary files /dev/null and b/support/testing/tests/init/__pycache__/base.cpython-312.pyc differ diff --git a/support/testing/tests/init/__pycache__/test_busybox.cpython-312.pyc b/support/testing/tests/init/__pycache__/test_busybox.cpython-312.pyc new file mode 100644 index 0000000000..0ac8358ce9 Binary files /dev/null and b/support/testing/tests/init/__pycache__/test_busybox.cpython-312.pyc differ diff --git a/support/testing/tests/init/__pycache__/test_none.cpython-312.pyc b/support/testing/tests/init/__pycache__/test_none.cpython-312.pyc new file mode 100644 index 0000000000..31c1429f46 Binary files /dev/null and b/support/testing/tests/init/__pycache__/test_none.cpython-312.pyc differ diff --git a/support/testing/tests/init/__pycache__/test_openrc.cpython-312.pyc b/support/testing/tests/init/__pycache__/test_openrc.cpython-312.pyc new file mode 100644 index 0000000000..427d13f86a Binary files /dev/null and b/support/testing/tests/init/__pycache__/test_openrc.cpython-312.pyc differ diff --git a/support/testing/tests/init/__pycache__/test_systemd.cpython-312.pyc b/support/testing/tests/init/__pycache__/test_systemd.cpython-312.pyc new file mode 100644 index 0000000000..1539f71c01 Binary files /dev/null and b/support/testing/tests/init/__pycache__/test_systemd.cpython-312.pyc differ diff --git a/support/testing/tests/init/__pycache__/test_systemd_selinux.cpython-312.pyc b/support/testing/tests/init/__pycache__/test_systemd_selinux.cpython-312.pyc new file mode 100644 index 0000000000..903dc57ac7 Binary files /dev/null and b/support/testing/tests/init/__pycache__/test_systemd_selinux.cpython-312.pyc differ diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 05a65223b3..7fdd5d1798 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -31,6 +31,25 @@ class InitSystemSystemdBase(InitSystemBase): self.start_emulator(fs) self.check_init("/lib/systemd/systemd") + # Test there is no tainted flag. + output, ret = self.emulator.run("systemctl --no-pager status") + self.assertEqual(ret, 0, f"'systemctl status' failed with exit code {ret}, with:\n{output}") + try: + # 'support-ended' tainted flag is only set based on the + # SUPPORT_END variable in /etc/os-release; as we don't set + # it in Buildroot, we can't get that flag in the runtime + # tests, even on our maintenance branches, so we don't need + # to filter it out. + tainted_flags = [ + "".join(line.split(":")[1:]).strip() + for line in output + if line.strip().startswith("Tainted: ") + ][0] + raise RuntimeError(f"Tainted flags: {tainted_flags}") + except IndexError: + # No tainted flag \o/ + pass + # Test all units are OK output, _ = self.emulator.run("systemctl --no-pager --failed --no-legend") self.assertEqual(len(output), 0) diff --git a/support/testing/tests/init/test_systemd_selinux.py b/support/testing/tests/init/test_systemd_selinux.py index e9bb3405cd..398cfbaa82 100644 --- a/support/testing/tests/init/test_systemd_selinux.py +++ b/support/testing/tests/init/test_systemd_selinux.py @@ -12,7 +12,7 @@ class TestSELinuxSystemd(infra.basetest.BRTest): BR2_INIT_SYSTEMD=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.148" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/support/testing/tests/package/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/package/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..5b1933bb1d Binary files /dev/null and b/support/testing/tests/package/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_4th.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_4th.cpython-312.pyc new file mode 100644 index 0000000000..cde3d24826 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_4th.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_acl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_acl.cpython-312.pyc new file mode 100644 index 0000000000..b820caab33 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_acl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_acpica.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_acpica.cpython-312.pyc new file mode 100644 index 0000000000..aeef0e2e35 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_acpica.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_apache.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_apache.cpython-312.pyc new file mode 100644 index 0000000000..f764fa235f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_apache.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_atftp.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_atftp.cpython-312.pyc new file mode 100644 index 0000000000..1c7879a245 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_atftp.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_atop.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_atop.cpython-312.pyc new file mode 100644 index 0000000000..965e60ad9a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_atop.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_attr.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_attr.cpython-312.pyc new file mode 100644 index 0000000000..ea65760659 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_attr.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_audio_codec_base.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_audio_codec_base.cpython-312.pyc new file mode 100644 index 0000000000..deec09f27a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_audio_codec_base.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_audit.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_audit.cpython-312.pyc new file mode 100644 index 0000000000..6900dcb161 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_audit.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_avocado.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_avocado.cpython-312.pyc new file mode 100644 index 0000000000..480fc1162f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_avocado.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bash.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bash.cpython-312.pyc new file mode 100644 index 0000000000..bcc7e26626 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bash.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bats.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bats.cpython-312.pyc new file mode 100644 index 0000000000..21dd4fd812 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bats.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bc.cpython-312.pyc new file mode 100644 index 0000000000..fc634e6686 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bcc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bcc.cpython-312.pyc new file mode 100644 index 0000000000..cbe4a2cacc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bcc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bitcoin.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bitcoin.cpython-312.pyc new file mode 100644 index 0000000000..e9f50d7bdd Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bitcoin.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bmap_tools.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bmap_tools.cpython-312.pyc new file mode 100644 index 0000000000..4f9e0c9fe7 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bmap_tools.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_brotli.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_brotli.cpython-312.pyc new file mode 100644 index 0000000000..14f6d0c92e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_brotli.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_btrfs_progs.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_btrfs_progs.cpython-312.pyc new file mode 100644 index 0000000000..127cae396e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_btrfs_progs.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_bzip2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_bzip2.cpython-312.pyc new file mode 100644 index 0000000000..0837342e33 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_bzip2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_clang.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_clang.cpython-312.pyc new file mode 100644 index 0000000000..f0147adc42 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_clang.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_compressor_base.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_compressor_base.cpython-312.pyc new file mode 100644 index 0000000000..d9fdf95370 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_compressor_base.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_coremark.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_coremark.cpython-312.pyc new file mode 100644 index 0000000000..1132b4162a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_coremark.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_crudini.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_crudini.cpython-312.pyc new file mode 100644 index 0000000000..eeb757f431 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_crudini.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_cryptsetup.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_cryptsetup.cpython-312.pyc new file mode 100644 index 0000000000..eb5fbcef25 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_cryptsetup.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ddrescue.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ddrescue.cpython-312.pyc new file mode 100644 index 0000000000..4099dc1175 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ddrescue.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_dmidecode.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_dmidecode.cpython-312.pyc new file mode 100644 index 0000000000..f5fc8b7521 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_dmidecode.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_docker_compose.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_docker_compose.cpython-312.pyc new file mode 100644 index 0000000000..c93fd1fda3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_docker_compose.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_dos2unix.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_dos2unix.cpython-312.pyc new file mode 100644 index 0000000000..0d52c73ad4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_dos2unix.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_dosfstools.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_dosfstools.cpython-312.pyc new file mode 100644 index 0000000000..df1d48b9d8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_dosfstools.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_dropbear.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_dropbear.cpython-312.pyc new file mode 100644 index 0000000000..c2d0f11ba7 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_dropbear.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_dtbocfg.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_dtbocfg.cpython-312.pyc new file mode 100644 index 0000000000..9d1a32ed6f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_dtbocfg.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_dtc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_dtc.cpython-312.pyc new file mode 100644 index 0000000000..634047a550 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_dtc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ed.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ed.cpython-312.pyc new file mode 100644 index 0000000000..b72380f949 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ed.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ethtool.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ethtool.cpython-312.pyc new file mode 100644 index 0000000000..ad80849bfe Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ethtool.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_execline.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_execline.cpython-312.pyc new file mode 100644 index 0000000000..7670fb193d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_execline.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_exfatprogs.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_exfatprogs.cpython-312.pyc new file mode 100644 index 0000000000..bc2d88a38d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_exfatprogs.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_file.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_file.cpython-312.pyc new file mode 100644 index 0000000000..329e706422 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_file.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_firewalld.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_firewalld.cpython-312.pyc new file mode 100644 index 0000000000..0466a72324 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_firewalld.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_fluidsynth.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_fluidsynth.cpython-312.pyc new file mode 100644 index 0000000000..bfba448810 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_fluidsynth.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_flutter.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_flutter.cpython-312.pyc new file mode 100644 index 0000000000..592daeafc5 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_flutter.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_fping.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_fping.cpython-312.pyc new file mode 100644 index 0000000000..944e3aa3c3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_fping.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_fwts.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_fwts.cpython-312.pyc new file mode 100644 index 0000000000..57b3ae22d8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_fwts.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gawk.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gawk.cpython-312.pyc new file mode 100644 index 0000000000..8693af9e90 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gawk.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gdb.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gdb.cpython-312.pyc new file mode 100644 index 0000000000..7a53a57fc2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gdb.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ghostscript.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ghostscript.cpython-312.pyc new file mode 100644 index 0000000000..858468070a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ghostscript.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_glslsandbox_player.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_glslsandbox_player.cpython-312.pyc new file mode 100644 index 0000000000..ff73cdbdd3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_glslsandbox_player.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_glxinfo.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_glxinfo.cpython-312.pyc new file mode 100644 index 0000000000..c74bea821a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_glxinfo.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gnupg2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gnupg2.cpython-312.pyc new file mode 100644 index 0000000000..d57c40fe43 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gnupg2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gnuplot.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gnuplot.cpython-312.pyc new file mode 100644 index 0000000000..2124040b19 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gnuplot.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gnuradio.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gnuradio.cpython-312.pyc new file mode 100644 index 0000000000..c0d934550b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gnuradio.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_go.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_go.cpython-312.pyc new file mode 100644 index 0000000000..484f6e2911 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_go.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gpsd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gpsd.cpython-312.pyc new file mode 100644 index 0000000000..00799b3892 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gpsd.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gst1_python.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gst1_python.cpython-312.pyc new file mode 100644 index 0000000000..5c5684a45b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gst1_python.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_gzip.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_gzip.cpython-312.pyc new file mode 100644 index 0000000000..b66893fa05 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_gzip.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_highway.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_highway.cpython-312.pyc new file mode 100644 index 0000000000..2524e058dc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_highway.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_hwloc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_hwloc.cpython-312.pyc new file mode 100644 index 0000000000..d5aa7f6ba6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_hwloc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_iozone.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_iozone.cpython-312.pyc new file mode 100644 index 0000000000..22076ad9ca Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_iozone.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_iperf.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_iperf.cpython-312.pyc new file mode 100644 index 0000000000..5856c9422a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_iperf.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_iperf3.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_iperf3.cpython-312.pyc new file mode 100644 index 0000000000..69a0cb4421 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_iperf3.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_iproute2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_iproute2.cpython-312.pyc new file mode 100644 index 0000000000..1fa4d448f2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_iproute2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_iptables.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_iptables.cpython-312.pyc new file mode 100644 index 0000000000..1273ee83c5 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_iptables.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_iputils.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_iputils.cpython-312.pyc new file mode 100644 index 0000000000..ea720bea6a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_iputils.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ipython.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ipython.cpython-312.pyc new file mode 100644 index 0000000000..97249b5c97 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ipython.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_jailhouse.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_jailhouse.cpython-312.pyc new file mode 100644 index 0000000000..c094d267a6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_jailhouse.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_jq.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_jq.cpython-312.pyc new file mode 100644 index 0000000000..788c442cf6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_jq.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_kexec.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_kexec.cpython-312.pyc new file mode 100644 index 0000000000..4fbd217ccf Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_kexec.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_kmod.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_kmod.cpython-312.pyc new file mode 100644 index 0000000000..6aa7ad2db1 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_kmod.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_kmscube.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_kmscube.cpython-312.pyc new file mode 100644 index 0000000000..fcc3f29aaf Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_kmscube.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lame.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lame.cpython-312.pyc new file mode 100644 index 0000000000..915e68f61d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lame.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_less.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_less.cpython-312.pyc new file mode 100644 index 0000000000..b964f376d1 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_less.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_libcamera.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_libcamera.cpython-312.pyc new file mode 100644 index 0000000000..0e2a050d4a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_libcamera.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_libftdi1.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_libftdi1.cpython-312.pyc new file mode 100644 index 0000000000..89a04349b2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_libftdi1.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_libgpgme.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_libgpgme.cpython-312.pyc new file mode 100644 index 0000000000..c8437ef8a6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_libgpgme.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_libjxl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_libjxl.cpython-312.pyc new file mode 100644 index 0000000000..111a913f0a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_libjxl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_libshdata.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_libshdata.cpython-312.pyc new file mode 100644 index 0000000000..e80da9c3d1 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_libshdata.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_links.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_links.cpython-312.pyc new file mode 100644 index 0000000000..2c1470d56c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_links.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lpeg.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lpeg.cpython-312.pyc new file mode 100644 index 0000000000..8ea1609000 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lpeg.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lrzip.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lrzip.cpython-312.pyc new file mode 100644 index 0000000000..cf553a9734 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lrzip.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lrzsz.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lrzsz.cpython-312.pyc new file mode 100644 index 0000000000..3de719361f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lrzsz.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lsof.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lsof.cpython-312.pyc new file mode 100644 index 0000000000..617164663f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lsof.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lsqlite3.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lsqlite3.cpython-312.pyc new file mode 100644 index 0000000000..b50545720b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lsqlite3.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ltrace.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ltrace.cpython-312.pyc new file mode 100644 index 0000000000..441f680b76 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ltrace.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua.cpython-312.pyc new file mode 100644 index 0000000000..fa825e5d89 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_argon2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_argon2.cpython-312.pyc new file mode 100644 index 0000000000..1c509df038 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_argon2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_augeas.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_augeas.cpython-312.pyc new file mode 100644 index 0000000000..73a4e57c0a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_augeas.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_cffi.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_cffi.cpython-312.pyc new file mode 100644 index 0000000000..952debf958 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_cffi.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_cqueues.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_cqueues.cpython-312.pyc new file mode 100644 index 0000000000..22edf25f79 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_cqueues.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_curl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_curl.cpython-312.pyc new file mode 100644 index 0000000000..1aa8448385 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_curl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_gd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_gd.cpython-312.pyc new file mode 100644 index 0000000000..94b5ac98ae Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_gd.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_http.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_http.cpython-312.pyc new file mode 100644 index 0000000000..625f14a14c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_http.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_inotify.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_inotify.cpython-312.pyc new file mode 100644 index 0000000000..c87742ce8e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_inotify.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_lgdbm.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_lgdbm.cpython-312.pyc new file mode 100644 index 0000000000..75fdc1de0b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_lgdbm.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_lightningmdb.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_lightningmdb.cpython-312.pyc new file mode 100644 index 0000000000..3d06e0e0c7 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_lightningmdb.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_lunix.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_lunix.cpython-312.pyc new file mode 100644 index 0000000000..0c7b4647d4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_lunix.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_lyaml.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_lyaml.cpython-312.pyc new file mode 100644 index 0000000000..2956582922 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_lyaml.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_sdl2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_sdl2.cpython-312.pyc new file mode 100644 index 0000000000..0555ad5973 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_sdl2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_utf8.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_utf8.cpython-312.pyc new file mode 100644 index 0000000000..6e4e3475b8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_utf8.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lua_zlib.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lua_zlib.cpython-312.pyc new file mode 100644 index 0000000000..048bb9626d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lua_zlib.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luaexpat.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luaexpat.cpython-312.pyc new file mode 100644 index 0000000000..ef91c67b9b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luaexpat.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luafilesystem.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luafilesystem.cpython-312.pyc new file mode 100644 index 0000000000..c2976d9643 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luafilesystem.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lualdap.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lualdap.cpython-312.pyc new file mode 100644 index 0000000000..8af077a691 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lualdap.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luaossl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luaossl.cpython-312.pyc new file mode 100644 index 0000000000..283093accd Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luaossl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luaposix.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luaposix.cpython-312.pyc new file mode 100644 index 0000000000..5f24c57bb0 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luaposix.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luasec.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luasec.cpython-312.pyc new file mode 100644 index 0000000000..25909ff344 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luasec.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luasocket.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luasocket.cpython-312.pyc new file mode 100644 index 0000000000..69a3a17923 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luasocket.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luasyslog.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luasyslog.cpython-312.pyc new file mode 100644 index 0000000000..5434a43318 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luasyslog.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_luvi.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_luvi.cpython-312.pyc new file mode 100644 index 0000000000..8638a63e13 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_luvi.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lvm2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lvm2.cpython-312.pyc new file mode 100644 index 0000000000..8da38b462e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lvm2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lxc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lxc.cpython-312.pyc new file mode 100644 index 0000000000..923fc3f717 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lxc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lz4.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lz4.cpython-312.pyc new file mode 100644 index 0000000000..efc086e9a8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lz4.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lzip.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lzip.cpython-312.pyc new file mode 100644 index 0000000000..c30acec442 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lzip.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lzlib.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lzlib.cpython-312.pyc new file mode 100644 index 0000000000..534b605697 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lzlib.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_lzop.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_lzop.cpython-312.pyc new file mode 100644 index 0000000000..253ed586c8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_lzop.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_make.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_make.cpython-312.pyc new file mode 100644 index 0000000000..d2d358aab5 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_make.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mariadb.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mariadb.cpython-312.pyc new file mode 100644 index 0000000000..ce58376496 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mariadb.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mawk.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mawk.cpython-312.pyc new file mode 100644 index 0000000000..6ed8c91df4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mawk.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mdadm.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mdadm.cpython-312.pyc new file mode 100644 index 0000000000..d50eb266d0 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mdadm.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mender.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mender.cpython-312.pyc new file mode 100644 index 0000000000..c222723eba Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mender.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_micropython.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_micropython.cpython-312.pyc new file mode 100644 index 0000000000..1aa4d6561b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_micropython.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mosquitto.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mosquitto.cpython-312.pyc new file mode 100644 index 0000000000..c2211888eb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mosquitto.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_msr_tools.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_msr_tools.cpython-312.pyc new file mode 100644 index 0000000000..a0efe37309 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_msr_tools.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mtd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mtd.cpython-312.pyc new file mode 100644 index 0000000000..cad1aae49a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mtd.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mtools.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mtools.cpython-312.pyc new file mode 100644 index 0000000000..36217d37fe Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mtools.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_mtr.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_mtr.cpython-312.pyc new file mode 100644 index 0000000000..d2d87bc7eb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_mtr.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ncdu.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ncdu.cpython-312.pyc new file mode 100644 index 0000000000..69c037e675 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ncdu.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_netcat.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_netcat.cpython-312.pyc new file mode 100644 index 0000000000..9a8adf709f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_netcat.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_netdata.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_netdata.cpython-312.pyc new file mode 100644 index 0000000000..e919910f15 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_netdata.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_netsnmp.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_netsnmp.cpython-312.pyc new file mode 100644 index 0000000000..1b90e67726 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_netsnmp.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_nftables.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_nftables.cpython-312.pyc new file mode 100644 index 0000000000..d4b6eb821d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_nftables.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ngrep.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ngrep.cpython-312.pyc new file mode 100644 index 0000000000..8cbfde1b77 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ngrep.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_nmap.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_nmap.cpython-312.pyc new file mode 100644 index 0000000000..79125b804a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_nmap.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_nodejs.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_nodejs.cpython-312.pyc new file mode 100644 index 0000000000..713438ac4a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_nodejs.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ntp.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ntp.cpython-312.pyc new file mode 100644 index 0000000000..815a96da48 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ntp.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_nu.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_nu.cpython-312.pyc new file mode 100644 index 0000000000..9dce13f049 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_nu.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_numactl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_numactl.cpython-312.pyc new file mode 100644 index 0000000000..90b1903e68 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_numactl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_oath_toolkit.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_oath_toolkit.cpython-312.pyc new file mode 100644 index 0000000000..f701879bbd Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_oath_toolkit.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_octave.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_octave.cpython-312.pyc new file mode 100644 index 0000000000..a9032a9606 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_octave.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ola.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ola.cpython-312.pyc new file mode 100644 index 0000000000..9c66673628 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ola.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_openblas.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_openblas.cpython-312.pyc new file mode 100644 index 0000000000..bc42493469 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_openblas.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_openjdk.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_openjdk.cpython-312.pyc new file mode 100644 index 0000000000..395c8a7a82 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_openjdk.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_openssh.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_openssh.cpython-312.pyc new file mode 100644 index 0000000000..da2a4f9053 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_openssh.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_opkg.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_opkg.cpython-312.pyc new file mode 100644 index 0000000000..a781ca0f82 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_opkg.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_parted.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_parted.cpython-312.pyc new file mode 100644 index 0000000000..487e33964f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_parted.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_pciutils.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_pciutils.cpython-312.pyc new file mode 100644 index 0000000000..dc6a835466 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_pciutils.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perftest.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perftest.cpython-312.pyc new file mode 100644 index 0000000000..fb6153c215 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perftest.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl.cpython-312.pyc new file mode 100644 index 0000000000..bd7801a8d9 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_class_load.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_class_load.cpython-312.pyc new file mode 100644 index 0000000000..b78f2d818e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_class_load.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_dbd_mysql.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_dbd_mysql.cpython-312.pyc new file mode 100644 index 0000000000..f7f8c1a741 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_dbd_mysql.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_encode_detect.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_encode_detect.cpython-312.pyc new file mode 100644 index 0000000000..b4e31553f3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_encode_detect.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_gdgraph.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_gdgraph.cpython-312.pyc new file mode 100644 index 0000000000..35193d758f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_gdgraph.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_html_parser.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_html_parser.cpython-312.pyc new file mode 100644 index 0000000000..19d9815afc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_html_parser.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_io_socket_multicast.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_io_socket_multicast.cpython-312.pyc new file mode 100644 index 0000000000..ccc0566335 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_io_socket_multicast.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_io_socket_ssl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_io_socket_ssl.cpython-312.pyc new file mode 100644 index 0000000000..04243a80fe Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_io_socket_ssl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_libwww_perl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_libwww_perl.cpython-312.pyc new file mode 100644 index 0000000000..4f03155c61 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_libwww_perl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_lwp_protocol_https.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_lwp_protocol_https.cpython-312.pyc new file mode 100644 index 0000000000..48536972e4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_lwp_protocol_https.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_mail_dkim.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_mail_dkim.cpython-312.pyc new file mode 100644 index 0000000000..c883a86899 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_mail_dkim.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_x10.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_x10.cpython-312.pyc new file mode 100644 index 0000000000..ce2513543d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_x10.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_perl_xml_libxml.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_perl_xml_libxml.cpython-312.pyc new file mode 100644 index 0000000000..296c4aacdc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_perl_xml_libxml.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_php_apcu.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_php_apcu.cpython-312.pyc new file mode 100644 index 0000000000..647f4a9ed3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_php_apcu.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_php_lua.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_php_lua.cpython-312.pyc new file mode 100644 index 0000000000..4c73de324b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_php_lua.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_php_pam.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_php_pam.cpython-312.pyc new file mode 100644 index 0000000000..1157bb58fb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_php_pam.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_php_pecl_dbus.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_php_pecl_dbus.cpython-312.pyc new file mode 100644 index 0000000000..8940351172 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_php_pecl_dbus.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_pigz.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_pigz.cpython-312.pyc new file mode 100644 index 0000000000..e7ca3d3e32 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_pigz.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_pixz.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_pixz.cpython-312.pyc new file mode 100644 index 0000000000..adcd02cb72 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_pixz.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_polkit.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_polkit.cpython-312.pyc new file mode 100644 index 0000000000..91475d8162 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_polkit.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_postgresql.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_postgresql.cpython-312.pyc new file mode 100644 index 0000000000..d33c46f3dd Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_postgresql.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_pppd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_pppd.cpython-312.pyc new file mode 100644 index 0000000000..5eefcacc47 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_pppd.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_prosody.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_prosody.cpython-312.pyc new file mode 100644 index 0000000000..25083798cc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_prosody.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_pv.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_pv.cpython-312.pyc new file mode 100644 index 0000000000..cfc44d068e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_pv.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python.cpython-312.pyc new file mode 100644 index 0000000000..e3f07fabbf Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_aexpect.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_aexpect.cpython-312.pyc new file mode 100644 index 0000000000..97a0866d41 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_aexpect.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_argh.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_argh.cpython-312.pyc new file mode 100644 index 0000000000..9ae4d44de6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_argh.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_asn1crypto.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_asn1crypto.cpython-312.pyc new file mode 100644 index 0000000000..b276be5050 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_asn1crypto.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_attrs.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_attrs.cpython-312.pyc new file mode 100644 index 0000000000..050dc18d6f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_attrs.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_augeas.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_augeas.cpython-312.pyc new file mode 100644 index 0000000000..5118beeef2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_augeas.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_autobahn.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_autobahn.cpython-312.pyc new file mode 100644 index 0000000000..9e1650529b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_autobahn.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_automat.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_automat.cpython-312.pyc new file mode 100644 index 0000000000..499d2eec4a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_automat.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_avro.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_avro.cpython-312.pyc new file mode 100644 index 0000000000..81e5f02540 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_avro.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_bitstring.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_bitstring.cpython-312.pyc new file mode 100644 index 0000000000..378e4dd698 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_bitstring.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_boto3.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_boto3.cpython-312.pyc new file mode 100644 index 0000000000..90a68a1cc0 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_boto3.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_botocore.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_botocore.cpython-312.pyc new file mode 100644 index 0000000000..e887b6dfaf Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_botocore.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_can.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_can.cpython-312.pyc new file mode 100644 index 0000000000..eb9139b992 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_can.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_cbor.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_cbor.cpython-312.pyc new file mode 100644 index 0000000000..eca0c690f6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_cbor.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_click.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_click.cpython-312.pyc new file mode 100644 index 0000000000..5411abcf5c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_click.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_colorzero.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_colorzero.cpython-312.pyc new file mode 100644 index 0000000000..72ac141b50 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_colorzero.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_constantly.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_constantly.cpython-312.pyc new file mode 100644 index 0000000000..f51eca02f8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_constantly.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_construct.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_construct.cpython-312.pyc new file mode 100644 index 0000000000..0128d88a33 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_construct.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_cryptography.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_cryptography.cpython-312.pyc new file mode 100644 index 0000000000..3c45a23fa8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_cryptography.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_dbus_fast.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_dbus_fast.cpython-312.pyc new file mode 100644 index 0000000000..50e94441fa Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_dbus_fast.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_dbus_next.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_dbus_next.cpython-312.pyc new file mode 100644 index 0000000000..b2c1184222 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_dbus_next.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_dicttoxml2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_dicttoxml2.cpython-312.pyc new file mode 100644 index 0000000000..d26dcd1394 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_dicttoxml2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_distro.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_distro.cpython-312.pyc new file mode 100644 index 0000000000..06c88d3cb4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_distro.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_django.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_django.cpython-312.pyc new file mode 100644 index 0000000000..ed566a12c8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_django.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_dtschema.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_dtschema.cpython-312.pyc new file mode 100644 index 0000000000..f5f3174a06 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_dtschema.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_evdev.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_evdev.cpython-312.pyc new file mode 100644 index 0000000000..700c8d5693 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_evdev.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_fastapi.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_fastapi.cpython-312.pyc new file mode 100644 index 0000000000..899bdb8c46 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_fastapi.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_flask.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_flask.cpython-312.pyc new file mode 100644 index 0000000000..751273df0d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_flask.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_flask_expects_json.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_flask_expects_json.cpython-312.pyc new file mode 100644 index 0000000000..551d9fe90c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_flask_expects_json.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_git.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_git.cpython-312.pyc new file mode 100644 index 0000000000..f21d5a3d09 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_git.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_gitdb2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_gitdb2.cpython-312.pyc new file mode 100644 index 0000000000..ab22d228f2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_gitdb2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_gnupg.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_gnupg.cpython-312.pyc new file mode 100644 index 0000000000..cb126c3398 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_gnupg.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_gobject.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_gobject.cpython-312.pyc new file mode 100644 index 0000000000..3e2d2fa578 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_gobject.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_gpiozero.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_gpiozero.cpython-312.pyc new file mode 100644 index 0000000000..23ef296976 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_gpiozero.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_hid.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_hid.cpython-312.pyc new file mode 100644 index 0000000000..ca8ab2e53e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_hid.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_hkdf.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_hkdf.cpython-312.pyc new file mode 100644 index 0000000000..bd58b39ef0 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_hkdf.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_hwdata.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_hwdata.cpython-312.pyc new file mode 100644 index 0000000000..0fc625fa95 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_hwdata.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_incremental.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_incremental.cpython-312.pyc new file mode 100644 index 0000000000..a207531f68 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_incremental.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_iptables.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_iptables.cpython-312.pyc new file mode 100644 index 0000000000..7db9f5393f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_iptables.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_jc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_jc.cpython-312.pyc new file mode 100644 index 0000000000..ea28592728 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_jc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_jmespath.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_jmespath.cpython-312.pyc new file mode 100644 index 0000000000..edd0f097de Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_jmespath.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_magic_wormhole.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_magic_wormhole.cpython-312.pyc new file mode 100644 index 0000000000..35b3012943 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_magic_wormhole.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_mako.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_mako.cpython-312.pyc new file mode 100644 index 0000000000..e2030b76d8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_mako.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_midiutil.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_midiutil.cpython-312.pyc new file mode 100644 index 0000000000..953387dd33 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_midiutil.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_minimalmodbus.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_minimalmodbus.cpython-312.pyc new file mode 100644 index 0000000000..08d7f1c8e1 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_minimalmodbus.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_ml_dtypes.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_ml_dtypes.cpython-312.pyc new file mode 100644 index 0000000000..7725b55f3f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_ml_dtypes.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_mpmath.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_mpmath.cpython-312.pyc new file mode 100644 index 0000000000..d0666e508b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_mpmath.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_msgpack.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_msgpack.cpython-312.pyc new file mode 100644 index 0000000000..ff228badea Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_msgpack.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_munch.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_munch.cpython-312.pyc new file mode 100644 index 0000000000..3039d1d8aa Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_munch.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_paho_mqtt.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_paho_mqtt.cpython-312.pyc new file mode 100644 index 0000000000..aeced112e7 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_paho_mqtt.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_passlib.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_passlib.cpython-312.pyc new file mode 100644 index 0000000000..1947f062d8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_passlib.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pathspec.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pathspec.cpython-312.pyc new file mode 100644 index 0000000000..928e665e30 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pathspec.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pexpect.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pexpect.cpython-312.pyc new file mode 100644 index 0000000000..690d7cac64 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pexpect.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pyalsa.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pyalsa.cpython-312.pyc new file mode 100644 index 0000000000..3626c90e83 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pyalsa.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pybind.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pybind.cpython-312.pyc new file mode 100644 index 0000000000..4deaec2d7c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pybind.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pymupdf.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pymupdf.cpython-312.pyc new file mode 100644 index 0000000000..74ea275fad Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pymupdf.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pynacl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pynacl.cpython-312.pyc new file mode 100644 index 0000000000..f66b3bb9ac Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pynacl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pyndiff.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pyndiff.cpython-312.pyc new file mode 100644 index 0000000000..a5a3e6d4f1 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pyndiff.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pyqt5.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pyqt5.cpython-312.pyc new file mode 100644 index 0000000000..2a8ccfabbf Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pyqt5.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pysmb.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pysmb.cpython-312.pyc new file mode 100644 index 0000000000..2c6a476f60 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pysmb.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pytest.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pytest.cpython-312.pyc new file mode 100644 index 0000000000..7277e72b77 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pytest.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pytest_asyncio.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pytest_asyncio.cpython-312.pyc new file mode 100644 index 0000000000..de54ee0272 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pytest_asyncio.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_pyyaml.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_pyyaml.cpython-312.pyc new file mode 100644 index 0000000000..bcebc11606 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_pyyaml.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_qrcode.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_qrcode.cpython-312.pyc new file mode 100644 index 0000000000..6e410618df Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_qrcode.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_rpi_gpio.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_rpi_gpio.cpython-312.pyc new file mode 100644 index 0000000000..27fa2a5d52 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_rpi_gpio.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_rsa.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_rsa.cpython-312.pyc new file mode 100644 index 0000000000..bfa7118bfd Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_rsa.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_rtoml.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_rtoml.cpython-312.pyc new file mode 100644 index 0000000000..6faeadb3eb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_rtoml.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_ruamel_yaml.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_ruamel_yaml.cpython-312.pyc new file mode 100644 index 0000000000..9bf879f3aa Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_ruamel_yaml.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_s3transfer.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_s3transfer.cpython-312.pyc new file mode 100644 index 0000000000..5f4447e906 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_s3transfer.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_scipy.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_scipy.cpython-312.pyc new file mode 100644 index 0000000000..eff31f01c2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_scipy.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_sdbus.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_sdbus.cpython-312.pyc new file mode 100644 index 0000000000..4fced54230 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_sdbus.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_sdbus_networkmanager.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_sdbus_networkmanager.cpython-312.pyc new file mode 100644 index 0000000000..efd2226ae1 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_sdbus_networkmanager.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_segno.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_segno.cpython-312.pyc new file mode 100644 index 0000000000..da062ce22c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_segno.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_service_identity.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_service_identity.cpython-312.pyc new file mode 100644 index 0000000000..e3ef7614b6 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_service_identity.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_smmap2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_smmap2.cpython-312.pyc new file mode 100644 index 0000000000..f3796d245e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_smmap2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_spake2.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_spake2.cpython-312.pyc new file mode 100644 index 0000000000..18b61dd42a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_spake2.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_sympy.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_sympy.cpython-312.pyc new file mode 100644 index 0000000000..e406d0dfe5 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_sympy.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_tftpy.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_tftpy.cpython-312.pyc new file mode 100644 index 0000000000..3f47004137 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_tftpy.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_treq.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_treq.cpython-312.pyc new file mode 100644 index 0000000000..7b337a6925 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_treq.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_twisted.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_twisted.cpython-312.pyc new file mode 100644 index 0000000000..4d93031980 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_twisted.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_txaio.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_txaio.cpython-312.pyc new file mode 100644 index 0000000000..4c10a87520 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_txaio.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_txtorcon.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_txtorcon.cpython-312.pyc new file mode 100644 index 0000000000..957c5eecdf Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_txtorcon.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_ubjson.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_ubjson.cpython-312.pyc new file mode 100644 index 0000000000..13c2bbd877 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_ubjson.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_unittest_xml_reporting.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_unittest_xml_reporting.cpython-312.pyc new file mode 100644 index 0000000000..09878e2ec3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_unittest_xml_reporting.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_uvloop.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_uvloop.cpython-312.pyc new file mode 100644 index 0000000000..8132b9c3c3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_uvloop.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_python_yamllint.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_python_yamllint.cpython-312.pyc new file mode 100644 index 0000000000..88d6139ac7 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_python_yamllint.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_rdma_core.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_rdma_core.cpython-312.pyc new file mode 100644 index 0000000000..4b6552a6f4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_rdma_core.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_redis.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_redis.cpython-312.pyc new file mode 100644 index 0000000000..d629922f61 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_redis.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_rings.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_rings.cpython-312.pyc new file mode 100644 index 0000000000..9c1d0ee56f Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_rings.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_rrdtool.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_rrdtool.cpython-312.pyc new file mode 100644 index 0000000000..a11e394b00 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_rrdtool.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_rt_tests.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_rt_tests.cpython-312.pyc new file mode 100644 index 0000000000..fdddce7e0d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_rt_tests.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_ruby.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_ruby.cpython-312.pyc new file mode 100644 index 0000000000..88064538eb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_ruby.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_rust.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_rust.cpython-312.pyc new file mode 100644 index 0000000000..65d80bcbb5 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_rust.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_s6.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_s6.cpython-312.pyc new file mode 100644 index 0000000000..d0834ace8d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_s6.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_s6_networking.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_s6_networking.cpython-312.pyc new file mode 100644 index 0000000000..aec93b13a8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_s6_networking.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_s6_portable_utils.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_s6_portable_utils.cpython-312.pyc new file mode 100644 index 0000000000..a62a173e96 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_s6_portable_utils.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_s6_rc.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_s6_rc.cpython-312.pyc new file mode 100644 index 0000000000..fbb943dccb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_s6_rc.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_screen.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_screen.cpython-312.pyc new file mode 100644 index 0000000000..e52e7fd47e Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_screen.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_sed.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_sed.cpython-312.pyc new file mode 100644 index 0000000000..2908de707a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_sed.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_shadow.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_shadow.cpython-312.pyc new file mode 100644 index 0000000000..e0b7e8cd5a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_shadow.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_socat.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_socat.cpython-312.pyc new file mode 100644 index 0000000000..4421d586cb Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_socat.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_sox.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_sox.cpython-312.pyc new file mode 100644 index 0000000000..6fde9dd8f2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_sox.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_sqlite.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_sqlite.cpython-312.pyc new file mode 100644 index 0000000000..0ec691004b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_sqlite.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_strace.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_strace.cpython-312.pyc new file mode 100644 index 0000000000..0a7be0f82b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_strace.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_stress_ng.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_stress_ng.cpython-312.pyc new file mode 100644 index 0000000000..176ee3a2d9 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_stress_ng.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_sudo.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_sudo.cpython-312.pyc new file mode 100644 index 0000000000..100585e53a Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_sudo.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_swipl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_swipl.cpython-312.pyc new file mode 100644 index 0000000000..7bdf368619 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_swipl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_syslog_ng.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_syslog_ng.cpython-312.pyc new file mode 100644 index 0000000000..5a51b333c0 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_syslog_ng.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_tcl.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_tcl.cpython-312.pyc new file mode 100644 index 0000000000..7f08bcdc4b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_tcl.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_tcpdump.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_tcpdump.cpython-312.pyc new file mode 100644 index 0000000000..0cc270b7b4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_tcpdump.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_tesseract_ocr.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_tesseract_ocr.cpython-312.pyc new file mode 100644 index 0000000000..25babf0e8d Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_tesseract_ocr.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_thttpd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_thttpd.cpython-312.pyc new file mode 100644 index 0000000000..a4e2b05d2b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_thttpd.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_tmux.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_tmux.cpython-312.pyc new file mode 100644 index 0000000000..27a7093125 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_tmux.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_trace_cmd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_trace_cmd.cpython-312.pyc new file mode 100644 index 0000000000..62ac3b8a43 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_trace_cmd.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_turbolua.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_turbolua.cpython-312.pyc new file mode 100644 index 0000000000..664fbfa4f4 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_turbolua.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_uboot_openssl_pkgconfig.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_uboot_openssl_pkgconfig.cpython-312.pyc new file mode 100644 index 0000000000..fe1f513818 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_uboot_openssl_pkgconfig.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_unbound.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_unbound.cpython-312.pyc new file mode 100644 index 0000000000..00d9f48dbc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_unbound.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_usbutils.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_usbutils.cpython-312.pyc new file mode 100644 index 0000000000..a0842a3751 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_usbutils.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_vorbis_tools.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_vorbis_tools.cpython-312.pyc new file mode 100644 index 0000000000..3d1bf1782b Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_vorbis_tools.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_weston.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_weston.cpython-312.pyc new file mode 100644 index 0000000000..28a7eaa5f3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_weston.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_which.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_which.cpython-312.pyc new file mode 100644 index 0000000000..693fe48102 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_which.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_wine.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_wine.cpython-312.pyc new file mode 100644 index 0000000000..aeb92ea02c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_wine.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_xfsprogs.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_xfsprogs.cpython-312.pyc new file mode 100644 index 0000000000..030c8228e2 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_xfsprogs.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_xz.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_xz.cpython-312.pyc new file mode 100644 index 0000000000..be4964abd9 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_xz.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_z3.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_z3.cpython-312.pyc new file mode 100644 index 0000000000..b42d5359d3 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_z3.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_zbar.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_zbar.cpython-312.pyc new file mode 100644 index 0000000000..4053d17dbc Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_zbar.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_zchunk.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_zchunk.cpython-312.pyc new file mode 100644 index 0000000000..dae7462918 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_zchunk.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_zerofree.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_zerofree.cpython-312.pyc new file mode 100644 index 0000000000..7000ca05e8 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_zerofree.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_zfs.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_zfs.cpython-312.pyc new file mode 100644 index 0000000000..ffa84f0b2c Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_zfs.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_zip.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_zip.cpython-312.pyc new file mode 100644 index 0000000000..f83d7e5e76 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_zip.cpython-312.pyc differ diff --git a/support/testing/tests/package/__pycache__/test_zstd.cpython-312.pyc b/support/testing/tests/package/__pycache__/test_zstd.cpython-312.pyc new file mode 100644 index 0000000000..9eacc7d405 Binary files /dev/null and b/support/testing/tests/package/__pycache__/test_zstd.cpython-312.pyc differ diff --git a/support/testing/tests/package/br2-external/gumbo-parser/Config.in b/support/testing/tests/package/br2-external/gumbo-parser/Config.in new file mode 100644 index 0000000000..28a97c1dfe --- /dev/null +++ b/support/testing/tests/package/br2-external/gumbo-parser/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_GUMBO_PARSER_PATH/package/gumbo-parser-test/Config.in" diff --git a/support/testing/tests/package/br2-external/gumbo-parser/external.desc b/support/testing/tests/package/br2-external/gumbo-parser/external.desc new file mode 100644 index 0000000000..4bda9627e9 --- /dev/null +++ b/support/testing/tests/package/br2-external/gumbo-parser/external.desc @@ -0,0 +1 @@ +name: GUMBO_PARSER diff --git a/support/testing/tests/package/br2-external/gumbo-parser/external.mk b/support/testing/tests/package/br2-external/gumbo-parser/external.mk new file mode 100644 index 0000000000..bdc8b2fc79 --- /dev/null +++ b/support/testing/tests/package/br2-external/gumbo-parser/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_GUMBO_PARSER_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/Config.in b/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/Config.in new file mode 100644 index 0000000000..714d3e0198 --- /dev/null +++ b/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_GUMBO_PARSER_TEST + bool "gumbo-parser-test" + depends on BR2_PACKAGE_GUMBO_PARSER + help + Test program for gumbo-parser library. + This package builds a simple test program that demonstrates + basic HTML parsing functionality using gumbo-parser. diff --git a/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/gumbo-parser-test.mk b/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/gumbo-parser-test.mk new file mode 100644 index 0000000000..111f1977bf --- /dev/null +++ b/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/gumbo-parser-test.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# gumbo-parser-test +# +################################################################################ + +GUMBO_PARSER_TEST_DEPENDENCIES = gumbo-parser + +define GUMBO_PARSER_TEST_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/gumbo_test \ + $(GUMBO_PARSER_TEST_PKGDIR)/gumbo_test.c \ + $(TARGET_LDFLAGS) -lgumbo +endef + +define GUMBO_PARSER_TEST_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/gumbo_test $(TARGET_DIR)/usr/bin/gumbo_test +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/gumbo_test.c b/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/gumbo_test.c new file mode 100644 index 0000000000..f9c9ca4a91 --- /dev/null +++ b/support/testing/tests/package/br2-external/gumbo-parser/package/gumbo-parser-test/gumbo_test.c @@ -0,0 +1,40 @@ +#include +#include +#include +#include + +static void search_for_title(GumboNode* node) { + if (node->type != GUMBO_NODE_ELEMENT) { + return; + } + + if (node->v.element.tag == GUMBO_TAG_TITLE) { + GumboNode* text = node->v.element.children.data[0]; + if (text->type == GUMBO_NODE_TEXT) { + printf("Found title: %s\n", text->v.text.text); + } + return; + } + + GumboVector* children = &node->v.element.children; + for (unsigned int i = 0; i < children->length; ++i) { + search_for_title(children->data[i]); + } +} + +int main() { + const char* html = "Test HTML

    Hello World

    "; + + GumboOutput* output = gumbo_parse(html); + + if (output == NULL) { + printf("HTML parsing failed\n"); + return 1; + } + + printf("HTML parsing successful\n"); + search_for_title(output->root); + + gumbo_destroy_output(&kGumboDefaultOptions, output); + return 0; +} diff --git a/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c b/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c index ed87e345af..9e926a27d9 100644 --- a/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c +++ b/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c @@ -29,8 +29,10 @@ void execute_function(void(*function)(void*), void* context) } void set_time_in_seconds(int seconds) { - time_t timeToSet = seconds; - stime(&timeToSet); + struct timespec timeToSet = { 0, 0 }; + + timeToSet.tv_sec = seconds; + clock_settime(CLOCK_REALTIME, &timeToSet); } void write_internal_time_in_seconds() { diff --git a/support/testing/tests/package/sample_python_apscheduler.py b/support/testing/tests/package/sample_python_apscheduler.py new file mode 100644 index 0000000000..befe424c28 --- /dev/null +++ b/support/testing/tests/package/sample_python_apscheduler.py @@ -0,0 +1,15 @@ +from queue import Queue +from apscheduler.schedulers.background import BackgroundScheduler + +queue = Queue() + + +def work(): + queue.put("Ping!") + + +scheduler = BackgroundScheduler() +scheduler.add_job(work, "interval", seconds=1) +scheduler.start() +result = queue.get(timeout=3) +assert result == "Ping!" diff --git a/support/testing/tests/package/sample_python_attrs.py b/support/testing/tests/package/sample_python_attrs.py index f224944914..8199cc666b 100644 --- a/support/testing/tests/package/sample_python_attrs.py +++ b/support/testing/tests/package/sample_python_attrs.py @@ -8,8 +8,8 @@ class Obj(object): obj1 = Obj(2) -assert(obj1.x == 2) -assert(obj1.y == 1) +assert obj1.x == 2 +assert obj1.y == 1 obj2 = Obj(3, 4) -assert(obj2.x == 3) -assert(obj2.y == 4) +assert obj2.x == 3 +assert obj2.y == 4 diff --git a/support/testing/tests/package/sample_python_colorzero.py b/support/testing/tests/package/sample_python_colorzero.py index 23862a816d..8d4daa560d 100644 --- a/support/testing/tests/package/sample_python_colorzero.py +++ b/support/testing/tests/package/sample_python_colorzero.py @@ -3,6 +3,6 @@ from colorzero import Color red = Color('red') green = Color('lime') blue = Color('blue') -assert(red.rgb == (1.0, 0.0, 0.0)) -assert(green.rgb == (0.0, 1.0, 0.0)) -assert(blue.rgb == (0.0, 0.0, 1.0)) +assert red.rgb == (1.0, 0.0, 0.0) +assert green.rgb == (0.0, 1.0, 0.0) +assert blue.rgb == (0.0, 0.0, 1.0) diff --git a/support/testing/tests/package/sample_python_constantly.py b/support/testing/tests/package/sample_python_constantly.py index 570cf85b23..b826dd4b71 100644 --- a/support/testing/tests/package/sample_python_constantly.py +++ b/support/testing/tests/package/sample_python_constantly.py @@ -14,6 +14,6 @@ class RESULT(Values): print(list(RESULT.iterconstants())) -assert(RESULT.OK < RESULT.FAIL) -assert(RESULT.OK.value > RESULT.FAIL.value) -assert(RESULT.get(-5) == RESULT.FAIL) +assert RESULT.OK < RESULT.FAIL +assert RESULT.OK.value > RESULT.FAIL.value +assert RESULT.get(-5) == RESULT.FAIL diff --git a/support/testing/tests/package/sample_python_crc.py b/support/testing/tests/package/sample_python_crc.py new file mode 100644 index 0000000000..0090df11f2 --- /dev/null +++ b/support/testing/tests/package/sample_python_crc.py @@ -0,0 +1,7 @@ +from crc import Calculator, Crc8 + +expected = 0xBC +data = bytes([0, 1, 2, 3, 4, 5]) +calculator = Calculator(Crc8.CCITT) + +assert expected == calculator.checksum(data) diff --git a/support/testing/tests/package/sample_python_gpiozero.py b/support/testing/tests/package/sample_python_gpiozero.py index b95df07fe7..e20a9c8d34 100644 --- a/support/testing/tests/package/sample_python_gpiozero.py +++ b/support/testing/tests/package/sample_python_gpiozero.py @@ -2,4 +2,4 @@ from gpiozero import pi_info piBoardInfo = pi_info('a020d3') # 3B+ -assert(piBoardInfo.model == '3B+') +assert piBoardInfo.model == '3B+' diff --git a/support/testing/tests/package/sample_python_networkmanager_goi.py b/support/testing/tests/package/sample_python_networkmanager_goi.py new file mode 100644 index 0000000000..240e8437fd --- /dev/null +++ b/support/testing/tests/package/sample_python_networkmanager_goi.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 + +# This script is from https://networkmanager.dev/docs/developers/ + +import gi +gi.require_version("NM", "1.0") +from gi.repository import NM # noqa: E402 + + +def print_values(setting, key, value, flags, data): + print(" {}.{}: {}".format(setting.get_name(), key, value)) + + +# Create the client object. This automatically loads all the D-Bus +# tree and creates in-memory objects for connections, devices, access +# points, etc. +client = NM.Client.new(None) + +# Obtain a list of connection profiles ... +connections = client.get_connections() + +# ... and print their properties +for c in connections: + print("{}:".format(c.get_id())) + c.for_each_setting_value(print_values, None) + print("\n") diff --git a/support/testing/tests/package/sample_python_passlib.py b/support/testing/tests/package/sample_python_passlib.py index 3ab348b9e4..80afbf18d0 100644 --- a/support/testing/tests/package/sample_python_passlib.py +++ b/support/testing/tests/package/sample_python_passlib.py @@ -1,5 +1,5 @@ from passlib.hash import pbkdf2_sha256 hash = pbkdf2_sha256.hash("password") -assert(pbkdf2_sha256.verify("passWord", hash) is False) -assert(pbkdf2_sha256.verify("password", hash) is True) +assert pbkdf2_sha256.verify("passWord", hash) is False +assert pbkdf2_sha256.verify("password", hash) is True diff --git a/support/testing/tests/package/sample_python_pydantic.py b/support/testing/tests/package/sample_python_pydantic.py new file mode 100644 index 0000000000..1c6e949211 --- /dev/null +++ b/support/testing/tests/package/sample_python_pydantic.py @@ -0,0 +1,37 @@ +from datetime import datetime + +from pydantic import BaseModel, PositiveInt +from pydantic.version import check_pydantic_core_version + +# pydantic pins an exact version of pydantic core +# verify these are in sync in buildroots packaging +assert check_pydantic_core_version() + + +class User(BaseModel): + id: int + name: str = "John Doe" + signup_ts: datetime | None + tastes: dict[str, PositiveInt] + + +external_data = { + "id": 123, + "signup_ts": "2019-06-01 12:22", + "tastes": { + "wine": 9, + b"cheese": 7, + "cabbage": "1", + }, +} + +user = User(**external_data) +expected_user_dump = { + "id": 123, + "name": "John Doe", + "signup_ts": datetime(2019, 6, 1, 12, 22), + "tastes": {"wine": 9, "cheese": 7, "cabbage": 1}, +} + +assert user.id == 123 +assert user.model_dump() == expected_user_dump diff --git a/support/testing/tests/package/sample_python_pydantic_settings.py b/support/testing/tests/package/sample_python_pydantic_settings.py new file mode 100644 index 0000000000..c98d1ce9c1 --- /dev/null +++ b/support/testing/tests/package/sample_python_pydantic_settings.py @@ -0,0 +1,8 @@ +from pydantic_settings import BaseSettings + + +class Settings(BaseSettings): + api_key: str + + +assert Settings().api_key == "ABCD1234" diff --git a/support/testing/tests/package/sample_python_pyproj.py b/support/testing/tests/package/sample_python_pyproj.py new file mode 100644 index 0000000000..f814f8d2df --- /dev/null +++ b/support/testing/tests/package/sample_python_pyproj.py @@ -0,0 +1,5 @@ +from pyproj import CRS + +# WGS 84 - World Geodetic System 1984, used in GPS +crs_4326 = CRS.from_epsg(4326) +assert crs_4326.name == "WGS 84" diff --git a/support/testing/tests/package/sample_python_pyroute2.py b/support/testing/tests/package/sample_python_pyroute2.py new file mode 100644 index 0000000000..50d0d486bf --- /dev/null +++ b/support/testing/tests/package/sample_python_pyroute2.py @@ -0,0 +1,16 @@ +from pyroute2 import IPRoute + + +def test_ipr(): + with IPRoute() as ipr: + lo = ipr.link('get', ifname='lo')[0] + a = [ + dict(a['attrs'])['IFA_ADDRESS'] + for a in ipr.get_addr(index=lo['index']) + ] + print(repr(a)) + assert '127.0.0.1' in a + + +if __name__ == '__main__': + test_ipr() diff --git a/support/testing/tests/package/sample_python_rpi_gpio.py b/support/testing/tests/package/sample_python_rpi_gpio.py index 5f0d884e07..e0bd96f631 100644 --- a/support/testing/tests/package/sample_python_rpi_gpio.py +++ b/support/testing/tests/package/sample_python_rpi_gpio.py @@ -1,6 +1,6 @@ try: import RPi.GPIO # noqa except RuntimeError as e: - assert(str(e) == 'This module can only be run on a Raspberry Pi!') + assert str(e) == 'This module can only be run on a Raspberry Pi!' else: raise RuntimeError('Import succeeded when it should not have!') diff --git a/support/testing/tests/package/sample_python_scp.py b/support/testing/tests/package/sample_python_scp.py new file mode 100644 index 0000000000..5df3ae24d8 --- /dev/null +++ b/support/testing/tests/package/sample_python_scp.py @@ -0,0 +1,15 @@ +import filecmp + +from paramiko import SSHClient +from paramiko.client import AutoAddPolicy + +from scp import SCPClient + +ssh_client = SSHClient() +ssh_client.load_system_host_keys() +ssh_client.set_missing_host_key_policy(AutoAddPolicy) +ssh_client.connect('127.0.0.1', username='root') +scp_client = SCPClient(ssh_client.get_transport()) +scp_client.get("/etc/hostname", "/tmp/hostname") + +assert filecmp.cmp("/etc/hostname", "/tmp/hostname") diff --git a/support/testing/tests/package/sample_python_sdbus_modemmanager.py b/support/testing/tests/package/sample_python_sdbus_modemmanager.py new file mode 100644 index 0000000000..f238a4dab9 --- /dev/null +++ b/support/testing/tests/package/sample_python_sdbus_modemmanager.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 + +import sdbus + +from sdbus_block.modemmanager import MM + +sdbus.set_default_bus(sdbus.sd_bus_open_system()) +mm = MM() + +assert mm.version is not None diff --git a/support/testing/tests/package/sample_python_tzlocal.py b/support/testing/tests/package/sample_python_tzlocal.py new file mode 100644 index 0000000000..a02818bf9e --- /dev/null +++ b/support/testing/tests/package/sample_python_tzlocal.py @@ -0,0 +1,5 @@ +from tzlocal import get_localzone +from zoneinfo import ZoneInfo + +tz = get_localzone() +assert tz == ZoneInfo(key='Europe/Berlin') diff --git a/support/testing/tests/package/sample_python_urllib3.py b/support/testing/tests/package/sample_python_urllib3.py new file mode 100644 index 0000000000..9e0cf8c17a --- /dev/null +++ b/support/testing/tests/package/sample_python_urllib3.py @@ -0,0 +1,9 @@ +# Check that we can import urllib3 even if we don't use all of it: +import urllib3 + +# Just check that we can create a PoolManager: +http = urllib3.PoolManager() + +# Check if we can normalize URLs: +assert urllib3.util.url.parse_url("HTTPS://Example.Com/?Key=Value").url \ + == "https://example.com/?Key=Value" diff --git a/support/testing/tests/package/test_bat.py b/support/testing/tests/package/test_bat.py new file mode 100644 index 0000000000..018d0e002f --- /dev/null +++ b/support/testing/tests/package/test_bat.py @@ -0,0 +1,27 @@ +import os +import infra.basetest + + +class TestBat(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BAT=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the programs can execute + self.assertRunOk("bat --version") + self.assertRunOk("echo 'hello test' > test.txt") + + # Run bat and capture output + output, exit_code = self.emulator.run("bat test.txt", timeout=10) + self.assertEqual(exit_code, 0) + self.assertIn("hello test", "\n".join(output)) diff --git a/support/testing/tests/package/test_bitcoin.py b/support/testing/tests/package/test_bitcoin.py index 1f00345a12..a942504af4 100644 --- a/support/testing/tests/package/test_bitcoin.py +++ b/support/testing/tests/package/test_bitcoin.py @@ -1,3 +1,4 @@ +import json import os import time @@ -47,19 +48,25 @@ class TestBitcoin(infra.basetest.BRTest): self.create_btc_wallet(wallet_name) return self.gen_btc_address(wallet_name) + def get_wallet_balances(self, wallet): + """Return the balances of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getbalances" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + balances = json.loads("".join(out)) + return balances + def get_wallet_balance(self, wallet): """Return the (confirmed) balance of a wallet.""" - cmd = f"{self.cli_cmd} -rpcwallet={wallet} getbalance" - out, ret = self.emulator.run(cmd) - self.assertEqual(ret, 0) - return float(out[0]) + balances = self.get_wallet_balances(wallet) + balance = balances["mine"]["trusted"] + return balance def get_wallet_unconfirmed_balance(self, wallet): - """Return the unconfirmed balance of a wallet.""" - cmd = f"{self.cli_cmd} -rpcwallet={wallet} getunconfirmedbalance" - out, ret = self.emulator.run(cmd) - self.assertEqual(ret, 0) - return float(out[0]) + """Return the untrusted pending (unconfirmed) balance of a wallet.""" + balances = self.get_wallet_balances(wallet) + untrusted_balance = balances["mine"]["untrusted_pending"] + return untrusted_balance def get_block_count(self): """Returns the height of the most-work fully-validated chain.""" diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py index f36faa059a..a9794a49fa 100644 --- a/support/testing/tests/package/test_clang.py +++ b/support/testing/tests/package/test_clang.py @@ -7,8 +7,10 @@ FUZZ_TIMEOUT = 120 class TestClangCompilerRT(infra.basetest.BRTest): br2_external = [infra.filepath("tests/package/br2-external/clang-compiler-rt")] + # Without this option the test fails due to insufficient address space for 64-bit allocator + va48_fragment = infra.filepath("tests/package/test_clang/linux-arm64-va48.fragment") config = \ - """ + f""" BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -17,6 +19,7 @@ class TestClangCompilerRT(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.283" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{va48_fragment}" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_COMPILER_RT=y BR2_PACKAGE_LLVM=y diff --git a/support/testing/tests/package/test_clang/linux-arm64-va48.fragment b/support/testing/tests/package/test_clang/linux-arm64-va48.fragment new file mode 100644 index 0000000000..1bafe6e581 --- /dev/null +++ b/support/testing/tests/package/test_clang/linux-arm64-va48.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_VA_BITS_48=y diff --git a/support/testing/tests/package/test_dieharder.py b/support/testing/tests/package/test_dieharder.py new file mode 100644 index 0000000000..de09b383b4 --- /dev/null +++ b/support/testing/tests/package/test_dieharder.py @@ -0,0 +1,36 @@ +import os + +import infra.basetest + + +class TestDieharder(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_DIEHARDER=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can run (by showing its version) + self.assertRunOk("dieharder -V") + + # The birthdays randomness test on the mt19937 random number + # generator with 25 sample is expected to always succeed. + cmd = "dieharder -g mt19937 -d diehard_birthdays -t 25" + output, exit_code = self.emulator.run(cmd, timeout=10) + self.assertEqual(exit_code, 0) + self.assertIn("PASSED", '\n'.join(output)) + + # The birthdays randomness test on file /dev/zero is expected + # to always fail. + cmd = "dieharder -g file_input_raw -f /dev/zero -d diehard_birthdays -t 25" + output, exit_code = self.emulator.run(cmd, timeout=40) + self.assertEqual(exit_code, 0) + self.assertIn("FAILED", '\n'.join(output)) diff --git a/support/testing/tests/package/test_distribution_registry.py b/support/testing/tests/package/test_distribution_registry.py new file mode 100644 index 0000000000..65fe6d850e --- /dev/null +++ b/support/testing/tests/package/test_distribution_registry.py @@ -0,0 +1,97 @@ +import infra.basetest +import os +import time + + +class TestDistributionRegistry(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.202" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_DISTRIBUTION_REGISTRY=y + BR2_PACKAGE_SQLITE=y + BR2_PACKAGE_SKOPEO=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + kernel_file = os.path.join(self.builddir, "images", "zImage") + dtb_file = os.path.join(self.builddir, "images", "vexpress-v2p-ca9.dtb") + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot( + arch="armv5", + kernel=kernel_file, + kernel_cmdline=[ + 'console=ttyAMA0', + ], + options=[ + '-M', 'vexpress-a9', + "-m", "1G", + "-nic", "user,model=lan9118", + "-dtb", dtb_file, + "-initrd", cpio_file, + ], + ) + self.emulator.login() + + # Allow unfettered access to the local registry: + registry_conf = "\\n".join( # \\n to be interpreted by printf in the target + [ + '[[registry]]', + 'location = "localhost:5000"', + 'insecure = true', + ], + ) + self.assertRunOk("mkdir /etc/containers/registries.conf.d") + self.assertRunOk( + f"printf '{registry_conf}\\n' >/etc/containers/registries.conf.d/localhost.conf", + ) + + # Check we can at least run + self.assertRunOk("distribution-registry --version", timeout=30) + + # Spawn the registry and wait for it to be ready + self.assertRunOk( + "distribution-registry serve /etc/docker/registry/config.yml >/tmp/registry.log 2>&1 &", + ) + for i in range(60): + time.sleep(1) + _, ret = self.emulator.run("test -s /tmp/registry.log") + if ret == 0: + time.sleep(2) # Wait just a little tiny bit more... + break + else: + raise SystemError("Cannot start the registry") + + # Get a multi-arch image from the Docker hub registry + # Huge timeout because qemu-system-arm has slirp issues + self.assertRunOk( + "skopeo copy -a docker://busybox:1.37.0-glibc oci-archive:busybox-1.37.0-glibc.oci", + timeout=600, + ) + + # Push the multi-arch image to the local registry + self.assertRunOk( + "skopeo copy -a oci-archive:busybox-1.37.0-glibc.oci docker://localhost:5000/busybox:1.37.0-glibc", + timeout=120, + ) + + # Pull the image back + self.assertRunOk( + "skopeo copy -a docker://localhost:5000/busybox:1.37.0-glibc oci-archive:busybox-1.37.0-glibc-2.oci", + timeout=120, + ) diff --git a/support/testing/tests/package/test_dmidecode.py b/support/testing/tests/package/test_dmidecode.py index 33c19f0d96..087075a7bb 100644 --- a/support/testing/tests/package/test_dmidecode.py +++ b/support/testing/tests/package/test_dmidecode.py @@ -14,7 +14,7 @@ class TestDmidecode(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.39" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.102" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 16027c9c3a..a96c9d1481 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -3,7 +3,7 @@ import os import infra.basetest -class TestDockerCompose(infra.basetest.BRTest): +class BaseTestDockerCompose(infra.basetest.BRTest): scripts = ["conf/docker-compose.yml", "tests/package/sample_python_docker.py"] config = \ @@ -17,7 +17,7 @@ class TestDockerCompose(infra.basetest.BRTest): BR2_ROOTFS_POST_SCRIPT_ARGS="{}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.262" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.296" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" BR2_PACKAGE_PYTHON3=y @@ -53,13 +53,13 @@ class TestDockerCompose(infra.basetest.BRTest): def python_docker_test(self): self.assertRunOk('python3 ./sample_python_docker.py', 120) - def test_run(self): + def do_test(self): kernel = os.path.join(self.builddir, "images", "bzImage") rootfs = os.path.join(self.builddir, "images", "rootfs.ext2") self.emulator.boot(arch="x86_64", kernel=kernel, kernel_cmdline=["root=/dev/vda", "console=ttyS0"], - options=["-cpu", "Nehalem", + options=["-cpu", "Haswell", "-m", "512M", "-device", "virtio-rng-pci", "-drive", "file={},format=raw,if=virtio".format(rootfs), @@ -70,3 +70,17 @@ class TestDockerCompose(infra.basetest.BRTest): self.docker_test() self.docker_compose_test() self.python_docker_test() + + +class TestDockerComposeRunc(BaseTestDockerCompose): + def test_run(self): + self.do_test() + + +class TestDockerComposeCrun(BaseTestDockerCompose): + config = BaseTestDockerCompose.config + """ + BR2_PACKAGE_CRUN=y + """ + + def test_run(self): + self.do_test() diff --git a/support/testing/tests/package/test_dpdk.py b/support/testing/tests/package/test_dpdk.py new file mode 100644 index 0000000000..6f55cddee8 --- /dev/null +++ b/support/testing/tests/package/test_dpdk.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + + +class TestDPDK(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_nehalem=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.102" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_DPDK=y + BR2_PACKAGE_DPDK_TESTS=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="300M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.ext2") + kern = os.path.join(self.builddir, "images", "bzImage") + self.emulator.boot(arch="x86_64", + kernel=kern, + kernel_cmdline=["root=/dev/vda", "console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "512M", + "-smp", "4", + "-device", "virtio-rng-pci", + "-drive", f"file={img},format=raw,if=virtio", + "-net", "nic,model=virtio", + "-net", "user"]) + self.emulator.login() + + # We run few DPDK test cases. + dpdk_tests = [ + "crc_autotest", + "threads_autotest", + "lcores_autotest" + ] + cmd = "dpdk-test --no-huge " + " ".join(dpdk_tests) + self.assertRunOk(cmd, timeout=30) diff --git a/support/testing/tests/package/test_dust.py b/support/testing/tests/package/test_dust.py new file mode 100644 index 0000000000..8243024981 --- /dev/null +++ b/support/testing/tests/package/test_dust.py @@ -0,0 +1,32 @@ +import os +import infra.basetest + + +class TestDust(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_DUST=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check that dust is installed and can be executed + self.assertRunOk("dust --version") + + # Create a test directory structure with some files + self.assertRunOk("mkdir -p testdir/subdir") + self.assertRunOk("dd if=/dev/zero of=testdir/a bs=1K count=10") + self.assertRunOk("dd if=/dev/zero of=testdir/subdir/b bs=1K count=5") + + # Run dust on the test directory and capture the output + output, exit_code = self.emulator.run("dust testdir", timeout=10) + self.assertEqual(exit_code, 0) + self.assertIn("testdir", "\n".join(output)) + self.assertIn("subdir", "\n".join(output)) diff --git a/support/testing/tests/package/test_flutter.py b/support/testing/tests/package/test_flutter.py index 08aa497417..19406b7cb1 100644 --- a/support/testing/tests/package/test_flutter.py +++ b/support/testing/tests/package/test_flutter.py @@ -22,7 +22,7 @@ class TestFlutter(infra.basetest.BRTest, GraphicsBase): BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{infra.filepath("tests/package/test_flutter/linux-vkms.fragment")}" BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_FLUTTER_PI=y @@ -48,8 +48,6 @@ class TestFlutter(infra.basetest.BRTest, GraphicsBase): "-cpu", "cortex-a57", "-m", "512M", "-smp", "4", - "-vga", "std", - "-vnc", "none", "-drive", f"file={img},if=virtio,format=raw"]) self.emulator.login() diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py index 6e2b6f50ba..90bf086a58 100644 --- a/support/testing/tests/package/test_fwts.py +++ b/support/testing/tests/package/test_fwts.py @@ -7,6 +7,7 @@ class TestFwts(infra.basetest.BRTest): config = \ """ BR2_aarch64=y + BR2_neoverse_n2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y @@ -26,7 +27,7 @@ class TestFwts(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.12" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_FWTS=y @@ -38,35 +39,13 @@ class TestFwts(infra.basetest.BRTest): BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ - def __init__(self, names): - """Setup common test variables.""" - super(TestFwts, self).__init__(names) - """All EDK2 releases <= edk2-stable202408 can't be fetched from git - anymore due to a missing git submodule as reported by [1]. - - Usually Buildroot fall-back using https://sources.buildroot.net - thanks to BR2_BACKUP_SITE where a backup of the generated archive - is available. But the BRConfigTest remove BR2_BACKUP_SITE default - value while generating the .config used by TestFwts. - - Replace the BR2_BACKUP_SITE override from BRConfigTest in order - to continue testing EDK2 package using the usual backup site. - - To be removed with the next EDK2 version bump using this commit - [2]. - - [1] https://github.com/tianocore/edk2/issues/6398 - [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 - """ - self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") self.emulator.boot(arch="aarch64", options=["-M", "sbsa-ref", - "-cpu", "cortex-a57", + "-cpu", "neoverse-n2", "-m", "512M", "-pflash", flash0, "-pflash", flash1, diff --git a/support/testing/tests/package/test_gdb.py b/support/testing/tests/package/test_gdb.py index 4712162349..324052efdb 100644 --- a/support/testing/tests/package/test_gdb.py +++ b/support/testing/tests/package/test_gdb.py @@ -95,7 +95,7 @@ class TestGdbArc(BaseGdb): config = \ """ BR2_arcle=y - BR2_archs4x_rel31=y + BR2_archs38=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_GDB=y diff --git a/support/testing/tests/package/test_git.py b/support/testing/tests/package/test_git.py new file mode 100644 index 0000000000..878c4c8092 --- /dev/null +++ b/support/testing/tests/package/test_git.py @@ -0,0 +1,57 @@ +import os + +import infra.basetest + + +class TestGit(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GIT=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("git --version") + + # Initialize some git global configuration. + git_cfg = [ + ("user.name", "Build Root"), + ("user.email", "build.root@localhost.localdomain"), + ("color.ui", "false"), + ("init.defaultBranch", "master"), + ("core.pager", "") + ] + for cfg_name, cfg_value in git_cfg: + cmd = f"git config --global {cfg_name} '{cfg_value}'" + self.assertRunOk(cmd) + + # Run a sequence of few git commands. + commands = [ + "mkdir workdir", + "cd workdir", + "git init", + "echo 'Hello World' > file.txt", + "git add file.txt", + "git commit -as -m 'Initial commit'", + "git checkout -b my_branch", + "sed -i 's/World/Buildroot/g' file.txt", + "git status", + "git commit -as -m 'Replace World by Buildroot'", + "git format-patch -M -n -s -o patches master", + "ls -al patches/*.patch", + "git checkout -b another_branch master", + "git am patches/*.patch", + "git diff --exit-code my_branch another_branch", + "git tag -a -m 'Tagged v1.0' v1.0", + "git log" + ] + for cmd in commands: + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_glslsandbox_player.py b/support/testing/tests/package/test_glslsandbox_player.py index 3b0dd60395..f72ac2adce 100644 --- a/support/testing/tests/package/test_glslsandbox_player.py +++ b/support/testing/tests/package/test_glslsandbox_player.py @@ -17,7 +17,7 @@ class TestGlslsandboxPlayer(infra.basetest.BRTest): BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 3ccbdca8d9..f96ee0aaeb 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -19,7 +19,8 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y + BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index 2c44e25cec..59b3fe7d3e 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -17,6 +17,40 @@ class TestGpsd(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set """ + def _test_gpsd_one(self, transport=None): + # Start the "gpsfake" GPS emulator. + cmd = "gpsfake" + cmd += " --slow --cycle 0.1 --quiet" + if transport: + cmd += f" --{transport}" + cmd += " /root/nmea.log &> /dev/null &" + self.assertRunOk(cmd) + + # Wait a bit, to let the gpsfake and gpsd to settle... + time.sleep(3 * self.timeout_multiplier) + + # List the GPS devices. We should see our local UDP test GPS. + out, ret = self.emulator.run("gpsctl") + self.assertEqual(ret, 0) + self.assertIn("NMEA0183", out[0]) + if transport: + self.assertTrue(out[0].startswith(f"{transport}://127.0.0.1")) + else: + self.assertTrue(out[0].startswith("/dev/pts/1 ")) + + # Collect some of our fake GPS data, and check we got the + # coordinates from our test data file. + # Our expected coordinates are: + # https://www.openstreetmap.org/#map=19/43.60439/1.44336 + out, ret = self.emulator.run("gpscsv --header 0 --count 3") + self.assertEqual(ret, 0) + _, gps_lat, gps_long, _ = out[0].split(",") + self.assertAlmostEqual(float(gps_lat), 43.60439) + self.assertAlmostEqual(float(gps_long), 1.44336) + + # Terminate gpsd, wait for it to finish. + self.assertRunOk("kill %1; sleep 1") + def test_run(self): cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv5", @@ -30,27 +64,7 @@ class TestGpsd(infra.basetest.BRTest): # Since gpsd needs a real GPS device, we stop the service. self.assertRunOk("/etc/init.d/S50gpsd stop") - # We start the "gpsfake" GPS emulator instead. - cmd = "gpsfake" - cmd += " --slow --cycle 0.1 --quiet" - cmd += " /root/udp-nmea.log &> /dev/null &" - self.assertRunOk(cmd) - - # Wait a bit, to let the gpsfake and gpsd to settle... - time.sleep(3 * self.timeout_multiplier) - - # List the GPS devices. We should see our local UDP test GPS. - out, ret = self.emulator.run("gpsctl") - self.assertEqual(ret, 0) - self.assertTrue(out[0].startswith("udp://127.0.0.1")) - self.assertIn("NMEA0183", out[0]) - - # Collect some of our fake GPS data, and check we got the - # coordinates from our test data file. - # Our expected coordinates are: - # https://www.openstreetmap.org/#map=19/43.60439/1.44336 - out, ret = self.emulator.run("gpscsv --header 0 --count 3") - self.assertEqual(ret, 0) - _, gps_lat, gps_long, _ = out[0].split(",") - self.assertAlmostEqual(float(gps_lat), 43.60439) - self.assertAlmostEqual(float(gps_long), 1.44336) + # Test various transports for gpsd + self._test_gpsd_one() + self._test_gpsd_one("tcp") + self._test_gpsd_one("udp") diff --git a/support/testing/tests/package/test_gpsd/rootfs-overlay/root/nmea.log b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/nmea.log new file mode 100644 index 0000000000..da9fbf8b78 --- /dev/null +++ b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/nmea.log @@ -0,0 +1,5 @@ +# Name: NMEA 0183 messages for gpsd Buildroot test +# For packet format, see: +# https://gpsd.gitlab.io/gpsd/NMEA.html +$GPGGA,123456.789,4336.2634,N,0126.6016,E,1,04,1.7,143.5,M,,,,*3A +$GPZDA,123456.789,20,07,2024,2,00*64 diff --git a/support/testing/tests/package/test_gst1_python.py b/support/testing/tests/package/test_gst1_python.py index caae3e6b2d..e5fe71b7d9 100644 --- a/support/testing/tests/package/test_gst1_python.py +++ b/support/testing/tests/package/test_gst1_python.py @@ -10,7 +10,8 @@ class TestGst1Python(TestPythonPackageBase): BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_PACKAGE_GSTREAMER1=y BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y BR2_PACKAGE_GST1_PLUGINS_BAD=y diff --git a/support/testing/tests/package/test_gstreamer1.py b/support/testing/tests/package/test_gstreamer1.py new file mode 100644 index 0000000000..82829dab98 --- /dev/null +++ b/support/testing/tests/package/test_gstreamer1.py @@ -0,0 +1,83 @@ +import os + +import infra.basetest + + +class TestGstreamer1(infra.basetest.BRTest): + # This test creates a full, yet simple, Gstreamer pipeline which + # encodes/decodes a video, using only plugins from Base and Good + # packages. It will use Tesseract OCR to validate the final + # output. The DejaVu font package is also installed, in order to + # have few fonts for the Pango plugin. + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_PACKAGE_DEJAVU=y + BR2_PACKAGE_GSTREAMER1=y + BR2_PACKAGE_GST1_PLUGINS_BASE=y + BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG=y + BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y + BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA=y + BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y + BR2_PACKAGE_GST1_PLUGINS_GOOD=y + BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y + BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + video_file = "videotest.ogg" + num_frames = 10 + msg_prefix = "Hello Buildroot:" + + # We check the main program can execute. + self.assertRunOk("gst-launch-1.0 --version") + + # We check we can list installed plugins. + self.assertRunOk("gst-inspect-1.0") + + # We check we can query one of the plugin we requested. + self.assertRunOk("gst-inspect-1.0 theoraenc") + + # We create a Ogg/Theora video file. We use the "videotestsrc" + # with the ball animation which will create a small file. We + # add a time overlay with a message. We encode with the Theora + # codec and store everything in an Ogg container file. + enc_pipeline = \ + f"videotestsrc num-buffers={num_frames} pattern=ball ! " \ + f"timeoverlay text=\"{msg_prefix}\" font-desc=\"Sans, 24\" ! " \ + f"theoraenc ! oggmux ! filesink location={video_file}" + cmd = f"gst-launch-1.0 -v {enc_pipeline}" + self.assertRunOk(cmd, timeout=15) + + # We decode our previous video file and store each frame in a + # PNG image file. + dec_pipeline = \ + f"filesrc location={video_file} ! " \ + "decodebin ! videoconvert ! pngenc ! " \ + "multifilesink index=1 location=frame%02d.png" + cmd = f"gst-launch-1.0 -v {dec_pipeline}" + self.assertRunOk(cmd) + + # We extract the text from our last image. + img_file = f"frame{num_frames}.png" + cmd = f"tesseract {img_file} output" + self.assertRunOk(cmd, timeout=15) + + # We check we have our initial message. + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith(msg_prefix)) diff --git a/support/testing/tests/package/test_gumbo_parser.py b/support/testing/tests/package/test_gumbo_parser.py new file mode 100644 index 0000000000..efa8ec91a7 --- /dev/null +++ b/support/testing/tests/package/test_gumbo_parser.py @@ -0,0 +1,27 @@ +import os + +import infra.basetest + + +class TestGumboParser(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/gumbo-parser")] + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GUMBO_PARSER=y + BR2_PACKAGE_GUMBO_PARSER_TEST=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Run the test program and check output + out, ret = self.emulator.run("/usr/bin/gumbo_test") + self.assertEqual(ret, 0) + self.assertIn("HTML parsing successful", "\n".join(out)) + self.assertIn("Found title: Test HTML", "\n".join(out)) diff --git a/support/testing/tests/package/test_hyperfine.py b/support/testing/tests/package/test_hyperfine.py new file mode 100644 index 0000000000..4db62c7116 --- /dev/null +++ b/support/testing/tests/package/test_hyperfine.py @@ -0,0 +1,25 @@ +import os + +import infra.basetest + + +class TestHyperfine(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HYPERFINE=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("hyperfine --version") + + test_cmd = "sleep 0.1" + cmd = f"hyperfine --style basic --runs 10 '{test_cmd}'" + self.assertRunOk(cmd, timeout=15) diff --git a/support/testing/tests/package/test_iptables.py b/support/testing/tests/package/test_iptables.py index 924a483ddb..6e4db0ac06 100644 --- a/support/testing/tests/package/test_iptables.py +++ b/support/testing/tests/package/test_iptables.py @@ -11,6 +11,7 @@ class TestIptables(infra.basetest.BRTest): """ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_INIT_BUSYBOX=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y @@ -70,9 +71,26 @@ class TestIptables(infra.basetest.BRTest): _, exit_code = self.emulator.run(ping_test_cmd) self.assertNotEqual(exit_code, 0) + # Save the current rules to test the init script later. + self.assertRunOk("/etc/init.d/S35iptables save") + # We delete our only rule #1 in the INPUT chain. self.assertRunOk("iptables --delete INPUT 1") # Since we deleted the rule, the ping test command which was # supposed to fail earlier is now supposed to succeed. self.assertRunOk(ping_test_cmd) + + # Load the rules as saved before. + self.assertRunOk("/etc/init.d/S35iptables start") + + # Ping to 127.0.0.2 is expected to fail again. + _, exit_code = self.emulator.run(ping_test_cmd) + self.assertNotEqual(exit_code, 0) + + # And flush the rules again. + self.assertRunOk("/etc/init.d/S35iptables stop") + + # Since we deleted the rule, the ping test command which was + # supposed to fail earlier is now supposed to succeed. + self.assertRunOk(ping_test_cmd) diff --git a/support/testing/tests/package/test_kmscube.py b/support/testing/tests/package/test_kmscube.py index 0ddeb67939..4a0eb07c32 100644 --- a/support/testing/tests/package/test_kmscube.py +++ b/support/testing/tests/package/test_kmscube.py @@ -18,7 +18,7 @@ class TestKmsCube(infra.basetest.BRTest): BR2_PACKAGE_KMSCUBE=y BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py index 8953021b82..91df427b6f 100644 --- a/support/testing/tests/package/test_libcamera.py +++ b/support/testing/tests/package/test_libcamera.py @@ -64,7 +64,7 @@ class TestLibCamera(infra.basetest.BRTest): cmd = f"cam --camera {cam_idx} --list-controls" out, ret = self.emulator.run(cmd) self.assertEqual(ret, 0) - self.assertIn("Control: Brightness:", "\n".join(out)) + self.assertIn("Control: [inout] libcamera::Brightness:", "\n".join(out)) # List the camera properties and check we have a camera # "Model" property. diff --git a/support/testing/tests/package/test_libcurl.py b/support/testing/tests/package/test_libcurl.py new file mode 100644 index 0000000000..076a5388ca --- /dev/null +++ b/support/testing/tests/package/test_libcurl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibCurl(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIBCURL=y + BR2_PACKAGE_LIBCURL_CURL=y + BR2_PACKAGE_BUSYBOX_HTTPD=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + msg = "Hello Buildroot!" + fname = "file.txt" + url = f"http://localhost/{fname}" + + # We check the program can execute. + self.assertRunOk("curl --version") + + # We create a simple file to serve. + self.assertRunOk(f"echo '{msg}' > /var/www/data/{fname}") + + # We try to download that file, using our local httpd server. + self.assertRunOk(f"curl -o {fname} {url}") + + # We check the downloaded file contains our initial message. + out, ret = self.emulator.run(f"cat {fname}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We download again the file without saving it, but printing + # it on stdout this time. + out, ret = self.emulator.run(f"curl -q {url}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We download one last time, showing the server response. We + # check we can see the OK status. + cmd = f"curl --no-progress-meter --dump-header - -o /dev/null {url}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + out_str = "\n".join(out) + self.assertIn("HTTP/1.1 200 OK", out_str) diff --git a/support/testing/tests/package/test_lighttpd.py b/support/testing/tests/package/test_lighttpd.py new file mode 100644 index 0000000000..54dd68bcda --- /dev/null +++ b/support/testing/tests/package/test_lighttpd.py @@ -0,0 +1,26 @@ +import os + +import infra.basetest + + +class TestLighttpd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LIGHTTPD=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + msg = "Hello Buildroot!" + + self.assertRunOk("lighttpd -v") + self.assertRunOk(f"echo '{msg}' > /var/www/index.html") + self.assertRunOk("wget http://localhost/index.html") + self.assertRunOk(f"grep -F '{msg}' index.html") diff --git a/support/testing/tests/package/test_llama_cpp.py b/support/testing/tests/package/test_llama_cpp.py new file mode 100644 index 0000000000..4462be0a5b --- /dev/null +++ b/support/testing/tests/package/test_llama_cpp.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestLlamaCpp(infra.basetest.BRTest): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_OPENSSL=y + BR2_PACKAGE_LIBCURL=y + BR2_PACKAGE_LIBCURL_CURL=y + BR2_PACKAGE_LLAMA_CPP=y + BR2_PACKAGE_LLAMA_CPP_TOOLS=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="1024M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext2") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot( + arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda", "console=ttyAMA0"], + options=[ + "-M", "virt", + "-cpu", "cortex-a57", + "-smp", "4", + "-m", "2G", + "-drive", f"file={img},if=virtio,format=raw", + "-net", "nic,model=virtio", + "-net", "user" + ] + ) + self.emulator.login() + + def test_run(self): + self.login() + + # Check the program can execute. + self.assertRunOk("llama-cli --version") + + # We define a Hugging Face model to be downloaded. + # We choose a relatively small model, for testing. + hf_model = "ggml-org/gemma-3-270m-it-GGUF" + + # We define a common knowledge question to ask to the model. + prompt = "What is the capital of the United Kingdom?" + + # We define an expected keyword, to be present in the answer. + expected_answer = "london" + + # We set few llama-cli options: + # We don't want an interactive session + llama_opts = "--single-turn" + llama_opts += " --no-display-prompt" + # We set a fixed seed, to reduce variability of the test + llama_opts += " --seed 123456789" + llama_opts += f" --hf-repo {hf_model}" + llama_opts += f" --prompt '{prompt}'" + + # Run the command. We suppress all stderr output logs to get + # only the answer. Remove the redirection for debugging. + cmd = f"llama-cli {llama_opts} 2>/dev/null" + out, ret = self.emulator.run(cmd, timeout=60) + self.assertEqual(ret, 0) + out_str = "\n".join(out).lower() + self.assertIn(expected_answer, out_str) diff --git a/support/testing/tests/package/test_ltp_testsuite.py b/support/testing/tests/package/test_ltp_testsuite.py new file mode 100644 index 0000000000..a85ceb35a6 --- /dev/null +++ b/support/testing/tests/package/test_ltp_testsuite.py @@ -0,0 +1,39 @@ +import os + +import infra.basetest + + +class TestLtpTestsuite(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LTP_TESTSUITE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="600M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv5", + kernel="builtin", + kernel_cmdline=["rootwait", "root=/dev/sda"], + options=["-drive", f"file={drive},if=scsi,format=raw"]) + self.emulator.login() + + # We run a reduced number of tests (read syscall tests) for a + # fast execution. See "runltp --help" for option details. + cmd = "/usr/lib/ltp-testsuite/runltp" + cmd += " -p -q" + cmd += " -s ^read0[0-9]*" + cmd += " -l /tmp/ltp.log" + cmd += " -o /tmp/ltp.output" + cmd += " -C /tmp/ltp.failed" + cmd += " -T /tmp/ltp.tconf" + self.assertRunOk(cmd) + + # We print the LTP run log and check there was zero failure in + # our test selection. + out, ret = self.emulator.run("cat /tmp/ltp.log") + self.assertEqual(ret, 0) + self.assertIn("Total Failures: 0", out) diff --git a/support/testing/tests/package/test_lua_lrexlib_pcre2.py b/support/testing/tests/package/test_lua_lrexlib_pcre2.py new file mode 100644 index 0000000000..07a1a3e03b --- /dev/null +++ b/support/testing/tests/package/test_lua_lrexlib_pcre2.py @@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLrexlibPCRE2(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_LREXLIB_PCRE2=y + """ + + def test_run(self): + self.login() + self.module_test("rex_pcre2") + + +class TestLuajitLrexlibPCRE2(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_LREXLIB_PCRE2=y + """ + + def test_run(self): + self.login() + self.module_test("rex_pcre2") diff --git a/support/testing/tests/package/test_lua_periphery.py b/support/testing/tests/package/test_lua_periphery.py new file mode 100644 index 0000000000..5b93e36e39 --- /dev/null +++ b/support/testing/tests/package/test_lua_periphery.py @@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuaperiphery(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_PERIPHERY=y + """ + + def test_run(self): + self.login() + self.module_test("periphery") + + +class TestLuajitLuaperiphery(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_PERIPHERY=y + """ + + def test_run(self): + self.login() + self.module_test("periphery") diff --git a/support/testing/tests/package/test_luvi.py b/support/testing/tests/package/test_luvi.py index 4b55091762..b9d43fe266 100644 --- a/support/testing/tests/package/test_luvi.py +++ b/support/testing/tests/package/test_luvi.py @@ -11,7 +11,7 @@ class TestLuvi(infra.basetest.BRTest): BR2_PACKAGE_LUAJIT=y BR2_PACKAGE_LUVI=y BR2_PACKAGE_OPENSSL=y - BR2_PACKAGE_PCRE=y + BR2_PACKAGE_PCRE2=y BR2_PACKAGE_ZLIB=y """ diff --git a/support/testing/tests/package/test_lynis.py b/support/testing/tests/package/test_lynis.py new file mode 100644 index 0000000000..bed4023e64 --- /dev/null +++ b/support/testing/tests/package/test_lynis.py @@ -0,0 +1,26 @@ +import os + +import infra.basetest + + +class TestLynis(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_LYNIS=y + """ + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + def test_run(self): + self.login() + self.assertRunOk("which awk") + self.assertRunOk("which stat") + self.assertRunOk("which zgrep") + self.assertRunOk("lynis show version", timeout=90) diff --git a/support/testing/tests/package/test_mender.py b/support/testing/tests/package/test_mender.py index fdf55ed616..0c83c5644e 100644 --- a/support/testing/tests/package/test_mender.py +++ b/support/testing/tests/package/test_mender.py @@ -3,25 +3,26 @@ import os import infra.basetest -class TestMender(infra.basetest.BRTest): +class TestMenderInfra(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ - """ - BR2_PACKAGE_MENDER=y - BR2_TARGET_ROOTFS_CPIO=y - BR2_ROOTFS_OVERLAY="{}" - """.format( - # overlay to add a fake 'fw_printenv', used by Mender - infra.filepath("tests/package/test_mender/rootfs-overlay")) + """ + BR2_PACKAGE_MENDER=y + BR2_PACKAGE_HOST_MENDER_ARTIFACT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_OVERLAY="{}" + """.format( + infra.filepath("tests/package/test_mender/post-build.sh"), + # overlay to add a fake 'fw_printenv', used by Mender + infra.filepath("tests/package/test_mender/rootfs-overlay")) - def test_run(self): + def base_test_run(self): cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", + self.emulator.boot(arch="armv5", kernel="builtin", options=["-initrd", cpio_file]) self.emulator.login() - # Check if the Daemon is running - self.assertRunOk("ls /var/run/mender.pid") + def run_mender_test(self): self.assertRunOk("ps aux | egrep [m]ender") # Check if a simple Mender command is correctly executed @@ -30,3 +31,41 @@ class TestMender(infra.basetest.BRTest): cmd = "mender show-artifact 2>&1 | grep -i 'err'" # Check if no 'error' among the traces _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 1) + + +class TestMenderRW(TestMenderInfra): + def test_run(self): + TestMenderInfra.base_test_run(self) + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.run_mender_test() + + +class TestMenderRO(TestMenderInfra): + config = \ + """ + {} + # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set + """.format(TestMenderInfra.config) + + def test_run(self): + TestMenderInfra.base_test_run(self) + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.run_mender_test() + + +class TestMenderSystemd(TestMenderInfra): + config = \ + """ + {} + BR2_INIT_SYSTEMD=y + """.format(TestMenderInfra.config) + + def test_run(self): + TestMenderInfra.base_test_run(self) + output, _ = self.emulator.run("systemctl is-active mender-client") + self.assertEqual(output[0], "active") + self.run_mender_test() diff --git a/support/testing/tests/package/test_mender/post-build.sh b/support/testing/tests/package/test_mender/post-build.sh new file mode 100755 index 0000000000..1afa231082 --- /dev/null +++ b/support/testing/tests/package/test_mender/post-build.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +set -e +DEVICE_TYPE="buildroot-arm" +ARTIFACT_NAME="RUNTIME_TEST_ARTIFACT_NAME" + +generate_mender_bootstrap_artifact() { + "${HOST_DIR}"/bin/mender-artifact \ + write bootstrap-artifact \ + --artifact-name "${ARTIFACT_NAME}" \ + --device-type "${DEVICE_TYPE}" \ + --provides "rootfs-image.version:${ARTIFACT_NAME}" \ + --clears-provides "rootfs-image.*" \ + --output-path "${TARGET_DIR}"/var/lib/mender/bootstrap.mender \ + --version 3 +} + +function mender_fixup() { + rm -rf "${TARGET_DIR}"/var/lib/mender + mkdir -p "${TARGET_DIR}"/var/lib/mender + echo "device_type=${DEVICE_TYPE}" > "${TARGET_DIR}"/var/lib/mender/device_type + +} + +mender_fixup +generate_mender_bootstrap_artifact diff --git a/support/testing/tests/package/test_mesa3d.py b/support/testing/tests/package/test_mesa3d.py new file mode 100644 index 0000000000..f5133c2eef --- /dev/null +++ b/support/testing/tests/package/test_mesa3d.py @@ -0,0 +1,53 @@ +import os +import infra.basetest + +RUSTICL_TIMEOUT = 180 + + +class TestMesa3DRusticl(infra.basetest.BRTest): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MESA3D=y + BR2_PACKAGE_MESA3D_LLVM=y + BR2_PACKAGE_MESA3D_OPENCL=y + BR2_PACKAGE_MESA3D_RUSTICL=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE=y + BR2_PACKAGE_CLINFO=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="1024M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext2") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot( + arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=[ + "-M", "virt", + "-cpu", "cortex-a57", + "-m", "512", + "-drive", f"file={img},if=virtio,format=raw" + ] + ) + self.emulator.login() + + def test_run(self): + self.login() + + # check the output exit code + output, exit_code = self.emulator.run("RUSTICL_ENABLE=llvmpipe clinfo", RUSTICL_TIMEOUT) + self.assertEqual(exit_code, 0) + # also check if platform name is rusticl and device name is llvmpipe + self.assertRegex("\n".join(output), r"Platform Name\s+rusticl") + self.assertRegex("\n".join(output), r"Device Name\s+llvmpipe") diff --git a/support/testing/tests/package/test_msr_tools.py b/support/testing/tests/package/test_msr_tools.py index 4d62742a5f..d098b29aa2 100644 --- a/support/testing/tests/package/test_msr_tools.py +++ b/support/testing/tests/package/test_msr_tools.py @@ -11,7 +11,7 @@ class TestMsrTools(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.42" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" diff --git a/support/testing/tests/package/test_nftables.py b/support/testing/tests/package/test_nftables.py index 142e7d0352..2622c7e822 100644 --- a/support/testing/tests/package/test_nftables.py +++ b/support/testing/tests/package/test_nftables.py @@ -85,7 +85,7 @@ class TestNftables(infra.basetest.BRTest): # supposed to fail earlier is now supposed to succeed. self.assertRunOk(ping_test_cmd) - def test_run(self): + def boot_vm(self): img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") kern = os.path.join(self.builddir, "images", "Image") self.emulator.boot(arch="aarch64", @@ -97,6 +97,9 @@ class TestNftables(infra.basetest.BRTest): "-initrd", img]) self.emulator.login() + def test_run(self): + self.boot_vm() + # We check the program can execute. self.assertRunOk("nft --version") @@ -107,3 +110,35 @@ class TestNftables(infra.basetest.BRTest): # We run again the same test sequence using our simple nft # python implementation, to check the language bindings. self.nftables_test(prog="/root/nft.py") + + +class TestNftablesInit(TestNftables): + config = TestNftables.config + \ + """ + BR2_INIT_BUSYBOX=y + """ + + def test_run(self): + self.boot_vm() + + # start with known state (rules from /etc/nftables.conf) + self.assertRunOk("/etc/init.d/S35nftables reload") + + # Same concept as in TestNftables.nftables_test: The rules + # should allow ping to 127.0.0.1, but not 127.0.0.2. + ping_cmd_prefix = "ping -c 3 -i 0.5 -W 2 " + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + _, exit_code = self.emulator.run(ping_cmd_prefix + "127.0.0.2") + self.assertNotEqual(exit_code, 0) + + # Stop should flush the rules, ping to both addresses should + # work now. + self.assertRunOk("/etc/init.d/S35nftables stop") + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + self.assertRunOk(ping_cmd_prefix + "127.0.0.2") + + # Start is essentially the same as reload, check that + # 127.0.0.2 gets blocked again. + self.assertRunOk("/etc/init.d/S35nftables start") + _, exit_code = self.emulator.run(ping_cmd_prefix + "127.0.0.2") + self.assertNotEqual(exit_code, 0) diff --git a/support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf b/support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf new file mode 100644 index 0000000000..a04af1d634 --- /dev/null +++ b/support/testing/tests/package/test_nftables/rootfs-overlay/etc/nftables.conf @@ -0,0 +1,8 @@ +flush ruleset + +table inet filter { + chain input { + type filter hook input priority filter; policy accept; + ip daddr 127.0.0.2 icmp type echo-request drop + } +} diff --git a/support/testing/tests/package/test_nginx_modsecurity.py b/support/testing/tests/package/test_nginx_modsecurity.py new file mode 100644 index 0000000000..3903d46bcc --- /dev/null +++ b/support/testing/tests/package/test_nginx_modsecurity.py @@ -0,0 +1,33 @@ +import os + +import infra.basetest + + +class TestNginxModsecurity(infra.basetest.BRTest): + overlay = infra.filepath("tests/package/test_nginx_modsecurity/overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_NGINX=y + BR2_PACKAGE_NGINX_HTTP=y + BR2_PACKAGE_NGINX_MODSECURITY=y + BR2_ROOTFS_OVERLAY="{overlay}" + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("nginx -V") + self.assertRunOk("wget http://localhost/index.html") + self.assertRunOk("grep -F 'Welcome to nginx!' index.html") + cmd = "wget -q -O /dev/null --server-response 2>&1 " \ + "http://localhost/blockme/ 2>&1 | awk '/^ HTTP/{print $2}'" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # Check for HTTP 403 Unauthorized: + self.assertEqual(out[0], "403") diff --git a/support/testing/tests/package/test_nginx_modsecurity/overlay/etc/nginx/modsecurity-rules.conf b/support/testing/tests/package/test_nginx_modsecurity/overlay/etc/nginx/modsecurity-rules.conf new file mode 100644 index 0000000000..94a132a9c7 --- /dev/null +++ b/support/testing/tests/package/test_nginx_modsecurity/overlay/etc/nginx/modsecurity-rules.conf @@ -0,0 +1,7 @@ +SecRuleEngine On +SecRule REQUEST_URI "@contains blockme" \ + "id:100001, \ + phase:2, \ + deny, \ + status:403, \ + msg:'Blocked request with forbidden keyword in URI.'" diff --git a/support/testing/tests/package/test_nginx_modsecurity/overlay/etc/nginx/nginx.conf b/support/testing/tests/package/test_nginx_modsecurity/overlay/etc/nginx/nginx.conf new file mode 100644 index 0000000000..3d1b990557 --- /dev/null +++ b/support/testing/tests/package/test_nginx_modsecurity/overlay/etc/nginx/nginx.conf @@ -0,0 +1,15 @@ +events { + worker_connections 1024; +} + +http { + server { + modsecurity on; + listen 80; + location / { + root html; + index index.html index.htm; + modsecurity_rules_file /etc/nginx/modsecurity-rules.conf; + } + } +} diff --git a/support/testing/tests/package/test_numactl.py b/support/testing/tests/package/test_numactl.py index 2ef9eb3635..218f53c262 100644 --- a/support/testing/tests/package/test_numactl.py +++ b/support/testing/tests/package/test_numactl.py @@ -17,7 +17,7 @@ class TestNumaCtl(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.148" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" diff --git a/support/testing/tests/package/test_openocd.py b/support/testing/tests/package/test_openocd.py new file mode 100644 index 0000000000..fe4d203073 --- /dev/null +++ b/support/testing/tests/package/test_openocd.py @@ -0,0 +1,37 @@ +import os + +import infra.basetest + + +class TestOpenOCD(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_OPENOCD=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can run. + self.assertRunOk("openocd --version") + + msg = "Buildroot" + + # We check openocd can run, load a "dummy" driver in the + # standard search path, and use some of its TCL commands. See: + # https://github.com/openocd-org/openocd/blob/v0.12.0/doc/manual/primer/commands.txt#L117 + # https://github.com/openocd-org/openocd/blob/v0.12.0/src/jtag/drivers/dummy.c + cmd = "openocd" + cmd += " -f interface/dummy.cfg" + cmd += f" -c 'dummy hello {msg}'" + cmd += " -c shutdown" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + expected_str = f"Greetings {msg}!" + self.assertIn(expected_str, out) diff --git a/support/testing/tests/package/test_patch.py b/support/testing/tests/package/test_patch.py new file mode 100644 index 0000000000..67ecb0497a --- /dev/null +++ b/support/testing/tests/package/test_patch.py @@ -0,0 +1,44 @@ +import os + +import infra.basetest + + +class TestPatch(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_patch/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_PATCH=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. This also checks that we are + # not using the patch applet from BusyBox (as it does not + # recognize the --version option). + self.assertRunOk("patch --version") + + # We check the test file contains our expected string before + # the patch. + sed_cmd = "sed -n '2p' file.txt" + out, ret = self.emulator.run(sed_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello World!") + + # We apply our test patch... + self.assertRunOk("patch -p1 < file.diff") + + # We check the test file contains our expected string after + # applying the patch. + out, ret = self.emulator.run(sed_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") diff --git a/support/testing/tests/package/test_patch/rootfs-overlay/root/file.diff b/support/testing/tests/package/test_patch/rootfs-overlay/root/file.diff new file mode 100644 index 0000000000..d53324d84b --- /dev/null +++ b/support/testing/tests/package/test_patch/rootfs-overlay/root/file.diff @@ -0,0 +1,8 @@ +diff -Naur a/file.txt b/file.txt +--- a/file.txt 2024-12-18 23:11:50.863359248 +0100 ++++ b/file.txt 2024-12-18 23:12:26.464561146 +0100 +@@ -1,3 +1,3 @@ + This is some context... +-Hello World! ++Hello Buildroot! + ...and this is some more context. diff --git a/support/testing/tests/package/test_patch/rootfs-overlay/root/file.txt b/support/testing/tests/package/test_patch/rootfs-overlay/root/file.txt new file mode 100644 index 0000000000..b506c73d9f --- /dev/null +++ b/support/testing/tests/package/test_patch/rootfs-overlay/root/file.txt @@ -0,0 +1,3 @@ +This is some context... +Hello World! +...and this is some more context. diff --git a/support/testing/tests/package/test_podman.py b/support/testing/tests/package/test_podman.py new file mode 100644 index 0000000000..9d86a06129 --- /dev/null +++ b/support/testing/tests/package/test_podman.py @@ -0,0 +1,253 @@ +import infra.basetest +import json +import os + + +class PodmanBase(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.202" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_PACKAGE_PODMAN=y + BR2_PACKAGE_UTIL_LINUX=y + BR2_PACKAGE_UTIL_LINUX_MOUNT=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def do_test(self): + class _Emul(): + def __init__(self, orig_emulator): + self.emulator = orig_emulator + + def run(self, cmd, timeout=-1): + if timeout < 0: + timeout = 60 + return self.emulator.run(cmd, timeout) + + def stop(self): + self.emulator.stop() + + kernel_file = os.path.join(self.builddir, 'images', 'zImage') + dtb_file = os.path.join(self.builddir, 'images', 'vexpress-v2p-ca9.dtb') + ext2_file = os.path.join(self.builddir, 'images', 'rootfs.ext2') + self.emulator.boot( + arch='armv5', + kernel=kernel_file, + kernel_cmdline=[ + 'root=/dev/mmcblk0', + 'rootwait', + 'console=ttyAMA0', + ], + options=[ + '-M', 'vexpress-a9', + '-dtb', dtb_file, + '-drive', f'file={ext2_file},if=sd,format=raw', + ] + ) + self.emulator.login() + + # Trick: replace the original emulator with one that always + # adds a timeout + self.emulator = _Emul(self.emulator) + + # Do some preparation for rootless use + self.assertRunOk("mount --make-shared /") + self.assertRunOk("chmod 666 /dev/net/tun") + self.assertRunOk("useradd -d /home/foo -m -s /bin/sh -u 1000 foo") + self.assertRunOk("touch /etc/subuid /etc/subgid") + self.assertRunOk("usermod --add-subuids 10000-75535 foo") + self.assertRunOk("usermod --add-subgids 10000-75535 foo") + + # First, test podman as root (the current user) + self.do_podman() + + # Now, test podman as non-root. We need a bit of setup + # We need to use the same prompts for the user as used for root, so that the + # REPLWrapper still detects the prompts. This means it is going to be a bit + # difficut to directly see that it was a user that executed a command. + self.assertRunOk('su -s /usr/bin/env - foo PS1="${PS1}" PS2="${PS2}" /bin/sh') + output, _ = self.emulator.run("id -u") + self.assertEqual(output[0], "1000", "Could not switch to non-root") + self.do_podman() + + def do_podman(self): + # The podman binary is huge, so it takes time to load... + # Next calls will be faster, though, as it is going to be cached. + self.assertRunOk('podman --version') + + # Check for an empty image store + output, exit_code = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + self.assertEqual(len(img_info), 0, f"{len(img_info)} image(s) already present") + + # Pull an image; it can take time: network, hash checksums... + self.assertRunOk('podman image pull busybox:1.37.0') + output, exit_code = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + self.assertEqual(len(img_info), 1, f"{len(img_info)} image(s), expecting 1") + self.assertTrue("Id" in img_info[0], '"Id" not in img_info[0]') + self.assertTrue("Digest" in img_info[0], '"Digest" not in img_info[0]') + self.assertEqual(img_info[0]["Names"][0], "docker.io/library/busybox:1.37.0") + + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Already in a container") + + # Spawn the container; that can take a bit of time + # Propagate the prompt so that the REPLWrapper detects it + self.assertRunOk( + "podman container run --rm -ti -e PS1 -e br_container=podman busybox:1.37.0", + ) + # Twist! The command above is still running, but the shell it + # started exposes the same prompt we expect. This is all what we want. + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "podman", "Not in a podman container") + + # Check that pid1 is the shell + output, _ = self.emulator.run('readlink /proc/1/exe') + self.assertEqual(output[0], "/bin/sh", f"PID1 is {output[0]}, should be /bin/sh") + + # Try to get something off the network + # Using http, not https, as busybox' wget does not do https + # Using --spider to just check we can reach the remote. + output, exit_code = self.emulator.run('wget --spider http://google.com/') + self.assertEqual(exit_code, 0, "wget did not succeed to reach google.com") + self.assertEqual(output[-1], "remote file exists", "wget did not succeed to reach google.com") + + # Exit the container + self.assertRunOk("exit 0") + # Twist, take two! We are now back to the shell in the VM. + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Still in a container") + + # Spawn a container, round two, but with an injected init this time + self.assertRunOk( + "podman container run --rm -ti -e PS1 --init -e br_container=podman busybox:1.37.0", + ) + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "podman", "Not in a podman container") + + # Check that pid1 is the init injected by podman + output, _ = self.emulator.run('readlink /proc/1/exe') + self.assertEqual(output[0], "/run/podman-init", f"PID1 is {output[0]}, should be /run/podman-init") + + # Exit the container + self.assertRunOk("exit 0") + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Still in a container") + + # Use an image from another registry, spawn without pulling first + self.assertRunOk( + "podman container run --rm -ti -e PS1 -e br_container=podman quay.io/prometheus/busybox:latest", + ) + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "podman", "Not in a podman container") + self.assertRunOk("exit 0") + output, _ = self.emulator.run('echo ${br_container}') + self.assertEqual(output[0], "", "Still in a container") + + # Test networking between two containers + self.assertRunOk("podman network create buz") + self.assertRunOk( + "podman container run --rm -ti --name pod007 --network buz --detach busybox:1.37.0", + ) + self.assertRunOk( + "podman container run --rm -ti --name pod006 --network buz --detach busybox:1.37.0", + ) + # Ensure each pod can resolv itself and the other + # (not using itertools.matrix() just for those trivial combinations) + for pod1, pod2 in [ + ("pod006", "pod006"), + ("pod006", "pod007"), + ("pod007", "pod007"), + ("pod007", "pod006"), + ]: + output, exit_code = self.emulator.run( + f"podman container exec {pod1} nslookup {pod2}", + ) + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("Server:")) + self.assertTrue(output[1].startswith("Address:")) + # Busybox' nslookup emits one "Non-authoritative answer" per + # supported address familly: IPv4 and IPv6. + self.assertEqual( + len([line for line in output[2:] if line == "Non-authoritative answer:"]), + 2, + ) + # But only IPv4 is available on this network + self.assertEqual( + len([line for line in output[2:] if line.startswith("Address:")]), + 1, + ) + self.assertRunOk("podman container kill --all") + output, _ = self.emulator.run("podman container ls --format '{{ json }}'") + pod_info = json.loads("".join(output)) + self.assertEqual(len(pod_info), 0, f"{len(pod_info)} container(s) still present, expecting 0") + + # Remove the offical image + self.assertRunOk('podman image rm busybox:1.37.0') + output, _ = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + # There is still one image(the unofficial one from quay.io) + self.assertEqual(len(img_info), 1, f"{len(img_info)} image(s) still present, expecting 1") + + # Remove all remaining images + self.assertRunOk('podman image prune -af') + output, exit_code = self.emulator.run("podman image ls --format '{{ json }}'") + img_info = json.loads("".join(output)) + self.assertEqual(len(img_info), 0, f"{len(img_info)} image(s) still present, expecting 0") + + +class TestPodmanIptables(PodmanBase): + def test_run(self): + self.do_test() + + +class TestPodmanNftables(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_NFTABLES=y + """ + + def test_run(self): + self.do_test() + + +class TestPodmanTini(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_PODMAN_INIT_TINI=y + """ + + def test_run(self): + self.do_test() + + +class TestPodmanSlirpIptables(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_PODMAN_NET_SLIRP4NETNS=y + """ + + def test_run(self): + self.do_test() + + +class TestPodmanSlirpNftables(PodmanBase): + config = PodmanBase.config + """ + BR2_PACKAGE_NFTABLES=y + BR2_PACKAGE_PODMAN_NET_SLIRP4NETNS=y + """ + + def test_run(self): + self.do_test() diff --git a/support/testing/tests/package/test_proj.py b/support/testing/tests/package/test_proj.py new file mode 100644 index 0000000000..ed23c229fd --- /dev/null +++ b/support/testing/tests/package/test_proj.py @@ -0,0 +1,59 @@ +import os + +import infra.basetest + + +class TestProj(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_PROJ=y + BR2_PACKAGE_PROJ_APPS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can run. The "proj" command does not + # have a "--version" option. It will just show its version + # when invoked without any argument. + self.assertRunOk("proj") + + # The commands in this tests are taken from the Proj + # documentation quickstart page, at: + # https://proj.org/en/9.5/usage/quickstart.html + + proj_str = "+proj=merc +lat_ts=56.5 +ellps=GRS80" + cmd = "echo 55.2 12.2" + cmd += f" | proj {proj_str}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + expected_values = [3399483.80, 752085.60] + values = list(map(lambda x: float(x), out[0].split())) + for i in range(len(expected_values)): + self.assertAlmostEqual(values[i], expected_values[i]) + + proj_str = "+proj=merc +lat_ts=56.5 +ellps=GRS80 +to +proj=utm +zone=32" + cmd = "echo 3399483.80 752085.60" + cmd += f" | cs2cs {proj_str}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + expected_values = [6103992.36, 1924052.47, 0.00] + values = list(map(lambda x: float(x), out[0].split())) + for i in range(len(expected_values)): + self.assertAlmostEqual(values[i], expected_values[i]) + + proj_str = "+init=epsg:4326 +to +init=epsg:25832" + cmd = "echo 56 12" + cmd += f" | cs2cs {proj_str}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + expected_values = [6231950.54, 1920310.71, 0.00] + values = list(map(lambda x: float(x), out[0].split())) + for i in range(len(expected_values)): + self.assertAlmostEqual(values[i], expected_values[i]) diff --git a/support/testing/tests/package/test_python_apscheduler.py b/support/testing/tests/package/test_python_apscheduler.py new file mode 100644 index 0000000000..19eb8c9b41 --- /dev/null +++ b/support/testing/tests/package/test_python_apscheduler.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Apscheduler(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_APSCHEDULER=y + """ + sample_scripts = ["tests/package/sample_python_apscheduler.py"] + timeout = 15 diff --git a/support/testing/tests/package/test_python_boto3.py b/support/testing/tests/package/test_python_boto3.py index 02a1f69d40..e5fbc386b9 100644 --- a/support/testing/tests/package/test_python_boto3.py +++ b/support/testing/tests/package/test_python_boto3.py @@ -12,7 +12,7 @@ class TestPythonPy3Boto3(TestPythonPackageBase): BR2_TARGET_ROOTFS_EXT2_SIZE="250M" """ sample_scripts = ["tests/package/sample_python_boto3.py"] - timeout = 10 + timeout = 20 def login(self): ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") diff --git a/support/testing/tests/package/test_python_crc.py b/support/testing/tests/package/test_python_crc.py new file mode 100644 index 0000000000..0b36580a44 --- /dev/null +++ b/support/testing/tests/package/test_python_crc.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Crc(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CRC=y + """ + sample_scripts = ["tests/package/sample_python_crc.py"] diff --git a/support/testing/tests/package/test_python_crccheck.py b/support/testing/tests/package/test_python_crccheck.py new file mode 100644 index 0000000000..d51bdc7c9f --- /dev/null +++ b/support/testing/tests/package/test_python_crccheck.py @@ -0,0 +1,10 @@ +import infra.basetest + + +class TestHostPythonCrccheck(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-crccheck"] + + def test_run(self): + cmd = ["host/bin/python3", "-c", "import crccheck; print(crccheck.crc.Crc32.calc(bytearray.fromhex('DEADBEEF')))"] + res = infra.run_cmd_on_host(self.builddir, cmd) + self.assertEqual(res.strip(), "2090640218") diff --git a/support/testing/tests/package/test_python_fs.py b/support/testing/tests/package/test_python_fs.py new file mode 100644 index 0000000000..a53d8a64c8 --- /dev/null +++ b/support/testing/tests/package/test_python_fs.py @@ -0,0 +1,9 @@ +import infra.basetest + + +class TestHostPythonFs(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-fs"] + + def test_run(self): + cmd = ["host/bin/python3", "-c", "import fs; fs.open_fs('mem://'); fs.open_fs('temp://')"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py index 8861115130..8b438aed15 100644 --- a/support/testing/tests/package/test_python_gnupg.py +++ b/support/testing/tests/package/test_python_gnupg.py @@ -9,3 +9,4 @@ class TestPythonPy3GnuPG(TestPythonPackageBase): BR2_PACKAGE_PYTHON_GNUPG=y """ sample_scripts = ["tests/package/sample_python_gnupg.py"] + timeout = 10 # /dev/urandom can take a while to become initialized diff --git a/support/testing/tests/package/test_python_networkmanager_goi.py b/support/testing/tests/package/test_python_networkmanager_goi.py new file mode 100644 index 0000000000..e755569fc1 --- /dev/null +++ b/support/testing/tests/package/test_python_networkmanager_goi.py @@ -0,0 +1,24 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3NetworkmanagerGoi(TestPythonPackageBase): + __test__ = True + # Can't use TestPythonPackageBase.config because we need headers + # >= 4.20 for network-manager, so we have to use the bleeding-edge + # toolchain. + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GOBJECT=y + BR2_INIT_SYSTEMD=y + BR2_PACKAGE_NETWORK_MANAGER=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + sample_scripts = ["tests/package/sample_python_networkmanager_goi.py"] + + timeout = 30 diff --git a/support/testing/tests/package/test_python_pydantic.py b/support/testing/tests/package/test_python_pydantic.py new file mode 100644 index 0000000000..1369d82f59 --- /dev/null +++ b/support/testing/tests/package/test_python_pydantic.py @@ -0,0 +1,27 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Pydantic(TestPythonPackageBase): + __test__ = True + config = """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYDANTIC=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + sample_scripts = ["tests/package/sample_python_pydantic.py"] + timeout = 30 + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot( + arch="armv7", kernel="builtin", options=["-initrd", cpio_file] + ) + self.emulator.login() diff --git a/support/testing/tests/package/test_python_pydantic_settings.py b/support/testing/tests/package/test_python_pydantic_settings.py new file mode 100644 index 0000000000..608cbbc5b1 --- /dev/null +++ b/support/testing/tests/package/test_python_pydantic_settings.py @@ -0,0 +1,35 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3PydanticSettings(TestPythonPackageBase): + __test__ = True + config = """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYDANTIC_SETTINGS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + sample_scripts = ["tests/package/sample_python_pydantic_settings.py"] + timeout = 30 + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot( + arch="armv7", kernel="builtin", options=["-initrd", cpio_file] + ) + self.emulator.login() + + def run_sample_scripts(self): + """Run sample script while setting an environment variable""" + for script in self.sample_scripts: + cmd = ( + "api_key=ABCD1234 " + self.interpreter + " " + os.path.basename(script) + ) + self.assertRunOk(cmd, timeout=self.timeout) diff --git a/support/testing/tests/package/test_python_pyfatfs.py b/support/testing/tests/package/test_python_pyfatfs.py new file mode 100644 index 0000000000..ceb4e924a1 --- /dev/null +++ b/support/testing/tests/package/test_python_pyfatfs.py @@ -0,0 +1,53 @@ +import infra.basetest +import os + + +class TestHostPythonPyfatfs(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-pyfatfs", + "host-genimage", + "host-dosfstools", + "host-mtools"] + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + infra.basetest.MINIMAL_CONFIG + \ + """ + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_MTOOLS=y + """ + + genimage_cfg = """ +image test.vfat { + vfat { + files = { + "test.txt" + } + } + + size = 8M +}""" + + def test_run(self): + os.makedirs(os.path.join(self.builddir, "genimage-input"), + exist_ok=True) + with open(os.path.join(self.builddir, "genimage-input", "test.txt"), "w") as f: + f.write("Hello World!") + with open(os.path.join(self.builddir, "genimage.cfg"), "w") as f: + f.write(self.genimage_cfg) + os.makedirs(os.path.join(self.builddir, "genimage-tmp"), + exist_ok=True) + os.makedirs(os.path.join(self.builddir, "genimage-root"), + exist_ok=True) + + cmd = ["host/bin/genimage", + "--config", os.path.join(self.builddir, "genimage.cfg"), + "--outputpath", self.builddir, + "--inputpath", os.path.join(self.builddir, "genimage-input"), + "--tmppath", os.path.join(self.builddir, "genimage-tmp"), + "--rootpath", os.path.join(self.builddir, "genimage-root"), + "--mkdosfs", os.path.join(self.builddir, "host", "sbin", "mkdosfs"), + "--mcopy", os.path.join(self.builddir, "host", "bin", "mcopy") + ] + infra.run_cmd_on_host(self.builddir, cmd) + + cmd = ["host/bin/python3", "-c", + "import fs; fatfs = fs.open_fs('fat://test.vfat'); assert(fatfs.listdir('/') == ['TEST.TXT'])"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_python_pyproj.py b/support/testing/tests/package/test_python_pyproj.py new file mode 100644 index 0000000000..2044d517c2 --- /dev/null +++ b/support/testing/tests/package/test_python_pyproj.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Pyproj(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYPROJ=y + """ + sample_scripts = ["tests/package/sample_python_pyproj.py"] diff --git a/support/testing/tests/package/test_python_pyqt5.py b/support/testing/tests/package/test_python_pyqt5.py index 5f1952b559..65130f9c03 100644 --- a/support/testing/tests/package/test_python_pyqt5.py +++ b/support/testing/tests/package/test_python_pyqt5.py @@ -28,7 +28,7 @@ class TestPythonPyQt5(infra.basetest.BRTest): BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y diff --git a/support/testing/tests/package/test_python_pyroute2.py b/support/testing/tests/package/test_python_pyroute2.py new file mode 100644 index 0000000000..2f54a2bd26 --- /dev/null +++ b/support/testing/tests/package/test_python_pyroute2.py @@ -0,0 +1,24 @@ +from tests.package.test_python import TestPythonPackageBase +import os + + +class TestPythonPyroute2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYROUTE2=y + """ + sample_scripts = ["tests/package/sample_python_pyroute2.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + # helpful for debugging, if the test fails the run log will + # show if the interface was ready + output, exit_code = self.emulator.run('ip addr show', timeout=15) + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " " + os.path.basename(self.sample_scripts[0]) + _, exit_code = self.emulator.run(cmd, timeout=15) + self.assertEqual(exit_code, 0) diff --git a/support/testing/tests/package/test_python_pyusb.py b/support/testing/tests/package/test_python_pyusb.py new file mode 100644 index 0000000000..1e0dbba446 --- /dev/null +++ b/support/testing/tests/package/test_python_pyusb.py @@ -0,0 +1,9 @@ +import infra.basetest + + +class TestHostPythonPyusb(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-pyusb"] + + def test_run(self): + cmd = ["host/bin/python3", "-c", "import usb"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_python_scp.py b/support/testing/tests/package/test_python_scp.py new file mode 100644 index 0000000000..be04c5684c --- /dev/null +++ b/support/testing/tests/package/test_python_scp.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonSCP(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_DROPBEAR=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SCP=y + """ + sample_scripts = ["tests/package/sample_python_scp.py"] + + def run_sample_scripts(self): + # Allow passwordless root login in SSH server + self.assertRunOk("mkdir -m 0700 /root/.ssh") + self.assertRunOk("dropbearkey -t ed25519 -f .ssh/id_dropbear") + self.assertRunOk("dropbearkey -y -f .ssh/id_dropbear | grep '^ssh-ed25519' > .ssh/authorized_keys") + self.assertRunOk("dropbearconvert dropbear openssh .ssh/id_dropbear .ssh/id_ed25519") + + super().run_sample_scripts() diff --git a/support/testing/tests/package/test_python_sdbus_modemmanager.py b/support/testing/tests/package/test_python_sdbus_modemmanager.py new file mode 100644 index 0000000000..34ab66e3bf --- /dev/null +++ b/support/testing/tests/package/test_python_sdbus_modemmanager.py @@ -0,0 +1,15 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3SdbusNetworkmanager(TestPythonPackageBase): + __test__ = True + config = ( + TestPythonPackageBase.config + + """ + BR2_PACKAGE_PYTHON3=y + BR2_INIT_SYSTEMD=y + BR2_PACKAGE_MODEM_MANAGER=y + BR2_PACKAGE_PYTHON_SDBUS_MODEMMANAGER=y + """ + ) + sample_scripts = ["tests/package/sample_python_sdbus_modemmanager.py"] diff --git a/support/testing/tests/package/test_python_sdbus_networkmanager.py b/support/testing/tests/package/test_python_sdbus_networkmanager.py index a3961ec54f..c10f73920d 100644 --- a/support/testing/tests/package/test_python_sdbus_networkmanager.py +++ b/support/testing/tests/package/test_python_sdbus_networkmanager.py @@ -3,12 +3,21 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3SdbusNetworkmanager(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Can't use TestPythonPackageBase.config because we need headers + # >= 4.20 for network-manager, so we have to use the bleeding-edge + # toolchain. + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE=y BR2_PACKAGE_PYTHON3=y BR2_INIT_SYSTEMD=y BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_PYTHON_SDBUS_NETWORKMANAGER=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_sdbus_networkmanager.py"] diff --git a/support/testing/tests/package/test_python_serial.py b/support/testing/tests/package/test_python_serial.py new file mode 100644 index 0000000000..c4b05a10fb --- /dev/null +++ b/support/testing/tests/package/test_python_serial.py @@ -0,0 +1,12 @@ +import infra.basetest + + +class TestHostPythonSerial(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-serial"] + + def test_run(self): + cmd = ["host/bin/python3", "-c", "import serial"] + infra.run_cmd_on_host(self.builddir, cmd) + + cmd = ["host/bin/python3", "-m", "serial.tools.list_ports"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_python_spake2.py b/support/testing/tests/package/test_python_spake2.py index fb47a0802c..0629772bc3 100644 --- a/support/testing/tests/package/test_python_spake2.py +++ b/support/testing/tests/package/test_python_spake2.py @@ -9,3 +9,4 @@ class TestPythonPy3Spake2(TestPythonPackageBase): BR2_PACKAGE_PYTHON_SPAKE2=y """ sample_scripts = ["tests/package/sample_python_spake2.py"] + timeout = 10 # /dev/urandom can take a while to become initialized diff --git a/support/testing/tests/package/test_python_tftpy.py b/support/testing/tests/package/test_python_tftpy.py index d64f2c29d7..1dfbde0b67 100644 --- a/support/testing/tests/package/test_python_tftpy.py +++ b/support/testing/tests/package/test_python_tftpy.py @@ -1,4 +1,5 @@ from tests.package.test_python import TestPythonPackageBase +import infra.basetest class TestPythonTftpy(TestPythonPackageBase): @@ -9,3 +10,11 @@ class TestPythonTftpy(TestPythonPackageBase): BR2_PACKAGE_PYTHON_TFTPY=y """ sample_scripts = ["tests/package/sample_python_tftpy.py"] + + +class TestHostPythonTftpy(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-tftpy"] + + def test_run(self): + cmd = ["host/bin/python3", "-c", "import tftpy"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_python_txaio.py b/support/testing/tests/package/test_python_txaio.py index f1bb2c79a6..9acbb60d2f 100644 --- a/support/testing/tests/package/test_python_txaio.py +++ b/support/testing/tests/package/test_python_txaio.py @@ -7,5 +7,6 @@ class TestPythonPy3Txaio(TestPythonPackageBase): """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXAIO=y + BR2_PACKAGE_PYTHON_TWISTED=y """ - sample_scripts = ["tests/package/sample_python_txaio_asyncio.py"] + sample_scripts = ["tests/package/sample_python_txaio_asyncio.py", "tests/package/sample_python_txaio_twisted.py"] diff --git a/support/testing/tests/package/test_python_tzlocal.py b/support/testing/tests/package/test_python_tzlocal.py new file mode 100644 index 0000000000..d7dac361bf --- /dev/null +++ b/support/testing/tests/package/test_python_tzlocal.py @@ -0,0 +1,14 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3TZLocal(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_TARGET_TZ_INFO=y + BR2_TARGET_LOCALTIME="Europe/Berlin" + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_TZLOCAL=y + """ + sample_scripts = ["tests/package/sample_python_tzlocal.py"] + timeout = 10 diff --git a/support/testing/tests/package/test_python_urllib3.py b/support/testing/tests/package/test_python_urllib3.py new file mode 100644 index 0000000000..54a94d5e65 --- /dev/null +++ b/support/testing/tests/package/test_python_urllib3.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Urllib3(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_URLLIB3=y + """ + sample_scripts = ["tests/package/sample_python_urllib3.py"] + timeout = 20 diff --git a/support/testing/tests/package/test_python_waitress.py b/support/testing/tests/package/test_python_waitress.py new file mode 100644 index 0000000000..8024aaacfd --- /dev/null +++ b/support/testing/tests/package/test_python_waitress.py @@ -0,0 +1,33 @@ +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonWaitress(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FLASK=y + BR2_PACKAGE_PYTHON_WAITRESS=y + """ + + sample_scripts = ["tests/package/sample_python_flask.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = self.interpreter + " -m waitress sample_python_flask:app > /dev/null 2>&1 &" + # give some time to setup the server + _, exit = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + for attempt in range(30): + time.sleep(1) + + cmd = "wget -q -O - http://127.0.0.1:8080/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + self.assertEqual(exit_code, 0, "Timeout while waiting for django server") diff --git a/support/testing/tests/package/test_python_whitenoise.py b/support/testing/tests/package/test_python_whitenoise.py new file mode 100644 index 0000000000..5a76b6d5be --- /dev/null +++ b/support/testing/tests/package/test_python_whitenoise.py @@ -0,0 +1,41 @@ +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Whitenoise(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DJANGO=y + BR2_PACKAGE_PYTHON_WHITENOISE=y + BR2_PACKAGE_PYTHON3_SQLITE=y + """ + + def test_run(self): + self.login() + timeout = 35 + + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + self.assertRunOk(cmd, timeout=timeout) + # STATIC_ROOT needs to be set for 'collectstatic' to work. + self.emulator.run("echo 'STATIC_ROOT = BASE_DIR / \"staticfiles\"' >> /opt/testsite/testsite/settings.py") + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py collectstatic" + self.assertRunOk(cmd, timeout=timeout) + # whitenoise docs say it needs to be added directly after SecurityMiddleware, so we do this here with sed. + cmd = """sed -i -e /django.middleware.security.SecurityMiddleware/a\\ \\"whitenoise.middleware.WhiteNoiseMiddleware\\",\ + /opt/testsite/testsite/settings.py""" + self.assertRunOk(cmd, timeout=timeout) + # --nostatic ensures the builtin django server doesn't serve the static files, + # so we can test that whitenoise serves them + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver --nostatic 0.0.0.0:1234 > /dev/null 2>&1 & " + self.assertRunOk(cmd, timeout=timeout) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "wget http://127.0.0.1:1234/static/admin/css/base.css" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + self.assertEqual(exit_code, 0, "Timeout while waiting for django server") diff --git a/support/testing/tests/package/test_python_xmodem.py b/support/testing/tests/package/test_python_xmodem.py new file mode 100644 index 0000000000..b9feb78109 --- /dev/null +++ b/support/testing/tests/package/test_python_xmodem.py @@ -0,0 +1,9 @@ +import infra.basetest + + +class TestHostPythonXmodem(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-python-xmodem"] + + def test_run(self): + cmd = ["host/bin/python3", "-c", "import xmodem"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 8160cb6053..763125ca20 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -70,6 +70,7 @@ class TestRustVendoring(infra.basetest.BRConfigTest): BR2_PACKAGE_RIPGREP=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_BACKUP_SITE="" """ def setUp(self): diff --git a/support/testing/tests/package/test_skopeo.py b/support/testing/tests/package/test_skopeo.py new file mode 100644 index 0000000000..f19703bef2 --- /dev/null +++ b/support/testing/tests/package/test_skopeo.py @@ -0,0 +1,62 @@ +import infra.basetest +import json +import os + + +class TestSkopeo(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PER_PACKAGE_DIRECTORIES=y + BR2_SYSTEM_DHCP="eth0" + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_SQLITE=y + BR2_PACKAGE_SKOPEO=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file, "-nic", "user,model=rtl8139"]) + self.emulator.login() + + self.assertRunOk("skopeo --version", timeout=30) + + # First, check we can reach the default registry: docker.io + output, _ = self.emulator.run( + "skopeo inspect docker://busybox:latest", + timeout=60, + ) + bb_info = json.loads("".join(output)) + self.assertEqual(bb_info["Name"], "docker.io/library/busybox") + + # Then check we can retrieve the image from the default registry + # Copy all archs in the image to check we can enumerate those (inspect + # does not enumerate all archs) + self.assertRunOk( + "skopeo copy -a docker://busybox:latest oci-archive:busybox-latest.oci", + timeout=120, + ) + + # Check we can inspect a local OCI archive + self.assertRunOk( + "skopeo inspect oci-archive:busybox-latest.oci", + timeout=30, + ) + + # Now, check we can reach an arbitrary registry: quay.io + output, _ = self.emulator.run( + "skopeo inspect docker://quay.io/quay/busybox:latest", + timeout=60, + ) + skopeo_info = json.loads("".join(output)) + self.assertEqual(skopeo_info["Name"], "quay.io/quay/busybox") + + # Finally check we can retrieve the image from an arbitrary registry + self.assertRunOk( + "skopeo copy docker://quay.io/quay/busybox:latest oci-archive:busybox-quay.io-latest.oci", + timeout=120, + ) diff --git a/support/testing/tests/package/test_snagboot.py b/support/testing/tests/package/test_snagboot.py new file mode 100644 index 0000000000..65fe196520 --- /dev/null +++ b/support/testing/tests/package/test_snagboot.py @@ -0,0 +1,16 @@ +import infra.basetest + + +class TestHostSnagboot(infra.basetest.BRHostPkgTest): + hostpkgs = ["host-snagboot"] + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HOST_SNAGBOOT=y + """ + + def test_run(self): + cmd = ["host/bin/snagrecover", "--help"] + infra.run_cmd_on_host(self.builddir, cmd) + + cmd = ["host/bin/snagflash", "--help"] + infra.run_cmd_on_host(self.builddir, cmd) diff --git a/support/testing/tests/package/test_swipl.py b/support/testing/tests/package/test_swipl.py index 0839101599..0f317bb617 100644 --- a/support/testing/tests/package/test_swipl.py +++ b/support/testing/tests/package/test_swipl.py @@ -43,4 +43,4 @@ class TestSWIPL(infra.basetest.BRTest): # Run a more complex logic program (solve a sudoku). cmd = "swipl -g top -t halt /root/sudoku.pl" - self.assertRunOk(cmd, timeout=10) + self.assertRunOk(cmd, timeout=120) diff --git a/support/testing/tests/package/test_tree.py b/support/testing/tests/package/test_tree.py new file mode 100644 index 0000000000..3865932642 --- /dev/null +++ b/support/testing/tests/package/test_tree.py @@ -0,0 +1,54 @@ +import json +import os +import xml.etree.ElementTree as ET + +import infra.basetest + + +class TestTree(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_TREE=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + self.assertRunOk("tree --version") + + # Simple invocations on a path. + self.assertRunOk("tree /usr") + self.assertRunOk("tree -d /usr") + self.assertRunOk("tree -dx /") + + # Check we see the /usr/bin/tree file in the output. + out, ret = self.emulator.run("tree -f /usr") + self.assertEqual(ret, 0) + self.assertIn("/usr/bin/tree", "\n".join(out)) + + # Check we can parse the JSON output and the summary report. + out, ret = self.emulator.run("tree -J /usr") + self.assertEqual(ret, 0) + json_str = "\n".join(out) + json_data = json.loads(json_str) + # Report is the last element. + json_report = json_data[-1] + self.assertEqual(json_report["type"], "report") + self.assertGreater(json_report["directories"], 0) + self.assertGreater(json_report["files"], 0) + + # Check we can parse the XML output and the summary report. + out, ret = self.emulator.run("tree -X /usr") + self.assertEqual(ret, 0) + xml_str = "\n".join(out) + xml_root = ET.fromstring(xml_str) + self.assertEqual(xml_root.tag, "tree") + xml_report = xml_root.find("report") + self.assertGreater(int(xml_report.find("directories").text), 0) + self.assertGreater(int(xml_report.find("files").text), 0) diff --git a/support/testing/tests/package/test_usbip.py b/support/testing/tests/package/test_usbip.py new file mode 100644 index 0000000000..da94d6f92c --- /dev/null +++ b/support/testing/tests/package/test_usbip.py @@ -0,0 +1,100 @@ +import os + +import infra.basetest + + +class TestUsbIp(infra.basetest.BRTest): + # A specific configuration is needed for testing usbip, to + # enable USB 2.0 and USBIP support in the Kernel. + linux_fragment = \ + infra.filepath("tests/package/test_usbip/linux-usbip.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.6" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EUDEV=y + BR2_PACKAGE_HWDATA=y + BR2_PACKAGE_HWDATA_USB_IDS=y + BR2_PACKAGE_USBIP=y + BR2_PACKAGE_USBUTILS=y + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + # We add a USB keyboard and mouse devices for the test. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-device", "usb-ehci,id=ehci", + "-device", "usb-kbd,bus=ehci.0", + "-device", "usb-mouse,bus=ehci.0"]) + self.emulator.login() + + # We check the program can execute. + self.assertRunOk("usbipd --version") + + # We check "lsusb" sees exactly one QEMU USB Keyboard. + out, ret = self.emulator.run("lsusb") + self.assertEqual(ret, 0) + kbd_count = "\n".join(out).count("QEMU USB Keyboard") + self.assertEqual(kbd_count, 1) + + # The daemon is not running yet. Listing remote devices is + # expected to fail. + _, ret = self.emulator.run("usbip list --remote=127.0.0.1") + self.assertNotEqual(ret, 0) + + # We start the USBIP daemon. + self.assertRunOk("usbipd -D") + + # The daemon is started. Listing remote devices is now + # expected to succeed, but with an empty list (since we did + # not exported any device yet). + out, ret = self.emulator.run("usbip list --remote=127.0.0.1") + self.assertEqual(ret, 0) + self.assertIn("no exportable devices found", "\n".join(out)) + + # We list the local devices seen by usbip. We check we can see + # our local USB keyboard device in it. + out, ret = self.emulator.run("usbip list --local") + self.assertEqual(ret, 0) + self.assertIn("busid 1-1", "\n".join(out)) + + # We bind the first device (USB Keyboard) + self.assertRunOk("usbip bind --busid=1-1") + + # We list the remote devices. We should see our exported + # keyboard: we check we have the list header, and the device + # ID in the output. + out, ret = self.emulator.run("usbip list --remote=127.0.0.1") + self.assertEqual(ret, 0) + out_str = "\n".join(out) + self.assertNotIn("no exportable devices found", out_str) + self.assertIn("Exportable USB devices", out_str) + self.assertIn("(0627:0001)", out_str) + + # We attach the keyboard. This should create a second USB + # keyboard. + self.assertRunOk("usbip attach --remote=127.0.0.1 --busid=1-1") + + # We check "lsusb" now sees exactly two QEMU USB Keyboards + # (the original one, and a second one created by usbip). + out, ret = self.emulator.run("lsusb") + self.assertEqual(ret, 0) + kbd_count = "\n".join(out).count("QEMU USB Keyboard") + self.assertEqual(kbd_count, 2) diff --git a/support/testing/tests/package/test_usbip/linux-usbip.fragment b/support/testing/tests/package/test_usbip/linux-usbip.fragment new file mode 100644 index 0000000000..592f461145 --- /dev/null +++ b/support/testing/tests/package/test_usbip/linux-usbip.fragment @@ -0,0 +1,5 @@ +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USBIP_CORE=y +CONFIG_USBIP_HOST=y +CONFIG_USBIP_VHCI_HCD=y diff --git a/support/testing/tests/package/test_weston.py b/support/testing/tests/package/test_weston.py index 2ed59a7f15..c4a522c95b 100644 --- a/support/testing/tests/package/test_weston.py +++ b/support/testing/tests/package/test_weston.py @@ -22,7 +22,7 @@ class TestWeston(infra.basetest.BRTest, GraphicsBase): BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y @@ -58,8 +58,8 @@ class TestWeston(infra.basetest.BRTest, GraphicsBase): def stop_weston(self): cmd = "killall weston" - time.sleep(3) self.assertRunOk(cmd) + time.sleep(3) def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") diff --git a/support/testing/tests/package/test_wget.py b/support/testing/tests/package/test_wget.py new file mode 100644 index 0000000000..7279b77667 --- /dev/null +++ b/support/testing/tests/package/test_wget.py @@ -0,0 +1,55 @@ +import os + +import infra.basetest + + +class TestWget(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BUSYBOX_HTTPD=y + BR2_PACKAGE_WGET=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + msg = "Hello Buildroot!" + fname = "file.txt" + url = f"http://localhost/{fname}" + + # We check the program can execute. This also checks we have + # the GNU wget version, rather than the BusyBox version which + # does not know the --version option. + self.assertRunOk("wget --version") + + # We create a simple file to serve. + self.assertRunOk(f"echo '{msg}' > /var/www/data/{fname}") + + # We try to download that file, using our local httpd server. + self.assertRunOk(f"wget --progress=dot {url}") + + # We check the downloaded file contains our initial message. + out, ret = self.emulator.run(f"cat {fname}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We download again the file without saving it, but printing + # it on stdout this time. + out, ret = self.emulator.run(f"wget -q -O - {url}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We download one last time, showing the server response. We + # check we can see the OK status. + cmd = f"wget --no-verbose --server-response -O /dev/null {url}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + out_str = "\n".join(out) + self.assertIn("HTTP/1.1 200 OK", out_str) diff --git a/support/testing/tests/package/test_wine.py b/support/testing/tests/package/test_wine.py index 4e5b4a8b11..8c7b80f522 100644 --- a/support/testing/tests/package/test_wine.py +++ b/support/testing/tests/package/test_wine.py @@ -15,7 +15,7 @@ class TestWine(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.27" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.102" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/support/testing/tests/package/test_xen.py b/support/testing/tests/package/test_xen.py new file mode 100644 index 0000000000..6f2da05d3a --- /dev/null +++ b/support/testing/tests/package/test_xen.py @@ -0,0 +1,214 @@ +import os +import pexpect +import infra.basetest + + +class TestXenBase(infra.basetest.BRTest): + """A class to test Xen for multiple architectures.""" + + # We run only in the initramfs; this allows to use a single ramdisk image + # for both the host and the guest. + base_config = \ + """ + BR2_TOOLCHAIN_EXTERNAL=y + BR2_ROOTFS_POST_BUILD_SCRIPT="support/testing/tests/package/test_xen/common/post-build.sh" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.17.1" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_BRIDGE_UTILS=y + BR2_PACKAGE_XEN=y + BR2_PACKAGE_XEN_HYPERVISOR=y + BR2_PACKAGE_XEN_TOOLS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_UBOOT=y + BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y + BR2_TARGET_UBOOT_CUSTOM_VERSION=y + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" + BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + BR2_TARGET_UBOOT_NEEDS_GNUTLS=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_MTOOLS=y + """ + + def get_dom_uuid(self) -> str: + out, rc = self.emulator.run("cat /sys/hypervisor/uuid") + self.assertEqual(rc, 0, "Failed to get domain UUID") + return out[0] + + def assertNumVM(self, x: int) -> None: + out, rc = self.emulator.run("xl vm-list") + self.assertEqual(rc, 0, "Failed to get VM list") + num_vm = len(out) - 1 + self.assertEqual(num_vm, x, f"Expected {x} VM(s) but found {num_vm}") + + def run_xen_test(self, arch: str, options: list[str]) -> None: + """This functions tests Xen for multiple architectures. + The arch and options parameters are passed to the emulator. + + Here is the network setup we use in the test: + + : dom0 : dom1 : + : : : + : br0 : : + : 10.0.2.42 : : + gw : | : : + 10.0.2.2 -:- eth0 --+-- vif1.0 -:-- eth0 : + : : 10.0.2.43 : + + The VMs use static IP addresses. + We create a bridge in dom0, which allows dom0 to reach the gateway. + vif1.0 is added to the bridge automatically when dom1 is created. + + There is a stability issue for Armv7 with Qemu < 9.1, which makes the + dom1 -> gw connection unreliable. As a workaround, we interact only with + dom0 from dom1 (hence the fixed IP addresses). + """ + + # Boot the emulator. + # The system should automatically boot Xen and a Dom0. + self.emulator.boot(arch=arch, options=options) + self.emulator.login() + + # Verify that we are indeed running under Xen. + self.assertRunOk("xl info") + + # Check that we are dom0. + uuid = self.get_dom_uuid() + dom0_uuid = "00000000-0000-0000-0000-000000000000" + self.assertEqual(uuid, dom0_uuid, f"Unexpected dom UUID {uuid}") + + # Check that we have one VM running. + self.assertNumVM(1) + + # Create a network bridge. + self.assertRunOk("brctl addbr br0") + self.assertRunOk("brctl addif br0 eth0") + self.assertRunOk("brctl show") + + # Bring up the network in the dom0. + self.assertRunOk("ifconfig eth0 up") + self.assertRunOk("ifconfig br0 10.0.2.42") + self.assertRunOk("ifconfig -a") + + # Verify that we can ping the gateway. + self.assertRunOk("ping -c 3 -A 10.0.2.2") + + # Create dom1 with console attached and login. + self.emulator.qemu.sendline("xl create -c /etc/xen/dom1.cfg") + self.emulator.login() + + # Check that we are not talking to dom0 anymore. + uuid = self.get_dom_uuid() + self.assertNotEqual(uuid, dom0_uuid, "Unexpected dom0 UUID") + + # Bring up the network in the dom1. + self.assertRunOk("ifconfig eth0 10.0.2.43") + self.assertRunOk("ifconfig -a") + + # Verify that we can ping the dom0. + self.assertRunOk("ping -c 3 -A 10.0.2.42") + + # Detach from dom1's console with CTRL-]. + # dom1 is still running in the background after that. + self.emulator.qemu.send(chr(0x1d)) + mult = self.emulator.timeout_multiplier + index = self.emulator.qemu.expect(["#", pexpect.TIMEOUT], + timeout=2 * mult) + self.assertEqual(index, 0, "Timeout exiting guest") + + # Check that we are talking to dom0 again. + uuid = self.get_dom_uuid() + self.assertEqual(uuid, dom0_uuid, f"Unexpected dom UUID {uuid}") + + # Check that we have two VMs running. + self.assertNumVM(2) + + # Print the bridge setup for debugging. + self.assertRunOk("brctl show") + + +class TestXenAarch64(TestXenBase): + # Test Xen on 64b Arm. + # Boot flow: Qemu Devicetree -> U-Boot -> Xen UEFI -> Linux + # We need to boot Xen in UEFI to read xen.cfg. + # We use U-Boot as our UEFI firmware. + # We have a custom kernel config to reduce build time. + # Our genimage.cfg is inspired from qemu_aarch64_ebbr_defconfig as we boot + # Xen with UEFI. + config = TestXenBase.base_config + \ + """ + BR2_aarch64=y + BR2_ROOTFS_OVERLAY="support/testing/tests/package/test_xen/common/overlay \ + support/testing/tests/package/test_xen/aarch64/overlay" + BR2_ROOTFS_POST_IMAGE_SCRIPT="support/testing/tests/package/test_xen/aarch64/post-image.sh support/scripts/genimage.sh" + BR2_ROOTFS_POST_SCRIPT_ARGS="-c support/testing/tests/package/test_xen/aarch64/genimage.cfg" + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/package/test_xen/aarch64/linux.config" + BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" + """ + + def test_run(self): + uboot_bin = os.path.join(self.builddir, "images", "u-boot.bin") + disk_img = os.path.join(self.builddir, "images", "disk.img") + + # We need to run Qemu with virtualization to run Xen. + qemu_opts = [ + "-bios", uboot_bin, + "-cpu", "cortex-a53", + "-device", "virtio-blk-device,drive=hd0", + "-device", "virtio-net-device,netdev=eth0", + "-drive", f"file={disk_img},if=none,format=raw,id=hd0", + "-m", "1G", + "-netdev", "user,id=eth0,restrict=yes", + "-machine", "virt,gic-version=3,virtualization=on,acpi=off", + "-smp", "2" + ] + + # Run Xen test. + self.run_xen_test(arch="aarch64", options=qemu_opts) + + +class TestXenArmv7(TestXenBase): + # Test Xen on 32b Arm v7. + # Boot flow: Qemu Devicetree -> U-Boot -> Xen -> Linux + # Xen does not boot with UEFI on 32-bit Arm v7. + # We use U-Boot and a script to load the Dom0 images and amend the + # Devicetree for Xen dynamically. + # We have a custom kernel config to reduce build time. + config = TestXenBase.base_config + \ + """ + BR2_arm=y + BR2_cortex_a15=y + BR2_ROOTFS_OVERLAY="support/testing/tests/package/test_xen/common/overlay \ + support/testing/tests/package/test_xen/arm/overlay" + BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" + BR2_ROOTFS_POST_SCRIPT_ARGS="-c support/testing/tests/package/test_xen/arm/genimage.cfg" + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/package/test_xen/arm/linux.config" + BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" + BR2_PACKAGE_HOST_UBOOT_TOOLS=y + BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y + BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="support/testing/tests/package/test_xen/arm/boot.cmd" + """ + + def test_run(self): + uboot_bin = os.path.join(self.builddir, "images", "u-boot.bin") + disk_img = os.path.join(self.builddir, "images", "disk.img") + + # We need to run Qemu with virtualization to run Xen. + qemu_opts = [ + "-bios", uboot_bin, + "-cpu", "cortex-a15", + "-device", "virtio-blk-device,drive=hd0", + "-device", "virtio-net-device,netdev=eth0", + "-drive", f"file={disk_img},if=none,format=raw,id=hd0", + "-m", "1G", + "-machine", "virt,virtualization=on,acpi=off", + "-netdev", "user,id=eth0,restrict=yes", + "-smp", "2" + ] + + # Run Xen test. + self.run_xen_test(arch="armv7", options=qemu_opts) diff --git a/support/testing/tests/package/test_xen/aarch64/genimage.cfg b/support/testing/tests/package/test_xen/aarch64/genimage.cfg new file mode 100644 index 0000000000..7d7a83d6b6 --- /dev/null +++ b/support/testing/tests/package/test_xen/aarch64/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI/BOOT/bootaa64.efi { + image = "xen" + } + + file EFI/BOOT/bootaa64.cfg { + image = "xen.cfg" + } + + files = { + "Image", + "rootfs.cpio" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } +} diff --git a/support/testing/tests/package/test_xen/aarch64/linux.config b/support/testing/tests/package/test_xen/aarch64/linux.config new file mode 100644 index 0000000000..1c6b6d7a6c --- /dev/null +++ b/support/testing/tests/package/test_xen/aarch64/linux.config @@ -0,0 +1,175 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_CPU_ISOLATION is not set +# CONFIG_INITRAMFS_PRESERVE_MTIME is not set +CONFIG_KALLSYMS_ALL=y +CONFIG_ARCH_VEXPRESS=y +# CONFIG_AMPERE_ERRATUM_AC03_CPU_38 is not set +# CONFIG_ARM64_ERRATUM_832075 is not set +# CONFIG_ARM64_ERRATUM_1024718 is not set +# CONFIG_ARM64_ERRATUM_1165522 is not set +# CONFIG_ARM64_ERRATUM_1319367 is not set +# CONFIG_ARM64_ERRATUM_1530923 is not set +# CONFIG_ARM64_ERRATUM_1463225 is not set +# CONFIG_ARM64_ERRATUM_1508412 is not set +# CONFIG_ARM64_ERRATUM_2051678 is not set +# CONFIG_ARM64_ERRATUM_2077057 is not set +# CONFIG_ARM64_ERRATUM_2658417 is not set +# CONFIG_ARM64_ERRATUM_2054223 is not set +# CONFIG_ARM64_ERRATUM_2067961 is not set +# CONFIG_ARM64_ERRATUM_2645198 is not set +# CONFIG_ARM64_ERRATUM_2966298 is not set +# CONFIG_ARM64_ERRATUM_3117295 is not set +# CONFIG_ARM64_ERRATUM_3194386 is not set +# CONFIG_CAVIUM_ERRATUM_22375 is not set +# CONFIG_CAVIUM_ERRATUM_23154 is not set +# CONFIG_CAVIUM_ERRATUM_27456 is not set +# CONFIG_CAVIUM_ERRATUM_30115 is not set +# CONFIG_CAVIUM_TX2_ERRATUM_219 is not set +# CONFIG_FUJITSU_ERRATUM_010001 is not set +# CONFIG_HISILICON_ERRATUM_161600802 is not set +# CONFIG_HISILICON_ERRATUM_162100801 is not set +# CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set +# CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set +# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set +# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set +# CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set +# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set +# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set +CONFIG_SCHED_MC=y +CONFIG_XEN=y +# CONFIG_ARM64_HW_AFDBM is not set +# CONFIG_ARM64_USE_LSE_ATOMICS is not set +# CONFIG_ARM64_RAS_EXTN is not set +# CONFIG_ARM64_CNP is not set +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_AMU_EXTN is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_BTI is not set +# CONFIG_ARM64_E0PD is not set +# CONFIG_ARM64_POE is not set +# CONFIG_ARM64_SVE is not set +CONFIG_RANDOMIZE_BASE=y +# CONFIG_SUSPEND is not set +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_COMPAT_32BIT_TIME=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_IOSCHED_BFQ=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_SWAP is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_KSM=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_IPV6 is not set +CONFIG_BRIDGE=m +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_VIRTIO_BLK=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_SAS_LIBSAS=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_MATRIXKMAP=y +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_INPUT_MISC=y +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_AMBAKMI=y +CONFIG_LEGACY_PTY_COUNT=16 +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_VIRTIO_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_GPIO_DWAPB=y +CONFIG_GPIO_MB86S7X=y +CONFIG_GPIO_PL061=y +CONFIG_GPIO_SYSCON=y +CONFIG_GPIO_AGGREGATOR=m +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_ARM_SP805_WATCHDOG=y +CONFIG_ARM_SBSA_WATCHDOG=y +CONFIG_ARM_SMC_WATCHDOG=y +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_MMIO=y +# CONFIG_VHOST_MENU is not set +CONFIG_XEN_GNTDEV=y +CONFIG_XEN_GRANT_DEV_ALLOC=y +# CONFIG_SURFACE_PLATFORMS is not set +# CONFIG_FSL_ERRATUM_A008585 is not set +# CONFIG_HISILICON_ERRATUM_161010101 is not set +# CONFIG_ARM64_ERRATUM_858921 is not set +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_GPIO=m +CONFIG_GENERIC_PHY=y +# CONFIG_ARM_PMU is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_QUOTA=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +# CONFIG_INTEGRITY is not set +CONFIG_PACKING=y +CONFIG_INDIRECT_PIO=y +CONFIG_DMA_RESTRICTED_POOL=y +CONFIG_IRQ_POLL=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +CONFIG_DEBUG_INFO_REDUCED=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +# CONFIG_FTRACE is not set +CONFIG_CORESIGHT=m +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=m +CONFIG_CORESIGHT_CATU=m +CONFIG_CORESIGHT_SINK_TPIU=m +CONFIG_CORESIGHT_SINK_ETBV10=m +CONFIG_CORESIGHT_STM=m +CONFIG_CORESIGHT_CPU_DEBUG=m +CONFIG_CORESIGHT_CTI=m +CONFIG_MEMTEST=y diff --git a/support/testing/tests/package/test_xen/aarch64/overlay/etc/xen/dom1.cfg b/support/testing/tests/package/test_xen/aarch64/overlay/etc/xen/dom1.cfg new file mode 100644 index 0000000000..651b8de919 --- /dev/null +++ b/support/testing/tests/package/test_xen/aarch64/overlay/etc/xen/dom1.cfg @@ -0,0 +1,6 @@ +name="dom1" +kernel="/mnt/Image" +ramdisk="/mnt/rootfs.cpio" +memory=256 +cmdline="console=hvc0" +vif=['bridge=br0'] diff --git a/support/testing/tests/package/test_xen/aarch64/post-image.sh b/support/testing/tests/package/test_xen/aarch64/post-image.sh new file mode 100755 index 0000000000..d74447ae93 --- /dev/null +++ b/support/testing/tests/package/test_xen/aarch64/post-image.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Copy xen configuration. +cp -f "${BOARD_DIR}/xen.cfg" "${BINARIES_DIR}/xen.cfg" diff --git a/support/testing/tests/package/test_xen/aarch64/xen.cfg b/support/testing/tests/package/test_xen/aarch64/xen.cfg new file mode 100644 index 0000000000..8007ba725c --- /dev/null +++ b/support/testing/tests/package/test_xen/aarch64/xen.cfg @@ -0,0 +1,3 @@ +options=dom0_mem=256M loglvl=all guest_loglvl=all +kernel=\Image console=hvc0 +ramdisk=\rootfs.cpio diff --git a/support/testing/tests/package/test_xen/arm/boot.cmd b/support/testing/tests/package/test_xen/arm/boot.cmd new file mode 100644 index 0000000000..859dc661c8 --- /dev/null +++ b/support/testing/tests/package/test_xen/arm/boot.cmd @@ -0,0 +1,23 @@ +fdt addr ${fdt_addr} +fdt resize + +fdt set /chosen \#address-cells <1> +fdt set /chosen \#size-cells <1> + +fdt mknod /chosen modules + +fdt mknod /chosen/modules module@0 +fdt set /chosen/modules/module@0 compatible "xen,linux-zimage" "xen,multiboot-module" +load ${devtype} ${devnum} ${kernel_addr_r} zImage +fdt set /chosen/modules/module@0 reg <${kernel_addr_r} 0x${filesize} > + +fdt mknod /chosen/modules module@1 +fdt set /chosen/modules/module@1 compatible "xen,linux-initrd" "xen,multiboot-module" +load ${devtype} ${devnum} ${ramdisk_addr_r} rootfs.cpio +fdt set /chosen/modules/module@1 reg <${ramdisk_addr_r} 0x${filesize} > + +load ${devtype} ${devnum} ${loadaddr} xen +fdt set /chosen xen,dom0-bootargs "console=hvc0" +fdt set /chosen xen,xen-bootargs "dom0_mem=256M loglvl=all guest_loglvl=all" +fdt print /chosen +bootz ${loadaddr} - ${fdt_addr} diff --git a/support/testing/tests/package/test_xen/arm/genimage.cfg b/support/testing/tests/package/test_xen/arm/genimage.cfg new file mode 100644 index 0000000000..6fd4e0edcd --- /dev/null +++ b/support/testing/tests/package/test_xen/arm/genimage.cfg @@ -0,0 +1,25 @@ +image boot.vfat { + vfat { + files = { + "boot.scr", + "xen", + "zImage", + "rootfs.cpio" + } + } + + size = 128M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "boot.vfat" + partition-type-uuid = F + offset = 32K + bootable = true + } +} diff --git a/support/testing/tests/package/test_xen/arm/linux.config b/support/testing/tests/package/test_xen/arm/linux.config new file mode 100644 index 0000000000..0a58785f73 --- /dev/null +++ b/support/testing/tests/package/test_xen/arm/linux.config @@ -0,0 +1,165 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_CPU_ISOLATION is not set +CONFIG_CGROUPS=y +CONFIG_BLK_DEV_INITRD=y +# CONFIG_INITRAMFS_PRESERVE_MTIME is not set +CONFIG_EXPERT=y +CONFIG_PERF_EVENTS=y +CONFIG_ARCH_VIRT=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_VEXPRESS_TC2_PM=y +CONFIG_SMP=y +CONFIG_MCPM=y +CONFIG_NR_CPUS=16 +CONFIG_HIGHMEM=y +CONFIG_ARCH_FORCE_MAX_ORDER=11 +CONFIG_XEN=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +# CONFIG_SUSPEND is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_CMDLINE_PARTITION=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_SWAP is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_IPV6 is not set +CONFIG_BRIDGE=y +CONFIG_QRTR=m +CONFIG_PAGE_POOL_STATS=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_VIRTIO_BLK=y +CONFIG_SRAM=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_SYSTEMPORT=m +CONFIG_MACB=y +CONFIG_FTGMAC100=m +CONFIG_HIX5HD2_GMAC=y +CONFIG_MVMDIO=y +CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +CONFIG_MDIO_BITBANG=y +CONFIG_MDIO_MSCC_MIIM=m +# CONFIG_WLAN is not set +CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_GPIO_DECODER=m +CONFIG_INPUT_ADXL34X=m +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_AMBAKMI=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=5 +CONFIG_SERIAL_8250_RUNTIME_UARTS=5 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_VIRTIO_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_TCG_TPM=m +CONFIG_SPMI=y +CONFIG_GPIO_DWAPB=y +CONFIG_GPIO_MPC8XXX=y +CONFIG_GPIO_PL061=y +CONFIG_GPIO_SYSCON=y +CONFIG_POWER_RESET_BRCMKONA=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_ARM_SP805_WATCHDOG=y +CONFIG_DW_WATCHDOG=y +CONFIG_BCMA=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +CONFIG_MFD_PM8XXX=y +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +CONFIG_EDAC=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_PM8XXX=m +CONFIG_DMADEVICES=y +CONFIG_PL330_DMA=y +CONFIG_DW_DMAC=y +CONFIG_VIRTIO_MMIO=y +# CONFIG_VHOST_MENU is not set +CONFIG_COMMON_CLK_SCMI=y +CONFIG_HWSPINLOCK=y +CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 +CONFIG_MICROCHIP_PIT64B=y +CONFIG_MAILBOX=y +CONFIG_PL320_MBOX=y +CONFIG_MEMORY=y +CONFIG_PWM=y +CONFIG_RESET_SIMPLE=y +# CONFIG_ARM_PMU is not set +CONFIG_RAS=y +CONFIG_FSI=m +CONFIG_FSI_MASTER_GPIO=m +CONFIG_FSI_MASTER_HUB=m +CONFIG_FSI_MASTER_ASPEED=m +CONFIG_FSI_SCOM=m +CONFIG_FSI_SBEFIFO=m +CONFIG_FSI_OCC=m +CONFIG_INTERCONNECT=y +CONFIG_COUNTER=m +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_AUTOFS_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_NTFS_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +CONFIG_DEBUG_INFO_REDUCED=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +# CONFIG_FTRACE is not set diff --git a/support/testing/tests/package/test_xen/arm/overlay/etc/xen/dom1.cfg b/support/testing/tests/package/test_xen/arm/overlay/etc/xen/dom1.cfg new file mode 100644 index 0000000000..3c75a0cfb7 --- /dev/null +++ b/support/testing/tests/package/test_xen/arm/overlay/etc/xen/dom1.cfg @@ -0,0 +1,6 @@ +name="dom1" +kernel="/mnt/zImage" +ramdisk="/mnt/rootfs.cpio" +memory=256 +cmdline="console=hvc0" +vif=['bridge=br0'] diff --git a/support/testing/tests/package/test_xen/common/overlay/etc/init.d/S99custom b/support/testing/tests/package/test_xen/common/overlay/etc/init.d/S99custom new file mode 100755 index 0000000000..889350725e --- /dev/null +++ b/support/testing/tests/package/test_xen/common/overlay/etc/init.d/S99custom @@ -0,0 +1,61 @@ +#!/bin/sh +# +# Custom script for test_xen.py +# This will run both in dom0 and in dom1. +# When we detect that we are in dom0 we mount the boot partition under /mnt, +# to see the kernel image and the initramfs. +# + +DAEMON="custom" + +start() { + printf 'Starting %s: ' "$DAEMON" + case $(cat /sys/hypervisor/uuid) in + 00000000-0000-0000-0000-000000000000) + printf "dom0 " + mount /dev/vda1 /mnt -o ro + ;; + *) printf "domU " ;; + esac + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + case $(cat /sys/hypervisor/uuid) in + 00000000-0000-0000-0000-000000000000) + printf "dom0 " + umount /mnt + ;; + *) printf "domU " ;; + esac + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/support/testing/tests/package/test_xen/common/overlay/etc/profile.d/stty-raw.sh b/support/testing/tests/package/test_xen/common/overlay/etc/profile.d/stty-raw.sh new file mode 100644 index 0000000000..3502579d80 --- /dev/null +++ b/support/testing/tests/package/test_xen/common/overlay/etc/profile.d/stty-raw.sh @@ -0,0 +1,3 @@ +# Avoid double-cooking the terminal, otherwise the test infrastructure +# would not be able to retrieve return codes properly. +stty raw diff --git a/support/testing/tests/package/test_xen/common/post-build.sh b/support/testing/tests/package/test_xen/common/post-build.sh new file mode 100755 index 0000000000..67b726cf3a --- /dev/null +++ b/support/testing/tests/package/test_xen/common/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +# Remove unnecessary Xen binaries to spare ramdisk size. +for ext in bin fd rom; do + rm -vf "${TARGET_DIR}/usr/share/qemu-xen/qemu/"*."$ext" +done diff --git a/support/testing/tests/package/test_xvisor.py b/support/testing/tests/package/test_xvisor.py new file mode 100644 index 0000000000..6872e22db9 --- /dev/null +++ b/support/testing/tests/package/test_xvisor.py @@ -0,0 +1,131 @@ +import os +import re + +import infra.basetest + + +class TestXvisor(infra.basetest.BRTest): + # RISC-V 64bit is the "simplest" configuration to run + # Xvisor into QEmu. + config = \ + """ + BR2_riscv=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_XVISOR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_OPENSBI=y + BR2_TARGET_OPENSBI_CUSTOM_VERSION=y + BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6" + BR2_TARGET_OPENSBI_PLAT="generic" + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y + """ + xvisor_prompt = "XVisor# " + + def expect_xvisor_prompt(self, timeout=-1): + self.emulator.qemu.expect(self.xvisor_prompt, timeout=timeout) + + def run_xvisor_cmd(self, cmd, timeout=-1): + exit_code = 0 + if timeout != -1: + timeout *= self.emulator.timeout_multiplier + self.emulator.qemu.sendline(cmd) + self.expect_xvisor_prompt(timeout) + output = self.emulator.qemu.before.replace("\r\r", "\r").splitlines()[1:] + # Some Xvisor commands (like "sleep") might not + # produce any output + if len(output) > 0: + last_line = output[-1] + else: + last_line = "" + if last_line.startswith("Error:"): + match = re.search(last_line, r"code (-?\d)") + if match is None: + exit_code = -1 + else: + exit_code = int(match.group(1)) + + return output, exit_code + + def assertXvRunOk(self, cmd, timeout=-1): + out, exit_code = self.run_xvisor_cmd(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run xvisor command: {}\noutput was:\n{}".format( + cmd, ' '+'\n '.join(out)) + ) + + def test_run(self): + opensbi = os.path.join(self.builddir, "images", "fw_jump.bin") + xvisor = os.path.join(self.builddir, "images", "vmm.bin") + initrd = os.path.join(self.builddir, "images", "rootfs.cpio") + + self.emulator.boot(arch="riscv64", + kernel=xvisor, + options=["-M", "virt", "-cpu", "rv64", "-m", "256M", + "-bios", opensbi, "-initrd", initrd]) + + # There is no emulator.login(), since we start directly in + # Xvisor prompt. + self.expect_xvisor_prompt() + + # Check Xvisor version. + output, exit_code = self.run_xvisor_cmd("version") + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("Xvisor")) + + # Check a basic echo. + test_str = "Hello Buildroot!" + output, exit_code = self.run_xvisor_cmd("echo " + test_str) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0].strip(), test_str) + + # Check a nonexisting command fails. + _, exit_code = self.run_xvisor_cmd("bad_command") + self.assertNotEqual(exit_code, 0) + + # Check an error of a valid command. + _, exit_code = self.run_xvisor_cmd("vfs ls /nodir") + self.assertNotEqual(exit_code, 0) + + # We mount the initrd... + self.assertXvRunOk("vfs mount initrd /") + + # Check we see an existing file/symlink "os-release" in + # "/etc", from our mounted initrd. + output, exit_code = self.run_xvisor_cmd("vfs ls /etc") + self.assertEqual(exit_code, 0) + self.assertIn("os-release", "\n".join(output)) + + # Check the word "Buildroot" is in the /etc/issue file. + output, exit_code = self.run_xvisor_cmd("vfs cat /etc/issue") + self.assertEqual(exit_code, 0) + self.assertIn("Buildroot", "\n".join(output)) + + # Check qemu is seen in host info. + output, exit_code = self.run_xvisor_cmd("host info") + self.assertEqual(exit_code, 0) + self.assertIn("qemu", "\n".join(output)) + + # Run a batch of status commands... + cmds = [ + "blockdev list", + "rbd list", + "module info 0", + "wallclock get_time", + "heap info", + "thread list", + "vcpu list", + "vcpu dumpreg 0", + "devtree node show /", + "host cpu info", + "host ram info", + "host resources", + "host bus_list", + "host bus_device_list platform" + ] + + for cmd in cmds: + self.assertXvRunOk(cmd) diff --git a/support/testing/tests/package/test_xxhash.py b/support/testing/tests/package/test_xxhash.py new file mode 100644 index 0000000000..00e0f245fc --- /dev/null +++ b/support/testing/tests/package/test_xxhash.py @@ -0,0 +1,35 @@ +import os + +import infra.basetest + + +class TestXxHash(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_XXHASH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + testfile = "data.bin" + + # Check we can run the program. + self.assertRunOk("xxhsum --version") + + # We create a test data file with random data. + cmd = f"dd if=/dev/urandom of={testfile} bs=1M count=1" + self.assertRunOk(cmd) + + # For the three hash sizes, we compute the xxhash and check + # the integrity of the file. + for hsize in [32, 64, 128]: + hashfile = f"{testfile}.xxh{hsize}" + self.assertRunOk(f"xxh{hsize}sum {testfile} | tee {hashfile}") + self.assertRunOk(f"xxh{hsize}sum -c {hashfile}") diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 27dbc2869b..698d8d8bbd 100644 --- a/support/testing/tests/package/test_zfs.py +++ b/support/testing/tests/package/test_zfs.py @@ -7,15 +7,16 @@ class TestZfsBase(infra.basetest.BRTest): timeout = 60 * 3 config = \ """ - BR2_x86_64=y - BR2_x86_corei7=y + BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.35" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.9" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y - BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_ZFS=y BR2_PACKAGE_PYTHON3=y @@ -28,13 +29,14 @@ class TestZfsBase(infra.basetest.BRTest): """ def base_test_run(self): - kernel = os.path.join(self.builddir, "images", "bzImage") + kernel = os.path.join(self.builddir, "images", "Image") cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot( - arch="x86_64", + arch="aarch64", kernel=kernel, - kernel_cmdline=["console=ttyS0"], - options=["-cpu", "Nehalem", "-m", "320", "-initrd", cpio_file], + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "320M", + "-initrd", cpio_file], ) self.emulator.login() @@ -64,7 +66,7 @@ class TestZfsBase(infra.basetest.BRTest): class TestZfsGlibc(TestZfsBase): config = TestZfsBase.config + \ """ - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y """ def test_run(self): @@ -72,9 +74,18 @@ class TestZfsGlibc(TestZfsBase): class TestZfsUclibc(TestZfsBase): - config = TestZfsBase.config + \ + # The Bootling aarch64 uclibc stable 2025.08-1 needs to be + # rebuild with uClibc-ng 1.0.55. + # See: https://github.com/wbx-github/uclibc-ng/commit/94c1297d52263e20cd9715601afa37f49d008d93 + config = TestZfsBase.config.replace('BR2_TOOLCHAIN_EXTERNAL=y\n', '') + config = config.replace('BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y\n', '') + \ """ - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y + BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y + BR2_KERNEL_HEADERS_5_10=y + BR2_TOOLCHAIN_BUILDROOT_LOCALE=y + BR2_PTHREAD_DEBUG=y + BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_GCC_ENABLE_OPENMP=y """ def test_run(self): @@ -84,7 +95,7 @@ class TestZfsUclibc(TestZfsBase): class TestZfsMusl(TestZfsBase): config = TestZfsBase.config + \ """ - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE=y """ def test_run(self): diff --git a/support/testing/tests/toolchain/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/toolchain/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..e66d70def3 Binary files /dev/null and b/support/testing/tests/toolchain/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/toolchain/__pycache__/test_aarch64_64k.cpython-312.pyc b/support/testing/tests/toolchain/__pycache__/test_aarch64_64k.cpython-312.pyc new file mode 100644 index 0000000000..f483efb461 Binary files /dev/null and b/support/testing/tests/toolchain/__pycache__/test_aarch64_64k.cpython-312.pyc differ diff --git a/support/testing/tests/toolchain/__pycache__/test_external.cpython-312.pyc b/support/testing/tests/toolchain/__pycache__/test_external.cpython-312.pyc new file mode 100644 index 0000000000..6b388358ad Binary files /dev/null and b/support/testing/tests/toolchain/__pycache__/test_external.cpython-312.pyc differ diff --git a/support/testing/tests/toolchain/__pycache__/test_external_arm.cpython-312.pyc b/support/testing/tests/toolchain/__pycache__/test_external_arm.cpython-312.pyc new file mode 100644 index 0000000000..f7db388635 Binary files /dev/null and b/support/testing/tests/toolchain/__pycache__/test_external_arm.cpython-312.pyc differ diff --git a/support/testing/tests/toolchain/__pycache__/test_external_bootlin.cpython-312.pyc b/support/testing/tests/toolchain/__pycache__/test_external_bootlin.cpython-312.pyc new file mode 100644 index 0000000000..336ecfcf3c Binary files /dev/null and b/support/testing/tests/toolchain/__pycache__/test_external_bootlin.cpython-312.pyc differ diff --git a/support/testing/tests/toolchain/__pycache__/test_external_synopsys.cpython-312.pyc b/support/testing/tests/toolchain/__pycache__/test_external_synopsys.cpython-312.pyc new file mode 100644 index 0000000000..d771a40d7c Binary files /dev/null and b/support/testing/tests/toolchain/__pycache__/test_external_synopsys.cpython-312.pyc differ diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py index 27dfd68500..aed3664a02 100644 --- a/support/testing/tests/toolchain/test_external.py +++ b/support/testing/tests/toolchain/test_external.py @@ -37,15 +37,15 @@ class TestExternalToolchain(infra.basetest.BRTest): self.assertTrue(os.path.exists(interp_path)) -class TestExternalToolchainLinaroArm(TestExternalToolchain): +class TestExternalToolchainArmGnu(TestExternalToolchain): config = BASIC_CONFIG + \ """ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y + BR2_TOOLCHAIN_EXTERNAL_ARM_ARM=y """ - toolchain_prefix = "arm-linux-gnueabihf" + toolchain_prefix = "arm-none-linux-gnueabihf" def test_run(self): TestExternalToolchain.common_check(self) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index c137444cbc..6bcebf80c0 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -1653,34 +1653,6 @@ class TestExternalToolchainBootlinMips64r6eln32UclibcStable(TestExternalToolchai TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinNios2GlibcBleedingEdge(TestExternalToolchain): - config = """ - BR2_nios2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "nios2-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - -class TestExternalToolchainBootlinNios2GlibcStable(TestExternalToolchain): - config = """ - BR2_nios2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "nios2-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinOpenriscGlibcBleedingEdge(TestExternalToolchain): config = """ BR2_or1k=y diff --git a/support/testing/tests/utils/__pycache__/__init__.cpython-312.pyc b/support/testing/tests/utils/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000..41ad0d0e47 Binary files /dev/null and b/support/testing/tests/utils/__pycache__/__init__.cpython-312.pyc differ diff --git a/support/testing/tests/utils/__pycache__/test_check_package.cpython-312.pyc b/support/testing/tests/utils/__pycache__/test_check_package.cpython-312.pyc new file mode 100644 index 0000000000..6a8d4e0fca Binary files /dev/null and b/support/testing/tests/utils/__pycache__/test_check_package.cpython-312.pyc differ diff --git a/support/testing/tests/utils/__pycache__/test_get_developers.cpython-312.pyc b/support/testing/tests/utils/__pycache__/test_get_developers.cpython-312.pyc new file mode 100644 index 0000000000..7a9466936d Binary files /dev/null and b/support/testing/tests/utils/__pycache__/test_get_developers.cpython-312.pyc differ diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index ffc01f6ce7..195e421332 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -13,20 +13,32 @@ import unittest import infra -def call_script(args, env, cwd): +def call_script(args, env, cwd, stdin_data=None): """Call a script and return stdout and stderr as lists and the exit code.""" - proc = subprocess.Popen(args, cwd=cwd, stdout=subprocess.PIPE, + if stdin_data is None: + # We need stdin to be a tty, not just a pipe or whatever + m_tty, s_tty = os.openpty() + com_opts = dict() + else: + s_tty = subprocess.PIPE + com_opts = dict([("input", stdin_data)]) + proc = subprocess.Popen(args, cwd=cwd, + stdin=s_tty, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, universal_newlines=True) - out, err = proc.communicate() + out, err = proc.communicate(**com_opts) + if stdin_data is None: + os.close(s_tty) + os.close(m_tty) return out.splitlines(), err.splitlines(), proc.returncode -def call_get_developers(cmd, args, env, cwd, developers_content): +def call_get_developers(cmd, args, env, cwd, developers_content, stdin_data=None): """Call get-developers overrinding the default DEVELOPERS file.""" with tempfile.NamedTemporaryFile(buffering=0) as developers_file: developers_file.write(developers_content) - return call_script([cmd, "-d", developers_file.name] + args, env, cwd) + return call_script([cmd, "-d", developers_file.name] + args, env, cwd, stdin_data) class TestGetDevelopers(unittest.TestCase): @@ -41,9 +53,9 @@ class TestGetDevelopers(unittest.TestCase): # no args, with syntax error in the file developers = b'text3\n' out, err, rc = call_get_developers("./utils/get-developers", [], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("No action specified", out) - self.assertEqual(rc, 0) - self.assertEqual(len(err), 0) + self.assertIn("No action specified", "\n".join(err)) + self.assertEqual(rc, 2) + self.assertEqual(len(out), 0) # -v generating error, called from the main dir developers = b'text1\n' @@ -150,9 +162,9 @@ class TestGetDevelopers(unittest.TestCase): # no args, with syntax error in the file developers = b'text3\n' out, err, rc = call_get_developers("./utils/get-developers", [], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("No action specified", out) - self.assertEqual(rc, 0) - self.assertEqual(len(err), 0) + self.assertIn("No action specified", "\n".join(err)) + self.assertEqual(rc, 2) + self.assertEqual(len(out), 0) # patchfile from topdir and from elsewhere abs_path = infra.filepath("tests/utils/test_get_developers/") @@ -168,3 +180,9 @@ class TestGetDevelopers(unittest.TestCase): self.assertIn('git send-email --to buildroot@buildroot.org --cc "dev1"', out) self.assertEqual(rc, 0) self.assertEqual(len(err), 0) + with open(abs_file, "r") as fd: + patch_data = fd.read() + out, err, rc = call_get_developers("./utils/get-developers", [], self.WITH_EMPTY_PATH, topdir, developers, patch_data) + self.assertIn('git send-email --to buildroot@buildroot.org --cc "dev1"', out) + self.assertEqual(rc, 0) + self.assertEqual(len(err), 0) diff --git a/system/Config.in b/system/Config.in index 8f3579b7e0..0652b94a3b 100644 --- a/system/Config.in +++ b/system/Config.in @@ -115,10 +115,6 @@ comment "openrc needs a glibc or musl toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS && BR2_TOOLCHAIN_USES_UCLIBC -# In Buildroot, we decided not to support a split-usr when systemd is -# used as an init system. This is a design decision, not a systemd -# issue. Thus the select is with BR2_INIT_SYSTEMD (below) rather than -# with BR2_PACKAGE_SYSTEMD. config BR2_INIT_SYSTEMD bool "systemd" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS @@ -130,7 +126,6 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_HOST_GCC_AT_LEAST_8 - select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT @@ -149,6 +144,17 @@ comment "systemd highly recommends Linux >= 4.15" comment "Special purpose (read help)" +config BR2_INIT_CATATONIT + bool "catatonit" + depends on BR2_USE_MMU # catatonit + select BR2_PACKAGE_CATATONIT + select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT + help + A container init that is so simple it's effectively + brain-dead. + + https://github.com/openSUSE/catatonit + config BR2_INIT_TINI bool "tini" depends on BR2_USE_MMU # tini @@ -326,7 +332,7 @@ config BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES Support extended attributes handling in device tables config BR2_ROOTFS_MERGED_USR - bool "Use symlinks to /usr for /bin, /sbin and /lib" + bool "Merged /usr" help If you say 'n' here, then /bin, /sbin and /lib and their counterparts in /usr will be separate directories. This @@ -337,6 +343,16 @@ config BR2_ROOTFS_MERGED_USR symlinks to their counterparts in /usr. In this case, /usr can not be a separate filesystem. +config BR2_ROOTFS_MERGED_BIN + bool "Merged /usr/bin" + depends on BR2_ROOTFS_MERGED_USR + help + If you say 'n' here, then /usr/bin and /usr/sbin will be + separate directories; this is the historical UNIX way. + + If you say 'y' here, then /usr/sbin will be a relative + symlink to /usr/bin. + if BR2_ROOTFS_SKELETON_DEFAULT config BR2_TARGET_ENABLE_ROOT_LOGIN @@ -523,8 +539,9 @@ endif # BR2_ROOTFS_SKELETON_DEFAULT config BR2_SYSTEM_DEFAULT_PATH string "Set the system's default PATH" + default "/usr/bin" if BR2_ROOTFS_MERGED_BIN default "/usr/bin:/usr/sbin" if BR2_ROOTFS_MERGED_USR - default "/bin:/sbin:/usr/bin:/usr/sbin" if !BR2_ROOTFS_MERGED_USR + default "/bin:/sbin:/usr/bin:/usr/sbin" help Sets the system's default PATH. It is being used in /etc/profile in the skeleton-init-common package and by some diff --git a/system/skeleton/etc/resolv.conf b/system/skeleton/etc/resolv.conf index 71f6f96576..2ce2910f08 120000 --- a/system/skeleton/etc/resolv.conf +++ b/system/skeleton/etc/resolv.conf @@ -1 +1 @@ -../tmp/resolv.conf \ No newline at end of file +../run/resolv.conf \ No newline at end of file diff --git a/system/system.mk b/system/system.mk index 8fe2c138b0..52e810868a 100644 --- a/system/system.mk +++ b/system/system.mk @@ -32,18 +32,30 @@ # set inittab to remount root read-write or read-only # -# This function handles the merged or non-merged /usr cases +# This function handles the merged or non-merged /usr, and merged or +# non-merged /usr/bin cases ifeq ($(BR2_ROOTFS_MERGED_USR),y) +ifeq ($(BR2_ROOTFS_MERGED_BIN),y) +define SYSTEM_SBIN_SYMLINKS_OR_DIRS + ln -snf bin $(1)/usr/sbin +endef +else +define SYSTEM_SBIN_SYMLINKS_OR_DIRS + $(INSTALL) -d -m 0755 $(1)/usr/sbin +endef +endif define SYSTEM_USR_SYMLINKS_OR_DIRS ln -snf usr/bin $(1)/bin ln -snf usr/sbin $(1)/sbin ln -snf usr/lib $(1)/lib + $(SYSTEM_SBIN_SYMLINKS_OR_DIRS) endef else define SYSTEM_USR_SYMLINKS_OR_DIRS $(INSTALL) -d -m 0755 $(1)/bin $(INSTALL) -d -m 0755 $(1)/sbin $(INSTALL) -d -m 0755 $(1)/lib + $(INSTALL) -d -m 0755 $(1)/usr/sbin endef endif diff --git a/toolchain/Config.in b/toolchain/Config.in index c2522aca7f..8330e652c2 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -89,7 +89,6 @@ config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 config BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS bool default y - depends on !BR2_nios2 depends on !BR2_ARM_CPU_ARMV4 depends on !BR2_ARM_CPU_ARMV5 depends on !BR2_sparc_v8 @@ -180,23 +179,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_90620 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || BR2_TOOLCHAIN_GCC_AT_LEAST_11 -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93847 -# ICE: compiler error: Segmentation fault on Nios II. This bug -# no longer exists in gcc 9.x. -config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 - bool - default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 - -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 -# Error: branch offset out of range on Nios II. This bug -# no longer exists in gcc 8.x but reappeared on gcc 9.x and still exists -# on gcc 12.x -config BR2_TOOLCHAIN_HAS_GCC_BUG_99410 - bool - default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 - depends on BR2_nios2 - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 # ICE: SH4 -Os causes internal compiler error. This bug # still exists in gcc = 11.1.0 @@ -238,7 +220,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 bool default y if BR2_microblazebe || BR2_microblazeel \ || BR2_mips || BR2_mipsel \ - || BR2_nios2 \ || BR2_or1k \ || BR2_sh depends on BR2_TOOLCHAIN_USES_GLIBC @@ -262,6 +243,16 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_111001 BR2_OPTIMIZE_2 || \ BR2_OPTIMIZE_3 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121567 +# error: unable to find a register to spill in class ‘R0_REGS’ +# The bug exists at least since gcc 6.x, so we are assuming it affects +# all GCC versions. +config BR2_TOOLCHAIN_HAS_GCC_BUG_121567 + bool + default y if BR2_sh + depends on BR2_OPTIMIZE_2 || \ + BR2_OPTIMIZE_3 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool @@ -660,6 +651,34 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -673,6 +692,13 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 + default "6.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 + default "6.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + default "6.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 + default "6.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + default "6.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + default "6.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 @@ -815,10 +841,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_14 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_13 +config BR2_TOOLCHAIN_GCC_AT_LEAST_15 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "15" if BR2_TOOLCHAIN_GCC_AT_LEAST_15 default "14" if BR2_TOOLCHAIN_GCC_AT_LEAST_14 default "13" if BR2_TOOLCHAIN_GCC_AT_LEAST_13 default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -955,7 +986,7 @@ config BR2_TOOLCHAIN_HAS_LIBQUADMATH comment "Bare metal toolchain" config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT - bool "Build a bare metal toolchain" + bool "Build bare metal toolchains" select BR2_PACKAGE_NEWLIB_BARE_METAL help Select if you need a bare-metal toolchain for building diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index f3fdaaec07..21c710d0fb 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -96,6 +96,10 @@ copy_toolchain_lib_root = \ # Note that the 'locale' directories are not copied. They are huge # (400+MB) in CodeSourcery toolchains, and they are not really useful. # +# usr/sbin may be a directory in the source toolchain, but a symlink +# in the destination sysroot, when we are using a merged-bin. Account +# for that. +# # $1: main sysroot directory of the toolchain # $2: arch specific sysroot directory of the toolchain # $3: arch specific subdirectory in the sysroot @@ -109,13 +113,13 @@ copy_toolchain_sysroot = \ ARCH_SUBDIR="$(strip $3)"; \ ARCH_LIB_DIR="$(strip $4)" ; \ SUPPORT_LIB_DIR="$(strip $5)" ; \ - for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR}; do \ + for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR} usr/sbin; do \ if [ ! -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \ continue ; \ fi ; \ if [ "$$i" = "usr" ]; then \ rsync -au --chmod=u=rwX,go=rX --exclude 'locale/' \ - --include '/libexec*/' --exclude '/lib*/' \ + --include '/libexec*/' --exclude '/lib*/' --exclude '/sbin' \ $${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \ else \ rsync -au --chmod=u=rwX,go=rX --exclude 'locale/' \ diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index 6fe969357f..7ba579b570 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -1,10 +1,30 @@ if BR2_TOOLCHAIN_BARE_METAL_BUILDROOT config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH - string "architecture tuple" + string "list of architecture tuples" help - This option allows to define the architecture tuple for the - bare-metal toolchain. + This option allows to define the list of architecture + tuples for which bare-metal toolchains will be created. + One toolchain will be built for each of the architecture + tuples specified in this option. + + For example, to build both a Microblaze and a RISC-V bare + metal toolchain, use the following definition: + "microblazeel-buildroot-elf riscv32-buildroot-elf" + +config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_MULTILIB + bool "Enable multilib" + help + Sometimes the default GCC and newlib libraries for a given + architecture are not the desired ABI. Since ABI + definitions are different for each architecture, this + option will enable multilib configuration, so that all + available ABI libraries are built which will guarantee + that the desired version will be available for user + applications. + + When enabled, this option will apply to all architecture + tuples in the list. source "package/newlib-bare-metal/Config.in" diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk index dbfe30a910..71063fcee4 100644 --- a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -6,7 +6,6 @@ TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = newlib-bare-metal TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) -TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO $(eval $(virtual-package)) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 0173f40d97..0bccdc817c 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -48,6 +48,10 @@ comment "glibc needs a toolchain w/ kernel headers >= 3.2" depends on BR2_PACKAGE_GLIBC_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 +comment "glibc on LoongArch64 needs a toolchain w/ headers >= 5.19" + depends on BR2_loongarch64 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + # glibc >= 2.26 require kernel headers >= 3.10 on powerpc64le. comment "glibc on powerpc64le needs a toolchain w/ headers >= 3.10" depends on BR2_powerpc64le diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index e91aa16326..831387bc4e 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -10,24 +10,15 @@ choice # Aarch64 (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in" -source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in" -source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in" # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" # ARM (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in" -source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" - -# ARM big-endian -source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" - -# MIPS -source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" # Bootlin toolchains, available for virtually all architectures source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in" @@ -107,24 +98,15 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX # Aarch64 source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options" # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options" # ARM source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" - -# ARM big-endian -source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" - -# MIPS -source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" # Bootlin toolchains source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options" diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index c08bf0a653..2c2afa76c0 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -217,6 +217,10 @@ ifneq ($(GCC_TARGET_FLOAT_ABI),) TOOLCHAIN_EXTERNAL_CFLAGS += -mfloat-abi=$(GCC_TARGET_FLOAT_ABI) TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(GCC_TARGET_FLOAT_ABI)"' endif +ifneq ($(GCC_TARGET_SIMD),) +TOOLCHAIN_EXTERNAL_CFLAGS += -msimd=$(GCC_TARGET_SIMD) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_SIMD='"$(GCC_TARGET_SIMD)"' +endif ifneq ($(GCC_TARGET_MODE),) TOOLCHAIN_EXTERNAL_CFLAGS += -m$(GCC_TARGET_MODE) TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MODE='"$(GCC_TARGET_MODE)"' diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index d3c095b2b6..3a71e1356b 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,13 +1,13 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 13.3.rel1" + bool "Arm AArch64 BE 14.2.rel1" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index f876465543..317fc10a09 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,2 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc -sha256 55a2f073708c938ffe1d302859e5c3d6195b8bca3affa3d3aa6b2aafd79bf487 arm-gnu-toolchain-13.3.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc +sha256 0ea5d00d0ba4c5d16bc8e140d434c54367516b568a146d724936c589a2f56aaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index dd03635e71..381a591932 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 13.3.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 14.2.rel1 TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 7f4fc61f2f..8582fe0ec8 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,13 +1,13 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 13.3.rel1" + bool "Arm AArch64 14.2.rel1" depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86_64" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "aarch64" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index 75478913b0..3f9c9cea71 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,2 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc -sha256 322f0b4482fc0d9fa0bb468134841f08d8c554c54ff5aa29a13a7a24bf7e1eb5 arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc +sha256 47aeefc02b0ee39f6d4d1812110952975542d365872a7474b5306924bca4faa1 arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-linux-gnu.tar.xz.sha256asc +sha256 299c56db1644c135670afabbf801b97a42e5ef6069d73157ab869458cbda2096 arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index b6c75ecf3f..cbc923bee5 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 13.3.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 14.2.rel1 TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-$(HOSTARCH)-aarch64-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index b110885a96..7b1a7fb27f 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -3,23 +3,23 @@ comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 13.3.rel1" + bool "Arm ARM 14.2.rel1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_ARM_CPU_HAS_NEON depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "aarch64" depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 13.3, - GDB 14, glibc 2.38, Binutils 2.42. It generates code + Arm toolchain for the ARM architecture. It uses GCC 14.2, + GDB 15, glibc 2.40, Binutils 2.43. It generates code that runs on all Cortex-A profile devices. The code generated uses the hard floating point calling convention, and uses the NEON FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index 6d4facfdad..9a657a5ed4 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc -sha256 560267bdecf966b7a48467d0af6c81a85b906ef7b0a9b9dd91f506184b940281 arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc -sha256 377d11ec2b55c55306d435d3f2e3760f92efafa649393d5b6778457b3c8af1ab arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 32301a5a33aab47810837cdab848a5a513ca22804d3168d3ada5833828b07912 arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 3fe832f9c831323a37ff54bfb5ac7a083acdd473f2c93feaf0cb3c1ac690d739 arm-gnu-toolchain-14.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 84e0e18276..86937a7412 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 13.3.rel1 +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 14.2.rel1 TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 098e44fc36..e98ee023cb 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -8,8 +8,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_arcle && BR2_archs38 default y if BR2_arm && BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI default y if BR2_arm && BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF - default y if BR2_arm && BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF - default y if BR2_armeb && BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF + default y if BR2_arm && (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + default y if BR2_armeb && (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A default y if BR2_arm && BR2_ARM_CPU_ARMV7M && BR2_BINFMT_FLAT default y if BR2_m68k_m68k default y if BR2_m68k_cf @@ -22,7 +22,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_mips64 && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT default y if BR2_mips64el && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT default y if BR2_mips64el && BR2_mips_64r6 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT - default y if BR2_nios2 default y if BR2_or1k default y if BR2_powerpc && BR2_powerpc_440fp default y if BR2_powerpc && BR2_powerpc_e300c3 @@ -58,11 +57,11 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL choice prompt "Bootlin toolchain variant" config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE - bool "aarch64 glibc bleeding-edge 2024.05-1" + bool "aarch64 glibc bleeding-edge 2025.08-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -83,12 +82,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE - bool "aarch64 glibc stable 2024.05-1" + bool "aarch64 glibc stable 2025.08-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -107,11 +106,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE - bool "aarch64 musl bleeding-edge 2024.05-1" + bool "aarch64 musl bleeding-edge 2025.08-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -132,12 +131,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE - bool "aarch64 musl stable 2024.05-1" + bool "aarch64 musl stable 2025.08-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -155,10 +154,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE - bool "aarch64 uclibc bleeding-edge 2024.05-1" + bool "aarch64 uclibc bleeding-edge 2025.08-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -180,11 +179,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE - bool "aarch64 uclibc stable 2024.05-1" + bool "aarch64 uclibc stable 2025.08-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -204,11 +203,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE - bool "aarch64be glibc bleeding-edge 2024.05-1" + bool "aarch64be glibc bleeding-edge 2025.08-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -229,12 +228,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE - bool "aarch64be glibc stable 2024.05-1" + bool "aarch64be glibc stable 2025.08-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -253,11 +252,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE - bool "aarch64be musl bleeding-edge 2024.05-1" + bool "aarch64be musl bleeding-edge 2025.08-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -278,12 +277,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE - bool "aarch64be musl stable 2024.05-1" + bool "aarch64be musl stable 2025.08-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -301,10 +300,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE - bool "aarch64be uclibc bleeding-edge 2024.05-1" + bool "aarch64be uclibc bleeding-edge 2025.08-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -326,11 +325,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE - bool "aarch64be uclibc stable 2024.05-1" + bool "aarch64be uclibc stable 2025.08-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -350,11 +349,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE - bool "arcle-750d uclibc bleeding-edge 2024.05-1" + bool "arcle-750d uclibc bleeding-edge 2025.08-1" depends on BR2_arcle depends on BR2_arc750d - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -375,12 +375,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE - bool "arcle-750d uclibc stable 2024.05-1" + bool "arcle-750d uclibc stable 2025.08-1" depends on BR2_arcle depends on BR2_arc750d - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -399,12 +400,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE - bool "arcle-hs38 glibc bleeding-edge 2024.05-1" + bool "arcle-hs38 glibc bleeding-edge 2025.08-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -424,12 +425,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE - bool "arcle-hs38 glibc stable 2024.05-1" + bool "arcle-hs38 glibc stable 2025.08-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_SSP @@ -448,11 +449,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE - bool "arcle-hs38 uclibc bleeding-edge 2024.05-1" + bool "arcle-hs38 uclibc bleeding-edge 2025.08-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -473,12 +474,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE - bool "arcle-hs38 uclibc stable 2024.05-1" + bool "arcle-hs38 uclibc stable 2025.08-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -497,13 +498,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE - bool "armv5-eabi glibc bleeding-edge 2024.05-1" + bool "armv5-eabi glibc bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -524,14 +525,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE - bool "armv5-eabi glibc stable 2024.05-1" + bool "armv5-eabi glibc stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -550,13 +551,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE - bool "armv5-eabi musl bleeding-edge 2024.05-1" + bool "armv5-eabi musl bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -577,14 +578,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE - bool "armv5-eabi musl stable 2024.05-1" + bool "armv5-eabi musl stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -603,12 +604,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE - bool "armv5-eabi uclibc bleeding-edge 2024.05-1" + bool "armv5-eabi uclibc bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -630,13 +631,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE - bool "armv5-eabi uclibc stable 2024.05-1" + bool "armv5-eabi uclibc stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -656,13 +657,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv6-eabihf glibc bleeding-edge 2024.05-1" + bool "armv6-eabihf glibc bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -683,14 +684,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE - bool "armv6-eabihf glibc stable 2024.05-1" + bool "armv6-eabihf glibc stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -709,13 +710,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE - bool "armv6-eabihf musl bleeding-edge 2024.05-1" + bool "armv6-eabihf musl bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -736,14 +737,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE - bool "armv6-eabihf musl stable 2024.05-1" + bool "armv6-eabihf musl stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -762,12 +763,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv6-eabihf uclibc bleeding-edge 2024.05-1" + bool "armv6-eabihf uclibc bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -789,13 +790,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE - bool "armv6-eabihf uclibc stable 2024.05-1" + bool "armv6-eabihf uclibc stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -815,13 +816,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv7-eabihf glibc bleeding-edge 2024.05-1" + bool "armv7-eabihf glibc bleeding-edge 2025.08-1" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -842,14 +842,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE - bool "armv7-eabihf glibc stable 2024.05-1" + bool "armv7-eabihf glibc stable 2025.08-1" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -868,13 +867,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armv7-eabihf musl bleeding-edge 2024.05-1" + bool "armv7-eabihf musl bleeding-edge 2025.08-1" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -895,14 +893,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE - bool "armv7-eabihf musl stable 2024.05-1" + bool "armv7-eabihf musl stable 2025.08-1" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -921,12 +918,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv7-eabihf uclibc bleeding-edge 2024.05-1" + bool "armv7-eabihf uclibc bleeding-edge 2025.08-1" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -948,13 +944,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE - bool "armv7-eabihf uclibc stable 2024.05-1" + bool "armv7-eabihf uclibc stable 2025.08-1" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -974,13 +969,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armebv7-eabihf glibc bleeding-edge 2024.05-1" + bool "armebv7-eabihf glibc bleeding-edge 2025.08-1" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1001,14 +995,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE - bool "armebv7-eabihf glibc stable 2024.05-1" + bool "armebv7-eabihf glibc stable 2025.08-1" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1027,13 +1020,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armebv7-eabihf musl bleeding-edge 2024.05-1" + bool "armebv7-eabihf musl bleeding-edge 2025.08-1" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1054,14 +1046,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE - bool "armebv7-eabihf musl stable 2024.05-1" + bool "armebv7-eabihf musl stable 2025.08-1" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1080,12 +1071,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armebv7-eabihf uclibc bleeding-edge 2024.05-1" + bool "armebv7-eabihf uclibc bleeding-edge 2025.08-1" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1107,13 +1097,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE - bool "armebv7-eabihf uclibc stable 2024.05-1" + bool "armebv7-eabihf uclibc stable 2025.08-1" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1133,12 +1122,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE - bool "armv7m uclibc bleeding-edge 2024.05-1" + bool "armv7m uclibc bleeding-edge 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M depends on BR2_BINFMT_FLAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1158,13 +1147,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE - bool "armv7m uclibc stable 2024.05-1" + bool "armv7m uclibc stable 2025.08-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M depends on BR2_BINFMT_FLAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1182,11 +1171,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE - bool "m68k-68xxx glibc bleeding-edge 2024.05-1" + bool "m68k-68xxx glibc bleeding-edge 2025.08-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1207,12 +1196,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE - bool "m68k-68xxx glibc stable 2024.05-1" + bool "m68k-68xxx glibc stable 2025.08-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1231,11 +1220,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE - bool "m68k-68xxx musl bleeding-edge 2024.05-1" + bool "m68k-68xxx musl bleeding-edge 2025.08-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1256,12 +1245,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE - bool "m68k-68xxx musl stable 2024.05-1" + bool "m68k-68xxx musl stable 2025.08-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1280,10 +1269,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE - bool "m68k-68xxx uclibc bleeding-edge 2024.05-1" + bool "m68k-68xxx uclibc bleeding-edge 2025.08-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1305,11 +1294,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE - bool "m68k-68xxx uclibc stable 2024.05-1" + bool "m68k-68xxx uclibc stable 2025.08-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1329,10 +1318,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE - bool "m68k-coldfire uclibc bleeding-edge 2024.05-1" + bool "m68k-coldfire uclibc bleeding-edge 2025.08-1" depends on BR2_m68k_cf - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1352,11 +1341,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE - bool "m68k-coldfire uclibc stable 2024.05-1" + bool "m68k-coldfire uclibc stable 2025.08-1" depends on BR2_m68k_cf - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1374,12 +1363,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE - bool "microblazebe glibc bleeding-edge 2024.05-1" + bool "microblazebe glibc bleeding-edge 2025.08-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1397,13 +1386,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE - bool "microblazebe glibc stable 2024.05-1" + bool "microblazebe glibc stable 2025.08-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1420,12 +1409,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE - bool "microblazebe musl bleeding-edge 2024.05-1" + bool "microblazebe musl bleeding-edge 2025.08-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1443,13 +1432,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE - bool "microblazebe musl stable 2024.05-1" + bool "microblazebe musl stable 2025.08-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1466,11 +1455,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE - bool "microblazebe uclibc bleeding-edge 2024.05-1" + bool "microblazebe uclibc bleeding-edge 2025.08-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1490,12 +1479,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE - bool "microblazebe uclibc stable 2024.05-1" + bool "microblazebe uclibc stable 2025.08-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1514,12 +1503,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE - bool "microblazeel glibc bleeding-edge 2024.05-1" + bool "microblazeel glibc bleeding-edge 2025.08-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1537,13 +1526,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE - bool "microblazeel glibc stable 2024.05-1" + bool "microblazeel glibc stable 2025.08-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1560,12 +1549,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE - bool "microblazeel musl bleeding-edge 2024.05-1" + bool "microblazeel musl bleeding-edge 2025.08-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1583,13 +1572,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE - bool "microblazeel musl stable 2024.05-1" + bool "microblazeel musl stable 2025.08-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1606,11 +1595,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE - bool "microblazeel uclibc bleeding-edge 2024.05-1" + bool "microblazeel uclibc bleeding-edge 2025.08-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1630,12 +1619,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE - bool "microblazeel uclibc stable 2024.05-1" + bool "microblazeel uclibc stable 2025.08-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1654,13 +1643,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE - bool "mips32 glibc bleeding-edge 2024.05-1" + bool "mips32 glibc bleeding-edge 2025.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1681,14 +1670,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE - bool "mips32 glibc stable 2024.05-1" + bool "mips32 glibc stable 2025.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1707,13 +1696,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE - bool "mips32 musl bleeding-edge 2024.05-1" + bool "mips32 musl bleeding-edge 2025.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1734,14 +1723,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE - bool "mips32 musl stable 2024.05-1" + bool "mips32 musl stable 2025.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1759,12 +1748,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE - bool "mips32 uclibc bleeding-edge 2024.05-1" + bool "mips32 uclibc bleeding-edge 2025.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1786,13 +1775,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE - bool "mips32 uclibc stable 2024.05-1" + bool "mips32 uclibc stable 2025.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1812,13 +1801,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE - bool "mips32el glibc bleeding-edge 2024.05-1" + bool "mips32el glibc bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1839,14 +1828,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE - bool "mips32el glibc stable 2024.05-1" + bool "mips32el glibc stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1865,13 +1854,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE - bool "mips32el musl bleeding-edge 2024.05-1" + bool "mips32el musl bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1892,14 +1881,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE - bool "mips32el musl stable 2024.05-1" + bool "mips32el musl stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -1917,12 +1906,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE - bool "mips32el uclibc bleeding-edge 2024.05-1" + bool "mips32el uclibc bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1944,13 +1933,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE - bool "mips32el uclibc stable 2024.05-1" + bool "mips32el uclibc stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -1970,13 +1959,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE - bool "mips32r5el glibc bleeding-edge 2024.05-1" + bool "mips32r5el glibc bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1997,14 +1986,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE - bool "mips32r5el glibc stable 2024.05-1" + bool "mips32r5el glibc stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2023,13 +2012,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE - bool "mips32r5el musl bleeding-edge 2024.05-1" + bool "mips32r5el musl bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2050,14 +2039,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE - bool "mips32r5el musl stable 2024.05-1" + bool "mips32r5el musl stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2076,12 +2065,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE - bool "mips32r5el uclibc bleeding-edge 2024.05-1" + bool "mips32r5el uclibc bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2103,13 +2092,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE - bool "mips32r5el uclibc stable 2024.05-1" + bool "mips32r5el uclibc stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2129,13 +2118,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE - bool "mips32r6el glibc bleeding-edge 2024.05-1" + bool "mips32r6el glibc bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2156,14 +2145,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE - bool "mips32r6el glibc stable 2024.05-1" + bool "mips32r6el glibc stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2182,13 +2171,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE - bool "mips32r6el musl bleeding-edge 2024.05-1" + bool "mips32r6el musl bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2209,14 +2198,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE - bool "mips32r6el musl stable 2024.05-1" + bool "mips32r6el musl stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2235,12 +2224,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE - bool "mips32r6el uclibc bleeding-edge 2024.05-1" + bool "mips32r6el uclibc bleeding-edge 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2262,13 +2251,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE - bool "mips32r6el uclibc stable 2024.05-1" + bool "mips32r6el uclibc stable 2025.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2288,14 +2277,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE - bool "mips64-n32 glibc bleeding-edge 2024.05-1" + bool "mips64-n32 glibc bleeding-edge 2025.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2316,15 +2305,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE - bool "mips64-n32 glibc stable 2024.05-1" + bool "mips64-n32 glibc stable 2025.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2343,14 +2332,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE - bool "mips64-n32 musl bleeding-edge 2024.05-1" + bool "mips64-n32 musl bleeding-edge 2025.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2371,15 +2360,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE - bool "mips64-n32 musl stable 2024.05-1" + bool "mips64-n32 musl stable 2025.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2398,13 +2387,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE - bool "mips64-n32 uclibc bleeding-edge 2024.05-1" + bool "mips64-n32 uclibc bleeding-edge 2025.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2426,14 +2415,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE - bool "mips64-n32 uclibc stable 2024.05-1" + bool "mips64-n32 uclibc stable 2025.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2453,14 +2442,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64el-n32 glibc bleeding-edge 2024.05-1" + bool "mips64el-n32 glibc bleeding-edge 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2481,15 +2470,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE - bool "mips64el-n32 glibc stable 2024.05-1" + bool "mips64el-n32 glibc stable 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2508,14 +2497,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE - bool "mips64el-n32 musl bleeding-edge 2024.05-1" + bool "mips64el-n32 musl bleeding-edge 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2536,15 +2525,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE - bool "mips64el-n32 musl stable 2024.05-1" + bool "mips64el-n32 musl stable 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2563,13 +2552,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64el-n32 uclibc bleeding-edge 2024.05-1" + bool "mips64el-n32 uclibc bleeding-edge 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2591,14 +2580,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE - bool "mips64el-n32 uclibc stable 2024.05-1" + bool "mips64el-n32 uclibc stable 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2618,14 +2607,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 glibc bleeding-edge 2024.05-1" + bool "mips64r6el-n32 glibc bleeding-edge 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2646,15 +2635,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE - bool "mips64r6el-n32 glibc stable 2024.05-1" + bool "mips64r6el-n32 glibc stable 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2673,14 +2662,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE - bool "mips64r6el-n32 musl bleeding-edge 2024.05-1" + bool "mips64r6el-n32 musl bleeding-edge 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2701,15 +2690,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE - bool "mips64r6el-n32 musl stable 2024.05-1" + bool "mips64r6el-n32 musl stable 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2728,13 +2717,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 uclibc bleeding-edge 2024.05-1" + bool "mips64r6el-n32 uclibc bleeding-edge 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2756,14 +2745,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE - bool "mips64r6el-n32 uclibc stable 2024.05-1" + bool "mips64r6el-n32 uclibc stable 2025.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2782,62 +2771,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE - bool "nios2 glibc bleeding-edge 2024.05-1" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Bootlin toolchain for the nios2 architecture, using the - glibc C library. This is a bleeding-edge version, which - means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE - bool "nios2 glibc stable 2024.05-1" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_OPENMP - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Bootlin toolchain for the nios2 architecture, using the - glibc C library. This is a stable version, which means it - is using stable and proven versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE - bool "openrisc glibc bleeding-edge 2024.05-1" + bool "openrisc glibc bleeding-edge 2025.08-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2858,12 +2798,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE - bool "openrisc glibc stable 2024.05-1" + bool "openrisc glibc stable 2025.08-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP @@ -2883,12 +2823,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2024.05-1" + bool "openrisc musl bleeding-edge 2025.08-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2909,13 +2849,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2024.05-1" + bool "openrisc musl stable 2025.08-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -2933,11 +2873,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2024.05-1" + bool "openrisc uclibc bleeding-edge 2025.08-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2959,12 +2899,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2024.05-1" + bool "openrisc uclibc stable 2025.08-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -2984,12 +2924,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE - bool "powerpc-440fp glibc bleeding-edge 2024.05-1" + bool "powerpc-440fp glibc bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3010,13 +2950,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE - bool "powerpc-440fp glibc stable 2024.05-1" + bool "powerpc-440fp glibc stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3035,12 +2975,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE - bool "powerpc-440fp musl bleeding-edge 2024.05-1" + bool "powerpc-440fp musl bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3060,13 +3000,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE - bool "powerpc-440fp musl stable 2024.05-1" + bool "powerpc-440fp musl stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS @@ -3084,11 +3024,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE - bool "powerpc-440fp uclibc bleeding-edge 2024.05-1" + bool "powerpc-440fp uclibc bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3110,12 +3050,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE - bool "powerpc-440fp uclibc stable 2024.05-1" + bool "powerpc-440fp uclibc stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3135,12 +3075,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 glibc bleeding-edge 2024.05-1" + bool "powerpc-e300c3 glibc bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3161,13 +3101,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE - bool "powerpc-e300c3 glibc stable 2024.05-1" + bool "powerpc-e300c3 glibc stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3186,12 +3126,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE - bool "powerpc-e300c3 musl bleeding-edge 2024.05-1" + bool "powerpc-e300c3 musl bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3211,13 +3151,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE - bool "powerpc-e300c3 musl stable 2024.05-1" + bool "powerpc-e300c3 musl stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS @@ -3235,11 +3175,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 uclibc bleeding-edge 2024.05-1" + bool "powerpc-e300c3 uclibc bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3261,12 +3201,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE - bool "powerpc-e300c3 uclibc stable 2024.05-1" + bool "powerpc-e300c3 uclibc stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3286,12 +3226,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE - bool "powerpc-e500mc glibc bleeding-edge 2024.05-1" + bool "powerpc-e500mc glibc bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3312,13 +3252,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE - bool "powerpc-e500mc glibc stable 2024.05-1" + bool "powerpc-e500mc glibc stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3337,12 +3277,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE - bool "powerpc-e500mc musl bleeding-edge 2024.05-1" + bool "powerpc-e500mc musl bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3362,13 +3302,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE - bool "powerpc-e500mc musl stable 2024.05-1" + bool "powerpc-e500mc musl stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS @@ -3386,11 +3326,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE - bool "powerpc-e500mc uclibc bleeding-edge 2024.05-1" + bool "powerpc-e500mc uclibc bleeding-edge 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3412,12 +3352,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE - bool "powerpc-e500mc uclibc stable 2024.05-1" + bool "powerpc-e500mc uclibc stable 2025.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -3437,12 +3377,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e5500 glibc bleeding-edge 2024.05-1" + bool "powerpc64-e5500 glibc bleeding-edge 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3463,13 +3403,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE - bool "powerpc64-e5500 glibc stable 2024.05-1" + bool "powerpc64-e5500 glibc stable 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3488,12 +3428,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e6500 glibc bleeding-edge 2024.05-1" + bool "powerpc64-e6500 glibc bleeding-edge 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3514,13 +3454,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE - bool "powerpc64-e6500 glibc stable 2024.05-1" + bool "powerpc64-e6500 glibc stable 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3539,12 +3479,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE - bool "powerpc64-e6500 musl bleeding-edge 2024.05-1" + bool "powerpc64-e6500 musl bleeding-edge 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3565,13 +3505,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE - bool "powerpc64-e6500 musl stable 2024.05-1" + bool "powerpc64-e6500 musl stable 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3590,12 +3530,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64-power8 glibc bleeding-edge 2024.05-1" + bool "powerpc64-power8 glibc bleeding-edge 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3616,13 +3556,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE - bool "powerpc64-power8 glibc stable 2024.05-1" + bool "powerpc64-power8 glibc stable 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3641,12 +3581,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64-power8 musl bleeding-edge 2024.05-1" + bool "powerpc64-power8 musl bleeding-edge 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3667,13 +3607,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE - bool "powerpc64-power8 musl stable 2024.05-1" + bool "powerpc64-power8 musl stable 2025.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3692,12 +3632,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64le-power8 glibc bleeding-edge 2024.05-1" + bool "powerpc64le-power8 glibc bleeding-edge 2025.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3718,13 +3658,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE - bool "powerpc64le-power8 glibc stable 2024.05-1" + bool "powerpc64le-power8 glibc stable 2025.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3743,12 +3683,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64le-power8 musl bleeding-edge 2024.05-1" + bool "powerpc64le-power8 musl bleeding-edge 2025.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3769,13 +3709,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE - bool "powerpc64le-power8 musl stable 2024.05-1" + bool "powerpc64le-power8 musl stable 2025.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -3794,14 +3734,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE - bool "riscv32-ilp32d glibc bleeding-edge 2024.05-1" + bool "riscv32-ilp32d glibc bleeding-edge 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3822,14 +3762,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_STABLE - bool "riscv32-ilp32d glibc stable 2024.05-1" + bool "riscv32-ilp32d glibc stable 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP @@ -3849,14 +3789,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE - bool "riscv32-ilp32d musl bleeding-edge 2024.05-1" + bool "riscv32-ilp32d musl bleeding-edge 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3877,14 +3817,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE - bool "riscv32-ilp32d musl stable 2024.05-1" + bool "riscv32-ilp32d musl stable 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP @@ -3904,13 +3844,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_BLEEDING_EDGE - bool "riscv32-ilp32d uclibc bleeding-edge 2024.05-1" + bool "riscv32-ilp32d uclibc bleeding-edge 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3932,13 +3872,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_STABLE - bool "riscv32-ilp32d uclibc stable 2024.05-1" + bool "riscv32-ilp32d uclibc stable 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3959,14 +3899,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE - bool "riscv64-lp64d glibc bleeding-edge 2024.05-1" + bool "riscv64-lp64d glibc bleeding-edge 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3987,14 +3927,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE - bool "riscv64-lp64d glibc stable 2024.05-1" + bool "riscv64-lp64d glibc stable 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP @@ -4014,14 +3954,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE - bool "riscv64-lp64d musl bleeding-edge 2024.05-1" + bool "riscv64-lp64d musl bleeding-edge 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4042,14 +3982,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE - bool "riscv64-lp64d musl stable 2024.05-1" + bool "riscv64-lp64d musl stable 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP @@ -4069,14 +4009,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE - bool "riscv64-lp64d uclibc bleeding-edge 2024.05-1" + bool "riscv64-lp64d uclibc bleeding-edge 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4098,14 +4038,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE - bool "riscv64-lp64d uclibc stable 2024.05-1" + bool "riscv64-lp64d uclibc stable 2025.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4126,12 +4066,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE - bool "s390x-z13 glibc bleeding-edge 2024.05-1" + bool "s390x-z13 glibc bleeding-edge 2025.08-1" depends on BR2_s390x depends on BR2_s390x_z13 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4152,13 +4092,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE - bool "s390x-z13 glibc stable 2024.05-1" + bool "s390x-z13 glibc stable 2025.08-1" depends on BR2_s390x depends on BR2_s390x_z13 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4177,12 +4117,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_BLEEDING_EDGE - bool "s390x-z13 musl bleeding-edge 2024.05-1" + bool "s390x-z13 musl bleeding-edge 2025.08-1" depends on BR2_s390x depends on BR2_s390x_z13 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4203,13 +4143,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_STABLE - bool "s390x-z13 musl stable 2024.05-1" + bool "s390x-z13 musl stable 2025.08-1" depends on BR2_s390x depends on BR2_s390x_z13 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4227,12 +4167,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE - bool "sh-sh4 glibc bleeding-edge 2024.05-1" + bool "sh-sh4 glibc bleeding-edge 2025.08-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4253,13 +4193,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE - bool "sh-sh4 glibc stable 2024.05-1" + bool "sh-sh4 glibc stable 2025.08-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4278,12 +4218,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE - bool "sh-sh4 musl bleeding-edge 2024.05-1" + bool "sh-sh4 musl bleeding-edge 2025.08-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4304,13 +4244,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE - bool "sh-sh4 musl stable 2024.05-1" + bool "sh-sh4 musl stable 2025.08-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4328,11 +4268,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE - bool "sh-sh4 uclibc bleeding-edge 2024.05-1" + bool "sh-sh4 uclibc bleeding-edge 2025.08-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4354,12 +4294,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE - bool "sh-sh4 uclibc stable 2024.05-1" + bool "sh-sh4 uclibc stable 2025.08-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4379,12 +4319,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE - bool "sh-sh4aeb glibc bleeding-edge 2024.05-1" + bool "sh-sh4aeb glibc bleeding-edge 2025.08-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4405,13 +4345,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE - bool "sh-sh4aeb glibc stable 2024.05-1" + bool "sh-sh4aeb glibc stable 2025.08-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4430,12 +4370,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE - bool "sh-sh4aeb musl bleeding-edge 2024.05-1" + bool "sh-sh4aeb musl bleeding-edge 2025.08-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4456,13 +4396,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE - bool "sh-sh4aeb musl stable 2024.05-1" + bool "sh-sh4aeb musl stable 2025.08-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4480,12 +4420,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE - bool "sparc64 glibc bleeding-edge 2024.05-1" + bool "sparc64 glibc bleeding-edge 2025.08-1" depends on BR2_sparc64 depends on BR2_sparc_v9 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4506,13 +4446,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE - bool "sparc64 glibc stable 2024.05-1" + bool "sparc64 glibc stable 2025.08-1" depends on BR2_sparc64 depends on BR2_sparc_v9 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4531,11 +4471,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE - bool "sparcv8 uclibc bleeding-edge 2024.05-1" + bool "sparcv8 uclibc bleeding-edge 2025.08-1" depends on BR2_sparc depends on BR2_sparc_v8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4557,12 +4497,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE - bool "sparcv8 uclibc stable 2024.05-1" + bool "sparcv8 uclibc stable 2025.08-1" depends on BR2_sparc depends on BR2_sparc_v8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4582,14 +4522,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE - bool "x86-64 glibc bleeding-edge 2024.05-1" + bool "x86-64 glibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4610,15 +4550,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE - bool "x86-64 glibc stable 2024.05-1" + bool "x86-64 glibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4637,14 +4577,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE - bool "x86-64 musl bleeding-edge 2024.05-1" + bool "x86-64 musl bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4665,15 +4605,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE - bool "x86-64 musl stable 2024.05-1" + bool "x86-64 musl stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4691,13 +4631,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE - bool "x86-64 uclibc bleeding-edge 2024.05-1" + bool "x86-64 uclibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4719,14 +4659,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE - bool "x86-64 uclibc stable 2024.05-1" + bool "x86-64 uclibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4746,7 +4686,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE - bool "x86-64-v2 glibc bleeding-edge 2024.05-1" + bool "x86-64-v2 glibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4755,9 +4695,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4778,7 +4718,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE - bool "x86-64-v2 glibc stable 2024.05-1" + bool "x86-64-v2 glibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4787,10 +4727,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4809,7 +4749,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE - bool "x86-64-v2 musl bleeding-edge 2024.05-1" + bool "x86-64-v2 musl bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4818,9 +4758,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4841,7 +4781,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE - bool "x86-64-v2 musl stable 2024.05-1" + bool "x86-64-v2 musl stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4850,10 +4790,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -4871,7 +4811,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE - bool "x86-64-v2 uclibc bleeding-edge 2024.05-1" + bool "x86-64-v2 uclibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4880,8 +4820,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4903,7 +4843,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE - bool "x86-64-v2 uclibc stable 2024.05-1" + bool "x86-64-v2 uclibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4912,9 +4852,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4934,7 +4874,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE - bool "x86-64-v3 glibc bleeding-edge 2024.05-1" + bool "x86-64-v3 glibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4945,9 +4885,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4968,7 +4908,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE - bool "x86-64-v3 glibc stable 2024.05-1" + bool "x86-64-v3 glibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4979,10 +4919,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5001,7 +4941,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE - bool "x86-64-v3 musl bleeding-edge 2024.05-1" + bool "x86-64-v3 musl bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5012,9 +4952,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5035,7 +4975,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE - bool "x86-64-v3 musl stable 2024.05-1" + bool "x86-64-v3 musl stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5046,10 +4986,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5067,7 +5007,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE - bool "x86-64-v3 uclibc bleeding-edge 2024.05-1" + bool "x86-64-v3 uclibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5078,8 +5018,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5101,7 +5041,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE - bool "x86-64-v3 uclibc stable 2024.05-1" + bool "x86-64-v3 uclibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5112,9 +5052,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5134,7 +5074,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE - bool "x86-64-v4 glibc bleeding-edge 2024.05-1" + bool "x86-64-v4 glibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5146,9 +5086,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5169,7 +5109,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE - bool "x86-64-v4 glibc stable 2024.05-1" + bool "x86-64-v4 glibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5181,10 +5121,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5203,7 +5143,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE - bool "x86-64-v4 musl bleeding-edge 2024.05-1" + bool "x86-64-v4 musl bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5215,9 +5155,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5238,7 +5178,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE - bool "x86-64-v4 musl stable 2024.05-1" + bool "x86-64-v4 musl stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5250,10 +5190,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5271,7 +5211,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE - bool "x86-64-v4 uclibc bleeding-edge 2024.05-1" + bool "x86-64-v4 uclibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5283,8 +5223,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5306,7 +5246,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE - bool "x86-64-v4 uclibc stable 2024.05-1" + bool "x86-64-v4 uclibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5318,9 +5258,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5340,7 +5280,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 glibc bleeding-edge 2024.05-1" + bool "x86-64-core-i7 glibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5349,9 +5289,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5372,7 +5312,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE - bool "x86-64-core-i7 glibc stable 2024.05-1" + bool "x86-64-core-i7 glibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5381,10 +5321,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5403,7 +5343,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE - bool "x86-64-core-i7 musl bleeding-edge 2024.05-1" + bool "x86-64-core-i7 musl bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5412,9 +5352,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5435,7 +5375,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE - bool "x86-64-core-i7 musl stable 2024.05-1" + bool "x86-64-core-i7 musl stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5444,10 +5384,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5466,7 +5406,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 uclibc bleeding-edge 2024.05-1" + bool "x86-64-core-i7 uclibc bleeding-edge 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5475,8 +5415,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5498,7 +5438,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE - bool "x86-64-core-i7 uclibc stable 2024.05-1" + bool "x86-64-core-i7 uclibc stable 2025.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5507,9 +5447,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5529,16 +5469,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE - bool "x86-core2 glibc bleeding-edge 2024.05-1" + bool "x86-core2 glibc bleeding-edge 2025.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5559,17 +5499,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE - bool "x86-core2 glibc stable 2024.05-1" + bool "x86-core2 glibc stable 2025.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5588,16 +5528,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE - bool "x86-core2 musl bleeding-edge 2024.05-1" + bool "x86-core2 musl bleeding-edge 2025.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5617,17 +5557,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE - bool "x86-core2 musl stable 2024.05-1" + bool "x86-core2 musl stable 2025.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS @@ -5644,15 +5584,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE - bool "x86-core2 uclibc bleeding-edge 2024.05-1" + bool "x86-core2 uclibc bleeding-edge 2025.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5674,16 +5614,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE - bool "x86-core2 uclibc stable 2024.05-1" + bool "x86-core2 uclibc stable 2025.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5703,7 +5643,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE - bool "x86-i686 glibc bleeding-edge 2024.05-1" + bool "x86-i686 glibc bleeding-edge 2025.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5713,9 +5653,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5736,7 +5676,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE - bool "x86-i686 glibc stable 2024.05-1" + bool "x86-i686 glibc stable 2025.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5746,10 +5686,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP @@ -5768,7 +5708,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE - bool "x86-i686 musl bleeding-edge 2024.05-1" + bool "x86-i686 musl bleeding-edge 2025.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5778,9 +5718,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5800,7 +5740,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE - bool "x86-i686 musl stable 2024.05-1" + bool "x86-i686 musl stable 2025.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5810,10 +5750,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS @@ -5830,7 +5770,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE - bool "x86-i686 uclibc bleeding-edge 2024.05-1" + bool "x86-i686 uclibc bleeding-edge 2025.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5840,8 +5780,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5863,7 +5803,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE - bool "x86-i686 uclibc stable 2024.05-1" + bool "x86-i686 uclibc stable 2025.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5873,9 +5813,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -5895,12 +5835,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE - bool "xtensa-lx60 uclibc bleeding-edge 2024.05-1" + bool "xtensa-lx60 uclibc bleeding-edge 2025.08-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5922,13 +5862,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE - bool "xtensa-lx60 uclibc stable 2024.05-1" + bool "xtensa-lx60 uclibc stable 2025.08-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index adc42531cc..c2a0034907 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -1,442 +1,438 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2024.05-1.sha256 -sha256 4f64a9ecc2817db5a4cbf128fbd0162e9397cb2cf8316e005fc3fb3d16f097ae aarch64--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2024.05-1.sha256 -sha256 b0fad860eb94b503a56d66ca8b9ba06d2d4826943e37ebd1d7217423f6ea5bb2 aarch64--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2024.05-1.sha256 -sha256 7a2819d883ae1ddfc91b9ce325c972289d4aae0c692936e722120862a73021eb aarch64--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2024.05-1.sha256 -sha256 f847da1195325525f3f07eef045ef40c6b48464a37e0f7fea77360dfe0bc1aa1 aarch64--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 f5480ea84fc71d85361de9a0d89ff7e1a9b9640de86db76b4dec6dd099535cdc aarch64--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2024.05-1.sha256 -sha256 748de907a7b601490cbc6bdc816d31127fab6937c831b5c5d21d7f70decf15fe aarch64--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2024.05-1.sha256 -sha256 02f588c6900d33286b89db5a92e60fdf611a47da5d05c1ee644ba14e2630ffca aarch64be--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2024.05-1.sha256 -sha256 a44e4b4cc016aded66f00109c1c5f64f881a8b7effc60bae2e84a5936fd3b0e4 aarch64be--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2024.05-1.sha256 -sha256 af4ca347a5b1e725b0e0c7a4bccc9813005a3fbeb7d1127b4e5c4b07cc22eb5e aarch64be--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2024.05-1.sha256 -sha256 f31e16c451f151157069d9890f8f8fa759b1188293e083194b4e64867f0da216 aarch64be--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 45a00779ad073ef2edcb4d42db6e74b02e26de639a6f5d3060d42ce0d9160b52 aarch64be--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2024.05-1.sha256 -sha256 ef200bd2d5d4762a3f5844703d3c7ef683f15189a1a0fe3857c2eaa117fd45c7 aarch64be--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 18a630b725d97b9903f44d487292c891f4994f83334363d0311014664dc8230a arcle-750d--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2024.05-1.sha256 -sha256 74b2afe4f915708e81d9b595396ff82fbc841f698a0b78d778a52cf7be668081 arcle-750d--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2024.05-1.sha256 -sha256 ad0c27042c1ef42b1e7ea5a6b2a7e77a82d8ae137d08c2b95d7d4baea60b5472 arcle-hs38--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2024.05-1.sha256 -sha256 247f590dede487c76579aa6c5233f634c6525cf31430496ae6dcbd0e07e8dc5b arcle-hs38--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 38578d0503f123d3eb94afda435a7fa170337810c290e433f119f609856098a8 arcle-hs38--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2024.05-1.sha256 -sha256 982f6c2d3b161e8e07982f6fe846c18245d17b0ed602cddd64ad45c568c06b01 arcle-hs38--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2024.05-1.sha256 -sha256 1466a2c312a340d5314583c4ef3fbf955eaa0c16627712374e1f1d74d9a38505 armv5-eabi--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2024.05-1.sha256 -sha256 13f2bea0b06fe560fe60d199cd9d3fb1f20e2335bcc79b90c5130c3916a3ed92 armv5-eabi--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2024.05-1.sha256 -sha256 5261ae65d4e454cb9d16a25a6f93f615742a10c64fb7ce08b7ce776c388abbdd armv5-eabi--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2024.05-1.sha256 -sha256 9825d9a4515a92d2251aab3228ddbb6258440b0f952b95fcaa94653a4b29c71a armv5-eabi--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 5dba09b35b3d5cfd3c44b4429bca73f5d9d5eec591810148928b3ceb8ef688ed armv5-eabi--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2024.05-1.sha256 -sha256 c0c616d4f7d6702b8991f83a5a3777137f734e1eb610d4a20297eaef299ec59d armv5-eabi--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2024.05-1.sha256 -sha256 8c531910b5883352c39d84657c4a8052b67a318314273342890abec318159ead armv6-eabihf--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2024.05-1.sha256 -sha256 2924afaa0d47e046339fe70bf526db5a19edaa58d87c6758a861ef41e2781368 armv6-eabihf--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2024.05-1.sha256 -sha256 aeba34ea164503511233566148ccfddba3932ffe13f9d22bfa1a3bf2a31c63f7 armv6-eabihf--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2024.05-1.sha256 -sha256 cc7444189685f9405636568a582395e4e2b95347f8be0e6d63ed4e2791ab9267 armv6-eabihf--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 ba481ea8b2631871cdddc9ff9600cca3e7f4bdd558602ba936563ddd58039f8f armv6-eabihf--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2024.05-1.sha256 -sha256 38e3c482368c96f177c164ed098e7022f45adf83d8715cb2f74238a5a7c0622d armv6-eabihf--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2024.05-1.sha256 -sha256 10703f0184162ea6ebabb84696903154a8eb7b53175e76ccf5ca0a2294fc68ec armv7-eabihf--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2024.05-1.sha256 -sha256 608263bc9dc3eadf0962ddb1165f1c2291001190f9927dee47d464e26374462c armv7-eabihf--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2024.05-1.sha256 -sha256 2a8274d28abd4779010dda6b54bfe0d259559181f99908440d39974f2619567a armv7-eabihf--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2024.05-1.sha256 -sha256 5b34157a4c9f53064002f12f57c42836cd551c591a4be6a99b3ee201add506aa armv7-eabihf--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 f36b736c6cea721e743b2a075285d7b4d65e3b20d3b5353503ebf1c5ee509d36 armv7-eabihf--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2024.05-1.sha256 -sha256 eec6e21cf9d36ab2e8b9dbf4e26311d3d152927c72550bfe84872858e63bcaf4 armv7-eabihf--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2024.05-1.sha256 -sha256 664509d1a9abe7a01f6b2274aff9c9f26ec86bae42c601100dd7a2c5930d9d9c armebv7-eabihf--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2024.05-1.sha256 -sha256 50ca1e7c8bf78cdc941edf93d0a350d2c6b5b8024b582a57c7815f6e631ba43b armebv7-eabihf--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2024.05-1.sha256 -sha256 d8dc252c024a031524e56284bcea7b4706146d35fb6b04c5f0461f0bf7a31a8b armebv7-eabihf--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2024.05-1.sha256 -sha256 c804e2e963fc21db22a9d4611089e3b207937c63f95a87de62c4e789eff79a56 armebv7-eabihf--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 d81849ea8fe7f8eb4b306712435491479f380ce60e203a83f651df51de7d52e2 armebv7-eabihf--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2024.05-1.sha256 -sha256 7ad4a602c2055bc3e9b39e64fbef3c14e61b10605d1039db95a64b7efd1f6e7a armebv7-eabihf--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 fbab243d632e5dcaa56a9468e0a7f6afa52ebc15edb33f70a7060194cff66401 armv7m--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2024.05-1.sha256 -sha256 9891f5a43d1002a652353064e6543a1371c795938ecb595dd2f47a2d0ecc1e62 armv7m--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2024.05-1.sha256 -sha256 88d1e108412116778e01bd72f90c6bb06c97e3a846dcc061644eb2a18499dc93 m68k-68xxx--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2024.05-1.sha256 -sha256 77f22dcafc78cde84e6441bd450aa3edb628b8f36ef6c1a160c942f38b38e5ea m68k-68xxx--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2024.05-1.sha256 -sha256 f61aa3160dd75267a0b6018ca198f36ea99510f51d5a70eef8f2ac02d713abb3 m68k-68xxx--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2024.05-1.sha256 -sha256 4456ec5b09fba57222ec8c3b9cf4d19a118a5dc876a58939e7fd77033af80652 m68k-68xxx--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 9d7b25be2a49f2c059ede1bc87487e0d23251b0f7376e3db9b2c61f0841e9014 m68k-68xxx--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2024.05-1.sha256 -sha256 92b41ec8da2da233c65ce96ad9db5e849d0d687378c799f774df6efe7c8f0e28 m68k-68xxx--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 6ef31adc06bb53b0b9252bbf7cdc93c22f0d6838dc9f51a4dc6e0fe2016eceff m68k-coldfire--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2024.05-1.sha256 -sha256 370953f7c1e3bcf8b4e6849906991019f742fbde8532850aabd4eb3978e4a933 m68k-coldfire--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2024.05-1.sha256 -sha256 f8fe7afda005b6f3fc3a602c6d8d1e1d524b2ebb5452a736351994723a9faf72 microblazebe--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2024.05-1.sha256 -sha256 7a24a6cd76175d77134a0d02852204c548c9d2722e08ecc02ccf49f4c477792d microblazebe--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2024.05-1.sha256 -sha256 5e51c0576acc7043d74644fed43b10e0aa75c4025741edcdd3e636d528270973 microblazebe--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2024.05-1.sha256 -sha256 f1e0d9406fdb211c9f44b71d4d3b4b68ac5dec4e379b24ff8a488f7945b99dfe microblazebe--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 fb2a4dc7407699c36046f1fc0ff10833805dfb9c8aa4e2c30adcda45de7474f6 microblazebe--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2024.05-1.sha256 -sha256 17c6aa01b8421961b17eca4950cab8d292aa87d073f325525de1e77c5f7a5546 microblazebe--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2024.05-1.sha256 -sha256 686905d647c24fb1f95dedb95c4a764d263a577cce673ea629d87c1a8986e9c8 microblazeel--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2024.05-1.sha256 -sha256 2468c298089873e4d86026b84ca68e46b4802413639a55f2db1c6aba181d66d6 microblazeel--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2024.05-1.sha256 -sha256 ef1d35997bea684dfe5ee759b6668c309ee308956a3c82188402f5c42eba92db microblazeel--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2024.05-1.sha256 -sha256 72611e45e0a77eac21b04bfae70395b8bcfaf2c969fe51638db48a94ca9030f4 microblazeel--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 bdf72671801ff48b232f12f13de5f3aaf3180a8e93c680ab59a1023aac3ddfd7 microblazeel--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2024.05-1.sha256 -sha256 49657597e55aa7d771cb4546c1d37d7ab9408b426d8c45f1bf61d90a53322a65 microblazeel--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2024.05-1.sha256 -sha256 550803b9531b5a6c227329484c69e9d70ed08a29a456e9b941c5fe6b68f8258c mips32--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2024.05-1.sha256 -sha256 677402719c545e49eb71c3d27a5f495af38f60463b40ed705e24e43a9834c137 mips32--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2024.05-1.sha256 -sha256 28374e4431305b2d99bef9f706e1827390fc71848ce88d274a55c98674948bbf mips32--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2024.05-1.sha256 -sha256 f553aec760bfc9f452f1ab071b25b84fd36ed56ab4c75149b351144561b4e0b5 mips32--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 2080fffa0f9b4e9e8e994e855fd3560f3cc1daedfa8382b57138dc3e09c3b69f mips32--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2024.05-1.sha256 -sha256 52ed979092edad8100bc0275426e7eccadefa68b908ac35d18d29c385b30e12d mips32--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2024.05-1.sha256 -sha256 9dbfb7de343fef34e954989cd80ba8856baf771d8563c072cdba7b0a264a3389 mips32el--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2024.05-1.sha256 -sha256 d0139b6ade7f3b72a5f9c33814696af817661e826c9c501f6cefcab4ac684c8f mips32el--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2024.05-1.sha256 -sha256 bceda5815e975ff09530e5ba18d673ce4eccbfe42a2bb23c10dfd1a0ab54deb8 mips32el--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2024.05-1.sha256 -sha256 608b1b2434af563513df21ae0a6ab52af8a07b72a4bda760df946419cdd2645a mips32el--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 578d18e1ef57b4c616803ce21e6cd0b1d3599aeb017830554c01bb3e11c79a68 mips32el--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2024.05-1.sha256 -sha256 ae4400a934074a3b1b39fb7ec79fb535da4e65b668f2330ca14576d072f6b13e mips32el--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2024.05-1.sha256 -sha256 daff6281bea63185811e96d91bf23a79fef4d30ac2da0e9a115f78e9989eefa5 mips32r5el--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2024.05-1.sha256 -sha256 afb30c73afccebb84b146efc6c654aabd8b92185a26fb1ba357ac0a2ce5f7957 mips32r5el--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2024.05-1.sha256 -sha256 47f1291fa2a95e3ecc67fe4f410e4788bc65880bb1c5e465792c8376ee036448 mips32r5el--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2024.05-1.sha256 -sha256 6092b5d5e5f814e64038b205155016c3b1d10e3a3079478b4e1b0ab0b533c380 mips32r5el--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 98dcb8efe8f4897c6e7e6088238789c4f42593d4b08739cb7cb8dcd157765887 mips32r5el--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2024.05-1.sha256 -sha256 61b94dee2f60abd1e6698b283de6c5e2491cb5baf635d255addd5b4e7cc83afa mips32r5el--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2024.05-1.sha256 -sha256 0b374f870964ec8158beddf478beeec48a4ce09fa25a4a9c51c20a82839b3429 mips32r6el--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2024.05-1.sha256 -sha256 482cb60a8d0445b961fe1c5282826da9071f17ab37729b9c1c4ce7aabd014c7d mips32r6el--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2024.05-1.sha256 -sha256 19d6f280f4595a5fd0b43e16e9cd006163d94a96d4377399d93f5736716d79bc mips32r6el--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2024.05-1.sha256 -sha256 fd5b48ebbdd220b517f179f609bbd98895c65f3d152eadacc4137e51a9bbcd6f mips32r6el--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 adf63f7412d82e59de5bd19ea30068d205d7013c312af475d8b45656d20221ec mips32r6el--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2024.05-1.sha256 -sha256 b43c05fa3e3157b5cf3e45799dfbba5e305be16b5b80da98972e89de5d737658 mips32r6el--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2024.05-1.sha256 -sha256 d9d39286b9022dcd54dcabecfdc66e54cfc635a517128f005fd0ab1d2cfcc42d mips64-n32--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2024.05-1.sha256 -sha256 411d6e399455c032759f71ec0aaba004da4157f462d1192c2accbbff8827fd13 mips64-n32--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2024.05-1.sha256 -sha256 a07cacf4c88056ea612f64c50352e9fa2bb87766760fbae03577c50690f72d15 mips64-n32--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2024.05-1.sha256 -sha256 c058630e79b53333cca28ee1f34c3bb3b17bf03908a01f5c400a232d490d6a7a mips64-n32--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 8f571a7f93092743d1d2a59c6e88ed9096c0c44327f0e9b0b8eda97a2aa51c85 mips64-n32--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2024.05-1.sha256 -sha256 ac0aef32929d8521e8f7201b56d3e006d684e71f59b29b1d40d853d31b07f7f2 mips64-n32--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2024.05-1.sha256 -sha256 fb0a9e12ad0267691174a0c70fe604fe5527945d9997a7329b56e87241c49fcc mips64el-n32--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2024.05-1.sha256 -sha256 bc3035338f5874d1d6824fd75a9231d2a126e113b8d4e27f94c57be6795b97e0 mips64el-n32--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2024.05-1.sha256 -sha256 0525423b138f5e8e83babe591ffd8ea9aed6f34f20ee4af5e346479cad6f3dbf mips64el-n32--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2024.05-1.sha256 -sha256 d620b75ec5a05c0d76b132200e69c75c308c582696d616036d7b29dae21b730f mips64el-n32--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 f9afb690787968bb0365130fe5350ccdf2b2618e5ab658d696fab84bac4b09e4 mips64el-n32--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2024.05-1.sha256 -sha256 b1ce285a91107632ca5492f3e05d3488df314484f0ab8700f5fce5085fb271b4 mips64el-n32--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2024.05-1.sha256 -sha256 fd65b96514a6adf429b31dada2eeaae79a1eb00a21340998a24abe8420fcf06a mips64r6el-n32--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2024.05-1.sha256 -sha256 573721a0d53dacc34bf28f7f3e7e46fa79856e600cd515b270366ef7b900351e mips64r6el-n32--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2024.05-1.sha256 -sha256 e4353c990ea99fb5e39f9c64b6b92e614c0c6cd1760730334b6f2391aa10f3c6 mips64r6el-n32--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2024.05-1.sha256 -sha256 cce09fc456b592a993a7c8d182cdd1f04397a8160f176d9ac6799d8e2e09cef7 mips64r6el-n32--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 e12b6536fbacb624b0d938345fb29b202c8b174893d0d8fbefde46fbe727c729 mips64r6el-n32--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2024.05-1.sha256 -sha256 a0db853f4c40d120d22e6762ca4bff64e0c3e3db74ab59950967917aeb9bf330 mips64r6el-n32--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2024.05-1.sha256 -sha256 5d034a538a8613ef324ae96f097c122ed99574ec8707e3274743e4d79efd374c nios2--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2024.05-1.sha256 -sha256 db7a12e0b22037f3aad01cd126b5f1bfe7dc514e37f8c484eb587b861f20fbcd nios2--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2024.05-1.sha256 -sha256 0de17cd13642f71f112d086c1df4b34670440ceb459478a0f3d55007945633ca openrisc--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2024.05-1.sha256 -sha256 a6e06a72285ca8dc9974f2060cb79aa85e0a1388553871a7c48785a077cbbe2f openrisc--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2024.05-1.sha256 -sha256 5765a9fd73d4b2fa8bb4fd0d94b8ee8b88307684182ed62e55e0775ecdcbf09c openrisc--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2024.05-1.sha256 -sha256 cdc2a9e3f69aa32df36580151d51d359e98147a604745f9927dc0314e5d7dd39 openrisc--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 e79e8c669368cc2dfbccb4f6080491b06e6d2d8851f73e0c849e066821ccbb06 openrisc--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2024.05-1.sha256 -sha256 51527b6a9e2063db756d836e250866783bcdfb40ab0f122d6d65c7401806cc44 openrisc--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2024.05-1.sha256 -sha256 58efcbb6133dcc070332b570ee491840c8cf386a75180e7bf56c403549d61699 powerpc-440fp--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2024.05-1.sha256 -sha256 ebf598b97cd9641bf5993aa3f78288272771ceee21053ced5ac53b1194ebedd3 powerpc-440fp--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2024.05-1.sha256 -sha256 6888a4800d59228fcbd2c843378357619b32b7b8265ebc3b57895e4e92ca1d70 powerpc-440fp--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2024.05-1.sha256 -sha256 54eb3b651655b426c81ea7453470510a62e97356418f4ca748a35a7c0d225b52 powerpc-440fp--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 f98de4013224c65ecf36b9733236a0beed62782e67e9c4a5259a188e73d8dead powerpc-440fp--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2024.05-1.sha256 -sha256 9ecebc59591b81e2d5b502b34ab29fcefd21f4c3343e7695beb2ee894d34dc3d powerpc-440fp--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2024.05-1.sha256 -sha256 2802aea45aab7231fe9301639beab9f632751edaf26cb49ede65ab45603f9807 powerpc-e300c3--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2024.05-1.sha256 -sha256 6c975a7293fde77a52f348124049645ee2ceee19e75ab6e0b2364043090a2dff powerpc-e300c3--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2024.05-1.sha256 -sha256 6689847112fdf6b1be5cd17cf351a1e85ec42a1034993e203efbba2fec011ca1 powerpc-e300c3--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2024.05-1.sha256 -sha256 60fb6b828e58b5548514fd65c50457d190791191d3a7dcec1fbf77f0028bc240 powerpc-e300c3--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 40ed47b662384ddc480c1cdaf3615d44956f51fc9c389688fe6054f3ebcb1f11 powerpc-e300c3--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2024.05-1.sha256 -sha256 45c3324fa19f66adc294bfb99c1ea45b1a1adafc2c2431c3ba1f56cd5588952a powerpc-e300c3--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2024.05-1.sha256 -sha256 86dab3468dd71a4a6677bdf75442297ff9a9e8deb6cd472846f6c73f09eefa16 powerpc-e500mc--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2024.05-1.sha256 -sha256 365e30fda99630e5bcf04c4913f905640025b90cc9d1a4b17cccfc729827d335 powerpc-e500mc--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2024.05-1.sha256 -sha256 4337db3eae7b0d10057e49f1c01f6ff539de1490d1dde3b1b692306b1cb41533 powerpc-e500mc--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2024.05-1.sha256 -sha256 3456bca0016d0c3855a644845aa627c25cd61ce763529a6bae712f8d6d9ddd8d powerpc-e500mc--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 774b1fb431e10c840529521ff2d8a80efaaf04d3d65698e60b3484e3ead85730 powerpc-e500mc--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2024.05-1.sha256 -sha256 e016795898f13326ee551aa0a21ee77e58e2749065136e162cb88e64aa21ff07 powerpc-e500mc--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2024.05-1.sha256 -sha256 1747006fec4219fa71ac77b98e6b404f9f030140a5f1295465e3ef4391d91687 powerpc64-e5500--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2024.05-1.sha256 -sha256 588b8d77fbc991c2f26b356349cfdcd08d89df0d88477c8adfa00c20d9031ad3 powerpc64-e5500--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2024.05-1.sha256 -sha256 904583088a1690e8e05c469202abf6df8fa719c55871b4a5dd240ba284240155 powerpc64-e6500--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2024.05-1.sha256 -sha256 dbc8d38479d0b80675cb410f3285d1f77044222c15e8547db59a53b38436b5de powerpc64-e6500--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2024.05-1.sha256 -sha256 61cbeafa30ff0ecd225f933892a1696b4bcf83abed49fee7ff6e963fcdb9063f powerpc64-e6500--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2024.05-1.sha256 -sha256 2ee53f50a60a36f99243d6d9a2c15a7ee1e15384d10773d7f98da941506f1fb5 powerpc64-e6500--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2024.05-1.sha256 -sha256 729c9a302bba3d03e1c834bf3ae8e080c63456d9eba8ecac4c8f481efea8b77e powerpc64-power8--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2024.05-1.sha256 -sha256 8dfeb7f1ec38e623c98c125539df6ccc7fad1c057b7ab36d65c2b6426c03b332 powerpc64-power8--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2024.05-1.sha256 -sha256 9cc19d57a1374afbd41624aaa968f01914f884e2fb303f73f90d6e94c23ba451 powerpc64-power8--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2024.05-1.sha256 -sha256 d5f928ed99dd4f7dae5c4b3d47c0f463a990b7744866d89ba82e08a7ee9f9a8a powerpc64-power8--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2024.05-1.sha256 -sha256 3b7382684dd77118498b5e502fd90af616c3f6006843d27f538881505cb4a4d7 powerpc64le-power8--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2024.05-1.sha256 -sha256 8133b74614f880eb8b76730efee77b8fd281c982bfa2791b72c5f836a529530d powerpc64le-power8--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2024.05-1.sha256 -sha256 8506103888d0ee23a2e3126083e4f05ef18399c7adeb4e68838f864435394409 powerpc64le-power8--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2024.05-1.sha256 -sha256 62f056b5993f6d1bf2d94a61d01e1d4aaa58906107db3af11ac882c989ed7c1d powerpc64le-power8--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2024.05-1.sha256 -sha256 944fb2719d8657f1c5ee359046caca25a2080fe3535e99cc9dca78c20973c6c8 riscv32-ilp32d--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--stable-2024.05-1.sha256 -sha256 00112418e6d4b0733019a673b682a39f1ce6300b9448cd840f1194aa4b064192 riscv32-ilp32d--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--bleeding-edge-2024.05-1.sha256 -sha256 deabdc08dc49bebe43e445c015b393cb38ecb806ad04d230da2a5c95ef9f2fda riscv32-ilp32d--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--stable-2024.05-1.sha256 -sha256 bbf26ec29272814da1eb5eb97339ed36d2dda66655c4c3612951e3cfb2b842ec riscv32-ilp32d--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 7fb15b36e351bb1d749abec24eb62b106ada56b3483a910352e9a48e0e8138ee riscv32-ilp32d--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--uclibc--stable-2024.05-1.sha256 -sha256 4c74eb1062805f1e28ccc2aee7c006e55823a780eae84c81d5b58433361b4f11 riscv32-ilp32d--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2024.05-1.sha256 -sha256 a9e41a646d6757e47ab0539171bef54a6c0bf68f191210500875b386ea15444c riscv64-lp64d--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2024.05-1.sha256 -sha256 78e16f3def8b2ff3da09c16155f993ac7e4dc1791d0904ada03fcb2e04910aab riscv64-lp64d--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2024.05-1.sha256 -sha256 0acc030f695f48e29f03f25294ee5b6ebacc8ab93de5ed0c6988e9699c417510 riscv64-lp64d--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2024.05-1.sha256 -sha256 481c9353467f42d02edf9080954b3c14a75ff7c19ed9e8fbf9cfa67d028587d3 riscv64-lp64d--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 17d5745a3d063ebd94eb7172c2b10d0d157869e3fe46a8d27d0a4ec2da33b071 riscv64-lp64d--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2024.05-1.sha256 -sha256 1c336b0cc87a1c01a434b3666d4867f033c9f7844b0eb84887d32f309ba9ce6f riscv64-lp64d--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2024.05-1.sha256 -sha256 3f388a1549601fde95a084a439d8f514694d9819c2a75eaa678ac263b6ea5ccd s390x-z13--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2024.05-1.sha256 -sha256 b37ed02693a370f28434c34655c64bcb96dc0d428a92ddbc99feb5608bcf64a1 s390x-z13--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--musl--bleeding-edge-2024.05-1.sha256 -sha256 9bbb6fc607a76c32964208ba2e2e0d09af4cd7f1d0b9511e524363e86147992d s390x-z13--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--musl--stable-2024.05-1.sha256 -sha256 9dc280763cb2b18ea9417ffaf7fee2e24c9833033e730108138179a9887ef299 s390x-z13--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2024.05-1.sha256 -sha256 f4e6c46deeee5301ea4782b5eb6705da5261b16afe40fcc342a1a7d2430e9061 sh-sh4--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2024.05-1.sha256 -sha256 6290f90417b194c467cf432d9c012d4321827160407c5b4664a443910a54c7d8 sh-sh4--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2024.05-1.sha256 -sha256 3d6b8fb7c21d83528617eaaec7e078e0eecbfb0c939ea7be5794c287735d644d sh-sh4--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2024.05-1.sha256 -sha256 acec95cc0b26cc82de58bd5aee7472511563cb0145ed2f74a72344070216cc39 sh-sh4--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 6b7a3e1048c7679c8ae9be113cd51a8be0b2816502f00bfd006a035753061700 sh-sh4--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2024.05-1.sha256 -sha256 3433820a3ca8296d5166fbe0d8bcc722536fa9d71b3631667bb5039a61fbc039 sh-sh4--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2024.05-1.sha256 -sha256 cb4d6abb85e3e86d6d0b285d2b4d7ad6ece6483835f8950742e17ff5a2967ee3 sh-sh4aeb--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2024.05-1.sha256 -sha256 07c14c3c9bdee411bd1d5c04cd2a1ff50dd98231f1fb648f5746b0d2fab81767 sh-sh4aeb--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2024.05-1.sha256 -sha256 1c10d7c73bc61076007bbab909400dfea9cb7c6f9c356c03ef2bbd996b8ba003 sh-sh4aeb--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2024.05-1.sha256 -sha256 ebcbbff459bdc76f9ee3627b8f8688d922192eafaf1890911d2c7454a4973aec sh-sh4aeb--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2024.05-1.sha256 -sha256 5bcbc1fb43b8f0240b2f2503c8dfa9a2efa38ea23d2a2f44df4acc5a1288ef9b sparc64--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2024.05-1.sha256 -sha256 29d1e6c0d45ab95edf33ff2ee77b27869669f476a23d76fef96f56f8d3cc6234 sparc64--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 c74944737263acbabdbf7b646aa41dd6c96336d2dbbefdeebbba9866e1374a0a sparcv8--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2024.05-1.sha256 -sha256 8ec2c84b84a13b854a13802537f0b04848056ebc65f6212202f6d8c8a78d4bc3 sparcv8--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2024.05-1.sha256 -sha256 bc7ce1172602a377b5444d09b349e7d9fa2662b7ca59a95b884a7ea18c4de7c7 x86-64--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2024.05-1.sha256 -sha256 932823ca9a3e067e7e2a29810a666d20c9cc5bb550de947f6879e38ace1aa955 x86-64--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2024.05-1.sha256 -sha256 2721cb2421ba1f9740a739247da9c12fbebbffeb131998719bc810d7319eb9b9 x86-64--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2024.05-1.sha256 -sha256 f3cf417d28e7df95bdab632ff837de66ac03145bd0e1dd78cc89aadfa6e31526 x86-64--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 80830735a18239dd644b6aefbecd24437cc593402120b6eba0ff8625306fff3c x86-64--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2024.05-1.sha256 -sha256 da3c9a340e5d4c5037f2bc3114d262c5a27e8224df5c9ca6dbf5c5b4740445b4 x86-64--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2024.05-1.sha256 -sha256 809974fbfa1231e87ce40a81c6b2f78dad0cf4b0a61a6e9480a1c453f3983471 x86-64-v2--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2024.05-1.sha256 -sha256 4db498b45f0a0d85d5810ffe2d9558225f73159d261bfc7d8c466893d2f1ca08 x86-64-v2--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2024.05-1.sha256 -sha256 93e59f4ec983bf600337fc624e292ed86942d6c8f59af34ed8300a45474665f8 x86-64-v2--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2024.05-1.sha256 -sha256 f3c84a280e6fce53bdc95de1ce697fb354c85a3739c5102198e0930961a5bcc4 x86-64-v2--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 36b00ba714a82b0840165ce5d77931660d7daf571290638504791a71022f3fe5 x86-64-v2--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2024.05-1.sha256 -sha256 ca1dda638c053ca8a0992f71d02f4ccb54513d523bc3b09ded0017368ac258bb x86-64-v2--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2024.05-1.sha256 -sha256 18dcd9bebbe8369ffa577dfeae3c3d6622a8b7c022a6f41ce70048c7d41ce518 x86-64-v3--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2024.05-1.sha256 -sha256 21e08661a702695bfb1fbcbdb4c671e4c8146db2daf92e23e38e501f227584af x86-64-v3--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2024.05-1.sha256 -sha256 d2470a0001c7a00906752e8523a940a696a1218da7e9dd7b62f8fca3f58fcdda x86-64-v3--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2024.05-1.sha256 -sha256 e7f7da14ff1378bb7ec2a4014fa4f4fdc07b089e248e50f60ce930fd9b9fbc0b x86-64-v3--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 565883663c3e1901c7f8059dc8b55219940ffb464dc815b35801a81597a9b1de x86-64-v3--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2024.05-1.sha256 -sha256 6bd8b7ad75da84eb0f4f9da277584e79906c0a24dfa30e908cc20847f37a23fd x86-64-v3--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2024.05-1.sha256 -sha256 5de99096e454f9fbbefd5e358ee926c1999912c7f154abb0dca081fc38474554 x86-64-v4--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2024.05-1.sha256 -sha256 b546f055275d333c689dd9e0c05ae63b5b5419b5e79a5784dea898cae8d2e093 x86-64-v4--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2024.05-1.sha256 -sha256 f58bea6df4ab87cad5dcfe95f64a57365bd44a7624f19fb463762de1b41bf452 x86-64-v4--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2024.05-1.sha256 -sha256 fab47f56200fa54ce76c854f7a048fe61a2b346b87884199bb7e9ac527a86de1 x86-64-v4--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 2806f6e9a586d17b0009cf6b8b4ed351b3a6cefea552890e41ab9b56917c2470 x86-64-v4--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2024.05-1.sha256 -sha256 38ca4406dc1706153850ce331b82eda97e2badbd09ba033981da1bf66acaee17 x86-64-v4--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2024.05-1.sha256 -sha256 3076f0bd485696a1b8f29683d9330dcc79526cc9328064911548dd66e7bbe84f x86-64-core-i7--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2024.05-1.sha256 -sha256 c80884040a81a33fdd6a4d3f54d63650dbeea280ee6324664faba094ad93bd74 x86-64-core-i7--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2024.05-1.sha256 -sha256 0a8a2e6f6dfe8207bef3ce7c0445e4b72f57390ca590f6d50f61f03eeb8e2e0e x86-64-core-i7--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2024.05-1.sha256 -sha256 da77433e841011e0d8e3c360851e1e4b88996888a749b41067bfd7296e47f1f3 x86-64-core-i7--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 eddf678bfb23dbc2d07157c3371f8c45e8e9f8438ad64b615fa35e94d2a840cc x86-64-core-i7--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2024.05-1.sha256 -sha256 4c4a8ec05711f2e902b0cea50b29a6f536a0f184651ebe03fadcd8aa5febe11c x86-64-core-i7--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2024.05-1.sha256 -sha256 999cc27420b4305e200017d0780759206656cf0d39f20fe4502e4e547c9a432b x86-core2--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2024.05-1.sha256 -sha256 8bbff9a34cb5807bd81d46489c115fc4073726db2afab079ffdb7e4b44994b9e x86-core2--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2024.05-1.sha256 -sha256 583b11a382b536610c73583121500ee8e88ec3942f99090051a272ca0891dfac x86-core2--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2024.05-1.sha256 -sha256 c28cb368d67172a6e2d404250cbd5b1be70c1ae4f77e4514a46ac82bf53c030c x86-core2--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 d73f4119c0afc073fd1273cf1cc787b531b64665fb1dd1a2304de8c0fe4445ac x86-core2--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2024.05-1.sha256 -sha256 69fb29808de400fe59dc8c47b60c0e0cb5b65f48cbef09432edfc8cecb25a6b3 x86-core2--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2024.05-1.sha256 -sha256 81115a9b098b86c5ff37f3adac265d55c572fef1936378991995c285d9a65847 x86-i686--glibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2024.05-1.sha256 -sha256 023e4f03cd212b5545c4c184238693b61b40fa36d257b84546100a92ea2c1d8b x86-i686--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2024.05-1.sha256 -sha256 1fadb2e0195eec06efef94f16339ad1a950789dde618bd17f22fbc7346893584 x86-i686--musl--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2024.05-1.sha256 -sha256 f16c0f2cff527bdf9753135d5e22dfe81390f3646c34d05d951d23f76fbe06e9 x86-i686--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 b958ab84b59f2993afa5b2aba4b24b42c95826ae9ea01f04cf6b2dfbbb2e8a6d x86-i686--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2024.05-1.sha256 -sha256 e240d983717e03a8ea7c5ffba71077b555f05f40694f177e23756d2a47656599 x86-i686--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 eec483e97164d82939034c28bf3443e1d3d92f1674b9060d4086b773ac4e6ea0 xtensa-lx60--uclibc--bleeding-edge-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2024.05-1.sha256 -sha256 99f275b884895049a2d47812a94953199368da99f4bc2bd39869711006610c0e xtensa-lx60--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2025.08-1.sha256 +sha256 54875d12829a792b8d4d1c9fb1f736afc60f514b0d260616f188eafafaac7cb5 aarch64--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2025.08-1.sha256 +sha256 dfb47eee874eef9e8a7fc042eee4e0a183f444b6bcde6a82fef8f009918389c9 aarch64--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2025.08-1.sha256 +sha256 e102fe06809440bbca3b6d0d8837ffdb5122b07386d1d2ac023084d898aafe7b aarch64--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2025.08-1.sha256 +sha256 defba831ffa1175236f137069333e21ed46d4d19feb5080a90cf248b6fc2cb08 aarch64--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 61e07fcd9e5e114e417d4c1fccf5cda5c75b1d5a1c005f848a6868ea4a0ba4e1 aarch64--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2025.08-1.sha256 +sha256 e2f636f61d9eddbb503f7c9b04db1d9000c3c9281d9943afe373a61cbf944e3a aarch64--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2025.08-1.sha256 +sha256 9ad606eae73d7b48a1f7f658a9cd4af48916855f8fa27f7c6d0ded20ee5e9d9a aarch64be--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2025.08-1.sha256 +sha256 4eca1a03d3d73bd31427d0f231d40a9f00a682a50c6ae5b31f6738a4675f9dd8 aarch64be--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2025.08-1.sha256 +sha256 e9152e550b0382df90ac177f9463d62ea2f7301372d71397db6205c7e7c6565a aarch64be--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2025.08-1.sha256 +sha256 27c3196d69457ff201613eacb4764eb0f6dca8a2b56c4d4d13ee62c2fd3e18c7 aarch64be--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 d575f74461619f072bf394d784fb1e68d07cebb21ebf4ef07a40856152bffd92 aarch64be--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2025.08-1.sha256 +sha256 6d95a432130f38ddaffd04e08e2e21e3f58124e695d4c4ead7879a936d8333f9 aarch64be--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 2e38f7bcd0b7f81bfb54357b2fbd327300fb14f5977414f1f3dcb871dae5c75c arcle-750d--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2025.08-1.sha256 +sha256 dd0fb263ec10ffd15a4743974af6509a66e705c1da1dc1a72a270702e4567be0 arcle-750d--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2025.08-1.sha256 +sha256 9f871ad3a93ce027adb66b4239396fba8da021924877f6dd0fef5ee2e7c7b9a4 arcle-hs38--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2025.08-1.sha256 +sha256 c854f2339336662b02f8f440c348e25fa98eb80eb6c78405863b9ee5baa73a79 arcle-hs38--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 99086c8f5d779f1b19c57686778793020c7bb3af527604f132e2bda252915627 arcle-hs38--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2025.08-1.sha256 +sha256 acf19ed3f1fd6b633cd4ef0e84bb5df8c20890ac4efc7312de4c00221ba7a774 arcle-hs38--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2025.08-1.sha256 +sha256 bea49b0a172d318c9eb08a568e5a94ffac0d5f320aa88625e4c8126bc0dcd1fc armv5-eabi--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2025.08-1.sha256 +sha256 53f3d7c2b0ce32f120043bf4b338b3ea3f3375015ed63f5b382a5f62894baeec armv5-eabi--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2025.08-1.sha256 +sha256 e8cc7d8033291da63a5390b3450c027d2722594f606d465d5303cb35186ef974 armv5-eabi--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2025.08-1.sha256 +sha256 8cdb4ad70c6b5a66427fa3315fe3ddde1c19c90232674dec59045e04d2a36cf1 armv5-eabi--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 b0a04c35aa32a5722dc4f3f73288685855b932e501bad9397a9a3da7a5a1f637 armv5-eabi--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2025.08-1.sha256 +sha256 e5415d32b39e94bf7b990ea4ead3619bf7055e338309d2cce2b6de2dd7307f12 armv5-eabi--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2025.08-1.sha256 +sha256 a9c2557e48c010361411c0c42ebacb35543ff0aa3377211be3bd049414267d16 armv6-eabihf--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2025.08-1.sha256 +sha256 062c148a62785ce583f32e2e69bb1e8fc5dbb598bf4baacce0df118de4066de8 armv6-eabihf--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2025.08-1.sha256 +sha256 4159a6456e6cf2858fc3356da135d34db489d446cea6edf943a2e6a2e342de11 armv6-eabihf--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2025.08-1.sha256 +sha256 1a283f0936953c139d7171187414839c119997ea816de201f97e79ea3cfd6947 armv6-eabihf--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 925c12a0c1c3d4e9f86b9c94947546e9c4f786c0b5cedce7e55bdd68e3aedb08 armv6-eabihf--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2025.08-1.sha256 +sha256 8977f8e657518955d685263d527aa05ea502c5cf937fff926c2e1abbe2150299 armv6-eabihf--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2025.08-1.sha256 +sha256 eed0e672d305ac08d444685b48eafb291c63387ef7916c1615354ebfb3d1ebdc armv7-eabihf--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2025.08-1.sha256 +sha256 97d6fbaf19832002f3d6aa8fd31b2d29c1dc7b0752f4ae8ed35860fd33c1f9b4 armv7-eabihf--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2025.08-1.sha256 +sha256 d3ec56feaeb5ffcb9c953b54acfcf99d32ad16542fe9206574f5cd1d11a74b48 armv7-eabihf--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2025.08-1.sha256 +sha256 2f3a34458c3a8b961bd09f89669130fcdc4c1dbc6e31ada720527e4ad3741c11 armv7-eabihf--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 4a2c03247bc9bdedf72bdd4cd4e3f1859fb9b915a92e16fdeedbeb6d6d6b3399 armv7-eabihf--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2025.08-1.sha256 +sha256 1368328e9214ec71f0f9cea5229559fdd477e614b1e85c062fb562357b0a00ba armv7-eabihf--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2025.08-1.sha256 +sha256 1380971b9c480a7b5ed704e33e6e5d77974ad3a1e4a3b9d525f63e150387f7a4 armebv7-eabihf--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2025.08-1.sha256 +sha256 98150dbf42927fe33a1ce51f48d13fcd83e04ba7c3d8c9ad0fc1837a3fa971ce armebv7-eabihf--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2025.08-1.sha256 +sha256 8e724c1a763d23a5ad107ddbb77cc34e534b7aeceecbd6f9e65ee0b133b7ebeb armebv7-eabihf--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2025.08-1.sha256 +sha256 6429155d88514c508181483616ff23ec2307af5fa24ff55e340ff9a84acbb37d armebv7-eabihf--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 fc9fb31cf07e3bd6d1206765b93250ae44fb09c535ac182619c9d1612d926c1c armebv7-eabihf--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2025.08-1.sha256 +sha256 e048d4a7022b07cc585c5ef0c78842479bfcddcb521734f3278acb08a9f8dc99 armebv7-eabihf--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 13ebf698a4bfcdbb41d8e619cf76fbeb15224fe7c5239436a7e9c558ed7852db armv7m--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2025.08-1.sha256 +sha256 8024e0e353c85eb9c0a70aa258a0b6a2023e619e4d8cde082578742a80e1278c armv7m--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2025.08-1.sha256 +sha256 7e59552b90bf7ac1d122977d68e8a67f00e56d4aa591f0690d7d7742f611fe19 m68k-68xxx--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2025.08-1.sha256 +sha256 0ad3bde066917d3d57b05b89fd13529acd401f4bef4a2afdd0c14452d039ca77 m68k-68xxx--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2025.08-1.sha256 +sha256 defaa92f0a236c32384b681c07511e3cdc6dc7350ee570dd79bc64427fa8380c m68k-68xxx--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2025.08-1.sha256 +sha256 356551e95045f9f3ead162d9966ae02c914049c2512e4fbf8ea81d06edd5f2fd m68k-68xxx--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 a6566dd60e1f483d9eda0ffb6aa881e9995ee23f9f04bdb69924462a7903a5a4 m68k-68xxx--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2025.08-1.sha256 +sha256 bd065f2539e8ac03fdbe6fbb8b94f02c73337a828e958cc8e6fe27219c0b919e m68k-68xxx--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 7bb582b01d02d01533019e949dfbee163a45b998d9c59d08832002efc46c9642 m68k-coldfire--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2025.08-1.sha256 +sha256 ae1f50f6b274464208ebd291dbd9a6b2fa35682c16ed390eab4d8f6607006a77 m68k-coldfire--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2025.08-1.sha256 +sha256 0afdbfa599ea51e29242d2e3c2dc4e89f29e8d908ba988cee27eb51084660fda microblazebe--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2025.08-1.sha256 +sha256 dd0851e3e95feaebac2e078b8ad49bea9a82007443808d054e09f0a10a43dcc6 microblazebe--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2025.08-1.sha256 +sha256 f4ea28fd3e6651bf3044d08abe7816046da4898ca5d7611f3102bd6103930473 microblazebe--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2025.08-1.sha256 +sha256 99c6105e256a5a928595e18496996949201479fe9ea88aadcac8036d8be6d350 microblazebe--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 15f279cf63289f88ebac16772463e49d0d18d859d3e3bfe2c6ebe07dbc2cb9b7 microblazebe--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2025.08-1.sha256 +sha256 33eb906e9620604690986767be46cd0f516dc2b425a90d97b99f0977ff209557 microblazebe--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2025.08-1.sha256 +sha256 9ce246743ac66207e76c3649a9880f5a727e46e58d5384283af8b9a369060b2f microblazeel--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2025.08-1.sha256 +sha256 d171dcc14e21103636b4e6e9f59986303678d8a02435bde3453c3407fbe61424 microblazeel--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2025.08-1.sha256 +sha256 515adfc96b617e57d5e0b0a2d552c55e014c3ba7ea0961ec205739015804bdea microblazeel--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2025.08-1.sha256 +sha256 85654de9dff94aa016510ef1700e90ae25ea4c74a15d9bdde3bb543d2662f09a microblazeel--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 add7bd4c6eed777af458fe84a5716005a10859528642dd8185b0293157cf10fa microblazeel--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2025.08-1.sha256 +sha256 8ec6f521b5ca9ecb3eb98afd0c7bba7b42ba07329d08331aabe2300d9881a3b5 microblazeel--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2025.08-1.sha256 +sha256 6594fd0af39c24e8c1dafb40b39aa7beb6d1bb51d54d525acf7088022ce9c318 mips32--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2025.08-1.sha256 +sha256 23d0f36aa7962230ef43338ba14ac2a7fa6eb68e15ef39cb9114ac711b907f70 mips32--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2025.08-1.sha256 +sha256 a0a868d17980f80d1e40f81d4caa88b72f27dbad2b7c2119521a9bcc78969abe mips32--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2025.08-1.sha256 +sha256 35b434d3ae1a46065d9e37de56b71bcf0e72bcda652f96d185e51dbea7ef045c mips32--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 f6b86ced93fdd4de9d97db2a30aa0545822223c7be4a5dc043aa67b05b8dbe84 mips32--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2025.08-1.sha256 +sha256 0218bfa5ef4624350e48cc372632fb4bac60db54822a56f5565d4144c180f095 mips32--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2025.08-1.sha256 +sha256 cee17e45c3c40255796b7ea80e0499aead00504ff51d0f8201ab10f18ff5e4eb mips32el--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2025.08-1.sha256 +sha256 1085fe6b13d74205ef6e92d1d40fb3960bf6e4bad50555c723fa07416cb53c1c mips32el--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2025.08-1.sha256 +sha256 94dc82f94e87eb143d0959b3bf9e2bdd1d6d99e51752977e5cf1f249de69e46d mips32el--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2025.08-1.sha256 +sha256 12a5e2f50b94b5c619730914db380ce9679798fb3c7460a40d480f77bb50628f mips32el--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 075ba385cee0a40e32dbd658a517373488536150b6e2ebb9042ff6d4450257ff mips32el--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2025.08-1.sha256 +sha256 3911658253cf2e4b6168f0dca1511b96dae355979cbe4aa457a3bfe8116b9d97 mips32el--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2025.08-1.sha256 +sha256 5ed7b512c4b36244bfbaaccfc88b0f8cb81031ad6b709a18005ba8187d79114f mips32r5el--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2025.08-1.sha256 +sha256 47e4a737c7f820c4f490ac7ffb54adf2c853d7a05e450ef1e6da3f44e663b487 mips32r5el--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2025.08-1.sha256 +sha256 78c2942feb0bb1ee9f19060871fc320f33856abd1d9717a5c6aa8d9e0355bf20 mips32r5el--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2025.08-1.sha256 +sha256 c68ba5c5122c8df26c96348249467d3fdb4b1405a4ef316a365c1e8c82594edc mips32r5el--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 14f6b101aba02a4978deddd4a9dc91d84e0145bba0b2c7204e439e036ab1b684 mips32r5el--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2025.08-1.sha256 +sha256 7ce96fc3e0fe7409de3db1a205d74c0c9cbd30ad1371fb54bcee5f50cb517c72 mips32r5el--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2025.08-1.sha256 +sha256 3594f3dbc57ee3901af3c3f262969e633a57991e2b7b6ec7bd4ca6eed2b7c677 mips32r6el--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2025.08-1.sha256 +sha256 a43b136dcfc081a3c5cfe411cf9b47b7c1e8dd98d133e5afca72869e59c4794c mips32r6el--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2025.08-1.sha256 +sha256 3a64473a8a58e71bbaa45cb0eba9b7c079f34a2e153af23fee0f90f7bfd65da4 mips32r6el--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2025.08-1.sha256 +sha256 402aaf0420e728f45ee8702d05b84519d7f423944c59942cd17f65bb4cff75d2 mips32r6el--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 f840342d1775c349476c76cb2375c036c6a2061cc34c4fe7e22b1b1fbc993cf3 mips32r6el--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2025.08-1.sha256 +sha256 1731fc7edec2e39b5040bf09e1d8212c2b9ce9fee337148324134163f265e497 mips32r6el--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2025.08-1.sha256 +sha256 fcf828be016eb08f67cdfa27caf6253bb61cb51a1ca1fff88881aa6dd8fa1771 mips64-n32--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2025.08-1.sha256 +sha256 4f6220f1ea1afe900dd0f014dedfaa7b216fb05b002bac0e5bf2377a50d198c6 mips64-n32--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2025.08-1.sha256 +sha256 ebee97042671dee23107ea950a8a828219d66f28705376d46e8d71c5c4b8aff6 mips64-n32--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2025.08-1.sha256 +sha256 e84dfee1d90952396065d2bcd0f28dac3d315bb59012b6f7568a63f3789b853c mips64-n32--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 cc4e36fc1f959fb0529376de5a6a70f25adb822fa0db4f876e070ded82599ca3 mips64-n32--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2025.08-1.sha256 +sha256 9938c76f4a65aaa79494237597cc751479e66938375abcd8a7bdddd39f04ccd0 mips64-n32--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2025.08-1.sha256 +sha256 b2195ffc091a2ebd2027e5c06d2b68e4f294877b5352fc6b84982d9b67723a65 mips64el-n32--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2025.08-1.sha256 +sha256 3c370fb4ea2015ffe77ed69ec6af2b33bdb74be88d4ca544fe0588fed9762c7f mips64el-n32--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2025.08-1.sha256 +sha256 cdcf1e6852326aab2f3573a669e92aafd053c3c02256d382183f0cecbad4a3d8 mips64el-n32--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2025.08-1.sha256 +sha256 772712d2f0278f53bfde0e954cc7ad01d25ac837f9c40af2f25823b28e23aaef mips64el-n32--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 5b62273a90a887dc3e0fdc08a07ab6ec792e32d69709e5e929bb073b5ba378fe mips64el-n32--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2025.08-1.sha256 +sha256 da101611d048cfaf3f0df98da92da091286630dfcec6a794022713c7024a94e6 mips64el-n32--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2025.08-1.sha256 +sha256 c5d55a8c3c18056faac6316bfc9d8adaf8a8b8f73bcb96477b36a56f79c5a1b6 mips64r6el-n32--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2025.08-1.sha256 +sha256 f2a449cbed813b357a1c327630d61e4e24aab33e1bccd64985e90a69e13b087a mips64r6el-n32--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2025.08-1.sha256 +sha256 d485e5984da474bc67e72626968db9f719e07c007aa71881aa48943c484e2072 mips64r6el-n32--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2025.08-1.sha256 +sha256 7c76ef9502a9b53fb17f3c6f0604b88de9f2bf5e3dad2d73536041e6473232bd mips64r6el-n32--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 79289935bcfaa4929daf75a86cda8025eb4227aaaa9a81b768cdd0d7c5ba7251 mips64r6el-n32--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2025.08-1.sha256 +sha256 9a2a97e1ef4b2e320e053cc9918be5a9d10f460096827ef61c378a2347ccc522 mips64r6el-n32--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2025.08-1.sha256 +sha256 87b78b6129470e687414e37dc14f025349574cf2c224047f9c1bc2f0779daaee openrisc--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2025.08-1.sha256 +sha256 03b6e025b372970d4daf6879900b19df6fe23c9feb2c130c6743f36a48cb7d70 openrisc--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2025.08-1.sha256 +sha256 00a26576bafeccd7a4bdd7e8da649c7a8b465160c1dbade8a9b2559dc112ec0d openrisc--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2025.08-1.sha256 +sha256 fcaa1ed86b5fddfb7c0b2e7ec507a54d4723a0468de466fbbc0331d14d37a3cc openrisc--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 e877168c4eb637157e8dd9c4ac14de8d9492dcab8013434d9b62987014c8e534 openrisc--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2025.08-1.sha256 +sha256 c4554431ebbb615afaf12cdca0c9938ae41d77f45405e572be1ca91a52d19bd4 openrisc--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2025.08-1.sha256 +sha256 218af0ca2d46430e73e0773472d575b8e17f605df41887c12983af66438946c4 powerpc-440fp--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2025.08-1.sha256 +sha256 ff9425efff6ea7f9853fd2c0df7cf8f6c86d7a4cbd4f58605f3794e51237acfb powerpc-440fp--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2025.08-1.sha256 +sha256 5c9f9a07aa2dbaab33289c81911eda55b7ed6f392a632df68c9d7e31b61af57a powerpc-440fp--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2025.08-1.sha256 +sha256 5faa42457f06ded74f524074d73330f8156e53b4eb1e929069dc5df94d9a0868 powerpc-440fp--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 d4910ba94e356867bf7ae2e55e394a4419685d33c344a643ae1b8ccee3374457 powerpc-440fp--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2025.08-1.sha256 +sha256 864d99426acdccaa2787dcecffb800c502c0c5f4a344a6d2e2c609314631fbfe powerpc-440fp--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2025.08-1.sha256 +sha256 e9da6e9ac7864b16f07bac4d2454eca41baac027aac3ff29b36c7cf21fff7373 powerpc-e300c3--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2025.08-1.sha256 +sha256 581d0441a31bff4f3a0996b824afb3fe35c6c32f543765b28a6b63a5684fc116 powerpc-e300c3--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2025.08-1.sha256 +sha256 9533c785819a5ee3d7075532de3b97cd57cd5290f2977b0de9ea5fa0174d1b02 powerpc-e300c3--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2025.08-1.sha256 +sha256 5f628b374b6857f4b4ceabe5e41b2565b07985a7e444978c87b0f864bb5a47fc powerpc-e300c3--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 6b499b08a54ede805b3952ec2998868f1bbbf16a1ff6a3fe03a4e920bbd1786b powerpc-e300c3--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2025.08-1.sha256 +sha256 397a57de82491dab311e0305e6c49ef7623abc8b9257333f4c41b8c854c963e2 powerpc-e300c3--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2025.08-1.sha256 +sha256 2e0e681f684d0e2ef1ecdc187dc9dcbb91f64bcc940bb0e2255c2a3bf9e25383 powerpc-e500mc--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2025.08-1.sha256 +sha256 0232c110f2e47dcab4834ab375015a1a7a19379b059c352e5a95b5578f74a0a9 powerpc-e500mc--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2025.08-1.sha256 +sha256 3901ee890ac5e3a4064cf4a6611d8bc6ec3124988c770d305830719ddfcb0065 powerpc-e500mc--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2025.08-1.sha256 +sha256 a863d426495f89a7732d7e1e8a9862854a9823c5c95ac79ea0d082f8be357e34 powerpc-e500mc--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 bf657e82026449af48b3b2c2199ac2752824ee621c8546d4619a0da0434f2024 powerpc-e500mc--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2025.08-1.sha256 +sha256 6a1e0c0a7bcbfde645a8d432711ccf2a223fde3c99a774c3938064d1ab955ef7 powerpc-e500mc--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2025.08-1.sha256 +sha256 2351cf635eed3fd47a5655fdb918807136b90d2f4f4c83e51e73af064546f9a6 powerpc64-e5500--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2025.08-1.sha256 +sha256 0334d8c2b52043abc4ca5075af22ca9192b4c624ab7d4f31c8a6e1ed48c9f167 powerpc64-e5500--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2025.08-1.sha256 +sha256 8af79b874733206e3b8ed2156c7bedf6359723370e145f8d8d51bf5ecf677bec powerpc64-e6500--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2025.08-1.sha256 +sha256 7341a030bda89b7784d40a9d6df5725eb927fff39bf7990668bf919a9c68b65d powerpc64-e6500--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2025.08-1.sha256 +sha256 26eaed61de5538f16cb558ac5f64a860e325891dd194687e91b01ac9069309bf powerpc64-e6500--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2025.08-1.sha256 +sha256 2df7bf4878887c8be4daa41521bff14281bd0163f3bf15c0652ddb7f34b1d803 powerpc64-e6500--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2025.08-1.sha256 +sha256 56051f6fe8059eb5c4fa225767c816cf29c7f1de99d5dd012c671755f7f5baa2 powerpc64-power8--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2025.08-1.sha256 +sha256 5d4504754d9a1c6fe0385f4d32f83523a3c69d1e1f9926edd677139fed16e278 powerpc64-power8--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2025.08-1.sha256 +sha256 c2ee0fe6036f30e00d42758b367d1f8dba3a6fb2fd8548c8d54caccf307d8ddb powerpc64-power8--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2025.08-1.sha256 +sha256 37b16e86732696c6d30f4ac41ac6e279567ed1014c05dc44899600a9c8ada8ab powerpc64-power8--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2025.08-1.sha256 +sha256 c37471e3688d1a2232bd9b29bf3ba6fa833b0f683e45174d7eed36b901353392 powerpc64le-power8--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2025.08-1.sha256 +sha256 819c8dee94b1baff33943f3b01d669ea794a825e7b4cbead340ad5de8cff6baa powerpc64le-power8--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2025.08-1.sha256 +sha256 92758192acda8f5ab17448c702af906023fc60cc7d7808cab1e5731aec3c4453 powerpc64le-power8--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2025.08-1.sha256 +sha256 c32887d632e86da99a1c4efcc4358aa803b89d0d9651df65fb9d241c8edcd6cc powerpc64le-power8--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2025.08-1.sha256 +sha256 85befad773c292e4b356514d924eeb202c1078d3c2c6bb6ca35037f5b9ab79da riscv32-ilp32d--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--stable-2025.08-1.sha256 +sha256 d42680e926542595c4c87629d33f5f90aac1e9a964c8955089e0514caa01b78f riscv32-ilp32d--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--bleeding-edge-2025.08-1.sha256 +sha256 f8227ec5579f4861f9293b6aeb4c14d5e0321bfe2485e20c15fc9647e4d608df riscv32-ilp32d--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--stable-2025.08-1.sha256 +sha256 f15e9ed67724b249eb149126eb6ed945648c3cdcd3c1c484b23c1a12df368391 riscv32-ilp32d--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 5c7f5dd0f146a575191c954459dd912d4301d4ef22dfb4a99b555bf6a5380399 riscv32-ilp32d--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--uclibc--stable-2025.08-1.sha256 +sha256 48e97598eb2fdf11e9d79e4aa93fa47a3404ec2e6bbd7e84acad6579cc9fee97 riscv32-ilp32d--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2025.08-1.sha256 +sha256 4040cd45c13ff03e8daac0ef69caf4322ed10e9843914d628b315c5dc27bf9c9 riscv64-lp64d--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2025.08-1.sha256 +sha256 45209041e9ba5054aa9787c40bce0ac1e48b78528b6635b79dfb4253e1491ff0 riscv64-lp64d--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2025.08-1.sha256 +sha256 5100cea9083aa2339113a61a64f857d4c8c68981d0a973e8fa1cd918a06b4854 riscv64-lp64d--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2025.08-1.sha256 +sha256 2c5155ce133c9c8dddde8f69b0715aa07e0520d99b1fd0131d915357c6fbce39 riscv64-lp64d--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 3c99d7f2f6c705e8bdc59c3e156f14e65d23fb933c2d968a1cef70a1d4a2817c riscv64-lp64d--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2025.08-1.sha256 +sha256 04b82356a5956ebb58e03d163e958e9201071c24481102f18ac4e18efe1dc549 riscv64-lp64d--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2025.08-1.sha256 +sha256 dbd0a4a2ce4cbdb9481baad78ed33d08fdd5ef6d660f2fb8aa4da97a0d5419a8 s390x-z13--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2025.08-1.sha256 +sha256 4e67f2751487493c2d68aab643de22a6e8cf81e6d918125b96b50eb5e02a85d5 s390x-z13--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--musl--bleeding-edge-2025.08-1.sha256 +sha256 c7f9a94ba17985d3c5608c93b22b920f65bf1e46e465d4588dfd20c2f7393905 s390x-z13--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--musl--stable-2025.08-1.sha256 +sha256 23f536ff2bf1a9d3b93210465471996bc7c918fbb5702a277d8e1e42ffab8559 s390x-z13--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2025.08-1.sha256 +sha256 173a40ac99693a4b41749468f8f00c26511ffb2515bef0782c6074a9aebabe21 sh-sh4--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2025.08-1.sha256 +sha256 0bf080d351d4a97a412a7068baf75e036f071de323c5e04a71be6992576f79ce sh-sh4--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2025.08-1.sha256 +sha256 9c23e9504fedc250def212bdffd462bcbf1d0750d3914ade74ab5620e6534d23 sh-sh4--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2025.08-1.sha256 +sha256 cd08c2335b4676c3f51a8dd3b1b43cb02a8148b5c118b9c439f481ddb51bacf6 sh-sh4--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 cf2bdd8c2de851c6be0f830677abf8b8edd315fc5ab366b3450a022027b1b8d5 sh-sh4--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2025.08-1.sha256 +sha256 e8c2065017a3cd2355dcbb12773edfa6b8078e963178f047ccdfa493ccef1f6a sh-sh4--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2025.08-1.sha256 +sha256 a06a9b61d07f78510f17def530ee428e1a0db6ab430a0cbc65d2445523995b70 sh-sh4aeb--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2025.08-1.sha256 +sha256 3816efda0e543ce8fdb22ef830df3bf8de32c8bca42122f830f2f10d2f6000de sh-sh4aeb--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2025.08-1.sha256 +sha256 08f0f9d416214e1ef6abeaebe6f5298809895bf3575f568a76a7abadfd609b22 sh-sh4aeb--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2025.08-1.sha256 +sha256 85d562535d9f2e377086296df44b87c11cfa751c1112bdb09921cd2c11055457 sh-sh4aeb--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2025.08-1.sha256 +sha256 43cf9403feec9299a0d61d6aa0a7360dedc25187b0c5383cfb69cf2ac703be5c sparc64--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2025.08-1.sha256 +sha256 39c2a3ec9865bcdcdc4eb77a149283d92124761bcdacda347a12dbc1d4e6eb1d sparc64--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 0bf2103e45611de427294b51beda4ac6a404cda34622f7670534dcbc80f98d37 sparcv8--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2025.08-1.sha256 +sha256 5d099c4ecdac8e030e04e5b5139e635a9a1faa64bb77f452b33ef469f93b6e46 sparcv8--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2025.08-1.sha256 +sha256 dc986211c6a8701868277d52e8f5061ea13d119ce0d9f23b61f1b0373984479b x86-64--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2025.08-1.sha256 +sha256 760acd5c3159448b618e237b61935335baada74fe0cdc0d7611826cb49b41c8c x86-64--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2025.08-1.sha256 +sha256 830644a5f9c921fd8df2d40ab80dd81f03a662e5a7ad3cee20dbe2fde0de272e x86-64--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2025.08-1.sha256 +sha256 09fca3aa89540f1b01b5f4210d488cbeb00f522044c53e9989b1dd8a38076912 x86-64--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 8afb195a0aaa5c83d539d28bb4efcd6f5a3442d02e0e48318df7f495d0749140 x86-64--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2025.08-1.sha256 +sha256 39499bcca6c50e39ed61c2afbf0b4005fc676df72b9b68fff75347439061eb2c x86-64--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2025.08-1.sha256 +sha256 9461ecd9f2b2f99d3ac7c52d49d9491b35d732f6c8fc60c8f226e34541ed9e3d x86-64-v2--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2025.08-1.sha256 +sha256 fcbf8a7ce1c1c5dbd8d322a54f0fa8d5e18dec7511df66032d553a0a8639a076 x86-64-v2--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2025.08-1.sha256 +sha256 edaef4802e3891f44a466a1c3cfbe84215815996fd606494fbffa9c7fdfe01fc x86-64-v2--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2025.08-1.sha256 +sha256 d1ee83f905eaf2c4853d8102f408be0c3bf627531e71ab8fd796d94684077316 x86-64-v2--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 dbd93aa8318e1b04aa6678aea8791c781bff06cee98a9f4a300e88ebb170ce40 x86-64-v2--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2025.08-1.sha256 +sha256 d6422faad1384b3b58177149b257b814528058bba210a3fd2e70ebbc4272bfe4 x86-64-v2--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2025.08-1.sha256 +sha256 f055e7c1c5725dd4fbb7cf5d929b3c3d363a4c25c29070fc25041ba56086b2ac x86-64-v3--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2025.08-1.sha256 +sha256 fd63f95fa5eb52ef891da434bd3deada493d78fc11e42144f02d8806d7b47504 x86-64-v3--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2025.08-1.sha256 +sha256 3f352161c60f7a0ae1784bf429b849a70862f00d5154758d48f384bfda561234 x86-64-v3--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2025.08-1.sha256 +sha256 57324b3e06559a0e03ecb0a64faf7d4996c6f8e60d82f9222c479877ff5717cb x86-64-v3--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 99da8fd247b96495e02405879b2bed096deae97e7d426c3ef79144cd66aa52d0 x86-64-v3--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2025.08-1.sha256 +sha256 08b0b8cff1aea69bda3e88917a3c8deb3e05ec71c55c31079dc7780126f2bfb5 x86-64-v3--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2025.08-1.sha256 +sha256 de960c26eda01fd0e68c30f3041ffe1a68deb3a9d9dde57e1a7c17b3954135a0 x86-64-v4--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2025.08-1.sha256 +sha256 8f1a5623cb0a0b7814d7b87495685f5e98338f78062ea749c31648554a58ddc2 x86-64-v4--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2025.08-1.sha256 +sha256 35b38a6281f1f22c1fe5a2bdfae94dd999ad32c4e61e12c34d5ca1cd6c2b9436 x86-64-v4--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2025.08-1.sha256 +sha256 e259c0a51b4fc3c43c254a2e7446abafe38f01f00cf5d7f8f46183dd768eb223 x86-64-v4--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 ffbeb7be63eccc921d51561cfaf105b7939c0a5b71a141baf953d4ae64bfce6c x86-64-v4--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2025.08-1.sha256 +sha256 7df276b2409c57175586b132bb058babbd724a06dddf0b3dad548ff82aa7a1f2 x86-64-v4--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2025.08-1.sha256 +sha256 3777ad89e6d60bc8fafb83b6b74284b6c56aee20ea00e51dfa466800e98dcdb9 x86-64-core-i7--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2025.08-1.sha256 +sha256 f40b098d0435485a76307347e36e8f11727d25c8f5ba09a1c048d5e9e1edb2f0 x86-64-core-i7--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2025.08-1.sha256 +sha256 a7d861e2a1575d427d9572a78e7f01ba83cc11e544255c5fac54d4a4421b4d1e x86-64-core-i7--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2025.08-1.sha256 +sha256 780df995a9f389541f15abff72672c9b68ea86793c34b1dba16c0271a8e392d8 x86-64-core-i7--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 ac4cc4f555b04a44bb9ff6f8358720d40df50d6b894bceb49ce733ab3283faa4 x86-64-core-i7--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2025.08-1.sha256 +sha256 46166ced0ec5e8c7a5fc85ac2c732f2b26c465c00a5d4c9967ebb22eb4e0a08e x86-64-core-i7--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2025.08-1.sha256 +sha256 517a90df28fadcaf95c10f062d7860439c2485fa68cb40a8d56c00835d7b8a39 x86-core2--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2025.08-1.sha256 +sha256 69eb5c2dfc9e1dc594feda5e5f61d60d60de830ab4390751b4f2c07b084e939f x86-core2--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2025.08-1.sha256 +sha256 e70163fa62426347762c3a36e8cf8343086c7e4ca36e2a159b91828e3b096a69 x86-core2--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2025.08-1.sha256 +sha256 c3225387d2e30e4612066ad15d7303f352a0f55c981b8f8b32fd3bc7102be409 x86-core2--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 f65287b7c609c5fd92c10f69a1f0a088df9c15fd7aa8c6f2c9ad375f5dbaa5a0 x86-core2--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2025.08-1.sha256 +sha256 25b4d942afbdb4c4f943f93ce87de494f0308f9cfce540e650a02ff70ab0439f x86-core2--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2025.08-1.sha256 +sha256 db558ce3aeb76d0e3f8c177f8ddd9efaeeacacfb02f1ce7491d537697eb1939e x86-i686--glibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2025.08-1.sha256 +sha256 f9b365d7fd8f8860dfb1845ff731013550f071ca4a8de0e5074abc995296b26c x86-i686--glibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2025.08-1.sha256 +sha256 5f8a7a097d33c33bab851b8fd43ef352a3184feb2a322584fb80a0a84cf9793f x86-i686--musl--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2025.08-1.sha256 +sha256 3a340ebc386a057f5ddb24d8f4bbde07d2c013c99cebc02ac38565e2849bfda0 x86-i686--musl--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 dbc61fc1b20b83fb11e872276eeab42988bc01d07b063297ce7a8dcf6a965381 x86-i686--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2025.08-1.sha256 +sha256 42ae08d2440d73a9d25442b1499c0f5e3a10fd278f79439c849dbc3a0f16eb42 x86-i686--uclibc--stable-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2025.08-1.sha256 +sha256 83c13b7ea8ae433da2fe3f3fd7f723bcb692ec168e9e284534ac1999ef553197 xtensa-lx60--uclibc--bleeding-edge-2025.08-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2025.08-1.sha256 +sha256 a77b21ea3ef1b8d14a78103a645f23b5290b6ed1e8a9f95fd5eee669ffe258d2 xtensa-lx60--uclibc--stable-2025.08-1.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index 18639db1b3..7087e2cadf 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -7,1321 +7,1309 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2025.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index fcffeb6b77..6991b899be 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -46,12 +46,19 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_15 + bool "15.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_15 + config BR2_TOOLCHAIN_EXTERNAL_GCC_14 bool "14.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_GCC_AT_LEAST_14 config BR2_TOOLCHAIN_EXTERNAL_GCC_13 bool "13.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 config BR2_TOOLCHAIN_EXTERNAL_GCC_12 @@ -166,8 +173,36 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_18 + bool "6.18.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_17 + bool "6.17.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_16 + bool "6.16.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_15 + bool "6.15.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_14 + bool "6.14.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_13 + bool "6.13.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_12 + bool "6.12.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_11 - bool "6.11.x or later" + bool "6.11.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_10 diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index dc333f8474..07688a1416 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,8 +1,14 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC bool "Synopsys ARC 2024.06 toolchain" - depends on BR2_arc + depends on BR2_arc750d || BR2_arc770d || \ + BR2_archs38_64mpy || BR2_archs38_full || \ + BR2_archs4x_rel31 || BR2_archs4x depends on BR2_HOSTARCH = "x86_64" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + # The toolchains have libncurses and libexpat in their + # sysroot, confusing Buildroot and causing build + # issues. Disable until the toolchains get fixed. + depends on BR2_BROKEN select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index db11cdb6ab..5b306190bb 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -36,25 +36,9 @@ static char sysroot[PATH_MAX]; static char _time_[sizeof("-D__TIME__=\"HH:MM:SS\"")]; static char _date_[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; -/** - * GCC errors out with certain combinations of arguments (examples are - * -mfloat-abi={hard|soft} and -m{little|big}-endian), so we have to ensure - * that we only pass the predefined one to the real compiler if the inverse - * option isn't in the argument list. - * This specifies the worst case number of extra arguments we might pass - * Currently, we may have: - * -mfloat-abi= - * -march= - * -mcpu= - * -D__TIME__= - * -D__DATE__= - * -Wno-builtin-macro-redefined - * -Wl,-z,now - * -Wl,-z,relro - * -fPIE - * -pie - */ -#define EXCLUSIVE_ARGS 10 +/* Maximum amount of arguments to reserve space for by default. + Must be > predef_args */ +#define DEFAULT_MAX_ARGS 1024 static char *predef_args[] = { #ifdef BR_CCACHE @@ -62,6 +46,9 @@ static char *predef_args[] = { #endif path, "--sysroot", sysroot, +#ifdef BR_CLANG_CONFIG_FILE + BR_CLANG_CONFIG_FILE, +#endif #ifdef BR_ABI "-mabi=" BR_ABI, #endif @@ -74,6 +61,9 @@ static char *predef_args[] = { #ifdef BR_SOFTFLOAT "-msoft-float", #endif /* BR_SOFTFLOAT */ +#ifdef BR_SIMD + "-msimd=" BR_SIMD, +#endif #ifdef BR_MODE "-m" BR_MODE, #endif @@ -245,7 +235,8 @@ int main(int argc, char **argv) char *progpath = argv[0]; char *basename; char *env_debug; - int ret, i, count = 0, debug = 0, found_shared = 0; + int ret, i, count = 0, debug = 0, found_shared = 0, found_nonoption = 0; + size_t n_args; /* Debug the wrapper to see arguments it was called with. * If environment variable BR2_DEBUG_WRAPPER is: @@ -311,13 +302,33 @@ int main(int argc, char **argv) return 3; } - /* skip all processing --help is specified */ + /* any non-option (E.G. source / object files) arguments passed? */ for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "--help")) { - argv[0] = path; - if (execv(path, argv)) - perror(path); - return 1; + if (argv[i][0] != '-') { + found_nonoption = 1; + break; + } + } + + /* Check for unsafe library and header paths */ + for (i = 1; i < argc; i++) { + const struct str_len_s *opt; + for (opt=unsafe_opts; opt->str; opt++ ) { + /* Skip any non-unsafe option. */ + if (strncmp(argv[i], opt->str, opt->len)) + continue; + + /* Handle both cases: + * - path is a separate argument, + * - path is concatenated with option. + */ + if (argv[i][opt->len] == '\0') { + i++; + if (i == argc) + break; + check_unsafe_path(argv[i-1], argv[i], 0); + } else + check_unsafe_path(argv[i], argv[i] + opt->len, 1); } } @@ -334,16 +345,18 @@ int main(int argc, char **argv) return 3; } - cur = args = malloc(sizeof(predef_args) + - (sizeof(char *) * (argc + EXCLUSIVE_ARGS))); + cur = args = malloc(DEFAULT_MAX_ARGS * sizeof(char *)); if (args == NULL) { perror(__FILE__ ": malloc"); return 2; } /* start with predefined args */ - memcpy(cur, predef_args, sizeof(predef_args)); - cur += sizeof(predef_args) / sizeof(predef_args[0]); + for (i = 0; i < sizeof(predef_args) / sizeof(predef_args[0]); i++) { + /* skip linker flags when we know we are not linking */ + if (found_nonoption || strncmp(predef_args[i], "-Wl,", strlen("-Wl,"))) + *cur++ = predef_args[i]; + } #ifdef BR_FLOAT_ABI /* add float abi if not overridden in args */ @@ -463,7 +476,7 @@ int main(int argc, char **argv) !strcmp(argv[i], "-D__UBOOT__")) break; } - if (i == argc) { + if (i == argc && found_nonoption) { /* https://wiki.gentoo.org/wiki/Hardened/Toolchain#Mark_Read-Only_Appropriate_Sections */ #ifdef BR2_RELRO_PARTIAL *cur++ = "-Wl,-z,relro"; @@ -474,34 +487,17 @@ int main(int argc, char **argv) #endif } - /* Check for unsafe library and header paths */ - for (i = 1; i < argc; i++) { - const struct str_len_s *opt; - for (opt=unsafe_opts; opt->str; opt++ ) { - /* Skip any non-unsafe option. */ - if (strncmp(argv[i], opt->str, opt->len)) - continue; - - /* Handle both cases: - * - path is a separate argument, - * - path is concatenated with option. - */ - if (argv[i][opt->len] == '\0') { - i++; - if (i == argc) - break; - check_unsafe_path(argv[i-1], argv[i], 0); - } else - check_unsafe_path(argv[i], argv[i] + opt->len, 1); + n_args = (cur - args); + if ((n_args + argc) > DEFAULT_MAX_ARGS) { + args = realloc(args, (n_args + argc) * sizeof(char *)); + if (args == NULL) { + perror(__FILE__ ": realloc"); + return 2; } } - /* append forward args */ - memcpy(cur, &argv[1], sizeof(char *) * (argc - 1)); - cur += argc - 1; - - /* finish with NULL termination */ - *cur = NULL; + /* append forward args and terminating NULL */ + memcpy(&args[n_args], &argv[1], sizeof(char *) * argc); exec_args = args; #ifdef BR_CCACHE @@ -519,7 +515,7 @@ int main(int argc, char **argv) } #endif #ifdef BR_CCACHE_BASEDIR - /* Allow compilercheck to be overridden through the environment */ + /* Allow basedir to be overridden through the environment */ if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); return 3; diff --git a/utils/brmake b/utils/brmake index 4756016a0c..c29e56a9bc 100755 --- a/utils/brmake +++ b/utils/brmake @@ -5,25 +5,15 @@ main() { local ret start d h m mf - if ! which unbuffer >/dev/null 2>&1; then - printf "you need to install 'unbuffer' (from package expect or expect-dev)\n" >&2 - exit 1 - fi - start=${SECONDS} - if [ -n "$BR2_DOCKER" ]; then - docker=("${0%/*}/docker-run") - else - docker=() - fi - - ( exec 2>&1; unbuffer "${docker[@]}" make "${@}"; ) \ - > >( while read -r line; do + make "${@}" \ + &> >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ - |grep --colour=never -E '>>>' + |grep --line-buffered --colour=never -E '>>>' \ + |sed --unbuffered -E 's/^([0-9T:-]{19}) [[:print:]]*(.*>>> )/\1 \2/' ) ret=${?} diff --git a/utils/bump-stable-kernel-versions b/utils/bump-stable-kernel-versions new file mode 100755 index 0000000000..577a6841c8 --- /dev/null +++ b/utils/bump-stable-kernel-versions @@ -0,0 +1,98 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: MIT-0 +# Copyright (C) 2024 by Gero Schwäricke +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this +# software and associated documentation files (the "Software"), to deal in the Software +# without restriction, including without limitation the rights to use, copy, modify, +# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +# OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +# Check for updates to Linux stable releases. The script uses the versions found in +# linux/linux.hash. For each of the versions it downloads the related hash list and tries +# to find an updated stable release. If found it updates all related files and hashes. + +set -euo pipefail + +latest_version=$(sed -rn 's|^\tdefault "(.+)" if BR2_LINUX_KERNEL_LATEST_VERSION$|\1|p' linux/Config.in) +latest_release_version=$(echo "${latest_version}" | cut -f 1-2 -d .) +echo "${latest_version} -> ${latest_release_version}" + +updated_releases_list='' + +hash_list= +while read -r line; do + # e.g.: # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc + url=$(echo "${line}" | sed -n 's|^# From \(https://www\.kernel\.org/pub/linux/kernel/.*/sha256sums.asc\)|\1|p') + # e.g.: sha256 f905f1238ea7a8e85314bacf283302e8097006010d25fcea726d0de0ea5bc9b6 linux-6.8.9.tar.xz + old_hash=$(echo "${line}" | sed -rn 's|^sha256 +([0-9a-f]+) +linux-.*$|\1|p') + old_version=$(echo "${line}" | sed -rn 's|^sha256 +[0-9a-f]+ +linux-(.+)\.tar\.xz$|\1|p') + if [ -n "${url}" ]; then + # Line contained a URL: Download hash list and use it. + if [ -a "${hash_list}" ]; then + rm "${hash_list}" + fi + + hash_list=$(basename "${url}") + echo ">>> Downloading hash list from ${url}" + wget --no-verbose "${url}" + gpg --verify "${hash_list}" + + echo "${line}" >> linux/linux.hash.new + elif [ -n "${old_version}" ]; then + # Line contained a hash entry: Search for newer versions. + release_version=$(echo "${old_version}" | cut -f 1-2 -d .) # e.g.: 6.8 instead of 6.8.9 + # e.g.: 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz + new_hash_entry=$(grep "^[0-9a-f]\+ \+linux-${release_version//./\\.}\.[0-9]\+\.tar\.xz$" "${hash_list}" | sort -V --key '2' | tail -1) + new_hash=$(echo "${new_hash_entry}" | cut -f 1 -d ' ') + new_version=$(echo "${new_hash_entry}" | cut -f 3 -d ' ' | sed -rn 's|linux-(.+)\.tar\.xz|\1|p') + + if [ "$new_version" == "$old_version" ]; then + # Same version as before + echo ">>> Release ${release_version}.x already on newest version ${new_version}." + echo "${line}" >> linux/linux.hash.new + + if [ "${old_hash}" != "${new_hash}" ]; then + # Hash changed! This should never happen! + echo ">>> Version hash changed for ${release_version}.x!" + echo ">>> It was: ${old_hash}" + echo ">>> It is: ${new_hash}" + exit 1 + fi + else + # Different version: update hash list, default headers, and possibly latest + # version. + echo ">>> Updating hash for ${release_version}.x in linux/linux.hash" + echo "sha256 ${new_hash} linux-${new_version}.tar.xz" >> linux/linux.hash.new + + echo ">>> Updating version from ${old_version} to ${new_version} in Config.in files" + sed -Ei "s/\tdefault \"${old_version}\"([\t ]+)if /\tdefault \"${new_version}\"\1if /" \ + package/linux-headers/Config.in.host linux/Config.in + + updated_releases_list="${updated_releases_list} ${release_version}.x" + fi + else + # Different line: Reset hash list and just copy this line over as is. + if [ -a "${hash_list}" ]; then + rm "${hash_list}" + hash_list= + fi + echo "${line}" >> linux/linux.hash.new + fi +done < linux/linux.hash + +# We were iterating over this file so we could not edit in-place. +mv linux/linux.hash.new linux/linux.hash + +if [ -n "${updated_releases_list}" ]; then + echo ">>> Suggested subject: {linux, linux-headers}: bump${updated_releases_list//.x /.x, } series" +else + echo '>>> Nothing happened.' +fi diff --git a/utils/check-package b/utils/check-package index 6a5e89daa3..aa10280f4d 100755 --- a/utils/check-package +++ b/utils/check-package @@ -10,6 +10,7 @@ import argparse import inspect +import fileinput import magic import os import re @@ -91,6 +92,9 @@ def parse_args(): "functions that would be called for each file (debug)") parser.add_argument("--failed-only", action="store_true", help="print only" " the name of the functions that failed (debug)") + parser.add_argument("--patch", "-p", action="store_true", + help="The 'files' are patch files to be sent to the" + " Buildroot mailing list") parser.add_argument("--test-suite", action="store_true", help="Run the" " test-suite") @@ -253,20 +257,27 @@ def check_file_using_lib(fname): nwarnings += warn lastline = "" - with open(fname, "r", errors="surrogateescape") as f: - for lineno, text in enumerate(f): - nlines += 1 - for name, cf in objects: - if cf.disable.search(lastline): - continue - line_sts = cf.check_line(lineno + 1, text) - warn, fail = print_warnings(line_sts, name in xfail) - if fail > 0: - failed.add(name) - nwarnings += warn - lastline = text + try: + with open(fname, "r", errors="surrogateescape") as f: + for lineno, text in enumerate(f): + nlines += 1 + for name, cf in objects: + if cf.disable.search(lastline): + continue + line_sts = cf.check_line(lineno + 1, text) + warn, fail = print_warnings(line_sts, name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + lastline = text + except FileNotFoundError: + print(f"{fname}: missing; unstaged file removal?") + nwarnings += 1 + return nwarnings, nlines for name, cf in objects: + if cf.disable.search(lastline): + continue warn, fail = print_warnings(cf.after(), name in xfail) if fail > 0: failed.add(name) @@ -294,6 +305,30 @@ def check_file_using_lib(fname): return nwarnings, nlines +def patch_modified_files(patches): + """ + Find files modified in a patch file + + :param patches: Patch files to read, as a list of paths or '-' for stdin + :returns: List of modified filenames + """ + + files = [] + with fileinput.input(files=patches) as fp: + # Search for unified-diff to-file lines + for line in fp: + if line.startswith('+++'): + line = line.removeprefix('+++').strip() + + # Remove the prefix git adds to filenames + if line.startswith('b/'): + line = line.removeprefix('b/') + + files.append(line) + files.sort() + return files + + def __main__(): global flags flags = parse_args() @@ -301,14 +336,17 @@ def __main__(): if flags.test_suite: return checkpackagelib.base.run_test_suite() + if flags.patch: + files_to_check = patch_modified_files(flags.files) + else: + files_to_check = flags.files + if flags.intree_only: # change all paths received to be relative to the base dir base_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) - files_to_check = [os.path.relpath(os.path.abspath(f), base_dir) for f in flags.files] + files_to_check = [os.path.relpath(os.path.abspath(f), base_dir) for f in files_to_check] # move current dir so the script find the files os.chdir(base_dir) - else: - files_to_check = flags.files if len(files_to_check) == 0: print("No files to check style") diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index bf975d7a3b..202baa7f1b 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -242,6 +242,17 @@ class Indent(_CheckFunction): text] +class NoDefaultN(_CheckFunction): + DEFAULTN = re.compile(r"^\tdefault n$") + + def check_line(self, lineno, text): + text_nocomments = text.split("#")[0].rstrip() + if self.DEFAULTN.match(text_nocomments): + return ["{}:{}: boolean symbols default to 'n', so 'default n' is redundant" + .format(self.filename, lineno), + text] + + class RedefinedConfig(_CheckFunction): CONFIG = re.compile(r"^\s*(menu|)config\s+(BR2_\w+)\b") IF = re.compile(r"^\s*if\s+([^#]*)\b") diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 474d17105e..35614ef152 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -387,6 +387,39 @@ def test_Indent(testname, filename, string, expected): assert warnings == expected +NoDefaultN = [ + ('good example', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\tdefault y\n', + []), + ('default n', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\tdefault n\n', + [['any:2: boolean symbols default to \'n\', so \'default n\' is redundant', + '\tdefault n\n']]), + ('default n with comment', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\tdefault n # this is a comment\n', + [['any:2: boolean symbols default to \'n\', so \'default n\' is redundant', + '\tdefault n # this is a comment\n']]), + ('default n with trailing whitespace', + 'any', + 'config BR2_PACKAGE_FOO\n' + '\tdefault n \t\n', + [['any:2: boolean symbols default to \'n\', so \'default n\' is redundant', + '\tdefault n \t\n']]) + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', NoDefaultN) +def test_NoDefaultN(testname, filename, string, expected): + warnings = util.check_file(m.NoDefaultN, filename, string) + assert warnings == expected + + RedefinedConfig = [ ('no redefinition', 'any', diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index c86c55b9cb..3f97c25b2d 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -75,9 +75,6 @@ def test_Ifdef(testname, filename, string, expected): get_package_prefix_from_filename = [ - ('linux extension', - 'linux/linux-ext-aufs.mk', - ['aufs', 'AUFS']), ('linux tool', 'package/linux-tools/linux-tool-gpio.mk.in', ['gpio', 'GPIO']), diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index cfa826f57c..56326398d3 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -100,7 +100,7 @@ Shellcheck = [ '', ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", "In dir/empty.sh line 1:\n" - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), ('sh shebang', @@ -117,8 +117,8 @@ Shellcheck = [ ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", "In dir/unused.sh line 1:\n" 'unused=""\n' - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" - "^----^ SC2034: unused appears unused. Verify use (or export if used externally).\n" + "^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^----^ SC2034 (warning): unused appears unused. Verify use (or export if used externally).\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...\n" " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), @@ -128,7 +128,7 @@ Shellcheck = [ ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", "In dir/tab.sh line 1:\n" '\t#!/bin/sh\n' - "^-- SC1114: Remove leading spaces before the shebang.\n" + "^-- SC1114 (error): Remove leading spaces before the shebang.\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), ] diff --git a/utils/checksymbolslib/br.py b/utils/checksymbolslib/br.py index f9dc336e64..a4c1b84c56 100644 --- a/utils/checksymbolslib/br.py +++ b/utils/checksymbolslib/br.py @@ -45,6 +45,10 @@ symbols_not_defined_for_fake_virtual_packages = [ 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BUILDROOT', 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BARE_METAL_BUILDROOT', ] +# Config.in +symbols_possibly_unused = [ + 'BR2_BROKEN', +] # fs/common.mk suffixes_not_defined_for_all_rootfs_types = [ '_BZIP2', diff --git a/utils/checksymbolslib/db.py b/utils/checksymbolslib/db.py index 71b1e9e816..cb0dfa476f 100644 --- a/utils/checksymbolslib/db.py +++ b/utils/checksymbolslib/db.py @@ -155,6 +155,8 @@ class DB: continue if legacy_usage in entries: continue + if symbol in br.symbols_possibly_unused: + continue if symbol in br.symbols_used_only_in_source_code: continue if symbol in br.symbols_used_only_for_host_variant: diff --git a/utils/checksymbolslib/test_makefile.py b/utils/checksymbolslib/test_makefile.py index 1dc6564b2f..9d24484124 100644 --- a/utils/checksymbolslib/test_makefile.py +++ b/utils/checksymbolslib/test_makefile.py @@ -250,9 +250,6 @@ check_filename = [ ('fs/cramfs/cramfs.mk', 'fs/cramfs/cramfs.mk', True), - ('linux/linux-ext-fbtft.mk', - 'linux/linux-ext-fbtft.mk', - True), ('package/ace/ace.mk', 'package/ace/ace.mk', True), diff --git a/utils/config b/utils/config index dfaaf46cd7..038986ca6c 100755 --- a/utils/config +++ b/utils/config @@ -172,10 +172,10 @@ while [ "$1" != "" ] ; do ;; --state|-s) - if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then + if grep -q "# ${BR2_PREFIX}$ARG is not set" "$FN" ; then echo n else - if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then + if V="$(grep "^${BR2_PREFIX}$ARG=" "$FN")"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" diff --git a/utils/docker-run b/utils/docker-run index 849df66d54..27c169db72 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -35,7 +35,14 @@ declare -a mountpoints=( # compatibility command. export PODMAN_USERNS="keep-id" -if command -v docker >/dev/null; then +if [ "${BR2_DOCKER}" ]; then + if command -v "${BR2_DOCKER}" >/dev/null; then + DOCKER="${BR2_DOCKER}" + else + printf 'ERROR: Command "%s" (from env BR2_DOCKER) not found.\n' "${BR2_DOCKER}" >&2 + exit 1 + fi +elif command -v docker >/dev/null; then DOCKER="docker" elif command -v podman >/dev/null; then DOCKER="podman" diff --git a/utils/generate-cyclonedx b/utils/generate-cyclonedx new file mode 100755 index 0000000000..60983ac1ea --- /dev/null +++ b/utils/generate-cyclonedx @@ -0,0 +1,344 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later + +# This script converts the output of the show-info make target +# to CycloneDX format. +# +# Example usage: +# $ make show-info | utils/generate-cyclonedx > sbom.json + + +import argparse +import bz2 +import gzip +import json +import os +from pathlib import Path +import urllib.request +import subprocess +import sys + +CYCLONEDX_VERSION = "1.6" +SPDX_SCHEMA_URL = f"https://raw.githubusercontent.com/CycloneDX/specification/{CYCLONEDX_VERSION}/schema/spdx.schema.json" + +brpath = Path(__file__).parent.parent + +cyclonedxpath = Path(os.getenv("BR2_DL_DIR", brpath / "dl")) / "cyclonedx" +SPDX_SCHEMA_PATH = cyclonedxpath / f"spdx-{CYCLONEDX_VERSION}.schema.json" + +BR2_VERSION_FULL = ( + subprocess.check_output( + ["make", "--no-print-directory", "-C", brpath, "print-version"] + ) + .decode() + .strip() +) + +SPDX_LICENSES = [] + +if not SPDX_SCHEMA_PATH.exists(): + # Download the CycloneDX SPDX schema JSON, and cache it locally + cyclonedxpath.mkdir(parents=True, exist_ok=True) + urllib.request.urlretrieve(SPDX_SCHEMA_URL, SPDX_SCHEMA_PATH) + +try: + with SPDX_SCHEMA_PATH.open() as f: + SPDX_LICENSES = json.load(f).get("enum", []) +except json.JSONDecodeError: + # In case of error the license will just not be matched to the SPDX names + # but the SBOM generation still work. + print(f"Failed to load the SPDX licenses file: {SPDX_SCHEMA_PATH}", file=sys.stderr) + + +def split_top_level_comma(subj): + """Split a string at comma's, but do not split at comma's in between parentheses. + + Args: + subj (str): String to be split. + + Returns: + list: A list of substrings + """ + counter = 0 + substring = "" + + for char in subj: + if char == "," and counter == 0: + yield substring + substring = "" + else: + if char == "(": + counter += 1 + elif char == ")": + counter -= 1 + substring += char + + yield substring + + +def cyclonedx_license(lic): + """Given the name of a license, create an individual entry in + CycloneDX format. In CycloneDX, the 'id' keyword is used for + names that are recognized as SPDX License abbreviations. All other + license names are placed under the 'name' keyword. + + Args: + lic (str): Name of the license + + Returns: + dict: An entry for the license in CycloneDX format. + """ + key = "id" if lic in SPDX_LICENSES else "name" + return { + key: lic, + } + + +def cyclonedx_licenses(lic_list): + """Create a licenses list formatted for a CycloneDX component + + Args: + lic_list (str): A comma separated list of license names. + + Returns: + dict: A dictionary with license information for the component, + in CycloneDX format. + """ + return { + "licenses": [ + {"license": cyclonedx_license(lic.strip())} for lic in split_top_level_comma(lic_list) + ] + } + + +def cyclonedx_patches(patch_list): + """Translate a list of patches from the show-info JSON to a list of + patches in CycloneDX format. + + Args: + patch_list (dict): Information about the patches as a Python dictionary. + + Returns: + dict: Patch information in CycloneDX format. + """ + patch_contents = [] + for patch in patch_list: + patch_path = brpath / patch + if patch_path.exists(): + f = None + if patch.endswith('.gz'): + f = gzip.open(patch_path, mode="rt") + elif patch.endswith('.bz'): + f = bz2.open(patch_path, mode="rt") + else: + f = open(patch_path) + + try: + patch_contents.append({ + "text": { + "content": f.read() + } + }) + except Exception: + # If the patch can't be read it won't be added to + # the resulting SBOM. + print(f"Failed to handle patch: {patch}", file=sys.stderr) + + f.close() + else: + # If the patch is not a file it's a tarball or diff url passed + # through the `_PATCH` variable. + patch_contents.append({ + "url": patch + }) + + return { + "pedigree": { + "patches": [{ + "type": "unofficial", + "diff": content + } for content in patch_contents] + }, + } + + +def cyclonedx_component(name, comp): + """Translate a component from the show-info output, to a component entry in CycloneDX format. + + Args: + name (str): Key used for the package in the show-info output. + comp (dict): Data about the package as a Python dictionary. + + Returns: + dict: Component information in CycloneDX format. + """ + return { + "bom-ref": name, + "type": "library", + **({ + "name": comp["name"], + } if "name" in comp else {}), + **({ + "version": comp["version"], + **(cyclonedx_licenses(comp["licenses"]) if "licenses" in comp else {}), + } if not comp["virtual"] else {}), + **({ + "cpe": comp["cpe-id"], + } if "cpe-id" in comp else {}), + **(cyclonedx_patches(comp["patches"]) if comp.get("patches") else {}), + "properties": [{ + "name": "BR_TYPE", + "value": comp["type"], + }], + } + + +def cyclonedx_dependency(ref, depends): + """Create JSON for dependency relationships between components. + + Args: + ref (str): reference to a component bom-ref. + depends (list): array of component bom-ref identifier to create the dependencies. + + Returns: + dict: Dependency information in CycloneDX format. + """ + return { + "ref": ref, + "dependsOn": sorted(depends), + } + + +def cyclonedx_vulnerabilities(show_info_dict): + """Create a JSON list of vulnerabilities ignored by buildroot and associate + the component for which they are solved. + + Args: + show_info_dict (dict): The JSON output of the show-info + command, parsed into a Python dictionary. + + Returns: + list: Solved vulnerabilities list in CycloneDX format. + """ + cves = {} + + for name, comp in show_info_dict.items(): + for cve in comp.get('ignore_cves', []): + cves.setdefault(cve, []).append(name) + + return [{ + "id": cve, + "analysis": { + "state": "in_triage", + "detail": f"The CVE '{cve}' has been marked as ignored by Buildroot" + }, + "affects": [ + {"ref": bomref} for bomref in components + ] + } for cve, components in cves.items()] + + +def br2_parse_deps_recursively(ref, show_info_dict, virtual=False, deps=[]): + """Parse dependencies from the show-info output. This function will + recursively collect all dependencies, and return a list where each dependency + is stated at most once. + The dependency on virtual package will collect the final dependency without + including the virtual one. + + Args: + ref (str): The identifier of the package for which the dependencies have + to be looked up. + show_info_dict (dict): The JSON output of the show-info + command, parsed into a Python dictionary. + + Kwargs: + deps (list): A list, to which dependencies will be appended. If set to None, + a new empty list will be created. Defaults to None. + + Returns: + list: A list of dependencies of the 'ref' package. + """ + for dep in show_info_dict.get(ref, {}).get("dependencies", []): + if dep not in deps: + if virtual or show_info_dict.get(dep, {}).get("virtual") is False: + deps.append(dep) + br2_parse_deps_recursively(dep, show_info_dict, virtual, deps) + + return deps + + +def main(): + parser = argparse.ArgumentParser( + description='''Create a CycloneDX SBoM for the Buildroot configuration. + Example usage: make show-info | utils/generate-cyclonedx > sbom.json + ''' + ) + parser.add_argument("-i", "--in-file", nargs="?", type=argparse.FileType("r"), + default=(None if sys.stdin.isatty() else sys.stdin)) + parser.add_argument("-o", "--out-file", nargs="?", type=argparse.FileType("w"), + default=sys.stdout) + parser.add_argument("--virtual", default=False, action='store_true', + help="This option includes virtual packages to the CycloneDX output") + parser.add_argument("--project-name", type=str, default="buildroot", + help="Specify the project name to use in the SBOM metadata (default:'buildroot')") + parser.add_argument("--project-version", type=str, default=f"{BR2_VERSION_FULL}", + help="Specify the project version to use in the SBOM metadata (default: builroot version)") + + args = parser.parse_args() + + if args.in_file is None: + parser.print_help() + sys.exit(1) + + show_info_dict = json.load(args.in_file) + + # Remove rootfs and virtual packages if not explicitly included + # from the cli arguments + filtered_show_info_dict = {k: v for k, v in show_info_dict.items() + if ("rootfs" not in v["type"]) and (args.virtual or v["virtual"] is False)} + + cyclonedx_dict = { + "bomFormat": "CycloneDX", + "$schema": f"http://cyclonedx.org/schema/bom-{CYCLONEDX_VERSION}.schema.json", + "specVersion": f"{CYCLONEDX_VERSION}", + "metadata": { + "component": { + "bom-ref": args.project_name, + "name": args.project_name, + "version": args.project_version, + "type": "firmware", + }, + "tools": { + "components": [ + { + "type": "application", + "name": "Buildroot generate-cyclonedx", + "version": f"{BR2_VERSION_FULL}", + "licenses": [ + { + "license": { + "id": "GPL-2.0" + } + } + ] + } + ], + } + }, + "components": [ + cyclonedx_component(name, comp) for name, comp in filtered_show_info_dict.items() + ], + "dependencies": [ + cyclonedx_dependency("buildroot", list(filtered_show_info_dict)), + *[cyclonedx_dependency(ref, br2_parse_deps_recursively(ref, show_info_dict, args.virtual)) + for ref in filtered_show_info_dict], + ], + "vulnerabilities": cyclonedx_vulnerabilities(show_info_dict), + } + + args.out_file.write(json.dumps(cyclonedx_dict, indent=2)) + args.out_file.write('\n') + + +if __name__ == "__main__": + main() diff --git a/utils/genrandconfig b/utils/genrandconfig index 0698cc5ff0..ac80982f63 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -147,11 +147,8 @@ async def fixup_config(sysinfo, configfile): if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y\n' in configlines: configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""\n') - configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"\n') + configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf"\n') - if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ - 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: - return False if 'BR2_PACKAGE_A10DISP=y\n' in configlines: return False @@ -252,11 +249,6 @@ async def fixup_config(sysinfo, configfile): 'BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y\n' in configlines: configlines.remove('BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y') - if 'BR2_LINUX_KERNEL_EXT_AUFS=y\n' in configlines and \ - 'BR2_LINUX_KERNEL_EXT_AUFS_VERSION=""\n' in configlines: - configlines.remove('BR2_LINUX_KERNEL_EXT_AUFS=y\n') - configlines.remove('BR2_LINUX_KERNEL_EXT_AUFS_VERSION=""\n') - if 'BR2_PACKAGE_LINUX_BACKPORTS=y\n' in configlines and \ 'BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG=y\n' in configlines and \ 'BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE=""\n' in configlines: @@ -504,7 +496,8 @@ async def fixup_config(sysinfo, configfile): # Don't build igh-ethercat driver as they are highly # kernel-version specific - for opt in ['8139TOO', 'E100', 'E1000', 'E1000E', 'R8169']: + for opt in ['8139TOO', 'E100', 'E1000', 'E1000E', 'R8169', 'GENET', + 'IGB', 'IGC', 'STMMAC_PCI', 'STMMAC', 'DWMAC_INTEL', 'CCAT']: optstr = 'BR2_PACKAGE_IGH_ETHERCAT_%s=y\n' % opt if optstr in configlines: configlines.remove(optstr) diff --git a/utils/get-developers b/utils/get-developers index 9ab5c4503f..83c573bf23 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -5,7 +5,7 @@ import getdeveloperlib import sys -def parse_args(): +def __main__(): parser = argparse.ArgumentParser() parser.add_argument('patches', metavar='P', type=argparse.FileType('r'), nargs='*', help='list of patches (use - to read patches from stdin)') @@ -17,17 +17,15 @@ def parse_args(): help='find developers in charge of these files') parser.add_argument('-c', dest='check', action='store_const', const=True, help='list files not handled by any developer') + parser.add_argument('--cc', action="store_true", + help='list affected developers as CC: lines ready to be pasted in a commit log') parser.add_argument('-e', dest='email', action='store_const', const=True, help='only list affected developer email addresses') parser.add_argument('-v', dest='validate', action='store_const', const=True, help='validate syntax of DEVELOPERS file') parser.add_argument('-d', dest='filename', action='store', default=None, help='override the default DEVELOPERS file (for debug)') - return parser.parse_args() - - -def __main__(): - args = parse_args() + args = parser.parse_args() # Check that only one action is given action = 0 @@ -44,11 +42,11 @@ def __main__(): if len(args.patches) != 0: action += 1 if action > 1: - print("Cannot do more than one action") - return + parser.error("Cannot do more than one action") if action == 0: - print("No action specified") - return + if sys.stdin.isatty(): + parser.error("No action specified") + args.patches.append(sys.stdin) devs = getdeveloperlib.parse_developers(args.filename) if devs is None: @@ -102,9 +100,10 @@ def __main__(): if i in dev.infras: matching_devs.add(dev.name) - if args.email: + matching_devs = sorted(matching_devs) + if args.email or args.cc: for dev in matching_devs: - print(dev) + print(f"{'Cc: ' if args.cc else ''}{dev}") else: result = "--to buildroot@buildroot.org" for dev in matching_devs: diff --git a/utils/readme.txt b/utils/readme.txt index abff659d4f..b5862f1fb9 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -7,9 +7,6 @@ brmake front of each line, redirects all of the build output to a file ("'br.log' in the current directory), and just outputs the Buildroot messages (those lines starting with >>>) on stdout. - To run this within a container using docker-run (see below), set - BR2_DOCKER=y in the environment, i.e. call it as - `BR2_DOCKER=y utils/brmake`. Do not run this script for interactive configuration (e.g. menuconfig) or on an unconfigured directory. The output is redirected so you will see nothing. diff --git a/utils/scanpypi b/utils/scanpypi index af62c01632..61879e39d4 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -22,16 +22,10 @@ import tempfile import traceback import importlib import importlib.metadata -import six.moves.urllib.request -import six.moves.urllib.error -import six.moves.urllib.parse -from six.moves import map -from six.moves import zip -from six.moves import input -if six.PY2: - import StringIO -else: - import io +import urllib.request +import urllib.error +import urllib.parse +import io BUF_SIZE = 65536 @@ -225,15 +219,15 @@ class BuildrootPackage(): self.metadata_url = 'https://pypi.org/pypi/{pkg}/json'.format( pkg=self.real_name) try: - pkg_json = six.moves.urllib.request.urlopen(self.metadata_url).read().decode() - except six.moves.urllib.error.HTTPError as error: + pkg_json = urllib.request.urlopen(self.metadata_url).read().decode() + except urllib.error.HTTPError as error: print('ERROR:', error.getcode(), error.msg, file=sys.stderr) print('ERROR: Could not find package {pkg}.\n' 'Check syntax inside the python package index:\n' 'https://pypi.python.org/pypi/ ' .format(pkg=self.real_name)) raise - except six.moves.urllib.error.URLError: + except urllib.error.URLError: print('ERROR: Could not find package {pkg}.\n' 'Check syntax inside the python package index:\n' 'https://pypi.python.org/pypi/ ' @@ -260,7 +254,7 @@ class BuildrootPackage(): 'digests': None}] # In this case, we can't get the name of the downloaded file # from the pypi api, so we need to find it, this should work - urlpath = six.moves.urllib.parse.urlparse( + urlpath = urllib.parse.urlparse( self.metadata['info']['download_url']).path # urlparse().path give something like # /path/to/file-version.tar.gz @@ -272,8 +266,8 @@ class BuildrootPackage(): try: print('Downloading package {pkg} from {url}...'.format( pkg=self.real_name, url=download_url['url'])) - download = six.moves.urllib.request.urlopen(download_url['url']) - except six.moves.urllib.error.HTTPError as http_error: + download = urllib.request.urlopen(download_url['url']) + except urllib.error.HTTPError as http_error: download = http_error else: self.used_url = download_url @@ -288,7 +282,7 @@ class BuildrootPackage(): raise DownloadFailed('Failed to download package {pkg}: ' 'No source archive available' .format(pkg=self.real_name)) - elif download.__class__ == six.moves.urllib.error.HTTPError: + elif download.__class__ == urllib.error.HTTPError: raise download self.filename = self.used_url['filename'] @@ -317,10 +311,7 @@ class BuildrootPackage(): Keyword arguments: tmp_path -- directory where you want the package to be extracted """ - if six.PY2: - as_file = StringIO.StringIO(self.as_string) - else: - as_file = io.BytesIO(self.as_string) + as_file = io.BytesIO(self.as_string) if self.filename[-3:] == 'zip': with zipfile.ZipFile(as_file) as as_zipfile: tmp_pkg = os.path.join(tmp_path, self.buildroot_name) @@ -797,12 +788,12 @@ def main(): print('Fetching package', package.real_name) try: package.fetch_package_info() - except (six.moves.urllib.error.URLError, six.moves.urllib.error.HTTPError): + except (urllib.error.URLError, urllib.error.HTTPError): continue try: package.download_package() - except six.moves.urllib.error.HTTPError as error: + except urllib.error.HTTPError as error: print('Error: {code} {reason}'.format(code=error.code, reason=error.reason)) print('Error downloading package :', package.buildroot_name) diff --git a/utils/test-pkg b/utils/test-pkg index 19d8713d6a..cea7ace7cb 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -3,6 +3,11 @@ set -e TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' TEMP_CONF="" +abort=0 + +do_abort() { + abort=1 +} do_clean() { if [ -n "${TEMP_CONF}" ]; then @@ -17,8 +22,8 @@ main() { local -a toolchains local pkg_br_name - o='hakc:d:n:p:r:t:' - O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:' + o='hakc:d:n:p:r:t:T:' + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:,toolchain-name:' opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" eval set -- "${opts}" @@ -61,13 +66,17 @@ main() { (-t|--toolchains-csv) toolchains_csv="${2}"; shift 2 ;; + (-T|--toolchain-name) + toolchain_name="${2}"; shift 2 + ;; (--) shift; break ;; esac done - trap do_clean INT TERM HUP EXIT + trap do_abort INT + trap do_clean TERM HUP EXIT if [ -z "${cfg}" ]; then pkg_br_name="${pkg//-/_}" @@ -107,7 +116,9 @@ main() { # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - | if [ "${random}" -gt 0 ]; then \ + | if [ -n "${toolchain_name}" ]; then \ + grep -E "[/^]${toolchain_name}.config" + elif [ "${random}" -gt 0 ]; then \ sort -R | head -n "${random}" elif [ "${number}" -gt 0 ]; then \ head -n "${number}" @@ -139,6 +150,10 @@ main() { (3) : $((nb_legal++)); printf "FAILED\n";; (4) : $((nb_show++)); printf "FAILED\n";; esac + + if [ "${abort}" -eq 1 ]; then + return 1 + fi done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ @@ -278,6 +293,12 @@ Options: try. If not specified, the toolchains in ${TOOLCHAINS_CSV} will be used. + -T NAME, --toolchain-name NAME + Name of the single toolchain to use. It must be defined in the CSV + list of toolchains (see also -t / --toolchains-csv). If this option + is specified, then a single build will be performed on that + specific toolchain only. + -k, --keep Keep the build directories even if the build succeeds. Note: the logfile and configuration is always retained, even without diff --git a/utils/update-rust b/utils/update-rust index 0f40f2e2b6..7db3feff9c 100755 --- a/utils/update-rust +++ b/utils/update-rust @@ -62,7 +62,7 @@ RUST_DIST_URL = "https://static.rust-lang.org/dist" LICENSES = { "APACHE": "62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a", - "MIT": "23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3", + "MIT": "b71bd43a069ca0641a9ecfe585ca7b3c53b5cc1608f8b68321168698e28b5ea1", }